diff options
Diffstat (limited to 'doc/porting2.doc')
| -rw-r--r-- | doc/porting2.doc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/porting2.doc b/doc/porting2.doc index 3d0fb0521..26ff61b59 100644 --- a/doc/porting2.doc +++ b/doc/porting2.doc @@ -149,7 +149,7 @@ that is the Qt Developer Community! <p> Qt 2.x is namespace-clean, unlike 1.x. Qt now uses very few global identifiers. Identifiers like <code>red, blue, LeftButton, AlignRight, Key_Up, Key_Down, NoBrush</code> etc. are now part of a -special class <code>Qt</code> (defined in qnamespace.h), +special class <code>Qt</code> (defined in ntqnamespace.h), which is inherited by most Qt classes. Member functions of classes that inherit from QWidget, etc. are totally unaffected, but code that is @@ -226,7 +226,7 @@ classes such as QGDict, QGList, and the subclasses such as QDict and QList. <p> The macro-based Qt collection classes are obsolete; use the -template-based classes instead. Simply remove includes of qgeneric.h and +template-based classes instead. Simply remove includes of ntqgeneric.h and replace e.g. Q_DECLARE(QCache,QPixmap) with QCache<QPixmap>. <p> The GCI global typedef is replaced by QCollection::Item. Only if you @@ -1023,7 +1023,7 @@ removed. If you used it, do a global search-and-replace of the word <h3><a name="QEvent">QEvent</a></h3> -<p> The global #define macros in qevent.h have been replaced by an +<p> The global #define macros in ntqevent.h have been replaced by an enum in QEvent. Use e.g. QEvent::Paint instead of Event_Paint. Same for all of: Event_None, @@ -1063,7 +1063,7 @@ Event_DeactivateControl, and Event_User. -<p> The Q_*_EVENT macros in qevent.h have been deleted. Use an +<p> The Q_*_EVENT macros in ntqevent.h have been deleted. Use an explicit cast instead. The macros were: Q_TIMER_EVENT, Q_MOUSE_EVENT, |