diff options
Diffstat (limited to 'kdevdesigner/shared')
-rw-r--r-- | kdevdesigner/shared/domtool.cpp | 16 | ||||
-rw-r--r-- | kdevdesigner/shared/domtool.h | 10 | ||||
-rw-r--r-- | kdevdesigner/shared/globaldefs.h | 10 | ||||
-rw-r--r-- | kdevdesigner/shared/parser.cpp | 22 | ||||
-rw-r--r-- | kdevdesigner/shared/parser.h | 8 | ||||
-rw-r--r-- | kdevdesigner/shared/ui2uib.cpp | 184 | ||||
-rw-r--r-- | kdevdesigner/shared/ui2uib.h | 8 | ||||
-rw-r--r-- | kdevdesigner/shared/uib.cpp | 18 | ||||
-rw-r--r-- | kdevdesigner/shared/uib.h | 18 | ||||
-rw-r--r-- | kdevdesigner/shared/widgetdatabase.cpp | 154 | ||||
-rw-r--r-- | kdevdesigner/shared/widgetdatabase.h | 14 |
11 files changed, 231 insertions, 231 deletions
diff --git a/kdevdesigner/shared/domtool.cpp b/kdevdesigner/shared/domtool.cpp index ef995e44..4293224f 100644 --- a/kdevdesigner/shared/domtool.cpp +++ b/kdevdesigner/shared/domtool.cpp @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -352,7 +352,7 @@ static bool toBool( const TQString& s ) } /*! - Convert Qt 2.x format to Qt 3.0 format if necessary + Convert TQt 2.x format to TQt 3.0 format if necessary */ void DomTool::fixDocument( TQDomDocument& doc ) { @@ -404,9 +404,9 @@ void DomTool::fixDocument( TQDomDocument& doc ) bool stdset = toBool( e.attribute( "stdset" ) ); if ( stdset || name == "toolTip" || name == "whatsThis" || name == "buddy" || - e.parentNode().toElement().tagName() == "item" || - e.parentNode().toElement().tagName() == "spacer" || - e.parentNode().toElement().tagName() == "column" + e.tqparentNode().toElement().tagName() == "item" || + e.tqparentNode().toElement().tagName() == "spacer" || + e.tqparentNode().toElement().tagName() == "column" ) e.removeAttribute( "stdset" ); else diff --git a/kdevdesigner/shared/domtool.h b/kdevdesigner/shared/domtool.h index 8f3aa67c..efa67f09 100644 --- a/kdevdesigner/shared/domtool.h +++ b/kdevdesigner/shared/domtool.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -33,7 +33,7 @@ class TQDomElement; class TQDomDocument; -class DomTool : public Qt +class DomTool : public TQt { public: static TQVariant readProperty( const TQDomElement& e, const TQString& name, const TQVariant& defValue ); diff --git a/kdevdesigner/shared/globaldefs.h b/kdevdesigner/shared/globaldefs.h index ce70cae2..655545c6 100644 --- a/kdevdesigner/shared/globaldefs.h +++ b/kdevdesigner/shared/globaldefs.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -44,7 +44,7 @@ static void init_colors() return; #if 0 // a calculated alternative for backColor1 - TQColorGroup myCg = qApp->palette().active(); + TQColorGroup myCg = tqApp->palette().active(); int h1, s1, v1; int h2, s2, v2; myCg.color( TQColorGroup::Base ).hsv( &h1, &s1, &v1 ); diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp index 0affb9d0..03dc57a7 100644 --- a/kdevdesigner/shared/parser.cpp +++ b/kdevdesigner/shared/parser.cpp @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -28,7 +28,7 @@ #include <tqobject.h> #include <tqstringlist.h> -class NormalizeObject : public QObject +class NormalizeObject : public TQObject { public: NormalizeObject() : TQObject() {} @@ -38,9 +38,9 @@ public: TQString Parser::cleanArgs( const TQString &func ) { TQString slot( func ); - int begin = slot.find( "(" ) + 1; + int begin = slot.tqfind( "(" ) + 1; TQString args = slot.mid( begin ); - args = args.left( args.find( ")" ) ); + args = args.left( args.tqfind( ")" ) ); TQStringList lst = TQStringList::split( ',', args ); TQString res = slot.left( begin ); for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { @@ -48,13 +48,13 @@ TQString Parser::cleanArgs( const TQString &func ) res += ","; TQString arg = *it; int pos = 0; - if ( ( pos = arg.find( "&" ) ) != -1 ) { + if ( ( pos = arg.tqfind( "&" ) ) != -1 ) { arg = arg.left( pos + 1 ); - } else if ( ( pos = arg.find( "*" ) ) != -1 ) { + } else if ( ( pos = arg.tqfind( "*" ) ) != -1 ) { arg = arg.left( pos + 1 ); } else { arg = arg.simplifyWhiteSpace(); - if ( ( pos = arg.find( ':' ) ) != -1 ) + if ( ( pos = arg.tqfind( ':' ) ) != -1 ) arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace(); TQStringList l = TQStringList::split( ' ', arg ); if ( l.count() == 2 ) { @@ -68,5 +68,5 @@ TQString Parser::cleanArgs( const TQString &func ) } res += ")"; - return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); + return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); } diff --git a/kdevdesigner/shared/parser.h b/kdevdesigner/shared/parser.h index c50fed89..abec9963 100644 --- a/kdevdesigner/shared/parser.h +++ b/kdevdesigner/shared/parser.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp index 91fa7dee..76c522f9 100644 --- a/kdevdesigner/shared/ui2uib.cpp +++ b/kdevdesigner/shared/ui2uib.cpp @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -89,7 +89,7 @@ string-table is preinitialized with very common strings, so that these need not be stored along with .uib files. - 2. QObjects are referred to by index in a table rather than by + 2. TQObjects are referred to by index in a table rather than by name. The table itself is not stored in the .uib file; it is rather build dynamically by ui2uib and TQWidgetFactory as new objects are specified. In ui2uib, the table is represented by @@ -97,7 +97,7 @@ TQObject pointers suffices. 3. The data is packed to take as little place as possible, - without slowing down QLayoutFactory too much. For example, an + without slowing down TQLayoutFactory too much. For example, an index into the string-table is a 32-bit integer, but in practice it is rarely above 65534, so only 16 bits are used for them; when an index above 65534 is met, the index is @@ -119,9 +119,9 @@ specified. 6. Some of the information stored in a .ui file is useful only - by uic, not to QLayoutFactory. That information is, for now, + by uic, not to TQLayoutFactory. That information is, for now, not taken along in the .uib file. Likewise, needless - QLayoutWidget objects are not taken along. + TQLayoutWidget objects are not taken along. The arbitrary constants related to the .uib file formats are defined in uib.h. Constants such as Block_Actions and @@ -129,25 +129,25 @@ .uib files easier to read in a hexadecimal editor. The file format isn't designed to be extensible. Any extension - that prevents an older version of QLayoutWidget of reading the + that prevents an older version of TQLayoutWidget of reading the file correctly must have a different magic number. The plan is to use UibMagic + 1 for version 2, UibMagic + 2 for version 3, etc. */ -static TQCString layoutForTag( const TQString& tag ) +static TQCString tqlayoutForTag( const TQString& tag ) { if ( tag == "grid" ) { - return "TQGridLayout"; + return TQGRIDLAYOUT_OBJECT_NAME_STRING; } else if ( tag == "hbox" ) { - return "TQHBoxLayout"; + return TQHBOXLAYOUT_OBJECT_NAME_STRING; } else if ( tag == "vbox" ) { - return "TQVBoxLayout"; + return TQVBOXLAYOUT_OBJECT_NAME_STRING; } else { - return "TQLayout"; + return TQLAYOUT_OBJECT_NAME_STRING; } } -class UibHack : public QObject +class UibHack : public TQObject { public: static TQString normalize( const TQString& member ) { @@ -164,7 +164,7 @@ public: int insert() { return next++; } void setName( int no, const TQString& name ); - int find( const TQString& name, int deflt = -1 ) const; + int tqfind( const TQString& name, int deflt = -1 ) const; int count() const { return next; } private: @@ -181,32 +181,32 @@ void UibIndexMap::setName( int no, const TQString& name ) } } -int UibIndexMap::find( const TQString& name, int deflt ) const +int UibIndexMap::tqfind( const TQString& name, int deflt ) const { - TQMap<TQString, int>::ConstIterator no = nameMap.find( name ); - if ( no == nameMap.end() || conflicts.contains(name) ) { + TQMap<TQString, int>::ConstIterator no = nameMap.tqfind( name ); + if ( no == nameMap.end() || conflicts.tqcontains(name) ) { return deflt; } else { return *no; } } -static void packUInt16( TQDataStream& out, Q_UINT16 n ) +static void packUInt16( TQDataStream& out, TQ_UINT16 n ) { if ( n < 255 ) { - out << (Q_UINT8) n; + out << (TQ_UINT8) n; } else { - out << (Q_UINT8) 255; + out << (TQ_UINT8) 255; out << n; } } -static void packUInt32( TQDataStream& out, Q_UINT32 n ) +static void packUInt32( TQDataStream& out, TQ_UINT32 n ) { if ( n < 65535 ) { - out << (Q_UINT16) n; + out << (TQ_UINT16) n; } else { - out << (Q_UINT16) 65535; + out << (TQ_UINT16) 65535; out << n; } } @@ -232,7 +232,7 @@ static void packString( UibStrTable& strings, TQDataStream& out, static void packStringSplit( UibStrTable& strings, TQDataStream& out, const TQString& str, TQChar sep ) { - int pos = str.find( sep ); + int pos = str.tqfind( sep ); if ( pos == -1 ) pos = str.length(); packString( strings, out, str.left(pos) ); @@ -244,7 +244,7 @@ static void packVariant( UibStrTable& strings, TQDataStream& out, { TQStringList::ConstIterator s; - Q_UINT8 type = value.type(); + TQ_UINT8 type = value.type(); if ( tag == "pixmap" ) { type = TQVariant::Pixmap; } else if ( tag == "image" ) { @@ -293,7 +293,7 @@ static void packVariant( UibStrTable& strings, TQDataStream& out, packUInt32( out, value.asInt() ); break; case TQVariant::Bool: - out << (Q_UINT8) value.asBool(); + out << (TQ_UINT8) value.asBool(); break; case TQVariant::Double: out << value.asDouble(); @@ -333,8 +333,8 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo, if ( tag == "font" ) { TQString family; - Q_UINT16 pointSize = 65535; - Q_UINT8 fontFlags = 0; + TQ_UINT16 pointSize = 65535; + TQ_UINT8 fontFlags = 0; TQDomElement g = f.firstChild().toElement(); while ( !g.isNull() ) { @@ -344,7 +344,7 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo, family = text; } else if ( g.tagName() == "pointsize" ) { fontFlags |= Font_PointSize; - pointSize = (Q_UINT16) text.toUInt(); + pointSize = (TQ_UINT16) text.toUInt(); } else { if ( g.firstChild().toText().data().toInt() != 0 ) { if ( g.tagName() == "bold" ) { @@ -361,7 +361,7 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo, g = g.nextSibling().toElement(); } - out << (Q_UINT8) Object_FontProperty; + out << (TQ_UINT8) Object_FontProperty; packCString( strings, out, name ); out << fontFlags; if ( fontFlags & Font_Family ) @@ -369,34 +369,34 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo, if ( fontFlags & Font_PointSize ) packUInt16( out, pointSize ); } else if ( tag == "palette" ) { - out << (Q_UINT8) Object_PaletteProperty; + out << (TQ_UINT8) Object_PaletteProperty; packCString( strings, out, name ); TQDomElement g = f.firstChild().toElement(); while ( !g.isNull() ) { TQDomElement h = g.firstChild().toElement(); while ( !h.isNull() ) { - value = DomTool::elementToVariant( h, Qt::gray ); + value = DomTool::elementToVariant( h, TQt::gray ); if ( h.tagName() == "color" ) { - out << (Q_UINT8) Palette_Color; + out << (TQ_UINT8) Palette_Color; out << value.asColor(); } else if ( h.tagName() == "pixmap" ) { - out << (Q_UINT8) Palette_Pixmap; + out << (TQ_UINT8) Palette_Pixmap; packVariant( strings, out, value, "pixmap" ); } h = h.nextSibling().toElement(); } if ( g.tagName() == "active" ) { - out << (Q_UINT8) Palette_Active; + out << (TQ_UINT8) Palette_Active; } else if ( g.tagName() == "inactive" ) { - out << (Q_UINT8) Palette_Inactive; + out << (TQ_UINT8) Palette_Inactive; } else { - out << (Q_UINT8) Palette_Disabled; + out << (TQ_UINT8) Palette_Disabled; } g = g.nextSibling().toElement(); } - out << (Q_UINT8) Palette_End; + out << (TQ_UINT8) Palette_End; } else { value = DomTool::elementToVariant( f, value, comment ); if ( value.isValid() ) { @@ -404,12 +404,12 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo, buddies[objectNo] += value.asString(); } else { if ( tag == "string" ) { - out << (Q_UINT8) Object_TextProperty; + out << (TQ_UINT8) Object_TextProperty; packCString( strings, out, name ); packCString( strings, out, value.asString().utf8() ); packCString( strings, out, comment.utf8() ); } else { - out << (Q_UINT8) Object_VariantProperty; + out << (TQ_UINT8) Object_VariantProperty; packCString( strings, out, name ); packVariant( strings, out, value, tag ); } @@ -430,7 +430,7 @@ static void outputGridCell( TQDataStream& out, TQDomElement elem ) rowspan = 1; if ( column != 0 || row != 0 || colspan != 1 || rowspan != 1 ) { - out << (Q_UINT8) Object_GridCell; + out << (TQ_UINT8) Object_GridCell; packUInt16( out, column ); packUInt16( out, row ); packUInt16( out, colspan ); @@ -456,9 +456,9 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies, while ( !f.isNull() ) { TQString tag = f.tagName(); if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) { - out << (Q_UINT8) Object_SubLayout; + out << (TQ_UINT8) Object_SubLayout; subLayoutNo = outputObject( buddies, objects, strings, out, f, - layoutForTag(tag) ); + tqlayoutForTag(tag) ); } else if ( tag == "property" ) { if ( f.attribute("name") == "name" ) { name = DomTool::elementToVariant( f, name ).asCString(); @@ -470,14 +470,14 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies, if ( subLayoutNo != -1 ) { /* - Remove the sub-layout's Object_End marker, append the grid + Remove the sub-tqlayout's Object_End marker, append the grid cell and the correct name property, and put the Object_End marker back. */ - out.device()->at( out.device()->at() - 1 ); + out.tqdevice()->at( out.tqdevice()->at() - 1 ); outputGridCell( out, elem ); outputProperty( buddies, subLayoutNo, strings, out, nameElem ); - out << (Q_UINT8) Object_End; + out << (TQ_UINT8) Object_End; objects.setName( subLayoutNo, name ); } @@ -488,15 +488,15 @@ static int outputObject( TQMap<int, TQStringList>& buddies, TQDataStream& out, TQDomElement elem, TQCString className ) { - bool isQObject = !className.isEmpty(); + bool isTQObject = !className.isEmpty(); - if ( className == "TQToolBar" ) - out << (Q_UINT8) elem.attribute( "dock", "0" ).toInt(); - if ( className == "TQWidget" ) + if ( className == TQTOOLBAR_OBJECT_NAME_STRING ) + out << (TQ_UINT8) elem.attribute( "dock", "0" ).toInt(); + if ( className == TQWIDGET_OBJECT_NAME_STRING ) className = elem.attribute( "class", className ).latin1(); int objectNo = -1; - if ( isQObject ) { + if ( isTQObject ) { packCString( strings, out, className ); objectNo = objects.insert(); } @@ -504,7 +504,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies, outputGridCell( out, elem ); // optimization: insert '&Foo' into string-table before 'Foo' - if ( className == "TQAction" || className == "TQActionGroup" ) { + if ( className == TQACTION_OBJECT_NAME_STRING || className == TQACTIONGROUP_OBJECT_NAME_STRING ) { TQVariant value = DomTool::readProperty( elem, "menuText", TQVariant() ); if ( value.asString().startsWith("&") ) strings.insertString( value.asString() ); @@ -516,67 +516,67 @@ static int outputObject( TQMap<int, TQStringList>& buddies, if ( tag == "action" ) { if ( elem.tagName() == "item" || elem.tagName() == "toolbar" ) { TQString actionName = f.attribute( "name" ); - int no = objects.find( actionName ); + int no = objects.tqfind( actionName ); if ( no != -1 ) { - out << (Q_UINT8) Object_ActionRef; + out << (TQ_UINT8) Object_ActionRef; packUInt16( out, no ); } } else { - out << (Q_UINT8) Object_SubAction; - outputObject( buddies, objects, strings, out, f, "TQAction" ); + out << (TQ_UINT8) Object_SubAction; + outputObject( buddies, objects, strings, out, f, TQACTION_OBJECT_NAME_STRING ); } } else if ( tag == "actiongroup" ) { - out << (Q_UINT8) Object_SubAction; - outputObject( buddies, objects, strings, out, f, "TQActionGroup" ); + out << (TQ_UINT8) Object_SubAction; + outputObject( buddies, objects, strings, out, f, TQACTIONGROUP_OBJECT_NAME_STRING ); } else if ( tag == "attribute" ) { - out << (Q_UINT8) Object_Attribute; + out << (TQ_UINT8) Object_Attribute; outputProperty( buddies, objectNo, strings, out, f ); } else if ( tag == "column" ) { - out << (Q_UINT8) Object_Column; + out << (TQ_UINT8) Object_Column; outputObject( buddies, objects, strings, out, f ); } else if ( tag == "event" ) { - out << (Q_UINT8) Object_Event; + out << (TQ_UINT8) Object_Event; packCString( strings, out, f.attribute("name").latin1() ); packVariant( strings, out, TQStringList::split(',', f.attribute("functions")) ); } else if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) { - out << (Q_UINT8) Object_SubLayout; + out << (TQ_UINT8) Object_SubLayout; outputObject( buddies, objects, strings, out, f, - layoutForTag(tag) ); + tqlayoutForTag(tag) ); } else if ( tag == "item" ) { if ( elem.tagName() == "menubar" ) { - out << (Q_UINT8) Object_MenuItem; + out << (TQ_UINT8) Object_MenuItem; packCString( strings, out, f.attribute("name").latin1() ); packCString( strings, out, f.attribute("text").utf8() ); outputObject( buddies, objects, strings, out, f ); } else { - out << (Q_UINT8) Object_Item; + out << (TQ_UINT8) Object_Item; outputObject( buddies, objects, strings, out, f ); } } else if ( tag == "property" ) { outputProperty( buddies, objectNo, strings, out, f ); } else if ( tag == "row" ) { - out << (Q_UINT8) Object_Row; + out << (TQ_UINT8) Object_Row; outputObject( buddies, objects, strings, out, f ); } else if ( tag == "separator" ) { - out << (Q_UINT8) Object_Separator; + out << (TQ_UINT8) Object_Separator; } else if ( tag == "spacer" ) { - out << (Q_UINT8) Object_Spacer; + out << (TQ_UINT8) Object_Spacer; outputObject( buddies, objects, strings, out, f ); } else if ( tag == "widget" ) { - if ( f.attribute("class") == "QLayoutWidget" && + if ( f.attribute("class") == TQLAYOUTWIDGET_OBJECT_NAME_STRING && elem.tagName() != "widget" ) { outputLayoutWidgetsSubLayout( buddies, objects, strings, out, f ); } else { - out << (Q_UINT8) Object_SubWidget; - outputObject( buddies, objects, strings, out, f, "TQWidget" ); + out << (TQ_UINT8) Object_SubWidget; + outputObject( buddies, objects, strings, out, f, TQWIDGET_OBJECT_NAME_STRING ); } } f = f.nextSibling().toElement(); } - out << (Q_UINT8) Object_End; - if ( isQObject ) + out << (TQ_UINT8) Object_End; + if ( isTQObject ) objects.setName( objectNo, DomTool::readProperty(elem, "name", "").asString() ); return objectNo; @@ -586,7 +586,7 @@ static void outputBlock( TQDataStream& out, BlockTag tag, const TQByteArray& data ) { if ( !data.isEmpty() ) { - out << (Q_UINT8) tag; + out << (TQ_UINT8) tag; packByteArray( out, data ); } } @@ -619,9 +619,9 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) UibIndexMap objects; int widgetNo = -1; TQCString className; - Q_INT16 defaultMargin = -32768; - Q_INT16 defaultSpacing = -32768; - Q_UINT8 introFlags = 0; + TQ_INT16 defaultMargin = -32768; + TQ_INT16 defaultSpacing = -32768; + TQ_UINT8 introFlags = 0; TQDomElement elem = doc.firstChild().toElement().firstChild().toElement(); while ( !elem.isNull() ) { @@ -682,7 +682,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) } break; case 'l': - if ( tag == "layoutdefaults" ) { + if ( tag == "tqlayoutdefaults" ) { TQString margin = elem.attribute( "margin" ); if ( !margin.isEmpty() ) defaultMargin = margin.toInt(); @@ -747,7 +747,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) { TQDataStream out2( widgetBlock, IO_WriteOnly ); widgetNo = outputObject( buddies, objects, strings, out2, widgetElem, - "TQWidget" ); + TQWIDGET_OBJECT_NAME_STRING ); } if ( !tabstopsElem.isNull() ) { @@ -756,7 +756,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) while ( !f.isNull() ) { if ( f.tagName() == "tabstop" ) { TQString widgetName = f.firstChild().toText().data(); - int no = objects.find( widgetName ); + int no = objects.tqfind( widgetName ); if ( no != -1 ) packUInt16( out2, no ); } @@ -772,7 +772,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) if ( !menubarElem.isNull() ) { TQDataStream out2( menubarBlock, IO_WriteOnly ); outputObject( buddies, objects, strings, out2, menubarElem, - "TQMenuBar" ); + TQMENUBAR_OBJECT_NAME_STRING ); } if ( !toolbarsElem.isNull() ) { @@ -780,7 +780,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) TQDomElement f = toolbarsElem.firstChild().toElement(); while ( !f.isNull() ) { if ( f.tagName() == "toolbar" ) - outputObject( buddies, objects, strings, out2, f, "TQToolBar" ); + outputObject( buddies, objects, strings, out2, f, TQTOOLBAR_OBJECT_NAME_STRING ); f = f.nextSibling().toElement(); } } @@ -791,7 +791,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) while ( a != buddies.end() ) { TQStringList::ConstIterator b = (*a).begin(); while ( b != (*a).end() ) { - int no = objects.find( *b ); + int no = objects.tqfind( *b ); if ( no != -1 ) { packUInt16( out2, a.key() ); packUInt16( out2, no ); @@ -822,12 +822,12 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) } TQString language = f.attribute( "language", "C++" ); - int senderNo = objects.find( argMap["sender"], widgetNo ); - int receiverNo = objects.find( argMap["receiver"], widgetNo ); + int senderNo = objects.tqfind( argMap["sender"], widgetNo ); + int receiverNo = objects.tqfind( argMap["receiver"], widgetNo ); TQString signal = UibHack::normalize( argMap["signal"] ); TQString slot = UibHack::normalize( argMap["slot"] ); - Q_UINT8 connectionFlags = 0; + TQ_UINT8 connectionFlags = 0; if ( language != prevLanguage ) connectionFlags |= Connection_Language; if ( senderNo != prevSenderNo ) @@ -873,9 +873,9 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) } out << UibMagic; - out << (Q_UINT8) '\n'; - out << (Q_UINT8) '\r'; - out << (Q_UINT8) out.version(); + out << (TQ_UINT8) '\n'; + out << (TQ_UINT8) '\r'; + out << (TQ_UINT8) out.version(); outputBlock( out, Block_Strings, strings.block() ); outputBlock( out, Block_Intro, introBlock ); outputBlock( out, Block_Images, imagesBlock ); @@ -889,5 +889,5 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) outputBlock( out, Block_Functions, functionsBlock ); outputBlock( out, Block_Buddies, buddiesBlock ); outputBlock( out, Block_Connections, connectionsBlock ); - out << (Q_UINT8) Block_End; + out << (TQ_UINT8) Block_End; } diff --git a/kdevdesigner/shared/ui2uib.h b/kdevdesigner/shared/ui2uib.h index 3dd985b6..81041e6e 100644 --- a/kdevdesigner/shared/ui2uib.h +++ b/kdevdesigner/shared/ui2uib.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp index ca48b4e4..443df331 100644 --- a/kdevdesigner/shared/uib.cpp +++ b/kdevdesigner/shared/uib.cpp @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -27,12 +27,12 @@ #include "uib.h" static const char commonStrings[] = - "\0()\0(bool)\0(const TQString&)\0(int)\0C++\0Layout1\0PNG\0QCheckBox\0" - "QComboBox\0QDialog\0QFrame\0QGridLayout\0QGroupBox\0QHBoxLayout\0QLabel\0" - "QLineEdit\0QListView\0QPushButton\0QRadioButton\0QVBoxLayout\0QWidget\0" + "\0()\0(bool)\0(const TQString&)\0(int)\0C++\0Layout1\0PNG\0TQCheckBox\0" + "TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0" + "TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0" "TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0" - "default\0destroy\0frameShadow\0frameShape\0geometry\0init\0margin\0" - "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0" + "default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0" + "tqmaximumSize\0tqminimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0" "toolTip\0unnamed\0whatsThis"; UibStrTable::UibStrTable() diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h index 0a7063a4..07607328 100644 --- a/kdevdesigner/shared/uib.h +++ b/kdevdesigner/shared/uib.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -29,7 +29,7 @@ #include <tqdatastream.h> -const Q_UINT32 UibMagic = 0xb77c61d8; +const TQ_UINT32 UibMagic = 0xb77c61d8; enum BlockTag { Block_End = '$', Block_Actions = 'A', Block_Buddies = 'B', Block_Connections = 'C', Block_Functions = 'F', @@ -101,16 +101,16 @@ inline int UibStrTable::insertCString( const char *cstr ) return i; } for ( i = 0; i < len + 1; i++ ) - out << (Q_UINT8) cstr[i]; + out << (TQ_UINT8) cstr[i]; return nextPos; } } inline int UibStrTable::insertString( const TQString& str ) { - if ( str.contains('\0') || str[0] == TQChar(0x7f) ) { + if ( str.tqcontains('\0') || str[0] == TQChar(0x7f) ) { int nextPos = table.size(); - out << (Q_UINT8) 0x7f; + out << (TQ_UINT8) 0x7f; out << str; return nextPos; } else { @@ -128,7 +128,7 @@ inline TQString UibStrTable::asString( int offset ) const { if ( table[offset] == 0x7f ) { TQDataStream in( table, IO_ReadOnly ); - in.device()->at( offset + 1 ); + in.tqdevice()->at( offset + 1 ); TQString str; in >> str; return str; diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp index 6419b9b6..88785cdc 100644 --- a/kdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -56,11 +56,11 @@ static int dbcustomcount = 200; static TQStrList *wGroups; static TQStrList *invisibleGroups; static bool whatsThisLoaded = FALSE; -static QPluginManager<WidgetInterface> *widgetPluginManager = 0; +static TQPluginManager<WidgetInterface> *widgetPluginManager = 0; static bool plugins_set_up = FALSE; static bool was_in_setup = FALSE; -TQCleanupHandler<QPluginManager<WidgetInterface> > cleanup_manager; +TQCleanupHandler<TQPluginManager<WidgetInterface> > cleanup_manager; WidgetDatabaseRecord::WidgetDatabaseRecord() { @@ -91,7 +91,7 @@ WidgetDatabaseRecord::~WidgetDatabaseRecord() one application doesn't make sense anyway and so you don't need more than an instance of the widgetdatabase. - For creating widgets, layouts, etc. see WidgetFactory. + For creating widgets, tqlayouts, etc. see WidgetFactory. */ /*! @@ -135,7 +135,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_pushbutton.png"; - r->name = "TQPushButton"; + r->name = TQPUSHBUTTON_OBJECT_NAME_STRING; r->group = widgetGroup( "Buttons" ); r->toolTip = "Push Button"; r->isCommon = TRUE; @@ -144,7 +144,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbutton.png"; - r->name = "TQToolButton"; + r->name = TQTOOLBUTTON_OBJECT_NAME_STRING; r->group = widgetGroup( "Buttons" ); r->toolTip = "Tool Button"; @@ -152,7 +152,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_radiobutton.png"; - r->name = "TQRadioButton"; + r->name = TQRADIOBUTTON_OBJECT_NAME_STRING; r->group = widgetGroup( "Buttons" ); r->toolTip = "Radio Button"; r->isCommon = TRUE; @@ -161,7 +161,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_checkbox.png"; - r->name = "TQCheckBox"; + r->name = TQCHECKBOX_OBJECT_NAME_STRING; r->group = widgetGroup( "Buttons" ); r->toolTip = "Check Box"; r->isCommon = TRUE; @@ -170,7 +170,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_groupbox.png"; - r->name = "TQGroupBox"; + r->name = TQGROUPBOX_OBJECT_NAME_STRING; r->group = widgetGroup( "Containers" ); r->toolTip = "Group Box"; r->isContainer = TRUE; @@ -179,7 +179,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_buttongroup.png"; - r->name = "TQButtonGroup"; + r->name = TQBUTTONGROUP_OBJECT_NAME_STRING; r->group = widgetGroup( "Containers" ); r->toolTip = "Button Group"; r->isContainer = TRUE; @@ -189,7 +189,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_frame.png"; - r->name = "TQFrame"; + r->name = TQFRAME_OBJECT_NAME_STRING; r->group = widgetGroup( "Containers" ); r->toolTip = "Frame"; r->isContainer = TRUE; @@ -198,7 +198,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "TQTabWidget"; + r->name = TQTABWIDGET_OBJECT_NAME_STRING; r->group = widgetGroup( "Containers" ); r->toolTip = "Tabwidget"; r->isContainer = TRUE; @@ -207,7 +207,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_widgetstack.png"; - r->name = "TQWidgetStack"; + r->name = TQWIDGETSTACK_OBJECT_NAME_STRING; r->group = widgetGroup( "Containers" ); r->toolTip = "Widget Stack"; r->isContainer = TRUE; @@ -216,7 +216,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_toolbox.png"; - r->name = "TQToolBox"; + r->name = TQTOOLBOX_OBJECT_NAME_STRING; r->group = widgetGroup( "Containers" ); r->toolTip = "Tool Box"; r->isContainer = TRUE; @@ -225,7 +225,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listbox.png"; - r->name = "TQListBox"; + r->name = TQLISTBOX_OBJECT_NAME_STRING; r->group = widgetGroup( "Views" ); r->toolTip = "List Box"; r->isCommon = TRUE; @@ -234,37 +234,37 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_listview.png"; - r->name = "TQListView"; + r->name = TQLISTVIEW_OBJECT_NAME_STRING; r->group = widgetGroup( "Views" ); r->toolTip = "List View"; append( r ); -#if !defined(QT_NO_ICONVIEW) || defined(UIC) +#if !defined(TQT_NO_ICONVIEW) || defined(UIC) r = new WidgetDatabaseRecord; r->iconSet = "designer_iconview.png"; - r->name = "TQIconView"; + r->name = TQICONVIEW_OBJECT_NAME_STRING; r->group = widgetGroup( "Views" ); r->toolTip = "Icon View"; append( r ); #endif -#if !defined(QT_NO_TABLE) +#if !defined(TQT_NO_TABLE) r = new WidgetDatabaseRecord; r->iconSet = "designer_table.png"; - r->name = "TQTable"; + r->name = TQTABLE_OBJECT_NAME_STRING; r->group = widgetGroup( "Views" ); r->toolTip = "Table"; append( r ); #endif -#if !defined(QT_NO_SQL) +#if !defined(TQT_NO_SQL) r = new WidgetDatabaseRecord; r->iconSet = "designer_datatable.png"; r->includeFile = "tqdatatable.h"; - r->name = "TQDataTable"; + r->name = TQDATATABLE_OBJECT_NAME_STRING; r->group = widgetGroup( "Database" ); r->toolTip = "Data Table"; @@ -273,7 +273,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lineedit.png"; - r->name = "TQLineEdit"; + r->name = TQLINEEDIT_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Line Edit"; r->isCommon = TRUE; @@ -282,7 +282,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_spinbox.png"; - r->name = "TQSpinBox"; + r->name = TQSPINBOX_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Spin Box"; r->isCommon = TRUE; @@ -291,7 +291,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_dateedit.png"; - r->name = "QDateEdit"; + r->name = TQDATEEDIT_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Date Edit"; r->includeFile = "tqdatetimeedit.h"; @@ -300,7 +300,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_timeedit.png"; - r->name = "QTimeEdit"; + r->name = TQTIMEEDIT_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Time Edit"; r->includeFile = "tqdatetimeedit.h"; @@ -309,7 +309,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_datetimeedit.png"; - r->name = "QDateTimeEdit"; + r->name = TQDATETIMEEDIT_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Date-Time Edit"; r->includeFile = "tqdatetimeedit.h"; @@ -318,7 +318,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_multilineedit.png"; - r->name = "TQMultiLineEdit"; + r->name = TQMULTILINEEDIT_OBJECT_NAME_STRING; r->group = widgetGroup( "Temp" ); r->toolTip = "Multi Line Edit"; @@ -326,7 +326,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_richtextedit.png"; - r->name = "TQTextEdit"; + r->name = TQTEXTEDIT_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Rich Text Edit"; r->isCommon = TRUE; @@ -335,7 +335,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_combobox.png"; - r->name = "TQComboBox"; + r->name = TQCOMBOBOX_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Combo Box"; r->isCommon = TRUE; @@ -344,7 +344,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_slider.png"; - r->name = "TQSlider"; + r->name = TQSLIDER_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Slider"; @@ -352,7 +352,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_scrollbar.png"; - r->name = "TQScrollBar"; + r->name = TQSCROLLBAR_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Scrollbar"; @@ -360,7 +360,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_dial.png"; - r->name = "TQDial"; + r->name = TQDIAL_OBJECT_NAME_STRING; r->group = widgetGroup( "Input" ); r->toolTip = "Dial"; @@ -368,7 +368,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_label.png"; - r->name = "TQLabel"; + r->name = TQLABEL_OBJECT_NAME_STRING; r->group = widgetGroup( "Temp" ); r->toolTip = "Label"; @@ -395,7 +395,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_lcdnumber.png"; - r->name = "TQLCDNumber"; + r->name = TQLCDNUMBER_OBJECT_NAME_STRING; r->group = widgetGroup( "Display" ); r->toolTip = "LCD Number"; @@ -413,7 +413,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_progress.png"; - r->name = "TQProgressBar"; + r->name = TQPROGRESSBAR_OBJECT_NAME_STRING; r->group = widgetGroup( "Display" ); r->toolTip = "Progress Bar"; @@ -421,7 +421,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textview.png"; - r->name = "TQTextView"; + r->name = TQTEXTVIEW_OBJECT_NAME_STRING; r->group = widgetGroup( "Temp" ); r->toolTip = "Text View"; @@ -429,7 +429,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_textbrowser.png"; - r->name = "TQTextBrowser"; + r->name = TQTEXTBROWSER_OBJECT_NAME_STRING; r->group = widgetGroup( "Display" ); r->toolTip = "Text Browser"; @@ -440,40 +440,40 @@ void WidgetDatabase::setupDataBase( int id ) r->name = "Spacer"; r->group = widgetGroup( "Temp" ); r->toolTip = "Spacer"; - r->whatsThis = "The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of layouts."; + r->whatsThis = "The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of tqlayouts."; append( r ); r = new WidgetDatabaseRecord; - r->name = "TQWidget"; + r->name = TQWIDGET_OBJECT_NAME_STRING; r->isForm = TRUE; r->group = widgetGroup( "Forms" ); append( r ); r = new WidgetDatabaseRecord; - r->name = "TQDialog"; + r->name = TQDIALOG_OBJECT_NAME_STRING; r->group = widgetGroup( "Forms" ); r->isForm = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = "TQWizard"; + r->name = TQWIZARD_OBJECT_NAME_STRING; r->group = widgetGroup( "Forms" ); r->isContainer = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = "QDesignerWizard"; + r->name = "TQDesignerWizard"; r->group = widgetGroup( "Forms" ); r->isContainer = TRUE; append( r ); r = new WidgetDatabaseRecord; - r->name = "QLayoutWidget"; + r->name = TQLAYOUTWIDGET_OBJECT_NAME_STRING; r->group = widgetGroup( "Temp" ); r->includeFile = ""; r->isContainer = TRUE; @@ -481,7 +481,7 @@ void WidgetDatabase::setupDataBase( int id ) append( r ); r = new WidgetDatabaseRecord; - r->name = "TQSplitter"; + r->name = TQSPLITTER_OBJECT_NAME_STRING; r->group = widgetGroup( "Temp" ); r->includeFile = "tqsplitter.h"; r->isContainer = TRUE; @@ -490,7 +490,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QDesignerTabWidget"; + r->name = "TQDesignerTabWidget"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -498,7 +498,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QDesignerWidget"; + r->name = "TQDesignerWidget"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -506,7 +506,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = "designer_tabwidget.png"; - r->name = "QDesignerDialog"; + r->name = "TQDesignerDialog"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -514,7 +514,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "TQMainWindow"; + r->name = TQMAINWINDOW_OBJECT_NAME_STRING; r->includeFile = "tqmainwindow.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; @@ -523,7 +523,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDesignerAction"; + r->name = "TQDesignerAction"; r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -532,7 +532,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "QDesignerActionGroup"; + r->name = "TQDesignerActionGroup"; r->includeFile = "tqaction.h"; r->group = widgetGroup( "Temp" ); r->isContainer = FALSE; @@ -541,17 +541,17 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "TQScrollView"; + r->name = TQSCROLLVIEW_OBJECT_NAME_STRING; r->includeFile = "tqscrollview.h"; r->group = widgetGroup( "Temp" ); r->isContainer = TRUE; append( r ); -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "TQDataBrowser"; + r->name = TQDATABROWSER_OBJECT_NAME_STRING; r->includeFile = "tqdatabrowser.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Browser"; @@ -562,7 +562,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; - r->name = "TQDataView"; + r->name = TQDATAVIEW_OBJECT_NAME_STRING; r->includeFile = "tqdataview.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data View"; @@ -666,7 +666,7 @@ TQString WidgetDatabase::className( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return TQString::null; + return TQString(); return r->name; } @@ -679,7 +679,7 @@ TQString WidgetDatabase::group( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return TQString::null; + return TQString(); return r->group; } @@ -692,7 +692,7 @@ TQString WidgetDatabase::toolTip( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return TQString::null; + return TQString(); return r->toolTip; } @@ -705,7 +705,7 @@ TQString WidgetDatabase::whatsThis( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return TQString::null; + return TQString(); return r->whatsThis; } @@ -718,7 +718,7 @@ TQString WidgetDatabase::includeFile( int id ) setupDataBase( id ); WidgetDatabaseRecord *r = at( id ); if ( !r ) - return TQString::null; + return TQString(); if ( r->includeFile.isNull() ) return r->name.lower() + ".h"; return r->includeFile; @@ -735,7 +735,7 @@ bool WidgetDatabase::isForm( int id ) return r->isForm; } -/*! Returns whether the widget registered as \a id can have children. +/*! Returns whether the widget registered as \a id can have tqchildren. */ bool WidgetDatabase::isContainer( int id ) @@ -760,11 +760,11 @@ TQString WidgetDatabase::createWidgetName( int id ) { setupDataBase( id ); TQString n = className( id ); - if ( n == "QLayoutWidget" ) + if ( n == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) n = "Layout"; if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] ) n = n.mid( 1 ); - int colonColon = n.findRev( "::" ); + int colonColon = n.tqfindRev( "::" ); if ( colonColon != -1 ) n = n.mid( colonColon + 2 ); @@ -783,14 +783,14 @@ int WidgetDatabase::idFromClassName( const TQString &name ) setupDataBase( -1 ); if ( name.isEmpty() ) return 0; - int *i = className2Id->find( name ); + int *i = className2Id->tqfind( name ); if ( i ) return *i; if ( name == "FormWindow" ) - return idFromClassName( "QLayoutWidget" ); + return idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ); #ifdef UIC setupDataBase( -2 ); - i = className2Id->find( name ); + i = className2Id->tqfind( name ); if ( i ) return *i; #endif @@ -799,7 +799,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) bool WidgetDatabase::hasWidget( const TQString &name ) { - return className2Id->find( name ) != 0; + return className2Id->tqfind( name ) != 0; } WidgetDatabaseRecord *WidgetDatabase::at( int index ) @@ -820,7 +820,7 @@ void WidgetDatabase::insert( int index, WidgetDatabaseRecord *r ) db[ index ] = r; className2Id->insert( r->name, new int( index ) ); if ( index < dbcustom ) - dbcount = QMAX( dbcount, index ); + dbcount = TQMAX( dbcount, index ); } void WidgetDatabase::append( WidgetDatabaseRecord *r ) @@ -832,7 +832,7 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) TQString WidgetDatabase::widgetGroup( const TQString &g ) { - if ( wGroups->find( g.ascii() ) == -1 ) + if ( wGroups->tqfind( g.ascii() ) == -1 ) wGroups->append( g.ascii() ); return g; } @@ -854,7 +854,7 @@ TQString WidgetDatabase::widgetGroup( int i ) setupDataBase( -1 ); if ( i >= 0 && i < (int)wGroups->count() ) return wGroups->at( i ); - return TQString::null; + return TQString(); } int WidgetDatabase::numWidgetGroups() @@ -866,7 +866,7 @@ int WidgetDatabase::numWidgetGroups() bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); - return invisibleGroups->find( g.ascii() ) == -1; + return invisibleGroups->tqfind( g.ascii() ) == -1; } int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) @@ -927,7 +927,7 @@ void WidgetDatabase::loadWhatsThis( const TQString &docPath ) } -// ### Qt 3.1: make these publically accessible via QWidgetDatabase API +// ### TQt 3.1: make these publically accessible via TQWidgetDatabase API #if defined(UIC) bool dbnounload = FALSE; TQStringList *dbpaths = 0; @@ -936,7 +936,7 @@ extern TQString *qwf_plugin_dir; #endif -QPluginManager<WidgetInterface> *widgetManager() +TQPluginManager<WidgetInterface> *widgetManager() { if ( !widgetPluginManager ) { TQString pluginDir = "/designer"; @@ -944,7 +944,7 @@ QPluginManager<WidgetInterface> *widgetManager() if ( qwf_plugin_dir ) pluginDir = *qwf_plugin_dir; #endif - widgetPluginManager = new QPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), pluginDir ); + widgetPluginManager = new TQPluginManager<WidgetInterface>( IID_Widget, TQApplication::libraryPaths(), pluginDir ); cleanup_manager.add( &widgetPluginManager ); #if defined(UIC) if ( dbnounload ) diff --git a/kdevdesigner/shared/widgetdatabase.h b/kdevdesigner/shared/widgetdatabase.h index a41728fb..e64e4fae 100644 --- a/kdevdesigner/shared/widgetdatabase.h +++ b/kdevdesigner/shared/widgetdatabase.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000 Trolltech AS. All rights reserved. ** -** This file is part of Qt Designer. +** This file is part of TQt Designer. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software ** Foundation and appearing in the file LICENSE.GPL included in the ** packaging of this file. ** -** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition -** licenses may use this file in accordance with the Qt Commercial License +** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition +** licenses may use this file in accordance with the TQt Commercial License ** Agreement provided with the Software. ** ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE @@ -17,7 +17,7 @@ ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about Qt Commercial License Agreements. +** information about TQt Commercial License Agreements. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. @@ -30,10 +30,10 @@ #include <tqiconset.h> #include <tqstring.h> #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> -extern QPluginManager<WidgetInterface> *widgetManager(); +extern TQPluginManager<WidgetInterface> *widgetManager(); struct WidgetDatabaseRecord { @@ -48,7 +48,7 @@ struct WidgetDatabaseRecord int nameCounter; }; -class WidgetDatabase : public Qt +class WidgetDatabase : public TQt { public: WidgetDatabase(); |