diff options
Diffstat (limited to 'knotes')
| -rw-r--r-- | knotes/knote.cpp | 16 | ||||
| -rw-r--r-- | knotes/knotesapp.cpp | 2 | ||||
| -rw-r--r-- | knotes/main.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/knotes/knote.cpp b/knotes/knote.cpp index 2b0ae9599..182aee863 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -443,7 +443,7 @@ void KNote::saveConfig() const m_config->setHeight( 0 ); m_config->setPosition( pos() ); - NETWinInfo wm_client( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMDesktop ); + NETWinInfo wm_client( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMDesktop ); if ( wm_client.desktop() == NETWinInfo::OnAllDesktops || wm_client.desktop() > 0 ) m_config->setDesktop( wm_client.desktop() ); @@ -489,7 +489,7 @@ void KNote::setName( const TQString& name ) saveData(); // set the window's name for the taskbar entry to be more helpful (#58338) - NETWinInfo note_win( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMDesktop ); + NETWinInfo note_win( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMDesktop ); note_win.setName( name.utf8() ); emit sigNameChanged(); @@ -758,7 +758,7 @@ void KNote::slotUpdateReadOnly() void KNote::slotClose() { - NETWinInfo wm_client( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMDesktop ); + NETWinInfo wm_client( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMDesktop ); if ( wm_client.desktop() == NETWinInfo::OnAllDesktops || wm_client.desktop() > 0 ) m_config->setDesktop( wm_client.desktop() ); @@ -977,8 +977,8 @@ void KNote::slotUpdateShowInTaskbar() void KNote::slotUpdateDesktopActions() { - NETRootInfo wm_root( qt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames ); - NETWinInfo wm_client( qt_xdisplay(), winId(), qt_xrootwin(), NET::WMDesktop ); + NETRootInfo wm_root( tqt_xdisplay(), NET::NumberOfDesktops | NET::DesktopNames ); + NETWinInfo wm_client( tqt_xdisplay(), winId(), tqt_xrootwin(), NET::WMDesktop ); TQStringList desktops; desktops.append( i18n("&All Desktops") ); @@ -1334,8 +1334,8 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) e->button() == Qt::LeftButton ? KWin::raiseWindow( winId() ) : KWin::lowerWindow( winId() ); - XUngrabPointer( qt_xdisplay(), GET_QT_X_TIME() ); - NETRootInfo wm_root( qt_xdisplay(), NET::WMMoveResize ); + XUngrabPointer( tqt_xdisplay(), GET_QT_X_TIME() ); + NETRootInfo wm_root( tqt_xdisplay(), NET::WMMoveResize ); wm_root.moveResizeRequest( winId(), e->globalX(), e->globalY(), NET::Move ); return true; } @@ -1343,7 +1343,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) #if KDE_IS_VERSION( 3, 5, 1 ) if ( ev->type() == TQEvent::MouseButtonRelease ) { - NETRootInfo wm_root( qt_xdisplay(), NET::WMMoveResize ); + NETRootInfo wm_root( tqt_xdisplay(), NET::WMMoveResize ); wm_root.moveResizeRequest( winId(), e->globalX(), e->globalY(), NET::MoveResizeCancel ); return false; } diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index e62c3f456..27c13ee50 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -102,7 +102,7 @@ KNotesApp::KNotesApp() m_noteActions.setAutoDelete( true ); // create the dock widget... - KWin::setSystemTrayWindowFor( winId(), qt_xrootwin() ); + KWin::setSystemTrayWindowFor( winId(), tqt_xrootwin() ); TQToolTip::add( this, i18n( "KNotes: Sticky notes for KDE" ) ); setBackgroundMode( X11ParentRelative ); setPixmap( KSystemTray::loadSizedIcon( "knotes", TQWidget::width() ) ); diff --git a/knotes/main.cpp b/knotes/main.cpp index bf38e4c71..a14d52acf 100644 --- a/knotes/main.cpp +++ b/knotes/main.cpp @@ -43,11 +43,11 @@ void remove_sm_from_client_leader() Atom atoms[ 2 ]; char *atom_names[ 2 ] = { (char*)"WM_CLIENT_LEADER", (char*)"SM_CLIENT_ID" }; - XInternAtoms( qt_xdisplay(), atom_names, 2, False, atoms ); + XInternAtoms( tqt_xdisplay(), atom_names, 2, False, atoms ); TQWidget w; KXErrorHandler handler; // ignore X errors - status = XGetWindowProperty( qt_xdisplay(), w.winId(), atoms[ 0 ], 0, 10000, + status = XGetWindowProperty( tqt_xdisplay(), w.winId(), atoms[ 0 ], 0, 10000, FALSE, XA_WINDOW, &type, &format, &nitems, &extra, &data ); @@ -56,7 +56,7 @@ void remove_sm_from_client_leader() if (data && nitems > 0) { Window leader = *((Window*) data); - XDeleteProperty( qt_xdisplay(), leader, atoms[ 1 ] ); + XDeleteProperty( tqt_xdisplay(), leader, atoms[ 1 ] ); } XFree(data); } |