Changeset 561 for trunk/src/qt3support/other/q3dragobject.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/qt3support/other/q3dragobject.cpp (modified) (9 diffs)

trunk/src/qt3support/other/q3dragobject.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt3Support module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -94 +94 @@
     void setSubType(const QString & st) {
         subtype = st;
-        fmt = QString(QLatin1String("text/")).toLatin1() + subtype.toLatin1();
+        fmt = "text/" + subtype.toLatin1();
     }
 
@@ -192 +192 @@
     platform-specific implementation will use this where it can - so
     provide a small masked pixmap, and do not assume that the user
-    will actually see it. For example, cursors on Windows 95 are of
-    limited size.
+    will actually see it.
 
     The \a hotspot is the point on (or off) the pixmap that should be
@@ -209 +208 @@
     d->pixmap = pm;
     d->hot = hotspot;
-#if 0
-    QDragManager *manager = QDragManager::self();
-    if (manager && manager->object == d->data)
-        manager->updatePixmap();
-#endif
 }
 
@@ -559 +553 @@
         if (i >= 0)
             cs = cs.left(i);
-        // win98 often has charset=utf16, and we need to get the correct codec for
-        // it to be able to get Unicode text drops.
-        if (cs == "utf16")
-            cs = "ISO-10646-UCS-2";
         // May return 0 if unknown charset
         return QTextCodec::codecForName(cs);
@@ -1303 +1293 @@
     }
 #endif
-    return unicodeUriToUri(QString(QLatin1String("file://") + r));
+    return unicodeUriToUri(QLatin1String("file://") + r);
 }
 
@@ -1358 +1348 @@
     if (0==qstrnicmp(uri,"file:/",6)) // It is a local file uri
         uri += 6;
-    else if (QString(QLatin1String(uri)).indexOf(QLatin1String(":/")) != -1) // It is a different scheme uri
+    else if (QString::fromLatin1(uri).indexOf(QLatin1String(":/")) != -1) // It is a different scheme uri
         return file;