diff options
| author | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
| commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
| tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/kernel/qdragobject.cpp | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip | |
Undo prior accidental commit
Diffstat (limited to 'src/kernel/qdragobject.cpp')
| -rw-r--r-- | src/kernel/qdragobject.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp index 71ee26f..44e340f 100644 --- a/src/kernel/qdragobject.cpp +++ b/src/kernel/qdragobject.cpp @@ -814,7 +814,7 @@ QTextCodec* findcodec(const QMimeSource* e) const char* f; int i; for ( i=0; (f=e->format(i)); i++ ) { - bool html = !tqstrnicmp(f, "text/html", 9); + bool html = !qstrnicmp(f, "text/html", 9); if (html) r = codecForHTML(QCString(e->encodedData(f))); if (!r) @@ -833,7 +833,7 @@ QTextCodec* findcodec(const QMimeSource* e) QByteArray QTextDrag::encodedData(const char* mime) const { QCString r; - if ( 0==tqstrnicmp(mime,"text/",5) ) { + if ( 0==qstrnicmp(mime,"text/",5) ) { QCString m(mime); m = m.lower(); QTextCodec *codec = qt_findcharset(m); @@ -872,7 +872,7 @@ bool QTextDrag::canDecode( const QMimeSource* e ) { const char* f; for (int i=0; (f=e->format(i)); i++) { - if ( 0==tqstrnicmp(f,"text/",5) ) { + if ( 0==qstrnicmp(f,"text/",5) ) { return findcodec(e) != 0; } } @@ -912,7 +912,7 @@ bool QTextDrag::decode( const QMimeSource* e, QString& str, QCString& subtype ) const char* mime; for (int i=0; (mime = e->format(i)); i++) { - if ( 0==tqstrnicmp(mime,"text/",5) ) { + if ( 0==qstrnicmp(mime,"text/",5) ) { QCString m(mime); m = m.lower(); int semi = m.find(';'); @@ -920,7 +920,7 @@ bool QTextDrag::decode( const QMimeSource* e, QString& str, QCString& subtype ) semi = m.length(); QCString foundst = m.mid(5,semi-5); if ( subtype.isNull() || foundst == subtype ) { - bool html = !tqstrnicmp(mime, "text/html", 9); + bool html = !qstrnicmp(mime, "text/html", 9); QTextCodec* codec = 0; if (html) { QByteArray bytes = e->encodedData(mime); @@ -1087,7 +1087,7 @@ const char * QImageDrag::format(int i) const */ QByteArray QImageDrag::encodedData(const char* fmt) const { - if ( tqstrnicmp( fmt, "image/", 6 )==0 ) { + if ( qstrnicmp( fmt, "image/", 6 )==0 ) { QCString f = fmt+6; QByteArray data; QBuffer w( data ); @@ -1233,7 +1233,7 @@ QStoredDrag::QStoredDrag( const char* mimeType, QWidget * dragSource, const char QDragObject(dragSource,name) { d = new QStoredDragData(); - d->fmt = tqstrdup(mimeType); + d->fmt = qstrdup(mimeType); } /*! @@ -1278,7 +1278,7 @@ void QStoredDrag::setEncodedData( const QByteArray & encodedData ) */ QByteArray QStoredDrag::encodedData(const char* m) const { - if ( !tqstricmp(m,d->fmt) ) + if ( !qstricmp(m,d->fmt) ) return d->enc; else return QByteArray(); @@ -1588,7 +1588,7 @@ QString QUriDrag::uriToLocalFile(const char* uri) if (!uri) return file; - if (0==tqstrnicmp(uri,"file:/",6)) // It is a local file uri + if (0==qstrnicmp(uri,"file:/",6)) // It is a local file uri uri += 6; else if (QString(uri).find(":/") != -1) // It is a different scheme uri return file; |