Changeset 769 for trunk/src/corelib/codecs/qtextcodec.h

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/codecs/qtextcodec.h (modified) (2 diffs)

trunk/src/corelib/codecs/qtextcodec.h

@@ -146 +146 @@
     friend class QTextCodecCleanup;
     static QTextCodec *cftr;
+
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTextCodec::ConversionFlags)
 
-inline QTextCodec* QTextCodec::codecForTr() { return cftr; }
+; }
 inline void QTextCodec::setCodecForTr(QTextCodec *c) { cftr = c; }
-inline QTextCodec* QTextCodec::codecForCStrings() { return QString::codecForCStrings; }
+inline QTextCodec* QTextCodec::codecForCStrings() { return ; }
 inline void QTextCodec::setCodecForCStrings(QTextCodec *c) { QString::codecForCStrings = c; }
 
@@ -171 +172 @@
     friend class QXmlStreamWriter;
     friend class QXmlStreamWriterPrivate;
+
     friend class QCoreXmlStreamWriter;
     friend class QCoreXmlStreamWriterPrivate;
+
 };