diff options
Diffstat (limited to 'src/kernel/qmotifdnd_x11.cpp')
-rw-r--r-- | src/kernel/qmotifdnd_x11.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp index 0085b8956..fc97c3d68 100644 --- a/src/kernel/qmotifdnd_x11.cpp +++ b/src/kernel/qmotifdnd_x11.cpp @@ -597,12 +597,12 @@ static DndTargetsTable TargetsTable(Display *display) &type, &format, &size, &bytes_after, (unsigned char **) &target_prop) != Success) || type == None) { - qWarning("TQMotifDND: cannot get property on motif window"); + tqWarning("TQMotifDND: cannot get property on motif window"); return 0; } if (target_prop->protocol_version != DND_PROTOCOL_VERSION) { - qWarning("TQMotifDND: protocol mismatch"); + tqWarning("TQMotifDND: protocol mismatch"); } if (target_prop->byte_order != DndByteOrder()) { @@ -726,7 +726,7 @@ TQByteArray qt_motifdnd_obtain_data( const char *mimeType ) TQByteArray result; // try to convert the selection to the requested property - // qDebug( "trying to convert to '%s'", mimeType ); + // tqDebug( "trying to convert to '%s'", mimeType ); int n=0; const char* f; @@ -735,22 +735,22 @@ TQByteArray qt_motifdnd_obtain_data( const char *mimeType ) if ( !f ) return result; n++; - } while( qstricmp( mimeType, f ) ); + } while( tqstricmp( mimeType, f ) ); // found one Atom conversion_type; - if ( qstrnicmp( f, "text/", 5 ) == 0 ) { + if ( tqstrnicmp( f, "text/", 5 ) == 0 ) { // always convert text to XA_STRING for compatibility with // prior TQt versions conversion_type = XA_STRING; } else { conversion_type = *qt_xdnd_str_to_atom( f ); - // qDebug( "found format '%s' 0x%lx '%s'", f, conversion_type, + // tqDebug( "found format '%s' 0x%lx '%s'", f, conversion_type, // qt_xdnd_atom_to_str( conversion_type ) ); } - if ( XGetSelectionOwner( qt_xdisplay(), + if ( XGetSelectionOwner( tqt_xdisplay(), Dnd_selection ) == None ) { return result; // should never happen? } @@ -761,19 +761,19 @@ TQByteArray qt_motifdnd_obtain_data( const char *mimeType ) } // convert selection to the appropriate type - XConvertSelection (qt_xdisplay(), Dnd_selection, conversion_type, + XConvertSelection (tqt_xdisplay(), Dnd_selection, conversion_type, Dnd_selection, tw->winId(), Dnd_selection_time); - XFlush( qt_xdisplay() ); + XFlush( tqt_xdisplay() ); XEvent xevent; - bool got=qt_xclb_wait_for_event( qt_xdisplay(), + bool got=qt_xclb_wait_for_event( tqt_xdisplay(), tw->winId(), SelectionNotify, &xevent, 5000); if ( got ) { Atom type; - if ( qt_xclb_read_property( qt_xdisplay(), + if ( qt_xclb_read_property( tqt_xdisplay(), tw->winId(), Dnd_selection, TRUE, &result, 0, &type, 0, TRUE ) ) { @@ -781,11 +781,11 @@ TQByteArray qt_motifdnd_obtain_data( const char *mimeType ) } // we have to convert selection in order to indicate success to the initiator - XConvertSelection (qt_xdisplay(), Dnd_selection, Dnd_transfer_success, + XConvertSelection (tqt_xdisplay(), Dnd_selection, Dnd_transfer_success, Dnd_selection, tw->winId(), Dnd_selection_time); // wait again for SelectionNotify event - qt_xclb_wait_for_event( qt_xdisplay(), + qt_xclb_wait_for_event( tqt_xdisplay(), tw->winId(), SelectionNotify, &xevent, 5000); @@ -938,7 +938,7 @@ void qt_motifdnd_handle_msg( TQWidget * /* w */ , const XEvent * xe, bool /* pas case DND_DROP_START: if (!in_drop_site) { // we have to convert selection in order to indicate failure to the initiator - XConvertSelection (qt_xdisplay(), dnd_data.property, Dnd_transfer_failure, + XConvertSelection (tqt_xdisplay(), dnd_data.property, Dnd_transfer_failure, dnd_data.property, cur_window, dnd_data.time); TQDragLeaveEvent e; TQApplication::sendEvent( drop_widget, &e ); |