diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-04 23:29:40 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-04 23:29:40 -0500 |
| commit | 6e8d2d256bf19fd906e2caad3e54f107733464bb (patch) | |
| tree | 8abcb4c13d98109ecb7e79df0a345535a674350a | |
| parent | 48f56c435242b2e7049aa0a54d9ba7b8d5ef9de5 (diff) | |
| download | tqt3-6e8d2d256bf19fd906e2caad3e54f107733464bb.tar.gz tqt3-6e8d2d256bf19fd906e2caad3e54f107733464bb.zip | |
Automated update from Qt3
| -rw-r--r-- | src/kernel/qclipboard_x11.cpp | 15 | ||||
| -rw-r--r-- | src/kernel/qmime.cpp | 3 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp index 9fd48c589..4a16e6da4 100644 --- a/src/kernel/qclipboard_x11.cpp +++ b/src/kernel/qclipboard_x11.cpp @@ -166,7 +166,7 @@ public: TQByteArray getDataInFormat(Atom fmtatom) const; Atom atom; - TQValueList<const char *> formatList; + mutable TQValueList<const char *> formatList; }; @@ -1304,7 +1304,6 @@ const char* TQClipboardWatcher::format( int n ) const // server round trips... static Atom xa_targets = *qt_xdnd_str_to_atom( "TARGETS" ); - TQClipboardWatcher *that = (TQClipboardWatcher *) this; TQByteArray ba = getDataInFormat(xa_targets); if (ba.size() > 0) { Atom *unsorted_target = (Atom *) ba.data(); @@ -1337,21 +1336,21 @@ const char* TQClipboardWatcher::format( int n ) const VTQDEBUG(" format: %s", qt_xdnd_atom_to_str(target[i])); if ( target[i] == XA_PIXMAP ) - that->formatList.append("image/ppm"); + formatList.append("image/ppm"); else if ( target[i] == XA_STRING ) - that->formatList.append( "text/plain;charset=ISO-8859-1" ); + formatList.append( "text/plain;charset=ISO-8859-1" ); else if ( target[i] == qt_utf8_string ) - that->formatList.append( "text/plain;charset=UTF-8" ); + formatList.append( "text/plain;charset=UTF-8" ); else if ( target[i] == xa_text || target[i] == xa_compound_text ) - that->formatList.append( "text/plain" ); + formatList.append( "text/plain" ); else - that->formatList.append(qt_xdnd_atom_to_str(target[i])); + formatList.append(qt_xdnd_atom_to_str(target[i])); } delete []target; TQDEBUG("TQClipboardWatcher::format: %d formats available", - int(that->formatList.count())); + int(formatList.count())); } } diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp index 8b962a642..22857f3e0 100644 --- a/src/kernel/qmime.cpp +++ b/src/kernel/qmime.cpp @@ -139,8 +139,9 @@ bool TQMimeSource::provides(const char* mimeType) const { const char* fmt; for (int i=0; (fmt = format(i)); i++) { - if ( !tqstricmp(mimeType,fmt) ) + if ( !tqstricmp(mimeType,fmt) ) { return TRUE; + } } return FALSE; } |