diff options
| author | Timothy Pearson <[email protected]> | 2012-03-06 20:38:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-06 20:38:40 -0600 |
| commit | eb1d1e0dec5720ace27395e290b7093cd68b150d (patch) | |
| tree | 04a199ef5ea853d86a6f9a44716c0874d41c20f6 /src/kernel/qclipboard_x11.cpp | |
| parent | ae8aba1e0f17943046e6bfa889b169f7fc41da0d (diff) | |
| download | tqt3-eb1d1e0dec5720ace27395e290b7093cd68b150d.tar.gz tqt3-eb1d1e0dec5720ace27395e290b7093cd68b150d.zip | |
Automated update from qt3
Diffstat (limited to 'src/kernel/qclipboard_x11.cpp')
| -rw-r--r-- | src/kernel/qclipboard_x11.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp index b80e86987..9fd48c589 100644 --- a/src/kernel/qclipboard_x11.cpp +++ b/src/kernel/qclipboard_x11.cpp @@ -91,7 +91,7 @@ extern Time tqt_x_time; // def. in qapplication_x11.cpp extern Time qt_x_incr; // def. in qapplication_x11.cpp extern Atom qt_xa_clipboard; extern Atom qt_selection_property; -extern Atom qt_clipboard_sentinel; +extern Atom tqt_clipboard_sentinel; extern Atom qt_selection_sentinel; extern Atom qt_utf8_string; @@ -244,7 +244,7 @@ static TQClipboardData *clipboardData() return internalCbData; } -void qt_clipboard_cleanup_mime_source(TQMimeSource *src) +void tqt_clipboard_cleanup_mime_source(TQMimeSource *src) { if(internalCbData && internalCbData->source() == src) internalCbData->clear(FALSE); @@ -1520,7 +1520,7 @@ void TQClipboard::setData( TQMimeSource* src, Mode mode ) case Clipboard: atom = qt_xa_clipboard; - sentinel_atom = qt_clipboard_sentinel; + sentinel_atom = tqt_clipboard_sentinel; d = clipboardData(); break; @@ -1644,7 +1644,7 @@ bool qt_check_clipboard_sentinel() if (XGetWindowProperty(TQPaintDevice::x11AppDisplay(), TQApplication::desktop()->screen(0)->winId(), - qt_clipboard_sentinel, 0, 2, False, XA_WINDOW, + tqt_clipboard_sentinel, 0, 2, False, XA_WINDOW, &actualType, &actualFormat, &nitems, &bytesLeft, (unsigned char **) &owners) == Success) { if (actualType == XA_WINDOW && actualFormat == 32 && nitems == 2) { |