From 891a448afad4ab1f09bfb0cfee71652975bd7687 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 5 Mar 2015 11:56:10 -0600 Subject: [PATCH] Automated update from Qt3 --- doc/html/assistant.dcf | 10 +- doc/html/designer.dcf | 6 +- doc/html/qt.dcf | 2592 +++++++++++++++++++-------------------- include/ntqiconview.h | 2 +- src/kernel/ntqstyle.h | 6 +- src/moc/moc_yacc.cpp | 871 ++++++------- src/moc/moc_yacc.h | 14 +- src/tools/qsettings.cpp | 4 +- src/tools/qstring.cpp | 132 +- 9 files changed, 1842 insertions(+), 1795 deletions(-) diff --git a/doc/html/assistant.dcf b/doc/html/assistant.dcf index 7a2efb70..b23ea366 100644 --- a/doc/html/assistant.dcf +++ b/doc/html/assistant.dcf @@ -1,9 +1,9 @@ - +
-
-
-
+
+
+
-
+
diff --git a/doc/html/designer.dcf b/doc/html/designer.dcf index 915550ea..33eac264 100644 --- a/doc/html/designer.dcf +++ b/doc/html/designer.dcf @@ -1,14 +1,14 @@ - +
-
+
-
+
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf index 6265649f..ae3f5122 100644 --- a/doc/html/qt.dcf +++ b/doc/html/qt.dcf @@ -1,7 +1,7 @@ - -
- TQAccel + +
+ QAccel activated activatedAmbiguously clear @@ -19,12 +19,12 @@ setWhatsThis shortcutKey whatsThis - ~TQAccel + ~QAccel
-
- TQAccessible +
+ QAccessible Event NavDirection Role @@ -36,8 +36,8 @@
-
- TQAccessibleInterface +
+ QAccessibleInterface childCount clearSelection controlAt @@ -57,15 +57,15 @@
-
- TQAccessibleObject +
+ QAccessibleObject object - ~TQAccessibleObject + ~QAccessibleObject
-
- TQAction +
+ QAction accel accel activate @@ -110,12 +110,12 @@ visible whatsThis whatsThis - ~TQAction + ~QAction
-
- TQActionGroup +
+ QActionGroup add addSeparator addTo @@ -126,12 +126,12 @@ setUsesDropDown usesDropDown usesDropDown - ~TQActionGroup + ~QActionGroup
-
- TQApplication +
+ QApplication ColorSpec Encoding Type @@ -235,8 +235,8 @@ winFocus x11EventFilter x11ProcessEvent - ~TQApplication - TQ_ASSERT + ~QApplication + Q_ASSERT TQ_CHECK_PTR tqAddPostRoutine tqDebug @@ -249,8 +249,8 @@
-
- TQAsciiCache +
+ QAsciiCache clear count find @@ -264,12 +264,12 @@ statistics take totalCost - ~TQAsciiCache + ~QAsciiCache
-
- TQAsciiCacheIterator +
+ QAsciiCacheIterator atFirst atLast count @@ -288,8 +288,8 @@
-
- TQAsciiDict +
+ QAsciiDict clear count find @@ -305,12 +305,12 @@ statistics take write - ~TQAsciiDict + ~QAsciiDict
-
- TQAsciiDictIterator +
+ QAsciiDictIterator count current currentKey @@ -320,12 +320,12 @@ operator++ operator+= toFirst - ~TQAsciiDictIterator + ~QAsciiDictIterator
-
- TQAssistantClient +
+ QAssistantClient assistantClosed assistantOpened closeAssistant @@ -335,19 +335,19 @@ openAssistant setArguments showPage - ~TQAssistantClient + ~QAssistantClient
-
+
connect ready - ~TQAsyncIO + ~QAsyncIO
-
- TQAxAggregated +
+ QAxAggregated controllingUnknown object queryInterface @@ -355,8 +355,8 @@
-
- TQAxBase +
+ QAxBase PropertyBag asVariant clear @@ -382,23 +382,23 @@ setPropertyBag setPropertyWritable signal - ~TQAxBase + ~QAxBase
-
- TQAxBindable +
+ QAxBindable clientSite createAggregate propertyChanged reportError requestPropertyChange - ~TQAxBindable + ~QAxBindable
-
- TQAxFactory +
+ QAxFactory ServerType appID classID @@ -422,18 +422,18 @@ typeLibID unregisterClass validateLicenseKey - ~TQAxFactory + ~QAxFactory
-
- TQAxObject - ~TQAxObject +
+ QAxObject + ~QAxObject
-
- TQAxScript +
+ QAxScript FunctionFlags call entered @@ -445,12 +445,12 @@ scriptEngine scriptName stateChanged - ~TQAxScript + ~QAxScript
-
- TQAxScriptEngine +
+ QAxScriptEngine State addItem hasIntrospection @@ -459,12 +459,12 @@ scriptLanguage setState state - ~TQAxScriptEngine + ~QAxScriptEngine
-
- TQAxScriptManager +
+ QAxScriptManager addObject call error @@ -474,30 +474,30 @@ script scriptFileFilter scriptNames - ~TQAxScriptManager + ~QAxScriptManager
-
- TQAxWidget +
+ QAxWidget createHostWindow translateKeyEvent - ~TQAxWidget + ~QAxWidget
-
- TQBig5Codec +
+ QBig5Codec
-
- TQBig5hkscsCodec +
+ QBig5hkscsCodec
-
- TQBitArray +
+ QBitArray at clearBit copy @@ -523,22 +523,22 @@
-
- TQBitmap +
+ QBitmap operator= xForm
-
- TQBitVal +
+ QBitVal operator int operator=
-
- TQBoxLayout +
+ QBoxLayout Direction addItem addLayout @@ -563,12 +563,12 @@ setGeometry setStretchFactor sizeHint - ~TQBoxLayout + ~QBoxLayout
-
- TQBrush +
+ QBrush color copy detach @@ -580,23 +580,23 @@ setPixmap setStyle style - ~TQBrush + ~QBrush operator<< operator>>
-
- TQBuffer +
+ QBuffer buffer setBuffer writeBlock - ~TQBuffer + ~QBuffer
-
- TQButton +
+ QButton ToggleState ToggleType accel @@ -642,12 +642,12 @@ toggleType toggleType toggled - ~TQButton + ~QButton
-
- TQButtonGroup +
+ QButtonGroup clicked count exclusive @@ -671,15 +671,15 @@
-
- TQByteArray +
+ QByteArray tqCompress tqUncompress
-
- TQCache +
+ QCache clear count find @@ -693,12 +693,12 @@ statistics take totalCost - ~TQCache + ~QCache
-
- TQCacheIterator +
+ QCacheIterator atFirst atLast count @@ -717,8 +717,8 @@
-
- TQCanvas +
+ QCanvas advance allItems backgroundColor @@ -753,12 +753,12 @@ update validChunk width - ~TQCanvas + ~QCanvas
-
- TQCanvasEllipse +
+ QCanvasEllipse angleLength angleStart drawShape @@ -767,12 +767,12 @@ setAngles setSize width - ~TQCanvasEllipse + ~QCanvasEllipse
-
- TQCanvasItem +
+ QCanvasItem RttiValues advance animated @@ -809,60 +809,60 @@ y yVelocity z - ~TQCanvasItem + ~QCanvasItem
-
- TQCanvasItemList +
+ QCanvasItemList operator+
-
- TQCanvasLine +
+ QCanvasLine endPoint rtti setPoints startPoint - ~TQCanvasLine + ~QCanvasLine
-
- TQCanvasPixmap +
+ QCanvasPixmap offsetX offsetY setOffset - ~TQCanvasPixmap + ~QCanvasPixmap
-
- TQCanvasPixmapArray +
+ QCanvasPixmapArray count image isValid readCollisionMasks readPixmaps setImage - ~TQCanvasPixmapArray + ~QCanvasPixmapArray
-
- TQCanvasPolygon +
+ QCanvasPolygon areaPoints drawShape points rtti setPoints - ~TQCanvasPolygon + ~QCanvasPolygon
-
- TQCanvasPolygonalItem +
+ QCanvasPolygonalItem areaPoints areaPointsAdvanced boundingRect @@ -877,12 +877,12 @@ setPen setWinding winding - ~TQCanvasPolygonalItem + ~QCanvasPolygonalItem
-
- TQCanvasRectangle +
+ QCanvasRectangle chunks drawShape height @@ -891,22 +891,22 @@ setSize size width - ~TQCanvasRectangle + ~QCanvasRectangle
-
- TQCanvasSpline +
+ QCanvasSpline closed controlPoints rtti setControlPoints - ~TQCanvasSpline + ~QCanvasSpline
-
- TQCanvasSprite +
+ QCanvasSprite FrameAnimationType advance bottomEdge @@ -927,12 +927,12 @@ setSequence topEdge width - ~TQCanvasSprite + ~QCanvasSprite
-
- TQCanvasText +
+ QCanvasText addToChunks boundingRect color @@ -946,12 +946,12 @@ setTextFlags text textFlags - ~TQCanvasText + ~QCanvasText
-
- TQCanvasView +
+ QCanvasView canvas drawContents inverseWorldMatrix @@ -959,18 +959,18 @@ setWorldMatrix sizeHint worldMatrix - ~TQCanvasView + ~QCanvasView
-
- TQCDEStyle - ~TQCDEStyle +
+ QCDEStyle + ~QCDEStyle
-
- TQChar +
+ QChar Category CombiningClass Decomposition @@ -1011,13 +1011,13 @@
-
- TQCharRef +
+ QCharRef
-
- TQCheckBox +
+ QCheckBox autoMask checked isChecked @@ -1029,8 +1029,8 @@
-
- TQCheckListItem +
+ QCheckListItem ToggleState Type activate @@ -1047,28 +1047,28 @@ text turnOffChild type - ~TQCheckListItem + ~QCheckListItem
-
- TQCheckTableItem +
+ QCheckTableItem isChecked rtti setChecked
-
- TQChildEvent +
+ QChildEvent child inserted removed
-
- TQClipboard +
+ QClipboard Mode clear data @@ -1087,16 +1087,16 @@
-
- TQCloseEvent +
+ QCloseEvent accept ignore isAccepted
-
- TQColor +
+ QColor Spec alloc blue @@ -1138,8 +1138,8 @@
-
- TQColorDialog +
+ QColorDialog color customColor customCount @@ -1151,20 +1151,20 @@ setCustomColor setSelectedAlpha setStandardColor - ~TQColorDialog + ~QColorDialog
-
- TQColorDrag +
+ QColorDrag canDecode decode setColor
-
- TQColorGroup +
+ QColorGroup ColorRole background base @@ -1189,13 +1189,13 @@ setColor shadow text - ~TQColorGroup + ~QColorGroup operator<<
-
- TQComboBox +
+ QComboBox Policy activated autoCompletion @@ -1249,12 +1249,12 @@ text textChanged validator - ~TQComboBox + ~QComboBox
-
- TQComboTableItem +
+ QComboTableItem count currentItem currentText @@ -1264,24 +1264,24 @@ setEditable setStringList text - ~TQComboTableItem + ~QComboTableItem
-
- TQCommonStyle +
+ QCommonStyle
-
- TQConstString +
+ QConstString string - ~TQConstString + ~QConstString
-
- TQContextMenuEvent +
+ QContextMenuEvent Reason accept consume @@ -1299,19 +1299,19 @@
-
- TQCopChannel +
+ QCopChannel channel isRegistered receive received send - ~TQCopChannel + ~QCopChannel
-
- TQCString +
+ QCString append contains copy @@ -1372,8 +1372,8 @@
-
- TQCursor +
+ QCursor bitmap cleanup handle @@ -1385,32 +1385,32 @@ setPos setShape shape - ~TQCursor + ~QCursor operator<< operator>>
-
- TQCustomEvent +
+ QCustomEvent data setData
-
- TQCustomMenuItem +
+ QCustomMenuItem fullSpan isSeparator paint setFont sizeHint - ~TQCustomMenuItem + ~QCustomMenuItem
-
- TQDataBrowser +
+ QDataBrowser Boundary autoEdit autoEdit @@ -1479,15 +1479,15 @@ updateBoundary updateCurrent writeFields - ~TQDataBrowser + ~QDataBrowser
-
+
-
+
eof maybeReady readyToReceive @@ -1495,7 +1495,7 @@
-
+
enableRewind maybeReady readyToSend @@ -1505,8 +1505,8 @@
-
- TQDataStream +
+ QDataStream ByteOrder atEnd byteOrder @@ -1524,12 +1524,12 @@ version writeBytes writeRawBytes - ~TQDataStream + ~QDataStream
-
- TQDataTable +
+ QDataTable Refresh addColumn adjustColumn @@ -1611,12 +1611,12 @@ trueText updateCurrent value - ~TQDataTable + ~QDataTable
-
- TQDataView +
+ QDataView clearValues form readFields @@ -1625,12 +1625,12 @@ setForm setRecord writeFields - ~TQDataView + ~QDataView
-
- TQDate +
+ QDate addDays addMonths addYears @@ -1665,8 +1665,8 @@
-
- TQDateEdit +
+ QDateEdit Order autoAdvance autoAdvance @@ -1695,12 +1695,12 @@ setYear updateButtons valueChanged - ~TQDateEdit + ~QDateEdit
-
- TQDateTime +
+ QDateTime addDays addMonths addSecs @@ -1729,8 +1729,8 @@
-
- TQDateTimeEdit +
+ QDateTimeEdit autoAdvance dateEdit dateTime @@ -1739,24 +1739,24 @@ setDateTime timeEdit valueChanged - ~TQDateTimeEdit + ~QDateTimeEdit
-
- TQDateTimeEditBase +
+ QDateTimeEditBase
-
- TQDeepCopy +
+ QDeepCopy operator T operator=
-
- TQDesktopWidget +
+ QDesktopWidget availableGeometry isVirtualDesktop numScreens @@ -1765,12 +1765,12 @@ screen screenGeometry screenNumber - ~TQDesktopWidget + ~QDesktopWidget
-
- TQDial +
+ QDial addLine addPage dialMoved @@ -1811,12 +1811,12 @@ valueChanged wrapping wrapping - ~TQDial + ~QDial
-
- TQDialog +
+ QDialog DialogCode accept done @@ -1836,12 +1836,12 @@ show showExtension sizeGripEnabled - ~TQDialog + ~QDialog
-
- TQDict +
+ QDict clear count find @@ -1857,12 +1857,12 @@ statistics take write - ~TQDict + ~QDict
-
- TQDictIterator +
+ QDictIterator count current currentKey @@ -1871,12 +1871,12 @@ operator() operator++ toFirst - ~TQDictIterator + ~QDictIterator
-
- TQDir +
+ QDir FilterSpec SortSpec absFilePath @@ -1926,12 +1926,12 @@ setPath setSorting sorting - ~TQDir + ~QDir
-
- TQDirectPainter +
+ QDirectPainter depth frameBuffer height @@ -1946,12 +1946,12 @@ width xOffset yOffset - ~TQDirectPainter + ~QDirectPainter
-
- TQDns +
+ QDns RecordType addresses canonicalName @@ -1967,12 +1967,12 @@ setRecordType setStartQueryTimer texts - ~TQDns + ~QDns
-
- TQDockArea +
+ QDockArea HandlePosition count count @@ -1989,14 +1989,14 @@ orientation removeDockWindow setAcceptDockWindow - ~TQDockArea + ~QDockArea operator<< operator>>
-
- TQDockWindow +
+ QDockWindow CloseMode Place area @@ -2044,8 +2044,8 @@
-
- TQDomAttr +
+ QDomAttr isAttr name nodeType @@ -2054,21 +2054,21 @@ setValue specified value - ~TQDomAttr + ~QDomAttr
-
- TQDomCDATASection +
+ QDomCDATASection isCDATASection nodeType operator= - ~TQDomCDATASection + ~QDomCDATASection
-
- TQDomCharacterData +
+ QDomCharacterData appendData data deleteData @@ -2080,21 +2080,21 @@ replaceData setData substringData - ~TQDomCharacterData + ~QDomCharacterData
-
- TQDomComment +
+ QDomComment isComment nodeType operator= - ~TQDomComment + ~QDomComment
-
- TQDomDocument +
+ QDomDocument createAttribute createAttributeNS createCDATASection @@ -2118,21 +2118,21 @@ setContent toCString toString - ~TQDomDocument + ~QDomDocument
-
- TQDomDocumentFragment +
+ QDomDocumentFragment isDocumentFragment nodeType operator= - ~TQDomDocumentFragment + ~QDomDocumentFragment
-
- TQDomDocumentType +
+ QDomDocumentType entities internalSubset isDocumentType @@ -2142,12 +2142,12 @@ operator= publicId systemId - ~TQDomDocumentType + ~QDomDocumentType
-
- TQDomElement +
+ QDomElement attribute attributeNS attributeNode @@ -2170,33 +2170,33 @@ setTagName tagName text - ~TQDomElement + ~QDomElement
-
- TQDomEntity +
+ QDomEntity isEntity nodeType notationName operator= publicId systemId - ~TQDomEntity + ~QDomEntity
-
- TQDomEntityReference +
+ QDomEntityReference isEntityReference nodeType operator= - ~TQDomEntityReference + ~QDomEntityReference
-
- TQDomImplementation +
+ QDomImplementation createDocument createDocumentType hasFeature @@ -2204,12 +2204,12 @@ operator!= operator= operator== - ~TQDomImplementation + ~QDomImplementation
-
- TQDomNamedNodeMap +
+ QDomNamedNodeMap contains count item @@ -2223,12 +2223,12 @@ removeNamedItemNS setNamedItem setNamedItemNS - ~TQDomNamedNodeMap + ~QDomNamedNodeMap
-
- TQDomNode +
+ QDomNode NodeType appendChild attributes @@ -2289,58 +2289,58 @@ toNotation toProcessingInstruction toText - ~TQDomNode + ~QDomNode operator<<
-
- TQDomNodeList +
+ QDomNodeList count item length operator!= operator= operator== - ~TQDomNodeList + ~QDomNodeList
-
- TQDomNotation +
+ QDomNotation isNotation nodeType operator= publicId systemId - ~TQDomNotation + ~QDomNotation
-
- TQDomProcessingInstruction +
+ QDomProcessingInstruction data isProcessingInstruction nodeType operator= setData target - ~TQDomProcessingInstruction + ~QDomProcessingInstruction
-
- TQDomText +
+ QDomText isText nodeType operator= splitText - ~TQDomText + ~QDomText
-
- TQDoubleValidator +
+ QDoubleValidator bottom bottom decimals @@ -2352,30 +2352,30 @@ top top validate - ~TQDoubleValidator + ~QDoubleValidator
-
- TQDragEnterEvent +
+ QDragEnterEvent
-
- TQDragLeaveEvent +
+ QDragLeaveEvent
-
- TQDragMoveEvent +
+ QDragMoveEvent accept answerRect ignore
-
- TQDragObject +
+ QDragObject DragMode drag dragCopy @@ -2386,12 +2386,12 @@ setPixmap source target - ~TQDragObject + ~QDragObject
-
- TQDropEvent +
+ QDropEvent Action accept acceptAction @@ -2409,53 +2409,53 @@
-
- ~TQDropSite +
+ ~QDropSite
-
- TQEditorFactory +
+ QEditorFactory createEditor defaultFactory installDefaultFactory - ~TQEditorFactory + ~QEditorFactory
-
- TQErrorMessage +
+ QErrorMessage message qtHandler - ~TQErrorMessage + ~QErrorMessage
-
- TQEucJpCodec +
+ QEucJpCodec mibEnum mimeName - ~TQEucJpCodec + ~QEucJpCodec
-
- TQEucKrCodec +
+ QEucKrCodec mimeName
-
- TQEvent +
+ QEvent Type spontaneous type - ~TQEvent + ~QEvent
-
- TQEventLoop +
+ QEventLoop ProcessEvents ProcessEventsFlags aboutToBlock @@ -2474,12 +2474,12 @@ timeToWait unregisterSocketNotifier wakeUp - ~TQEventLoop + ~QEventLoop
-
- TQFile +
+ QFile DecoderFn EncoderFn at @@ -2504,12 +2504,12 @@ size ungetch writeBlock - ~TQFile + ~QFile
-
- TQFileDialog +
+ QFileDialog Mode PreviewMode ViewMode @@ -2575,18 +2575,18 @@ url viewMode viewMode - ~TQFileDialog + ~QFileDialog
-
- TQFileIconProvider +
+ QFileIconProvider pixmap
-
- TQFileInfo +
+ QFileInfo PermissionSpec absFilePath baseName @@ -2620,18 +2620,18 @@ setCaching setFile size - ~TQFileInfo + ~QFileInfo
-
- TQFilePreview +
+ QFilePreview previewUrl
-
- TQFocusData +
+ QFocusData count first focusWidget @@ -2642,8 +2642,8 @@
-
- TQFocusEvent +
+ QFocusEvent Reason gotFocus lostFocus @@ -2653,8 +2653,8 @@
-
- TQFont +
+ QFont Script Stretch StyleHint @@ -2714,14 +2714,14 @@ toString underline weight - ~TQFont + ~QFont operator<< operator>>
-
- TQFontDatabase +
+ QFontDatabase bold families font @@ -2741,14 +2741,14 @@
-
- TQFontDialog +
+ QFontDialog getFont
-
- TQFontInfo +
+ QFontInfo bold exactMatch family @@ -2760,21 +2760,21 @@ rawMode styleHint weight - ~TQFontInfo + ~QFontInfo
-
- TQFontManager +
+ QFontManager cleanup get initialize - ~TQFontManager + ~QFontManager
-
- TQFontMetrics +
+ QFontMetrics ascent boundingRect charWidth @@ -2795,12 +2795,12 @@ strikeOutPos underlinePos width - ~TQFontMetrics + ~QFontMetrics
-
- TQFrame +
+ QFrame Shadow Shape contentsRect @@ -2835,8 +2835,8 @@
-
- TQFtp +
+ QFtp Command Error State @@ -2872,57 +2872,57 @@ rmdir state stateChanged - ~TQFtp + ~QFtp
-
- TQGb18030Codec +
+ QGb18030Codec
-
- TQGb2312Codec +
+ QGb2312Codec
-
- TQGbkCodec +
+ QGbkCodec
-
- TQGfxDriverFactory +
+ QGfxDriverFactory create keys
-
- TQGfxDriverPlugin +
+ QGfxDriverPlugin create keys - ~TQGfxDriverPlugin + ~QGfxDriverPlugin
-
- TQGL +
+ QGL FormatOption
-
- TQGLayoutIterator +
+ QGLayoutIterator current next takeCurrent - ~TQGLayoutIterator + ~QGLayoutIterator
-
- TQGLColormap +
+ QGLColormap detach entryColor entryRgb @@ -2933,12 +2933,12 @@ setEntries setEntry size - ~TQGLColormap + ~QGLColormap
-
- TQGLContext +
+ QGLContext chooseContext chooseMacVisual choosePixelFormat @@ -2962,12 +2962,12 @@ setWindowCreated swapBuffers windowCreated - ~TQGLContext + ~QGLContext
-
- TQGLFormat +
+ QGLFormat accum alpha defaultFormat @@ -2999,8 +2999,8 @@
-
- TQGLWidget +
+ QGLWidget autoBufferSwap colormap context @@ -3033,18 +3033,18 @@ swapBuffers updateGL updateOverlayGL - ~TQGLWidget + ~QGLWidget
-
- TQGrid +
+ QGrid setSpacing
-
- TQGridLayout +
+ QGridLayout Corner add addItem @@ -3077,12 +3077,12 @@ setRowSpacing setRowStretch sizeHint - ~TQGridLayout + ~QGridLayout
-
- TQGridView +
+ QGridView cellGeometry cellHeight cellHeight @@ -3106,12 +3106,12 @@ setNumCols setNumRows updateCell - ~TQGridView + ~QGridView
-
- TQGroupBox +
+ QGroupBox addSpace alignment alignment @@ -3140,12 +3140,12 @@ title title toggled - ~TQGroupBox + ~QGroupBox
-
- TQGuardedPtr +
+ QGuardedPtr isNull operator T * operator!= @@ -3153,31 +3153,31 @@ operator-> operator= operator== - ~TQGuardedPtr + ~QGuardedPtr
-
- TQHBox +
+ QHBox setSpacing setStretchFactor
-
- TQHBoxLayout - ~TQHBoxLayout +
+ QHBoxLayout + ~QHBoxLayout
-
- TQHButtonGroup - ~TQHButtonGroup +
+ QHButtonGroup + ~QHButtonGroup
-
- TQHeader +
+ QHeader addLabel adjustHeaderSize clicked @@ -3228,30 +3228,30 @@ stretching tracking tracking - ~TQHeader + ~QHeader
-
- TQHebrewCodec +
+ QHebrewCodec fromUnicode mimeName
-
- TQHGroupBox - ~TQHGroupBox +
+ QHGroupBox + ~QHGroupBox
-
- TQHideEvent +
+ QHideEvent
-
- TQHostAddress +
+ QHostAddress isIPv4Address isIPv6Address isNull @@ -3261,12 +3261,12 @@ toIPv4Address toIPv6Address toString - ~TQHostAddress + ~QHostAddress
-
- TQHttp +
+ QHttp Error State abort @@ -3296,12 +3296,12 @@ setHost state stateChanged - ~TQHttp + ~QHttp
-
- TQHttpHeader +
+ QHttpHeader contentLength contentType hasContentLength @@ -3318,12 +3318,12 @@ setValue toString value - ~TQHttpHeader + ~QHttpHeader
-
- TQHttpRequestHeader +
+ QHttpRequestHeader majorVersion method minorVersion @@ -3332,8 +3332,8 @@
-
- TQHttpResponseHeader +
+ QHttpResponseHeader majorVersion minorVersion reasonPhrase @@ -3342,44 +3342,44 @@
-
- TQIconDrag +
+ QIconDrag append canDecode encodedData - ~TQIconDrag + ~QIconDrag
-
- TQIconDragEvent +
+ QIconDragEvent accept ignore isAccepted
-
- TQIconDragItem +
+ QIconDragItem data setData - ~TQIconDragItem + ~QIconDragItem
-
- TQIconFactory +
+ QIconFactory autoDelete createPixmap defaultFactory installDefaultFactory setAutoDelete - ~TQIconFactory + ~QIconFactory
-
- TQIconSet +
+ QIconSet Mode Size State @@ -3396,12 +3396,12 @@ reset setIconSize setPixmap - ~TQIconSet + ~QIconSet
-
- TQIconView +
+ QIconView Arrangement ItemTextPos ResizeMode @@ -3504,12 +3504,12 @@ takeItem wordWrapIconText wordWrapIconText - ~TQIconView + ~QIconView
-
- TQIconViewItem +
+ QIconViewItem acceptDrop calcRect cancelRenameItem @@ -3563,12 +3563,12 @@ width x y - ~TQIconViewItem + ~QIconViewItem
-
- TQImage +
+ QImage Endian ScaleMode allGray @@ -3639,15 +3639,15 @@ valid width xForm - ~TQImage + ~QImage bitBlt operator<< operator>>
-
- TQImageConsumer +
+ QImageConsumer changed end frameDone @@ -3657,8 +3657,8 @@
-
- TQImageDecoder +
+ QImageDecoder decode format formatName @@ -3666,43 +3666,43 @@ inputFormats registerDecoderFactory unregisterDecoderFactory - ~TQImageDecoder + ~QImageDecoder
-
- TQImageDrag +
+ QImageDrag canDecode decode setImage - ~TQImageDrag + ~QImageDrag
-
- TQImageFormat +
+ QImageFormat decode
-
- TQImageFormatPlugin +
+ QImageFormatPlugin installIOHandler keys - ~TQImageFormatPlugin + ~QImageFormatPlugin
-
- TQImageFormatType +
+ QImageFormatType decoderFor formatName - ~TQImageFormatType + ~QImageFormatType
-
- TQImageIO +
+ QImageIO defineIOHandler description fileName @@ -3728,12 +3728,12 @@ setStatus status write - ~TQImageIO + ~QImageIO
-
- TQIMEvent +
+ QIMEvent accept cursorPos ignore @@ -3743,8 +3743,8 @@
-
- TQInputDialog +
+ QInputDialog Type comboBox editableComboBox @@ -3756,12 +3756,12 @@ setType spinBox type - ~TQInputDialog + ~QInputDialog
-
- TQIntCache +
+ QIntCache clear count find @@ -3775,12 +3775,12 @@ statistics take totalCost - ~TQIntCache + ~QIntCache
-
- TQIntCacheIterator +
+ QIntCacheIterator atFirst atLast count @@ -3799,8 +3799,8 @@
-
- TQIntDict +
+ QIntDict clear count find @@ -3816,12 +3816,12 @@ statistics take write - ~TQIntDict + ~QIntDict
-
- TQIntDictIterator +
+ QIntDictIterator count current currentKey @@ -3831,12 +3831,12 @@ operator++ operator+= toFirst - ~TQIntDictIterator + ~QIntDictIterator
-
- TQIntValidator +
+ QIntValidator bottom bottom setBottom @@ -3845,12 +3845,12 @@ top top validate - ~TQIntValidator + ~QIntValidator
-
- TQIODevice +
+ QIODevice Offset at atEnd @@ -3889,43 +3889,43 @@ status ungetch writeBlock - ~TQIODevice + ~QIODevice
-
+
enableRewind readyToSend rewind rewindable sendTo - ~TQIODeviceSource + ~QIODeviceSource
-
- TQJisCodec +
+ QJisCodec mimeName
-
- TQKbdDriverFactory +
+ QKbdDriverFactory create keys
-
- TQKbdDriverPlugin +
+ QKbdDriverPlugin create keys - ~TQKbdDriverPlugin + ~QKbdDriverPlugin
-
- TQKeyEvent +
+ QKeyEvent accept ascii count @@ -3939,8 +3939,8 @@
-
- TQKeySequence +
+ QKeySequence assign count decodeString @@ -3952,14 +3952,14 @@ operator= operator== operator[] - ~TQKeySequence + ~QKeySequence operator<< operator>>
-
- TQLabel +
+ QLabel alignment alignment backgroundMode @@ -3991,12 +3991,12 @@ textFormat textFormat updateLabel - ~TQLabel + ~QLabel
-
- TQLayout +
+ QLayout ResizeMode activate add @@ -4036,8 +4036,8 @@
-
- TQLayoutItem +
+ QLayoutItem alignment expanding geometry @@ -4054,23 +4054,23 @@ sizeHint spacerItem widget - ~TQLayoutItem + ~QLayoutItem
-
- TQLayoutIterator +
+ QLayoutIterator current deleteCurrent operator++ operator= takeCurrent - ~TQLayoutIterator + ~QLayoutIterator
-
- TQLCDNumber +
+ QLCDNumber Mode SegmentStyle checkOverflow @@ -4097,12 +4097,12 @@ smallDecimalPoint value value - ~TQLCDNumber + ~QLCDNumber
-
- TQLibrary +
+ QLibrary autoUnload isLoaded library @@ -4110,12 +4110,12 @@ resolve setAutoUnload unload - ~TQLibrary + ~QLibrary
-
- TQLineEdit +
+ QLineEdit EchoMode acceptableInput alignment @@ -4189,12 +4189,12 @@ undo undoAvailable validator - ~TQLineEdit + ~QLineEdit
-
- TQListBox +
+ QListBox LayoutMode SelectionMode changeItem @@ -4282,12 +4282,12 @@ variableHeight variableWidth variableWidth - ~TQListBox + ~QListBox
-
- TQListBoxItem +
+ QListBoxItem height isCurrent isSelectable @@ -4303,31 +4303,31 @@ setText text width - ~TQListBoxItem + ~QListBoxItem
-
- TQListBoxPixmap +
+ QListBoxPixmap height paint pixmap width - ~TQListBoxPixmap + ~QListBoxPixmap
-
- TQListBoxText +
+ QListBoxText height paint width - ~TQListBoxText + ~QListBoxText
-
- TQListView +
+ QListView RenameAction ResizeMode SelectionMode @@ -4440,12 +4440,12 @@ triggerUpdate updateContents widthChanged - ~TQListView + ~QListView
-
- TQListViewItem +
+ QListViewItem acceptDrop activate activatedPos @@ -4509,12 +4509,12 @@ totalHeight width widthChanged - ~TQListViewItem + ~QListViewItem
-
- TQListViewItemIterator +
+ QListViewItemIterator IteratorFlag current operator* @@ -4523,12 +4523,12 @@ operator-- operator-= operator= - ~TQListViewItemIterator + ~QListViewItemIterator
-
- TQLocale +
+ QLocale Country Language c @@ -4554,13 +4554,13 @@
-
- TQLocalFs +
+ QLocalFs
-
- TQMacMime +
+ QMacMime all canConvert convertFromMime @@ -4572,24 +4572,24 @@ flavorFor flavorToMime mimeFor - ~TQMacMime + ~QMacMime
-
- TQMacStyle +
+ QMacStyle FocusRectPolicy WidgetSizePolicy focusRectPolicy setFocusRectPolicy setWidgetSizePolicy widgetSizePolicy - ~TQMacStyle + ~QMacStyle
-
- TQMainWindow +
+ QMainWindow DockWindows addDockWindow appropriate @@ -4640,14 +4640,14 @@ usesTextLabel usesTextLabelChanged whatsThis - ~TQMainWindow + ~QMainWindow operator<< operator>>
-
- TQMap +
+ QMap ConstIterator Iterator ValueType @@ -4681,14 +4681,14 @@ size_type value_type values - ~TQMap + ~QMap operator<< operator>>
-
- TQMapConstIterator +
+ QMapConstIterator data iterator_category key @@ -4703,8 +4703,8 @@
-
- TQMapIterator +
+ QMapIterator data iterator_category key @@ -4719,8 +4719,8 @@
-
- TQMemArray +
+ QMemArray ConstIterator Iterator assign @@ -4750,15 +4750,15 @@ size sort truncate - ~TQMemArray + ~QMemArray operator<< operator>> tqChecksum
-
- TQMenuBar +
+ QMenuBar Separator activated defaultUp @@ -4772,12 +4772,12 @@ setDefaultUp setupAccelerators show - ~TQMenuBar + ~QMenuBar
-
- TQMenuData +
+ QMenuData accel activateItemAt changeItem @@ -4814,12 +4814,12 @@ text updateItem whatsThis - ~TQMenuData + ~QMenuData
-
- TQMessageBox +
+ QMessageBox Icon about aboutTQt @@ -4843,12 +4843,12 @@ textFormat textFormat warning - ~TQMessageBox + ~QMessageBox
-
- TQMetaObject +
+ QMetaObject classInfo className findProperty @@ -4866,8 +4866,8 @@
-
- TQMetaProperty +
+ QMetaProperty designable enumKeys isEnumType @@ -4885,18 +4885,18 @@
-
- TQMimeSource +
+ QMimeSource encodedData format provides serialNumber - ~TQMimeSource + ~QMimeSource
-
- TQMimeSourceFactory +
+ QMimeSourceFactory addFactory addFilePath data @@ -4912,64 +4912,64 @@ setPixmap setText takeDefaultFactory - ~TQMimeSourceFactory + ~QMimeSourceFactory
-
- TQMotif +
+ QMotif applicationContext x11Display - ~TQMotif + ~QMotif
-
- TQMotifDialog +
+ QMotifDialog acceptCallback dialog rejectCallback shell - ~TQMotifDialog + ~QMotifDialog
-
- TQMotifPlusStyle +
+ QMotifPlusStyle
-
- TQMotifStyle +
+ QMotifStyle setUseHighlightColors useHighlightColors
-
- TQMotifWidget +
+ QMotifWidget motifWidget - ~TQMotifWidget + ~QMotifWidget
-
- TQMouseDriverFactory +
+ QMouseDriverFactory create keys
-
- TQMouseDriverPlugin +
+ QMouseDriverPlugin create keys - ~TQMouseDriverPlugin + ~QMouseDriverPlugin
-
- TQMouseEvent +
+ QMouseEvent accept button globalPos @@ -4985,15 +4985,15 @@
-
- TQMoveEvent +
+ QMoveEvent oldPos pos
-
- TQMovie +
+ QMovie Status backgroundColor connectResize @@ -5021,11 +5021,11 @@ step steps unpause - ~TQMovie + ~QMovie
-
+
alignment alignment atBeginning @@ -5065,25 +5065,25 @@
-
- TQMutex +
+ QMutex lock locked tryLock unlock - ~TQMutex + ~QMutex
-
- TQMutexLocker +
+ QMutexLocker mutex - ~TQMutexLocker + ~QMutexLocker
-
- TQNetworkOperation +
+ QNetworkOperation arg errorCode free @@ -5096,12 +5096,12 @@ setRawArg setState state - ~TQNetworkOperation + ~QNetworkOperation
-
- TQNetworkProtocol +
+ QNetworkProtocol ConnectionState Error Operation @@ -5135,12 +5135,12 @@ stop supportedOperations url - ~TQNetworkProtocol + ~QNetworkProtocol
-
- TQNPInstance +
+ QNPInstance InstanceMode Reason StreamMode @@ -5166,12 +5166,12 @@ widget write writeReady - ~TQNPInstance + ~QNPInstance
-
- TQNPlugin +
+ QNPlugin actual create getJavaClass @@ -5182,12 +5182,12 @@ getVersionInfo newInstance unuseJavaClass - ~TQNPlugin + ~QNPlugin
-
- TQNPStream +
+ QNPStream complete end instance @@ -5198,21 +5198,21 @@ type url write - ~TQNPStream + ~QNPStream
-
- TQNPWidget +
+ QNPWidget enterInstance instance leaveInstance - ~TQNPWidget + ~QNPWidget
-
- TQObject +
+ QObject activate_signal blockSignals checkConnectArgs @@ -5258,36 +5258,36 @@ timerEvent tr trUtf8 - ~TQObject + ~QObject tqt_find_obj_child
-
- TQObjectCleanupHandler +
+ QObjectCleanupHandler add clear isEmpty remove - ~TQObjectCleanupHandler + ~QObjectCleanupHandler
-
- TQObjectList +
+ QObjectList operator= - ~TQObjectList + ~QObjectList
-
- TQObjectListIterator +
+ QObjectListIterator operator=
-
- TQPaintDevice +
+ QPaintDevice cmd handle isExtDev @@ -5313,13 +5313,13 @@ x11SetAppDpiX x11SetAppDpiY x11Visual - ~TQPaintDevice + ~QPaintDevice bitBlt
-
- TQPaintDeviceMetrics +
+ QPaintDeviceMetrics depth height heightMM @@ -5331,8 +5331,8 @@
-
- TQPainter +
+ QPainter CoordinateMode TextDirection backgroundColor @@ -5411,7 +5411,7 @@ worldMatrix xForm xFormDev - ~TQPainter + ~QPainter qDrawPlainRect qDrawShadeLine qDrawShadePanel @@ -5421,24 +5421,24 @@
-
- TQPaintEvent +
+ QPaintEvent erased rect region
-
- TQPair +
+ QPair first_type second_type qMakePair
-
- TQPalette +
+ QPalette ColorGroup active brush @@ -5457,14 +5457,14 @@ setColor setDisabled setInactive - ~TQPalette + ~QPalette operator<< operator>>
-
- TQPen +
+ QPen capStyle color copy @@ -5480,14 +5480,14 @@ setWidth style width - ~TQPen + ~QPen operator<< operator>>
-
- TQPicture +
+ QPicture boundingRect copy data @@ -5501,14 +5501,14 @@ setBoundingRect setData size - ~TQPicture + ~QPicture operator<< operator>>
-
- TQPixmap +
+ QPixmap ColorMode Optimization convertFromImage @@ -5547,15 +5547,15 @@ trueMatrix width xForm - ~TQPixmap + ~QPixmap copyBlt operator<< operator>>
-
- TQPixmapCache +
+ QPixmapCache cacheLimit clear find @@ -5565,22 +5565,22 @@
-
- TQPlatinumStyle +
+ QPlatinumStyle drawRiffles mixedColor
-
- TQPNGImagePacker +
+ QPNGImagePacker packImage setPixelAlignment
-
- TQPoint +
+ QPoint isNull manhattanLength operator*= @@ -5604,8 +5604,8 @@
-
- TQPointArray +
+ QPointArray boundingRect copy cubicBezier @@ -5617,14 +5617,14 @@ setPoint setPoints translate - ~TQPointArray + ~QPointArray operator<< operator>>
-
- TQPopupMenu +
+ QPopupMenu aboutToHide aboutToShow activated @@ -5642,12 +5642,12 @@ setActiveItem setCheckable updateItem - ~TQPopupMenu + ~QPopupMenu
-
- TQPrinter +
+ QPrinter ColorMode Orientation PageOrder @@ -5704,12 +5704,12 @@ setup toPage winPageSize - ~TQPrinter + ~QPrinter
-
- TQProcess +
+ QProcess Communication addArgument arguments @@ -5740,12 +5740,12 @@ workingDirectory writeToStdin wroteToStdin - ~TQProcess + ~QProcess
-
- TQProgressBar +
+ QProgressBar centerIndicator centerIndicator indicatorFollowsStyle @@ -5768,8 +5768,8 @@
-
- TQProgressDialog +
+ QProgressDialog autoClose autoClose autoReset @@ -5801,12 +5801,12 @@ totalSteps wasCanceled wasCanceled - ~TQProgressDialog + ~QProgressDialog
-
- TQPtrCollection +
+ QPtrCollection Item autoDelete clear @@ -5814,12 +5814,12 @@ deleteItem newItem setAutoDelete - ~TQPtrCollection + ~QPtrCollection
-
- TQPtrDict +
+ QPtrDict clear count find @@ -5835,12 +5835,12 @@ statistics take write - ~TQPtrDict + ~QPtrDict
-
- TQPtrDictIterator +
+ QPtrDictIterator count current currentKey @@ -5850,12 +5850,12 @@ operator++ operator+= toFirst - ~TQPtrDictIterator + ~QPtrDictIterator
-
- TQPtrList +
+ QPtrList append at clear @@ -5894,12 +5894,12 @@ takeNode toVector write - ~TQPtrList + ~QPtrList
-
- TQPtrListIterator +
+ QPtrListIterator atFirst atLast count @@ -5915,12 +5915,12 @@ operator= toFirst toLast - ~TQPtrListIterator + ~QPtrListIterator
-
- TQPtrQueue +
+ QPtrQueue autoDelete clear count @@ -5935,12 +5935,12 @@ remove setAutoDelete write - ~TQPtrQueue + ~QPtrQueue
-
- TQPtrStack +
+ QPtrStack autoDelete clear count @@ -5955,12 +5955,12 @@ setAutoDelete top write - ~TQPtrStack + ~QPtrStack
-
- TQPtrVector +
+ QPtrVector at bsearch clear @@ -5985,12 +5985,12 @@ sort take write - ~TQPtrVector + ~QPtrVector
-
- TQPushButton +
+ QPushButton autoDefault autoDefault autoMask @@ -6010,12 +6010,12 @@ setPopup setToggleButton toggleButton - ~TQPushButton + ~QPushButton
-
- TQRadioButton +
+ QRadioButton autoMask checked isChecked @@ -6023,8 +6023,8 @@
-
- TQRangeControl +
+ QRangeControl addLine addPage bound @@ -6047,12 +6047,12 @@ value valueChange valueFromPosition - ~TQRangeControl + ~QRangeControl
-
- TQRect +
+ QRect addCoords bottom bottomLeft @@ -6118,8 +6118,8 @@
-
- TQRegExp +
+ QRegExp CaretMode cap capturedTexts @@ -6144,21 +6144,21 @@ setPattern setWildcard wildcard - ~TQRegExp + ~QRegExp
-
- TQRegExpValidator +
+ QRegExpValidator regExp setRegExp validate - ~TQRegExpValidator + ~QRegExpValidator
-
- TQRegion +
+ QRegion RegionType boundingRect contains @@ -6186,21 +6186,21 @@ subtract translate unite - ~TQRegion + ~QRegion operator<< operator>>
-
- TQResizeEvent +
+ QResizeEvent oldSize size
-
- TQScreen +
+ QScreen alloc base blank @@ -6241,12 +6241,12 @@ transformOrientation uncache width - ~TQScreen + ~QScreen
-
- TQScrollBar +
+ QScrollBar doAutoRepeat draggingSlider draggingSlider @@ -6285,12 +6285,12 @@ value value valueChanged - ~TQScrollBar + ~QScrollBar
-
- TQScrollView +
+ QScrollView ResizePolicy ScrollBarMode addChild @@ -6372,12 +6372,12 @@ visibleHeight visibleWidth visibleWidth - ~TQScrollView + ~QScrollView
-
- TQSemaphore +
+ QSemaphore available operator++ operator+= @@ -6385,12 +6385,12 @@ operator-= total tryAccess - ~TQSemaphore + ~QSemaphore
-
- TQServerSocket +
+ QServerSocket address newConnection ok @@ -6398,12 +6398,12 @@ setSocket socket socketDevice - ~TQServerSocket + ~QServerSocket
-
- TQSessionManager +
+ QSessionManager RestartHint allowsErrorInteraction allowsInteraction @@ -6424,8 +6424,8 @@
-
- TQSettings +
+ QSettings Format Scope System @@ -6445,44 +6445,44 @@ setPath subkeyList writeEntry - ~TQSettings + ~QSettings
-
- TQSGIStyle - ~TQSGIStyle +
+ QSGIStyle + ~QSGIStyle
-
- TQShowEvent +
+ QShowEvent
-
- TQSignal +
+ QSignal activate connect disconnect setValue value - ~TQSignal + ~QSignal
-
- TQSignalMapper +
+ QSignalMapper map mapped removeMappings setMapping - ~TQSignalMapper + ~QSignalMapper
-
- TQSimpleRichText +
+ QSimpleRichText adjustSize anchorAt context @@ -6493,12 +6493,12 @@ setWidth width widthUsed - ~TQSimpleRichText + ~QSimpleRichText
-
- TQSize +
+ QSize ScaleMode boundedTo expandedTo @@ -6528,18 +6528,18 @@
-
- TQSizeGrip +
+ QSizeGrip mouseMoveEvent mousePressEvent paintEvent sizeHint - ~TQSizeGrip + ~QSizeGrip
-
- TQSizePolicy +
+ QSizePolicy ExpandData SizeType expanding @@ -6563,15 +6563,15 @@
-
- TQSjisCodec +
+ QSjisCodec mimeName - ~TQSjisCodec + ~QSjisCodec
-
- TQSlider +
+ QSlider TickSetting addStep lineStep @@ -6612,12 +6612,12 @@ value valueChange valueChanged - ~TQSlider + ~QSlider
-
- TQSocket +
+ QSocket Error State address @@ -6660,12 +6660,12 @@ ungetch waitForMore writeBlock - ~TQSocket + ~QSocket
-
- TQSocketDevice +
+ QSocketDevice Error Protocol Type @@ -6700,30 +6700,30 @@ type waitForMore writeBlock - ~TQSocketDevice + ~QSocketDevice
-
- TQSocketNotifier +
+ QSocketNotifier Type activated isEnabled setEnabled socket type - ~TQSocketNotifier + ~QSocketNotifier
-
+
operator= - ~TQSortedList + ~QSortedList
-
- TQSound +
+ QSound available fileName isAvailable @@ -6733,12 +6733,12 @@ play setLoops stop - ~TQSound + ~QSound
-
- TQSpacerItem +
+ QSpacerItem changeSize expanding isEmpty @@ -6749,8 +6749,8 @@
-
- TQSpinBox +
+ QSpinBox ButtonSymbols buttonSymbols buttonSymbols @@ -6801,12 +6801,12 @@ valueChanged wrapping wrapping - ~TQSpinBox + ~QSpinBox
-
- TQSplashScreen +
+ QSplashScreen clear drawContents finish @@ -6815,12 +6815,12 @@ pixmap repaint setPixmap - ~TQSplashScreen + ~QSplashScreen
-
- TQSplitter +
+ QSplitter ResizeMode adjustPos childEvent @@ -6848,14 +6848,14 @@ setRubberband setSizes sizes - ~TQSplitter + ~QSplitter operator<< operator>>
-
- TQSql +
+ QSql Confirm Location Op @@ -6864,8 +6864,8 @@
-
- TQSqlCursor +
+ QSqlCursor Mode append calculateField @@ -6902,12 +6902,12 @@ sort toString update - ~TQSqlCursor + ~QSqlCursor
-
- TQSqlDatabase +
+ QSqlDatabase addDatabase close commit @@ -6948,12 +6948,12 @@ transaction userName userName - ~TQSqlDatabase + ~QSqlDatabase
-
- TQSqlDriver +
+ QSqlDriver DriverFeature beginTransaction close @@ -6974,29 +6974,29 @@ setOpen setOpenError tables - ~TQSqlDriver + ~QSqlDriver
-
- TQSqlDriverPlugin +
+ QSqlDriverPlugin create keys - ~TQSqlDriverPlugin + ~QSqlDriverPlugin
-
- TQSqlEditorFactory +
+ QSqlEditorFactory createEditor defaultFactory installDefaultFactory - ~TQSqlEditorFactory + ~QSqlEditorFactory
-
- TQSqlError +
+ QSqlError Type databaseText driverText @@ -7008,12 +7008,12 @@ setType text type - ~TQSqlError + ~QSqlError
-
- TQSqlField +
+ QSqlField clear isNull isReadOnly @@ -7026,12 +7026,12 @@ setValue type value - ~TQSqlField + ~QSqlField
-
- TQSqlFieldInfo +
+ QSqlFieldInfo defaultValue isCalculated isGenerated @@ -7048,12 +7048,12 @@ toField type typeID - ~TQSqlFieldInfo + ~QSqlFieldInfo
-
- TQSqlForm +
+ QSqlForm clear clearValues count @@ -7068,12 +7068,12 @@ widgetToField writeField writeFields - ~TQSqlForm + ~QSqlForm
-
- TQSqlIndex +
+ QSqlIndex append cursorName fromStringList @@ -7083,24 +7083,24 @@ setCursorName setDescending setName - ~TQSqlIndex + ~QSqlIndex
-
- TQSqlPropertyMap +
+ QSqlPropertyMap defaultMap insert installDefaultMap property remove setProperty - ~TQSqlPropertyMap + ~QSqlPropertyMap
-
- TQSqlQuery +
+ QSqlQuery addBindValue afterSeek at @@ -7130,12 +7130,12 @@ setForwardOnly size value - ~TQSqlQuery + ~QSqlQuery
-
- TQSqlRecord +
+ QSqlRecord append clear clearValues @@ -7156,20 +7156,20 @@ toString toStringList value - ~TQSqlRecord + ~QSqlRecord
-
- TQSqlRecordInfo +
+ QSqlRecordInfo contains find toRecord
-
- TQSqlResult +
+ QSqlResult at data driver @@ -7194,18 +7194,18 @@ setQuery setSelect size - ~TQSqlResult + ~QSqlResult
-
- TQSqlSelectCursor - ~TQSqlSelectCursor +
+ QSqlSelectCursor + ~QSqlSelectCursor
-
- TQStatusBar +
+ QStatusBar addWidget clear hideOrShow @@ -7217,26 +7217,26 @@ removeWidget setSizeGripEnabled sizeGripEnabled - ~TQStatusBar + ~QStatusBar
-
- TQStoredDrag +
+ QStoredDrag encodedData setEncodedData - ~TQStoredDrag + ~QStoredDrag
-
- TQStrIList - ~TQStrIList +
+ QStrIList + ~QStrIList
-
- TQString +
+ QString SectionFlags append arg @@ -7312,7 +7312,7 @@ unicodeToLatin1 upper utf8 - ~TQString + ~QString operator!= operator+ operator< @@ -7325,8 +7325,8 @@
-
- TQStringList +
+ QStringList fromStrList grep gres @@ -7336,20 +7336,20 @@
-
- TQStrList +
+ QStrList operator= - ~TQStrList + ~QStrList
-
- TQStrListIterator +
+ QStrListIterator
-
- TQStyle +
+ QStyle ComplexControl ContentsType ControlElement @@ -7378,19 +7378,19 @@ subRect unPolish visualRect - ~TQStyle + ~QStyle
-
- TQStyleFactory +
+ QStyleFactory create keys
-
- TQStyleOption +
+ QStyleOption StyleOptionDefault arrowType checkListItem @@ -7412,16 +7412,16 @@
-
- TQStylePlugin +
+ QStylePlugin create keys - ~TQStylePlugin + ~QStylePlugin
-
- TQStyleSheet +
+ QStyleSheet convertFromPlainText defaultSheet error @@ -7431,12 +7431,12 @@ scaleFont setDefaultSheet tag - ~TQStyleSheet + ~QStyleSheet
-
- TQStyleSheetItem +
+ QStyleSheetItem DisplayMode ListStyle Margin @@ -7485,23 +7485,23 @@ styleSheet verticalAlignment whiteSpaceMode - ~TQStyleSheetItem + ~QStyleSheetItem
-
- TQSyntaxHighlighter +
+ QSyntaxHighlighter currentParagraph highlightParagraph rehighlight setFormat textEdit - ~TQSyntaxHighlighter + ~QSyntaxHighlighter
-
- TQt +
+ Qt AlignmentFlags AnchorAttribute ArrowType @@ -7537,8 +7537,8 @@
-
- TQTab +
+ QTab iconSet identifier isEnabled @@ -7549,12 +7549,12 @@ setRect setText text - ~TQTab + ~QTab
-
- TQTabBar +
+ QTabBar Shape addTab count @@ -7585,12 +7585,12 @@ tabAt tabList toolTip - ~TQTabBar + ~QTabBar
-
- TQTabDialog +
+ QTabDialog aboutToShow addTab applyButtonPressed @@ -7622,12 +7622,12 @@ showTab tabBar tabLabel - ~TQTabDialog + ~QTabDialog
-
- TQTable +
+ QTable EditMode FocusStyle SelectionMode @@ -7772,12 +7772,12 @@ updateHeaderStates valueChanged verticalHeader - ~TQTable + ~QTable
-
- TQTableItem +
+ QTableItem EditType alignment col @@ -7805,12 +7805,12 @@ table text wordWrap - ~TQTableItem + ~QTableItem
-
- TQTableSelection +
+ QTableSelection anchorCol anchorRow bottomRow @@ -7828,8 +7828,8 @@
-
- TQTabletEvent +
+ QTabletEvent TabletDevice accept device @@ -7848,8 +7848,8 @@
-
- TQTabWidget +
+ QTabWidget TabPosition TabShape addTab @@ -7894,8 +7894,8 @@
-
- TQTextBrowser +
+ QTextBrowser anchorClicked backward backwardAvailable @@ -7919,8 +7919,8 @@
-
- TQTextCodec +
+ QTextCodec canEncode codecForCStrings codecForContent @@ -7946,39 +7946,39 @@ setCodecForTr simpleHeuristicNameMatch toUnicode - ~TQTextCodec + ~QTextCodec
-
- TQTextCodecPlugin +
+ QTextCodecPlugin createForMib createForName mibEnums names - ~TQTextCodecPlugin + ~QTextCodecPlugin
-
- TQTextDecoder +
+ QTextDecoder toUnicode - ~TQTextDecoder + ~QTextDecoder
-
- TQTextDrag +
+ QTextDrag canDecode decode setSubtype setText - ~TQTextDrag + ~QTextDrag
-
- TQTextEdit +
+ QTextEdit AutoFormatting CursorAction KeyboardAction @@ -8134,25 +8134,25 @@
-
- TQTextEncoder +
+ QTextEncoder fromUnicode - ~TQTextEncoder + ~QTextEncoder
-
- TQTextIStream +
+ QTextIStream
-
- TQTextOStream +
+ QTextOStream
-
- TQTextStream +
+ QTextStream Encoding atEnd codec @@ -8178,11 +8178,11 @@ unsetf width writeRawBytes - ~TQTextStream + ~QTextStream
-
+
modified overwriteMode readOnly @@ -8191,8 +8191,8 @@
-
- TQThread +
+ QThread Priority currentThread exit @@ -8205,21 +8205,21 @@ terminate usleep wait - ~TQThread + ~QThread
-
- TQThreadStorage +
+ QThreadStorage hasLocalData localData setLocalData - ~TQThreadStorage + ~QThreadStorage
-
- TQTime +
+ QTime addMSecs addSecs currentTime @@ -8248,8 +8248,8 @@
-
- TQTimeEdit +
+ QTimeEdit Display autoAdvance autoAdvance @@ -8274,12 +8274,12 @@ time time valueChanged - ~TQTimeEdit + ~QTimeEdit
-
- TQTimer +
+ QTimer changeInterval isActive singleShot @@ -8287,18 +8287,18 @@ stop timeout timerId - ~TQTimer + ~QTimer
-
- TQTimerEvent +
+ QTimerEvent timerId
-
- TQToolBar +
+ QToolBar addSeparator clear label @@ -8309,8 +8309,8 @@
-
- TQToolBox +
+ QToolBox addItem count count @@ -8337,8 +8337,8 @@
-
- TQToolButton +
+ QToolButton TextPosition autoRaise autoRaise @@ -8372,12 +8372,12 @@ usesBigPixmap usesTextLabel usesTextLabel - ~TQToolButton + ~QToolButton
-
- TQToolTip +
+ QToolTip add clear font @@ -8397,8 +8397,8 @@
-
- TQToolTipGroup +
+ QToolTipGroup delay delay enabled @@ -8407,12 +8407,12 @@ setDelay setEnabled showTip - ~TQToolTipGroup + ~QToolTipGroup
-
- TQTranslator +
+ QTranslator SaveMode clear contains @@ -8425,12 +8425,12 @@ save squeeze unsqueeze - ~TQTranslator + ~QTranslator
-
- TQTranslatorMessage +
+ QTranslatorMessage Prefix comment commonPrefix @@ -8450,13 +8450,13 @@
-
- TQTsciiCodec +
+ QTsciiCodec
-
- TQUriDrag +
+ QUriDrag canDecode decode decodeLocalFiles @@ -8468,12 +8468,12 @@ unicodeUriToUri uriToLocalFile uriToUnicodeUri - ~TQUriDrag + ~QUriDrag
-
- TQUrl +
+ QUrl addPath cdUp decode @@ -8514,12 +8514,12 @@ setUser toString user - ~TQUrl + ~QUrl
-
- TQUrlInfo +
+ QUrlInfo PermissionSpec equal greaterThan @@ -8551,12 +8551,12 @@ setSymLink setWritable size - ~TQUrlInfo + ~QUrlInfo
-
- TQUrlOperator +
+ QUrlOperator addEntry clearEntries connectionStateChanged @@ -8584,13 +8584,13 @@ startOperation startedNextCopy stop - ~TQUrlOperator + ~QUrlOperator tqInitNetworkProtocols
-
- TQUuid +
+ QUuid Variant Version createUuid @@ -8609,17 +8609,17 @@
-
- TQValidator +
+ QValidator State fixup validate - ~TQValidator + ~QValidator
-
- TQValueList +
+ QValueList ConstIterator Iterator append @@ -8664,14 +8664,14 @@ size size_type value_type - ~TQValueList + ~QValueList operator<< operator>>
-
- TQValueListConstIterator +
+ QValueListConstIterator operator!= operator* operator++ @@ -8683,8 +8683,8 @@
-
- TQValueListIterator +
+ QValueListIterator operator!= operator* operator++ @@ -8698,17 +8698,17 @@
-
- TQValueStack +
+ QValueStack pop push top - ~TQValueStack + ~QValueStack
-
- TQValueVector +
+ QValueVector ConstIterator Iterator ValueType @@ -8746,12 +8746,12 @@ size size_type value_type - ~TQValueVector + ~QValueVector
-
- TQVariant +
+ QVariant Type asBitArray asBitmap @@ -8833,44 +8833,44 @@ type typeName typeToName - ~TQVariant + ~QVariant
-
- TQVBox +
+ QVBox
-
- TQVBoxLayout - ~TQVBoxLayout +
+ QVBoxLayout + ~QVBoxLayout
-
- TQVButtonGroup - ~TQVButtonGroup +
+ QVButtonGroup + ~QVButtonGroup
-
- TQVGroupBox - ~TQVGroupBox +
+ QVGroupBox + ~QVGroupBox
-
- TQWaitCondition +
+ QWaitCondition wait wakeAll wakeOne - ~TQWaitCondition + ~QWaitCondition
-
- TQWhatsThis +
+ QWhatsThis add clicked display @@ -8882,12 +8882,12 @@ text textFor whatsThisButton - ~TQWhatsThis + ~QWhatsThis
-
- TQWheelEvent +
+ QWheelEvent accept delta globalPos @@ -8903,8 +8903,8 @@
-
- TQWidget +
+ QWidget BackgroundOrigin FocusPolicy acceptDrops @@ -9187,24 +9187,24 @@ x11Event y y - ~TQWidget + ~QWidget
-
- TQWidgetFactory +
+ QWidgetFactory addWidgetFactory create createWidget loadImages supportsWidget widgets - ~TQWidgetFactory + ~QWidgetFactory
-
- TQWidgetItem +
+ QWidgetItem expanding isEmpty maximumSize @@ -9215,8 +9215,8 @@
-
- TQWidgetPlugin +
+ QWidgetPlugin create group iconSet @@ -9225,12 +9225,12 @@ keys toolTip whatsThis - ~TQWidgetPlugin + ~QWidgetPlugin
-
- TQWidgetStack +
+ QWidgetStack aboutToShow addWidget id @@ -9239,12 +9239,12 @@ setChildGeometries visibleWidget widget - ~TQWidgetStack + ~QWidgetStack
-
- TQWindowsMime +
+ QWindowsMime all canConvert cf @@ -9257,17 +9257,17 @@ countCf initialize mimeFor - ~TQWindowsMime + ~QWindowsMime
-
- TQWindowsStyle +
+ QWindowsStyle
-
- TQWizard +
+ QWizard addPage appropriate back @@ -9299,12 +9299,12 @@ title titleFont titleFont - ~TQWizard + ~QWizard
-
- TQWMatrix +
+ QWMatrix TransformationMode det dx @@ -9337,8 +9337,8 @@
-
- TQWorkspace +
+ QWorkspace WindowOrder activateNextWindow activatePrevWindow @@ -9352,12 +9352,12 @@ tile windowActivated windowList - ~TQWorkspace + ~QWorkspace
-
- TQWSDecoration +
+ QWSDecoration Region close maximize @@ -9366,41 +9366,41 @@ paint paintButton region - ~TQWSDecoration + ~QWSDecoration
-
- TQWSInputMethod +
+ QWSInputMethod filter reset sendIMEvent setFont setMicroFocus - ~TQWSInputMethod + ~QWSInputMethod
-
- TQWSKeyboardHandler +
+ QWSKeyboardHandler processKeyEvent - ~TQWSKeyboardHandler + ~QWSKeyboardHandler
-
- TQWSMouseHandler +
+ QWSMouseHandler calibrate clearCalibration limitToScreen mouseChanged pos - ~TQWSMouseHandler + ~QWSMouseHandler
-
- TQWSServer +
+ QWSServer GUIMode ServerFlags WindowEvent @@ -9434,12 +9434,12 @@ setWindowRegion windowAt windowEvent - ~TQWSServer + ~QWSServer
-
- TQWSWindow +
+ QWSWindow allocation caption client @@ -9454,12 +9454,12 @@ setActiveWindow show winId - ~TQWSWindow + ~QWSWindow
-
- TQXmlAttributes +
+ QXmlAttributes append clear count @@ -9470,12 +9470,12 @@ type uri value - ~TQXmlAttributes + ~QXmlAttributes
-
- TQXmlContentHandler +
+ QXmlContentHandler characters endDocument endElement @@ -9491,8 +9491,8 @@
-
- TQXmlDeclHandler +
+ QXmlDeclHandler attributeDecl errorString externalEntityDecl @@ -9500,29 +9500,29 @@
-
- TQXmlDefaultHandler - ~TQXmlDefaultHandler +
+ QXmlDefaultHandler + ~QXmlDefaultHandler
-
- TQXmlDTDHandler +
+ QXmlDTDHandler errorString notationDecl unparsedEntityDecl
-
- TQXmlEntityResolver +
+ QXmlEntityResolver errorString resolveEntity
-
- TQXmlErrorHandler +
+ QXmlErrorHandler error errorString fatalError @@ -9530,20 +9530,20 @@
-
- TQXmlInputSource +
+ QXmlInputSource data fetchData fromRawData next reset setData - ~TQXmlInputSource + ~QXmlInputSource
-
- TQXmlLexicalHandler +
+ QXmlLexicalHandler comment endCDATA endDTD @@ -9555,16 +9555,16 @@
-
- TQXmlLocator +
+ QXmlLocator columnNumber lineNumber - ~TQXmlLocator + ~QXmlLocator
-
- TQXmlNamespaceSupport +
+ QXmlNamespaceSupport popContext prefix prefixes @@ -9574,12 +9574,12 @@ setPrefix splitName uri - ~TQXmlNamespaceSupport + ~QXmlNamespaceSupport
-
- TQXmlParseException +
+ QXmlParseException columnNumber lineNumber message @@ -9588,8 +9588,8 @@
-
- TQXmlReader +
+ QXmlReader DTDHandler contentHandler declHandler @@ -9612,26 +9612,26 @@
-
- TQXmlSimpleReader +
+ QXmlSimpleReader parse parseContinue setFeature - ~TQXmlSimpleReader + ~QXmlSimpleReader
-
+
isActiveWindow setActiveWindow x11Event xtWidget - ~TQXtWidget + ~QXtWidget
-
- 3rd Party Licenses used in TQt +
+ 3rd Party Licenses used in Qt
A Complete Application Window @@ -9648,11 +9648,11 @@
A Motif Dialog
-
- A TQt example as a scriptable ActiveX control (executable) +
+ A Qt example as a scriptable ActiveX control (executable)
-
- A tqt-interest mail archive search +
+ A qt-interest mail archive search
A Rectangle Draw "Benchmark" @@ -10101,185 +10101,185 @@
Properties
-
+
qaction-examples
-
- TQArray Class Reference (obsolete) +
+ QArray Class Reference (obsolete)
-
- TQCollection Class Reference (obsolete) +
+ QCollection Class Reference (obsolete)
-
- TQDir +
+ QDir
-
- TQEmbed - File and Image Embedder +
+ QEmbed - File and Image Embedder
-
+
qfont-examples
-
- TQList Class Reference (obsolete) +
+ QList Class Reference (obsolete)
-
- TQListIterator Class Reference (obsolete) +
+ QListIterator Class Reference (obsolete)
-
- TQMag +
+ QMag
-
+
motif-examples
-
+
qprocess-examples
-
- TQQueue Class Reference (obsolete) +
+ QQueue Class Reference (obsolete)
-
- TQStack Class Reference (obsolete) +
+ QStack Class Reference (obsolete)
-
- TQt Commercial Editions +
+ Qt Commercial Editions
-
- TQt Demo +
+ Qt Demo
-
- TQt Distribution Example +
+ Qt Distribution Example
-
- TQt Editions +
+ Qt Editions
-
- TQt Motif Extension +
+ Qt Motif Extension
-
- TQt Motif Extension - A Migration Walkthrough +
+ Qt Motif Extension - A Migration Walkthrough
-
- TQt Netscape Plugin Extension +
+ Qt Netscape Plugin Extension
-
- TQt Object Model +
+ Qt Object Model
-
- TQt Open Source Edition +
+ Qt Open Source Edition
-
- TQt Open Source Edition License Agreement +
+ Qt Open Source Edition License Agreement
-
- TQt OpenGL 3D Graphics +
+ Qt OpenGL 3D Graphics
-
- TQt Plugins HOWTO +
+ Qt Plugins HOWTO
-
- TQt Reference Documentation (Open Source Edition) +
+ Qt Reference Documentation (Open Source Edition)
-
+
sql-examples
-
- TQt Template Library +
+ Qt Template Library
-
+
qtl
-
- TQt Tutorial #1 - The 14 Steps +
+ Qt Tutorial #1 - The 14 Steps
-
- TQt Tutorial - Chapter 1: Hello, World! +
+ Qt Tutorial - Chapter 10: Smooth as Silk
-
- TQt Tutorial - Chapter 2: Calling it Quits +
+ Qt Tutorial - Chapter 11: Giving It a Shot
-
- TQt Tutorial - Chapter 3: Family Values +
+ Qt Tutorial - Chapter 12: Hanging in the Air the Way Bricks Don't
-
- TQt Tutorial - Chapter 4: Let There Be Widgets +
+ Qt Tutorial - Chapter 13: Game Over
-
- TQt Tutorial - Chapter 5: Building Blocks +
+ Qt Tutorial - Chapter 14: Facing the Wall
-
- TQt Tutorial - Chapter 6: Building Blocks Galore! +
+ Qt Tutorial - Chapter 1: Hello, World!
-
- TQt Tutorial - Chapter 7: One Thing Leads to Another +
+ Qt Tutorial - Chapter 2: Calling it Quits
-
- TQt Tutorial - Chapter 8: Preparing for Battle +
+ Qt Tutorial - Chapter 3: Family Values
-
- TQt Tutorial - Chapter 9: With Cannon You Can +
+ Qt Tutorial - Chapter 4: Let There Be Widgets
-
- TQt Tutorial - Chapter 10: Smooth as Silk +
+ Qt Tutorial - Chapter 5: Building Blocks
-
- TQt Tutorial - Chapter 11: Giving It a Shot +
+ Qt Tutorial - Chapter 6: Building Blocks Galore!
-
- TQt Tutorial - Chapter 12: Hanging in the Air the Way Bricks Don't +
+ Qt Tutorial - Chapter 7: One Thing Leads to Another
-
- TQt Tutorial - Chapter 13: Game Over +
+ Qt Tutorial - Chapter 8: Preparing for Battle
-
- TQt Tutorial - Chapter 14: Facing the Wall +
+ Qt Tutorial - Chapter 9: With Cannon You Can
-
- TQt Widget Hierarchy +
+ Qt Widget Hierarchy
-
- TQt Widget Hierarchy (in-process) +
+ Qt Widget Hierarchy (in-process)
-
+
xml-examples
-
- TQt' OpenGL widgets as an ActiveX (executable) +
+ Qt' OpenGL widgets as an ActiveX (executable)
-
- TQt's Classes +
+ Qt's Classes
-
- TQt's Main Classes +
+ Qt's Main Classes
-
- TQt's Tools +
+ Qt's Tools
-
+
qws
-
- TQt/Embedded as a VNC Server +
+ Qt/Embedded as a VNC Server
-
- TQt/Embedded environment variables +
+ Qt/Embedded environment variables
-
- TQt/Embedded Performance Tuning +
+ Qt/Embedded Performance Tuning
-
- TQt/Embedded Pointer Handling +
+ Qt/Embedded Pointer Handling
-
- TQt/Embedded Virtual Framebuffer +
+ Qt/Embedded Virtual Framebuffer
-
- TQt/Mac is Mac OS X Native +
+ Qt/Mac is Mac OS X Native
-
- TQt/Mac Issues +
+ Qt/Mac Issues
-
- TQVector Class Reference (obsolete) +
+ QVector Class Reference (obsolete)
Range controls @@ -10419,9 +10419,6 @@
The DumpDoc Tool
-
- -
The Feature Definition File
@@ -10560,6 +10557,9 @@
Year 2000 Compliance Statement
+
+ +
canvastext.h
@@ -10713,45 +10713,6 @@
main.cpp
-
- lcdrange.cpp -
-
- lcdrange.h -
-
- main.cpp -
-
- cannon.cpp -
-
- cannon.h -
-
- lcdrange.cpp -
-
- lcdrange.h -
-
- main.cpp -
-
- cannon.cpp -
-
- cannon.h -
-
- lcdrange.cpp -
-
- lcdrange.h -
-
- main.cpp -
cannon.cpp
@@ -10839,6 +10800,45 @@
main.cpp
+
+ lcdrange.cpp +
+
+ lcdrange.h +
+
+ main.cpp +
+
+ cannon.cpp +
+
+ cannon.h +
+
+ lcdrange.cpp +
+
+ lcdrange.h +
+
+ main.cpp +
+
+ cannon.cpp +
+
+ cannon.h +
+
+ lcdrange.cpp +
+
+ lcdrange.h +
+
+ main.cpp +
main.cpp
diff --git a/include/ntqiconview.h b/include/ntqiconview.h index 113ed2d1..329c53b6 120000 --- a/include/ntqiconview.h +++ b/include/ntqiconview.h @@ -1 +1 @@ -../src/widgets/ntqiconview.h \ No newline at end of file +../src/iconview/ntqiconview.h \ No newline at end of file diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index ad4deed3..f1948552 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -287,14 +287,14 @@ class Q_EXPORT TQStyleControlElementData { TQ_UINT32 topLevelWidgetFlags; TQPixmap paletteBgPixmap; -#ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY +#ifdef ENABLE_QSTYLECONTROLELEMENTDATA_SLOW_COPY public: TQStyleControlElementData(const TQStyleControlElementData&); -#else // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY +#else // ENABLE_QSTYLECONTROLELEMENTDATA_SLOW_COPY private: // Disable copy constructor TQStyleControlElementData(const TQStyleControlElementData&); -#endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY +#endif // ENABLE_QSTYLECONTROLELEMENTDATA_SLOW_COPY }; diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 3d6b8cfb..5a8be928 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -1,10 +1,8 @@ +/* A Bison parser, made by GNU Bison 2.5. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton implementation for Bison's Yacc-like parsers in C +/* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -46,7 +44,7 @@ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "2.4.1" +#define YYBISON_VERSION "2.5" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -67,7 +65,7 @@ /* Copy the first part of user declarations. */ -/* Line 189 of yacc.c */ +/* Line 268 of yacc.c */ #line 57 "moc.y" #define MOC_YACC_CODE @@ -701,8 +699,8 @@ extern "C" int hack_isatty( int ) #endif //YYBISON -/* Line 189 of yacc.c */ -#line 706 "moc_yacc" +/* Line 268 of yacc.c */ +#line 704 "moc_yacc" /* Enabling traces. */ #ifndef YYDEBUG @@ -848,7 +846,7 @@ extern "C" int hack_isatty( int ) typedef union YYSTYPE { -/* Line 214 of yacc.c */ +/* Line 293 of yacc.c */ #line 692 "moc.y" char char_val; @@ -862,8 +860,8 @@ typedef union YYSTYPE -/* Line 214 of yacc.c */ -#line 867 "moc_yacc" +/* Line 293 of yacc.c */ +#line 865 "moc_yacc" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ @@ -874,8 +872,8 @@ typedef union YYSTYPE /* Copy the second part of user declarations. */ -/* Line 264 of yacc.c */ -#line 879 "moc_yacc" +/* Line 343 of yacc.c */ +#line 877 "moc_yacc" #ifdef short # undef short @@ -925,7 +923,7 @@ typedef short int yytype_int16; #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) #ifndef YY_ -# if YYENABLE_NLS +# if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include /* INFRINGES ON USER NAME SPACE */ # define YY_(msgid) dgettext ("bison-runtime", msgid) @@ -978,11 +976,11 @@ YYID (yyi) # define alloca _alloca # else # define YYSTACK_ALLOC alloca -# if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # endif @@ -1005,24 +1003,24 @@ YYID (yyi) # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif -# if (defined __cplusplus && ! defined _STDLIB_H \ +# if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include /* INFRINGES ON USER NAME SPACE */ -# ifndef _STDLIB_H -# define _STDLIB_H 1 +# ifndef EXIT_SUCCESS +# define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc -# if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free -# if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \ +# if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif @@ -1051,23 +1049,7 @@ union yyalloc ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) -/* Copy COUNT objects from FROM to TO. The source and destination do - not overlap. */ -# ifndef YYCOPY -# if defined __GNUC__ && 1 < __GNUC__ -# define YYCOPY(To, From, Count) \ - __builtin_memcpy (To, From, (Count) * sizeof (*(From))) -# else -# define YYCOPY(To, From, Count) \ - do \ - { \ - YYSIZE_T yyi; \ - for (yyi = 0; yyi < (Count); yyi++) \ - (To)[yyi] = (From)[yyi]; \ - } \ - while (YYID (0)) -# endif -# endif +# define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of @@ -1087,6 +1069,26 @@ union yyalloc #endif +#if defined YYCOPY_NEEDED && YYCOPY_NEEDED +/* Copy COUNT objects from FROM to TO. The source and destination do + not overlap. */ +# ifndef YYCOPY +# if defined __GNUC__ && 1 < __GNUC__ +# define YYCOPY(To, From, Count) \ + __builtin_memcpy (To, From, (Count) * sizeof (*(From))) +# else +# define YYCOPY(To, From, Count) \ + do \ + { \ + YYSIZE_T yyi; \ + for (yyi = 0; yyi < (Count); yyi++) \ + (To)[yyi] = (From)[yyi]; \ + } \ + while (YYID (0)) +# endif +# endif +#endif /* !YYCOPY_NEEDED */ + /* YYFINAL -- State number of the termination state. */ #define YYFINAL 2 /* YYLAST -- Last index in YYTABLE. */ @@ -1469,8 +1471,8 @@ static const yytype_uint8 yyr2[] = 3, 3, 3, 3, 3, 3, 0, 2, 0, 2 }; -/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state - STATE-NUM when YYTABLE doesn't specify something else to do. Zero +/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM. + Performed when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ static const yytype_uint16 yydefact[] = { @@ -1623,8 +1625,7 @@ static const yytype_int16 yypgoto[] = /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which - number is the opposite. If zero, do what YYDEFACT says. - If YYTABLE_NINF, syntax error. */ + number is the opposite. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -276 static const yytype_int16 yytable[] = { @@ -1692,6 +1693,12 @@ static const yytype_int16 yytable[] = 0, 0, 255 }; +#define yypact_value_is_default(yystate) \ + ((yystate) == (-356)) + +#define yytable_value_is_error(yytable_value) \ + YYID (0) + static const yytype_int16 yycheck[] = { 26, 13, 160, 226, 20, 245, 266, 164, 229, 168, @@ -1826,9 +1833,18 @@ static const yytype_uint8 yystos[] = /* Like YYERROR except do call yyerror. This remains here temporarily to ease the transition to the new meaning of YYERROR, for GCC. - Once GCC version 2 has supplanted version 1, this can go. */ + Once GCC version 2 has supplanted version 1, this can go. However, + YYFAIL appears to be in use. Nevertheless, it is formally deprecated + in Bison 2.4.2's NEWS entry, where a plan to phase it out is + discussed. */ #define YYFAIL goto yyerrlab +#if defined YYFAIL + /* This is here to suppress warnings from the GCC cpp's + -Wunused-macros. Normally we don't worry about that warning, but + some users do, and we want to make it easy for users to remove + YYFAIL uses, which will produce warnings from Bison 2.5. */ +#endif #define YYRECOVERING() (!!yyerrstatus) @@ -1838,7 +1854,6 @@ do \ { \ yychar = (Token); \ yylval = (Value); \ - yytoken = YYTRANSLATE (yychar); \ YYPOPSTACK (1); \ goto yybackup; \ } \ @@ -1880,19 +1895,10 @@ while (YYID (0)) #endif -/* YY_LOCATION_PRINT -- Print the location on the stream. - This macro was not mandated originally: define only if we know - we won't break user code: when these are the locations we know. */ +/* This macro is provided for backward compatibility. */ #ifndef YY_LOCATION_PRINT -# if YYLTYPE_IS_TRIVIAL -# define YY_LOCATION_PRINT(File, Loc) \ - fprintf (File, "%d.%d-%d.%d", \ - (Loc).first_line, (Loc).first_column, \ - (Loc).last_line, (Loc).last_column) -# else -# define YY_LOCATION_PRINT(File, Loc) ((void) 0) -# endif +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) #endif @@ -2084,7 +2090,6 @@ int yydebug; # define YYMAXDEPTH 10000 #endif - #if YYERROR_VERBOSE @@ -2187,115 +2192,142 @@ yytnamerr (char *yyres, const char *yystr) } # endif -/* Copy into YYRESULT an error message about the unexpected token - YYCHAR while in state YYSTATE. Return the number of bytes copied, - including the terminating null byte. If YYRESULT is null, do not - copy anything; just return the number of bytes that would be - copied. As a special case, return 0 if an ordinary "syntax error" - message will do. Return YYSIZE_MAXIMUM if overflow occurs during - size calculation. */ -static YYSIZE_T -yysyntax_error (char *yyresult, int yystate, int yychar) -{ - int yyn = yypact[yystate]; +/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message + about the unexpected token YYTOKEN for the state stack whose top is + YYSSP. - if (! (YYPACT_NINF < yyn && yyn <= YYLAST)) - return 0; - else + Return 0 if *YYMSG was successfully written. Return 1 if *YYMSG is + not large enough to hold the message. In that case, also set + *YYMSG_ALLOC to the required number of bytes. Return 2 if the + required number of bytes is too large to store. */ +static int +yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg, + yytype_int16 *yyssp, int yytoken) +{ + YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]); + YYSIZE_T yysize = yysize0; + YYSIZE_T yysize1; + enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; + /* Internationalized format string. */ + const char *yyformat = 0; + /* Arguments of yyformat. */ + char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; + /* Number of reported tokens (one for the "unexpected", one per + "expected"). */ + int yycount = 0; + + /* There are many possibilities here to consider: + - Assume YYFAIL is not used. It's too flawed to consider. See + + for details. YYERROR is fine as it does not invoke this + function. + - If this state is a consistent state with a default action, then + the only way this function was invoked is if the default action + is an error action. In that case, don't check for expected + tokens because there are none. + - The only way there can be no lookahead present (in yychar) is if + this state is a consistent state with a default action. Thus, + detecting the absence of a lookahead is sufficient to determine + that there is no unexpected or expected token to report. In that + case, just report a simple "syntax error". + - Don't assume there isn't a lookahead just because this state is a + consistent state with a default action. There might have been a + previous inconsistent state, consistent state with a non-default + action, or user semantic action that manipulated yychar. + - Of course, the expected token list depends on states to have + correct lookahead information, and it depends on the parser not + to perform extra reductions after fetching a lookahead from the + scanner and before detecting a syntax error. Thus, state merging + (from LALR or IELR) and default reductions corrupt the expected + token list. However, the list is correct for canonical LR with + one exception: it will still contain any token that will not be + accepted due to an error action in a later state. + */ + if (yytoken != YYEMPTY) { - int yytype = YYTRANSLATE (yychar); - YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]); - YYSIZE_T yysize = yysize0; - YYSIZE_T yysize1; - int yysize_overflow = 0; - enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 }; - char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM]; - int yyx; - -# if 0 - /* This is so xgettext sees the translatable formats that are - constructed on the fly. */ - YY_("syntax error, unexpected %s"); - YY_("syntax error, unexpected %s, expecting %s"); - YY_("syntax error, unexpected %s, expecting %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s"); - YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"); -# endif - char *yyfmt; - char const *yyf; - static char const yyunexpected[] = "syntax error, unexpected %s"; - static char const yyexpecting[] = ", expecting %s"; - static char const yyor[] = " or %s"; - char yyformat[sizeof yyunexpected - + sizeof yyexpecting - 1 - + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2) - * (sizeof yyor - 1))]; - char const *yyprefix = yyexpecting; - - /* Start YYX at -YYN if negative to avoid negative indexes in - YYCHECK. */ - int yyxbegin = yyn < 0 ? -yyn : 0; - - /* Stay within bounds of both yycheck and yytname. */ - int yychecklim = YYLAST - yyn + 1; - int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; - int yycount = 1; - - yyarg[0] = yytname[yytype]; - yyfmt = yystpcpy (yyformat, yyunexpected); - - for (yyx = yyxbegin; yyx < yyxend; ++yyx) - if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) - { - if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) - { - yycount = 1; - yysize = yysize0; - yyformat[sizeof yyunexpected - 1] = '\0'; - break; - } - yyarg[yycount++] = yytname[yyx]; - yysize1 = yysize + yytnamerr (0, yytname[yyx]); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; - yyfmt = yystpcpy (yyfmt, yyprefix); - yyprefix = yyor; - } + int yyn = yypact[*yyssp]; + yyarg[yycount++] = yytname[yytoken]; + if (!yypact_value_is_default (yyn)) + { + /* Start YYX at -YYN if negative to avoid negative indexes in + YYCHECK. In other words, skip the first -YYN actions for + this state because they are default actions. */ + int yyxbegin = yyn < 0 ? -yyn : 0; + /* Stay within bounds of both yycheck and yytname. */ + int yychecklim = YYLAST - yyn + 1; + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; + int yyx; + + for (yyx = yyxbegin; yyx < yyxend; ++yyx) + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR + && !yytable_value_is_error (yytable[yyx + yyn])) + { + if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) + { + yycount = 1; + yysize = yysize0; + break; + } + yyarg[yycount++] = yytname[yyx]; + yysize1 = yysize + yytnamerr (0, yytname[yyx]); + if (! (yysize <= yysize1 + && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; + } + } + } - yyf = YY_(yyformat); - yysize1 = yysize + yystrlen (yyf); - yysize_overflow |= (yysize1 < yysize); - yysize = yysize1; + switch (yycount) + { +# define YYCASE_(N, S) \ + case N: \ + yyformat = S; \ + break + YYCASE_(0, YY_("syntax error")); + YYCASE_(1, YY_("syntax error, unexpected %s")); + YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); + YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); + YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); + YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); +# undef YYCASE_ + } - if (yysize_overflow) - return YYSIZE_MAXIMUM; + yysize1 = yysize + yystrlen (yyformat); + if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + return 2; + yysize = yysize1; - if (yyresult) - { - /* Avoid sprintf, as that infringes on the user's name space. - Don't have undefined behavior even if the translation - produced a string with the wrong number of "%s"s. */ - char *yyp = yyresult; - int yyi = 0; - while ((*yyp = *yyf) != '\0') - { - if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) - { - yyp += yytnamerr (yyp, yyarg[yyi++]); - yyf += 2; - } - else - { - yyp++; - yyf++; - } - } - } - return yysize; + if (*yymsg_alloc < yysize) + { + *yymsg_alloc = 2 * yysize; + if (! (yysize <= *yymsg_alloc + && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) + *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; + return 1; } + + /* Avoid sprintf, as that infringes on the user's name space. + Don't have undefined behavior even if the translation + produced a string with the wrong number of "%s"s. */ + { + char *yyp = *yymsg; + int yyi = 0; + while ((*yyp = *yyformat) != '\0') + if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) + { + yyp += yytnamerr (yyp, yyarg[yyi++]); + yyformat += 2; + } + else + { + yyp++; + yyformat++; + } + } + return 0; } #endif /* YYERROR_VERBOSE */ - /*-----------------------------------------------. | Release the memory associated to this symbol. | @@ -2328,6 +2360,7 @@ yydestruct (yymsg, yytype, yyvaluep) } } + /* Prevent warnings from -Wmissing-prototypes. */ #ifdef YYPARSE_PARAM #if defined __STDC__ || defined __cplusplus @@ -2354,10 +2387,9 @@ YYSTYPE yylval; int yynerrs; - -/*-------------------------. -| yyparse or yypush_parse. | -`-------------------------*/ +/*----------. +| yyparse. | +`----------*/ #ifdef YYPARSE_PARAM #if (defined __STDC__ || defined __C99__FUNC__ \ @@ -2381,8 +2413,6 @@ yyparse () #endif #endif { - - int yystate; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; @@ -2537,7 +2567,7 @@ yybackup: /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; - if (yyn == YYPACT_NINF) + if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ @@ -2568,8 +2598,8 @@ yybackup: yyn = yytable[yyn]; if (yyn <= 0) { - if (yyn == 0 || yyn == YYTABLE_NINF) - goto yyerrlab; + if (yytable_value_is_error (yyn)) + goto yyerrlab; yyn = -yyn; goto yyreduce; } @@ -2624,21 +2654,21 @@ yyreduce: { case 11: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 824 "moc.y" { enterNameSpace((yyvsp[(2) - (2)].string)); } break; case 12: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 825 "moc.y" { BEGIN IN_NAMESPACE; } break; case 13: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 827 "moc.y" { leaveNameSpace(); selectOutsideClassState(); @@ -2647,21 +2677,21 @@ yyreduce: case 14: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 832 "moc.y" { enterNameSpace(); } break; case 15: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 833 "moc.y" { BEGIN IN_NAMESPACE; } break; case 16: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 835 "moc.y" { leaveNameSpace(); selectOutsideClassState(); @@ -2670,42 +2700,42 @@ yyreduce: case 18: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 844 "moc.y" { selectOutsideClassState(); } break; case 19: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 848 "moc.y" { selectOutsideClassState(); } break; case 20: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 851 "moc.y" { selectOutsideClassState(); } break; case 21: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 852 "moc.y" { selectOutsideClassState(); } break; case 22: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 855 "moc.y" { initClass(); } break; case 23: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 856 "moc.y" { generateClass(); registerClassInNamespace(); @@ -2714,21 +2744,21 @@ yyreduce: case 24: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 864 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 25: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 865 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 26: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 869 "moc.y" { g->tmpExpression = rmWS( g->tmpExpression ); (yyval.string) = stradd( (yyvsp[(1) - (4)].string), "<", @@ -2737,7 +2767,7 @@ yyreduce: case 27: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 880 "moc.y" { initExpression(); templLevel = 1; @@ -2746,7 +2776,7 @@ yyreduce: case 28: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 893 "moc.y" { initExpression(); BEGIN IN_EXPR; } @@ -2754,14 +2784,14 @@ yyreduce: case 29: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 902 "moc.y" { BEGIN IN_DEF_ARG; } break; case 30: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 905 "moc.y" { initExpression(); BEGIN IN_ENUM; } @@ -2769,210 +2799,210 @@ yyreduce: case 31: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 911 "moc.y" { (yyval.string) = ""; } break; case 32: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 912 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 33: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 913 "moc.y" { (yyval.string) = ""; } break; case 34: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 914 "moc.y" { skipFunc = TRUE; (yyval.string) = ""; } break; case 35: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 915 "moc.y" { skipFunc = TRUE; (yyval.string) = ""; } break; case 36: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 919 "moc.y" { (yyval.string) = straddSpc((yyvsp[(1) - (3)].string),(yyvsp[(2) - (3)].string),(yyvsp[(3) - (3)].string)); } break; case 37: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 921 "moc.y" { (yyval.string) = ""; } break; case 38: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 922 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 39: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 925 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 40: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 926 "moc.y" { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); } break; case 43: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 931 "moc.y" { skipFunc = TRUE; } break; case 45: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 935 "moc.y" { } break; case 46: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 936 "moc.y" { } break; case 47: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 939 "moc.y" { (yyval.string) = "const"; } break; case 48: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 940 "moc.y" { (yyval.string) = "volatile"; } break; case 49: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 943 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 50: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 944 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 51: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 945 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 52: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 949 "moc.y" { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); } break; case 53: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 950 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 54: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 953 "moc.y" { (yyval.string) = "char"; } break; case 55: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 954 "moc.y" { (yyval.string) = "short"; } break; case 56: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 955 "moc.y" { (yyval.string) = "int"; } break; case 57: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 956 "moc.y" { (yyval.string) = "long"; } break; case 58: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 957 "moc.y" { (yyval.string) = "signed"; } break; case 59: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 958 "moc.y" { (yyval.string) = "unsigned"; } break; case 60: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 959 "moc.y" { (yyval.string) = "float"; } break; case 61: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 960 "moc.y" { (yyval.string) = "double"; } break; case 62: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 961 "moc.y" { (yyval.string) = "void"; } break; case 63: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 965 "moc.y" { g->tmpExpression = rmWS( g->tmpExpression ); (yyval.string) = stradd( "template<", @@ -2981,7 +3011,7 @@ yyreduce: case 65: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 971 "moc.y" { templateClassOld = templateClass; templateClass = TRUE; @@ -2990,77 +3020,77 @@ yyreduce: case 66: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 977 "moc.y" { (yyval.string) = "class"; } break; case 67: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 978 "moc.y" { (yyval.string) = "struct"; } break; case 68: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 981 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 69: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 983 "moc.y" { (yyval.string) = stradd( "::", (yyvsp[(2) - (2)].string) ); } break; case 70: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 987 "moc.y" { (yyval.string) = stradd( (yyvsp[(1) - (3)].string), "::", (yyvsp[(3) - (3)].string) );} break; case 71: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 988 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 72: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 992 "moc.y" { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); } break; case 73: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 993 "moc.y" { (yyval.string) = stradd("enum ",(yyvsp[(2) - (2)].string)); } break; case 74: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 994 "moc.y" { (yyval.string) = stradd("union ",(yyvsp[(2) - (2)].string)); } break; case 75: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 999 "moc.y" { (yyval.arg_list) = (yyvsp[(1) - (2)].arg_list);} break; case 76: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1000 "moc.y" { (yyval.arg_list) = (yyvsp[(1) - (3)].arg_list); func_warn("Ellipsis not supported" @@ -3070,28 +3100,28 @@ yyreduce: case 77: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1006 "moc.y" { (yyval.arg_list) = tmpArgList; } break; case 78: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1007 "moc.y" { (yyval.arg_list) = (yyvsp[(1) - (1)].arg_list); } break; case 79: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1010 "moc.y" { (yyval.arg) = 0; } break; case 82: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1015 "moc.y" { func_warn("Ellipsis not supported" " in signals and slots.\n" @@ -3100,91 +3130,91 @@ yyreduce: case 83: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1023 "moc.y" { (yyval.arg_list) = addArg((yyvsp[(3) - (3)].arg)); } break; case 84: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1024 "moc.y" { (yyval.arg_list) = addArg((yyvsp[(1) - (1)].arg)); } break; case 85: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1028 "moc.y" { (yyval.arg) = new Argument(straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)),""); } break; case 86: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1030 "moc.y" { expLevel = 1; } break; case 87: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1032 "moc.y" { (yyval.arg) = new Argument(straddSpc((yyvsp[(1) - (5)].string),(yyvsp[(2) - (5)].string)),"", 0, TRUE ); } break; case 88: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1035 "moc.y" { (yyval.arg) = new Argument(straddSpc((yyvsp[(1) - (4)].string),(yyvsp[(2) - (4)].string)),(yyvsp[(4) - (4)].string), (yyvsp[(3) - (4)].string)); } break; case 89: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1038 "moc.y" { expLevel = 1; } break; case 90: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1040 "moc.y" { (yyval.arg) = new Argument(straddSpc((yyvsp[(1) - (7)].string),(yyvsp[(2) - (7)].string)),(yyvsp[(4) - (7)].string), (yyvsp[(3) - (7)].string), TRUE); } break; case 91: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1044 "moc.y" { (yyval.string) = ""; } break; case 92: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1045 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 93: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1049 "moc.y" { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); } break; case 94: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1050 "moc.y" { expLevel = 1; } break; case 95: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1052 "moc.y" { (yyval.string) = stradd( "[", g->tmpExpression = @@ -3193,14 +3223,14 @@ yyreduce: case 96: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1055 "moc.y" { expLevel = 1; } break; case 97: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1057 "moc.y" { (yyval.string) = stradd( (yyvsp[(1) - (5)].string),"[", g->tmpExpression = @@ -3209,42 +3239,42 @@ yyreduce: case 98: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1060 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 99: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1061 "moc.y" { (yyval.string) = (yyvsp[(2) - (3)].string); } break; case 100: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1064 "moc.y" { (yyval.string) = ""; } break; case 101: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1066 "moc.y" { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string));} break; case 102: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1067 "moc.y" { expLevel = 1; } break; case 103: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1069 "moc.y" { (yyval.string) = stradd( (yyvsp[(1) - (5)].string),"[", g->tmpExpression = @@ -3253,14 +3283,14 @@ yyreduce: case 104: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1072 "moc.y" { (yyval.string) = (yyvsp[(2) - (3)].string); } break; case 106: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1086 "moc.y" { tmpFunc->args = (yyvsp[(2) - (8)].arg_list); tmpFunc->qualifier = (yyvsp[(4) - (8)].string); } @@ -3268,154 +3298,154 @@ yyreduce: case 108: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1092 "moc.y" { func_warn("Variable as signal or slot."); } break; case 109: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1093 "moc.y" { expLevel=0; } break; case 110: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1095 "moc.y" { skipFunc = TRUE; } break; case 111: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1096 "moc.y" { expLevel=0; } break; case 112: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1098 "moc.y" { skipFunc = TRUE; } break; case 113: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1102 "moc.y" { expLevel = 1; } break; case 115: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1104 "moc.y" { expLevel = 1; } break; case 117: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1109 "moc.y" { (yyval.string) = ""; } break; case 118: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1110 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 119: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1113 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 120: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1114 "moc.y" { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string));} break; case 121: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1117 "moc.y" { (yyval.string) = straddSpc("*",(yyvsp[(2) - (2)].string));} break; case 122: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1118 "moc.y" { (yyval.string) = stradd("&",(yyvsp[(2) - (2)].string));} break; case 123: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1125 "moc.y" { (yyval.string) = ""; } break; case 124: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1126 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 125: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1129 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 126: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1131 "moc.y" { (yyval.string) = straddSpc((yyvsp[(1) - (2)].string),(yyvsp[(2) - (2)].string)); } break; case 127: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1134 "moc.y" { (yyval.string) = "const"; } break; case 128: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1135 "moc.y" { (yyval.string) = "volatile"; } break; case 132: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1143 "moc.y" { BEGIN IN_FCT; fctLevel = 1;} break; case 133: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1144 "moc.y" { BEGIN QT_DEF; } break; case 134: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1151 "moc.y" { BEGIN IN_CLASS; classPLevel = 1; @@ -3424,14 +3454,14 @@ yyreduce: case 135: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1155 "moc.y" { BEGIN QT_DEF; } break; case 136: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1156 "moc.y" { BEGIN QT_DEF; /* -- " -- */ skipClass = TRUE; } @@ -3439,7 +3469,7 @@ yyreduce: case 137: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1158 "moc.y" { BEGIN QT_DEF; /* -- " -- */ skipClass = TRUE; } @@ -3447,7 +3477,7 @@ yyreduce: case 138: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1160 "moc.y" { BEGIN QT_DEF; /* -- " -- */ skipClass = TRUE; } @@ -3455,7 +3485,7 @@ yyreduce: case 139: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1164 "moc.y" { BEGIN QT_DEF; /* catch ';' */ skipClass = TRUE; } @@ -3463,7 +3493,7 @@ yyreduce: case 140: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1166 "moc.y" { skipClass = TRUE; BEGIN GIMME_SEMICOLON; } @@ -3471,14 +3501,14 @@ yyreduce: case 144: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1173 "moc.y" { (yyval.string) = ""; } break; case 146: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1179 "moc.y" { g->className = (yyvsp[(2) - (2)].string); if ( g->className == "TQObject" ) @@ -3488,7 +3518,7 @@ yyreduce: case 147: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1185 "moc.y" { g->className = (yyvsp[(3) - (3)].string); if ( g->className == "TQObject" ) @@ -3498,49 +3528,49 @@ yyreduce: case 148: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1192 "moc.y" { g->superClassName = (yyvsp[(2) - (2)].string); } break; case 149: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1197 "moc.y" { templateClass = templateClassOld; } break; case 158: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1220 "moc.y" { expLevel = 1; } break; case 160: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1225 "moc.y" { (yyval.string) = 0; } break; case 161: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1226 "moc.y" { (yyval.string) = (yyvsp[(1) - (1)].string); } break; case 166: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1238 "moc.y" { tmpAccess = (yyvsp[(1) - (1)].access); } break; case 167: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1239 "moc.y" { moc_err( "Missing access specifier" " before \"slots:\"." ); } @@ -3548,21 +3578,21 @@ yyreduce: case 168: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1243 "moc.y" { BEGIN QT_DEF; } break; case 170: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1245 "moc.y" { BEGIN QT_DEF; } break; case 172: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1247 "moc.y" { if ( tmpAccess ) @@ -3576,7 +3606,7 @@ yyreduce: case 173: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1255 "moc.y" { tmpYYStart = YY_START; tmpPropOverride = FALSE; @@ -3585,7 +3615,7 @@ yyreduce: case 174: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1258 "moc.y" { BEGIN tmpYYStart; @@ -3594,7 +3624,7 @@ yyreduce: case 176: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1262 "moc.y" { tmpYYStart = YY_START; tmpPropOverride = TRUE; @@ -3603,7 +3633,7 @@ yyreduce: case 177: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1265 "moc.y" { BEGIN tmpYYStart; @@ -3612,14 +3642,14 @@ yyreduce: case 179: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1269 "moc.y" { tmpYYStart = YY_START; BEGIN IN_CLASSINFO; } break; case 180: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1271 "moc.y" { g->infos.append( new ClassInfo( (yyvsp[(4) - (7)].string), (yyvsp[(6) - (7)].string) ) ); @@ -3629,14 +3659,14 @@ yyreduce: case 182: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1276 "moc.y" { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } break; case 183: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1277 "moc.y" { TQ_PROPERTYdetected = TRUE; @@ -3646,14 +3676,14 @@ yyreduce: case 185: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1282 "moc.y" { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } break; case 186: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1283 "moc.y" { TQ_PROPERTYdetected = TRUE; @@ -3663,7 +3693,7 @@ yyreduce: case 188: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1290 "moc.y" { moc_err( "Signals cannot " "have access specifiers" ); } @@ -3671,7 +3701,7 @@ yyreduce: case 190: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1293 "moc.y" { if ( tmpAccess == Public && TQ_PROPERTYdetected ) BEGIN QT_DEF; @@ -3683,7 +3713,7 @@ yyreduce: case 191: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1300 "moc.y" { suppress_func_warn = FALSE; @@ -3692,7 +3722,7 @@ yyreduce: case 192: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1303 "moc.y" { BEGIN IN_CLASS; if ( classPLevel != 1 ) @@ -3703,161 +3733,161 @@ yyreduce: case 197: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1318 "moc.y" { addMember( PropertyCandidateMember ); } break; case 202: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1330 "moc.y" { addMember( SignalMember ); } break; case 207: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1341 "moc.y" { addMember( SlotMember ); } break; case 210: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1348 "moc.y" { (yyval.string)=(yyvsp[(2) - (2)].string); } break; case 211: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1351 "moc.y" { g->multipleSuperClasses.append( (yyvsp[(3) - (3)].string) ); } break; case 213: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1356 "moc.y" { (yyval.string) = stradd( (yyvsp[(1) - (4)].string), "(", (yyvsp[(3) - (4)].string), ")" ); } break; case 214: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1358 "moc.y" { (yyval.string) = stradd( (yyvsp[(1) - (4)].string), "(", (yyvsp[(3) - (4)].string), ")" ); } break; case 215: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1361 "moc.y" {(yyval.string)=(yyvsp[(1) - (1)].string);} break; case 216: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1362 "moc.y" {(yyval.string)=(yyvsp[(3) - (3)].string);} break; case 217: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1363 "moc.y" {(yyval.string)=(yyvsp[(2) - (2)].string);} break; case 218: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1364 "moc.y" {(yyval.string)=(yyvsp[(3) - (3)].string);} break; case 219: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1365 "moc.y" {(yyval.string)=(yyvsp[(2) - (2)].string);} break; case 220: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1366 "moc.y" {(yyval.string)=(yyvsp[(1) - (1)].string);} break; case 221: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1367 "moc.y" {(yyval.string)=(yyvsp[(3) - (3)].string);} break; case 222: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1368 "moc.y" {(yyval.string)=(yyvsp[(2) - (2)].string);} break; case 223: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1369 "moc.y" {(yyval.string)=(yyvsp[(3) - (3)].string);} break; case 224: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1370 "moc.y" {(yyval.string)=(yyvsp[(2) - (2)].string);} break; case 225: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1373 "moc.y" { (yyval.access)=Private; } break; case 226: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1374 "moc.y" { (yyval.access)=Protected; } break; case 227: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1375 "moc.y" { (yyval.access)=Public; } break; case 228: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1378 "moc.y" { } break; case 229: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1379 "moc.y" { } break; case 271: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1427 "moc.y" { tmpFunc->type = (yyvsp[(1) - (2)].string); tmpFunc->name = (yyvsp[(2) - (2)].string); } @@ -3865,7 +3895,7 @@ yyreduce: case 272: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1430 "moc.y" { tmpFunc->type = "int"; tmpFunc->name = (yyvsp[(1) - (1)].string); @@ -3877,7 +3907,7 @@ yyreduce: case 273: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1437 "moc.y" { tmpFunc->type = "void"; tmpFunc->name = "~"; @@ -3889,7 +3919,7 @@ yyreduce: case 274: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1445 "moc.y" { char *tmp = @@ -3901,14 +3931,14 @@ yyreduce: case 275: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1452 "moc.y" { skipFunc = TRUE; } break; case 276: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1454 "moc.y" { tmpFunc->type = straddSpc((yyvsp[(1) - (3)].string),(yyvsp[(2) - (3)].string)); @@ -3917,7 +3947,7 @@ yyreduce: case 277: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1459 "moc.y" { tmpFunc->type = straddSpc((yyvsp[(1) - (4)].string),(yyvsp[(2) - (4)].string),(yyvsp[(3) - (4)].string)); @@ -3926,77 +3956,77 @@ yyreduce: case 278: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1463 "moc.y" { operatorError(); } break; case 279: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1465 "moc.y" { operatorError(); } break; case 280: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1468 "moc.y" { operatorError(); } break; case 281: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1470 "moc.y" { operatorError(); } break; case 282: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1473 "moc.y" { operatorError(); } break; case 284: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1479 "moc.y" { func_warn("Unexpected variable declaration."); } break; case 285: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1482 "moc.y" { func_warn("Unexpected variable declaration."); } break; case 286: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1484 "moc.y" { func_warn("Unexpected enum declaration."); } break; case 287: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1486 "moc.y" { func_warn("Unexpected using declaration."); } break; case 288: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1488 "moc.y" { func_warn("Unexpected using declaration."); } break; case 289: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1490 "moc.y" { classPLevel++; moc_err("Unexpected namespace declaration."); } @@ -4004,14 +4034,14 @@ yyreduce: case 290: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1493 "moc.y" { func_warn("Unexpected class declaration.");} break; case 291: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1495 "moc.y" { func_warn("Unexpected class declaration."); BEGIN IN_FCT; fctLevel=1; @@ -4020,42 +4050,42 @@ yyreduce: case 292: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1498 "moc.y" { BEGIN QT_DEF; } break; case 296: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1507 "moc.y" { } break; case 297: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1508 "moc.y" { expLevel = 0; } break; case 299: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1510 "moc.y" { expLevel = 0; } break; case 302: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1515 "moc.y" { expLevel = 0; } break; case 307: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1530 "moc.y" { BEGIN QT_DEF; if ( tmpAccess == Public) { @@ -4067,42 +4097,42 @@ yyreduce: case 308: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1537 "moc.y" { tmpEnum->clear();} break; case 310: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1541 "moc.y" { } break; case 314: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1549 "moc.y" { if ( tmpAccess == Public) tmpEnum->append( (yyvsp[(1) - (1)].string) ); } break; case 315: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1550 "moc.y" { enumLevel=0; } break; case 316: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1551 "moc.y" { if ( tmpAccess == Public) tmpEnum->append( (yyvsp[(1) - (4)].string) ); } break; case 317: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1555 "moc.y" { g->propWrite = ""; @@ -4123,7 +4153,7 @@ yyreduce: case 318: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1571 "moc.y" { if ( g->propRead.isEmpty() && !g->propOverride ) @@ -4147,80 +4177,91 @@ yyreduce: case 320: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1592 "moc.y" { g->propRead = (yyvsp[(2) - (3)].string); } break; case 321: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1593 "moc.y" { g->propWrite = (yyvsp[(2) - (3)].string); } break; case 322: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1594 "moc.y" { g->propReset = (yyvsp[(2) - (3)].string); } break; case 323: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1595 "moc.y" { g->propStored = (yyvsp[(2) - (3)].string); } break; case 324: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1596 "moc.y" { g->propDesignable = (yyvsp[(2) - (3)].string); } break; case 325: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1597 "moc.y" { g->propScriptable = (yyvsp[(2) - (3)].string); } break; case 326: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1600 "moc.y" { } break; case 327: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1601 "moc.y" { g->qtEnums.append( (yyvsp[(1) - (2)].string) ); } break; case 328: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1604 "moc.y" { } break; case 329: -/* Line 1455 of yacc.c */ +/* Line 1806 of yacc.c */ #line 1605 "moc.y" { g->qtSets.append( (yyvsp[(1) - (2)].string) ); } break; -/* Line 1455 of yacc.c */ -#line 4222 "moc_yacc" +/* Line 1806 of yacc.c */ +#line 4252 "moc_yacc" default: break; } + /* User semantic actions sometimes alter yychar, and that requires + that yytoken be updated with the new translation. We take the + approach of translating immediately before every use of yytoken. + One alternative is translating here after every semantic action, + but that translation would be missed if the semantic action invokes + YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or + if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an + incorrect destructor might then be invoked immediately. In the + case of YYERROR or YYBACKUP, subsequent parser actions might lead + to an incorrect destructor call or verbose syntax error message + before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YYPOPSTACK (yylen); @@ -4248,6 +4289,10 @@ yyreduce: | yyerrlab -- here on detecting error | `------------------------------------*/ yyerrlab: + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); + /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { @@ -4255,37 +4300,36 @@ yyerrlab: #if ! YYERROR_VERBOSE yyerror (YY_("syntax error")); #else +# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ + yyssp, yytoken) { - YYSIZE_T yysize = yysyntax_error (0, yystate, yychar); - if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) - { - YYSIZE_T yyalloc = 2 * yysize; - if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM)) - yyalloc = YYSTACK_ALLOC_MAXIMUM; - if (yymsg != yymsgbuf) - YYSTACK_FREE (yymsg); - yymsg = (char *) YYSTACK_ALLOC (yyalloc); - if (yymsg) - yymsg_alloc = yyalloc; - else - { - yymsg = yymsgbuf; - yymsg_alloc = sizeof yymsgbuf; - } - } - - if (0 < yysize && yysize <= yymsg_alloc) - { - (void) yysyntax_error (yymsg, yystate, yychar); - yyerror (yymsg); - } - else - { - yyerror (YY_("syntax error")); - if (yysize != 0) - goto yyexhaustedlab; - } + char const *yymsgp = YY_("syntax error"); + int yysyntax_error_status; + yysyntax_error_status = YYSYNTAX_ERROR; + if (yysyntax_error_status == 0) + yymsgp = yymsg; + else if (yysyntax_error_status == 1) + { + if (yymsg != yymsgbuf) + YYSTACK_FREE (yymsg); + yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc); + if (!yymsg) + { + yymsg = yymsgbuf; + yymsg_alloc = sizeof yymsgbuf; + yysyntax_error_status = 2; + } + else + { + yysyntax_error_status = YYSYNTAX_ERROR; + yymsgp = yymsg; + } + } + yyerror (yymsgp); + if (yysyntax_error_status == 2) + goto yyexhaustedlab; } +# undef YYSYNTAX_ERROR #endif } @@ -4344,7 +4388,7 @@ yyerrlab1: for (;;) { yyn = yypact[yystate]; - if (yyn != YYPACT_NINF) + if (!yypact_value_is_default (yyn)) { yyn += YYTERROR; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) @@ -4403,8 +4447,13 @@ yyexhaustedlab: yyreturn: if (yychar != YYEMPTY) - yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); + { + /* Make sure we have latest lookahead translation. See comments at + user semantic actions for why this is necessary. */ + yytoken = YYTRANSLATE (yychar); + yydestruct ("Cleanup: discarding lookahead", + yytoken, &yylval); + } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); @@ -4429,7 +4478,7 @@ yyreturn: -/* Line 1675 of yacc.c */ +/* Line 2067 of yacc.c */ #line 1608 "moc.y" diff --git a/src/moc/moc_yacc.h b/src/moc/moc_yacc.h index 3b3a7c15..9f47feba 100644 --- a/src/moc/moc_yacc.h +++ b/src/moc/moc_yacc.h @@ -1,10 +1,8 @@ +/* A Bison parser, made by GNU Bison 2.5. */ -/* A Bison parser, made by GNU Bison 2.4.1. */ - -/* Skeleton interface for Bison's Yacc-like parsers in C +/* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 - Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -158,7 +156,7 @@ typedef union YYSTYPE { -/* Line 1676 of yacc.c */ +/* Line 2068 of yacc.c */ #line 692 "moc.y" char char_val; @@ -172,8 +170,8 @@ typedef union YYSTYPE -/* Line 1676 of yacc.c */ -#line 177 "moc_yacc.h" +/* Line 2068 of yacc.c */ +#line 175 "moc_yacc.h" } YYSTYPE; # define YYSTYPE_IS_TRIVIAL 1 # define yystype YYSTYPE /* obsolescent; will be withdrawn */ diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp index 9c70bf02..929f7960 100644 --- a/src/tools/qsettings.cpp +++ b/src/tools/qsettings.cpp @@ -470,7 +470,7 @@ TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format ) #endif TQString home; - home = getenv("TQT_HOME_DIR"); + home = getenv("QT_HOME_DIR"); if ( !home.isEmpty() ) { home += "/"; TQFileInfo i( home + "qtrc" ); @@ -532,7 +532,7 @@ TQSettingsPrivate::TQSettingsPrivate( TQSettings::Format format ) searchPaths.append(defPath); TQString system; - system = getenv("TQT_SYSTEM_DIR"); + system = getenv("QT_SYSTEM_DIR"); if ( !system.isEmpty() && system[0] == '/') { TQFileInfo i( system + "/qtrc" ); if ( i.isReadable() ) { diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 2610a2cd..10f0a6d2 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -46,9 +46,9 @@ #endif // WARNING -// When MAKE_TQSTRING_THREAD_SAFE is defined, overall TQt3 performance suffers badly! +// When MAKE_QSTRING_THREAD_SAFE is defined, overall TQt3 performance suffers badly! // TQString is thread unsafe in many other areas; perhaps this option is not even useful? -// #define MAKE_TQSTRING_THREAD_SAFE 1 +// #define MAKE_QSTRING_THREAD_SAFE 1 #include "ntqstring.h" #include "ntqregexp.h" @@ -93,9 +93,9 @@ #define ULLONG_MAX TQ_UINT64_C(18446744073709551615) #endif -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) #include "ntqmutex.h" -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE extern TQMutex *tqt_sharedStringMutex; @@ -1053,9 +1053,9 @@ TQStringData::TQStringData() : TQShared(), maxl(0), islatin1(FALSE), security_unpaged(FALSE) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) mutex = new TQMutex(FALSE); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE ref(); } @@ -1067,9 +1067,9 @@ TQStringData::TQStringData(TQChar *u, uint l, uint m) : TQShared(), maxl(m), islatin1(FALSE), security_unpaged(FALSE) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) mutex = new TQMutex(FALSE); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } TQStringData::~TQStringData() { @@ -1084,12 +1084,12 @@ TQStringData::~TQStringData() { if ( ascii ) { delete[] ascii; } -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) if ( mutex ) { delete mutex; mutex = NULL; } -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } void TQStringData::setDirty() { @@ -1457,14 +1457,14 @@ QT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0); TQStringData* TQString::makeSharedNull() { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) if (tqt_sharedStringMutex) tqt_sharedStringMutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if (TQString::shared_null) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE return TQString::shared_null; } @@ -1474,9 +1474,9 @@ TQStringData* TQString::makeSharedNull() that->d = TQString::shared_null; #endif -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) if (tqt_sharedStringMutex) tqt_sharedStringMutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE return TQString::shared_null; } @@ -1517,13 +1517,13 @@ TQString::TQString( const TQString &s ) : d(s.d) { if ( d && (d != shared_null) ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->ref(); -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } } @@ -1676,20 +1676,20 @@ TQString::~TQString() return; } -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->deref() ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->deleteSelf(); d = NULL; } else { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } } @@ -1711,22 +1711,22 @@ void TQString::real_detach() void TQString::deref() { if ( d && (d != shared_null) ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->deref() ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d != shared_null ) { delete d; } d = 0; } else { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } } } @@ -1769,13 +1769,13 @@ void TQStringData::deleteSelf() TQString &TQString::operator=( const TQString &s ) { if ( s.d && (s.d != shared_null) ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) s.d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE s.d->ref(); -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) s.d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } deref(); d = s.d; @@ -1883,9 +1883,9 @@ void TQString::truncate( uint newLen ) */ void TQString::setLength( uint newLen ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || newLen > d->maxl || ( newLen * 4 < d->maxl && d->maxl > 4 ) ) { @@ -1896,24 +1896,24 @@ void TQString::setLength( uint newLen ) uint len = TQMIN( d->len, newLen ); memcpy( nd, d->unicode, sizeof(TQChar) * len ); bool unpaged = d->security_unpaged; -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE deref(); d = new TQStringData( nd, newLen, newMax ); setSecurityUnPaged(unpaged); } else { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } } else { d->len = newLen; -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->setDirty(); } } @@ -1999,21 +1999,21 @@ void TQString::squeeze() */ void TQString::grow( uint newLen ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || newLen > d->maxl ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE setLength( newLen ); } else { d->len = newLen; -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->setDirty(); } } @@ -6423,19 +6423,19 @@ TQString TQString::fromUcs2( const unsigned short *str ) */ TQChar& TQString::ref(uint i) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( (d->count != 1) || (i >= d->len) ) { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE subat( i ); } else { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } d->setDirty(); return d->unicode[i]; @@ -6523,9 +6523,9 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len ) } } else { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->count != 1 || len > d->maxl || ( len * 4 < d->maxl && d->maxl > 4 ) ) { // detach, grown or shrink uint newMax = computeNewMax( len ); @@ -6533,17 +6533,17 @@ TQString& TQString::setUnicode( const TQChar *unicode, uint len ) if ( unicode ) { memcpy( nd, unicode, sizeof(TQChar)*len ); } -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE deref(); d = new TQStringData( nd, len, newMax ); } else { d->len = len; -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE d->setDirty(); if ( unicode ) { memcpy( d->unicode, unicode, sizeof(TQChar)*len ); @@ -7254,9 +7254,9 @@ TQConstString::TQConstString( const TQChar* unicode, uint length ) : */ TQConstString::~TQConstString() { -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->lock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE if ( d->count > 1 ) { TQChar* cp = QT_ALLOC_QCHAR_VEC( d->len ); @@ -7268,9 +7268,9 @@ TQConstString::~TQConstString() } // The original d->unicode is now unlinked. -#if defined(QT_THREAD_SUPPORT) && defined(MAKE_TQSTRING_THREAD_SAFE) +#if defined(QT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) d->mutex->unlock(); -#endif // QT_THREAD_SUPPORT && MAKE_TQSTRING_THREAD_SAFE +#endif // QT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE } /*!