diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
| commit | e985f7e545f4739493965aad69bbecb136dc9346 (patch) | |
| tree | 54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /quanta | |
| parent | f7670c198945adc3b95ad69a959fe5f8ae55b493 (diff) | |
| download | tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip | |
TQt4 port kdewebdev
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta')
801 files changed, 7077 insertions, 6939 deletions
diff --git a/quanta/Quanta-3.3-plan.kno b/quanta/Quanta-3.3-plan.kno index fc22ca65..eb2837b7 100644 --- a/quanta/Quanta-3.3-plan.kno +++ b/quanta/Quanta-3.3-plan.kno @@ -22,24 +22,24 @@ \NewEntry 1 Toolbars <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> -<p>Toolbars need serious attention!<br />Phase 1:<br />1) Clean up for current usage<br />2) Create quick "add this tag to a toolbar" RMB function<br />3) Make toolbars abide by tag relationships like auto complete<br /><br />Phase 2:<br />1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags<br />2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, layout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings. <br /><br />The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static layout the layout and presentation become dynamic. This will require balance and good icons to be more productive.</p> +<p>Toolbars need serious attention!<br />Phase 1:<br />1) Clean up for current usage<br />2) Create quick "add this tag to a toolbar" RMB function<br />3) Make toolbars abide by tag relationships like auto complete<br /><br />Phase 2:<br />1) Add drop down icon group ability to manage larger sets (like on file folder icons) This will require a new type on the action dialog with a new sub dialog to list tags<br />2) Create toolbar modalities. Allow for recognition of edting type like tables, forms, data, tqlayout and user defined tasks where entering a portion of a document, opening a view or directly selecting the mode changes selected toolbar or even toolbars and groupings. <br /><br />The idea is that the user could teach Quanta how to provide optimal tools for various tasks and instead of a static tqlayout the tqlayout and presentation become dynamic. This will require balance and good icons to be more productive.</p> </body></html> \NewEntry 2 Phase 2 explanation <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> <p><span style="font-style:italic;color:#3300ff">> - Phase 2/2 sounds a little complicated to me and I'm also not sure that I understood it completely.</span></p> <p>Think of it as personalities. The idea is that Quanta could interpret some aspects of what I am doing and offer toolbar presentations based on that. How to best go about it is not totally clear. Initially I had thought to have Quanta offer the relevent toolbar so the user didn't have to select it, but this is not completely effective it you think about it. Another possibility is to construct a toolbar on the fly from relevent tags... intriguing but probably not very fast or fluid. The advantage to the toolbars we have is that you know where the icons are. The disadvantage is you could end up switching between 3-4 of them building a formatted data form, which is not intuitive.</p> -<p>In balancing these several concepts seem to offer counterpoints.<br />familiar layout <-> specifically applicable actions<br />pre-made toolbars <-> dynamicly created toolbars<br />feature oriented toolbars <-> task oriented toolbars</p> +<p>In balancing these several concepts seem to offer counterpoints.<br />familiar tqlayout <-> specifically applicable actions<br />pre-made toolbars <-> dynamicly created toolbars<br />feature oriented toolbars <-> task oriented toolbars</p> <p>Currently Quanta is solidly to the left and only to the left on all three of these points. I began considering adding task oriented toolbars. Which is better? If you could be certain that the toolbar would do the following you would have perfection:</p> -<p>1) orient correctly to every task<br />2) retain familiarity of layout for variations and segue to next task<br />3) offer only proper tag relationships</p> -<p>Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard layout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).</p> +<p>1) orient correctly to every task<br />2) retain familiarity of tqlayout for variations and segue to next task<br />3) offer only proper tag relationships</p> +<p>Inherently some tasks cannot be discerned from context but could be defined by the user. Selecting a task modality could convert all toolbars to the applicable tagging, not just one. However you may want to be in a standard tqlayout in one situation (certainly in a blank page) but assume modal personalities in others (common data design scenarios).</p> <p>So we can say this about the ultimate solution:</p> <p>1) I don't think anybody is really anal enough to already be doing it.</p> <p>2) If it could be accomplished it would be very very cool and get a lot of press.</p> <p>3) It cannot be a single solution, thus it's multiple "personalities"</p> -<p>4) Basic structure and layout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</p> +<p>4) Basic structure and tqlayout will take experimentation, and user feedback. In fact it would take a fair amount of study and refinement.</p> <p>5) No single solution is possible so it must allow for easy user extensibility</p> -<p>Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar layout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.</p> +<p>Because we hope to be able to make VPL play a larger role we cannot discount the importance of good toolbar tqlayout. Making toolbars load with a DTEP is a good start as are user toolbars. Extending intelligent context sensitive task extentions will make a big difference, especially when dealing with the huge diversity of tasks and preponderance of tags out there.</p> <p>My vision is not just someone saving a toolbar for a task, but saving a whole personality. Imagine these as dowloadable resources. ;-)</p> <p></p> </body></html> @@ -56,7 +56,7 @@ \NewEntry 1 VPL <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> -<p>Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.<br /><br />1) Visual Table editor<br />2) Integration of visual CSS using our dialogs and tools<br />3) XSLT translation layer for XML<br />4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the layout or CSS visually in data layout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.</p> +<p>Undoubtably there will be many things we want to do here. I'll start the list... This is not really prioritized.<br /><br />1) Visual Table editor<br />2) Integration of visual CSS using our dialogs and tools<br />3) XSLT translation layer for XML<br />4) Script integration edit mode - very tricky but we should conceptually explore being able to interpret and edit elements of PHP in a loop for instance to create a visual mode for editing the tqlayout or CSS visually in data tqlayout. I'm suggesting merely exploring what is possible here as something exceptional if we had any degree of success.</p> </body></html> \NewEntry 0 New Features @@ -94,7 +94,7 @@ \NewEntry 1 RAD Site <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:sans-serif"> -<p>This has largely been under wraps except a few teasers. It's going to be my baby.<br /><br />RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.<br /><br />1) Based on templates - this allows the user to develop the framework in layers<br />2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it<br />3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning<br />4) New abstract interface - the key to integrate this is an interface that uses "set"definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or layout which assist in painting an even interface. <br />5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as<br />- physical layout<br />- conceptual group<br />- style grouping<br />- layout grouping<br />Level views would include<br />- overview<br />- concept/style/layout group<br />- page elements/relationships<br />- element definitions<br />- various configuration dialogs<br /><br />The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.<br /><br />Some aspects:<br />* moving files automatically manages links<br />* Minimal application speeds development and manages framework<br />* Page component templates function dynamically<br />* Would use comment system and or generated file to manage elements<br />* would be able to offer limited functionaliy directly importing existing sites<br />* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)</p> +<p>This has largely been under wraps except a few teasers. It's going to be my baby.<br /><br />RAD design has not come to web development because of the diverse approaches. It's rather difficult to even use code other people build in PHP because it's largely built with the assumption that it's the only systematic approach on your site intstead of a good object model as a part of what exists that abstracts well and plays together well. If I build it you won't use it because it's not your style and vice versa. That's where this is different.<br /><br />1) Based on templates - this allows the user to develop the framework in layers<br />2) User defines abstractions - when you have a modular element in your design you define what the public and private interface is to it<br />3) Learning ability - because creating something like this is complex and involved the burden is lessened by enabling the system to assist in creation by learning<br />4) New abstract interface - the key to integrate this is an interface that uses "set"definitions starting with a page and defined elements in the page where the user defines relationships. Then there are the physical aspects in directory relationships (which are tracked) and group set assignments for style or tqlayout which assist in painting an even interface. <br />5) The interface can be viewed panning various levels and perspectives and remembering view arrangements. Perspective would be things such as<br />- physical tqlayout<br />- conceptual group<br />- style grouping<br />- tqlayout grouping<br />Level views would include<br />- overview<br />- concept/style/tqlayout group<br />- page elements/relationships<br />- element definitions<br />- various configuration dialogs<br /><br />The concept here is that extremely anal content management can be done with tight control of abstrated design elements... or you could ease particular elements of a basic site design with nominal effort. Results would be up to the user and their design base.<br /><br />Some aspects:<br />* moving files automatically manages links<br />* Minimal application speeds development and manages framework<br />* Page component templates function dynamically<br />* Would use comment system and or generated file to manage elements<br />* would be able to offer limited functionaliy directly importing existing sites<br />* Extreme application could completely manage an abstracted site where a site manager could request elements from contributors - combined with group projects and versioning a good manager can take skilled crafts people and clueless fools and weave a quality project. ;-)</p> </body></html> \NewEntry 0 Plug Ins diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index d2164b06..fc4399bb 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -34,7 +34,7 @@ class colorRequester::colorRequesterPrivate{ void connectSignals( TQObject *receiver ) { connect( edit, TQT_SIGNAL( textChanged( const TQString& )),receiver, TQT_SIGNAL( textChanged( const TQString& ))); } }; -colorRequester::colorRequester(TQWidget *parent, const char* name) : miniEditor(parent,name){ +colorRequester::colorRequester(TQWidget *tqparent, const char* name) : miniEditor(tqparent,name){ d = new colorRequesterPrivate; init(); } @@ -56,7 +56,7 @@ void colorRequester::init() d->edit = new KLineEdit( this, "line edit" ); myButton = new KPushButton( this, "kfile button"); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("colorize")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("colorize")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); myButton->setIconSet( iconSet ); myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -67,12 +67,12 @@ void colorRequester::init() TQWidget *widget = (TQWidget*) d->edit; setFocusProxy( widget ); - d->connectSignals( this ); + d->connectSignals( TQT_TQOBJECT(this) ); connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() )); connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) )); KAccel *accel = new KAccel( this ); - accel->insert( KStdAccel::Open, this, TQT_SLOT( openColorDialog() )); + accel->insert( KStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() )); accel->readSettings(); } @@ -93,7 +93,7 @@ KLineEdit * colorRequester::lineEdit() const{ void colorRequester::setInitialValue(/*const TQString& s*/){ TQString temp = d->edit->text(); temp.remove(" "); - if( temp.contains("#") != 0){ + if( temp.tqcontains("#") != 0){ temp.remove("#"); if(temp.length() == 3) { TQString temp2; @@ -113,7 +113,7 @@ void colorRequester::setInitialValue(/*const TQString& s*/){ } else - if( temp.contains("rgb(") != 0){ + if( temp.tqcontains("rgb(") != 0){ temp.remove("rgb(").remove(")"); TQStringList rgbValues = TQStringList::split(",",temp); // bool ok; diff --git a/quanta/components/csseditor/colorrequester.h b/quanta/components/csseditor/colorrequester.h index baf95d86..ceb28f6b 100644 --- a/quanta/components/csseditor/colorrequester.h +++ b/quanta/components/csseditor/colorrequester.h @@ -25,8 +25,9 @@ class KLineEdit; class KColorDialog; class colorRequester : public miniEditor{ Q_OBJECT + TQ_OBJECT public: - colorRequester(TQWidget *parent, const char* name=0); + colorRequester(TQWidget *tqparent, const char* name=0); ~colorRequester(); KLineEdit * lineEdit() const; KPushButton * button() const { return myButton; } diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index 98019f23..b57649bd 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -29,7 +29,7 @@ -colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,const TQString& r,TQWidget *parent, const char *name) : miniEditor(parent,name) { +colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c,const TQString& r,TQWidget *tqparent, const char *name) : miniEditor(tqparent,name) { m_functionName = fn; TQVBox *leftBox = new TQVBox(this); TQVBox *centerBox = new TQVBox(this); @@ -37,12 +37,12 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c, TQLabel *leftLabel = new TQLabel("<b>" + l +"</b>",leftBox); TQLabel *centerLabel = new TQLabel(("<b>" + c +"</b>"),centerBox); TQLabel *rightLabel = new TQLabel(("<b>" + r +"</b>"),rightBox); - leftLabel->setAlignment(Qt::AlignHCenter); - centerLabel->setAlignment(Qt::AlignHCenter); - rightLabel->setAlignment(Qt::AlignHCenter); - leftLabel->setTextFormat (Qt::RichText ) ; - centerLabel->setTextFormat ( Qt::RichText ) ; - rightLabel->setTextFormat (Qt::RichText ) ; + leftLabel->tqsetAlignment(TQt::AlignHCenter); + centerLabel->tqsetAlignment(TQt::AlignHCenter); + rightLabel->tqsetAlignment(TQt::AlignHCenter); + leftLabel->setTextFormat (TQt::RichText ) ; + centerLabel->setTextFormat ( TQt::RichText ) ; + rightLabel->setTextFormat (TQt::RichText ) ; m_leftValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , leftBox); m_centerValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , centerBox); m_rightValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , rightBox); @@ -74,11 +74,11 @@ void colorSlider::convertRightValue(int i){ emit valueChanged(m_functionName + "(" + TQString::number(m_leftValue->value(),10) + "," + TQString::number(m_centerValue->value(),10) + "," + TQString::number(i,10) +")"); } -RGBcolorSlider::RGBcolorSlider(TQWidget *parent, const char *name) : colorSlider("rgb",i18n("Red"),i18n("Green"),i18n("Blue"),parent,name){ +RGBcolorSlider::RGBcolorSlider(TQWidget *tqparent, const char *name) : colorSlider("rgb",i18n("Red"),i18n("Green"),i18n("Blue"),tqparent,name){ } //FOR CSS3 -/*HSLcolorSlider::HSLcolorSlider(TQWidget *parent, const char *name) : colorSlider("hsl",i18n("Hue"),i18n("Saturation"),i18n("Lightness"),parent,name){ +/*HSLcolorSlider::HSLcolorSlider(TQWidget *tqparent, const char *name) : colorSlider("hsl",i18n("Hue"),i18n("Saturation"),i18n("Lightness"),tqparent,name){ } */ diff --git a/quanta/components/csseditor/colorslider.h b/quanta/components/csseditor/colorslider.h index d2e0b11b..202020a6 100644 --- a/quanta/components/csseditor/colorslider.h +++ b/quanta/components/csseditor/colorslider.h @@ -30,6 +30,7 @@ class colorSlider : public miniEditor { Q_OBJECT + TQ_OBJECT private : TQString m_functionName; protected: @@ -37,7 +38,7 @@ class colorSlider : public miniEditor { *m_centerValue, *m_rightValue; public: - colorSlider(const TQString& functionName,const TQString& l=TQString::null,const TQString& c=TQString::null,const TQString& r=TQString::null,TQWidget *parent=0, const char *name=0); + colorSlider(const TQString& functionName,const TQString& l=TQString(),const TQString& c=TQString(),const TQString& r=TQString(),TQWidget *tqparent=0, const char *name=0); virtual ~colorSlider(); virtual void connectToPropertySetter(propertySetter* p); @@ -52,16 +53,18 @@ class colorSlider : public miniEditor { class RGBcolorSlider : public colorSlider { Q_OBJECT + TQ_OBJECT public: - RGBcolorSlider(TQWidget *parent=0, const char *name=0); + RGBcolorSlider(TQWidget *tqparent=0, const char *name=0); ~RGBcolorSlider(){} }; //FOR CSS3 /*class HSLcolorSlider : public colorSlider { Q_OBJECT + TQ_OBJECT public: - HSLcolorSlider(TQWidget *parent=0, const char *name=0); + HSLcolorSlider(TQWidget *tqparent=0, const char *name=0); ~HSLcolorSlider(); };*/ diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index 5393d875..afe90315 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -47,11 +47,11 @@ -myCheckListItem::myCheckListItem(TQListView * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ +myCheckListItem::myCheckListItem(TQListView * tqparent, const TQString & text):TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ m_sig = new TQSignal; } -myCheckListItem::myCheckListItem(TQCheckListItem * parent, const TQString & text):TQCheckListItem(parent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ +myCheckListItem::myCheckListItem(TQCheckListItem * tqparent, const TQString & text):TQCheckListItem(tqparent, text, TQCheckListItem::CheckBox),m_checkedChildren(0){ m_sig = new TQSignal; } @@ -85,8 +85,8 @@ void myCheckListItem::stateChange (bool b){ m_checkedChildren = 0; } else { - if(parent()){ - myCheckListItem *p = static_cast<myCheckListItem*>(parent()); + if(tqparent()){ + myCheckListItem *p = static_cast<myCheckListItem*>(tqparent()); while( p ) { if( p->m_checkedChildren != 1) { p->m_checkedChildren--; @@ -99,7 +99,7 @@ void myCheckListItem::stateChange (bool b){ m_sig->activate(); p->setOn(false); } - p = static_cast<myCheckListItem*>(p->parent()); + p = static_cast<myCheckListItem*>(p->tqparent()); } } else { @@ -109,7 +109,7 @@ void myCheckListItem::stateChange (bool b){ } } else { - if(parent()) static_cast<myCheckListItem*>(parent())->addCheckedChild(); + if(tqparent()) static_cast<myCheckListItem*>(tqparent())->addCheckedChild(); } } @@ -117,7 +117,7 @@ void CSSEditor::appendSub(TQDomNodeList l, myCheckListItem *cli){ unsigned int i; for(i=0;i<l.length();i++) { myCheckListItem *item = new myCheckListItem(cli,l.item(i).toElement().tagName()); - item->connect(this,TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") appendSub(l.item(i).childNodes(),item); } @@ -127,7 +127,7 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){ unsigned int i; for(i=0;i<l.length();i++) { myCheckListItem *item = new myCheckListItem(lv,l.item(i).toElement().tagName()); - item->connect(this,TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") { TQDomNodeList listSub = l.item(i).childNodes(); appendSub(listSub,item); @@ -136,26 +136,26 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){ } void CSSEditor::setCurrentPropOn(const TQString& s){ - if( (m_currentProp = static_cast<myCheckListItem*>(lvVisual->findItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvVisual->tqfindItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast<myCheckListItem*>(lvAll->findItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvAll->tqfindItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast<myCheckListItem*>(lvAural->findItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvAural->tqfindItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast<myCheckListItem*>(lvInteractive->findItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvInteractive->tqfindItem( s,0 )) )) m_currentProp->setOn(true); else - if( (m_currentProp = static_cast<myCheckListItem*>(lvPaged->findItem( s,0 )) )) + if( (m_currentProp = static_cast<myCheckListItem*>(lvPaged->tqfindItem( s,0 )) )) m_currentProp->setOn(true); if( m_currentProp && m_currentProp->depth() ) { - myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->parent()); + myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->tqparent()); while(p) { p->setOn(true); - p=static_cast<myCheckListItem*>(p->parent()); + p=static_cast<myCheckListItem*>(p->tqparent()); } } } @@ -167,14 +167,14 @@ void CSSEditor::setCurrentPropOn(const TQString& s){ } void CSSEditor::setSidesOfPropertyBorderOn(const TQString& s){ - static_cast<myCheckListItem*>(lvVisual->findItem( "border-top",0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->findItem( "border-right",0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->findItem( "border-bottom",0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->findItem( "border-left",0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->findItem( "border-top-"+s,0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->findItem( "border-right-"+s,0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->findItem( "border-bottom-"+s,0 ))->setOn(true); - static_cast<myCheckListItem*>(lvVisual->findItem( "border-left-"+s,0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-top",0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-right",0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-bottom",0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-left",0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-top-"+s,0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-right-"+s,0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-bottom-"+s,0 ))->setOn(true); + static_cast<myCheckListItem*>(lvVisual->tqfindItem( "border-left-"+s,0 ))->setOn(true); } void CSSEditor::hidePreviewer(){ @@ -190,7 +190,7 @@ void CSSEditor::initialize(){ TQString configFile = locate("appdata", "csseditor/config.xml"); - m_myhi = new QMyHighlighter(display); + m_myhi = new TQMyHighlighter(display); TQBoxLayout *fPreviewLayout = new TQBoxLayout(fPreview,TQBoxLayout::LeftToRight); m_previewer=new KHTMLPart(fPreview); @@ -266,7 +266,7 @@ void CSSEditor::initialize(){ const TQString propertyName((*it).section(":",0,0).stripWhiteSpace()); const TQString propertyValue((*it).section(":",1)); - if( ShorthandFormer::SHFormList().contains(propertyName)==0 ) { + if( ShorthandFormer::SHFormList().tqcontains(propertyName)==0 ) { temp+= propertyName + " : " + propertyValue +";\n\t"; addAndSetPropertyOn(propertyName,propertyValue); } @@ -296,7 +296,7 @@ void CSSEditor::toggleShortendForm() m_config->sync(); } -CSSEditor::CSSEditor(TQListViewItem *i, TQWidget *parent, const char *name) : CSSEditorS(parent, name){ +CSSEditor::CSSEditor(TQListViewItem *i, TQWidget *tqparent, const char *name) : CSSEditorS(tqparent, name){ m_selectorName = i->text(0); m_initialProperties = i->text(1); } @@ -323,12 +323,12 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ m_ps->setComboBox(); TQStringList values = TQStringList::split(",",curr.attribute("value")); m_ps->ComboBox()->insertStringList(values); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) - if( values.contains(m_currentProp->text(0))) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) + if( values.tqcontains(m_currentProp->text(0))) m_ps->ComboBox()->setCurrentText(m_properties[m_currentProp->text(0)]); if(curr.attribute("editable") == "yes"){ m_ps->ComboBox()->setEditable(true); - /*if(m_properties.contains(m_currentProp->text(0)) !=0 ) + /*if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) m_ps->ComboBox()->setEditText(m_properties[m_currentProp->text(0)]); */ } } @@ -344,7 +344,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "number") m_ps->setLineEdit(); else if( valueTypeName == "integer") { - if(m_properties.contains(m_currentProp->text(0)) !=0 ) { + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) { if(!curr.attribute("minValue").isNull()) m_ps->setSpinBox(m_properties[m_currentProp->text(0)],curr.attribute("minValue")); else @@ -359,15 +359,15 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "length") { lengthEditor *editor = new lengthEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else - editor->setInitialValue(TQString::null); + editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "percentage") { - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ percentageEditor *editor = new percentageEditor(m_properties[m_currentProp->text(0)],m_ps); m_ps->installMiniEditor(editor); } @@ -380,55 +380,55 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "doubleLength") { doubleLengthEditor *editor = new doubleLengthEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ TQString temp(m_properties[m_currentProp->text(0)].simplifyWhiteSpace()), sx(temp.section(" ",0,0)), dx(temp.section(" ",1,1)); editor->setInitialValue(sx,dx); } - else editor->setInitialValue(TQString::null,TQString::null); + else editor->setInitialValue(TQString(),TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "doublePercentage") { doublePercentageEditor *editor = new doublePercentageEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ TQString temp(m_properties[m_currentProp->text(0)].simplifyWhiteSpace()), sx(temp.section(" ",0,0)), dx(temp.section(" ",1,1)); editor->setInitialValue(sx,dx); } - else editor->setInitialValue(TQString::null,TQString::null); + else editor->setInitialValue(TQString(),TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "frequency") { frequencyEditor *editor = new frequencyEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else - editor->setInitialValue(TQString::null); + editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "time") { timeEditor *editor = new timeEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else - editor->setInitialValue(TQString::null); + editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } else if( valueTypeName == "angle") { angleEditor *editor = new angleEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ) + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ) editor->setInitialValue(m_properties[m_currentProp->text(0)]); else - editor->setInitialValue(TQString::null); + editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } else @@ -454,7 +454,7 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ if( valueTypeName == "colors") { RGBcolorSlider *RGBeditor = new RGBcolorSlider(m_ps); colorRequester *CReditor = new colorRequester(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ CReditor->lineEdit()->setText(m_properties[m_currentProp->text(0)]); CReditor->setInitialValue(); @@ -474,10 +474,10 @@ void CSSEditor::setMiniEditors(TQListViewItem* i){ else if( valueTypeName == "fontDialog" ){ fontEditor *editor = new fontEditor(m_ps); - if(m_properties.contains(m_currentProp->text(0)) !=0 ){ + if(m_properties.tqcontains(m_currentProp->text(0)) !=0 ){ editor->setInitialValue(m_properties[m_currentProp->text(0)]); } - else editor->setInitialValue(TQString::null); + else editor->setInitialValue(TQString()); m_ps->installMiniEditor(editor); } } @@ -491,10 +491,10 @@ void CSSEditor::checkProperty(const TQString& v){ m_currentProp->setOn(true); if( m_currentProp->depth() ){ - myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->parent()); + myCheckListItem *p = static_cast<myCheckListItem*>(m_currentProp->tqparent()); while(p){ p->setOn(true); - p=static_cast<myCheckListItem*>(p->parent()); + p=static_cast<myCheckListItem*>(p->tqparent()); } } diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h index e54667f5..d1f2ec7f 100644 --- a/quanta/components/csseditor/csseditor.h +++ b/quanta/components/csseditor/csseditor.h @@ -31,18 +31,18 @@ class KHTMLPart; class TQListViewItem; class TQDomNodeList; class TQVariant; -class QMyHighlighter; +class TQMyHighlighter; -class myCheckListItem : public QCheckListItem +class myCheckListItem : public TQCheckListItem { private: TQSignal *m_sig; unsigned int m_checkedChildren; public : - myCheckListItem(TQCheckListItem * parent, const TQString & text); - myCheckListItem(TQListView * parent, const TQString & text); + myCheckListItem(TQCheckListItem * tqparent, const TQString & text); + myCheckListItem(TQListView * tqparent, const TQString & text); ~myCheckListItem(); void connect( TQObject *receiver, const char *member ); void addCheckedChild(); @@ -56,8 +56,9 @@ class myCheckListItem : public QCheckListItem class CSSEditor : public CSSEditorS { Q_OBJECT + TQ_OBJECT private: - QMyHighlighter *m_myhi; + TQMyHighlighter *m_myhi; propertySetter *m_ps; myCheckListItem *m_currentProp; KHTMLPart *m_previewer; @@ -97,8 +98,8 @@ class CSSEditor : public CSSEditorS public: - CSSEditor(TQWidget* parent=0, const char *name=0): CSSEditorS(parent, name), m_config(0L){} - CSSEditor( TQListViewItem * i, TQWidget* parent=0, const char *name=0); + CSSEditor(TQWidget* tqparent=0, const char *name=0): CSSEditorS(tqparent, name), m_config(0L){} + CSSEditor( TQListViewItem * i, TQWidget* tqparent=0, const char *name=0); ~CSSEditor(); void initialize(); void setSelectors( const TQString& s) { m_Selectors = s; } diff --git a/quanta/components/csseditor/csseditor_globals.cpp b/quanta/components/csseditor/csseditor_globals.cpp index c2be79c0..3e9e1ca2 100644 --- a/quanta/components/csseditor/csseditor_globals.cpp +++ b/quanta/components/csseditor/csseditor_globals.cpp @@ -18,12 +18,12 @@ #include <tqlineedit.h> #include "csseditor_globals.h" -mySpinBox::mySpinBox(TQWidget * parent , const char * name ) : TQSpinBox (parent, name){ +mySpinBox::mySpinBox(TQWidget * tqparent , const char * name ) : TQSpinBox (tqparent, name){ connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); } -mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * parent, const char * name ) : TQSpinBox( minValue, maxValue, step, parent,name ){ +mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * tqparent, const char * name ) : TQSpinBox( minValue, maxValue, step, tqparent,name ){ connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); } @@ -34,12 +34,12 @@ void mySpinBox::checkSuffix(const TQString&){// check if the suffix is present a if(!suffix().isEmpty()){ const TQString suf(suffix()); TQString t(editor()->text()); - if( t.contains(suf) ==0 ) { + if( t.tqcontains(suf) ==0 ) { editor()->setText( t + suf); editor()->setCursorPosition(editor()->cursorPosition() - 1); } else - if( t.contains(suf) >1 ) { + if( t.tqcontains(suf) >1 ) { editor()->setText( t.remove(suf) + suf); editor()->setCursorPosition(editor()->cursorPosition() - 1); } diff --git a/quanta/components/csseditor/csseditor_globals.h b/quanta/components/csseditor/csseditor_globals.h index b577981e..edf9add3 100644 --- a/quanta/components/csseditor/csseditor_globals.h +++ b/quanta/components/csseditor/csseditor_globals.h @@ -34,7 +34,7 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu "lightskyblue,lightslategray,lightsteelblue,lightyellow,lime,limegreen,linen,magenta," "maroon,mediumaquamarine,mediumblue,mediumorchid,mediumpurple,mediumseagreen," "mediumslateblue,mediumspringgreen,mediumturquoise,mediumvioletred,midnightblue," - "mintcream,mistyrose,moccasin,navajowhite,navy,oldlace,olive,olivedrab,orange," + "mintcream,mistyrose,tqmoccasin,navajowhite,navy,oldlace,olive,olivedrab,orange," "orangered,orchid,palegoldenrod,palegreen,paleturquoise,palevioletred,papayawhip," "peachpuff,peru,pink,plum,powderblue,purple,red,rosybrown,royalblue,saddlebrown," "salmon,sandybrown,seagreen,seashell,sienna,silver,skyblue,slateblue,slategray,snow," @@ -49,11 +49,12 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu } -class mySpinBox : public QSpinBox{ +class mySpinBox : public TQSpinBox{ Q_OBJECT + TQ_OBJECT public: - mySpinBox(TQWidget * parent = 0, const char * name = 0 ); - mySpinBox( int minValue, int maxValue, int step = 1, TQWidget * parent = 0, const char * name = 0 ); + mySpinBox(TQWidget * tqparent = 0, const char * name = 0 ); + mySpinBox( int minValue, int maxValue, int step = 1, TQWidget * tqparent = 0, const char * name = 0 ); ~mySpinBox(); public slots: void checkSuffix(const TQString&); diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui index de99118f..cc7f94f3 100644 --- a/quanta/components/csseditor/csseditors.ui +++ b/quanta/components/csseditor/csseditors.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CSSEditorS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CSSEditorS</cstring> </property> @@ -32,22 +32,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>280</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="2" column="2"> + <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbOk</cstring> </property> @@ -63,7 +63,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> @@ -81,7 +81,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>SHckb</cstring> </property> @@ -92,7 +92,7 @@ <bool>false</bool> </property> </widget> - <widget class="QSplitter" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQSplitter" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>splitter3</cstring> </property> @@ -105,7 +105,7 @@ <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QTabWidget"> + <widget class="TQTabWidget"> <property name="name"> <cstring>twMediaGroup</cstring> </property> @@ -117,19 +117,19 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>33</width> <height>7</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>290</width> <height>32767</height> </size> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -143,7 +143,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Properties</string> @@ -167,7 +167,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -181,7 +181,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Properties</string> @@ -202,7 +202,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -216,7 +216,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Properties</string> @@ -237,7 +237,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -251,7 +251,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Properties</string> @@ -272,7 +272,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -286,7 +286,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Properties</string> @@ -308,14 +308,14 @@ </grid> </widget> </widget> - <widget class="QSplitter"> + <widget class="TQSplitter"> <property name="name"> <cstring>splitter3</cstring> </property> <property name="orientation"> <enum>Vertical</enum> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>fEditing</cstring> </property> @@ -326,7 +326,7 @@ <enum>Raised</enum> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>fPreview</cstring> </property> @@ -338,7 +338,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>200</height> @@ -351,7 +351,7 @@ <enum>Raised</enum> </property> </widget> - <widget class="QTextEdit"> + <widget class="TQTextEdit"> <property name="name"> <cstring>display</cstring> </property> @@ -363,7 +363,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32766</width> <height>32766</height> @@ -404,7 +404,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 458c8d13..2598336c 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -39,7 +39,7 @@ #include "stylesheetparser.h" -CSSSelector::CSSSelector(TQWidget *parent, const char* name) : CSSSelectorS (parent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) { +CSSSelector::CSSSelector(TQWidget *tqparent, const char* name) : CSSSelectorS (tqparent,name),m_orderNumber(0),m_stopProcessingStylesheet(false) { m_currentItem = 0L; @@ -174,7 +174,7 @@ void CSSSelector::addTag(){ TQListViewItem *item = new TQListViewItem(lvTags); if(!cbTag->currentText().isEmpty()){ item->setText(0,cbTag->currentText()); - QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber); + TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber); m_currentStylesheetStructure[item->text(0)]=tmp; } } @@ -183,7 +183,7 @@ void CSSSelector::addClass(){ TQListViewItem *item = new TQListViewItem(lvClasses); if(!leClass->text().isEmpty()){ item->setText(0,leClass->text()); - QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber); + TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber); m_currentStylesheetStructure[item->text(0)]=tmp; } } @@ -192,7 +192,7 @@ void CSSSelector::addID(){ TQListViewItem *item = new TQListViewItem(lvIDs); if(!leID->text().isEmpty()){ item->setText(0,leID->text()); - QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber); + TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber); m_currentStylesheetStructure[item->text(0)]=tmp; } } @@ -200,7 +200,7 @@ void CSSSelector::addID(){ void CSSSelector::addPseudo(){ TQListViewItem *item = new TQListViewItem(lvPseudo); item->setText(0,(lePseudoSelector->text()+":"+cbPseudo->currentText()).stripWhiteSpace()); - QPair<TQString, unsigned int> tmp(TQString::null,++m_orderNumber); + TQPair<TQString, unsigned int> tmp(TQString(),++m_orderNumber); m_currentStylesheetStructure[item->text(0)]=tmp; } @@ -283,7 +283,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ if(dlg.exec()) { i->setText(1,dlg.generateProperties()); - QPair<TQString, unsigned int> tmp(m_currentStylesheetStructure[i->text(0)]); + TQPair<TQString, unsigned int> tmp(m_currentStylesheetStructure[i->text(0)]); tmp.first = dlg.generateProperties(); m_currentStylesheetStructure[i->text(0)] = tmp; } @@ -292,7 +292,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ void CSSSelector::setCurrentListView(TQWidget* w){ TQObjectList *l = w->queryList( TQLISTVIEW_OBJECT_NAME_STRING ); - m_currentListView = static_cast<TQListView*>(l->first()); + m_currentListView = static_cast<TQListView*>(TQT_TQWIDGET(l->first())); } void CSSSelector::removeAll(){ @@ -319,20 +319,20 @@ void CSSSelector::loadCSSContent(const TQString& s){ p.parse(); m_orderNumber = p.orderNumber(); - TQMap<TQString, QPair<TQString,unsigned int> >::Iterator it; + TQMap<TQString, TQPair<TQString,unsigned int> >::Iterator it; m_currentStylesheetStructure = p.stylesheetStructure(); for ( it = m_currentStylesheetStructure.begin(); it != m_currentStylesheetStructure.end(); ++it ) { if(!it.key().startsWith("@rule") && !it.key().startsWith("/*")){ TQListViewItem *item; - if(it.key().contains(":")){ + if(it.key().tqcontains(":")){ item = new TQListViewItem(lvPseudo); } else - if(it.key().contains("#")){ + if(it.key().tqcontains("#")){ item = new TQListViewItem(lvIDs); } else - if(it.key().contains(".")){ + if(it.key().tqcontains(".")){ item = new TQListViewItem(lvClasses); } else { @@ -347,7 +347,7 @@ void CSSSelector::loadCSSContent(const TQString& s){ } TQString CSSSelector::generateFormattedStyleSection(){ - TQMap< TQString,QPair<TQString,unsigned int> >::Iterator it; + TQMap< TQString,TQPair<TQString,unsigned int> >::Iterator it; TQString styleSection,tmpStr; unsigned int indentWidth, indentDisplacement = 2; @@ -374,7 +374,7 @@ TQString CSSSelector::generateFormattedStyleSection(){ } indentStr.fill(' ', indentDisplacement); styleSection += tmpStr + indentStr + "}\n\n"; - tmpStr = TQString::null; + tmpStr = TQString(); } } } diff --git a/quanta/components/csseditor/cssselector.h b/quanta/components/csseditor/cssselector.h index 2c0fe426..7d5c40da 100644 --- a/quanta/components/csseditor/cssselector.h +++ b/quanta/components/csseditor/cssselector.h @@ -30,6 +30,7 @@ class TQStringList; class CSSSelector : public CSSSelectorS { Q_OBJECT + TQ_OBJECT private: TQListViewItem *m_currentItem; @@ -38,14 +39,14 @@ class CSSSelector : public CSSSelectorS { m_footer, m_callingFrom, m_fileToPreview; - TQMap<TQString, QPair<TQString,unsigned int> > m_currentStylesheetStructure; + TQMap<TQString, TQPair<TQString,unsigned int> > m_currentStylesheetStructure; unsigned int m_orderNumber; bool m_stopProcessingStylesheet; void Connect(); public: - CSSSelector(TQWidget *parent=0, const char* name=0); + CSSSelector(TQWidget *tqparent=0, const char* name=0); ~CSSSelector(); void loadCSSContent(const TQString& s); void setHeader(const TQString& h) { m_header = h; } diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui index 1119ccdb..09356a70 100644 --- a/quanta/components/csseditor/cssselectors.ui +++ b/quanta/components/csseditor/cssselectors.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CSSSelectorS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CSSSelectorS</cstring> </property> @@ -22,15 +22,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tlApplyToFile</cstring> </property> @@ -61,22 +61,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="2"> + <widget class="TQLayoutWidget" row="3" column="2"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbOk</cstring> </property> @@ -84,7 +84,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> @@ -94,11 +94,11 @@ </widget> </hbox> </widget> - <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQTabWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>twSelectors</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -109,9 +109,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> @@ -127,14 +127,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -153,7 +153,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>pbRemoveSelectedTag</cstring> </property> @@ -165,7 +165,7 @@ <string>Selected</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbRemoveAllTags</cstring> </property> @@ -185,14 +185,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -203,7 +203,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="0"> + <widget class="TQComboBox" row="0" column="0"> <property name="name"> <cstring>cbDTD</cstring> </property> @@ -220,14 +220,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>24</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -238,7 +238,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="0"> + <widget class="TQComboBox" row="0" column="0"> <property name="name"> <cstring>cbTag</cstring> </property> @@ -246,7 +246,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbAddTag</cstring> </property> @@ -266,7 +266,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -275,7 +275,7 @@ </spacer> </vbox> </widget> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Selector</string> @@ -329,7 +329,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -338,7 +338,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -349,7 +349,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Selector</string> @@ -403,16 +403,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <vbox> <property name="name"> @@ -428,14 +428,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4_2</cstring> </property> @@ -446,7 +446,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>pbRemoveSelectedID</cstring> </property> @@ -458,7 +458,7 @@ <string>Selected</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbRemoveAllIDs</cstring> </property> @@ -478,14 +478,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox7_2</cstring> </property> @@ -496,12 +496,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="0"> + <widget class="TQLineEdit" row="0" column="0"> <property name="name"> <cstring>leID</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbAddID</cstring> </property> @@ -521,7 +521,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -532,7 +532,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -543,7 +543,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Selector</string> @@ -597,16 +597,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> @@ -622,14 +622,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4_3</cstring> </property> @@ -640,7 +640,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>pbRemoveSelectedClass</cstring> </property> @@ -652,7 +652,7 @@ <string>Selected</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbRemoveAllClasses</cstring> </property> @@ -672,14 +672,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -690,12 +690,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="0"> + <widget class="TQLineEdit" row="0" column="0"> <property name="name"> <cstring>leClass</cstring> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbAddClass</cstring> </property> @@ -715,7 +715,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -726,7 +726,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -737,7 +737,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Selector</string> @@ -791,16 +791,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <vbox> <property name="name"> @@ -816,14 +816,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -834,7 +834,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbRemoveAllPseudo</cstring> </property> @@ -842,7 +842,7 @@ <string>All</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>pbRemoveSelectedPseudo</cstring> </property> @@ -866,14 +866,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>groupBox7_3</cstring> </property> @@ -884,12 +884,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="0"> + <widget class="TQLineEdit" row="0" column="0"> <property name="name"> <cstring>lePseudoSelector</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="0"> + <widget class="TQComboBox" row="1" column="0"> <property name="name"> <cstring>cbPseudo</cstring> </property> @@ -897,7 +897,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>pbAddPseudo</cstring> </property> @@ -917,7 +917,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -939,7 +939,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>380</width> <height>20</height> @@ -975,7 +975,7 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/quanta/components/csseditor/cssshpropertyparser.cpp b/quanta/components/csseditor/cssshpropertyparser.cpp index d117b5f5..b523a1b4 100644 --- a/quanta/components/csseditor/cssshpropertyparser.cpp +++ b/quanta/components/csseditor/cssshpropertyparser.cpp @@ -61,7 +61,7 @@ TQString CSSSHPropertyParser::extractQuotedStringList(){ unsigned int i=0; while(!stop && i<m_propertyToParse.length() ){ if( m_propertyToParse[i] == ' ' ){ - if( ( temp.contains("\"") + temp.contains("\'") )%2 == 0 ) stop = true; + if( ( temp.tqcontains("\"") + temp.tqcontains("\'") )%2 == 0 ) stop = true; else temp += m_propertyToParse[i]; } else temp += m_propertyToParse[i]; @@ -89,32 +89,32 @@ TQStringList CSSSHPropertyParser::parse(){ temp+=m_propertyToParse[i]; } - if(temp.contains("url(") !=0 ){ + if(temp.tqcontains("url(") !=0 ){ TQString foundURIList = extractURIList(); m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundURIList)); tokenList.append(foundURIList); } else - if(temp.contains("(")!=0){ + if(temp.tqcontains("(")!=0){ TQString foundFunctionList = extractFunctionList(); m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundFunctionList)); tokenList.append(foundFunctionList); } else - if(temp.contains("'")!=0 || temp.contains("\"")!=0 || temp.contains(",")!=0){ + if(temp.tqcontains("'")!=0 || temp.tqcontains("\"")!=0 || temp.tqcontains(",")!=0){ TQString foundQuotedStringList = extractQuotedStringList(); m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(foundQuotedStringList)); tokenList.append(foundQuotedStringList); } else - if(temp.contains("/")!=0){ //treat the presence of line-height in font shorthand form + if(temp.tqcontains("/")!=0){ //treat the presence of line-height in font shorthand form m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(temp)); tokenList.append(temp.section("/",0,0)); tokenList.append("/"+temp.section("/",1,1)); } else { tokenList.append(temp); - int tempPos = m_propertyToParse.find(temp); + int tempPos = m_propertyToParse.tqfind(temp); m_propertyToParse = removeBeginningWhiteSpaces(m_propertyToParse.remove(tempPos,temp.length())); } if( m_propertyToParse.isEmpty() ) stop = true; diff --git a/quanta/components/csseditor/data/config.xml b/quanta/components/csseditor/data/config.xml index 15fd659f..988041ca 100644 --- a/quanta/components/csseditor/data/config.xml +++ b/quanta/components/csseditor/data/config.xml @@ -469,9 +469,9 @@ <freeedit/> </right> - <table-layout> + <table-tqlayout> <list value="auto,fixed,inherit"/> - </table-layout> + </table-tqlayout> <text-align> <list value="center,justify,right,left,inherit"/> @@ -503,9 +503,9 @@ <freeedit/> </top> - <unicode-bidi> + <tqunicode-bidi> <list value="normal,embed,bidi-override,inherit"/> - </unicode-bidi> + </tqunicode-bidi> <vertical-align> <list value="baseline,inherit,sub,super,top,text-top,middle,bottom,text-bottom"/> diff --git a/quanta/components/csseditor/doubleeditors.cpp b/quanta/components/csseditor/doubleeditors.cpp index e877e2ac..0bc85eee 100644 --- a/quanta/components/csseditor/doubleeditors.cpp +++ b/quanta/components/csseditor/doubleeditors.cpp @@ -23,7 +23,7 @@ -doubleEditorBase::doubleEditorBase(TQWidget *parent, const char *name) : miniEditor(parent,name){ +doubleEditorBase::doubleEditorBase(TQWidget *tqparent, const char *name) : miniEditor(tqparent,name){ } void doubleEditorBase::sxValueSlot(const TQString& v){ @@ -36,7 +36,7 @@ void doubleEditorBase::dxValueSlot(const TQString& v){ emit valueChanged( m_sxValue +" " + m_dxValue); } - doubleLengthEditor::doubleLengthEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ + doubleLengthEditor::doubleLengthEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ m_ssbSx = new specialSB(this); m_ssbSx->insertItem("cm"); @@ -76,7 +76,7 @@ void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx) m_ssbDx->setInitialValue(dx); } -doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ +doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ m_cbSx = new TQComboBox(this); m_cbDx = new TQComboBox(this); connect(m_cbSx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(sxValueSlot(const TQString&))); @@ -92,7 +92,7 @@ void doubleComboBoxEditor::connectToPropertySetter(propertySetter* p){ connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); } -doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ +doublePercentageEditor::doublePercentageEditor(TQWidget *tqparent, const char *name) : doubleEditorBase(tqparent,name){ m_sbSx = new mySpinBox(this); m_sbDx = new mySpinBox(this); m_sbSx->setSuffix("%"); diff --git a/quanta/components/csseditor/doubleeditors.h b/quanta/components/csseditor/doubleeditors.h index 4797f7c7..3bae8456 100644 --- a/quanta/components/csseditor/doubleeditors.h +++ b/quanta/components/csseditor/doubleeditors.h @@ -25,12 +25,13 @@ class doubleEditorBase : public miniEditor { Q_OBJECT + TQ_OBJECT protected: TQString m_sxValue, m_dxValue; public: - doubleEditorBase(TQWidget *parent=0, const char *name=0); + doubleEditorBase(TQWidget *tqparent=0, const char *name=0); virtual ~doubleEditorBase(){} virtual void setInitialValue(){} virtual void connectToPropertySetter(propertySetter* /*p*/){} @@ -45,12 +46,13 @@ class doubleEditorBase : public miniEditor { class doublePercentageEditor : public doubleEditorBase { Q_OBJECT + TQ_OBJECT private: mySpinBox *m_sbSx, *m_sbDx; public: - doublePercentageEditor(TQWidget *parent=0, const char *name=0); + doublePercentageEditor(TQWidget *tqparent=0, const char *name=0); virtual ~doublePercentageEditor(); virtual void setInitialValue(const TQString& sx, const TQString& dx); virtual void connectToPropertySetter(propertySetter* p); @@ -58,12 +60,13 @@ class doublePercentageEditor : public doubleEditorBase { class doubleComboBoxEditor : public doubleEditorBase { Q_OBJECT + TQ_OBJECT private: TQComboBox *m_cbSx, *m_cbDx; public: - doubleComboBoxEditor(TQWidget *parent=0, const char *name=0); + doubleComboBoxEditor(TQWidget *tqparent=0, const char *name=0); virtual ~doubleComboBoxEditor(); TQComboBox* cbSx() const { return m_cbSx;} TQComboBox* cbDx() const { return m_cbDx;} @@ -72,12 +75,13 @@ class doubleComboBoxEditor : public doubleEditorBase { class doubleLengthEditor : public doubleEditorBase { Q_OBJECT + TQ_OBJECT private: specialSB *m_ssbSx, *m_ssbDx; public: - doubleLengthEditor(TQWidget *parent=0, const char *name=0); + doubleLengthEditor(TQWidget *tqparent=0, const char *name=0); virtual ~doubleLengthEditor(); virtual void setInitialValue(const TQString& sx, const TQString& dx); virtual void connectToPropertySetter(propertySetter* p); diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp index f8ba4ac6..fb0272a0 100644 --- a/quanta/components/csseditor/encodingselector.cpp +++ b/quanta/components/csseditor/encodingselector.cpp @@ -26,7 +26,7 @@ *@author gulmini luciano */ -encodingSelector::encodingSelector(TQWidget *parent, const char* name) : encodingSelectorS(parent,name){ +encodingSelector::encodingSelector(TQWidget *tqparent, const char* name) : encodingSelectorS(tqparent,name){ TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); int insert = 0; for (uint i=0; i < encodings.count(); i++) { diff --git a/quanta/components/csseditor/encodingselector.h b/quanta/components/csseditor/encodingselector.h index f53dca27..9c2db48c 100644 --- a/quanta/components/csseditor/encodingselector.h +++ b/quanta/components/csseditor/encodingselector.h @@ -28,9 +28,10 @@ class encodingSelector : public encodingSelectorS { Q_OBJECT + TQ_OBJECT public: - encodingSelector(TQWidget *parent=0, const char* name=0); + encodingSelector(TQWidget *tqparent=0, const char* name=0); ~encodingSelector(); TQString encodingSet() const { return cbEncoding->currentText();} diff --git a/quanta/components/csseditor/encodingselectors.ui b/quanta/components/csseditor/encodingselectors.ui index 45d269de..532cc137 100644 --- a/quanta/components/csseditor/encodingselectors.ui +++ b/quanta/components/csseditor/encodingselectors.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>encodingSelectorS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>encodingSelectorS</cstring> </property> @@ -19,23 +19,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -43,22 +43,22 @@ <string>Select encoding:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>cbEncoding</cstring> </property> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbOk</cstring> </property> @@ -76,14 +76,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> @@ -111,5 +111,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index 9f8da65d..08f24ed5 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -32,40 +32,40 @@ #include<kdebug.h> -fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontFamilyChooserS(parent,name){ +fontFamilyChooser::fontFamilyChooser(TQWidget* tqparent, const char *name) : fontFamilyChooserS(tqparent,name){ TQFont tmpFont( KGlobalSettings::generalFont().family(), 64, TQFont::Black ); lePreview->setMinimumHeight( lePreview->fontMetrics().lineSpacing() ); - lePreview->setAlignment(Qt::AlignCenter); + lePreview->tqsetAlignment(TQt::AlignCenter); TQFont font; font.setPointSize(20); lePreview->setFont(font); lePreview->setText(i18n("The Quick Brown Fox Jumps Over The Lazy Dog")); TQFontDatabase fdb; - TQStringList families = fdb.families(); + TQStringList families = fdb.tqfamilies(); for ( TQStringList::Iterator it = families.begin(); it != families.end(); ++it ) { - if( (*it).contains('[') !=0 ) + if( (*it).tqcontains('[') !=0 ) it = families.remove(it); } if( families.count() != 0 ) lbAvailable->insertStringList(families); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("forward")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("forward")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); pbAdd->setIconSet(iconSet); pbAdd->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::fromLatin1("back")); + iconSet = SmallIconSet(TQString::tqfromLatin1("back")); pbRemove->setIconSet(iconSet); pbRemove->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::fromLatin1("up")); + iconSet = SmallIconSet(TQString::tqfromLatin1("up")); pbMoveUp->setIconSet(iconSet); pbMoveUp->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - iconSet = SmallIconSet(TQString::fromLatin1("down")); + iconSet = SmallIconSet(TQString::tqfromLatin1("down")); pbMoveDown->setIconSet(iconSet); pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -100,9 +100,9 @@ void fontFamilyChooser::updatePreview(const TQString& s){ void fontFamilyChooser::addFont(){ lbSelected->insertItem( m_currentSelectedFont ); switch(m_fontOrigin) { - case available: lbAvailable->removeItem(lbAvailable->index(lbAvailable->findItem(m_currentSelectedFont))); + case available: lbAvailable->removeItem(lbAvailable->index(lbAvailable->tqfindItem(m_currentSelectedFont))); break; - case generic : lbGeneric->removeItem(lbGeneric->index(lbGeneric->findItem(m_currentSelectedFont))); + case generic : lbGeneric->removeItem(lbGeneric->index(lbGeneric->tqfindItem(m_currentSelectedFont))); break; } } @@ -156,7 +156,7 @@ TQStringList fontFamilyChooser::fontList(){ TQStringList list; TQListBoxItem *item = lbSelected->firstItem(); while( item != 0 ){ - if( item->text().contains( TQRegExp("\\W") ) ) list.append( "'" + item->text() + "'" ); + if( item->text().tqcontains( TQRegExp("\\W") ) ) list.append( "'" + item->text() + "'" ); else list.append( item->text() ); item = item->next(); } diff --git a/quanta/components/csseditor/fontfamilychooser.h b/quanta/components/csseditor/fontfamilychooser.h index d67ce92d..9cb8af54 100644 --- a/quanta/components/csseditor/fontfamilychooser.h +++ b/quanta/components/csseditor/fontfamilychooser.h @@ -24,6 +24,7 @@ class TQStringList; class fontFamilyChooser : public fontFamilyChooserS { Q_OBJECT + TQ_OBJECT private: enum FontOrigin { available, generic }; TQString m_currentSelectedFont; @@ -43,7 +44,7 @@ class fontFamilyChooser : public fontFamilyChooserS void moveFontDown(); public: - fontFamilyChooser(TQWidget* parent, const char *name=0); + fontFamilyChooser(TQWidget* tqparent, const char *name=0); ~fontFamilyChooser(); TQStringList fontList(); void setInitialValue(const TQString& s); diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui index 1b846446..11d3bfe8 100644 --- a/quanta/components/csseditor/fontfamilychoosers.ui +++ b/quanta/components/csseditor/fontfamilychoosers.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>fontFamilyChooserS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>fontFamilyChooserS</cstring> </property> @@ -30,47 +30,47 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout42</cstring> + <cstring>tqlayout42</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout40</cstring> + <cstring>tqlayout40</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout39</cstring> + <cstring>tqlayout39</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout36</cstring> + <cstring>tqlayout36</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout20</cstring> + <cstring>tqlayout20</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -78,22 +78,22 @@ <string>Available system font families:</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>lbAvailable</cstring> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -101,7 +101,7 @@ <string>Generic family:</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <item> <property name="text"> <string>cursive</string> @@ -143,9 +143,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout38</cstring> + <cstring>tqlayout38</cstring> </property> <vbox> <property name="name"> @@ -164,14 +164,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -193,7 +193,7 @@ <property name="title"> <string></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> <property name="flat"> @@ -219,13 +219,13 @@ <property name="name"> <cstring>pbMoveUp</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>22</width> <height>22</height> @@ -239,13 +239,13 @@ <property name="name"> <cstring>pbAdd</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>22</width> <height>22</height> @@ -259,13 +259,13 @@ <property name="name"> <cstring>pbRemove</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>22</width> <height>22</height> @@ -279,13 +279,13 @@ <property name="name"> <cstring>pbMoveDown</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>22</width> <height>22</height> @@ -307,7 +307,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -316,15 +316,15 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -332,7 +332,7 @@ <string>Selected font families:</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>lbSelected</cstring> </property> @@ -349,16 +349,16 @@ </widget> </hbox> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lePreview</cstring> </property> </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout41</cstring> + <cstring>tqlayout41</cstring> </property> <hbox> <property name="name"> @@ -374,16 +374,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>313</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -429,7 +429,7 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/quanta/components/csseditor/minieditor.h b/quanta/components/csseditor/minieditor.h index 1f5c25ef..0d668529 100644 --- a/quanta/components/csseditor/minieditor.h +++ b/quanta/components/csseditor/minieditor.h @@ -26,9 +26,9 @@ class propertySetter; -class miniEditor : public QHBox{ +class miniEditor : public TQHBox{ public: - miniEditor(TQWidget *parent=0, const char *name=0):TQHBox(parent,name){} + miniEditor(TQWidget *tqparent=0, const char *name=0):TQHBox(tqparent,name){} ~miniEditor(){} virtual void connectToPropertySetter(propertySetter* p)=0; }; diff --git a/quanta/components/csseditor/percentageeditor.cpp b/quanta/components/csseditor/percentageeditor.cpp index b02a1615..cd0eec23 100644 --- a/quanta/components/csseditor/percentageeditor.cpp +++ b/quanta/components/csseditor/percentageeditor.cpp @@ -17,7 +17,7 @@ #include "percentageeditor.h" #include "propertysetter.h" -percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *parent, const char *name) : miniEditor(parent,name) +percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *tqparent, const char *name) : miniEditor(tqparent,name) { TQString temp(initialValue); m_sb = new mySpinBox(0,9999,1,this); diff --git a/quanta/components/csseditor/percentageeditor.h b/quanta/components/csseditor/percentageeditor.h index a6aecb8c..31a0d6ef 100644 --- a/quanta/components/csseditor/percentageeditor.h +++ b/quanta/components/csseditor/percentageeditor.h @@ -38,10 +38,11 @@ class propertySetter; class percentageEditor : public miniEditor { Q_OBJECT + TQ_OBJECT private: mySpinBox *m_sb; public: - percentageEditor(const TQString& initialValue="0",TQWidget *parent=0, const char *name=0); + percentageEditor(const TQString& initialValue="0",TQWidget *tqparent=0, const char *name=0); ~percentageEditor(); virtual void connectToPropertySetter(propertySetter* p); signals: diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp index 922c7dbe..894a9562 100644 --- a/quanta/components/csseditor/propertysetter.cpp +++ b/quanta/components/csseditor/propertysetter.cpp @@ -36,7 +36,7 @@ #include "csseditor_globals.h" #include "minieditor.h" -propertySetter::propertySetter(TQWidget *parent, const char *name ) : TQHBox(parent,name) { +propertySetter::propertySetter(TQWidget *tqparent, const char *name ) : TQHBox(tqparent,name) { m_ind = 0; m_cb = 0L; m_list.setAutoDelete(true); @@ -113,7 +113,7 @@ void propertySetter::addButton(){ m_pb = new KPushButton(this); TQToolTip::add(m_pb, i18n( "More..." )); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("2rightarrow")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("2rightarrow")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); diff --git a/quanta/components/csseditor/propertysetter.h b/quanta/components/csseditor/propertysetter.h index 2f0a90af..df9c29bc 100644 --- a/quanta/components/csseditor/propertysetter.h +++ b/quanta/components/csseditor/propertysetter.h @@ -33,6 +33,7 @@ class KPushButton; class propertySetter : public TQHBox { Q_OBJECT + TQ_OBJECT private: unsigned int m_ind; @@ -41,13 +42,13 @@ class propertySetter : public TQHBox { KPushButton *m_pb; public: - propertySetter(TQWidget *parent=0, const char *name=0); + propertySetter(TQWidget *tqparent=0, const char *name=0); ~propertySetter(); void installMiniEditor(miniEditor *m); void setComboBox(); - void setSpinBox(const TQString& initialValue="0", const TQString& min="0", const TQString& max="9999", const TQString& s=TQString::null); + void setSpinBox(const TQString& initialValue="0", const TQString& min="0", const TQString& max="9999", const TQString& s=TQString()); void setLineEdit(); void setPredefinedColorListEditor(); void reset(); diff --git a/quanta/components/csseditor/qmyhighlighter.cpp b/quanta/components/csseditor/qmyhighlighter.cpp index dad1fe24..ce81aedc 100644 --- a/quanta/components/csseditor/qmyhighlighter.cpp +++ b/quanta/components/csseditor/qmyhighlighter.cpp @@ -17,14 +17,14 @@ #include "qmyhighlighter.h" #include <tqregexp.h> -QMyHighlighter::QMyHighlighter(TQTextEdit* Qtxt):TQSyntaxHighlighter(Qtxt){ +TQMyHighlighter::TQMyHighlighter(TQTextEdit* TQtxt):TQSyntaxHighlighter(TQtxt){ } /*****************************************************************************/ -QMyHighlighter::~QMyHighlighter(){ +TQMyHighlighter::~TQMyHighlighter(){ } /*****************************************************************************/ -int QMyHighlighter::highlightParagraph( const TQString & text, int /*endStateOfLastPara*/ ) +int TQMyHighlighter::highlightParagraph( const TQString & text, int /*endStateOfLastPara*/ ) { //TQRegExp pattern("\\s*\\{([\\w\\s\\d:;-\"]*)\\}\\s*"); TQRegExp pattern("([#:\\.\\w]*)\\s*\\{"); diff --git a/quanta/components/csseditor/qmyhighlighter.h b/quanta/components/csseditor/qmyhighlighter.h index 60e767f5..8d7b6a67 100644 --- a/quanta/components/csseditor/qmyhighlighter.h +++ b/quanta/components/csseditor/qmyhighlighter.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef QMYHIGHLIGHTER_H -#define QMYHIGHLIGHTER_H +#ifndef TQMYHIGHLIGHTER_H +#define TQMYHIGHLIGHTER_H #include <tqsyntaxhighlighter.h> @@ -24,11 +24,11 @@ *@author Emiliano Gulmini */ -class QMyHighlighter : public TQSyntaxHighlighter { +class TQMyHighlighter : public TQSyntaxHighlighter { public: - QMyHighlighter(TQTextEdit* Qtxt); + TQMyHighlighter(TQTextEdit* TQtxt); - ~QMyHighlighter(); + ~TQMyHighlighter(); int highlightParagraph ( const TQString & text, int endStateOfLastPara ); }; diff --git a/quanta/components/csseditor/shorthandformer.cpp b/quanta/components/csseditor/shorthandformer.cpp index 08acc819..4843986c 100644 --- a/quanta/components/csseditor/shorthandformer.cpp +++ b/quanta/components/csseditor/shorthandformer.cpp @@ -52,167 +52,167 @@ static const TQStringList backgroundRepeatValueList = TQStringList::split(",",ba ShorthandFormer::ShorthandFormer( TQMap<TQString,TQString> m){ m_properties = m; - if(m_properties.contains("cue-after")){ + if(m_properties.tqcontains("cue-after")){ cue_after= m_properties["cue-after"]; m_properties.remove("cue-after"); } - if(m_properties.contains("cue-before")){ + if(m_properties.tqcontains("cue-before")){ cue_before = m_properties["cue-before"]; m_properties.remove("cue-before"); } - if(m_properties.contains("pause-before")){ + if(m_properties.tqcontains("pause-before")){ pause_before= m_properties["pause-before"]; m_properties.remove("pause-before"); } - if(m_properties.contains("pause-after")){ + if(m_properties.tqcontains("pause-after")){ pause_after = m_properties["pause-after"]; m_properties.remove("pause-after"); } - if(m_properties.contains("background-color")){ + if(m_properties.tqcontains("background-color")){ background_color = m_properties["background-color"]; m_properties.remove("background-color"); } - if(m_properties.contains("background-image")){ + if(m_properties.tqcontains("background-image")){ background_image = m_properties["background-image"]; m_properties.remove("background-image"); } - if(m_properties.contains("background-repeat")){ + if(m_properties.tqcontains("background-repeat")){ background_repeat = m_properties["background-repeat"]; m_properties.remove("background-repeat"); } - if(m_properties.contains("background-attachment")){ + if(m_properties.tqcontains("background-attachment")){ background_attachment = m_properties["background-attachment"]; m_properties.remove("background-attachment"); } - if(m_properties.contains("background-position")){ + if(m_properties.tqcontains("background-position")){ background_position = m_properties["background-position"]; m_properties.remove("background-position"); } - if(m_properties.contains("border-top-style")){ + if(m_properties.tqcontains("border-top-style")){ border_top_style = m_properties["border-top-style"]; m_properties.remove("border-top-style"); } - if(m_properties.contains("border-top-color")){ + if(m_properties.tqcontains("border-top-color")){ border_top_color = m_properties["border-top-color"]; m_properties.remove("border-top-color"); } - if(m_properties.contains("border-top-width")){ + if(m_properties.tqcontains("border-top-width")){ border_top_width = m_properties["border-top-width"]; m_properties.remove("border-top-width"); } - if(m_properties.contains("border-left-style")){ + if(m_properties.tqcontains("border-left-style")){ border_left_style = m_properties["border-left-style"]; m_properties.remove("border-left-style"); } - if(m_properties.contains("border-left-color")){ + if(m_properties.tqcontains("border-left-color")){ border_left_color = m_properties["border-left-color"]; m_properties.remove("border-left-color"); } - if(m_properties.contains("border-left-width")){ + if(m_properties.tqcontains("border-left-width")){ border_left_width = m_properties["border-left-width"]; m_properties.remove("border-left-width"); } - if(m_properties.contains("border-right-style")){ + if(m_properties.tqcontains("border-right-style")){ border_right_style = m_properties["border-right-style"]; m_properties.remove("border-right-style"); } - if(m_properties.contains("border-right-color")){ + if(m_properties.tqcontains("border-right-color")){ border_right_color = m_properties["border-right-color"]; m_properties.remove("border-right-color"); } - if(m_properties.contains("border-right-width")){ + if(m_properties.tqcontains("border-right-width")){ border_right_width= m_properties["border-right-width"]; m_properties.remove("border-right-width"); } - if(m_properties.contains("border-bottom-style")){ + if(m_properties.tqcontains("border-bottom-style")){ border_bottom_style = m_properties["border-bottom-style"]; m_properties.remove("border-bottom-style"); } - if(m_properties.contains("border-bottom-color")){ + if(m_properties.tqcontains("border-bottom-color")){ border_bottom_color = m_properties["border-bottom-color"]; m_properties.remove("border-bottom-color"); } - if(m_properties.contains("border-bottom-width")){ + if(m_properties.tqcontains("border-bottom-width")){ border_bottom_width = m_properties["border-bottom-width"]; m_properties.remove("border-bottom-width"); } - if(m_properties.contains("outline-style")){ + if(m_properties.tqcontains("outline-style")){ outline_style = m_properties["outline-style"]; m_properties.remove("outline-style"); } - if(m_properties.contains("outline-color")){ + if(m_properties.tqcontains("outline-color")){ outline_color = m_properties["outline-color"]; m_properties.remove("outline-color"); } - if(m_properties.contains("outline-width")){ + if(m_properties.tqcontains("outline-width")){ outline_width = m_properties["outline-width"]; m_properties.remove("outline-width"); } - if(m_properties.contains("list-style-type")){ + if(m_properties.tqcontains("list-style-type")){ list_style_type= m_properties["list-style-type"]; m_properties.remove("list-style-type"); } - if(m_properties.contains("list-style-image")){ + if(m_properties.tqcontains("list-style-image")){ list_style_image = m_properties["list-style-image"]; m_properties.remove("list-style-image"); } - if(m_properties.contains("list-style-position")){ + if(m_properties.tqcontains("list-style-position")){ list_style_position = m_properties["list-style-position"]; m_properties.remove("list-style-position"); } - if(m_properties.contains("font-style")){ + if(m_properties.tqcontains("font-style")){ font_style = m_properties["font-style"]; m_properties.remove("font-style"); } - if(m_properties.contains("font-variant")){ + if(m_properties.tqcontains("font-variant")){ font_variant = m_properties["font-variant"]; m_properties.remove("font-variant"); } - if(m_properties.contains("font-weight")){ + if(m_properties.tqcontains("font-weight")){ font_weight = m_properties["font-weight"]; m_properties.remove("font-weight"); } - if(m_properties.contains("font-size")){ + if(m_properties.tqcontains("font-size")){ font_size = m_properties["font-size"]; m_properties.remove("font-size"); } - if(m_properties.contains("line-height")){ + if(m_properties.tqcontains("line-height")){ line_height= m_properties["line-height"]; m_properties.remove("line-height"); } - if(m_properties.contains("font-family")){ + if(m_properties.tqcontains("font-family")){ font_family = m_properties["font-family"]; m_properties.remove("font-family"); } - if(m_properties.contains("margin-top")){ + if(m_properties.tqcontains("margin-top")){ margin_top = m_properties["margin-top"]; m_properties.remove("margin-top"); } - if(m_properties.contains("margin-bottom")){ + if(m_properties.tqcontains("margin-bottom")){ margin_bottom = m_properties["margin-bottom"]; m_properties.remove("margin-bottom"); } - if(m_properties.contains("margin-left")){ + if(m_properties.tqcontains("margin-left")){ margin_left = m_properties["margin-left"]; m_properties.remove("margin-left"); } - if(m_properties.contains("margin-right")){ + if(m_properties.tqcontains("margin-right")){ margin_right = m_properties["margin-right"]; m_properties.remove("margin-right"); } - if(m_properties.contains("padding-top")){ + if(m_properties.tqcontains("padding-top")){ padding_top = m_properties["padding-top"]; m_properties.remove("padding-top"); } - if(m_properties.contains("padding-bottom")){ + if(m_properties.tqcontains("padding-bottom")){ padding_bottom = m_properties["padding-bottom"]; m_properties.remove("padding-bottom"); } - if(m_properties.contains("padding-left")){ + if(m_properties.tqcontains("padding-left")){ padding_left = m_properties["padding-left"]; m_properties.remove("padding-left"); } - if(m_properties.contains("padding-right")){ + if(m_properties.tqcontains("padding-right")){ padding_right = m_properties["padding-right"]; m_properties.remove("padding-right"); } @@ -384,7 +384,7 @@ TQString ShorthandFormer::compressBackgroundProp(){ if( !background_attachment.isEmpty() ) backgroundProp += (" " + background_attachment ); if( !background_position.isEmpty() ) backgroundProp += (" " + background_position ); if( !backgroundProp.isEmpty() ) return ( "background :" + backgroundProp + "; "); - return TQString::null; + return TQString(); } TQString ShorthandFormer::compressPaddingProp(){ @@ -408,7 +408,7 @@ TQString ShorthandFormer::compressImplementation3( const TQString& prop, const T if( !p2.isEmpty() ) props += (" " + p2 ); if( !p3.isEmpty() ) props += (" " + p3 ); if( !props.isEmpty() ) return ( prop + " :" + props + "; "); - return TQString::null; + return TQString(); } TQString ShorthandFormer::compressImplementation2( const TQString& prop, const TQString& after, const TQString& before, const TQString& defValue){ @@ -440,7 +440,7 @@ TQString ShorthandFormer::compressImplementation( const TQString& prop, const TQ if( top == defValue && bottom == defValue && right == defValue && left == defValue) - return TQString::null; + return TQString(); if( top == bottom && bottom == right && right == left ) return ( prop +" : " + top + "; "); @@ -517,11 +517,11 @@ TQMap<TQString,TQString> ShorthandFormer::expandBackgroundProp(const TQStringLi while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( (*it).contains("url(") || temp == "none" || temp == "inherit" ){ + if( (*it).tqcontains("url(") || temp == "none" || temp == "inherit" ){ expandedProps["background-image"] = (*it); } else - if( backgroundRepeatValueList.contains(temp)!=0 ) { + if( backgroundRepeatValueList.tqcontains(temp)!=0 ) { expandedProps["background-repeat"] = (*it); } else @@ -529,12 +529,12 @@ TQMap<TQString,TQString> ShorthandFormer::expandBackgroundProp(const TQStringLi expandedProps["background-attachment"] = (*it); } else - if( (*it).contains("rgb(") || (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit" ){ + if( (*it).tqcontains("rgb(") || (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit" ){ expandedProps["background-color"] = (*it); } else - if( temp == "top" || temp == "center" || temp == "bottom" || temp == "left" || temp == "right" || (*it).contains(globalPercentagePattern) || (*it).contains(globalLengthPattern) || temp == "inherit"){ - if( expandedProps.contains("background-position") ) + if( temp == "top" || temp == "center" || temp == "bottom" || temp == "left" || temp == "right" || (*it).tqcontains(globalPercentagePattern) || (*it).tqcontains(globalLengthPattern) || temp == "inherit"){ + if( expandedProps.tqcontains("background-position") ) expandedProps["background-position"] = ( expandedProps["background-position"] + " " + (*it) ); else expandedProps["background-position"] = (*it); @@ -590,7 +590,7 @@ TQMap<TQString,TQString> ShorthandFormer::expandFontProp(const TQStringList& l) fontPseudoSHFormValues.append("message-box"); fontPseudoSHFormValues.append("small-caption"); fontPseudoSHFormValues.append("status-bar"); - if( l.count()==1 && fontPseudoSHFormValues.contains(l[0]) != 0) { + if( l.count()==1 && fontPseudoSHFormValues.tqcontains(l[0]) != 0) { expandedProps["font"] = l[0]; return expandedProps; } @@ -599,18 +599,18 @@ TQMap<TQString,TQString> ShorthandFormer::expandFontProp(const TQStringList& l) while ( it != l.end() ) { TQString currentIt = (*it); TQString temp(currentIt.stripWhiteSpace()); - if( fontStyleValueList.contains(temp)!=0 ) expandedProps["font-style"] = (*it); + if( fontStyleValueList.tqcontains(temp)!=0 ) expandedProps["font-style"] = (*it); else - if( fontVariantValueList.contains(temp)!=0 ) expandedProps["font-variant"] = currentIt ; + if( fontVariantValueList.tqcontains(temp)!=0 ) expandedProps["font-variant"] = currentIt ; else - if( fontWeightValueList.contains(temp)!=0) expandedProps["font-weight"] = currentIt; + if( fontWeightValueList.tqcontains(temp)!=0) expandedProps["font-weight"] = currentIt; else - if( (fontSizeValueList.contains(temp)!=0 || currentIt.contains(globalPercentagePattern)!=0 || currentIt.contains(globalLengthPattern)!=0) && expandedProps["font-size"].isEmpty() ) + if( (fontSizeValueList.tqcontains(temp)!=0 || currentIt.tqcontains(globalPercentagePattern)!=0 || currentIt.tqcontains(globalLengthPattern)!=0) && expandedProps["font-size"].isEmpty() ) { expandedProps["font-size"] = currentIt; } else - if( currentIt.contains(percentagePattern)!=0 || currentIt.contains(numberPattern)!=0 || currentIt.contains(lengthPattern)!=0 || temp == "/normal" || temp == "/inherit" ) + if( currentIt.tqcontains(percentagePattern)!=0 || currentIt.tqcontains(numberPattern)!=0 || currentIt.tqcontains(lengthPattern)!=0 || temp == "/normal" || temp == "/inherit" ) { expandedProps["line-height"] = (currentIt.remove('/')); } @@ -640,7 +640,7 @@ TQMap<TQString,TQString> ShorthandFormer::expandListstyleProp( const TQStringLis TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( listTypeValueList.contains(temp)!=0) { + if( listTypeValueList.tqcontains(temp)!=0) { expandedProps["list-style-type"] = (*it) ; } else @@ -648,7 +648,7 @@ TQMap<TQString,TQString> ShorthandFormer::expandListstyleProp( const TQStringLis expandedProps["list-style-position"] = (*it); } else - if( (*it).contains("url(") || temp == "none" || temp == "inherit" ) + if( (*it).tqcontains("url(") || temp == "none" || temp == "inherit" ) expandedProps["list-style-image"] = (*it); ++it; @@ -661,12 +661,12 @@ TQMap<TQString,TQString> ShorthandFormer::expandOutlineProp( const TQStringList TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.contains(temp)!=0 ) expandedProps["outline-style"] = (*it); + if( borderStyleValueList.tqcontains(temp)!=0 ) expandedProps["outline-style"] = (*it); else - if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "invert" || temp == "inherit") + if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "invert" || temp == "inherit") expandedProps["outline-color"] = (*it) ; else - if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0) + if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0) expandedProps["outline-width"] = (*it); ++it; } @@ -679,12 +679,12 @@ TQMap<TQString,TQString> ShorthandFormer::expandBoxSide(const TQString& subProp TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.contains(temp)!=0 ) expandedProps[subPropName + "-style"] = (*it); + if( borderStyleValueList.tqcontains(temp)!=0 ) expandedProps[subPropName + "-style"] = (*it); else - if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit") + if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit") expandedProps[subPropName + "-color"] = (*it) ; else - if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0) + if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0) expandedProps[subPropName + "-width"] = (*it); ++it; } @@ -696,21 +696,21 @@ TQMap<TQString,TQString> ShorthandFormer::expandBorderProp(const TQStringList& TQStringList::ConstIterator it = l.begin(); while ( it != l.end() ) { TQString temp((*it).stripWhiteSpace()); - if( borderStyleValueList.contains(temp)!=0 ){ + if( borderStyleValueList.tqcontains(temp)!=0 ){ expandedProps["border-top-style"] = (*it); expandedProps["border-left-style"] = (*it); expandedProps["border-right-style"] = (*it); expandedProps["border-bottom-style"] = (*it); } else - if( (*it).contains(globalColorPattern) || CSSEditorGlobals::HTMLColors.contains((*it))!=0 || temp == "transparent" || temp == "inherit"){ + if( (*it).tqcontains(globalColorPattern) || CSSEditorGlobals::HTMLColors.tqcontains((*it))!=0 || temp == "transparent" || temp == "inherit"){ expandedProps["border-top-color"] = (*it); expandedProps["border-left-color"] = (*it); expandedProps["border-right-color"] = (*it); expandedProps["border-bottom-color"] = (*it); } else - if( (*it).contains(globalLengthPattern) || widthValueList.contains(temp)!=0){ + if( (*it).tqcontains(globalLengthPattern) || widthValueList.tqcontains(temp)!=0){ expandedProps["border-top-width"] = (*it); expandedProps["border-left-width"] = (*it); expandedProps["border-right-width"] = (*it); diff --git a/quanta/components/csseditor/specialsb.cpp b/quanta/components/csseditor/specialsb.cpp index 6edf110c..e59fca51 100644 --- a/quanta/components/csseditor/specialsb.cpp +++ b/quanta/components/csseditor/specialsb.cpp @@ -21,7 +21,7 @@ #include <klineedit.h> -specialSB::specialSB(TQWidget *parent, const char *name, bool useLineEdit ) : miniEditor(parent,name) { +specialSB::specialSB(TQWidget *tqparent, const char *name, bool useLineEdit ) : miniEditor(tqparent,name) { if (useLineEdit) { m_lineEdit = new KLineEdit(this); @@ -87,13 +87,13 @@ TQStringList specialSB::cbValueList(){ return l; } -frequencyEditor::frequencyEditor(TQWidget *parent, const char *name ) : specialSB(parent,name) { +frequencyEditor::frequencyEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name) { m_cb->insertItem("Hz"); m_cb->insertItem("kHz"); m_sb->setMaxValue(9999); } -angleEditor::angleEditor(TQWidget *parent, const char *name) : specialSB(parent,name){ +angleEditor::angleEditor(TQWidget *tqparent, const char *name) : specialSB(tqparent,name){ m_cb->insertItem("deg"); m_cb->insertItem("grad"); m_cb->insertItem("rad"); @@ -101,13 +101,13 @@ angleEditor::angleEditor(TQWidget *parent, const char *name) : specialSB(parent, m_sb->setMaxValue(400); } -timeEditor::timeEditor(TQWidget *parent, const char *name ) : specialSB(parent,name) { +timeEditor::timeEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name) { m_cb->insertItem("ms"); m_cb->insertItem("s"); m_sb->setMaxValue(99999); } -lengthEditor::lengthEditor(TQWidget *parent, const char *name ) : specialSB(parent,name, true) { +lengthEditor::lengthEditor(TQWidget *tqparent, const char *name ) : specialSB(tqparent,name, true) { m_cb->insertItem("px"); m_cb->insertItem("em"); m_cb->insertItem("ex"); diff --git a/quanta/components/csseditor/specialsb.h b/quanta/components/csseditor/specialsb.h index bca3d9fa..6df3fc9d 100644 --- a/quanta/components/csseditor/specialsb.h +++ b/quanta/components/csseditor/specialsb.h @@ -29,13 +29,14 @@ class KLineEdit; class specialSB : public miniEditor { Q_OBJECT + TQ_OBJECT protected: TQComboBox *m_cb; mySpinBox *m_sb; KLineEdit *m_lineEdit; public: - specialSB(TQWidget *parent=0, const char *name=0, bool useLineEdit = false); + specialSB(TQWidget *tqparent=0, const char *name=0, bool useLineEdit = false); ~specialSB(); void insertItem(const TQString& s){ m_cb->insertItem(s); } void setInitialValue(const TQString& s); @@ -54,26 +55,30 @@ class specialSB : public miniEditor { class angleEditor : public specialSB { Q_OBJECT + TQ_OBJECT public: - angleEditor(TQWidget *parent=0, const char *name=0); + angleEditor(TQWidget *tqparent=0, const char *name=0); }; class frequencyEditor : public specialSB { Q_OBJECT + TQ_OBJECT public: - frequencyEditor(TQWidget *parent=0, const char *name=0); + frequencyEditor(TQWidget *tqparent=0, const char *name=0); }; class timeEditor : public specialSB { Q_OBJECT + TQ_OBJECT public: - timeEditor(TQWidget *parent=0, const char *name=0); + timeEditor(TQWidget *tqparent=0, const char *name=0); }; class lengthEditor : public specialSB { Q_OBJECT + TQ_OBJECT public: - lengthEditor(TQWidget *parent=0, const char *name=0); + lengthEditor(TQWidget *tqparent=0, const char *name=0); }; #endif diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index 31f6788b..fff108d1 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -39,10 +39,10 @@ #include "viewmanager.h" #include "csseditor.h" -StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ +StyleEditor::StyleEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name){ connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor())); setToolTip(i18n("Open css dialog")); - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("stylesheet")); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("stylesheet")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_iconWidth = pixMap.width(); @@ -92,7 +92,7 @@ void StyleEditor::openCSSEditor(){ temp = tempTag.toString(); } else { - dlg->setInlineStyleContent(TQString::null); + dlg->setInlineStyleContent(TQString()); temp = styleNode->tag->toString(); } diff --git a/quanta/components/csseditor/styleeditor.h b/quanta/components/csseditor/styleeditor.h index bef9146f..49f4fd3c 100644 --- a/quanta/components/csseditor/styleeditor.h +++ b/quanta/components/csseditor/styleeditor.h @@ -25,11 +25,12 @@ class propertySetter; class StyleEditor : public TLPEditor{ Q_OBJECT + TQ_OBJECT private: int m_iconWidth, m_iconHeight; public: - StyleEditor(TQWidget *parent=0, const char* name=0); + StyleEditor(TQWidget *tqparent=0, const char* name=0); virtual void setButtonIcon(int width, int height); public slots: diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp index db36ea4c..7374ce9a 100644 --- a/quanta/components/csseditor/stylesheetparser.cpp +++ b/quanta/components/csseditor/stylesheetparser.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> static const TQString msg1(i18n("has not been closed")), - msg2(i18n("needs an opening parenthesis ")); + msg2(i18n("needs an opening tqparenthesis ")); stylesheetParser::stylesheetParser(const TQString& s){ m_styleSheet = s; @@ -74,7 +74,7 @@ void stylesheetParser::parseComment(){ if(stopProcessingComment){ int ws=whiteSpaces(k); - QPair<TQString,unsigned int> tmp(m_styleSheet.left(k+ws),++m_orderNumber); + TQPair<TQString,unsigned int> tmp(m_styleSheet.left(k+ws),++m_orderNumber); m_stylesheetStructure["/*"+TQString::number(m_orderNumber,10)]=tmp; m_styleSheet=m_styleSheet.right(m_styleSheet.length()-k-ws); parse(); @@ -87,7 +87,7 @@ void stylesheetParser::parseComment(){ } } -unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b){ +unsigned int stylesheetParser::numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b){ TQChar searchFor = '{'; if (p == closed) searchFor = '}'; @@ -151,24 +151,24 @@ void stylesheetParser::parseSelector(){ int closingParentheses = 1, openingParentheses = 0; while(true){ - openingParentheses = numberOfParenthesisInAParenthesisBlock(closed,m_styleSheet.left(closingParenthesisPos+1)); //m_styleSheet.left(closingParenthesisPos+1).contains("{"); + openingParentheses = numberOfParenthesisInAParenthesisBlock(closed,m_styleSheet.left(closingParenthesisPos+1)); //m_styleSheet.left(closingParenthesisPos+1).tqcontains("{"); if(openingParentheses==closingParentheses){ - TQString selectorName=m_styleSheet.left(findParanthesis(m_styleSheet, '{')/*m_styleSheet.find("{")*/).stripWhiteSpace(), - selectorValue=m_styleSheet.mid(findParanthesis(m_styleSheet, '{')/*m_styleSheet.find("{")*/+1, closingParenthesisPos - m_styleSheet.find("{") -1); + TQString selectorName=m_styleSheet.left(findParanthesis(m_styleSheet, '{')/*m_styleSheet.tqfind("{")*/).stripWhiteSpace(), + selectorValue=m_styleSheet.mid(findParanthesis(m_styleSheet, '{')/*m_styleSheet.tqfind("{")*/+1, closingParenthesisPos - m_styleSheet.tqfind("{") -1); selectorName.remove("\n").remove("\t"); selectorValue.remove("\n").remove("\t"); - QPair<TQString,unsigned int> tmp(selectorValue,++m_orderNumber); + TQPair<TQString,unsigned int> tmp(selectorValue,++m_orderNumber); - if (m_stylesheetStructure.contains(selectorName)) + if (m_stylesheetStructure.tqcontains(selectorName)) { uint i = 2; - TQString s = selectorName + TQString("-v%1").arg(i); - while (m_stylesheetStructure.contains(s)) + TQString s = selectorName + TQString("-v%1").tqarg(i); + while (m_stylesheetStructure.tqcontains(s)) { i++; - s = selectorName + TQString("-v%1").arg(i); + s = selectorName + TQString("-v%1").tqarg(i); } selectorName = s; } @@ -176,7 +176,7 @@ void stylesheetParser::parseSelector(){ break; } else { - closingParenthesisPos = findParanthesis(m_styleSheet, '{',closingParenthesisPos+1)/*m_styleSheet.find("}",closingParenthesisPos+1)*/; + closingParenthesisPos = findParanthesis(m_styleSheet, '{',closingParenthesisPos+1)/*m_styleSheet.tqfind("}",closingParenthesisPos+1)*/; closingParentheses++; } } @@ -188,13 +188,13 @@ void stylesheetParser::parseSelector(){ void stylesheetParser::parseAtRules1(){ //TODO this needs to be fixed : in case the at rule is not properly closed the parser hangs - if(m_styleSheet.find("{") == -1) { + if(m_styleSheet.tqfind("{") == -1) { m_stopProcessing = true; emit errorOccurred(m_styleSheet.mid(0,20) + "...\n " + msg2); return; } - int closingParenthesisPos = m_styleSheet.find("}"), + int closingParenthesisPos = m_styleSheet.tqfind("}"), closingParentheses = 0; if(closingParenthesisPos==-1) return; @@ -202,12 +202,12 @@ void stylesheetParser::parseAtRules1(){ int openingParentheses=0; while(true){ - openingParentheses = m_styleSheet.left(closingParenthesisPos+1).contains("{"); + openingParentheses = m_styleSheet.left(closingParenthesisPos+1).tqcontains("{"); if(openingParentheses==closingParentheses) break; else { - closingParenthesisPos = m_styleSheet.find("}",closingParenthesisPos+1); + closingParenthesisPos = m_styleSheet.tqfind("}",closingParenthesisPos+1); if( closingParenthesisPos!= -1 ) closingParentheses++; else { @@ -219,7 +219,7 @@ void stylesheetParser::parseAtRules1(){ } int ws=whiteSpaces(closingParenthesisPos+1); - QPair<TQString,unsigned int> tmp(m_styleSheet.left(closingParenthesisPos+1+ws),++m_orderNumber); + TQPair<TQString,unsigned int> tmp(m_styleSheet.left(closingParenthesisPos+1+ws),++m_orderNumber); m_stylesheetStructure["@rule"+TQString::number(m_orderNumber,10)]=tmp; m_styleSheet=m_styleSheet.right(m_styleSheet.length()-closingParenthesisPos-1-ws); parse(); @@ -227,7 +227,7 @@ void stylesheetParser::parseAtRules1(){ void stylesheetParser::parseAtRules2(){ //TODO this needs to be fixed : in case the at rule is not properly closed the parser hangs - int semicolonPos = m_styleSheet.find(";"); + int semicolonPos = m_styleSheet.tqfind(";"); if(semicolonPos==-1) { m_stopProcessing = true; @@ -236,7 +236,7 @@ void stylesheetParser::parseAtRules2(){ } int ws=whiteSpaces(semicolonPos+1); - QPair<TQString,unsigned int> tmp(m_styleSheet.left(semicolonPos+1+ws),++m_orderNumber); + TQPair<TQString,unsigned int> tmp(m_styleSheet.left(semicolonPos+1+ws),++m_orderNumber); m_stylesheetStructure["@rule"+TQString::number(m_orderNumber,10)]=tmp; m_styleSheet=m_styleSheet.right(m_styleSheet.length()-semicolonPos-1-ws); parse(); diff --git a/quanta/components/csseditor/stylesheetparser.h b/quanta/components/csseditor/stylesheetparser.h index 06ad1f86..9fc0716d 100644 --- a/quanta/components/csseditor/stylesheetparser.h +++ b/quanta/components/csseditor/stylesheetparser.h @@ -26,28 +26,29 @@ *@author gulmini luciano */ -class stylesheetParser : public QObject{ +class stylesheetParser : public TQObject{ Q_OBJECT + TQ_OBJECT private: - enum parenthesisKind { opened, closed }; + enum tqparenthesisKind { opened, closed }; TQString m_styleSheet; bool m_stopProcessing; unsigned int m_orderNumber; - TQMap<TQString, QPair<TQString,unsigned int> > m_stylesheetStructure; + TQMap<TQString, TQPair<TQString,unsigned int> > m_stylesheetStructure; void parseComment(); void parseSelector(); void parseAtRules1(); void parseAtRules2(); int whiteSpaces(int); - unsigned int numberOfParenthesisInAParenthesisBlock(parenthesisKind p, const TQString& b); + unsigned int numberOfParenthesisInAParenthesisBlock(tqparenthesisKind p, const TQString& b); public: stylesheetParser(const TQString& s); ~stylesheetParser(){} void parse(); - TQMap<TQString, QPair<TQString,unsigned int> > stylesheetStructure() { return m_stylesheetStructure; } + TQMap<TQString, TQPair<TQString,unsigned int> > stylesheetStructure() { return m_stylesheetStructure; } unsigned int orderNumber() const {return m_orderNumber; } signals: diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index 057083e1..6b796cf7 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -34,7 +34,7 @@ #include "fontfamilychooser.h" #include "project.h" -TLPEditor::TLPEditor(TQWidget *parent, const char* name) : miniEditor(parent,name){ +TLPEditor::TLPEditor(TQWidget *tqparent, const char* name) : miniEditor(tqparent,name){ m_label = new TQLabel(this); m_le = new TQLineEdit(this); m_pb = new KPushButton(this); @@ -48,7 +48,7 @@ TLPEditor::~TLPEditor(){ } void TLPEditor::setButtonIcon(TQString s){ - TQIconSet iconSet = SmallIconSet(TQString::fromLatin1(s.ascii())); + TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1(s.ascii())); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); @@ -66,7 +66,7 @@ void TLPEditor::setWhatsThis(TQString s){ TQWhatsThis::add(m_le,s); } -URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ +URIEditor::URIEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name){ TQString whatsthis =i18n("With this line edit you can insert the URI of the resource you want to reach"); setWhatsThis(whatsthis); setLabelText(" Uri :"); @@ -92,7 +92,7 @@ void URIEditor::setMode(const mode& m) { void URIEditor::selectedURI(const TQString & s){ KURL u; u.setPath(s); - emit valueChanged("url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); + emit valueChanged("url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); } void URIEditor::selectedURIs(const TQStringList& s){ @@ -101,7 +101,7 @@ void URIEditor::selectedURIs(const TQStringList& s){ selectedFilesWithURLFormat; for ( TQStringList::Iterator it = selectedFiles.begin(); it != selectedFiles.end(); ++it ){ u.setPath(*it); - selectedFilesWithURLFormat.append( "url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); + selectedFilesWithURLFormat.append( "url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); } emit valueChanged(selectedFilesWithURLFormat.join(",")); } @@ -143,14 +143,14 @@ void URIEditor::openFileDialog(){ KURL u; for ( TQStringList::Iterator it = selectedFiles.begin(); it != selectedFiles.end(); ++it ){ u.setPath(*it); - m_sFiles.append( "url(\'" + QExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); + m_sFiles.append( "url(\'" + TQExtFileInfo::toRelative(u, Project::ref()->projectBaseURL()).path() + "\')"); } emit valueChanged(m_sFiles.join(","));*/ } } } -fontEditor::fontEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name), m_initialValue(TQString::null){ +fontEditor::fontEditor(TQWidget *tqparent, const char* name) : TLPEditor(tqparent,name), m_initialValue(TQString()){ TQString whatsthis =i18n("With this line edit you can insert the name of the font you want to use"); setWhatsThis(whatsthis); setLabelText(i18n("Font family:")); diff --git a/quanta/components/csseditor/tlpeditors.h b/quanta/components/csseditor/tlpeditors.h index 8388c6b6..80d5899b 100644 --- a/quanta/components/csseditor/tlpeditors.h +++ b/quanta/components/csseditor/tlpeditors.h @@ -31,6 +31,7 @@ class TQLabel; class TLPEditor : public miniEditor { //editor with a line text and a button calling a dialog Q_OBJECT + TQ_OBJECT protected: TQLineEdit *m_le; @@ -38,7 +39,7 @@ class TLPEditor : public miniEditor { //editor with a line text and a button cal KPushButton *m_pb; public: - TLPEditor(TQWidget *parent, const char* name=0); + TLPEditor(TQWidget *tqparent, const char* name=0); virtual ~TLPEditor(); virtual void setButtonIcon(TQString); void setToolTip(TQString); @@ -55,11 +56,12 @@ class TLPEditor : public miniEditor { //editor with a line text and a button cal class fontEditor : public TLPEditor{ Q_OBJECT + TQ_OBJECT private: TQString m_initialValue; public: - fontEditor(TQWidget *parent, const char* name=0); + fontEditor(TQWidget *tqparent, const char* name=0); virtual void setInitialValue(const TQString& s) { m_initialValue = s; } virtual void connectToPropertySetter(propertySetter* p); @@ -69,6 +71,7 @@ class fontEditor : public TLPEditor{ class URIEditor : public TLPEditor { Q_OBJECT + TQ_OBJECT public: enum mode{ Multi, Single }; enum URIResourceType{ audio, image, mousePointer }; @@ -78,7 +81,7 @@ class URIEditor : public TLPEditor { URIResourceType m_resourceType; public: - URIEditor(TQWidget *parent, const char* name=0); + URIEditor(TQWidget *tqparent, const char* name=0); void setMode(const mode& m); void setResourceType(const URIResourceType& r) { m_resourceType = r ; } virtual void setInitialValue(const TQString& /*s*/){} diff --git a/quanta/components/cvsservice/Makefile.am b/quanta/components/cvsservice/Makefile.am index 79429348..eb381581 100644 --- a/quanta/components/cvsservice/Makefile.am +++ b/quanta/components/cvsservice/Makefile.am @@ -1,3 +1,5 @@ +INCLUDES = $(all_includes) -I$(kde_includes)/kde + noinst_LTLIBRARIES = libcvsservice.la libcvsservice_la_SOURCES = cvsservice.cpp cvscommitdlgs.ui \ diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui index ce2c9fd0..a2ce167e 100644 --- a/quanta/components/cvsservice/cvscommitdlgs.ui +++ b/quanta/components/cvsservice/cvscommitdlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2004 Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CVSCommitDlgS</cstring> </property> @@ -33,7 +33,7 @@ <cstring>fileList</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -49,7 +49,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -60,7 +60,7 @@ <cstring>messageCombo</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -71,7 +71,7 @@ <cstring>logEdit</cstring> </property> </widget> - <widget class="QTextEdit" row="5" column="0" rowspan="1" colspan="4"> + <widget class="TQTextEdit" row="5" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>logEdit</cstring> </property> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>20</height> @@ -143,7 +143,7 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 4849ea72..33386cb3 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -176,11 +176,11 @@ void CVSService::slotUpdateToTag(const TQStringList &files) if (m_updateToDlg->tagRadioButton->isChecked()) { extraOpts = "-r " + m_updateToDlg->tagCombo->currentText(); - commandStr = i18n("Updating to revision %1 ...").arg(m_updateToDlg->tagCombo->currentText()); + commandStr = i18n("Updating to revision %1 ...").tqarg(m_updateToDlg->tagCombo->currentText()); } else { extraOpts = "-D " + m_updateToDlg->dateLineEdit->text(); - commandStr = i18n("Updating to the version from %1 ...").arg(+ m_updateToDlg->dateLineEdit->text()); + commandStr = i18n("Updating to the version from %1 ...").tqarg(+ m_updateToDlg->dateLineEdit->text()); } emit clearMessages(); emit showMessage(commandStr + "\n", false); @@ -430,7 +430,7 @@ void CVSService::slotAddToCVSIgnore() line = str.readLine().stripWhiteSpace(); if (line == fInfo.fileName()) { - emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is already in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); found = true; break; } @@ -438,7 +438,7 @@ void CVSService::slotAddToCVSIgnore() if (!found) { str << fInfo.fileName() << endl; - emit showMessage(i18n("\"%1\" added to the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" added to the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -477,7 +477,7 @@ void CVSService::slotRemoveFromCVSIgnore() } if (!found) { - emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" is not in the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); } f.close(); } @@ -486,7 +486,7 @@ void CVSService::slotRemoveFromCVSIgnore() TQTextStream str(&f); str.setEncoding(TQTextStream::UnicodeUTF8); str << content; - emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").arg(fInfo.fileName()) + "\n", false); + emit showMessage(i18n("\"%1\" removed from the CVS ignore list.").tqarg(fInfo.fileName()) + "\n", false); f.close(); } @@ -501,7 +501,7 @@ void CVSService::slotJobExited(bool normalExit, int exitStatus) { if (!normalExit) { - KMessageBox::sorry(0, i18n("<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>").arg(m_cvsCommand).arg(exitStatus), i18n("Command Failed")); + KMessageBox::sorry(0, i18n("<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>").tqarg(m_cvsCommand).tqarg(exitStatus), i18n("Command Failed")); } if (exitStatus == 0) { @@ -529,7 +529,7 @@ void CVSService::slotReceivedStderr(TQString output) void CVSService::notInRepository() { emit clearMessages(); - emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").arg(m_defaultFile).arg(m_repositoryPath) + "\n", false); + emit showMessage(i18n("Error: \"%1\" is not part of the\n\"%2\" repository.").tqarg(m_defaultFile).tqarg(m_repositoryPath) + "\n", false); } void CVSService::startService() diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h index 9cfc1328..e9f0945c 100644 --- a/quanta/components/cvsservice/cvsservice.h +++ b/quanta/components/cvsservice/cvsservice.h @@ -41,6 +41,7 @@ class CVSUpdateToDlgS; class CVSService : public TQObject, public CVSServiceDCOPIf { Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui index ef646f92..d5e116a4 100644 --- a/quanta/components/cvsservice/cvsupdatetodlgs.ui +++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2005 Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>CVSUpdateToDlgS</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -45,7 +45,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>dateRadioButton</cstring> </property> @@ -53,7 +53,7 @@ <string>Update to &date ('yyyy-mm-dd'):</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>tagRadioButton</cstring> </property> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -104,7 +104,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -113,9 +113,9 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>295</width> <height>20</height> @@ -194,5 +194,5 @@ <slot>accept()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index 202e86e0..6c2d8679 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -49,8 +49,8 @@ BacktraceListviewItem::BacktraceListviewItem(BacktraceListview* view) } -BacktraceListview::BacktraceListview(TQWidget *parent, const char *name) - : KListView(parent, name) +BacktraceListview::BacktraceListview(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { int charwidth = this->fontMetrics().width("0"); // If you change the order here, change the BacktraceListviewColumns enums above @@ -91,7 +91,7 @@ void BacktraceListview::backtraceShow(int level, BacktraceType type, const TQStr void BacktraceListview::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Enter) + if(e->key() != TQt::Key_Enter) { e->ignore(); return; diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h index 21b72d3d..495130f0 100644 --- a/quanta/components/debugger/backtracelistview.h +++ b/quanta/components/debugger/backtracelistview.h @@ -71,10 +71,11 @@ class BacktraceListviewItem : public KListViewItem class BacktraceListview : public KListView { Q_OBJECT + TQ_OBJECT public: - BacktraceListview(TQWidget *parent = 0, const char *name = 0); + BacktraceListview(TQWidget *tqparent = 0, const char *name = 0); ~BacktraceListview(); void backtraceShow(int level, BacktraceType type, const TQString& filename, long line, const TQString& func); diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp index 055512da..9dfeb5a6 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.cpp +++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp @@ -56,7 +56,7 @@ ConditionalBreakpointDialog::~ConditionalBreakpointDialog() void ConditionalBreakpointDialog::slotExpressionChanged() { - if(comboExpression->currentText().find( TQRegExp("[^=!]=[^=]"), 0 ) >= 0) + if(comboExpression->currentText().tqfind( TQRegExp("[^=!]=[^=]"), 0 ) >= 0) ledWarning->on(); else ledWarning->off(); diff --git a/quanta/components/debugger/conditionalbreakpointdialog.h b/quanta/components/debugger/conditionalbreakpointdialog.h index cad4adeb..ca67814e 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.h +++ b/quanta/components/debugger/conditionalbreakpointdialog.h @@ -23,6 +23,7 @@ class ConditionalBreakpointDialog : public ConditionalBreakpointDialogS { Q_OBJECT + TQ_OBJECT public: enum Break diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui index 8e4a1bf2..9c397431 100644 --- a/quanta/components/debugger/conditionalbreakpointdialogs.ui +++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>ConditionalBreakpointDialogS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ConditionalBreakpointDialogS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblExpression</cstring> </property> @@ -38,7 +38,7 @@ <string>Expression:</string> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -62,14 +62,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -86,7 +86,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -102,7 +102,7 @@ </widget> </hbox> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -113,7 +113,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioOnTrue</cstring> </property> @@ -121,7 +121,7 @@ <string>When expression is true</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioOnChange</cstring> </property> @@ -144,7 +144,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -163,13 +163,13 @@ <property name="name"> <cstring>ledWarning</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>22</width> <height>22</height> @@ -189,7 +189,7 @@ <string>Lit when a finding a single equal sign in expression (common error)</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -200,7 +200,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblValue</cstring> </property> @@ -215,11 +215,11 @@ <property name="text"> <string>File:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblValue_2</cstring> </property> @@ -234,11 +234,11 @@ <property name="text"> <string>Objects of class:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblValue_3</cstring> </property> @@ -253,21 +253,21 @@ <property name="text"> <string>Function:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineFile</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lineFunction</cstring> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>buttonClearFile</cstring> </property> @@ -275,7 +275,7 @@ <string>x</string> </property> </widget> - <widget class="QPushButton" row="2" column="2"> + <widget class="TQPushButton" row="2" column="2"> <property name="name"> <cstring>buttonClearFunction</cstring> </property> @@ -283,7 +283,7 @@ <string>x</string> </property> </widget> - <widget class="QPushButton" row="1" column="2"> + <widget class="TQPushButton" row="1" column="2"> <property name="name"> <cstring>buttonClearClass</cstring> </property> @@ -291,7 +291,7 @@ <string>x</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineClass</cstring> </property> @@ -320,7 +320,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index 62b0daa0..d5ce7b86 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -71,14 +71,14 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_server->listen()) { emit active(true); - emit networkError(i18n("Listening on port %1").arg(service), true); + emit networkError(i18n("Listening on port %1").tqarg(service), true); } else { delete m_server; m_server = NULL; emit active(false); - emit networkError(i18n("Unable to listen on port %1").arg(service), true); + emit networkError(i18n("Unable to listen on port %1").tqarg(service), true); } } } @@ -118,7 +118,7 @@ void DBGpNetwork::slotError(int) kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(m_socket) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->errorString() << endl; + kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; if(m_socket->error() == KNetwork::KSocketBase::RemotelyDisconnected) { slotConnectionClosed(); @@ -128,7 +128,7 @@ void DBGpNetwork::slotError(int) if(m_socket->error()) { - emit networkError(m_socket->errorString(), true); + emit networkError(m_socket->KSocketBase::errorString(), true); } } @@ -262,7 +262,7 @@ void DBGpNetwork::slotReadyRead() // If datalen == -1, we didnt read the size yet, otherwise we're reading data. if(m_datalen == -1) { - bytes = m_fifo.find('\0'); + bytes = m_fifo.tqfind('\0'); if(bytes < 0) break; @@ -293,7 +293,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen return false; m_transaction_id++; - TQString commandline = command + TQString(" -i %1").arg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; + TQString commandline = command + TQString(" -i %1").tqarg(m_transaction_id) + (!arguments.isEmpty() ? " " : "") + arguments; kdDebug(24002) << k_funcinfo << ", sending: " << commandline << endl; @@ -304,7 +304,7 @@ long DBGpNetwork::sendCommand(const TQString & command, const TQString & argumen long DBGpNetwork::sendCommand( const TQString & command, const TQString & arguments, const TQString & data ) { - QByteArrayFifo buffer; + TQByteArrayFifo buffer; buffer.append(data.ascii(), data.length()); return sendCommand(command, arguments + " -- " + buffer.base64Encoded()); } diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.h b/quanta/components/debugger/dbgp/dbgpnetwork.h index 96faca06..a6f64a69 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.h +++ b/quanta/components/debugger/dbgp/dbgpnetwork.h @@ -28,14 +28,15 @@ //using namespace KNetwork; class KResolverEntry; -class DBGpNetwork : public QObject +class DBGpNetwork : public TQObject { Q_OBJECT + TQ_OBJECT private: KNetwork::KStreamSocket *m_socket; KNetwork::KServerSocket *m_server; - QByteArrayFifo m_fifo; + TQByteArrayFifo m_fifo; bool m_useproxy; long m_datalen; long m_transaction_id; diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp index e9bbc249..c76e00c2 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.cpp +++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp @@ -23,7 +23,7 @@ DBGpSettings::DBGpSettings(const TQString &protocolversion) : DBGpSettingsS(0, "DBGpSettings", false, 0) { - textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); + textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion)); connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool))); } diff --git a/quanta/components/debugger/dbgp/dbgpsettings.h b/quanta/components/debugger/dbgp/dbgpsettings.h index bdf8c2f0..6ec8e73b 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.h +++ b/quanta/components/debugger/dbgp/dbgpsettings.h @@ -22,6 +22,7 @@ class DBGpSettings : public DBGpSettingsS { Q_OBJECT + TQ_OBJECT public: DBGpSettings(const TQString &protocolversion); diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index 2b846a7e..98da70f1 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>DBGpSettingsS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DBGpSettingsS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -70,7 +70,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -83,7 +83,7 @@ </widget> </hbox> </widget> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget2</cstring> </property> @@ -98,7 +98,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -109,7 +109,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -120,7 +120,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDebuggerServerListenPort</cstring> </property> @@ -136,7 +136,7 @@ <string>Listen port:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineServerListenPort</cstring> </property> @@ -149,7 +149,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblRequest</cstring> </property> @@ -165,7 +165,7 @@ <string>Request URL:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineStartSession</cstring> </property> @@ -207,14 +207,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -225,7 +225,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lineServerBasedir</cstring> </property> @@ -238,7 +238,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblDebuggerServerBasedir</cstring> </property> @@ -254,7 +254,7 @@ <string>Server basedir:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineLocalBasedir</cstring> </property> @@ -270,7 +270,7 @@ <string></string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkLocalProject</cstring> </property> @@ -289,7 +289,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDebuggerLocalBasedir</cstring> </property> @@ -305,7 +305,7 @@ <string>Local basedir:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblLocalProject</cstring> </property> @@ -323,7 +323,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox3_2</cstring> </property> @@ -334,7 +334,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineProfilerFilename</cstring> </property> @@ -355,7 +355,7 @@ %c - CRC32 of the initial filepath</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblRequest_2</cstring> </property> @@ -371,7 +371,7 @@ <string>Profiler output:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblLocalProject_2</cstring> </property> @@ -387,7 +387,7 @@ <string>Map profiler output:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>checkProfilerMapFilename</cstring> </property> @@ -409,7 +409,7 @@ <string>If this checkbox is checked, the profiler output filename will be mapped using the basedirs just like the remote script files.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblLocalProject_2_2</cstring> </property> @@ -425,7 +425,7 @@ <string>Open automatically:</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>checkProfilerAutoOpen</cstring> </property> @@ -451,7 +451,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -462,7 +462,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -473,7 +473,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>checkBreakOnUserError</cstring> </property> @@ -489,18 +489,18 @@ <string>User errors</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="5" colspan="1"> <property name="name"> <cstring>lblBreakOn</cstring> </property> <property name="text"> <string>Break on:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>checkBreakOnUserWarning</cstring> </property> @@ -516,7 +516,7 @@ <string>User warnings</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>checkBreakOnUserNotice</cstring> </property> @@ -532,7 +532,7 @@ <string>User notices</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkBreakOnNotice</cstring> </property> @@ -548,7 +548,7 @@ <string>Notices</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>checkBreakOnWarning</cstring> </property> @@ -566,7 +566,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -577,7 +577,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="3"> <item> <property name="text"> <string>Pause</string> @@ -598,14 +598,14 @@ <cstring>comboDefaultExecutionState</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDefaultExecutionMode</cstring> </property> <property name="text"> <string>Default mode:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -621,7 +621,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> @@ -630,7 +630,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -641,7 +641,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -716,12 +716,12 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotLocalProjectToggled(bool)</slot> <slot>checkLocalProject_toggled(bool)</slot> <slot>slotLocalProjectToggle(bool)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextbrowser.h</includehint> </includehints> diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp index 4f8e72d8..6a52ac39 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.cpp +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.cpp @@ -21,13 +21,13 @@ #include <tqcstring.h> #include <kmdcodec.h> -QByteArrayFifo::QByteArrayFifo( ) +TQByteArrayFifo::TQByteArrayFifo( ) { m_size = 0; m_array.resize(0); } -TQString QByteArrayFifo::retrieve( ) +TQString TQByteArrayFifo::retrieve( ) { // See if there's a null teminator somewhere TQString str(m_array); @@ -38,16 +38,16 @@ TQString QByteArrayFifo::retrieve( ) for(size_t cnt = 0; cnt < m_size; cnt++) m_array[cnt] = m_array[cnt + size]; - // Resize array, needed for find() to work + // Resize array, needed for tqfind() to work m_array.resize(m_size); return str; } -bool QByteArrayFifo::append(const char * chars, size_t size ) +bool TQByteArrayFifo::append(const char * chars, size_t size ) { // Resize the array, fail if not possible - if(!m_array.resize(m_size + size )) + if(!m_array.tqresize(m_size + size )) return false; // Copy the elements @@ -60,16 +60,16 @@ bool QByteArrayFifo::append(const char * chars, size_t size ) return true; } -long QByteArrayFifo::find( char character ) +long TQByteArrayFifo::tqfind( char character ) { - // If size is 0, find() outputs a warning for some reason + // If size is 0, tqfind() outputs a warning for some reason if(m_size == 0) return -1; - return m_array.find(character); + return m_array.tqfind(character); } -TQString QByteArrayFifo::base64Encoded() +TQString TQByteArrayFifo::base64Encoded() { return KCodecs::base64Encode(m_array); } diff --git a/quanta/components/debugger/dbgp/qbytearrayfifo.h b/quanta/components/debugger/dbgp/qbytearrayfifo.h index 851c7f34..2f46df76 100644 --- a/quanta/components/debugger/dbgp/qbytearrayfifo.h +++ b/quanta/components/debugger/dbgp/qbytearrayfifo.h @@ -23,15 +23,15 @@ #include <tqstring.h> #include <tqcstring.h> -class QByteArrayFifo +class TQByteArrayFifo { public: - QByteArrayFifo(); + TQByteArrayFifo(); bool append(const char * chars, size_t size); TQString retrieve(); TQString base64Encoded(); - long find(char character); + long tqfind(char character); size_t length() { return m_size; } private: diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 481c8d61..ba1c7c44 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -49,15 +49,15 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggerdbgp, const char QuantaDebuggerDBGp::protocolversion[] = "1.0"; -QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQStringList&) - : DebuggerClient (parent, "DBGp") +QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *tqparent, const char*, const TQStringList&) + : DebuggerClient (tqparent, "DBGp") { // Create a socket object and set up its signals - m_errormask = 1794; + m_errortqmask = 1794; m_supportsasync = false; m_defaultExecutionState = Starting; setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&))); connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool))); @@ -88,9 +88,9 @@ void QuantaDebuggerDBGp::slotNetworkActive(bool active) setExecutionState(m_defaultExecutionState); if(active) - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); else - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); } @@ -113,11 +113,11 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected) debuggerInterface()->setActiveLine("", 0); if(connected) - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); else { setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); profilerOpen(false); } @@ -126,7 +126,7 @@ void QuantaDebuggerDBGp::slotNetworkConnected(bool connected) void QuantaDebuggerDBGp::slotNetworkError(const TQString &errormsg, bool log) { - debuggerInterface()->showStatus(errormsg, log); + debuggerInterface()->showtqStatus(errormsg, log); } @@ -194,29 +194,29 @@ void QuantaDebuggerDBGp::setExecutionState(const TQString &state) if(state == "starting") { setExecutionState(Starting); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } else if(state == "stopping") { setExecutionState(Stopping); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket } else if(state == "stopped") { setExecutionState(Stopped); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); m_network.slotSocketDestroyed(); //XDebug disconnects when stopped and destroys our socket } else if(state == "running") { setExecutionState(Running); - emit updateStatus(DebuggerUI::Running); + emit updatetqStatus(DebuggerUI::Running); } else if(state == "break") { setExecutionState(Break); - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } } @@ -263,7 +263,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) TQDomNode response = data.elementsByTagName("response").item(0); TQString command = attribute(response, "command"); - // Status command + // tqStatus command if(command == "status") setExecutionState(attribute(response, "status")); @@ -327,7 +327,7 @@ void QuantaDebuggerDBGp::processCommand(const TQString& datas) } else { - debuggerInterface()->showStatus(i18n("Unrecognized package: '%1%2'").arg(datas.left(50)).arg(datas.length() > 50 ? "..." : ""), true); + debuggerInterface()->showtqStatus(i18n("Unrecognized package: '%1%2'").tqarg(datas.left(50)).tqarg(datas.length() > 50 ? "..." : ""), true); kdDebug(24002) << datas << endl; } @@ -338,10 +338,10 @@ void QuantaDebuggerDBGp::initiateSession(const TQDomNode& initpacket) { if(attribute(initpacket, "protocol_version") != protocolversion) { - debuggerInterface()->showStatus( + debuggerInterface()->showtqStatus( i18n("The debugger for %1 uses an unsupported protocol version (%2)") - .arg(attribute(initpacket, "language")) - .arg(attribute(initpacket, "protocol_version")) + .tqarg(attribute(initpacket, "language")) + .tqarg(attribute(initpacket, "protocol_version")) , true); endSession(); @@ -384,7 +384,7 @@ void QuantaDebuggerDBGp::stackShow(const TQDomNode&node) // Type isnt currently correct with xdebug // type = (attribute(child, "type") == "file" ? File : Eval); typestr = attribute(child, "filename"); - if(typestr.find(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0) + if(typestr.tqfind(TQRegExp(".*%28[0-9]+%29%20%3A%20eval")) >= 0) type = Eval; else type = File; @@ -540,7 +540,7 @@ void QuantaDebuggerDBGp::addBreakpoint (DebuggerBreakpoint* breakpoint) " -n " + TQString::number(breakpoint->line() + 1) , breakpoint->condition()); - breakpoint->setKey(TQString("id %1").arg(id)); + breakpoint->setKey(TQString("id %1").tqarg(id)); } void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) @@ -550,7 +550,7 @@ void QuantaDebuggerDBGp::setBreakpointKey( const TQDomNode & response ) id = attribute(response, "transaction_id").toLong(); if(id > 0) { - TQString oldkey = TQString("id %1").arg(id); + TQString oldkey = TQString("id %1").tqarg(id); DebuggerBreakpoint *bp = debuggerInterface()->findDebuggerBreakpoint(oldkey); if(bp) debuggerInterface()->updateBreakpointKey(*bp, attribute(response, "id")); @@ -573,15 +573,15 @@ void QuantaDebuggerDBGp::fileOpened(const TQString&) // Watch a variable void QuantaDebuggerDBGp::addWatch(const TQString & variable) { - if(m_watchlist.find(variable) == m_watchlist.end()) + if(m_watchlist.tqfind(variable) == m_watchlist.end()) m_watchlist.append(variable); m_network.sendCommand("property_get", "-n " + variable); } // Remove watch void QuantaDebuggerDBGp::removeWatch(DebuggerVariable *variable) { - if(m_watchlist.find(variable->name()) != m_watchlist.end()) - m_watchlist.remove(m_watchlist.find(variable->name())); + if(m_watchlist.tqfind(variable->name()) != m_watchlist.end()) + m_watchlist.remove(m_watchlist.tqfind(variable->name())); } // Show conditional breakpoint state @@ -649,9 +649,9 @@ void QuantaDebuggerDBGp::readConfig(TQDomNode node) valuenode = node.namedItem("useproxy"); m_useproxy = valuenode.firstChild().nodeValue() == "1"; - valuenode = node.namedItem("errormask"); - m_errormask = valuenode.firstChild().nodeValue().toLong(); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; + valuenode = node.namedItem("errortqmask"); + m_errortqmask = valuenode.firstChild().nodeValue().toLong(); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; // Profiler valuenode = node.namedItem("profilerfilename"); @@ -687,11 +687,11 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) else set.comboDefaultExecutionState->setCurrentItem(1); - set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errormask); - set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errormask); - set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errormask); - set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errormask); - set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errormask); + set.checkBreakOnNotice->setChecked(QuantaDebuggerDBGp::Notice & m_errortqmask); + set.checkBreakOnWarning->setChecked(QuantaDebuggerDBGp::Warning & m_errortqmask); + set.checkBreakOnUserNotice->setChecked(QuantaDebuggerDBGp::User_Notice & m_errortqmask); + set.checkBreakOnUserWarning->setChecked(QuantaDebuggerDBGp::User_Warning & m_errortqmask); + set.checkBreakOnUserError->setChecked(QuantaDebuggerDBGp::User_Error & m_errortqmask); set.lineProfilerFilename->setText(m_profilerFilename); if(m_profilerAutoOpen) @@ -705,7 +705,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("localproject").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localproject"); node.appendChild( el ); if(set.checkLocalProject->isChecked()) @@ -725,7 +725,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("localbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localbasedir"); node.appendChild( el ); el.appendChild( node.ownerDocument().createTextNode(m_localBasedir) ); @@ -734,7 +734,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("serverbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverbasedir"); node.appendChild( el ); if(debuggerInterface()) @@ -743,7 +743,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("listenport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("listenport"); node.appendChild( el ); m_listenPort = set.lineServerListenPort->text(); @@ -751,7 +751,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("startsession").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("startsession"); node.appendChild( el ); m_startsession = set.lineStartSession->text(); @@ -759,7 +759,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("defaultexecutionstate").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("defaultexecutionstate"); node.appendChild( el ); if(set.comboDefaultExecutionState->currentItem() == 0) @@ -774,23 +774,23 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) } - el = node.namedItem("errormask").toElement(); + el = node.namedItem("errortqmask").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); - el = node.ownerDocument().createElement("errormask"); + el.tqparentNode().removeChild(el); + el = node.ownerDocument().createElement("errortqmask"); node.appendChild( el ); - m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0) + m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerDBGp::Notice : 0) + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerDBGp::Warning : 0) + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerDBGp::User_Notice : 0) + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerDBGp::User_Warning : 0) + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerDBGp::User_Error : 0); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; - el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask))); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; + el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask))); // Profiler el = node.namedItem("profilerfilename").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profilerfilename"); node.appendChild( el ); m_profilerFilename = set.lineProfilerFilename->text(); @@ -798,7 +798,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("profilerfilename_map").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profilerfilename_map"); node.appendChild( el ); m_profilerMapFilename = (set.checkProfilerMapFilename->isChecked() ? true : false); @@ -806,7 +806,7 @@ void QuantaDebuggerDBGp::showConfig(TQDomNode node) el = node.namedItem("profiler_autoopen").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("profiler_autoopen"); node.appendChild( el ); m_profilerAutoOpen = (set.checkProfilerAutoOpen->isChecked() ? true : false); @@ -850,8 +850,8 @@ void QuantaDebuggerDBGp::profilerOpen() void QuantaDebuggerDBGp::profilerOpen(bool forceopen) { TQString profileroutput = m_profilerFilename; - profileroutput.replace("%a", m_appid); - profileroutput.replace("%c", m_initialscript); + profileroutput.tqreplace("%a", m_appid); + profileroutput.tqreplace("%c", m_initialscript); if(m_profilerMapFilename) profileroutput = mapServerPathToLocal( profileroutput); @@ -867,9 +867,9 @@ void QuantaDebuggerDBGp::profilerOpen(bool forceopen) else { if(forceopen) - KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").arg(profileroutput), i18n("Profiler File Error")); + KMessageBox::sorry(NULL, i18n("Unable to open profiler output (%1)").tqarg(profileroutput), i18n("Profiler File Error")); else - debuggerInterface()->showStatus(i18n("Unable to open profiler output (%1)").arg(profileroutput), false); + debuggerInterface()->showtqStatus(i18n("Unable to open profiler output (%1)").tqarg(profileroutput), false); } } else @@ -923,7 +923,7 @@ void QuantaDebuggerDBGp::propertySetResponse( const TQDomNode & setnode) { if(attribute(setnode, "success") == "0") { - debuggerInterface()->showStatus(i18n("Unable to set value of variable."), true); + debuggerInterface()->showtqStatus(i18n("Unable to set value of variable."), true); } } @@ -932,11 +932,11 @@ DebuggerVariable* QuantaDebuggerDBGp::buildVariable( const TQDomNode & variablen { /* Sample: - <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" children="1" numchildren="4"> + <property name="$arrayVar" fullname="$arrayVar" address="-1073754976" type="hash" tqchildren="1" numtqchildren="4"> <property name="birthyear" fullname="$arrayVar['birthyear']" address="135522364" type="int"> <![CDATA[1949]]> </property> - <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" children="1" numchildren="3"> + <property name="songs" fullname="$arrayVar['songs']" address="135522236" type="hash" tqchildren="1" numtqchildren="3"> <property name="0" fullname="$arrayVar['songs'][0]" address="135522332" type="string" encoding="base64"> <![CDATA[SW5ub2NlbnQgV2hlbiBZb3UgRHJlYW0=]]> </property> @@ -1015,22 +1015,22 @@ void QuantaDebuggerDBGp::handleError(const TQDomNode & statusnode ) { // Managable error long error = attribute(errornode, "code").toLong(); - if(!(error & m_errormask)) + if(!(error & m_errortqmask)) { setExecutionState(Running); } else { - emit updateStatus(DebuggerUI::HaltedOnError); - debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true); + emit updatetqStatus(DebuggerUI::HaltedOnError); + debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true); } break; } else { // Fatal error - emit updateStatus(DebuggerUI::HaltedOnError); - debuggerInterface()->showStatus(errornode.firstChild().nodeValue(), true); + emit updatetqStatus(DebuggerUI::HaltedOnError); + debuggerInterface()->showtqStatus(errornode.firstChild().nodeValue(), true); } } errornode = errornode.nextSibling(); diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h index 7c9601ad..52ec17bc 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h @@ -32,9 +32,10 @@ typedef TQMap<TQString, TQString> StringMap; class QuantaDebuggerDBGp : public DebuggerClient { Q_OBJECT + TQ_OBJECT public: - QuantaDebuggerDBGp(TQObject *parent, const char* name, const TQStringList&); + QuantaDebuggerDBGp(TQObject *tqparent, const char* name, const TQStringList&); ~QuantaDebuggerDBGp(); // Execution states @@ -121,7 +122,7 @@ class QuantaDebuggerDBGp : public DebuggerClient bool m_profilerAutoOpen; bool m_profilerMapFilename; State m_executionState, m_defaultExecutionState; - long m_errormask; + long m_errortqmask; long m_displaydelay; bool m_supportsasync; @@ -160,7 +161,7 @@ class QuantaDebuggerDBGp : public DebuggerClient void processCommand(const TQString&); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; #endif diff --git a/quanta/components/debugger/debuggerbreakpointlist.cpp b/quanta/components/debugger/debuggerbreakpointlist.cpp index 6a47d296..2d18309f 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.cpp +++ b/quanta/components/debugger/debuggerbreakpointlist.cpp @@ -50,7 +50,7 @@ void DebuggerBreakpointList::add(DebuggerBreakpoint* bp) void DebuggerBreakpointList::remove(DebuggerBreakpoint* bp) { - BreakpointList_t::iterator it = find(*bp); + BreakpointList_t::iterator it = tqfind(*bp); if(it == m_breakpointList->end()) return; @@ -113,7 +113,7 @@ void DebuggerBreakpointList::clear() bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp) { - BreakpointList_t::iterator it = find(*bp); + BreakpointList_t::iterator it = tqfind(*bp); if(it == m_breakpointList->end()) return false; @@ -124,7 +124,7 @@ bool DebuggerBreakpointList::exists(DebuggerBreakpoint* bp) } -BreakpointList_t::iterator DebuggerBreakpointList::find(const DebuggerBreakpoint &bp) +BreakpointList_t::iterator DebuggerBreakpointList::tqfind(const DebuggerBreakpoint &bp) { BreakpointList_t::iterator it; @@ -180,7 +180,7 @@ void DebuggerBreakpointList::updateBreakpointKey( const DebuggerBreakpoint & bp, { //DebuggerBreakpoint *bpp = new DebuggerBreakpoint(bp); BreakpointList_t::iterator it; - it = find(bp); + it = tqfind(bp); if(it != m_breakpointList->end()) { (*it)->setKey(newkey); diff --git a/quanta/components/debugger/debuggerbreakpointlist.h b/quanta/components/debugger/debuggerbreakpointlist.h index aa6cd803..ef9233bc 100644 --- a/quanta/components/debugger/debuggerbreakpointlist.h +++ b/quanta/components/debugger/debuggerbreakpointlist.h @@ -31,7 +31,7 @@ class DebuggerBreakpointList private: BreakpointList_t* m_breakpointList; BreakpointList_t::iterator m_current; - BreakpointList_t::iterator find(const DebuggerBreakpoint &bp); + BreakpointList_t::iterator tqfind(const DebuggerBreakpoint &bp); public: DebuggerBreakpointList(); diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index 8614bc28..bf4911ad 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -52,8 +52,8 @@ DebuggerBreakpointViewItem::DebuggerBreakpointViewItem(DebuggerBreakpointView* v } -DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *name) - : KListView(parent, name) +DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { // If you change here, change the DebuggerBreakpointViewColumns enums above addColumn(i18n("Expression")); @@ -154,7 +154,7 @@ void DebuggerBreakpointView::slotRemoveSelected() void DebuggerBreakpointView::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Delete) + if(e->key() != TQt::Key_Delete) { e->ignore(); return; diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h index 196cd451..e593a815 100644 --- a/quanta/components/debugger/debuggerbreakpointview.h +++ b/quanta/components/debugger/debuggerbreakpointview.h @@ -44,9 +44,10 @@ class DebuggerBreakpointViewItem : public KListViewItem class DebuggerBreakpointView : public KListView { Q_OBJECT + TQ_OBJECT public: - DebuggerBreakpointView(TQWidget *parent = 0, const char *name = 0); + DebuggerBreakpointView(TQWidget *tqparent = 0, const char *name = 0); ~DebuggerBreakpointView(); void showBreakpoint(const DebuggerBreakpoint& bp); diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index b62b3e3b..60fd68ef 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -49,8 +49,8 @@ // dialogs #include "debuggervariablesets.h" -DebuggerManager::DebuggerManager(TQObject *myparent) - : TQObject(myparent) +DebuggerManager::DebuggerManager(TQObject *mytqparent) + : TQObject(mytqparent) { initActions(); @@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); delete m_client; m_client = NULL; @@ -108,7 +108,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(!m_client) { emit hideSplash(); - KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } break; } @@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU // recreate UI m_debuggerui = new DebuggerUI(this, "debuggerui"); - connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + connect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); // Load saved breakpoints if(Project::ref()->debuggerPersistentBreakpoints()) @@ -212,7 +212,7 @@ void DebuggerManager::initActions() return; //Debugger, breakpoint - newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), Qt::CTRL+Qt::SHIFT+Qt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); + newaction = new KAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location")); newaction = new KAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); @@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager() if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQT_SIGNAL(updatetqStatus(DebuggerUI::DebuggertqStatus)), m_debuggerui, TQT_SLOT(slottqStatus(DebuggerUI::DebuggertqStatus))); delete m_client; m_client = 0L; @@ -601,11 +601,11 @@ bool DebuggerManager::setActiveLine (const TQString& file, int line ) return true; // Find new position in editor - if(ViewManager::ref()->isOpened(filename) || QExtFileInfo::exists(filename, true, 0L)) + if(ViewManager::ref()->isOpened(filename) || TQExtFileInfo::exists(filename, true, 0L)) quantaApp->gotoFileAndLine(filename, line, 0); else { - showStatus(i18n("Unable to open file %1, check your basedirs and mappings.").arg(filename), true); + showtqStatus(i18n("Unable to open file %1, check your basedirs and mappings.").tqarg(filename), true); } // Add new active line mark @@ -659,7 +659,7 @@ void DebuggerManager::disconnectBreakpointSignals(Document* qdoc) } // Show a status message and optionally put it on the log -bool DebuggerManager::showStatus(const TQString& a_message, bool log) +bool DebuggerManager::showtqStatus(const TQString& a_message, bool log) { TQString message = a_message; quantaApp->slotStatusMsg(m_client->getName() + ": " + message); @@ -781,7 +781,7 @@ void DebuggerManager::saveProperties( ) // (Re)create breakpoints section TQDomNode nodeBreakpoints = nodeDbg.namedItem("breakpoints"); if(!nodeBreakpoints.isNull()) - nodeBreakpoints.parentNode().removeChild(nodeBreakpoints); + nodeBreakpoints.tqparentNode().removeChild(nodeBreakpoints); if(m_breakpointList->count() > 0) { @@ -818,7 +818,7 @@ void DebuggerManager::saveProperties( ) // (Re)create watches section TQDomNode nodeWatches = nodeDbg.namedItem("watches"); if(!nodeWatches.isNull()) - nodeWatches.parentNode().removeChild(nodeWatches); + nodeWatches.tqparentNode().removeChild(nodeWatches); if(m_debuggerui->watches()->first()) { diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h index 5a88b156..ad3c8739 100644 --- a/quanta/components/debugger/debuggermanager.h +++ b/quanta/components/debugger/debuggermanager.h @@ -30,9 +30,10 @@ class DebuggerBreakpoint; class PathMapper; class Document; -class DebuggerManager : public QObject +class DebuggerManager : public TQObject { Q_OBJECT + TQ_OBJECT private: // client DebuggerClient *m_client; @@ -53,7 +54,7 @@ class DebuggerManager : public QObject long m_currentLine; public: - DebuggerManager(TQObject *myparent); + DebuggerManager(TQObject *mytqparent); ~DebuggerManager(); // Access to memebers @@ -70,7 +71,7 @@ class DebuggerManager : public QObject void updateBreakpointKey(const DebuggerBreakpoint &bp, const TQString& newkey); // Public help functions - bool showStatus(const TQString& message, bool log); + bool showtqStatus(const TQString& message, bool log); bool setActiveLine (const TQString& file, int line); void setMark(const TQString& filename, long line, bool set, int mark); diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index fdf32a5c..ae88b3e9 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -36,8 +36,8 @@ #include "resource.h" #include "whtmlpart.h" -DebuggerUI::DebuggerUI(TQObject *parent, const char *name) - : TQObject(parent, name), m_variablesListView(0) +DebuggerUI::DebuggerUI(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), m_variablesListView(0) { // Variable watch tree @@ -69,9 +69,9 @@ DebuggerUI::DebuggerUI(TQObject *parent, const char *name) // Show debugger toolbar quantaApp->toolBar("debugger_toolbar")->show(); - connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); + connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), tqparent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); - connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); + connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), tqparent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); showMenu(); } @@ -109,7 +109,7 @@ void DebuggerUI::showMenu() else m_debuggerMenuID = 0; - // Status indicator + // tqStatus indicator quantaApp->statusBar()->insertFixedItem(i18n("Debugger Inactive"), IDS_STATUS_DEBUGGER); } @@ -124,7 +124,7 @@ void DebuggerUI::hideMenu() } m_debuggerMenuID = 0; - // Status indicator + // tqStatus indicator quantaApp->statusBar()->removeItem(IDS_STATUS_DEBUGGER); } @@ -148,7 +148,7 @@ void DebuggerUI::sendRequest(const KURL &url) m_preview->openURL(url); } -void DebuggerUI::slotStatus( DebuggerStatus status ) +void DebuggerUI::slottqStatus( DebuggertqStatus status ) { switch(status) { diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index 767facad..3a438f11 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -32,12 +32,13 @@ class DebuggerVariable; class WHTMLPart; class KURL; -class DebuggerUI : public QObject +class DebuggerUI : public TQObject { Q_OBJECT + TQ_OBJECT public: - enum DebuggerStatus + enum DebuggertqStatus { NoSession = 0, AwaitingConnection, @@ -49,7 +50,7 @@ class DebuggerUI : public QObject HaltedOnBreakpoint }; - DebuggerUI(TQObject *parent = 0, const char *name = 0); + DebuggerUI(TQObject *tqparent = 0, const char *name = 0); ~DebuggerUI(); // Watches @@ -82,8 +83,8 @@ class DebuggerUI : public QObject WHTMLPart *m_preview; public slots: - // Status indication - void slotStatus(DebuggerUI::DebuggerStatus status); + // tqStatus indication + void slottqStatus(DebuggerUI::DebuggertqStatus status); }; diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp index 390290a7..46f827cb 100644 --- a/quanta/components/debugger/debuggervariable.cpp +++ b/quanta/components/debugger/debuggervariable.cpp @@ -258,17 +258,17 @@ DebuggerVariable* DebuggerVariable::findItem( TQListViewItem * item, bool traver return NULL; } -void DebuggerVariable::copy( DebuggerVariable * v, bool copychildren ) +void DebuggerVariable::copy( DebuggerVariable * v, bool copytqchildren ) { m_name = v->name(); - m_size = (v->isScalar() || copychildren ? v->size() : m_valueList.count()); + m_size = (v->isScalar() || copytqchildren ? v->size() : m_valueList.count()); m_value = v->value(); m_type = v->type(); m_isReference = v->isReference(); // We cant just assign m_valuelist to v->values(), it would make a shallow copy... // - if(copychildren) + if(copytqchildren) { m_valueList.clear(); for(DebuggerVariable * v2 = v->values().first(); v2; v2 = v->values().next()) diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui index 70440ff4..76689e57 100644 --- a/quanta/components/debugger/debuggervariablesets.ui +++ b/quanta/components/debugger/debuggervariablesets.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DebuggerVariableSetS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DebuggerVariableSetS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -70,7 +70,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -86,7 +86,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineVariable</cstring> </property> @@ -94,7 +94,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblVariable</cstring> </property> @@ -110,7 +110,7 @@ <string>Variable:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblValue</cstring> </property> @@ -125,7 +125,7 @@ <property name="text"> <string>New value:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> @@ -139,14 +139,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineValue</cstring> </property> @@ -181,5 +181,5 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/components/debugger/gubed/gubedsettings.cpp b/quanta/components/debugger/gubed/gubedsettings.cpp index 9464dc81..b6df9b25 100644 --- a/quanta/components/debugger/gubed/gubedsettings.cpp +++ b/quanta/components/debugger/gubed/gubedsettings.cpp @@ -22,7 +22,7 @@ GubedSettings::GubedSettings(const TQString &protocolversion) : GubedSettingsS(0, "GubedSettings", false, 0) { - textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); + textAbout->setText(textAbout->text().tqreplace("%PROTOCOLVERSION%", protocolversion)); } GubedSettings::~GubedSettings() diff --git a/quanta/components/debugger/gubed/gubedsettings.h b/quanta/components/debugger/gubed/gubedsettings.h index 73232e06..b8fef421 100644 --- a/quanta/components/debugger/gubed/gubedsettings.h +++ b/quanta/components/debugger/gubed/gubedsettings.h @@ -22,6 +22,7 @@ class GubedSettings : public GubedSettingsS { Q_OBJECT + TQ_OBJECT public slots: virtual void slotUseProxyToggle( bool useproxy); diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui index 12125c93..7697a337 100644 --- a/quanta/components/debugger/gubed/gubedsettingss.ui +++ b/quanta/components/debugger/gubed/gubedsettingss.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>GubedSettingsS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>GubedSettingsS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -46,14 +46,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -70,7 +70,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -83,7 +83,7 @@ </widget> </hbox> </widget> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget2</cstring> </property> @@ -95,7 +95,7 @@ <verstretch>1</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -116,14 +116,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -134,7 +134,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDebuggerServerBasedir</cstring> </property> @@ -150,7 +150,7 @@ <string>Server basedir:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDebuggerLocalBasedir</cstring> </property> @@ -166,12 +166,12 @@ <string>Local basedir:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineServerBasedir</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineLocalBasedir</cstring> </property> @@ -181,7 +181,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox2</cstring> </property> @@ -192,7 +192,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>lineServerListenPort</cstring> </property> @@ -205,7 +205,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>lineServerPort</cstring> </property> @@ -221,7 +221,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineServerHost</cstring> </property> @@ -229,7 +229,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkUseProxy</cstring> </property> @@ -237,7 +237,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDebuggerUseProxe</cstring> </property> @@ -253,7 +253,7 @@ <string>Use proxy</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDebuggerServerHost</cstring> </property> @@ -269,7 +269,7 @@ <string>Proxy host:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>lblDebuggerServerPort</cstring> </property> @@ -285,7 +285,7 @@ <string>Proxy port:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>lblDebuggerServerListenPort</cstring> </property> @@ -303,7 +303,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -314,7 +314,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineStartSession</cstring> </property> @@ -336,7 +336,7 @@ %add - Document root of current script</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>optAddInclude</cstring> </property> @@ -347,7 +347,7 @@ <string>&Add include</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>optStartSession</cstring> </property> @@ -362,7 +362,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -373,7 +373,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox4</cstring> </property> @@ -384,7 +384,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="1"> + <widget class="TQCheckBox" row="4" column="1"> <property name="name"> <cstring>checkBreakOnUserError</cstring> </property> @@ -400,18 +400,18 @@ <string>User errors</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="5" colspan="1"> <property name="name"> <cstring>lblBreakOn</cstring> </property> <property name="text"> <string>Break on:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop</set> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>checkBreakOnUserWarning</cstring> </property> @@ -427,7 +427,7 @@ <string>User warnings</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>checkBreakOnUserNotice</cstring> </property> @@ -443,7 +443,7 @@ <string>User notices</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>checkBreakOnNotice</cstring> </property> @@ -459,7 +459,7 @@ <string>Notices</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>checkBreakOnWarning</cstring> </property> @@ -487,14 +487,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>50</height> </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox5</cstring> </property> @@ -505,7 +505,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>lblDelayFast</cstring> </property> @@ -526,11 +526,11 @@ <string>Fast</string> </property> </widget> - <widget class="QSlider" row="1" column="2"> + <widget class="TQSlider" row="1" column="2"> <property name="name"> <cstring>sliderDisplayDelay</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>27</height> @@ -546,7 +546,7 @@ <enum>Below</enum> </property> </widget> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>lblDelaySlow</cstring> </property> @@ -566,11 +566,11 @@ <property name="text"> <string>Slow</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="3"> <item> <property name="text"> <string>Pause</string> @@ -599,25 +599,25 @@ <cstring>comboDefaultExecutionState</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDefaultExecutionMode</cstring> </property> <property name="text"> <string>Default mode:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDisplayDelay</cstring> </property> <property name="text"> <string>Run speed:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> @@ -625,7 +625,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -636,7 +636,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -652,7 +652,7 @@ <string><h4>Gubed PHP Debugger Plugin for Quanta +</h4></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel1</cstring> </property> @@ -670,7 +670,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -752,10 +752,10 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot specifier="pure virtual">slotUseProxyToggle( bool )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextbrowser.h</includehint> </includehints> diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 8c2ab1b5..58f949a1 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -47,17 +47,17 @@ K_EXPORT_COMPONENT_FACTORY( quantadebuggergubed, const char QuantaDebuggerGubed::protocolversion[] = "0.0.12"; -QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *parent, const char* name, const TQStringList&) - : DebuggerClient (parent, name) +QuantaDebuggerGubed::QuantaDebuggerGubed (TQObject *tqparent, const char* name, const TQStringList&) + : DebuggerClient (tqparent, name) { // Create a socket object and set up its signals m_socket = NULL; m_server = NULL; - m_errormask = 1794; + m_errortqmask = 1794; m_defaultExecutionState = Pause; setExecutionState(m_defaultExecutionState); - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); m_datalen = -1; } @@ -80,7 +80,7 @@ QuantaDebuggerGubed::~QuantaDebuggerGubed () delete m_server; m_server = NULL; } - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); } // Try to make a connection to the gubed server @@ -109,7 +109,7 @@ void QuantaDebuggerGubed::startSession() debuggerInterface()->enableAction("debug_request", false); kdDebug(24002) << k_funcinfo << ", proxy:" << m_serverHost << ", " << m_serverPort.toUInt() << endl; - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); } } else @@ -123,14 +123,14 @@ void QuantaDebuggerGubed::startSession() if(m_server->listen()) { - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); debuggerInterface()->enableAction("debug_connect", false); debuggerInterface()->enableAction("debug_disconnect", true); debuggerInterface()->enableAction("debug_request", true); } else { - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); delete m_server; m_server = NULL; debuggerInterface()->enableAction("debug_connect", true); @@ -174,7 +174,7 @@ void QuantaDebuggerGubed::endSession() debuggerInterface()->enableAction("debug_leap", false); debuggerInterface()->enableAction("debug_pause", false); - emit updateStatus(DebuggerUI::NoSession); + emit updatetqStatus(DebuggerUI::NoSession); } // Change executionstate of the script @@ -185,7 +185,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("pause", (char*)0L); sendCommand("sendactiveline", (char*)0L); if(isActive()) - emit updateStatus(DebuggerUI::Paused); + emit updatetqStatus(DebuggerUI::Paused); } else if(newstate == Run) { @@ -194,7 +194,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("run", (char*)0L); if(isActive()) - emit updateStatus(DebuggerUI::Running); + emit updatetqStatus(DebuggerUI::Running); } else if(newstate == Trace) { @@ -203,7 +203,7 @@ void QuantaDebuggerGubed::setExecutionState(State newstate) sendCommand("trace", (char*)0L); if(isActive()) - emit updateStatus(DebuggerUI::Tracing); + emit updatetqStatus(DebuggerUI::Tracing); } m_executionState = newstate; @@ -258,15 +258,15 @@ void QuantaDebuggerGubed::slotError(int) if(m_socket->error()) { - kdDebug(24002) << k_funcinfo << ", " << m_socket->errorString() << endl; - debuggerInterface()->showStatus(m_socket->errorString(), false); + kdDebug(24002) << k_funcinfo << ", " << m_socket->KSocketBase::errorString() << endl; + debuggerInterface()->showtqStatus(m_socket->KSocketBase::errorString(), false); } } if(m_server && m_server->error()) { kdDebug(24002) << k_funcinfo << ", " << m_server->errorString() << endl; - debuggerInterface()->showStatus(m_server->errorString(), false); + debuggerInterface()->showtqStatus(m_server->errorString(), false); } } @@ -294,7 +294,7 @@ void QuantaDebuggerGubed::slotReadyAccept() connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); connected(); - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); } else { @@ -307,7 +307,7 @@ void QuantaDebuggerGubed::slotReadyAccept() // Connection established void QuantaDebuggerGubed::slotConnected(const KNetwork::KResolverEntry &) { - emit updateStatus(DebuggerUI::Connected); + emit updatetqStatus(DebuggerUI::Connected); connected(); } @@ -353,7 +353,7 @@ void QuantaDebuggerGubed::slotConnectionClosed() debuggerInterface()->setActiveLine("", 0); - emit updateStatus(DebuggerUI::AwaitingConnection); + emit updatetqStatus(DebuggerUI::AwaitingConnection); m_active = false; } @@ -383,13 +383,13 @@ void QuantaDebuggerGubed::slotReadyRead() // If datalen == -1, we didnt read the command yet, otherwise were reading data. if(m_datalen == -1) { - bytes = m_buffer.find(";"); + bytes = m_buffer.tqfind(";"); if(bytes < 0) break; data = m_buffer.left(bytes); m_buffer.remove(0, bytes + 1); - bytes = data.find(":"); + bytes = data.tqfind(":"); m_command = data.left(bytes); data.remove(0, bytes + 1); m_datalen = data.toLong(); @@ -437,7 +437,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_executionState == Trace) sendCommand("trace", (char*)0L); - sendCommand("seterrormask", "errormask", TQString::number(m_errormask).ascii(), (char*)0L); + sendCommand("seterrortqmask", "errortqmask", TQString::number(m_errortqmask).ascii(), (char*)0L); } // Just some status info, display on status line else if(m_command == "status") @@ -445,9 +445,9 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) long argcnt = args["args"].toLong(); TQString msg = i18n(args["message"].ascii()); // How will we get these messages throught to the translators? for(int cnt = 1; cnt <= argcnt; cnt++) - msg.replace("%" + TQString("%1").arg(cnt) + "%", args[TQString("arg%1").arg(cnt)]); + msg.tqreplace("%" + TQString("%1").tqarg(cnt) + "%", args[TQString("arg%1").tqarg(cnt)]); - debuggerInterface()->showStatus(msg, false); + debuggerInterface()->showtqStatus(msg, false); } // New current line else if(m_command == "setactiveline") @@ -462,7 +462,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Parsing failed else if(m_command == "parsefailed") { - debuggerInterface()->showStatus(i18n("Syntax or parse error in %1)").arg(args["filenme"]), true); + debuggerInterface()->showtqStatus(i18n("Syntax or parse error in %1)").tqarg(args["filenme"]), true); return; } // A debugging session is running @@ -479,11 +479,11 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else if(m_command == "error") { // Put the line number first so double clicking will jump to the corrrect line - debuggerInterface()->showStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").arg(args["line"]).arg(args["errnum"]).arg(args["errmsg"]).arg(args["filename"]), true); + debuggerInterface()->showtqStatus(i18n("Error occurred: Line %1, Code %2 (%3) in %4").tqarg(args["line"]).tqarg(args["errnum"]).tqarg(args["errmsg"]).tqarg(args["filename"]), true); - // Filter to get error code only and match it with out mask + // Filter to get error code only and match it with out tqmask long error = args["errnum"].toLong(); - if(m_errormask & error) + if(m_errortqmask & error) setExecutionState(Pause); else if(m_executionState == Trace) setExecutionState(Trace); @@ -492,21 +492,21 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) else setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnError); + emit updatetqStatus(DebuggerUI::HaltedOnError); } // We came across a hard coded breakpoint else if(m_command == "forcebreak") { setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnBreakpoint); - debuggerInterface()->showStatus(i18n("Breakpoint reached"), true); + emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint); + debuggerInterface()->showtqStatus(i18n("Breakpoint reached"), true); } // A conditional breakpoint was fulfilled else if(m_command == "conditionalbreak") { setExecutionState(Pause); - emit updateStatus(DebuggerUI::HaltedOnBreakpoint); - debuggerInterface()->showStatus(i18n("Conditional breakpoint fulfilled"), true); + emit updatetqStatus(DebuggerUI::HaltedOnBreakpoint); + debuggerInterface()->showtqStatus(i18n("Conditional breakpoint fulfilled"), true); } // There is a breakpoint set in this file/line else if(m_command == "removebreakpoint") @@ -516,7 +516,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // We're about to debug a file.. else if(m_command == "initialize") { - debuggerInterface()->showStatus(i18n("Established connection to %1").arg(args["filename"]), false); + debuggerInterface()->showtqStatus(i18n("Established connection to %1").tqarg(args["filename"]), false); sendCommand("sendprotocolversion", (char*)0L); debuggerInterface()->setActiveLine(mapServerPathToLocal(args["filename"]), 0); @@ -549,7 +549,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) // Reached en of an include else if(m_command == "end") { - //debuggerInterface()->showStatus(i18n("At end of include %1").arg(data), true); + //debuggerInterface()->showtqStatus(i18n("At end of include %1").tqarg(data), true); return; } // Check protocol version @@ -557,7 +557,7 @@ void QuantaDebuggerGubed::processCommand(const TQString& datas) { if(args["version"] != protocolversion) { - debuggerInterface()->showStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true); + debuggerInterface()->showtqStatus(i18n("The script being debugged does not communicate with the correct protocol version"), true); sendCommand("die", (char*)0L); } return; @@ -603,7 +603,7 @@ bool QuantaDebuggerGubed::sendCommand(const TQString& command, StringMap args) TQString buffer = phpSerialize(args); - buffer = TQString(command + ":%1;" + buffer).arg(buffer.length()); + buffer = TQString(command + ":%1;" + buffer).tqarg(buffer.length()); m_socket->writeBlock(buffer.ascii(), buffer.length()); return true; } @@ -768,15 +768,15 @@ void QuantaDebuggerGubed::fileOpened(const TQString&) // Watch a variable void QuantaDebuggerGubed::addWatch(const TQString &variable) { - if(m_watchlist.find(variable) == m_watchlist.end()) + if(m_watchlist.tqfind(variable) == m_watchlist.end()) m_watchlist.append(variable); sendCommand("getwatch", "variable", variable.ascii(), (char*)0L); } // Remove watch void QuantaDebuggerGubed::removeWatch(DebuggerVariable *variable) { - if(m_watchlist.find(variable->name()) != m_watchlist.end()) - m_watchlist.remove(m_watchlist.find(variable->name())); + if(m_watchlist.tqfind(variable->name()) != m_watchlist.end()) + m_watchlist.remove(m_watchlist.tqfind(variable->name())); //sendCommand("unwatchvariable", var->name()); } @@ -843,9 +843,9 @@ void QuantaDebuggerGubed::readConfig(TQDomNode node) valuenode = node.namedItem("displaydelay"); m_displaydelay = valuenode.firstChild().nodeValue().toLong(); - valuenode = node.namedItem("errormask"); - m_errormask = valuenode.firstChild().nodeValue().toLong(); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; + valuenode = node.namedItem("errortqmask"); + m_errortqmask = valuenode.firstChild().nodeValue().toLong(); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; } @@ -866,11 +866,11 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) set.lineStartSession->setText(m_startsession); set.comboDefaultExecutionState->setCurrentItem((int)m_defaultExecutionState); - set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errormask); - set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errormask); - set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errormask); - set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errormask); - set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errormask); + set.checkBreakOnNotice->setChecked(QuantaDebuggerGubed::Notice & m_errortqmask); + set.checkBreakOnWarning->setChecked(QuantaDebuggerGubed::Warning & m_errortqmask); + set.checkBreakOnUserNotice->setChecked(QuantaDebuggerGubed::User_Notice & m_errortqmask); + set.checkBreakOnUserWarning->setChecked(QuantaDebuggerGubed::User_Warning & m_errortqmask); + set.checkBreakOnUserError->setChecked(QuantaDebuggerGubed::User_Error & m_errortqmask); if(set.exec() == TQDialog::Accepted ) { @@ -878,7 +878,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverhost").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverhost"); node.appendChild( el ); m_serverHost = set.lineServerHost->text(); @@ -886,7 +886,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverport"); node.appendChild( el ); m_serverPort = set.lineServerPort->text(); @@ -894,7 +894,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("localbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("localbasedir"); node.appendChild( el ); m_localBasedir = set.lineLocalBasedir->text(); @@ -904,7 +904,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("serverbasedir").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("serverbasedir"); node.appendChild( el ); m_serverBasedir = set.lineServerBasedir->text(); @@ -914,7 +914,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("useproxy").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("useproxy"); node.appendChild( el ); m_useproxy = set.checkUseProxy->isChecked(); @@ -922,7 +922,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("listenport").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("listenport"); node.appendChild( el ); m_listenPort = set.lineServerListenPort->text(); @@ -930,7 +930,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("startsession").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("startsession"); node.appendChild( el ); m_startsession = set.lineStartSession->text(); @@ -938,7 +938,7 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("defaultexecutionstate").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("defaultexecutionstate"); node.appendChild( el ); m_defaultExecutionState = (State)set.comboDefaultExecutionState->currentItem(); @@ -947,24 +947,24 @@ void QuantaDebuggerGubed::showConfig(TQDomNode node) el = node.namedItem("displaydelay").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el = node.ownerDocument().createElement("displaydelay"); node.appendChild( el ); m_displaydelay = set.sliderDisplayDelay->value(); el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_displaydelay))); - el = node.namedItem("errormask").toElement(); + el = node.namedItem("errortqmask").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); - el = node.ownerDocument().createElement("errormask"); + el.tqparentNode().removeChild(el); + el = node.ownerDocument().createElement("errortqmask"); node.appendChild( el ); - m_errormask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0) + m_errortqmask = (set.checkBreakOnNotice->isChecked() ? QuantaDebuggerGubed::Notice : 0) + (set.checkBreakOnWarning->isChecked() ? QuantaDebuggerGubed::Warning : 0) + (set.checkBreakOnUserNotice->isChecked() ? QuantaDebuggerGubed::User_Notice : 0) + (set.checkBreakOnUserWarning->isChecked() ? QuantaDebuggerGubed::User_Warning : 0) + (set.checkBreakOnUserError->isChecked() ? QuantaDebuggerGubed::User_Error : 0); - kdDebug(24002) << k_funcinfo << ", m_errormask = " << m_errormask << endl; - el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errormask))); + kdDebug(24002) << k_funcinfo << ", m_errortqmask = " << m_errortqmask << endl; + el.appendChild( node.ownerDocument().createTextNode(TQString::number(m_errortqmask))); } } @@ -995,7 +995,7 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) { StringMap::Iterator it; // a:2:{s:4:"name";s:7:"Jessica";s:3:"age";s:2:"26";s:4:"test";i:1;} - TQString ret = TQString("a:%1:{").arg(args.size()); + TQString ret = TQString("a:%1:{").tqarg(args.size()); for( it = args.begin(); it != args.end(); ++it ) { bool isNumber; @@ -1003,15 +1003,15 @@ TQString QuantaDebuggerGubed::phpSerialize(StringMap args) it.data().toInt(&isNumber); if(isNumber && !it.data().isEmpty()) ret += TQString("s:%1:\"%2\";i:%3;") - .arg(it.key().length()) - .arg(it.key()) - .arg(it.data()); + .tqarg(it.key().length()) + .tqarg(it.key()) + .tqarg(it.data()); else ret += TQString("s:%1:\"%2\";s:%3:\"%4\";") - .arg(it.key().length()) - .arg(it.key()) - .arg(it.data().length()) - .arg(it.data()); + .tqarg(it.key().length()) + .tqarg(it.key()) + .tqarg(it.data().length()) + .tqarg(it.data()); } @@ -1038,13 +1038,13 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) return ca; } - cnt = args.mid(2, args.find("{") - 3).toLong(); - TQString data = args.mid(args.find("{") + 1); + cnt = args.mid(2, args.tqfind("{") - 3).toLong(); + TQString data = args.mid(args.tqfind("{") + 1); TQString tmp, func; while(cnt > 0) { - tmp = data.left(data.find("\"")); + tmp = data.left(data.tqfind("\"")); length = tmp.mid(2, tmp.length() - 3).toLong(); func = data.mid(tmp.length() + 1, length); @@ -1053,8 +1053,8 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) if(data.left(1) == "i") { // Integer data - tmp = data.mid(data.find(":") + 1); - tmp = tmp.left(tmp.find(";")); + tmp = data.mid(data.tqfind(":") + 1); + tmp = tmp.left(tmp.tqfind(";")); ca[func] = tmp; data = data.mid(tmp.length() + 3); // kdDebug(24002) << k_funcinfo << "**i " << func << ": " << ca[func] << endl; @@ -1062,7 +1062,7 @@ StringMap QuantaDebuggerGubed::parseArgs(const TQString &args) else { // String data - tmp = data.left(data.find("\"")); + tmp = data.left(data.tqfind("\"")); length = tmp.mid(2, tmp.length() - 3).toLong(); ca[func] = data.mid(tmp.length() + 1, length); @@ -1098,8 +1098,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) if(type == "s") { // Get length of key - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 1); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 1); length = tempstring.toUInt(); key = str.left(length + 1); @@ -1108,8 +1108,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) } else if(type == "i") { - key = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + key = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); } @@ -1122,8 +1122,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:4:"$row";i:6; */ - data = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + data = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Integer); } @@ -1132,9 +1132,9 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:8:"$boolvar";b:1; */ - data = str.left(str.find(';')); + data = str.left(str.tqfind(';')); data = (data == "0" ? i18n("False"): i18n("True")); - str.remove(0, str.find(';') + 1); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Boolean); } else if(type == "N") @@ -1151,8 +1151,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of string - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 1); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 1); length = tempstring.toUInt(); data = str.left(length + 1); @@ -1168,8 +1168,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of array - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 2); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 2); length = tempstring.toUInt(); TQPtrList<DebuggerVariable> vars ; @@ -1193,13 +1193,13 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) */ // Get length of array - tempstring = str.left(str.find(':')); - str.remove(0, str.find(':') + 2); - tempstring = str.mid(str.find(':') + 1); - tempstring = tempstring.left(tempstring.find(':')); + tempstring = str.left(str.tqfind(':')); + str.remove(0, str.tqfind(':') + 2); + tempstring = str.mid(str.tqfind(':') + 1); + tempstring = tempstring.left(tempstring.tqfind(':')); length = tempstring.toUInt(); - str.remove(0, str.find('{') + 1); + str.remove(0, str.tqfind('{') + 1); TQPtrList<DebuggerVariable> vars ; while(length > 0) @@ -1220,8 +1220,8 @@ DebuggerVariable* QuantaDebuggerGubed::parsePHPVariables(TQString &str) /* Example: s:9:"$floatvar";d:12.5600000000000004973799150320701301097869873046875;" */ - data = str.left(str.find(';')); - str.remove(0, str.find(';') + 1); + data = str.left(str.tqfind(';')); + str.remove(0, str.tqfind(';') + 1); debuggervar = debuggerInterface()->newDebuggerVariable(key, data, DebuggerVariableTypes::Float); } diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index 624a8ae8..b30bbe5c 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -31,9 +31,10 @@ typedef TQMap<TQString, TQString> StringMap; class QuantaDebuggerGubed : public DebuggerClient { Q_OBJECT + TQ_OBJECT public: - QuantaDebuggerGubed(TQObject *parent, const char* name, const TQStringList&); + QuantaDebuggerGubed(TQObject *tqparent, const char* name, const TQStringList&); ~QuantaDebuggerGubed(); // Execution states @@ -109,7 +110,7 @@ class QuantaDebuggerGubed : public DebuggerClient TQString m_listenPort; bool m_useproxy; State m_executionState, m_defaultExecutionState; - long m_errormask; + long m_errortqmask; long m_displaydelay; WatchList m_watchlist; @@ -147,7 +148,7 @@ class QuantaDebuggerGubed : public DebuggerClient void slotReadyAccept(); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; #endif diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp index 97140dbb..03b024f0 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.cpp +++ b/quanta/components/debugger/interfaces/debuggerclient.cpp @@ -23,8 +23,8 @@ // CTor -DebuggerClient::DebuggerClient(TQObject *parent, const char* name) - : TQObject(parent, name) +DebuggerClient::DebuggerClient(TQObject *tqparent, const char* name) + : TQObject(tqparent, name) { m_active = false; } @@ -32,7 +32,7 @@ DebuggerClient::DebuggerClient(TQObject *parent, const char* name) DebuggerInterface* DebuggerClient::debuggerInterface() { - return static_cast<DebuggerInterface*>( parent()->child( 0, "DebuggerInterface" ) ); + return static_cast<DebuggerInterface*>( tqparent()->child( 0, "DebuggerInterface" ) ); } // Active state of session @@ -43,7 +43,7 @@ bool DebuggerClient::isActive() void DebuggerClient::unSupportedAction(const TQString &action) { - KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").arg(this->getName()).arg(action), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("The current debugger, %1, does not support the \"%2\" instruction.").tqarg(this->getName()).tqarg(action), i18n("Unsupported Debugger Function")); } @@ -129,7 +129,7 @@ void DebuggerClient::removeBreakpoint(DebuggerBreakpoint*) // Unimplemented defaults void DebuggerClient::showConfig(TQDomNode) { - KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").arg(this->getName()), i18n("Settings")); + KMessageBox::error(NULL, i18n("%1 does not have any specific settings.").tqarg(this->getName()), i18n("Settings")); } // Unimplemented defaults @@ -141,20 +141,20 @@ void DebuggerClient::readConfig(TQDomNode) // Unimplemented defaults: add watch void DebuggerClient::addWatch(const TQString &) { - KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: Remove watch void DebuggerClient::removeWatch(DebuggerVariable *) { // Giving an error seems pointless, since you shouldnt be able to add a watch in the first place... - KMessageBox::error(NULL, i18n("%1 does not support watches.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support watches.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } // Unimplemented defaults: set value of varialbe void DebuggerClient::variableSetValue(const DebuggerVariable &) { - KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").arg(this->getName()), i18n("Unsupported Debugger Function")); + KMessageBox::error(NULL, i18n("%1 does not support setting the value of variables.").tqarg(this->getName()), i18n("Unsupported Debugger Function")); } #include "debuggerclient.moc" diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h index 1966039f..20d5b604 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.h +++ b/quanta/components/debugger/interfaces/debuggerclient.h @@ -60,13 +60,14 @@ namespace DebuggerClientCapabilities }; } -class DebuggerClient : public QObject +class DebuggerClient : public TQObject { Q_OBJECT + TQ_OBJECT private: protected: - DebuggerClient(TQObject *parent, const char* name); + DebuggerClient(TQObject *tqparent, const char* name); bool m_active; @@ -108,7 +109,7 @@ class DebuggerClient : public QObject DebuggerInterface *debuggerInterface(); signals: - void updateStatus(DebuggerUI::DebuggerStatus); + void updatetqStatus(DebuggerUI::DebuggertqStatus); }; diff --git a/quanta/components/debugger/interfaces/debuggerinterface.cpp b/quanta/components/debugger/interfaces/debuggerinterface.cpp index 4d7beda6..013aeb15 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.cpp +++ b/quanta/components/debugger/interfaces/debuggerinterface.cpp @@ -17,8 +17,8 @@ #include "debuggerinterface.h" -DebuggerInterface::DebuggerInterface (TQObject *parent, const char* name) - : TQObject(parent, name) +DebuggerInterface::DebuggerInterface (TQObject *tqparent, const char* name) + : TQObject(tqparent, name) { } diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h index 1540a616..a93fee50 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.h +++ b/quanta/components/debugger/interfaces/debuggerinterface.h @@ -28,22 +28,23 @@ class PathMapper; -class DebuggerInterface : public QObject +class DebuggerInterface : public TQObject { Q_OBJECT + TQ_OBJECT private: public: - DebuggerInterface(TQObject *parent, const char* name); + DebuggerInterface(TQObject *tqparent, const char* name); // Breakpoints virtual void haveBreakpoint (const TQString& file, int line) = 0; virtual void havenoBreakpoint (const TQString& file, int line) = 0; // Public help functions - virtual bool showStatus(const TQString& message, bool log) = 0; + virtual bool showtqStatus(const TQString& message, bool log) = 0; virtual bool setActiveLine (const TQString& file, int line) = 0; virtual void enableAction(const TQString& action, bool enable) = 0; diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp index c38e2fec..e1d74875 100644 --- a/quanta/components/debugger/pathmapper.cpp +++ b/quanta/components/debugger/pathmapper.cpp @@ -27,8 +27,8 @@ #include <qextfileinfo.h> #include <tqdom.h> -PathMapper::PathMapper(TQObject *parent, const char *name) - : TQObject(parent, name) +PathMapper::PathMapper(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { } @@ -43,7 +43,7 @@ TQString PathMapper::translate(const TQString & path, const TQString & from, con TQString translated = path; // Check if this dir is matched by the maps - if(path.startsWith(from, false)) + if(path.tqstartsWith(from, false)) { translated.remove(0, from.length()); translated = to + translated; @@ -110,21 +110,21 @@ TQString PathMapper::mapServerPathToLocal(const TQString &serverpath) newpath = translate(serverpath, m_serverBasedir, m_localBasedir); // Check if this dir is matched by the basedirs - if(QExtFileInfo::exists(newpath, true, 0L)) + if(TQExtFileInfo::exists(newpath, true, 0L)) return newpath; // Check if any previous mappings fit... for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ ) { newpath = translate(serverpath, m_serverlist[cnt], m_locallist[cnt]); - if(QExtFileInfo::exists(newpath, true, 0L)) + if(TQExtFileInfo::exists(newpath, true, 0L)) return newpath; } // If the basedirs didnt match, check if the file exists, // otherwise scan through the mapping history or show the // mapping dialog - if(!QExtFileInfo::exists(serverpath, true, 0L)) + if(!TQExtFileInfo::exists(serverpath, true, 0L)) { PathMapperDialog pmdlg(serverpath, PathMapperDialog::ServerToLocal); for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ ) diff --git a/quanta/components/debugger/pathmapper.h b/quanta/components/debugger/pathmapper.h index fd48e3ab..92a761ac 100644 --- a/quanta/components/debugger/pathmapper.h +++ b/quanta/components/debugger/pathmapper.h @@ -25,12 +25,13 @@ class KURL; -class PathMapper : public QObject +class PathMapper : public TQObject { Q_OBJECT + TQ_OBJECT public: - PathMapper(TQObject *parent = 0, const char *name = 0); + PathMapper(TQObject *tqparent = 0, const char *name = 0); PathMapper(); virtual TQString mapLocalPathToServer(const TQString &localpath); virtual TQString mapServerPathToLocal(const TQString &serverpath); diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp index 74e01956..8cc385d5 100644 --- a/quanta/components/debugger/pathmapperdialog.cpp +++ b/quanta/components/debugger/pathmapperdialog.cpp @@ -69,7 +69,7 @@ void PathMapperDialog::slotPathsChanged() translated = m_path; // Check if this dir is matched by the maps - if(m_path.startsWith(from, false)) + if(m_path.tqstartsWith(from, false)) { translated.remove(0, from.length()); translated = to + translated; @@ -78,10 +78,10 @@ void PathMapperDialog::slotPathsChanged() // Indicate wether local file exists if(m_direction == ServerToLocal) { - if(QExtFileInfo::exists(translated, true, this)) - ledTranslationExists->setColor(Qt::green); + if(TQExtFileInfo::exists(translated, true, this)) + ledTranslationExists->setColor(TQt::green); else - ledTranslationExists->setColor(Qt::red); + ledTranslationExists->setColor(TQt::red); ledTranslationExists->on(); } diff --git a/quanta/components/debugger/pathmapperdialog.h b/quanta/components/debugger/pathmapperdialog.h index 39eb4600..e8d6b8c4 100644 --- a/quanta/components/debugger/pathmapperdialog.h +++ b/quanta/components/debugger/pathmapperdialog.h @@ -22,6 +22,7 @@ class PathMapperDialog : public PathMapperDialogS { Q_OBJECT + TQ_OBJECT public: enum Direction diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui index fc7486d4..933d003a 100644 --- a/quanta/components/debugger/pathmapperdialogs.ui +++ b/quanta/components/debugger/pathmapperdialogs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>PathMapperDialogS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>PathMapperDialogS</cstring> </property> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>groupBox6</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblDebuggerLocalBasedir</cstring> </property> @@ -49,7 +49,7 @@ <string>Local basedir:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblDebuggerServerBasedir</cstring> </property> @@ -65,7 +65,7 @@ <string>Server basedir:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineLocalPath</cstring> </property> @@ -74,7 +74,7 @@ The quanta will know that files starting with "/home/user/project/" on the local computer, will start with "/var/www/" on the remote computer.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineServerPath</cstring> </property> @@ -85,7 +85,7 @@ The quanta will know that files starting with "/home/user/project/" on the local </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -109,14 +109,14 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -133,7 +133,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -149,7 +149,7 @@ The quanta will know that files starting with "/home/user/project/" on the local </widget> </hbox> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -160,7 +160,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView"> + <widget class="TQListView"> <column> <property name="text"> <string>Local Directory</string> @@ -204,7 +204,7 @@ The quanta will know that files starting with "/home/user/project/" on the local </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox8</cstring> </property> @@ -215,7 +215,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>lblTranslates</cstring> </property> @@ -231,7 +231,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <string>Translates to:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lblOriginal</cstring> </property> @@ -251,13 +251,13 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="name"> <cstring>ledTranslationExists</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>22</width> <height>22</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>22</width> <height>22</height> @@ -279,7 +279,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <string>This indicator tells you whether the translated path exists on local disk or not.</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineTranslated</cstring> </property> @@ -297,7 +297,7 @@ The quanta will know that files starting with "/home/user/project/" on the local <string>This field shows what the "original path" above will look like after translation.</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>linePath</cstring> </property> @@ -335,10 +335,10 @@ The quanta will know that files starting with "/home/user/project/" on the local <slot>reject()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotHistoryclicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kled.h</includehint> </includehints> diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp index af70da0a..be930d17 100644 --- a/quanta/components/debugger/quantadebuggerinterface.cpp +++ b/quanta/components/debugger/quantadebuggerinterface.cpp @@ -32,10 +32,10 @@ class DebuggerBreakpoint; -QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *myparent, const char* name) - : DebuggerInterface(myparent, name) +QuantaDebuggerInterface::QuantaDebuggerInterface (TQObject *mytqparent, const char* name) + : DebuggerInterface(mytqparent, name) { - m_manager = static_cast<DebuggerManager*>(parent()); + m_manager = static_cast<DebuggerManager*>(tqparent()); } QuantaDebuggerInterface::~QuantaDebuggerInterface () @@ -52,9 +52,9 @@ void QuantaDebuggerInterface::havenoBreakpoint (const TQString& file, int line) } // Public help functions -bool QuantaDebuggerInterface::showStatus(const TQString& message, bool log) +bool QuantaDebuggerInterface::showtqStatus(const TQString& message, bool log) { - return m_manager->showStatus(message, log); + return m_manager->showtqStatus(message, log); } bool QuantaDebuggerInterface::setActiveLine(const TQString& file, int line) @@ -86,20 +86,20 @@ const TQString QuantaDebuggerInterface::activeFileParts(const TQString & str) // n/d/p = name/dir/path // Filename, filedir and filepath - newstr.replace("%afn", ViewManager::ref()->activeDocument()->url().fileName()); - newstr.replace("%afd", ViewManager::ref()->activeDocument()->url().directory()); - newstr.replace("%afp", ViewManager::ref()->activeDocument()->url().path()); + newstr.tqreplace("%afn", ViewManager::ref()->activeDocument()->url().fileName()); + newstr.tqreplace("%afd", ViewManager::ref()->activeDocument()->url().directory()); + newstr.tqreplace("%afp", ViewManager::ref()->activeDocument()->url().path()); // filedir and filepath relative to project root - newstr.replace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path())); - newstr.replace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory())); + newstr.tqreplace("%rfpp", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().path())); + newstr.tqreplace("%rfpd", KURL::relativePath(Project::ref()->projectBaseURL().path(), ViewManager::ref()->activeDocument()->url().directory())); // filedir and filepath relative to document root - newstr.replace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path())); - newstr.replace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory())); + newstr.tqreplace("%rfdp", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().path())); + newstr.tqreplace("%rfdd", KURL::relativePath(Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory(), ViewManager::ref()->activeDocument()->url().directory())); - newstr.replace("%apd", Project::ref()->projectBaseURL().path()); - newstr.replace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory()); + newstr.tqreplace("%apd", Project::ref()->projectBaseURL().path()); + newstr.tqreplace("%add", Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()).directory()); kdDebug(24002) << k_funcinfo << ", BaseURL " << Project::ref()->projectBaseURL().path() << ", active doc : " << ViewManager::ref()->activeDocument()->url().path() << ", documentFolderForURL" << Project::ref()->documentFolderForURL(ViewManager::ref()->activeDocument()->url()) << ", newstr" << newstr << endl; diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h index d18fd1cd..ba637307 100644 --- a/quanta/components/debugger/quantadebuggerinterface.h +++ b/quanta/components/debugger/quantadebuggerinterface.h @@ -28,12 +28,13 @@ class DebuggerManager; class QuantaDebuggerInterface : public DebuggerInterface { Q_OBJECT + TQ_OBJECT private: DebuggerManager *m_manager; public: - QuantaDebuggerInterface(TQObject *myparent, const char* name); + QuantaDebuggerInterface(TQObject *mytqparent, const char* name); ~QuantaDebuggerInterface(); // Breakpoints @@ -42,7 +43,7 @@ class QuantaDebuggerInterface : public DebuggerInterface void refreshBreakpoints(); // Public help functions - bool showStatus(const TQString& message, bool log); + bool showtqStatus(const TQString& message, bool log); bool setActiveLine (const TQString& file, int line) ; void enableAction(const TQString& action, bool enable); diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 03ddd7d3..9c7263bb 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -39,7 +39,7 @@ namespace VariablesListViewColumns enum Columns { Name = 0, - Status, + tqStatus, Value, Type, Size @@ -47,12 +47,12 @@ namespace VariablesListViewColumns }; } -VariablesListView::VariablesListView(TQWidget *parent, const char *name) - : KListView(parent, name) +VariablesListView::VariablesListView(TQWidget *tqparent, const char *name) + : KListView(tqparent, name) { // If you change here, change the VariablesListViewColumns enums above addColumn(i18n("Name")); - addColumn(TQString::null); + addColumn(TQString()); addColumn(i18n("Value")); addColumn(i18n("Type")); addColumn(i18n("Size")); @@ -106,7 +106,7 @@ void VariablesListView::slotRemoveSelected() void VariablesListView::keyPressEvent(TQKeyEvent *e) { - if(e->key() != Qt::Key_Delete) + if(e->key() != TQt::Key_Delete) { e->ignore(); return; @@ -160,7 +160,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab { KListViewItem * item; - // Remove children that doesen't exist anymore + // Remove tqchildren that doesen't exist anymore TQPtrList<DebuggerVariable> oldlist = oldvar->values(); for(DebuggerVariable* oldchild = oldlist.last(); oldchild; oldchild = oldlist.prev()) { @@ -178,7 +178,7 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab oldvar->deleteChild(oldchild); } - // Update and add children + // Update and add tqchildren TQPtrList<DebuggerVariable> newlist = newvar->values(); for(DebuggerVariable* newchild = newlist.last(); newchild; newchild = newlist.prev()) { @@ -206,9 +206,9 @@ void VariablesListView::replaceVariable(DebuggerVariable* oldvar, DebuggerVariab item = oldvar->item(); if(oldvar->value() != newvar->value()) - item->setPixmap(VariablesListViewColumns::Status, SmallIcon("ok")); + item->setPixmap(VariablesListViewColumns::tqStatus, SmallIcon("ok")); else - item->setPixmap(VariablesListViewColumns::Status, KPixmap()); + item->setPixmap(VariablesListViewColumns::tqStatus, KPixmap()); oldvar->copy(newvar, false); @@ -274,7 +274,7 @@ void VariablesListView::slotVariableDump( ) if(!v) return; - quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").arg(v->name())); + quantaApp->messageOutput()->showMessage(i18n("Contents of variable %1:\n>>>\n").tqarg(v->name())); quantaApp->messageOutput()->showMessage(v->value()); quantaApp->messageOutput()->showMessage("<<<\n"); } @@ -284,7 +284,7 @@ void VariablesListView::slotVariableCopyToClipboard( ) DebuggerVariable *v = selected(true); if(!v) return; - TQApplication::clipboard()->setText(v->value()); + TQApplication::tqclipboard()->setText(v->value()); } #include "variableslistview.moc" diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h index 729aa8d8..b4f3d9bc 100644 --- a/quanta/components/debugger/variableslistview.h +++ b/quanta/components/debugger/variableslistview.h @@ -28,6 +28,7 @@ class DebuggerVariable; class VariablesListView : public KListView { Q_OBJECT + TQ_OBJECT enum menuitems { @@ -38,7 +39,7 @@ class VariablesListView : public KListView }; public: - VariablesListView(TQWidget *parent = 0, const char *name = 0); + VariablesListView(TQWidget *tqparent = 0, const char *name = 0); ~VariablesListView(); void addVariable(DebuggerVariable* variable); diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h index 6dbe92d1..528da3ea 100644 --- a/quanta/components/framewizard/areaattributedb.h +++ b/quanta/components/framewizard/areaattributedb.h @@ -24,11 +24,12 @@ *@author gulmini luciano */ -class areaAttribute : public QObject{ +class areaAttribute : public TQObject{ Q_OBJECT + TQ_OBJECT private: - TQRect m_geometry; + TQRect m_tqgeometry; TQMap<TQString,TQString> m_attributeMap; //tag specific attributes public: @@ -37,13 +38,13 @@ class areaAttribute : public QObject{ void setAttribute(const TQString& name, const TQString& value){ m_attributeMap[name] = value; } void setAllAttributes(TQMap<TQString,TQString> map){ m_attributeMap = map; } void resetAttributes(); - TQRect geometry() const { return m_geometry; } + TQRect tqgeometry() const { return m_tqgeometry; } TQString src() const{ return m_attributeMap["src"]; } TQString attributeValue(TQString l) const { return attributeMap()[l];} TQMap<TQString,TQString> attributeMap() const { return m_attributeMap; } public slots: - void setGeometry(TQRect g) { m_geometry = g; } + void setGeometry(TQRect g) { m_tqgeometry = g; } }; #endif diff --git a/quanta/components/framewizard/fmfpeditor.h b/quanta/components/framewizard/fmfpeditor.h index 1a89f0c8..2fc52e64 100644 --- a/quanta/components/framewizard/fmfpeditor.h +++ b/quanta/components/framewizard/fmfpeditor.h @@ -26,6 +26,7 @@ class fmFPeditor : public fmFPeditorS { Q_OBJECT + TQ_OBJECT public: fmFPeditor(); diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui index ef8990a9..bcfb43c1 100644 --- a/quanta/components/framewizard/fmfpeditors.ui +++ b/quanta/components/framewizard/fmfpeditors.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>fmFPeditorS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>fmFPeditorS</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -43,14 +43,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>55</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbOk</cstring> </property> @@ -58,7 +58,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> @@ -68,11 +68,11 @@ </widget> </hbox> </widget> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tw</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -83,7 +83,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="4" column="0"> + <widget class="TQButtonGroup" row="4" column="0"> <property name="name"> <cstring>bgBorder</cstring> </property> @@ -100,7 +100,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rbBorderYes</cstring> </property> @@ -111,7 +111,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>rbBorderNo</cstring> </property> @@ -124,7 +124,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>gbMargins</cstring> </property> @@ -141,7 +141,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -155,7 +155,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -169,7 +169,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -177,7 +177,7 @@ <string>From left:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>sbLeft</cstring> </property> @@ -190,7 +190,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -204,7 +204,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -212,7 +212,7 @@ <string>From top:</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>sbTop</cstring> </property> @@ -229,7 +229,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="3" column="0"> + <widget class="TQButtonGroup" row="3" column="0"> <property name="name"> <cstring>bgScrolling</cstring> </property> @@ -246,7 +246,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rbScrollingYes</cstring> </property> @@ -254,7 +254,7 @@ <string>Yes</string> </property> </widget> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>rbScrollingAuto</cstring> </property> @@ -265,7 +265,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>rbScrollingNo</cstring> </property> @@ -275,7 +275,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>bgNoresize</cstring> </property> @@ -295,7 +295,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>rbResizeYes</cstring> </property> @@ -303,7 +303,7 @@ <string>Yes</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>rbResizeNo</cstring> </property> @@ -316,7 +316,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -330,7 +330,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -344,7 +344,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tlFrameSource</cstring> </property> @@ -352,7 +352,7 @@ <string>Frame source:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tlFrameName</cstring> </property> @@ -362,7 +362,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout8</cstring> </property> @@ -381,7 +381,7 @@ <cstring>fc</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leName</cstring> </property> @@ -392,7 +392,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -403,7 +403,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -417,7 +417,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tlId</cstring> </property> @@ -425,7 +425,7 @@ <string>Id:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -433,7 +433,7 @@ <string>Class:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -441,7 +441,7 @@ <string>Style:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -449,7 +449,7 @@ <string>Title:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -459,7 +459,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -473,27 +473,27 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leId</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leClass</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leStyle</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leTitle</cstring> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>leLongdesc</cstring> </property> @@ -510,7 +510,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -537,5 +537,5 @@ </connection> </connections> <pixmapinproject/> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/components/framewizard/fmrceditor.h b/quanta/components/framewizard/fmrceditor.h index 254f1cc5..ab33d5b4 100644 --- a/quanta/components/framewizard/fmrceditor.h +++ b/quanta/components/framewizard/fmrceditor.h @@ -26,6 +26,7 @@ class fmRCeditor : public fmRCeditorS { Q_OBJECT + TQ_OBJECT public: fmRCeditor(); ~fmRCeditor(); diff --git a/quanta/components/framewizard/fmrceditors.ui b/quanta/components/framewizard/fmrceditors.ui index 25cd41bd..d85bb0da 100644 --- a/quanta/components/framewizard/fmrceditors.ui +++ b/quanta/components/framewizard/fmrceditors.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>fmRCeditorS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>fmRCeditorS</cstring> </property> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>150</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>300</width> <height>150</height> @@ -45,7 +45,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -59,7 +59,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tl</cstring> </property> @@ -67,7 +67,7 @@ <string></string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>sb</cstring> </property> @@ -80,7 +80,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -104,14 +104,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>0</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbOk</cstring> </property> @@ -119,7 +119,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> @@ -145,5 +145,5 @@ <slot>reject()</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp index e0e7d5d9..0eabb061 100644 --- a/quanta/components/framewizard/framewizard.cpp +++ b/quanta/components/framewizard/framewizard.cpp @@ -28,7 +28,7 @@ static const TQString info1=i18n("You must select an area."), info2=i18n("Before editing a frame you must save the file."); -FrameWizard::FrameWizard(TQWidget *parent, const char *name) : FrameWizardS(parent, name), +FrameWizard::FrameWizard(TQWidget *tqparent, const char *name) : FrameWizardS(tqparent, name), m_hasSelected(false),m_saved(false) { m_hasSelected = false; @@ -44,7 +44,7 @@ m_hasSelected(false),m_saved(false) } FrameWizard::~FrameWizard(){ -#define QT_CHECK_NULL +#define TQT_CHECK_NULL Q_CHECK_PTR( vfe ); } @@ -57,7 +57,7 @@ void FrameWizard::split(){ if(m_hasSelected) { int split = 0; TQString currNodeLabel = m_currSA; - TQString senderName=sender()->name(); + TQString senderName=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); if(senderName=="pbHorizontal"){ split = showRCeditorDlg(i18n("Enter the desired number of rows:")); if(split>=2) vfe->split(currNodeLabel,split,HORIZONTAL); diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h index 42386982..177c6c6b 100644 --- a/quanta/components/framewizard/framewizard.h +++ b/quanta/components/framewizard/framewizard.h @@ -26,6 +26,7 @@ class TQStringList; class FrameWizard : public FrameWizardS { Q_OBJECT + TQ_OBJECT private: bool m_hasSelected, m_saved; // if saved = false the the file containing the frameset structure @@ -35,7 +36,7 @@ class FrameWizard : public FrameWizardS TQString m_currSA; public: - FrameWizard( TQWidget* parent=0, const char *name=0); + FrameWizard( TQWidget* tqparent=0, const char *name=0); ~FrameWizard(); private slots: diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui index a06d321b..6f3d030e 100644 --- a/quanta/components/framewizard/framewizards.ui +++ b/quanta/components/framewizard/framewizards.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>FrameWizardS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>FrameWizardS</cstring> </property> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -45,7 +45,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -59,7 +59,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbHelp</cstring> </property> @@ -77,14 +77,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -98,7 +98,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbOk</cstring> </property> @@ -106,7 +106,7 @@ <string>&OK</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pbCancel</cstring> </property> @@ -118,7 +118,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -132,7 +132,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout9</cstring> </property> @@ -146,7 +146,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tl</cstring> </property> @@ -161,14 +161,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>30</height> </size> </property> </spacer> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup4</cstring> </property> @@ -193,7 +193,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbVertical</cstring> </property> @@ -201,7 +201,7 @@ <string>Vertical</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>pbHorizontal</cstring> </property> @@ -221,14 +221,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>16</height> </size> </property> </spacer> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup5</cstring> </property> @@ -253,7 +253,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>pbEditFrame</cstring> </property> @@ -261,7 +261,7 @@ <string>Edit Frame</string> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>pbDelete</cstring> </property> @@ -272,7 +272,7 @@ <string>Delete</string> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>pbReset</cstring> </property> @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>30</height> @@ -362,7 +362,7 @@ </connection> </connections> <pixmapinproject/> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>visualframeeditor.h</includehint> </includehints> diff --git a/quanta/components/framewizard/selectablearea.cpp b/quanta/components/framewizard/selectablearea.cpp index c168e323..40f76ae2 100644 --- a/quanta/components/framewizard/selectablearea.cpp +++ b/quanta/components/framewizard/selectablearea.cpp @@ -20,7 +20,7 @@ //#include <kdebug.h> #include "fwglobal.h" -SelectableArea::SelectableArea(TQWidget *parent, const char *name ) : KHTMLPart(parent,name) { +SelectableArea::SelectableArea(TQWidget *tqparent, const char *name ) : KHTMLPart(tqparent,name) { view()->setFrameShape(TQFrame::NoFrame); view()->setMinimumSize(TQSize(1,1)); view()->installEventFilter(this); @@ -44,7 +44,7 @@ bool SelectableArea::eventFilter(TQObject *o, TQEvent *event){ } break; case TQEvent::Resize : { - emit Resized( view()->geometry() ); + emit Resized( view()->tqgeometry() ); view()->hide(); view()->show(); return true; diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h index 8de351a9..3df3200a 100644 --- a/quanta/components/framewizard/selectablearea.h +++ b/quanta/components/framewizard/selectablearea.h @@ -29,9 +29,10 @@ class SelectableArea : public KHTMLPart { Q_OBJECT + TQ_OBJECT public : - SelectableArea(TQWidget *parent=0, const char *name=0); + SelectableArea(TQWidget *tqparent=0, const char *name=0); ~SelectableArea(); TQString idLabel() const { return m_idLabel; } void setIdLabel(const TQString &i) { m_idLabel = i; } diff --git a/quanta/components/framewizard/treenode.cpp b/quanta/components/framewizard/treenode.cpp index fd1f187f..0ff7cf74 100644 --- a/quanta/components/framewizard/treenode.cpp +++ b/quanta/components/framewizard/treenode.cpp @@ -20,7 +20,7 @@ static const int SIZE = 101; treeNode::treeNode(const TQString &l, const TQString &pl) : m_label(l), m_parentLabel(pl), m_splitType(NONE){ - m_childrenList.setAutoDelete(true); + m_tqchildrenList.setAutoDelete(true); m_atts = new areaAttribute; } @@ -29,16 +29,16 @@ treeNode::~treeNode(){ } void treeNode::addChildNode(const TQString &l) { - m_childrenList.append( new treeNode(l,m_label) ); + m_tqchildrenList.append( new treeNode(l,m_label) ); } void treeNode::removeChildNode(const TQString &l,bool autoDelete) { - m_childrenList.setAutoDelete(autoDelete); - m_childrenList.remove(findChild(l)); + m_tqchildrenList.setAutoDelete(autoDelete); + m_tqchildrenList.remove(findChild(l)); } treeNode* treeNode::findChild(const TQString &l){ - TQPtrListIterator<treeNode> it( m_childrenList ); + TQPtrListIterator<treeNode> it( m_tqchildrenList ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; @@ -68,25 +68,25 @@ void tree::refreshGeometries(treeNode *n){ n->nextChild(); } - TQPtrList<treeNode> list = n->childrenList(); + TQPtrList<treeNode> list = n->tqchildrenList(); TQPtrListIterator<treeNode> it( list ); treeNode *node= it.current(); - TQRect newGeometry = n->atts()->geometry(); + TQRect newGeometry = n->atts()->tqgeometry(); if(n->splitType()==VERTICAL){ - newGeometry.setHeight(node->atts()->geometry().height()); + newGeometry.setHeight(node->atts()->tqgeometry().height()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->geometry().width(); + dim += node->atts()->tqgeometry().width(); dim += 6; } newGeometry.setWidth(dim); } else if(n->splitType()==HORIZONTAL){ - newGeometry.setWidth(node->atts()->geometry().width()); + newGeometry.setWidth(node->atts()->tqgeometry().width()); while ( (node = it.current()) != 0 ) { ++it; - dim += node->atts()->geometry().height(); + dim += node->atts()->tqgeometry().height(); dim += 6; } newGeometry.setHeight(dim); @@ -98,7 +98,7 @@ void tree::refreshGeometries(treeNode *n){ treeNode* tree::findNode(const TQString &l){ if(l==m_root->label()) return m_root; - return m_nodeList.find(l); + return m_nodeList.tqfind(l); } TQString tree::addChildNode(const TQString &l){ @@ -114,13 +114,13 @@ TQString tree::addChildNode(const TQString &l){ } bool tree::insertChildNode(const TQString &l){ - TQString parent = findNode(l)->parentLabel(); - int pos=findNode( parent )->childPosition( findNode(l) ); + TQString tqparent = findNode(l)->tqparentLabel(); + int pos=findNode( tqparent )->childPosition( findNode(l) ); ++nodeId; - treeNode *newNode = new treeNode(TQString::number(nodeId,10),parent); + treeNode *newNode = new treeNode(TQString::number(nodeId,10),tqparent); newNode->atts()->setAttribute( "src",findNode(l)->atts()->src() ); m_nodeList.insert(TQString::number(nodeId,10),newNode); - return findNode( parent )->insertChild(pos,newNode); + return findNode( tqparent )->insertChild(pos,newNode); } void tree::reset(){ diff --git a/quanta/components/framewizard/treenode.h b/quanta/components/framewizard/treenode.h index 0d686630..6680e443 100644 --- a/quanta/components/framewizard/treenode.h +++ b/quanta/components/framewizard/treenode.h @@ -33,36 +33,36 @@ class treeNode { TQString m_label, m_parentLabel; SplitType m_splitType; - TQPtrList<treeNode> m_childrenList; + TQPtrList<treeNode> m_tqchildrenList; areaAttribute *m_atts; public: - treeNode(const TQString &l=TQString::null, const TQString &pl=TQString::null); + treeNode(const TQString &l=TQString(), const TQString &pl=TQString()); ~treeNode(); void addChildNode(const TQString &L); - void addChildNode(treeNode *n){ m_childrenList.append(n); } + void addChildNode(treeNode *n){ m_tqchildrenList.append(n); } void removeChildNode(const TQString &l, bool autoDelete); void setSplitType(SplitType s) { m_splitType = s; } void setLabel(const TQString &l) { m_label = l; } - void removeChildren() { m_childrenList.clear(); } + void removeChildren() { m_tqchildrenList.clear(); } void setParentLabel(const TQString &s){ m_parentLabel = s;} - int childPosition(treeNode* n){ return m_childrenList.find(n); } - bool insertChild(unsigned int pos, treeNode* n) { return m_childrenList.insert( pos, n); } + int childPosition(treeNode* n){ return m_tqchildrenList.tqfind(n); } + bool insertChild(unsigned int pos, treeNode* n) { return m_tqchildrenList.insert( pos, n); } TQString label() const { return m_label; } - TQString parentLabel() const { return m_parentLabel; } + TQString tqparentLabel() const { return m_parentLabel; } SplitType splitType() const { return m_splitType; } - TQPtrList<treeNode> childrenList() { return m_childrenList; } + TQPtrList<treeNode> tqchildrenList() { return m_tqchildrenList; } - treeNode* firstChild() { return m_childrenList.first(); } - treeNode* nextChild() { return m_childrenList.next(); } - treeNode* lastChild() { return m_childrenList.last(); } - treeNode* currentChild() { return m_childrenList.current(); } + treeNode* firstChild() { return m_tqchildrenList.first(); } + treeNode* nextChild() { return m_tqchildrenList.next(); } + treeNode* lastChild() { return m_tqchildrenList.last(); } + treeNode* currentChild() { return m_tqchildrenList.current(); } treeNode* findChild(const TQString &L); areaAttribute* atts() { return m_atts; } - int countChildren() const { return m_childrenList.count(); } - bool hasChildren() const { return !m_childrenList.isEmpty(); } + int countChildren() const { return m_tqchildrenList.count(); } + bool hasChildren() const { return !m_tqchildrenList.isEmpty(); } }; class tree{ @@ -77,7 +77,7 @@ class tree{ treeNode* root() const { return m_root; } TQString addChildNode(const TQString &l); bool insertChildNode(const TQString &L); - void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//parent node,child node + void removeChildNode(const TQString &pl,const TQString &l,bool autoDelete);//tqparent node,child node treeNode* findNode(const TQString &L); areaAttribute* findAreaAttribute(const TQString &l){ return findNode(l)->atts(); }; void reset(); diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index a11dae84..d75074bd 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -32,7 +32,7 @@ TQMap<TQString, TQValueList< int > > SIZES; static int splitterIdNumber = 0; -VisualFrameEditor::VisualFrameEditor(TQWidget * parent, const char * name) : TQHBox(parent,name){ +VisualFrameEditor::VisualFrameEditor(TQWidget * tqparent, const char * name) : TQHBox(tqparent,name){ m_internalTree = new tree; m_internalTree->root()->atts()->setGeometry(TQRect(0,0,510,422)); m_firstInsertedSA = 0L; @@ -46,12 +46,12 @@ VisualFrameEditor::~VisualFrameEditor(){ void VisualFrameEditor::setGeometries(const TQString &l){ int cP = cancelledPixels(m_internalTree->findNode(l)->countChildren()); - TQRect newGeometry(m_internalTree->findNode(l)->atts()->geometry()); - TQPtrList<treeNode> list=m_internalTree->findNode(l)->childrenList(); + TQRect newGeometry(m_internalTree->findNode(l)->atts()->tqgeometry()); + TQPtrList<treeNode> list=m_internalTree->findNode(l)->tqchildrenList(); TQPtrListIterator<treeNode> it( list ); treeNode *node; if(m_internalTree->findNode(l)->splitType() == VERTICAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().width()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().width()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setWidth( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -60,7 +60,7 @@ void VisualFrameEditor::setGeometries(const TQString &l){ } else if(m_internalTree->findNode(l)->splitType() == HORIZONTAL){ - int dummyDimension=m_internalTree->findNode(l)->atts()->geometry().height()-cP; + int dummyDimension=m_internalTree->findNode(l)->atts()->tqgeometry().height()-cP; while ( (node = it.current()) != 0 ) { ++it; newGeometry.setHeight( int(dummyDimension/m_internalTree->findNode(l)->countChildren()) ); @@ -76,17 +76,17 @@ void VisualFrameEditor::split(const TQString &l, int n, SplitType type) { setGeometries(l); } else { - TQString parentLabel=m_internalTree->findNode(l)->parentLabel(); - SplitType parentSplit=m_internalTree->findNode(parentLabel)->splitType(); - if( parentSplit != type ) { + TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel(); + SplitType tqparentSplit=m_internalTree->findNode(tqparentLabel)->splitType(); + if( tqparentSplit != type ) { m_internalTree->findNode(l)->setSplitType(type); for(int i = 1; i<=n; i++) m_internalTree->addChildNode(l); setGeometries(l); } else { for(int i = 1; i<=n; i++) m_internalTree->insertChildNode(l); - m_internalTree->findNode(parentLabel)->removeChildNode(l,true); - setGeometries(m_internalTree->findNode(parentLabel)->label()); + m_internalTree->findNode(tqparentLabel)->removeChildNode(l,true); + setGeometries(m_internalTree->findNode(tqparentLabel)->label()); } } } @@ -109,9 +109,9 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ // then every asterisk must be assigned a percentage of 10% so the real percentage // notation is cols="40%,50%,10%" for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if(!(*it).contains("%") && !(*it).contains("*")) leftPercentage -= ( (*it).toInt()*100 )/d; - if((*it).contains("%")) leftPercentage -= (*it).section("%",0,0).toInt(); - if((*it).contains("*")) { + if(!(*it).tqcontains("%") && !(*it).tqcontains("*")) leftPercentage -= ( (*it).toInt()*100 )/d; + if((*it).tqcontains("%")) leftPercentage -= (*it).section("%",0,0).toInt(); + if((*it).tqcontains("*")) { int weight= (*it).section("*",0,0).toInt(); if( weight==0 ) weight=1; weightAsteriskCounter += weight; @@ -125,7 +125,7 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ // a quelli effettivamente generati dal metodo build che opera un'altra normalizzazione. // In genere la differenza �dell' 1% for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { - if((*it).contains("*")){ + if((*it).tqcontains("*")){ int weight= (*it).section("*",0,0).toInt(); if(weight==0) weight=1; int newPercentage = weight*leftPercentageDistributedAmongAsterisks; @@ -136,28 +136,28 @@ TQStringList VisualFrameEditor::convertAsterisks(const TQString &s,int d){ return list; } -void VisualFrameEditor::buildInternalTree(const TQString &parent){ +void VisualFrameEditor::buildInternalTree(const TQString &tqparent){ TQString line = m_existingStructure.first(); - if(line.contains("<frameset")) { - if(line.contains("rows")) { - split(parent,(line.contains(",")+1),HORIZONTAL); + if(line.tqcontains("<frameset")) { + if(line.tqcontains("rows")) { + split(tqparent,(line.tqcontains(",")+1),HORIZONTAL); TQRegExp pattern("rows\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); + TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.height()); - int dummyDimension=dummy.height()-cancelledPixels(line.contains(",")+1); + int dummyDimension=dummy.height()-cancelledPixels(line.tqcontains(",")+1); - TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList(); + TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList(); TQPtrListIterator<treeNode> it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; TQRect newGeometry(dummy); double newDimension; - if(percentages.first().contains("%")) + if(percentages.first().tqcontains("%")) newDimension=(dummyDimension*(percentages.first().remove("%").toInt()))/100.0; else newDimension=(double)percentages.first().toInt(); newGeometry.setHeight( proxInt(newDimension) ); @@ -166,24 +166,24 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ } } else - if(line.contains("cols")) { - split(parent,(line.contains(",")+1),VERTICAL); + if(line.tqcontains("cols")) { + split(tqparent,(line.tqcontains(",")+1),VERTICAL); TQRegExp pattern("cols\\s*=\"([\\s\\d%,\\*]*)\""); pattern.search(line); - TQRect dummy=m_internalTree->findNode(parent)->atts()->geometry(); + TQRect dummy=m_internalTree->findNode(tqparent)->atts()->tqgeometry(); TQStringList percentages = convertAsterisks(pattern.cap(1),dummy.width()); - int dummyDimension=dummy.width()-cancelledPixels(line.contains(",")+1); + int dummyDimension=dummy.width()-cancelledPixels(line.tqcontains(",")+1); - TQPtrList<treeNode> list=m_internalTree->findNode(parent)->childrenList(); + TQPtrList<treeNode> list=m_internalTree->findNode(tqparent)->tqchildrenList(); TQPtrListIterator<treeNode> it( list ); treeNode *node; while ( (node = it.current()) != 0 ) { ++it; TQRect newGeometry(dummy); double newDimension; - if(percentages.first().contains("%")) + if(percentages.first().tqcontains("%")) newDimension=(dummyDimension*(percentages.first().remove("%").toInt()))/100.0; else newDimension=(double)percentages.first().toInt(); newGeometry.setWidth( proxInt(newDimension) ); @@ -193,23 +193,23 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ } m_existingStructure.pop_front(); - m_internalTree->findNode(parent)->firstChild(); - while(m_internalTree->findNode(parent)->currentChild()) { - buildInternalTree(m_internalTree->findNode(parent)->currentChild()->label()); - m_internalTree->findNode(parent)->nextChild(); + m_internalTree->findNode(tqparent)->firstChild(); + while(m_internalTree->findNode(tqparent)->currentChild()) { + buildInternalTree(m_internalTree->findNode(tqparent)->currentChild()->label()); + m_internalTree->findNode(tqparent)->nextChild(); } } else { TQMap<TQString,TQString> attributeMap; - if( line.contains( TQRegExp("\\s+noresize") ) ) attributeMap["noresize"] = "noresize"; - else attributeMap["noresize"] = TQString::null; + if( line.tqcontains( TQRegExp("\\s+noresize") ) ) attributeMap["noresize"] = "noresize"; + else attributeMap["noresize"] = TQString(); TQRegExp srcPattern("\\s+src\\s*=\\s*\"([%-\\w\\s\\./_\\+\\d]*)\""); //search for files if(srcPattern.search(line) !=-1 ) { KURL pathToConvert, basePath; pathToConvert.setPath(srcPattern.cap(1)); basePath.setPath( Project::ref()->projectBaseURL().path() ); - attributeMap["src"] = QExtFileInfo::toAbsolute( pathToConvert, basePath ).path(); + attributeMap["src"] = TQExtFileInfo::toAbsolute( pathToConvert, basePath ).path(); line.remove(srcPattern);//we don't need to operate on this anymore } @@ -221,7 +221,7 @@ void VisualFrameEditor::buildInternalTree(const TQString &parent){ attributeMap[ pattern.cap(1).section( TQRegExp("=\\s*\"") ,0,0) ] = pattern.cap(1).section(TQRegExp("=\\s*\""),1,1).remove("\""); if ( pos >= 0 ) pos += pattern.matchedLength(); } - m_internalTree->findNode(parent)->atts()->setAllAttributes(attributeMap); + m_internalTree->findNode(tqparent)->atts()->setAllAttributes(attributeMap); m_existingStructure.pop_front(); } } @@ -246,23 +246,23 @@ void VisualFrameEditor::paintEvent ( TQPaintEvent * ){ void VisualFrameEditor::removeNode(const TQString &l){ if( l == m_internalTree->root()->label() ) m_internalTree->reset();//trying to remove root node is equivalent to reinitialize else { - TQString parentLabel=m_internalTree->findNode(l)->parentLabel(); - if(m_internalTree->findNode(parentLabel)->countChildren()>=3) - m_internalTree->removeChildNode(parentLabel,l,true); + TQString tqparentLabel=m_internalTree->findNode(l)->tqparentLabel(); + if(m_internalTree->findNode(tqparentLabel)->countChildren()>=3) + m_internalTree->removeChildNode(tqparentLabel,l,true); else { - m_internalTree->removeChildNode(parentLabel,l,true); - if( !m_internalTree->findNode(parentLabel)->firstChild()->hasChildren() ){ //final nodes - TQMap<TQString,TQString> map = m_internalTree->findNode(parentLabel)->firstChild()->atts()->attributeMap(); - m_internalTree->findNode(parentLabel)->removeChildren(); - m_internalTree->findNode(parentLabel)->atts()->setAllAttributes( map ) ; - m_internalTree->findNode(parentLabel)->setSplitType(NONE); + m_internalTree->removeChildNode(tqparentLabel,l,true); + if( !m_internalTree->findNode(tqparentLabel)->firstChild()->hasChildren() ){ //final nodes + TQMap<TQString,TQString> map = m_internalTree->findNode(tqparentLabel)->firstChild()->atts()->attributeMap(); + m_internalTree->findNode(tqparentLabel)->removeChildren(); + m_internalTree->findNode(tqparentLabel)->atts()->setAllAttributes( map ) ; + m_internalTree->findNode(tqparentLabel)->setSplitType(NONE); } else { - TQPtrList<treeNode> list = m_internalTree->findNode(parentLabel)->firstChild()->childrenList(); - if( parentLabel != m_internalTree->root()->label() ) { - TQString grandParentLabel = m_internalTree->findNode(parentLabel)->parentLabel(); - m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); - m_internalTree->removeChildNode( grandParentLabel ,parentLabel, true ); + TQPtrList<treeNode> list = m_internalTree->findNode(tqparentLabel)->firstChild()->tqchildrenList(); + if( tqparentLabel != m_internalTree->root()->label() ) { + TQString grandParentLabel = m_internalTree->findNode(tqparentLabel)->tqparentLabel(); + m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false ); + m_internalTree->removeChildNode( grandParentLabel ,tqparentLabel, true ); treeNode *node; for ( node = list.first(); node; node = list.next() ) { node->setParentLabel(grandParentLabel); @@ -270,12 +270,12 @@ void VisualFrameEditor::removeNode(const TQString &l){ } } else { - m_internalTree->findNode(parentLabel)->setSplitType( m_internalTree->findNode(parentLabel)->firstChild()->splitType() ); - m_internalTree->removeChildNode( parentLabel,m_internalTree->findNode(parentLabel)->firstChild()->label(),false ); + m_internalTree->findNode(tqparentLabel)->setSplitType( m_internalTree->findNode(tqparentLabel)->firstChild()->splitType() ); + m_internalTree->removeChildNode( tqparentLabel,m_internalTree->findNode(tqparentLabel)->firstChild()->label(),false ); treeNode *node; for ( node = list.first(); node; node = list.next() ) { - node->setParentLabel(parentLabel); - m_internalTree->findNode(parentLabel)->addChildNode(node); + node->setParentLabel(tqparentLabel); + m_internalTree->findNode(tqparentLabel)->addChildNode(node); } } } @@ -283,14 +283,14 @@ void VisualFrameEditor::removeNode(const TQString &l){ } } -void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ +void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* tqparent){ if(n->hasChildren()) { TQString splitterName("splitter"+TQString::number(++splitterIdNumber,10)); - TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii()); - if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] ); + TQSplitter *splitter = new TQSplitter(tqparent,splitterName.ascii()); + if(SIZES.tqcontains(splitterName)) splitter->setSizes( SIZES[splitterName] ); switch( n->splitType() ){ - case VERTICAL : splitter->setOrientation(TQSplitter::Horizontal);break; - case HORIZONTAL : splitter->setOrientation(TQSplitter::Vertical);break; + case VERTICAL : splitter->setOrientation(Qt::Horizontal);break; + case HORIZONTAL : splitter->setOrientation(Qt::Vertical);break; default:break; } n->firstChild(); @@ -300,11 +300,11 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ } } else { - SelectableArea *sa=new SelectableArea(parent,n->label().ascii()); - if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); + SelectableArea *sa=new SelectableArea(tqparent,n->label().ascii()); + if(tqparent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(tqparent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); else if(!m_firstInsertedSA) m_firstInsertedSA = sa; - sa->view()->setGeometry(n->atts()->geometry()); + sa->view()->setGeometry(n->atts()->tqgeometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); @@ -335,7 +335,7 @@ TQString VisualFrameEditor::createFrameTag(areaAttribute *a){ base.setPath( Project::ref()->projectBaseURL().path() ); KURL u; u.setPath(Src); - tagMiddle+= (" src=\"" + QExtFileInfo::toRelative( u, base).path() + "\""); + tagMiddle+= (" src=\"" + TQExtFileInfo::toRelative( u, base).path() + "\""); } if( !Longdesc.isEmpty() ) @@ -371,11 +371,11 @@ TQString VisualFrameEditor::RCvalue(treeNode *n) { int lostPixels = (6*(child_number-1)); // 6 pixels are lost every time a splitter is drawn switch( n->splitType() ) { - case VERTICAL: percentage/=n->atts()->geometry().width(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().width(); + case VERTICAL: percentage/=n->atts()->tqgeometry().width(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().width(); break; - case HORIZONTAL: percentage/=n->atts()->geometry().height(); - for(int i=1;i<=child_number;++i) dimMap[i]=n->childrenList().at(i-1)->atts()->geometry().height(); + case HORIZONTAL: percentage/=n->atts()->tqgeometry().height(); + for(int i=1;i<=child_number;++i) dimMap[i]=n->tqchildrenList().at(i-1)->atts()->tqgeometry().height(); break; default:break; } @@ -421,9 +421,9 @@ TQString VisualFrameEditor::formatStructure(){ TQString s; int tabNum = 0; for ( TQStringList::Iterator it = nonFormattedStructure.begin(); it != nonFormattedStructure.end(); ++it ) { - if((*it).contains("<frameset")) tabNum++; + if((*it).tqcontains("<frameset")) tabNum++; else - if((*it).contains("</frameset>")) { + if((*it).tqcontains("</frameset>")) { tabNum--; s.truncate(s.length()-1); } @@ -441,9 +441,9 @@ TQString VisualFrameEditor::framesetStructure() { } void VisualFrameEditor::setMarkupLanguage(const TQString& s){ - if( s.contains("xhtml",false)!=0 ) m_markupLanguage = XHTML; + if( s.tqcontains("xhtml",false)!=0 ) m_markupLanguage = XHTML; else - if( s.contains("html",false)!=0 ) m_markupLanguage = HTML; + if( s.tqcontains("html",false)!=0 ) m_markupLanguage = HTML; } #include "visualframeeditor.moc" diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h index 27cef614..c3b28b7b 100644 --- a/quanta/components/framewizard/visualframeeditor.h +++ b/quanta/components/framewizard/visualframeeditor.h @@ -29,6 +29,7 @@ class VisualFrameEditor : public TQHBox { Q_OBJECT + TQ_OBJECT private: enum MarkupLanguage{XHTML,HTML}; tree *m_internalTree; @@ -36,9 +37,9 @@ class VisualFrameEditor : public TQHBox { TQStringList m_existingStructure; MarkupLanguage m_markupLanguage; - void buildInternalTree(const TQString &parent); + void buildInternalTree(const TQString &tqparent); void setGeometries(const TQString &l); - void drawGUI(treeNode *n, TQWidget* parent); + void drawGUI(treeNode *n, TQWidget* tqparent); TQStringList convertAsterisks(const TQString &s, int d); TQString createFrameTag(areaAttribute *a); @@ -47,9 +48,9 @@ class VisualFrameEditor : public TQHBox { void createStructure(treeNode* n); public: - VisualFrameEditor( TQWidget * parent = 0, const char * name = 0); + VisualFrameEditor( TQWidget * tqparent = 0, const char * name = 0); ~VisualFrameEditor(); - void draw() { repaint(); } + void draw() { tqrepaint(); } void loadExistingStructure(const TQStringList &list); TQString framesetStructure(); void removeNode(const TQString &l); diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index bb581859..e9475242 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -48,8 +48,8 @@ int newNum; -TableEditor::TableEditor(TQWidget* parent, const char* name) - : TableEditorS(parent, name) +TableEditor::TableEditor(TQWidget* tqparent, const char* name) + : TableEditorS(tqparent, name) { m_popup = new KPopupMenu(); m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell())); @@ -152,7 +152,7 @@ void TableEditor::slotContextMenuRequested( int row, int col, const TQPoint & po TQTableSelection selection = m_dataTable->selection(m_dataTable->currentSelection()); TQRect rect(TQPoint(selection.topRow(), selection.leftCol()) , TQPoint(selection.bottomRow(), selection.rightCol())); - if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.contains(m_row, m_col)) { + if (rect.isValid() && (rect.width() > 1 || rect.height() > 1) && rect.tqcontains(m_row, m_col)) { m_popup->setItemVisible(m_mergeCellsId, true); m_popup->setItemVisible(m_mergeSeparatorId, true); } @@ -204,7 +204,7 @@ void TableEditor::slotEditRow() void TableEditor::slotEditCol() { - KMessageBox::information(this, i18n("Edit col: %1").arg(m_col + 1)); + KMessageBox::information(this, i18n("Edit col: %1").tqarg(m_col + 1)); TagDialog dlg(QuantaCommon::tagFromDTD(m_dtd,"col")); dlg.exec(); } @@ -411,7 +411,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(col); TableNode tableN = mergeMatrix[nRow - 1][col]; Node *n = tableN.node; - setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1)); + setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1)); m_dataTable->item(nRow-1, col)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -451,7 +451,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(col); TableNode tableN = mergeMatrix[nRow - 1][col]; Node *n = tableN.node; - setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").arg(tableN.mergedRow + 1).arg(tableN.mergedCol + 1)); + setCellText(m_dataTable, nRow - 1, col, i18n("Merged with (%1, %2).").tqarg(tableN.mergedRow + 1).tqarg(tableN.mergedCol + 1)); m_dataTable->item(nRow-1, col)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -496,7 +496,7 @@ bool TableEditor::setTableArea( int bLine, int bCol, int eLine, int eCol, Parser m_colSpin->setValue(nCol); for (int i = 0; i < colValue - 1; i++) { - setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").arg(nRow).arg(lastCol)); + setCellText(m_dataTable, nRow - 1, lastCol + i, i18n("Merged with (%1, %2).").tqarg(nRow).tqarg(lastCol)); m_dataTable->item(nRow-1, lastCol + i)->setEnabled(false); tableNode.node = new Node(0L); tableNode.node->tag = new Tag(*(n->tag)); @@ -713,11 +713,11 @@ TQString TableEditor::indent( int n ) TQString TableEditor::cellValue( int row, int col ) { if (!m_dataTable) - return TQString::null; + return TQString(); TQString str; Node *node = (*m_tableTags)[row][col].node; if (!node) - return TQString::null; + return TQString(); str = node->tag->toString(); str += m_dataTable->text(row, col); str += "</" + QuantaCommon::tagCase(node->tag->name) + ">"; @@ -758,7 +758,7 @@ TQString TableEditor::tableToString() TQString TableEditor::tagContent(Node *node) { if (!node) - return TQString::null; + return TQString(); TQString content; int bl, bc, el, ec; node->tag->endPos(bl, bc); @@ -775,7 +775,7 @@ TQString TableEditor::tagContent(Node *node) n->tag->beginPos(el, ec); ec--; } else { - return TQString::null; + return TQString(); } } content = m_write->text(bl, bc, el, ec); @@ -919,12 +919,12 @@ void TableEditor::slotRemoveRow() if ((*it3).merged) { TableNode *mainTableNode = &((*m_tableTags)[(*it3).mergedRow][(*it3).mergedCol]); - if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode)) + if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode)) { int rowspan = mainTableNode->node->tag->attributeValue("rowspan", true).toInt(); rowspan--; if (rowspan > 1) - mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(rowspan)); + mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(rowspan)); else mainTableNode->node->tag->deleteAttribute("rowspan"); updatedMainNodes.append(mainTableNode); @@ -970,12 +970,12 @@ void TableEditor::slotRemoveCol() if ((*it2).merged) { TableNode *mainTableNode = &((*m_tableTags)[(*it2).mergedRow][(*it2).mergedCol]); - if (mainTableNode->node && !updatedMainNodes.contains(mainTableNode)) + if (mainTableNode->node && !updatedMainNodes.tqcontains(mainTableNode)) { int colspan = mainTableNode->node->tag->attributeValue("colspan", true).toInt(); colspan--; if (colspan > 1) - mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(colspan)); + mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(colspan)); else mainTableNode->node->tag->deleteAttribute("colspan"); updatedMainNodes.append(mainTableNode); @@ -1054,13 +1054,13 @@ void TableEditor::slotMergeCells() rCol = selection.rightCol(); TableNode *mainTableNode = &((*m_tableTags)[tRow][lCol]); if (rCol - lCol > 0) - mainTableNode->node->tag->editAttribute("colspan", TQString("%1").arg(rCol - lCol + 1)); + mainTableNode->node->tag->editAttribute("colspan", TQString("%1").tqarg(rCol - lCol + 1)); if (bRow - tRow > 0) - mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").arg(bRow - tRow + 1)); + mainTableNode->node->tag->editAttribute("rowspan", TQString("%1").tqarg(bRow - tRow + 1)); for (int i = 0; i < bRow - tRow + 1; i++) for (int j = 0; j < rCol - lCol + 1; j++) { if (i != 0 || j != 0) { - setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").arg(tRow + 1).arg(lCol + 1)); + setCellText(m_dataTable, tRow + i, lCol + j, i18n("Merged with (%1, %2).").tqarg(tRow + 1).tqarg(lCol + 1)); m_dataTable->item(tRow + i, lCol + j)->setEnabled(false); TableNode *tableNode = &((*m_tableTags)[tRow + i][lCol + j]); Node::deleteNode(tableNode->node); @@ -1163,7 +1163,7 @@ void TableEditor::slotEditChildTable() table = *it; if (table.row == m_row && table.col == m_col) { TQString cellData = m_dataTable->text(table.row, table.col); - int pos = cellData.find(table.nestedData); + int pos = cellData.tqfind(table.nestedData); if (pos == -1) { KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table")); error = true; @@ -1182,9 +1182,9 @@ void TableEditor::slotEditChildTable() baseNode = localParser->parse(w); tempDocCreated = true; //try to find the child table position - int pos2 = tableData.find(cellData); + int pos2 = tableData.tqfind(cellData); if (pos2 != -1) - pos2 = tableData.find(table.nestedData, pos2); + pos2 = tableData.tqfind(table.nestedData, pos2); else { KMessageBox::error(this, i18n("Cannot edit the child table; you probably modified the cell containing the table manually."), i18n("Cannot Read Table")); error = true; @@ -1192,8 +1192,8 @@ void TableEditor::slotEditChildTable() break; } tableData = tableData.left(pos2); - table.bLine = tableData.contains('\n'); - pos2 = tableData.findRev('\n'); + table.bLine = tableData.tqcontains('\n'); + pos2 = tableData.tqfindRev('\n'); if (pos2 != -1) { table.bCol = tableData.length() - pos2; } else { @@ -1214,7 +1214,7 @@ void TableEditor::slotEditChildTable() if (editor.exec()) { int length = table.nestedData.length(); (*it).nestedData = editor.readModifiedTable(); - cellData.replace(pos, length, (*it).nestedData); + cellData.tqreplace(pos, length, (*it).nestedData); setCellText(m_dataTable, table.row, table.col, cellData); } //cleanup on success @@ -1271,27 +1271,27 @@ void TableEditor::configureCell(int row, int col, Node * node) return; // Header (TH) or standard cell? item->setHeader(node->tag->name.lower() == "th"); - // Horizontal alignment - Qt::AlignmentFlags flags; + //Qt::Horizontal tqalignment + TQt::AlignmentFlags flags; TQString align = node->tag->attributeValue("align", true); if (align == "right") - flags = Qt::AlignRight; + flags = TQt::AlignRight; else if (align == "center") - flags = Qt::AlignHCenter; + flags = TQt::AlignHCenter; else if (align == "justify") - flags = Qt::AlignJustify; + flags = TQt::AlignJustify; else if (align.isEmpty() && item->header()) - flags = Qt::AlignHCenter; // TH is centered by default + flags = TQt::AlignHCenter; // TH is centered by default else - flags = Qt::AlignLeft; - item->setAlignment(flags); - // Vertical alignment + flags = TQt::AlignLeft; + item->tqsetAlignment(flags); + //Qt::Vertical tqalignment TQString valign = node->tag->attributeValue("valign", true); if (valign == "top") - flags = Qt::AlignTop; + flags = TQt::AlignTop; else if (valign == "bottom") - flags = Qt::AlignBottom; - else flags = Qt::AlignVCenter; + flags = TQt::AlignBottom; + else flags = TQt::AlignVCenter; item->setVAlignment(flags); } diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h index 3b913811..f8e7cf40 100644 --- a/quanta/components/tableeditor/tableeditor.h +++ b/quanta/components/tableeditor/tableeditor.h @@ -47,9 +47,10 @@ class Parser; class TableEditor : public TableEditorS { Q_OBJECT + TQ_OBJECT public: - TableEditor( TQWidget* parent = 0, const char* name = 0 ); + TableEditor( TQWidget* tqparent = 0, const char* name = 0 ); ~TableEditor(); virtual bool setTableArea( int bLine, int bCol, int eLine, int eCol, Parser * docParser ); @@ -65,7 +66,7 @@ public: public slots: virtual void slotContextMenuRequested( int row, int col, const TQPoint & pos ); virtual void slotEditCell(); - // Wrapper for setText to use TableItem instead of QTableItem + // Wrapper for setText to use TableItem instead of TQTableItem virtual void slotEditCellText( int r, int ); virtual void slotEditRow(); virtual void slotEditCol(); diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui index 88def66d..04af473c 100644 --- a/quanta/components/tableeditor/tableeditors.ui +++ b/quanta/components/tableeditor/tableeditors.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TableEditorS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>TableEditorS</cstring> </property> @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -78,11 +78,11 @@ <bool>true</bool> </property> </widget> - <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQTabWidget" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -93,7 +93,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -104,7 +104,7 @@ <cstring>tableData</cstring> </property> </widget> - <widget class="QTable" row="4" column="0" rowspan="1" colspan="4"> + <widget class="TQTable" row="4" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>tableData</cstring> </property> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>276</width> <height>20</height> @@ -159,14 +159,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>276</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>rowSpinBox</cstring> </property> @@ -177,7 +177,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -188,7 +188,7 @@ <cstring>colSpinBox</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>captionText</cstring> </property> @@ -209,7 +209,7 @@ <string>&Table Properties</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -228,7 +228,7 @@ <cstring>captionText</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -239,7 +239,7 @@ <cstring>rowSpinBox</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>colSpinBox</cstring> </property> @@ -252,7 +252,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -263,7 +263,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>frame3</cstring> </property> @@ -280,7 +280,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTable" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQTable" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>headerTableData</cstring> </property> @@ -313,14 +313,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>340</width> <height>20</height> </size> </property> </spacer> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>headerRowSpinBox</cstring> </property> @@ -331,7 +331,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4_2</cstring> </property> @@ -342,7 +342,7 @@ <cstring>headerRowSpinBox</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>headerColSpinBox</cstring> </property> @@ -350,7 +350,7 @@ <number>999</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -361,7 +361,7 @@ <cstring>headerColSpinBox</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -374,7 +374,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>headerCheckBox</cstring> </property> @@ -392,7 +392,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -412,7 +412,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -423,7 +423,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>frame3_2</cstring> </property> @@ -440,7 +440,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTable" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQTable" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>footerTableData</cstring> </property> @@ -466,7 +466,7 @@ <enum>FollowStyle</enum> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>footerRowSpinBox</cstring> </property> @@ -477,7 +477,7 @@ <number>0</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4_2_2</cstring> </property> @@ -488,7 +488,7 @@ <cstring>footerRowSpinBox</cstring> </property> </widget> - <widget class="QSpinBox" row="1" column="1"> + <widget class="TQSpinBox" row="1" column="1"> <property name="name"> <cstring>footerColSpinBox</cstring> </property> @@ -496,7 +496,7 @@ <number>999</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel4_3</cstring> </property> @@ -507,7 +507,7 @@ <cstring>footerColSpinBox</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel6_2</cstring> </property> @@ -528,7 +528,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>340</width> <height>20</height> @@ -537,7 +537,7 @@ </spacer> </grid> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>footerCheckBox</cstring> </property> @@ -555,7 +555,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -638,5 +638,5 @@ <tabstop>footerColSpinBox</tabstop> <tabstop>footerTableData</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp index 60625d95..b877df76 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -21,23 +21,23 @@ TableItem::TableItem(TQTable* table, EditType et) : TQTableItem(table, et) { setReplaceable(false); - m_halign = Qt::AlignLeft; - m_valign = Qt::AlignVCenter; + m_halign = TQt::AlignLeft; + m_valign = TQt::AlignVCenter; } TableItem::TableItem(TQTable* table, EditType et, const TQString& text) : TQTableItem(table, et, text) { setReplaceable(false); - m_halign = Qt::AlignLeft; - m_valign = Qt::AlignVCenter; + m_halign = TQt::AlignLeft; + m_valign = TQt::AlignVCenter; } TableItem::TableItem (TQTable* table, EditType et, const TQString& text, const TQPixmap& p) : TQTableItem(table, et, text, p) { setReplaceable(false); - m_halign = Qt::AlignLeft; - m_valign = Qt::AlignVCenter; + m_halign = TQt::AlignLeft; + m_valign = TQt::AlignVCenter; } TQWidget* TableItem::createEditor() const @@ -84,9 +84,9 @@ void TableItem::paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bo p->drawText(4, 4, cr0.width()-8, cr0.height()-8, m_halign | m_valign | WordBreak, text()); } -TQSize TableItem::sizeHint() const +TQSize TableItem::tqsizeHint() const { - TQSize size = TQTableItem::sizeHint(); + TQSize size = TQTableItem::tqsizeHint(); size.setWidth(size.width()+8); size.setHeight(size.height()+8); return size; diff --git a/quanta/components/tableeditor/tableitem.h b/quanta/components/tableeditor/tableitem.h index 88c94e20..66d3b85b 100644 --- a/quanta/components/tableeditor/tableitem.h +++ b/quanta/components/tableeditor/tableitem.h @@ -20,31 +20,31 @@ #include <tqtable.h> #include <kdeversion.h> -class TableItem : public QTableItem +class TableItem : public TQTableItem { private: - Qt::AlignmentFlags m_halign; - Qt::AlignmentFlags m_valign; + TQt::AlignmentFlags m_halign; + TQt::AlignmentFlags m_valign; bool m_header; public: - // Standard constructors copied from QTableItem + // Standard constructors copied from TQTableItem TableItem(TQTable* table, EditType et); TableItem(TQTable* table, EditType et, const TQString& text); TableItem (TQTable* table, EditType et, const TQString& text, const TQPixmap& p); - // Use TQTextEdit instead of standard QLineEdit + // Use TQTextEdit instead of standard TQLineEdit virtual TQWidget* createEditor() const; - // Get text from QTextEdit + // Get text from TQTextEdit virtual void setContentFromEditor(TQWidget *w); - // Paint cell - handle alignment (horizontal and vertical) and bold for header + // Paint cell - handle tqalignment (horizontal and vertical) and bold for header virtual void paint(TQPainter* p, const TQColorGroup& cg, const TQRect& cr, bool selected); - // Return A bit larger sizeHint because TQTextEdit has some margin around - virtual TQSize sizeHint() const; + // Return A bit larger tqsizeHint because TQTextEdit has some margin around + virtual TQSize tqsizeHint() const; // Get and set vertical aligment - Qt::AlignmentFlags vAlignment() {return m_valign;} - void setVAlignment(Qt::AlignmentFlags flags) {m_valign = flags;} + TQt::AlignmentFlags vAlignment() {return m_valign;} + void setVAlignment(TQt::AlignmentFlags flags) {m_valign = flags;} // Get and set horizontal aligment - Qt::AlignmentFlags alignment() {return m_halign;} - void setAlignment(Qt::AlignmentFlags flags) {m_halign = flags;} + TQt::AlignmentFlags tqalignment() {return m_halign;} + void tqsetAlignment(TQt::AlignmentFlags flags) {m_halign = flags;} // Get and set header status (use true for TH, false for TD) bool header() {return m_header;} void setHeader(bool h) {m_header = h;} diff --git a/quanta/data/chars b/quanta/data/chars index e5d2a4f4..eef828a5 100644 --- a/quanta/data/chars +++ b/quanta/data/chars @@ -5,8 +5,8 @@ $ ($) Dollar sign % (%) Percent sign & (&) Ampersand ' (') Apostrophe -( (() Left parenthesis -) ()) Right parenthesis +( (() Left tqparenthesis +) ()) Right tqparenthesis * (*) Asterisk + (+) Plus sign , (,) Comma @@ -27,7 +27,7 @@ $ ($) Dollar sign _ (_) Underscore ` (`) Grave accent { ({) Left curly brace -| (|) Vertical bar +| (|)Qt::Vertical bar } (}) Right curly brace ~ (~) Tilde ( ) Nonbreaking space @@ -157,7 +157,7 @@ _ (_) Underscore †(†) Dagger ‡ (‡) Double Dagger • (•) Bullet -… (…) Horizontal Ellipsis +… (…)Qt::Horizontal Ellipsis ‰ (‰) Per Mille sign ‹ (‹) Single Left-Pointing Angle Quotation mark › (›) Single Right-Pointing Angle Quotation mark diff --git a/quanta/data/doc/faq.html b/quanta/data/doc/faq.html index e48a438d..2f5fb651 100644 --- a/quanta/data/doc/faq.html +++ b/quanta/data/doc/faq.html @@ -126,11 +126,11 @@ <div class="fltop"><a href="#top">Top</a></div> <div class="minihdr">2.3 Compiling Quanta Plus</div> <div class="indent"> - <p>An assumption is made that you have the knowledge and ability to find and install any missing libraries that you may encounter. Basically, you need the headers from KDE, Qt, and GCC. If you don't know what was just said, then try the steps below and, if it doesn't work for you, then find yourself a Linux geek that can help.</p> + <p>An assumption is made that you have the knowledge and ability to find and install any missing libraries that you may encounter. Basically, you need the headers from KDE, TQt, and GCC. If you don't know what was just said, then try the steps below and, if it doesn't work for you, then find yourself a Linux geek that can help.</p> <p>Type the following in a shell and see what you get:</p> <ul> <li>test `echo $KDEDIR` && echo "yes" || echo "noKDE"</li> - <li>test `echo $QTDIR` && echo "yes" || echo "noQT"</li> + <li>test `echo $TQTDIR` && echo "yes" || echo "noQT"</li> </ul> <p>If you don't get two yes answers, then you need to find the location of the one that failed and export it to your current shell environment.</p> <p>Then it is as simple as:</p> @@ -145,7 +145,7 @@ <div class="fltop"><a href="#top">Top</a></div> <div class="minihdr">2.4 I get error <i>X</i> when running ./configure</div> <div class="indent"> - <p>Please read 2.3 carefully again and make certain that you have exported the $KDEDIR and $QTDIR environment variables. This is the most likely cause. Aside from that, if you are missing something very important, then configure will tell you what it needs.</p> + <p>Please read 2.3 carefully again and make certain that you have exported the $KDEDIR and $TQTDIR environment variables. This is the most likely cause. Aside from that, if you are missing something very important, then configure will tell you what it needs.</p> </div> <a name="2.5" /> <div class="fltop"><a href="#top">Top</a></div> diff --git a/quanta/data/doc/templates.html b/quanta/data/doc/templates.html index 3043187e..0e6f3e82 100644 --- a/quanta/data/doc/templates.html +++ b/quanta/data/doc/templates.html @@ -145,7 +145,7 @@ cool things we took into consideration when using templates in projects. <p>Our goal with templates is to extend them to include multi file "concept" templates useful for things like placing an order or creating an about section, Ideally this will be a tool for making your work more productive and dynamic. An eventual goal is to have a structural template -design mode to deal with site layout and structure which you could use to design and interactively +design mode to deal with site tqlayout and structure which you could use to design and interactively update your sites. If you would like to be involved contact us. </p> <br> diff --git a/quanta/data/doc/tips.html b/quanta/data/doc/tips.html index 9efe6822..81b26204 100644 --- a/quanta/data/doc/tips.html +++ b/quanta/data/doc/tips.html @@ -105,7 +105,7 @@ <li>You always have control where you place your templates so you can choose to move them. However, Quanta Plus does not track this, so you will need to change links. This is a good task for KFileReplace, which is now a plug-in as a KPart!</li> </ul> <p class="minihdr">Templates conclusion</p> - <p>Our goal with templates is to extend them to include multi-file "concept" templates, useful for certain things, like placing an order or creating an about section. Ideally this will be a tool for making your work more productive and dynamic. An eventual goal is to have a structural template design mode to deal with site layout and structure which you could use to design and interactively update your sites. If you would like to be involved, then contact us. </p> + <p>Our goal with templates is to extend them to include multi-file "concept" templates, useful for certain things, like placing an order or creating an about section. Ideally this will be a tool for making your work more productive and dynamic. An eventual goal is to have a structural template design mode to deal with site tqlayout and structure which you could use to design and interactively update your sites. If you would like to be involved, then contact us. </p> <a name="toolbars" /> <h2>Quanta Plus Toolbars</h2> <p class="minihdr">Toolbar Description</p> diff --git a/quanta/data/dtep/cffunct/bitmaskset.tag b/quanta/data/dtep/cffunct/bitmaskset.tag index 42289ce6..0e57dec9 100644 --- a/quanta/data/dtep/cffunct/bitmaskset.tag +++ b/quanta/data/dtep/cffunct/bitmaskset.tag @@ -2,7 +2,7 @@ <TAGS> <tag name="BitMaskSet" type="function" returnType="number"> <attr name="number" type="int" status="required" /> - <attr name="mask" type="int" status="required" /> + <attr name="tqmask" type="int" status="required" /> <attr name="start" type="int" status="required" /> <attr name="length" type="int" status="required" /> </tag> diff --git a/quanta/data/dtep/cffunct/datetime.tag b/quanta/data/dtep/cffunct/datetime.tag index a2f29126..bd5b4e04 100644 --- a/quanta/data/dtep/cffunct/datetime.tag +++ b/quanta/data/dtep/cffunct/datetime.tag @@ -54,7 +54,7 @@ </tag> <tag name="DateFormat" type="function" returnType="date"> <attr name="date" type="object" status="required" /> - <attr name="mask" type="object" status="optional" /> + <attr name="tqmask" type="object" status="optional" /> </tag> <tag name="DatePart" type="function" returnType="int"> <attr name="datepart" type="string" status="required" /> diff --git a/quanta/data/dtep/cfml/cfldap.tag b/quanta/data/dtep/cfml/cfldap.tag index 9d77cd77..497d51aa 100644 --- a/quanta/data/dtep/cfml/cfldap.tag +++ b/quanta/data/dtep/cfml/cfldap.tag @@ -43,7 +43,7 @@ <items> <item>add</item> <item>delete</item> - <item>replace</item> + <item>tqreplace</item> </items> </attr> <attr name="rebind" type="list"> diff --git a/quanta/data/dtep/cfml/cftreeitem.tag b/quanta/data/dtep/cfml/cftreeitem.tag index 2e54a59a..710ddd6f 100644 --- a/quanta/data/dtep/cfml/cftreeitem.tag +++ b/quanta/data/dtep/cfml/cftreeitem.tag @@ -3,7 +3,7 @@ <tag name="cftreeitem" single="1"> <attr name="value" /> <attr name="display" /> - <attr name="parent" /> + <attr name="tqparent" /> <attr name="img" type="list"> <items> <item>cd</item> diff --git a/quanta/data/dtep/css/table-layout.tag b/quanta/data/dtep/css/table-layout.tag index 36306882..4e47f267 100644 --- a/quanta/data/dtep/css/table-layout.tag +++ b/quanta/data/dtep/css/table-layout.tag @@ -1,6 +1,6 @@ <!DOCTYPE tags> <tags> - <tag name="table-layout" type="property"> + <tag name="table-tqlayout" type="property"> <attr name="value" type="list"> <items> <item>auto</item> diff --git a/quanta/data/dtep/css/unicode-bidi.tag b/quanta/data/dtep/css/unicode-bidi.tag index cb3b4cf8..b0d9024d 100644 --- a/quanta/data/dtep/css/unicode-bidi.tag +++ b/quanta/data/dtep/css/unicode-bidi.tag @@ -1,6 +1,6 @@ <!DOCTYPE tags> <tags> - <tag name="unicode-bidi" type="property"> + <tag name="tqunicode-bidi" type="property"> <attr name="value" type="list"> <items> <item>normal</item> diff --git a/quanta/data/dtep/docbook-4.2/a.tag b/quanta/data/dtep/docbook-4.2/a.tag index 2e5e1355..367eaca6 100644 --- a/quanta/data/dtep/docbook-4.2/a.tag +++ b/quanta/data/dtep/docbook-4.2/a.tag @@ -253,8 +253,8 @@ </attr> </tag> <tag name="article" hasCore="1"> - <attr name="parentbook" type="input"> - <text>parentbook</text> + <attr name="tqparentbook" type="input"> + <text>tqparentbook</text> <textlocation row="0" col="0" /> <location row="0" col="1" /> </attr> diff --git a/quanta/data/dtep/docbook-4.2/l.tag b/quanta/data/dtep/docbook-4.2/l.tag index 08737456..b94155dc 100644 --- a/quanta/data/dtep/docbook-4.2/l.tag +++ b/quanta/data/dtep/docbook-4.2/l.tag @@ -41,7 +41,7 @@ </items> </attr> </tag> - <tag name="literallayout" hasCore="1"> + <tag name="literaltqlayout" hasCore="1"> <attr name="width" type="input"> <text>width</text> <textlocation row="0" col="0" /> diff --git a/quanta/data/dtep/docbook-4.2/s.tag b/quanta/data/dtep/docbook-4.2/s.tag index 1a616cc1..45e0e481 100644 --- a/quanta/data/dtep/docbook-4.2/s.tag +++ b/quanta/data/dtep/docbook-4.2/s.tag @@ -470,7 +470,7 @@ <item>ipaddress</item> <item>library</item> <item>macro</item> - <item>netmask</item> + <item>nettqmask</item> <item>newsgroup</item> <item>osname</item> <item>resource</item> diff --git a/quanta/data/dtep/dtd-description.txt b/quanta/data/dtep/dtd-description.txt index 3c55890d..b66ad8c6 100644 --- a/quanta/data/dtep/dtd-description.txt +++ b/quanta/data/dtep/dtd-description.txt @@ -172,7 +172,7 @@ TypeRx = regular expression to find the type of the element. The pattern is DefinitionRx =\$+([a-zA-Z]+)=new\\s[a-zA-Z]+; TypeRx = new\\s([a-zA-Z]+); This will match strings like "$fooObj=new foo;". Now this string is - searched and it will find "new foo;", where "foo" is the first + searched and it will tqfind "new foo;", where "foo" is the first captured text (the regular expression matching foo is between brackets). So the type of "$fooObj" is "foo". @@ -185,7 +185,7 @@ ClearRx = OBSOLETED by DefinitionRx. Don't use it. [Parsing rules] AreaBorders = comma separated list of the area borders encapsulating this pseudo DTD. In case of PHP it is: <? ?>, <* *>, <% %> -Tags = tagname(attribute[defaultvalue]). If the parent(real) DTD has a tag with tagname and +Tags = tagname(attribute[defaultvalue]). If the tqparent(real) DTD has a tag with tagname and the attribute value of this tag is equal with the DTD name, the tag area is parsed according to the rules of this DTD. If [defaultvalue] is present, it means that if the attribute is not present in the tag it's taken as present with value = defaultvalue. Example: diff --git a/quanta/data/dtep/html-frameset/font.tag b/quanta/data/dtep/html-frameset/font.tag index 2e38aa2c..1c8aa521 100644 --- a/quanta/data/dtep/html-frameset/font.tag +++ b/quanta/data/dtep/html-frameset/font.tag @@ -31,7 +31,7 @@ <item>-4</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -71,7 +71,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-frameset/frame.tag b/quanta/data/dtep/html-frameset/frame.tag index 0cf37a05..44b8fd0c 100644 --- a/quanta/data/dtep/html-frameset/frame.tag +++ b/quanta/data/dtep/html-frameset/frame.tag @@ -9,10 +9,10 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="frameset" /> <child name="head" /> -</children> +</tqchildren> </tag> diff --git a/quanta/data/dtep/html-frameset/frameset.tag b/quanta/data/dtep/html-frameset/frameset.tag index 0c830af5..c32bd8ae 100644 --- a/quanta/data/dtep/html-frameset/frameset.tag +++ b/quanta/data/dtep/html-frameset/frameset.tag @@ -26,10 +26,10 @@ <textlocation col="0" row="4" /> <location col="1" row="4" colspan="2"/> </attr> -<children> +<tqchildren> <child name="frame" /> <child name="frameset" /> <child name="noframes" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/a.tag b/quanta/data/dtep/html-strict/a.tag index a10e1c04..471badb7 100644 --- a/quanta/data/dtep/html-strict/a.tag +++ b/quanta/data/dtep/html-strict/a.tag @@ -109,9 +109,9 @@ <attr name="charset"> </attr> <attr name="accesskey"> </attr> <attr name="tabindex"> </attr> - <attr name="shape"> </attr> + <attr name="tqshape"> </attr> <attr name="coords"> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -143,11 +143,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -180,11 +180,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -217,11 +217,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="address" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -254,12 +254,12 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="area" hasScript="1" hasCore="1" hasI18n="1" single="1"> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <text>Shape</text> <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2"/> diff --git a/quanta/data/dtep/html-strict/b.tag b/quanta/data/dtep/html-strict/b.tag index 47424fe8..d2bb30da 100644 --- a/quanta/data/dtep/html-strict/b.tag +++ b/quanta/data/dtep/html-strict/b.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="b" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -35,7 +35,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="base" single="1"> @@ -71,7 +71,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -104,11 +104,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="big" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -141,7 +141,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="blockquote" hasScript="1" hasCore="1" hasI18n="1"> @@ -163,7 +163,7 @@ <item>RTL</item> </items> </attr> -<children> +<tqchildren> <child name="p" /> <child name="h1" /> <child name="h2" /> @@ -184,7 +184,7 @@ <child name="fieldset" /> <child name="address" /> <child name="script" /> - </children> + </tqchildren> </tag> @@ -246,7 +246,7 @@ <attr name="leftmargin"> </attr> <attr name="marginwidth"> </attr> <attr name="marginheight"> </attr> -<children> +<tqchildren> <child name="p" /> <child name="h1" /> <child name="h2" /> @@ -269,7 +269,7 @@ <child name="script" /> <child name="ins" /> <child name="del" /> - </children> + </tqchildren> </tag> <tag name="br" hasCore="1" single="1"> @@ -316,7 +316,7 @@ <textlocation col="0" row="3" /> <location col="1" row="3" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -360,6 +360,6 @@ <child name="hr" /> <child name="table" /> <child name="address" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/c.tag b/quanta/data/dtep/html-strict/c.tag index e22bc9d3..25afb2f1 100644 --- a/quanta/data/dtep/html-strict/c.tag +++ b/quanta/data/dtep/html-strict/c.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="caption" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -35,11 +35,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="cite" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -72,11 +72,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="code" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -109,7 +109,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="col" hasScript="1" hasCore="1" hasI18n="1" single="1"> @@ -164,14 +164,14 @@ <attr name="char" type="input"> <text>Character</text> <textlocation col="0" row="4" /> - <tooltip>alignment character for cells</tooltip> + <tooltip>tqalignment character for cells</tooltip> <location col="1" row="4" /> </attr> <attr name="charoff" type="input"> <text>Character offset</text> <textlocation col="0" row="5" /> - <tooltip>alignment character offset</tooltip> + <tooltip>tqalignment character offset</tooltip> <location col="1" row="5" /> </attr> @@ -232,19 +232,19 @@ <attr name="char" type="input"> <text>Character</text> <textlocation col="0" row="4" /> - <tooltip>alignment character for cells</tooltip> + <tooltip>tqalignment character for cells</tooltip> <location col="1" row="4" /> </attr> <attr name="charoff" type="input"> <text>Character offset</text> <textlocation col="0" row="5" /> - <tooltip>alignment character offset</tooltip> + <tooltip>tqalignment character offset</tooltip> <location col="1" row="5" /> </attr> -<children> +<tqchildren> <child name="col" usage="required" /> -</children> +</tqchildren> <stoppingtags> <stoppingtag name="colgroup" /> <stoppingtag name="tbody" /> diff --git a/quanta/data/dtep/html-strict/d.tag b/quanta/data/dtep/html-strict/d.tag index bef94ba9..d9ef7134 100644 --- a/quanta/data/dtep/html-strict/d.tag +++ b/quanta/data/dtep/html-strict/d.tag @@ -6,7 +6,7 @@ <stoppingtag name="dt" /> <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -58,7 +58,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="del" hasCore="1" hasI18n="1" hasScript="1"> @@ -72,7 +72,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -124,11 +124,11 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -161,7 +161,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="div" hasScript="1" hasCore="1" hasI18n="1" scope="paragraph"> @@ -178,7 +178,7 @@ <item>justify</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -230,7 +230,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> -</children> +</tqchildren> </tag> <tag name="dl" hasCore="1" hasI18n="1" hasScript="1"> @@ -239,10 +239,10 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="dt" /> <child name="dd" /> -</children> +</tqchildren> </tag> <tag name="dt" hasCore="1" hasI18n="1" hasScript="1" optional="1"> @@ -250,7 +250,7 @@ <stoppingtag name="dt" /> <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -283,6 +283,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/e.tag b/quanta/data/dtep/html-strict/e.tag index 275630e7..ab77988b 100644 --- a/quanta/data/dtep/html-strict/e.tag +++ b/quanta/data/dtep/html-strict/e.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="em" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -35,6 +35,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/f.tag b/quanta/data/dtep/html-strict/f.tag index 67ce4dc9..786f2108 100644 --- a/quanta/data/dtep/html-strict/f.tag +++ b/quanta/data/dtep/html-strict/f.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="fieldset" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <chid name="legend" /> <child name="tt" /> @@ -55,7 +55,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="form" hasScript="1" hasCore="1" hasI18n="1"> @@ -109,7 +109,7 @@ <attr name="onsubmit"> </attr> <attr name="onreset"> </attr> -<children> +<tqchildren> <child name="p" /> <child name="h1" /> <child name="h2" /> @@ -130,7 +130,7 @@ <child name="fieldset" /> <child name="address" /> <child name="script" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/h.tag b/quanta/data/dtep/html-strict/h.tag index 9d48f029..fd241416 100644 --- a/quanta/data/dtep/html-strict/h.tag +++ b/quanta/data/dtep/html-strict/h.tag @@ -15,7 +15,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -48,7 +48,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="h2" hasScript="1" hasCore="1" hasI18n="1"> @@ -65,7 +65,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -98,7 +98,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="h3" hasScript="1" hasCore="1" hasI18n="1"> @@ -115,7 +115,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -148,7 +148,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="h4" hasScript="1" hasCore="1" hasI18n="1"> @@ -165,7 +165,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -198,7 +198,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="h5" hasScript="1" hasCore="1" hasI18n="1"> @@ -215,7 +215,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -248,7 +248,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="h6" hasScript="1" hasCore="1" hasI18n="1"> @@ -265,7 +265,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -298,7 +298,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="head" hasI18n="1"> @@ -309,7 +309,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="title" usage="required" /> <child name="isindex" /> <child name="base" /> @@ -318,7 +318,7 @@ <child name="meta" /> <child name="link" /> <child name="object" /> -</children> +</tqchildren> </tag> <tag name="hr" hasScript="1" hasCore="1" single="1"> @@ -365,10 +365,10 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="body" /> <child name="head" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/i.tag b/quanta/data/dtep/html-strict/i.tag index cf4f838e..e38436b8 100644 --- a/quanta/data/dtep/html-strict/i.tag +++ b/quanta/data/dtep/html-strict/i.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -35,7 +35,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="img" single="1"> @@ -246,7 +246,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -298,6 +298,6 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/k.tag b/quanta/data/dtep/html-strict/k.tag index fa7f66d9..fa12141e 100644 --- a/quanta/data/dtep/html-strict/k.tag +++ b/quanta/data/dtep/html-strict/k.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -35,6 +35,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/l.tag b/quanta/data/dtep/html-strict/l.tag index 68718b4f..4117b3a0 100644 --- a/quanta/data/dtep/html-strict/l.tag +++ b/quanta/data/dtep/html-strict/l.tag @@ -23,7 +23,7 @@ <location col="1" row="3" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -55,7 +55,7 @@ <child name="select" /> <child name="textarea" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="legend" hasCore="1" hasI18n="1" hasScript="1"> @@ -76,7 +76,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -109,7 +109,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="li" hasCore="1" hasI18n="1" hasScript="1" optional="1"> @@ -140,7 +140,7 @@ <text>compact</text> <location col="0" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -192,7 +192,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="link" hasScript="1" hasCore="1" hasI18n="1" single="1"> diff --git a/quanta/data/dtep/html-strict/m.tag b/quanta/data/dtep/html-strict/m.tag index 3b20e3bd..92908dd3 100644 --- a/quanta/data/dtep/html-strict/m.tag +++ b/quanta/data/dtep/html-strict/m.tag @@ -27,7 +27,7 @@ <textlocation col="0" row="4" /> <location col="1" row="4" colspan="2" /> </attr> -<children> +<tqchildren> <child name="p" /> <child name="h1" /> <child name="h2" /> @@ -48,7 +48,7 @@ <child name="fieldset" /> <child name="address" /> <child name="area" /> -</children> +</tqchildren> </tag> <tag name="meta" hasI18n="1" single="1"> diff --git a/quanta/data/dtep/html-strict/n.tag b/quanta/data/dtep/html-strict/n.tag index 648cbe2b..5d749973 100644 --- a/quanta/data/dtep/html-strict/n.tag +++ b/quanta/data/dtep/html-strict/n.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="p" /> <child name="h1" /> <child name="h2" /> @@ -22,6 +22,6 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/o.tag b/quanta/data/dtep/html-strict/o.tag index 0caa1fee..5b92af52 100644 --- a/quanta/data/dtep/html-strict/o.tag +++ b/quanta/data/dtep/html-strict/o.tag @@ -97,7 +97,7 @@ <textlocation col="0" row="16" /> <location col="1" row="16" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -150,7 +150,7 @@ <child name="fieldset" /> <child name="address" /> <child name="param" /> - </children> + </tqchildren> </tag> <tag name="ol" hasScript="1" hasCore="1" hasI18n="1"> @@ -179,9 +179,9 @@ <location col="0" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> <tag name="option" hasScript="1" hasCore="1" hasI18n="1" optional="1"> @@ -235,8 +235,8 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/p.tag b/quanta/data/dtep/html-strict/p.tag index 71487b05..fc7e41e1 100644 --- a/quanta/data/dtep/html-strict/p.tag +++ b/quanta/data/dtep/html-strict/p.tag @@ -25,7 +25,7 @@ <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -58,7 +58,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="param" single="1"> @@ -101,7 +101,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -128,6 +128,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/q.tag b/quanta/data/dtep/html-strict/q.tag index 3225bf5d..b2e2fe60 100644 --- a/quanta/data/dtep/html-strict/q.tag +++ b/quanta/data/dtep/html-strict/q.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="q" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -35,6 +35,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/s.tag b/quanta/data/dtep/html-strict/s.tag index 30f59c9c..ae23cb35 100644 --- a/quanta/data/dtep/html-strict/s.tag +++ b/quanta/data/dtep/html-strict/s.tag @@ -33,13 +33,13 @@ <location col="0" row="4" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> <tag name="samp" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -72,7 +72,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="select" hasScript="1" hasCore="1" hasI18n="1"> @@ -123,14 +123,14 @@ <stoppingtag name="select" /> </stoppingtags> -<children> +<tqchildren> <child name="optgroup" /> <child name="option" /> -</children> +</tqchildren> </tag> <tag name="small" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -162,11 +162,11 @@ <child name="select" /> <child name="textarea" /> <child name="label" /> - <child name="button" /></children> + <child name="button" /></tqchildren> </tag> <tag name="span" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -199,11 +199,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="strong" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -236,7 +236,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="style" hasI18n="1"> @@ -273,13 +273,13 @@ <location col="1" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> <tag name="sub" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -312,11 +312,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="sup" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -349,6 +349,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/t.tag b/quanta/data/dtep/html-strict/t.tag index 426dbaaf..691fdee5 100644 --- a/quanta/data/dtep/html-strict/t.tag +++ b/quanta/data/dtep/html-strict/t.tag @@ -70,7 +70,7 @@ <attr name="rules"> </attr> <attr name="background"> </attr> <attr name="height"> </attr> -<children> +<tqchildren> <child name="caption" /> <child name="col" /> <child name="colgroup" /> @@ -78,7 +78,7 @@ <child name="tfoot" /> <child name="tbody" /> <child name="tr" usage="required" /> -</children> +</tqchildren> </tag> <tag name="tbody" hasScript="1" hasCore="1" hasI18n="1"> @@ -118,9 +118,9 @@ <attr name="char"> </attr> <attr name="charoff"> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> <tag name="td" hasScript="1" hasCore="1" hasI18n="1" optional="1"> @@ -222,7 +222,7 @@ <stoppingtag name="tr" /> <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -274,7 +274,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="textarea" hasScript="1" hasCore="1" hasI18n="1"> @@ -320,9 +320,9 @@ <attr name="onselect"> </attr> <attr name="onchange"> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> <tag name="tfoot" hasScript="1" hasCore="1" hasI18n="1"> @@ -360,9 +360,9 @@ <attr name="char"> </attr> <attr name="charoff"> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> <tag name="th" hasScript="1" hasCore="1" hasI18n="1" optional="1"> @@ -464,7 +464,7 @@ <stoppingtag name="tr" /> <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -516,7 +516,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> @@ -555,15 +555,15 @@ <attr name="char"> </attr> <attr name="charoff"> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> <tag name="title" hasI18n="1" > -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> <tag name="tr" hasScript="1" hasCore="1" hasI18n="1" optional="1"> @@ -606,14 +606,14 @@ <stoppingtag name="tr" /> <stoppingtag name="tfoot" /> </stoppingtags> -<children> +<tqchildren> <child name="th" /> <child name="td" usage="required" /> -</children> +</tqchildren> </tag> <tag name="tt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -646,6 +646,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/u.tag b/quanta/data/dtep/html-strict/u.tag index 305f837c..df243de9 100644 --- a/quanta/data/dtep/html-strict/u.tag +++ b/quanta/data/dtep/html-strict/u.tag @@ -20,14 +20,14 @@ <tooltip>Depricated in HTML 4.0</tooltip> <location col="0" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> <tag name="u" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -67,6 +67,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html-strict/v.tag b/quanta/data/dtep/html-strict/v.tag index 06fa14bb..22026f9b 100644 --- a/quanta/data/dtep/html-strict/v.tag +++ b/quanta/data/dtep/html-strict/v.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="var" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -35,6 +35,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/a.tag b/quanta/data/dtep/html/a.tag index a4658cb1..914f1031 100644 --- a/quanta/data/dtep/html/a.tag +++ b/quanta/data/dtep/html/a.tag @@ -109,9 +109,9 @@ <attr name="charset"> </attr> <attr name="accesskey"> </attr> <attr name="tabindex"> </attr> - <attr name="shape"> </attr> + <attr name="tqshape"> </attr> <attr name="coords"> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -151,11 +151,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -195,11 +195,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -239,11 +239,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="address" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -284,12 +284,12 @@ <child name="label" /> <child name="button" /> <child name="p" /> -</children> +</tqchildren> </tag> <tag name="area" hasScript="1" hasCore="1" hasI18n="1" single="1"> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <text>Shape</text> <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2"/> diff --git a/quanta/data/dtep/html/b.tag b/quanta/data/dtep/html/b.tag index 35877ad6..cab51e10 100644 --- a/quanta/data/dtep/html/b.tag +++ b/quanta/data/dtep/html/b.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="b" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -42,7 +42,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="base" single="1"> @@ -76,7 +76,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -116,11 +116,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="big" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -160,7 +160,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="blockquote" hasScript="1" hasCore="1" hasI18n="1"> @@ -182,7 +182,7 @@ <item>RTL</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -246,7 +246,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> -</children> +</tqchildren> </tag> <tag name="body" hasScript="1" hasCore="1" hasI18n="1"> @@ -307,7 +307,7 @@ <attr name="leftmargin"> </attr> <attr name="marginwidth"> </attr> <attr name="marginheight"> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -373,7 +373,7 @@ <child name="address" /> <child name="ins" /> <child name="del" /> - </children> + </tqchildren> </tag> <tag name="br" hasCore="1" single="1"> @@ -418,7 +418,7 @@ <textlocation col="0" row="3" /> <location col="1" row="3" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -472,6 +472,6 @@ <child name="hr" /> <child name="table" /> <child name="address" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/c.tag b/quanta/data/dtep/html/c.tag index 2875b88e..bea8512b 100644 --- a/quanta/data/dtep/html/c.tag +++ b/quanta/data/dtep/html/c.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="caption" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -42,12 +42,12 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="center" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -111,11 +111,11 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> -</children> +</tqchildren> </tag> <tag name="cite" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -155,11 +155,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="code" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -199,7 +199,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="col" hasScript="1" hasCore="1" hasI18n="1" single="1"> @@ -254,14 +254,14 @@ <attr name="char" type="input"> <text>Character</text> <textlocation col="0" row="4" /> - <tooltip>alignment character for cells</tooltip> + <tooltip>tqalignment character for cells</tooltip> <location col="1" row="4" /> </attr> <attr name="charoff" type="input"> <text>Character offset</text> <textlocation col="0" row="5" /> - <tooltip>alignment character offset</tooltip> + <tooltip>tqalignment character offset</tooltip> <location col="1" row="5" /> </attr> @@ -322,14 +322,14 @@ <attr name="char" type="input"> <text>Character</text> <textlocation col="0" row="4" /> - <tooltip>alignment character for cells</tooltip> + <tooltip>tqalignment character for cells</tooltip> <location col="1" row="4" /> </attr> <attr name="charoff" type="input"> <text>Character offset</text> <textlocation col="0" row="5" /> - <tooltip>alignment character offset</tooltip> + <tooltip>tqalignment character offset</tooltip> <location col="1" row="5" /> </attr> <stoppingtags> @@ -341,9 +341,9 @@ </stoppingtags> -<children> +<tqchildren> <child name="col" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/d.tag b/quanta/data/dtep/html/d.tag index e482727f..6de4bdfa 100644 --- a/quanta/data/dtep/html/d.tag +++ b/quanta/data/dtep/html/d.tag @@ -6,7 +6,7 @@ <stoppingtag name="dt" /> <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -70,7 +70,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="del" hasCore="1" hasI18n="1" hasScript="1"> @@ -84,7 +84,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -148,11 +148,11 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -192,7 +192,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="div" hasScript="1" hasCore="1" hasI18n="1"> @@ -209,7 +209,7 @@ <item>justify</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -273,7 +273,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="dl" hasCore="1" hasI18n="1" hasScript="1"> @@ -282,17 +282,17 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="dt" /> <child name="dd" /> -</children> +</tqchildren> </tag> <tag name="dt" hasCore="1" hasI18n="1" hasScript="1" optional="1"> <stoppingtags> <stoppingtag name="dt" /> <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -332,6 +332,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/e.tag b/quanta/data/dtep/html/e.tag index a966799a..e8280e01 100644 --- a/quanta/data/dtep/html/e.tag +++ b/quanta/data/dtep/html/e.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="em" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -42,6 +42,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/f.tag b/quanta/data/dtep/html/f.tag index 8136efba..ce9ca712 100644 --- a/quanta/data/dtep/html/f.tag +++ b/quanta/data/dtep/html/f.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="fieldset" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -67,7 +67,7 @@ <child name="fieldset" /> <child name="address" /> <child name="legend" /> -</children> +</tqchildren> </tag> <tag name="form" hasScript="1" hasCore="1" hasI18n="1"> @@ -121,7 +121,7 @@ <attr name="onsubmit"> </attr> <attr name="onreset"> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -184,7 +184,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> -</children> +</tqchildren> </tag> @@ -235,7 +235,7 @@ <location col="0" row="9" colspan="3" /> </spacer> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -275,6 +275,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/h.tag b/quanta/data/dtep/html/h.tag index febe25ca..2d63792d 100644 --- a/quanta/data/dtep/html/h.tag +++ b/quanta/data/dtep/html/h.tag @@ -15,7 +15,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -55,7 +55,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> @@ -73,7 +73,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -113,7 +113,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="h3" hasScript="1" hasCore="1" hasI18n="1"> @@ -130,7 +130,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -170,7 +170,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> @@ -188,7 +188,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -228,7 +228,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> @@ -246,7 +246,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -286,7 +286,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> @@ -304,7 +304,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -344,7 +344,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> @@ -356,7 +356,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="title" usage="required" /> <child name="isindex" /> <child name="base" /> @@ -365,7 +365,7 @@ <child name="meta" /> <child name="link" /> <child name="object" /> -</children> +</tqchildren> </tag> @@ -414,10 +414,10 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="body" /> <child name="head" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/i.tag b/quanta/data/dtep/html/i.tag index 0dca3a63..45eed713 100644 --- a/quanta/data/dtep/html/i.tag +++ b/quanta/data/dtep/html/i.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -42,7 +42,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> @@ -133,7 +133,7 @@ <location col="1" row="12" /> </attr> -<children> +<tqchildren> <child name="a" /> <child name="abbr" /> <child name="acronym" /> @@ -198,7 +198,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -425,7 +425,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -489,6 +489,6 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/k.tag b/quanta/data/dtep/html/k.tag index e0babed5..431505e9 100644 --- a/quanta/data/dtep/html/k.tag +++ b/quanta/data/dtep/html/k.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -42,6 +42,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/l.tag b/quanta/data/dtep/html/l.tag index 6e02de9f..ab677502 100644 --- a/quanta/data/dtep/html/l.tag +++ b/quanta/data/dtep/html/l.tag @@ -23,7 +23,7 @@ <location col="1" row="3" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -62,7 +62,7 @@ <child name="select" /> <child name="textarea" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="legend" hasCore="1" hasI18n="1" hasScript="1"> @@ -83,7 +83,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -123,7 +123,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> - </children> + </tqchildren> </tag> <tag name="li" hasCore="1" hasI18n="1" hasScript="1" optional="1"> @@ -159,7 +159,7 @@ <stoppingtag name="ul" /> <stoppingtag name="ol" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -223,7 +223,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> - </children> + </tqchildren> </tag> <tag name="link" hasScript="1" hasCore="1" hasI18n="1" single="1"> diff --git a/quanta/data/dtep/html/m.tag b/quanta/data/dtep/html/m.tag index 413df4f8..130b81b5 100644 --- a/quanta/data/dtep/html/m.tag +++ b/quanta/data/dtep/html/m.tag @@ -27,7 +27,7 @@ <textlocation col="0" row="4" /> <location col="1" row="4" colspan="2" /> </attr> -<children> +<tqchildren> <child name="p" /> <child name="h1" /> <child name="h2" /> @@ -53,7 +53,7 @@ <child name="fieldset" /> <child name="address" /> <child name="area" /> -</children> +</tqchildren> </tag> <tag name="meta" hasI18n="1" single="1"> diff --git a/quanta/data/dtep/html/n.tag b/quanta/data/dtep/html/n.tag index f745cf46..b759bf5e 100644 --- a/quanta/data/dtep/html/n.tag +++ b/quanta/data/dtep/html/n.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -66,6 +66,6 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/o.tag b/quanta/data/dtep/html/o.tag index 85767c1a..43529b5d 100644 --- a/quanta/data/dtep/html/o.tag +++ b/quanta/data/dtep/html/o.tag @@ -97,7 +97,7 @@ <textlocation col="0" row="16" /> <location col="1" row="16" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -162,7 +162,7 @@ <child name="fieldset" /> <child name="address" /> <child name="param" /> -</children> +</tqchildren> </tag> <tag name="ol" hasScript="1" hasCore="1" hasI18n="1"> @@ -192,9 +192,9 @@ <location col="0" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> <tag name="option" hasScript="1" hasCore="1" hasI18n="1" optional="1"> @@ -246,8 +246,8 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/p.tag b/quanta/data/dtep/html/p.tag index 33017fa0..caf3ab10 100644 --- a/quanta/data/dtep/html/p.tag +++ b/quanta/data/dtep/html/p.tag @@ -25,7 +25,7 @@ <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -65,7 +65,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="param" single="1"> @@ -108,7 +108,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -139,6 +139,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/q.tag b/quanta/data/dtep/html/q.tag index 1d5f512c..c14c1e36 100644 --- a/quanta/data/dtep/html/q.tag +++ b/quanta/data/dtep/html/q.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="q" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -42,6 +42,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/s.tag b/quanta/data/dtep/html/s.tag index 6a3cb987..188d1939 100644 --- a/quanta/data/dtep/html/s.tag +++ b/quanta/data/dtep/html/s.tag @@ -51,7 +51,7 @@ </tag> <tag name="samp" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -91,7 +91,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="select" hasScript="1" hasCore="1" hasI18n="1"> @@ -142,14 +142,14 @@ <stoppingtag name="select" /> </stoppingtags> -<children> +<tqchildren> <child name="optgroup" /> <child name="option" /> -</children> +</tqchildren> </tag> <tag name="small" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -189,11 +189,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="span" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -233,11 +233,11 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="strong" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -277,7 +277,7 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="style" hasI18n="1"> @@ -314,13 +314,13 @@ <location col="1" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> <tag name="sub" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -360,10 +360,10 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> <tag name="sup" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -403,6 +403,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/strong.tag b/quanta/data/dtep/html/strong.tag index 2be3da65..0ec79185 100644 --- a/quanta/data/dtep/html/strong.tag +++ b/quanta/data/dtep/html/strong.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/t.tag b/quanta/data/dtep/html/t.tag index 3d1d959f..df104014 100644 --- a/quanta/data/dtep/html/t.tag +++ b/quanta/data/dtep/html/t.tag @@ -70,7 +70,7 @@ <attr name="rules"> </attr> <attr name="background"> </attr> <attr name="height"> </attr> -<children> +<tqchildren> <child name="caption" /> <child name="col" /> <child name="colgroup" /> @@ -78,7 +78,7 @@ <child name="tfoot" /> <child name="tbody" /> <child name="tr" usage="required" /> -</children> +</tqchildren> </tag> @@ -119,9 +119,9 @@ <attr name="char"> </attr> <attr name="charoff"> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> @@ -224,7 +224,7 @@ <stoppingtag name="tr" /> <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -288,7 +288,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> -</children> +</tqchildren> </tag> <tag name="textarea" hasScript="1" hasCore="1" hasI18n="1"> @@ -334,9 +334,9 @@ <attr name="onselect"> </attr> <attr name="onchange"> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> <tag name="tfoot" hasScript="1" hasCore="1" hasI18n="1"> @@ -374,9 +374,9 @@ <attr name="char"> </attr> <attr name="charoff"> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> <tag name="th" hasScript="1" hasCore="1" hasI18n="1" optional="1"> @@ -478,7 +478,7 @@ <stoppingtag name="tr" /> <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -542,7 +542,7 @@ <child name="table" /> <child name="fieldset" /> <child name="address" /> -</children> +</tqchildren> </tag> <tag name="thead" hasScript="1" hasCore="1" hasI18n="1"> @@ -580,16 +580,16 @@ <attr name="char"> </attr> <attr name="charoff"> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> <tag name="title" hasI18n="1" > -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> <tag name="tr" hasScript="1" hasCore="1" hasI18n="1" optional="1"> @@ -632,14 +632,14 @@ <stoppingtag name="tr" /> <stoppingtag name="tfoot" /> </stoppingtags> -<children> +<tqchildren> <child name="th" /> <child name="td" usage="required" /> -</children> +</tqchildren> </tag> <tag name="tt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -679,6 +679,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/u.tag b/quanta/data/dtep/html/u.tag index 34778191..5553014b 100644 --- a/quanta/data/dtep/html/u.tag +++ b/quanta/data/dtep/html/u.tag @@ -20,14 +20,14 @@ <tooltip>Depricated in HTML 4.0</tooltip> <location col="0" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> <tag name="u" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -67,6 +67,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/html/v.tag b/quanta/data/dtep/html/v.tag index 11ea92a7..90d6dad5 100644 --- a/quanta/data/dtep/html/v.tag +++ b/quanta/data/dtep/html/v.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="var" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="tt" /> <child name="i" /> @@ -42,6 +42,6 @@ <child name="textarea" /> <child name="label" /> <child name="button" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/kde-docbook-4.1.2/l.tag b/quanta/data/dtep/kde-docbook-4.1.2/l.tag index b9238e09..cae36163 100644 --- a/quanta/data/dtep/kde-docbook-4.1.2/l.tag +++ b/quanta/data/dtep/kde-docbook-4.1.2/l.tag @@ -40,7 +40,7 @@ </items> </attr> </tag> - <tag name="literallayout" hasCore="1"> + <tag name="literaltqlayout" hasCore="1"> <attr name="width" type="input"> <text>width</text> <textlocation row="0" col="0" /> diff --git a/quanta/data/dtep/php/dba.tag b/quanta/data/dtep/php/dba.tag index 04efd953..bdf1a0ab 100644 --- a/quanta/data/dtep/php/dba.tag +++ b/quanta/data/dtep/php/dba.tag @@ -49,7 +49,7 @@ <attr name="handler" type="string" status="required"></attr> <attr name="..." type="" status="optional"></attr> </tag> - <tag name="dba_replace" type="function" returnType="bool" version="PHP 3>= 3.0.8, PHP 4 , PHP 5"> + <tag name="dba_tqreplace" type="function" returnType="bool" version="PHP 3>= 3.0.8, PHP 4 , PHP 5"> <attr name="key" type="string" status="required"></attr> <attr name="value" type="string" status="required"></attr> <attr name="handle" type="resource" status="required"></attr> diff --git a/quanta/data/dtep/php/dbm.tag b/quanta/data/dtep/php/dbm.tag index 50c9011e..250b6f3c 100644 --- a/quanta/data/dtep/php/dbm.tag +++ b/quanta/data/dtep/php/dbm.tag @@ -33,7 +33,7 @@ <attr name="filename" type="string" status="required"></attr> <attr name="flags" type="string" status="required"></attr> </tag> - <tag name="dbmreplace" type="function" returnType="int" version="PHP 3, PHP 4 "> + <tag name="dbmtqreplace" type="function" returnType="int" version="PHP 3, PHP 4 "> <attr name="dbm_identifier" type="resource" status="required"></attr> <attr name="key" type="string" status="required"></attr> <attr name="value" type="string" status="required"></attr> diff --git a/quanta/data/dtep/php/dbplus.tag b/quanta/data/dtep/php/dbplus.tag index 03f3009f..695fb448 100644 --- a/quanta/data/dtep/php/dbplus.tag +++ b/quanta/data/dtep/php/dbplus.tag @@ -24,7 +24,7 @@ </tag> <tag name="dbplus_errno" type="function" returnType="int" version="4.1.0 - 4.2.3 only"> </tag> - <tag name="dbplus_find" type="function" returnType="int" version="4.1.0 - 4.2.3 only"> + <tag name="dbplus_tqfind" type="function" returnType="int" version="4.1.0 - 4.2.3 only"> <attr name="relation" type="resource" status="required"></attr> <attr name="constraints" type="array" status="required"></attr> <attr name="tuple" type="mixed" status="required"></attr> @@ -78,7 +78,7 @@ </tag> <tag name="dbplus_rchperm" type="function" returnType="int" version="4.1.0 - 4.2.3 only"> <attr name="relation" type="resource" status="required"></attr> - <attr name="mask" type="int" status="required"></attr> + <attr name="tqmask" type="int" status="required"></attr> <attr name="user" type="string" status="required"></attr> <attr name="group" type="string" status="required"></attr> </tag> diff --git a/quanta/data/dtep/php/domxml.tag b/quanta/data/dtep/php/domxml.tag index 03c2e310..b95dd866 100644 --- a/quanta/data/dtep/php/domxml.tag +++ b/quanta/data/dtep/php/domxml.tag @@ -139,7 +139,7 @@ </tag> <tag name="DomNode->owner_document" type="function" returnType="object" version=""> </tag> - <tag name="DomNode->parent_node" type="function" returnType="object" version=""> + <tag name="DomNode->tqparent_node" type="function" returnType="object" version=""> </tag> <tag name="DomNode->prefix" type="function" returnType="string" version=""> </tag> diff --git a/quanta/data/dtep/php/fam.tag b/quanta/data/dtep/php/fam.tag index e976c9e5..1b6789df 100644 --- a/quanta/data/dtep/php/fam.tag +++ b/quanta/data/dtep/php/fam.tag @@ -11,7 +11,7 @@ <attr name="fam" type="resource" status="required"></attr> <attr name="dirname" type="string" status="required"></attr> <attr name="depth" type="int" status="required"></attr> - <attr name="mask" type="string" status="required"></attr> + <attr name="tqmask" type="string" status="required"></attr> </tag> <tag name="fam_monitor_directory" type="function" returnType="resource" version="PHP 5"> <attr name="fam" type="resource" status="required"></attr> diff --git a/quanta/data/dtep/php/filesystem.tag b/quanta/data/dtep/php/filesystem.tag index 8b75719f..601a4855 100644 --- a/quanta/data/dtep/php/filesystem.tag +++ b/quanta/data/dtep/php/filesystem.tag @@ -263,7 +263,7 @@ <attr name="atime" type="int" status="optional"></attr> </tag> <tag name="umask" type="function" returnType="int" version="PHP 3, PHP 4 , PHP 5"> - <attr name="mask" type="int" status="optional"></attr> + <attr name="tqmask" type="int" status="optional"></attr> </tag> <tag name="unlink" type="function" returnType="bool" version="PHP 3, PHP 4 , PHP 5"> <attr name="filename" type="string" status="required"></attr> diff --git a/quanta/data/dtep/php/http.tag b/quanta/data/dtep/php/http.tag index ab12f29c..544571c0 100644 --- a/quanta/data/dtep/php/http.tag +++ b/quanta/data/dtep/php/http.tag @@ -2,7 +2,7 @@ <tags> <tag name="header" type="function" returnType="void" version="PHP 3, PHP 4 , PHP 5"> <attr name="string" type="string" status="required"></attr> - <attr name="replace" type="bool" status="optional"></attr> + <attr name="tqreplace" type="bool" status="optional"></attr> <attr name="http_response_code" type="int" status="optional"></attr> </tag> <tag name="headers_list" type="function" returnType="array" version="PHP 5"> diff --git a/quanta/data/dtep/php/hw.tag b/quanta/data/dtep/php/hw.tag index 806ed4f6..e2e4433b 100644 --- a/quanta/data/dtep/php/hw.tag +++ b/quanta/data/dtep/php/hw.tag @@ -8,11 +8,11 @@ <attr name="objid" type="int" status="required"></attr> <attr name="attributes" type="array" status="required"></attr> </tag> - <tag name="hw_children" type="function" returnType="array" version="PHP 3>= 3.0.3, PHP 4 "> + <tag name="hw_tqchildren" type="function" returnType="array" version="PHP 3>= 3.0.3, PHP 4 "> <attr name="connection" type="int" status="required"></attr> <attr name="objectID" type="int" status="required"></attr> </tag> - <tag name="hw_childrenobj" type="function" returnType="array" version="PHP 3>= 3.0.3, PHP 4 "> + <tag name="hw_tqchildrenobj" type="function" returnType="array" version="PHP 3>= 3.0.3, PHP 4 "> <attr name="connection" type="int" status="required"></attr> <attr name="objectID" type="int" status="required"></attr> </tag> @@ -135,11 +135,11 @@ <attr name="query" type="string" status="required"></attr> <attr name="max_hits" type="int" status="required"></attr> </tag> - <tag name="hw_getparents" type="function" returnType="array" version="PHP 3>= 3.0.3, PHP 4 "> + <tag name="hw_gettqparents" type="function" returnType="array" version="PHP 3>= 3.0.3, PHP 4 "> <attr name="connection" type="int" status="required"></attr> <attr name="objectID" type="int" status="required"></attr> </tag> - <tag name="hw_getparentsobj" type="function" returnType="array" version="PHP 3>= 3.0.3, PHP 4 "> + <tag name="hw_gettqparentsobj" type="function" returnType="array" version="PHP 3>= 3.0.3, PHP 4 "> <attr name="connection" type="int" status="required"></attr> <attr name="objectID" type="int" status="required"></attr> </tag> @@ -153,7 +153,7 @@ <attr name="connection" type="int" status="required"></attr> <attr name="objectID" type="int" status="required"></attr> </tag> - <tag name="hw_getremotechildren" type="function" returnType="int" version="PHP 3>= 3.0.3, PHP 4 "> + <tag name="hw_getremotetqchildren" type="function" returnType="int" version="PHP 3>= 3.0.3, PHP 4 "> <attr name="connection" type="int" status="required"></attr> <attr name="object_record" type="string" status="required"></attr> </tag> @@ -190,7 +190,7 @@ </tag> <tag name="hw_insdoc" type="function" returnType="int" version="PHP 3>= 3.0.3, PHP 4 "> <attr name="connection" type="resource" status="required"></attr> - <attr name="parentID" type="int" status="required"></attr> + <attr name="tqparentID" type="int" status="required"></attr> <attr name="object_record" type="string" status="required"></attr> <attr name="text" type="string" status="optional"></attr> </tag> @@ -202,7 +202,7 @@ </tag> <tag name="hw_insertdocument" type="function" returnType="int" version="PHP 3>= 3.0.3, PHP 4 "> <attr name="connection" type="int" status="required"></attr> - <attr name="parent_id" type="int" status="required"></attr> + <attr name="tqparent_id" type="int" status="required"></attr> <attr name="hw_document" type="int" status="required"></attr> </tag> <tag name="hw_insertobject" type="function" returnType="int" version="PHP 3>= 3.0.3, PHP 4 "> diff --git a/quanta/data/dtep/php/hwapi.tag b/quanta/data/dtep/php/hwapi.tag index 09744277..7b0580ab 100644 --- a/quanta/data/dtep/php/hwapi.tag +++ b/quanta/data/dtep/php/hwapi.tag @@ -19,7 +19,7 @@ <tag name="hw_api->checkout" type="function" returnType="object" version=""> <attr name="parameter" type="array" status="required"></attr> </tag> - <tag name="hw_api->children" type="function" returnType="array" version=""> + <tag name="hw_api->tqchildren" type="function" returnType="array" version=""> <attr name="parameter" type="array" status="required"></attr> </tag> <tag name="hw_api_content->mimetype" type="function" returnType="string" version=""> @@ -50,7 +50,7 @@ </tag> <tag name="hw_api_error->reason" type="function" returnType="object" version=""> </tag> - <tag name="hw_api->find" type="function" returnType="array" version=""> + <tag name="hw_api->tqfind" type="function" returnType="array" version=""> <attr name="parameter" type="array" status="required"></attr> </tag> <tag name="hw_api->ftstat" type="function" returnType="object" version=""> @@ -124,7 +124,7 @@ <tag name="hw_api->objectbyanchor" type="function" returnType="object" version=""> <attr name="parameter" type="array" status="required"></attr> </tag> - <tag name="hw_api->parents" type="function" returnType="array" version=""> + <tag name="hw_api->tqparents" type="function" returnType="array" version=""> <attr name="parameter" type="array" status="required"></attr> </tag> <tag name="hw_api_reason->description" type="function" returnType="string" version=""> @@ -134,7 +134,7 @@ <tag name="hw_api->remove" type="function" returnType="object" version=""> <attr name="parameter" type="array" status="required"></attr> </tag> - <tag name="hw_api->replace" type="function" returnType="object" version=""> + <tag name="hw_api->tqreplace" type="function" returnType="object" version=""> <attr name="parameter" type="array" status="required"></attr> </tag> <tag name="hw_api->setcommitedversion" type="function" returnType="object" version=""> diff --git a/quanta/data/dtep/php/hyperwave.tag b/quanta/data/dtep/php/hyperwave.tag index af08d010..0e75108e 100644 --- a/quanta/data/dtep/php/hyperwave.tag +++ b/quanta/data/dtep/php/hyperwave.tag @@ -7,11 +7,11 @@ <attr name="objid" type="int" status="optional"></attr> <attr name="attributes" type="array" status="optional"></attr> </tag> - <tag name="hw_children" type="function" returnType="array"> + <tag name="hw_tqchildren" type="function" returnType="array"> <attr name="connection" type="int" status="optional"></attr> <attr name="objectID" type="int" status="optional"></attr> </tag> - <tag name="hw_childrenobj" type="function" returnType="array"> + <tag name="hw_tqchildrenobj" type="function" returnType="array"> <attr name="connection" type="int" status="optional"></attr> <attr name="objectID" type="int" status="optional"></attr> </tag> @@ -133,11 +133,11 @@ <attr name="query" type="string" status="optional"></attr> <attr name="max_hits" type="int" status="optional"></attr> </tag> - <tag name="hw_getparents" type="function" returnType="array"> + <tag name="hw_gettqparents" type="function" returnType="array"> <attr name="connection" type="int" status="optional"></attr> <attr name="objectID" type="int" status="optional"></attr> </tag> - <tag name="hw_getparentsobj" type="function" returnType="array"> + <tag name="hw_gettqparentsobj" type="function" returnType="array"> <attr name="connection" type="int" status="optional"></attr> <attr name="objectID" type="int" status="optional"></attr> </tag> @@ -151,7 +151,7 @@ <attr name="connection" type="int" status="optional"></attr> <attr name="objectID" type="int" status="optional"></attr> </tag> - <tag name="hw_getremotechildren" type="function" returnType="int"> + <tag name="hw_getremotetqchildren" type="function" returnType="int"> <attr name="connection" type="int" status="optional"></attr> <attr name="object record" type="string" status="optional"></attr> </tag> @@ -187,7 +187,7 @@ </tag> <tag name="hw_insdoc" type="function" returnType="int"> <attr name="connection" type="int" status="optional"></attr> - <attr name="parentID" type="int" status="optional"></attr> + <attr name="tqparentID" type="int" status="optional"></attr> <attr name="object_record" type="string" status="optional"></attr> <attr name="text" type="string" status="optional"></attr> </tag> @@ -199,7 +199,7 @@ </tag> <tag name="hw_insertdocument" type="function" returnType="int"> <attr name="connection" type="int" status="optional"></attr> - <attr name="parent_id" type="int" status="optional"></attr> + <attr name="tqparent_id" type="int" status="optional"></attr> <attr name="hw_document" type="int" status="optional"></attr> </tag> <tag name="hw_insertobject" type="function" returnType="int"> diff --git a/quanta/data/dtep/php/ircg.tag b/quanta/data/dtep/php/ircg.tag index a80b31c7..d948d409 100644 --- a/quanta/data/dtep/php/ircg.tag +++ b/quanta/data/dtep/php/ircg.tag @@ -129,7 +129,7 @@ </tag> <tag name="ircg_who" type="function" returnType="bool" version="PHP 4 >= 4.3.3, PHP 5"> <attr name="connection" type="resource" status="required"></attr> - <attr name="mask" type="string" status="required"></attr> + <attr name="tqmask" type="string" status="required"></attr> <attr name="ops_only" type="bool" status="optional"></attr> </tag> <tag name="ircg_whois" type="function" returnType="bool" version="PHP 4 >= 4.0.5, PHP 5"> diff --git a/quanta/data/dtep/php/ldap.tag b/quanta/data/dtep/php/ldap.tag index bb652bb8..df81cf3b 100644 --- a/quanta/data/dtep/php/ldap.tag +++ b/quanta/data/dtep/php/ldap.tag @@ -113,7 +113,7 @@ <attr name="dn" type="string" status="required"></attr> <attr name="entry" type="array" status="required"></attr> </tag> - <tag name="ldap_mod_replace" type="function" returnType="bool" version="PHP 3>= 3.0.8, PHP 4 , PHP 5"> + <tag name="ldap_mod_tqreplace" type="function" returnType="bool" version="PHP 3>= 3.0.8, PHP 4 , PHP 5"> <attr name="link_identifier" type="resource" status="required"></attr> <attr name="dn" type="string" status="required"></attr> <attr name="entry" type="array" status="required"></attr> @@ -163,7 +163,7 @@ <attr name="link_identifier" type="resource" status="required"></attr> <attr name="dn" type="string" status="required"></attr> <attr name="newrdn" type="string" status="required"></attr> - <attr name="newparent" type="string" status="required"></attr> + <attr name="newtqparent" type="string" status="required"></attr> <attr name="deleteoldrdn" type="bool" status="required"></attr> </tag> <tag name="ldap_sasl_bind" type="function" returnType="bool" version="PHP 5"> diff --git a/quanta/data/dtep/php/mbstring.tag b/quanta/data/dtep/php/mbstring.tag index 64939fc7..12090db5 100644 --- a/quanta/data/dtep/php/mbstring.tag +++ b/quanta/data/dtep/php/mbstring.tag @@ -53,7 +53,7 @@ <attr name="string" type="string" status="required"></attr> <attr name="option" type="string" status="optional"></attr> </tag> - <tag name="mb_ereg_replace" type="function" returnType="string" version="PHP 4 >= 4.2.0"> + <tag name="mb_ereg_tqreplace" type="function" returnType="string" version="PHP 4 >= 4.2.0"> <attr name="pattern" type="string" status="required"></attr> <attr name="replacement" type="string" status="required"></attr> <attr name="string" type="string" status="required"></attr> @@ -88,9 +88,9 @@ <attr name="string" type="string" status="required"></attr> <attr name="regs" type="array" status="optional"></attr> </tag> - <tag name="mb_eregi_replace" type="function" returnType="string" version="PHP 4 >= 4.2.0"> + <tag name="mb_eregi_tqreplace" type="function" returnType="string" version="PHP 4 >= 4.2.0"> <attr name="pattern" type="string" status="required"></attr> - <attr name="replace" type="string" status="required"></attr> + <attr name="tqreplace" type="string" status="required"></attr> <attr name="string" type="string" status="required"></attr> </tag> <tag name="mb_eregi" type="function" returnType="int" version="PHP 4 >= 4.2.0"> diff --git a/quanta/data/dtep/php/memcache.tag b/quanta/data/dtep/php/memcache.tag index 7e93f96d..2a38e77c 100644 --- a/quanta/data/dtep/php/memcache.tag +++ b/quanta/data/dtep/php/memcache.tag @@ -42,7 +42,7 @@ <attr name="port" type="int" status="optional"></attr> <attr name="timeout" type="int" status="optional"></attr> </tag> - <tag name="Memcache::replace" type="function" returnType="bool" version=""> + <tag name="Memcache::tqreplace" type="function" returnType="bool" version=""> <attr name="key" type="string" status="required"></attr> <attr name="var" type="mixed" status="required"></attr> <attr name="flag" type="int" status="optional"></attr> diff --git a/quanta/data/dtep/php/ming.tag b/quanta/data/dtep/php/ming.tag index c69ec01a..b4f42ec6 100644 --- a/quanta/data/dtep/php/ming.tag +++ b/quanta/data/dtep/php/ming.tag @@ -27,24 +27,24 @@ <attr name="action" type="resource" status="required"></attr> <attr name="flags" type="int" status="required"></attr> </tag> - <tag name="swfbutton->addshape" type="function" returnType="void" version=""> - <attr name="shape" type="resource" status="required"></attr> + <tag name="swfbutton->addtqshape" type="function" returnType="void" version=""> + <attr name="tqshape" type="resource" status="required"></attr> <attr name="flags" type="int" status="required"></attr> </tag> <tag name="swfbutton->setaction" type="function" returnType="void" version=""> <attr name="action" type="resource" status="required"></attr> </tag> <tag name="swfbutton->setdown" type="function" returnType="void" version=""> - <attr name="shape" type="resource" status="required"></attr> + <attr name="tqshape" type="resource" status="required"></attr> </tag> <tag name="swfbutton->sethit" type="function" returnType="void" version=""> - <attr name="shape" type="resource" status="required"></attr> + <attr name="tqshape" type="resource" status="required"></attr> </tag> <tag name="swfbutton->setover" type="function" returnType="void" version=""> - <attr name="shape" type="resource" status="required"></attr> + <attr name="tqshape" type="resource" status="required"></attr> </tag> <tag name="swfbutton->setup" type="function" returnType="void" version=""> - <attr name="shape" type="resource" status="required"></attr> + <attr name="tqshape" type="resource" status="required"></attr> </tag> <tag name="swfbutton" type="function" returnType="object" version="PHP 4 >= 4.0.5"> </tag> @@ -141,9 +141,9 @@ </tag> <tag name="swfgradient" type="function" returnType="object" version="PHP 4 >= 4.0.5"> </tag> - <tag name="swfmorph->getshape1" type="function" returnType="mixed" version=""> + <tag name="swfmorph->gettqshape1" type="function" returnType="mixed" version=""> </tag> - <tag name="swfmorph->getshape2" type="function" returnType="mixed" version=""> + <tag name="swfmorph->gettqshape2" type="function" returnType="mixed" version=""> </tag> <tag name="swfmorph" type="function" returnType="object" version="PHP 4 >= 4.0.5"> </tag> @@ -182,54 +182,54 @@ </tag> <tag name="swfmovie" type="function" returnType="object" version="PHP 4 >= 4.0.5"> </tag> - <tag name="swfshape->addfill" type="function" returnType="void" version=""> + <tag name="swftqshape->addfill" type="function" returnType="void" version=""> <attr name="red" type="int" status="required"></attr> <attr name="green" type="int" status="required"></attr> <attr name="blue" type="int" status="required"></attr> <attr name="a" type="int" status="optional"></attr> </tag> - <tag name="swfshape->drawcurve" type="function" returnType="void" version=""> + <tag name="swftqshape->drawcurve" type="function" returnType="void" version=""> <attr name="controldx" type="int" status="required"></attr> <attr name="controldy" type="int" status="required"></attr> <attr name="anchordx" type="int" status="required"></attr> <attr name="anchordy" type="int" status="required"></attr> </tag> - <tag name="swfshape->drawcurveto" type="function" returnType="void" version=""> + <tag name="swftqshape->drawcurveto" type="function" returnType="void" version=""> <attr name="controlx" type="int" status="required"></attr> <attr name="controly" type="int" status="required"></attr> <attr name="anchorx" type="int" status="required"></attr> <attr name="anchory" type="int" status="required"></attr> </tag> - <tag name="swfshape->drawline" type="function" returnType="void" version=""> + <tag name="swftqshape->drawline" type="function" returnType="void" version=""> <attr name="dx" type="int" status="required"></attr> <attr name="dy" type="int" status="required"></attr> </tag> - <tag name="swfshape->drawlineto" type="function" returnType="void" version=""> + <tag name="swftqshape->drawlineto" type="function" returnType="void" version=""> <attr name="x" type="int" status="required"></attr> <attr name="y" type="int" status="required"></attr> </tag> - <tag name="swfshape->movepen" type="function" returnType="void" version=""> + <tag name="swftqshape->movepen" type="function" returnType="void" version=""> <attr name="dx" type="int" status="required"></attr> <attr name="dy" type="int" status="required"></attr> </tag> - <tag name="swfshape->movepento" type="function" returnType="void" version=""> + <tag name="swftqshape->movepento" type="function" returnType="void" version=""> <attr name="x" type="int" status="required"></attr> <attr name="y" type="int" status="required"></attr> </tag> - <tag name="swfshape->setleftfill" type="function" returnType="void" version=""> + <tag name="swftqshape->setleftfill" type="function" returnType="void" version=""> <attr name="fill" type="swfgradient" status="required"></attr> </tag> - <tag name="swfshape->setline" type="function" returnType="void" version=""> + <tag name="swftqshape->setline" type="function" returnType="void" version=""> <attr name="width" type="int" status="required"></attr> <attr name="red" type="int" status="optional"></attr> <attr name="green" type="int" status="optional"></attr> <attr name="blue" type="int" status="optional"></attr> <attr name="a" type="int" status="optional"></attr> </tag> - <tag name="swfshape->setrightfill" type="function" returnType="void" version=""> + <tag name="swftqshape->setrightfill" type="function" returnType="void" version=""> <attr name="fill" type="swfgradient" status="required"></attr> </tag> - <tag name="swfshape" type="function" returnType="object" version="PHP 4 >= 4.0.5"> + <tag name="swftqshape" type="function" returnType="object" version="PHP 4 >= 4.0.5"> </tag> <tag name="swfsprite->add" type="function" returnType="void" version=""> <attr name="object" type="resource" status="required"></attr> diff --git a/quanta/data/dtep/php/mnogosearch.tag b/quanta/data/dtep/php/mnogosearch.tag index 3485cdec..d813ee2f 100644 --- a/quanta/data/dtep/php/mnogosearch.tag +++ b/quanta/data/dtep/php/mnogosearch.tag @@ -48,7 +48,7 @@ <tag name="udm_error" type="function" returnType="string" version="PHP 4 >= 4.0.5, PHP 5"> <attr name="agent" type="resource" status="required"></attr> </tag> - <tag name="udm_find" type="function" returnType="resource" version="PHP 4 >= 4.0.5, PHP 5"> + <tag name="udm_tqfind" type="function" returnType="resource" version="PHP 4 >= 4.0.5, PHP 5"> <attr name="agent" type="resource" status="required"></attr> <attr name="query" type="string" status="required"></attr> </tag> diff --git a/quanta/data/dtep/php/msession.tag b/quanta/data/dtep/php/msession.tag index 91495875..37114711 100644 --- a/quanta/data/dtep/php/msession.tag +++ b/quanta/data/dtep/php/msession.tag @@ -14,7 +14,7 @@ </tag> <tag name="msession_disconnect" type="function" returnType="void" version="PHP 4 >= 4.2.0, PHP 5"> </tag> - <tag name="msession_find" type="function" returnType="array" version="PHP 4 >= 4.2.0, PHP 5"> + <tag name="msession_tqfind" type="function" returnType="array" version="PHP 4 >= 4.2.0, PHP 5"> <attr name="name" type="string" status="required"></attr> <attr name="value" type="string" status="required"></attr> </tag> diff --git a/quanta/data/dtep/php/ncurses.tag b/quanta/data/dtep/php/ncurses.tag index 5daae115..76fc6cc7 100644 --- a/quanta/data/dtep/php/ncurses.tag +++ b/quanta/data/dtep/php/ncurses.tag @@ -204,9 +204,9 @@ <tag name="ncurses_mouseinterval" type="function" returnType="int" version="PHP 4 >= 4.1.0, PHP 5"> <attr name="milliseconds" type="int" status="required"></attr> </tag> - <tag name="ncurses_mousemask" type="function" returnType="int" version="PHP 4 >= 4.2.0, PHP 5"> - <attr name="newmask" type="int" status="required"></attr> - <attr name="&oldmask" type="int" status="required"></attr> + <tag name="ncurses_mousetqmask" type="function" returnType="int" version="PHP 4 >= 4.2.0, PHP 5"> + <attr name="newtqmask" type="int" status="required"></attr> + <attr name="&oldtqmask" type="int" status="required"></attr> </tag> <tag name="ncurses_move_panel" type="function" returnType="int" version="PHP 4 >= 4.3.0, PHP 5"> <attr name="panel" type="resource" status="required"></attr> diff --git a/quanta/data/dtep/php/pcre.tag b/quanta/data/dtep/php/pcre.tag index 15dcf520..d466a8e3 100644 --- a/quanta/data/dtep/php/pcre.tag +++ b/quanta/data/dtep/php/pcre.tag @@ -29,7 +29,7 @@ <attr name="subject" type="mixed" status="required"></attr> <attr name="limit" type="int" status="optional"></attr> </tag> - <tag name="preg_replace" type="function" returnType="mixed" version="PHP 3>= 3.0.9, PHP 4 , PHP 5"> + <tag name="preg_tqreplace" type="function" returnType="mixed" version="PHP 3>= 3.0.9, PHP 4 , PHP 5"> <attr name="pattern" type="mixed" status="required"></attr> <attr name="replacement" type="mixed" status="required"></attr> <attr name="subject" type="mixed" status="required"></attr> diff --git a/quanta/data/dtep/php/pdf.tag b/quanta/data/dtep/php/pdf.tag index a9b1b61a..d2533f1b 100644 --- a/quanta/data/dtep/php/pdf.tag +++ b/quanta/data/dtep/php/pdf.tag @@ -3,7 +3,7 @@ <tag name="pdf_add_bookmark" type="function" returnType="int" version="PHP 4 >= 4.0.1, PHP 5"> <attr name="pdfdoc" type="resource" status="required"></attr> <attr name="text" type="string" status="required"></attr> - <attr name="parent" type="int" status="required"></attr> + <attr name="tqparent" type="int" status="required"></attr> <attr name="open" type="int" status="required"></attr> </tag> <tag name="pdf_add_launchlink" type="function" returnType="bool" version="PHP 4 >= 4.0.5, PHP 5"> diff --git a/quanta/data/dtep/php/regex.tag b/quanta/data/dtep/php/regex.tag index 5b0752bf..325996ac 100644 --- a/quanta/data/dtep/php/regex.tag +++ b/quanta/data/dtep/php/regex.tag @@ -1,6 +1,6 @@ <!DOCTYPE tags> <tags> - <tag name="ereg_replace" type="function" returnType="string" version="PHP 3, PHP 4 , PHP 5"> + <tag name="ereg_tqreplace" type="function" returnType="string" version="PHP 3, PHP 4 , PHP 5"> <attr name="pattern" type="string" status="required"></attr> <attr name="replacement" type="string" status="required"></attr> <attr name="string" type="string" status="required"></attr> @@ -10,7 +10,7 @@ <attr name="string" type="string" status="required"></attr> <attr name="&regs" type="array" status="optional"></attr> </tag> - <tag name="eregi_replace" type="function" returnType="string" version="PHP 3, PHP 4 , PHP 5"> + <tag name="eregi_tqreplace" type="function" returnType="string" version="PHP 3, PHP 4 , PHP 5"> <attr name="pattern" type="string" status="required"></attr> <attr name="replacement" type="string" status="required"></attr> <attr name="string" type="string" status="required"></attr> diff --git a/quanta/data/dtep/php/simplexml.tag b/quanta/data/dtep/php/simplexml.tag index e2797756..aca2b4ac 100644 --- a/quanta/data/dtep/php/simplexml.tag +++ b/quanta/data/dtep/php/simplexml.tag @@ -5,7 +5,7 @@ <tag name="simplexml_element->attributes" type="function" returnType="object SimpleXMLElement" version=""> <attr name="data" type="string" status="required"></attr> </tag> - <tag name="simplexml_element->children" type="function" returnType="object SimpleXMLElement" version=""> + <tag name="simplexml_element->tqchildren" type="function" returnType="object SimpleXMLElement" version=""> </tag> <tag name="SimpleXMLElement->xpath" type="function" returnType="array" version=""> <attr name="path" type="string" status="required"></attr> diff --git a/quanta/data/dtep/php/strings.tag b/quanta/data/dtep/php/strings.tag index 474c10a4..461034e0 100644 --- a/quanta/data/dtep/php/strings.tag +++ b/quanta/data/dtep/php/strings.tag @@ -183,9 +183,9 @@ <attr name="format" type="string" status="required"></attr> <attr name="&..." type="mixed" status="optional"></attr> </tag> - <tag name="str_ireplace" type="function" returnType="mixed" version="PHP 5"> + <tag name="str_itqreplace" type="function" returnType="mixed" version="PHP 5"> <attr name="search" type="mixed" status="required"></attr> - <attr name="replace" type="mixed" status="required"></attr> + <attr name="tqreplace" type="mixed" status="required"></attr> <attr name="subject" type="mixed" status="required"></attr> <attr name="&count" type="int" status="optional"></attr> </tag> @@ -199,9 +199,9 @@ <attr name="input" type="string" status="required"></attr> <attr name="multiplier" type="int" status="required"></attr> </tag> - <tag name="str_replace" type="function" returnType="mixed" version="PHP 3>= 3.0.6, PHP 4 , PHP 5"> + <tag name="str_tqreplace" type="function" returnType="mixed" version="PHP 3>= 3.0.6, PHP 4 , PHP 5"> <attr name="search" type="mixed" status="required"></attr> - <attr name="replace" type="mixed" status="required"></attr> + <attr name="tqreplace" type="mixed" status="required"></attr> <attr name="subject" type="mixed" status="required"></attr> <attr name="&count" type="int" status="optional"></attr> </tag> @@ -339,7 +339,7 @@ <attr name="haystack" type="string" status="required"></attr> <attr name="needle" type="string" status="required"></attr> </tag> - <tag name="substr_replace" type="function" returnType="string" version="PHP 4 , PHP 5"> + <tag name="substr_tqreplace" type="function" returnType="string" version="PHP 4 , PHP 5"> <attr name="string" type="string" status="required"></attr> <attr name="replacement" type="string" status="required"></attr> <attr name="start" type="int" status="required"></attr> diff --git a/quanta/data/dtep/php/swf.tag b/quanta/data/dtep/php/swf.tag index 444f80c0..b453bd7c 100644 --- a/quanta/data/dtep/php/swf.tag +++ b/quanta/data/dtep/php/swf.tag @@ -29,7 +29,7 @@ </tag> <tag name="swf_addbuttonrecord" type="function" returnType="void" version="PHP 4 "> <attr name="states" type="int" status="required"></attr> - <attr name="shapeid" type="int" status="required"></attr> + <attr name="tqshapeid" type="int" status="required"></attr> <attr name="depth" type="int" status="required"></attr> </tag> <tag name="swf_addcolor" type="function" returnType="void" version="PHP 4 "> @@ -80,7 +80,7 @@ </tag> <tag name="swf_enddoaction" type="function" returnType="void" version="PHP 4 "> </tag> - <tag name="swf_endshape" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_endtqshape" type="function" returnType="void" version="PHP 4 "> </tag> <tag name="swf_endsymbol" type="function" returnType="void" version="PHP 4 "> </tag> @@ -191,20 +191,20 @@ <tag name="swf_setframe" type="function" returnType="void" version="PHP 4 "> <attr name="framenumber" type="int" status="required"></attr> </tag> - <tag name="swf_shapearc" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapearc" type="function" returnType="void" version="PHP 4 "> <attr name="x" type="float" status="required"></attr> <attr name="y" type="float" status="required"></attr> <attr name="r" type="float" status="required"></attr> <attr name="ang1" type="float" status="required"></attr> <attr name="ang2" type="float" status="required"></attr> </tag> - <tag name="swf_shapecurveto" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapecurveto" type="function" returnType="void" version="PHP 4 "> <attr name="x1" type="float" status="required"></attr> <attr name="y1" type="float" status="required"></attr> <attr name="x2" type="float" status="required"></attr> <attr name="y2" type="float" status="required"></attr> </tag> - <tag name="swf_shapecurveto3" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapecurveto3" type="function" returnType="void" version="PHP 4 "> <attr name="x1" type="float" status="required"></attr> <attr name="y1" type="float" status="required"></attr> <attr name="x2" type="float" status="required"></attr> @@ -212,32 +212,32 @@ <attr name="x3" type="float" status="required"></attr> <attr name="y3" type="float" status="required"></attr> </tag> - <tag name="swf_shapefillbitmapclip" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapefillbitmapclip" type="function" returnType="void" version="PHP 4 "> <attr name="bitmapid" type="int" status="required"></attr> </tag> - <tag name="swf_shapefillbitmaptile" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapefillbitmaptile" type="function" returnType="void" version="PHP 4 "> <attr name="bitmapid" type="int" status="required"></attr> </tag> - <tag name="swf_shapefilloff" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapefilloff" type="function" returnType="void" version="PHP 4 "> </tag> - <tag name="swf_shapefillsolid" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapefillsolid" type="function" returnType="void" version="PHP 4 "> <attr name="r" type="float" status="required"></attr> <attr name="g" type="float" status="required"></attr> <attr name="b" type="float" status="required"></attr> <attr name="a" type="float" status="required"></attr> </tag> - <tag name="swf_shapelinesolid" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapelinesolid" type="function" returnType="void" version="PHP 4 "> <attr name="r" type="float" status="required"></attr> <attr name="g" type="float" status="required"></attr> <attr name="b" type="float" status="required"></attr> <attr name="a" type="float" status="required"></attr> <attr name="width" type="float" status="required"></attr> </tag> - <tag name="swf_shapelineto" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapelineto" type="function" returnType="void" version="PHP 4 "> <attr name="x" type="float" status="required"></attr> <attr name="y" type="float" status="required"></attr> </tag> - <tag name="swf_shapemoveto" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_tqshapemoveto" type="function" returnType="void" version="PHP 4 "> <attr name="x" type="float" status="required"></attr> <attr name="y" type="float" status="required"></attr> </tag> @@ -249,7 +249,7 @@ </tag> <tag name="swf_startdoaction" type="function" returnType="void" version="PHP 4 "> </tag> - <tag name="swf_startshape" type="function" returnType="void" version="PHP 4 "> + <tag name="swf_starttqshape" type="function" returnType="void" version="PHP 4 "> <attr name="objid" type="int" status="required"></attr> </tag> <tag name="swf_startsymbol" type="function" returnType="void" version="PHP 4 "> diff --git a/quanta/data/dtep/php/tidy.tag b/quanta/data/dtep/php/tidy.tag index b87ccada..43a6385b 100644 --- a/quanta/data/dtep/php/tidy.tag +++ b/quanta/data/dtep/php/tidy.tag @@ -70,7 +70,7 @@ </tag> <tag name="tidy_node->attributes" type="function" returnType="array" version=""> </tag> - <tag name="tidy_node->children" type="function" returnType="array" version=""> + <tag name="tidy_node->tqchildren" type="function" returnType="array" version=""> </tag> <tag name="tidy_node->get_attr" type="function" returnType="tidy_attr" version=""> <attr name="attrib_id" type="int" status="required"></attr> diff --git a/quanta/data/dtep/php/xslt.tag b/quanta/data/dtep/php/xslt.tag index 15d90be5..619c26ce 100644 --- a/quanta/data/dtep/php/xslt.tag +++ b/quanta/data/dtep/php/xslt.tag @@ -66,6 +66,6 @@ </tag> <tag name="xslt_setopt" type="function" returnType="int" version="PHP 4 >= 4.3.0"> <attr name="processor" type="resource" status="required"></attr> - <attr name="newmask" type="int" status="required"></attr> + <attr name="newtqmask" type="int" status="required"></attr> </tag> </tags>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/anyName.tag b/quanta/data/dtep/relaxng/anyName.tag index fc6e4c31..3598ddad 100644 --- a/quanta/data/dtep/relaxng/anyName.tag +++ b/quanta/data/dtep/relaxng/anyName.tag @@ -4,8 +4,8 @@ <tag name="anyName"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="except" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/relaxng/attribute.tag b/quanta/data/dtep/relaxng/attribute.tag index da288603..33107bf8 100644 --- a/quanta/data/dtep/relaxng/attribute.tag +++ b/quanta/data/dtep/relaxng/attribute.tag @@ -5,7 +5,7 @@ <attr name="datatypeLibrary" type="input" /> <attr name="name" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="anyName" /> <child name="choice" /> <child name="name" /> @@ -19,7 +19,7 @@ <child name="oneOrMore" /> <child name="list" /> <child name="mixed" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -27,6 +27,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/relaxng/choice.tag b/quanta/data/dtep/relaxng/choice.tag index a5b07483..9057d664 100644 --- a/quanta/data/dtep/relaxng/choice.tag +++ b/quanta/data/dtep/relaxng/choice.tag @@ -4,7 +4,7 @@ <tag name="choice"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="name" /> <child name="anyName" /> <child name="nsName" /> @@ -20,7 +20,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -28,6 +28,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/relaxng/data.tag b/quanta/data/dtep/relaxng/data.tag index d7c01c05..45ed28e7 100644 --- a/quanta/data/dtep/relaxng/data.tag +++ b/quanta/data/dtep/relaxng/data.tag @@ -5,9 +5,9 @@ <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> <attr name="type" type="input" /> - <children> + <tqchildren> <child name="except" /> <child name="param" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/define.tag b/quanta/data/dtep/relaxng/define.tag index 3d43ef67..5bc39dac 100644 --- a/quanta/data/dtep/relaxng/define.tag +++ b/quanta/data/dtep/relaxng/define.tag @@ -6,7 +6,7 @@ <attr name="datatypeLibrary" type="input" /> <attr name="name" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="attribute" /> <child name="group" /> @@ -18,7 +18,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -26,6 +26,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/div.tag b/quanta/data/dtep/relaxng/div.tag index 1be93bb0..f633852a 100644 --- a/quanta/data/dtep/relaxng/div.tag +++ b/quanta/data/dtep/relaxng/div.tag @@ -4,9 +4,9 @@ <tag name="div"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="div" /> <child name="include" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/element.tag b/quanta/data/dtep/relaxng/element.tag index 7d508021..0a92fc6a 100644 --- a/quanta/data/dtep/relaxng/element.tag +++ b/quanta/data/dtep/relaxng/element.tag @@ -5,7 +5,7 @@ <attr name="datatypeLibrary" type="input" /> <attr name="name" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="anyName" /> <child name="choice" /> <child name="name" /> @@ -21,7 +21,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -29,6 +29,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/relaxng/except.tag b/quanta/data/dtep/relaxng/except.tag index bd85cab5..f6235b38 100644 --- a/quanta/data/dtep/relaxng/except.tag +++ b/quanta/data/dtep/relaxng/except.tag @@ -4,7 +4,7 @@ <tag name="except"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="anyName" /> <child name="choice" /> <child name="name" /> @@ -20,7 +20,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -28,6 +28,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/grammar.tag b/quanta/data/dtep/relaxng/grammar.tag index 0f3f4a99..a9017426 100644 --- a/quanta/data/dtep/relaxng/grammar.tag +++ b/quanta/data/dtep/relaxng/grammar.tag @@ -5,11 +5,11 @@ <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> <attr name="xmlns" type="input" /> - <children> + <tqchildren> <child name="define" /> <child name="div" /> <child name="include" /> <child name="start" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/group.tag b/quanta/data/dtep/relaxng/group.tag index 42f9858b..3f971508 100644 --- a/quanta/data/dtep/relaxng/group.tag +++ b/quanta/data/dtep/relaxng/group.tag @@ -4,7 +4,7 @@ <tag name="group"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="attribute" /> <child name="group" /> @@ -16,7 +16,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -24,6 +24,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/include.tag b/quanta/data/dtep/relaxng/include.tag index ff3310f9..0c1d0885 100644 --- a/quanta/data/dtep/relaxng/include.tag +++ b/quanta/data/dtep/relaxng/include.tag @@ -5,10 +5,10 @@ <attr name="datatypeLibrary" type="input" /> <attr name="href" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="define" /> <child name="div" /> <child name="start" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/interleave.tag b/quanta/data/dtep/relaxng/interleave.tag index d30632ab..e0a1603c 100644 --- a/quanta/data/dtep/relaxng/interleave.tag +++ b/quanta/data/dtep/relaxng/interleave.tag @@ -4,7 +4,7 @@ <tag name="interleave"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="attribute" /> <child name="group" /> @@ -16,7 +16,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -24,6 +24,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/list.tag b/quanta/data/dtep/relaxng/list.tag index f5660fb8..49ee5e57 100644 --- a/quanta/data/dtep/relaxng/list.tag +++ b/quanta/data/dtep/relaxng/list.tag @@ -4,7 +4,7 @@ <tag name="list"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="group" /> <child name="choice" /> @@ -12,13 +12,13 @@ <child name="zeroOrMore" /> <child name="oneOrMore" /> <child name="mixed" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="value" /> <child name="data" /> <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/mixed.tag b/quanta/data/dtep/relaxng/mixed.tag index f14335cf..8625b1dd 100644 --- a/quanta/data/dtep/relaxng/mixed.tag +++ b/quanta/data/dtep/relaxng/mixed.tag @@ -4,7 +4,7 @@ <tag name="mixed"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="attribute" /> <child name="group" /> @@ -16,7 +16,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -24,6 +24,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/nsName.tag b/quanta/data/dtep/relaxng/nsName.tag index 39a73cd9..f6bd95bb 100644 --- a/quanta/data/dtep/relaxng/nsName.tag +++ b/quanta/data/dtep/relaxng/nsName.tag @@ -4,8 +4,8 @@ <tag name="nsName"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="except" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/oneOrMore.tag b/quanta/data/dtep/relaxng/oneOrMore.tag index 4658479f..763aff34 100644 --- a/quanta/data/dtep/relaxng/oneOrMore.tag +++ b/quanta/data/dtep/relaxng/oneOrMore.tag @@ -4,7 +4,7 @@ <tag name="oneOrMore"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="attribute" /> <child name="group" /> @@ -16,7 +16,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -24,6 +24,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/optional.tag b/quanta/data/dtep/relaxng/optional.tag index 5d56d5f9..8b51f18b 100644 --- a/quanta/data/dtep/relaxng/optional.tag +++ b/quanta/data/dtep/relaxng/optional.tag @@ -4,7 +4,7 @@ <tag name="optional"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="attribute" /> <child name="group" /> @@ -16,7 +16,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -24,6 +24,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/parentRef.tag b/quanta/data/dtep/relaxng/parentRef.tag index 39ace697..0fcb9817 100644 --- a/quanta/data/dtep/relaxng/parentRef.tag +++ b/quanta/data/dtep/relaxng/parentRef.tag @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE TAGS> <TAGS> - <tag name="parentRef" single="1"> + <tag name="tqparentRef" single="1"> <attr name="datatypeLibrary" type="input" /> <attr name="name" type="input" /> <attr name="ns" type="input" /> diff --git a/quanta/data/dtep/relaxng/start.tag b/quanta/data/dtep/relaxng/start.tag index 2e1a4429..952beee8 100644 --- a/quanta/data/dtep/relaxng/start.tag +++ b/quanta/data/dtep/relaxng/start.tag @@ -5,17 +5,17 @@ <attr name="combine" type="input" /> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="choice" /> <child name="optional" /> <child name="zeroOrMore" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/relaxng/zeroOrMore.tag b/quanta/data/dtep/relaxng/zeroOrMore.tag index 7b8bea98..eb5f468e 100644 --- a/quanta/data/dtep/relaxng/zeroOrMore.tag +++ b/quanta/data/dtep/relaxng/zeroOrMore.tag @@ -4,7 +4,7 @@ <tag name="zeroOrMore"> <attr name="datatypeLibrary" type="input" /> <attr name="ns" type="input" /> - <children> + <tqchildren> <child name="element" /> <child name="attribute" /> <child name="group" /> @@ -16,7 +16,7 @@ <child name="list" /> <child name="mixed" /> <child name="ref" /> - <child name="parentRef" /> + <child name="tqparentRef" /> <child name="empty" /> <child name="text" /> <child name="value" /> @@ -24,6 +24,6 @@ <child name="notAllowed" /> <child name="externalRef" /> <child name="grammar" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/schema/all.tag b/quanta/data/dtep/schema/all.tag index 62e9bb6a..0c435782 100644 --- a/quanta/data/dtep/schema/all.tag +++ b/quanta/data/dtep/schema/all.tag @@ -38,9 +38,9 @@ <whatsthis>Maximum number of times the element can occur. The value must be 1.</whatsthis> <location col="1" row="2"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="element" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/annotation.tag b/quanta/data/dtep/schema/annotation.tag index 1846c969..610295a0 100644 --- a/quanta/data/dtep/schema/annotation.tag +++ b/quanta/data/dtep/schema/annotation.tag @@ -11,9 +11,9 @@ <whatsthis>A unique ID for the element.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="appinfo" /> <child name="documentation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/any.tag b/quanta/data/dtep/schema/any.tag index 182ebdf7..f2fcbf1b 100644 --- a/quanta/data/dtep/schema/any.tag +++ b/quanta/data/dtep/schema/any.tag @@ -56,8 +56,8 @@ <whatsthis>How should the XML processor handle validation, in regard to elements specified by this element?</whatsthis> <location col="1" row="4"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/anyAttribute.tag b/quanta/data/dtep/schema/anyAttribute.tag index 62e43733..07ebf80b 100644 --- a/quanta/data/dtep/schema/anyAttribute.tag +++ b/quanta/data/dtep/schema/anyAttribute.tag @@ -36,8 +36,8 @@ <whatsthis>How should the XML processor handle validation, in regard to attributes specified by this element?</whatsthis> <location col="1" row="2"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/attribute.tag b/quanta/data/dtep/schema/attribute.tag index b4e5c1bc..e6ac7ee4 100644 --- a/quanta/data/dtep/schema/attribute.tag +++ b/quanta/data/dtep/schema/attribute.tag @@ -102,9 +102,9 @@ <stoppingtag name="attribute" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> <child name="simpleType" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/attributeGroup.tag b/quanta/data/dtep/schema/attributeGroup.tag index 5e07e926..168ccf22 100644 --- a/quanta/data/dtep/schema/attributeGroup.tag +++ b/quanta/data/dtep/schema/attributeGroup.tag @@ -42,11 +42,11 @@ <stoppingtag name="element" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> <child name="attribute" /> <child name="attributeGroup" /> <child name="anyAttribute" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/choice.tag b/quanta/data/dtep/schema/choice.tag index d45f2356..72207791 100644 --- a/quanta/data/dtep/schema/choice.tag +++ b/quanta/data/dtep/schema/choice.tag @@ -31,13 +31,13 @@ <whatsthis>Maximum number of times the element can occur. Value can be >=0 or unbounded. Default is 1.</whatsthis> <location col="1" row="2"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="element" /> <child name="group" /> <child name="choice" /> <child name="sequence" /> <child name="any" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/complexContent.tag b/quanta/data/dtep/schema/complexContent.tag index 4096b604..3cc7b1dd 100644 --- a/quanta/data/dtep/schema/complexContent.tag +++ b/quanta/data/dtep/schema/complexContent.tag @@ -25,10 +25,10 @@ <whatsthis>true, if character data is allowed to appear between the child elements. Default is false.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="restriction" /> <child name="extension" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/complexType.tag b/quanta/data/dtep/schema/complexType.tag index 4ea80bfa..2efe28c4 100644 --- a/quanta/data/dtep/schema/complexType.tag +++ b/quanta/data/dtep/schema/complexType.tag @@ -75,7 +75,7 @@ <stoppingtag name="element" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="all" /> <child name="annotation" /> <child name="anyAttribute" /> @@ -86,6 +86,6 @@ <child name="group" /> <child name="sequence" /> <child name="simpleContent" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/element.tag b/quanta/data/dtep/schema/element.tag index 24adffa3..3048ee50 100644 --- a/quanta/data/dtep/schema/element.tag +++ b/quanta/data/dtep/schema/element.tag @@ -141,8 +141,8 @@ <location col="0" row="13"/> </label> <attr name="substitutionGroup" type="input"> - <tooltip>Name of an element that can be substituted with this one. Only usable if the parent element is schema.</tooltip> - <whatsthis>Name of an element that can be substituted with this one. Only usable if the parent element is schema.</whatsthis> + <tooltip>Name of an element that can be substituted with this one. Only usable if the tqparent element is schema.</tooltip> + <whatsthis>Name of an element that can be substituted with this one. Only usable if the tqparent element is schema.</whatsthis> <location col="1" row="13"/> </attr> @@ -156,13 +156,13 @@ <stoppingtag name="attribute" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> <child name="simpleType" /> <child name="complexType" /> <child name="unique" /> <child name="key" /> <child name="keyref" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/enumeration.tag b/quanta/data/dtep/schema/enumeration.tag index 3995f0ea..f8d27152 100644 --- a/quanta/data/dtep/schema/enumeration.tag +++ b/quanta/data/dtep/schema/enumeration.tag @@ -11,8 +11,8 @@ <whatsthis>Acceptable value.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/extension.tag b/quanta/data/dtep/schema/extension.tag index 12f5689f..05cea05e 100644 --- a/quanta/data/dtep/schema/extension.tag +++ b/quanta/data/dtep/schema/extension.tag @@ -21,7 +21,7 @@ <whatsthis>Name of a built-in data type, simpleType, or complexType.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="group" /> <child name="all" /> @@ -30,6 +30,6 @@ <child name="attribute" /> <child name="attributeGroup" /> <child name="anyAttribute" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/field.tag b/quanta/data/dtep/schema/field.tag index c5c1fa08..59a4d0d3 100644 --- a/quanta/data/dtep/schema/field.tag +++ b/quanta/data/dtep/schema/field.tag @@ -21,8 +21,8 @@ <whatsthis>Single element or attribute whose content or value is used for the constraint.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/fractionDigits.tag b/quanta/data/dtep/schema/fractionDigits.tag index 360679d1..227f9834 100644 --- a/quanta/data/dtep/schema/fractionDigits.tag +++ b/quanta/data/dtep/schema/fractionDigits.tag @@ -11,8 +11,8 @@ <whatsthis>Maximum number of decimal places allowed, which must be >=0.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/schema/group.tag b/quanta/data/dtep/schema/group.tag index 8a945c0a..3012de46 100644 --- a/quanta/data/dtep/schema/group.tag +++ b/quanta/data/dtep/schema/group.tag @@ -64,11 +64,11 @@ <stoppingtag name="attribute" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> <child name="all" /> <child name="choice" /> <child name="sequence" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/import.tag b/quanta/data/dtep/schema/import.tag index a7a7015e..dcf4d5a9 100644 --- a/quanta/data/dtep/schema/import.tag +++ b/quanta/data/dtep/schema/import.tag @@ -44,8 +44,8 @@ <stoppingtag name="attribute" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/include.tag b/quanta/data/dtep/schema/include.tag index 0a19816d..7e4b40dc 100644 --- a/quanta/data/dtep/schema/include.tag +++ b/quanta/data/dtep/schema/include.tag @@ -34,8 +34,8 @@ <stoppingtag name="attribute" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/key.tag b/quanta/data/dtep/schema/key.tag index 9798beb5..2995e7d0 100644 --- a/quanta/data/dtep/schema/key.tag +++ b/quanta/data/dtep/schema/key.tag @@ -21,10 +21,10 @@ <whatsthis>Name of the key element.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="selector" /> <child name="field" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/keyref.tag b/quanta/data/dtep/schema/keyref.tag index 87d2dcb5..a24941e8 100644 --- a/quanta/data/dtep/schema/keyref.tag +++ b/quanta/data/dtep/schema/keyref.tag @@ -31,10 +31,10 @@ <whatsthis>Name of a key or unique element defined in this or another schema.</whatsthis> <location col="1" row="2"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="selector" /> <child name="field" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/length.tag b/quanta/data/dtep/schema/length.tag index 5153975c..4bc20262 100644 --- a/quanta/data/dtep/schema/length.tag +++ b/quanta/data/dtep/schema/length.tag @@ -11,8 +11,8 @@ <whatsthis>Exact number of characters or list items allowed, which must be >=0.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/list.tag b/quanta/data/dtep/schema/list.tag index 454c3225..8037dafd 100644 --- a/quanta/data/dtep/schema/list.tag +++ b/quanta/data/dtep/schema/list.tag @@ -21,9 +21,9 @@ <whatsthis>Name of a built-in data type or simpleType. If the content contains a simpleType element, then itemType is not allowed, else itemType is required.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="simpleType" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/maxExclusive.tag b/quanta/data/dtep/schema/maxExclusive.tag index b30d15bf..8b41abed 100644 --- a/quanta/data/dtep/schema/maxExclusive.tag +++ b/quanta/data/dtep/schema/maxExclusive.tag @@ -11,8 +11,8 @@ <whatsthis>Upper bounds for numeric values. data less than value.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/maxInclusive.tag b/quanta/data/dtep/schema/maxInclusive.tag index 85e2a28c..75224876 100644 --- a/quanta/data/dtep/schema/maxInclusive.tag +++ b/quanta/data/dtep/schema/maxInclusive.tag @@ -11,8 +11,8 @@ <whatsthis>Upper bounds for numeric values. Data less than or equal to value.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/maxLength.tag b/quanta/data/dtep/schema/maxLength.tag index f0f285fa..905c618a 100644 --- a/quanta/data/dtep/schema/maxLength.tag +++ b/quanta/data/dtep/schema/maxLength.tag @@ -11,8 +11,8 @@ <whatsthis>Maximum number of characters or list items allowed, which must be >=0.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/minExclusive.tag b/quanta/data/dtep/schema/minExclusive.tag index 0cba57e1..e44bf4e7 100644 --- a/quanta/data/dtep/schema/minExclusive.tag +++ b/quanta/data/dtep/schema/minExclusive.tag @@ -11,8 +11,8 @@ <whatsthis>Lower bounds for numeric values. Data > value.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/minInclusive.tag b/quanta/data/dtep/schema/minInclusive.tag index b3eb6dd5..56f3716d 100644 --- a/quanta/data/dtep/schema/minInclusive.tag +++ b/quanta/data/dtep/schema/minInclusive.tag @@ -11,8 +11,8 @@ <whatsthis>Lower bounds for numeric values. Data >= value.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/minLength.tag b/quanta/data/dtep/schema/minLength.tag index 761f4302..6386027d 100644 --- a/quanta/data/dtep/schema/minLength.tag +++ b/quanta/data/dtep/schema/minLength.tag @@ -11,8 +11,8 @@ <whatsthis>Minimum number of characters or list items allowed, which must be >=0.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/notation.tag b/quanta/data/dtep/schema/notation.tag index 016c30d0..291ea924 100644 --- a/quanta/data/dtep/schema/notation.tag +++ b/quanta/data/dtep/schema/notation.tag @@ -54,8 +54,8 @@ <stoppingtag name="attribute" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/pattern.tag b/quanta/data/dtep/schema/pattern.tag index 4a81f785..19f3b171 100644 --- a/quanta/data/dtep/schema/pattern.tag +++ b/quanta/data/dtep/schema/pattern.tag @@ -11,8 +11,8 @@ <whatsthis>Exact sequence of characters that are acceptable.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/redefine.tag b/quanta/data/dtep/schema/redefine.tag index 8dcb0456..e421b3bb 100644 --- a/quanta/data/dtep/schema/redefine.tag +++ b/quanta/data/dtep/schema/redefine.tag @@ -30,12 +30,12 @@ <stoppingtag name="attribute" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> <child name="simpleType" /> <child name="complexType" /> <child name="group" /> <child name="attributeGroup" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/restriction.tag b/quanta/data/dtep/schema/restriction.tag index c4562b34..d39176e4 100644 --- a/quanta/data/dtep/schema/restriction.tag +++ b/quanta/data/dtep/schema/restriction.tag @@ -21,7 +21,7 @@ <whatsthis>Name of a built-in data type, simpleType, or complexType.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="simpleType" /> <child name="attribute" /> @@ -43,6 +43,6 @@ <child name="enumeration" /> <child name="whiteSpace" /> <child name="pattern" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/schema.tag b/quanta/data/dtep/schema/schema.tag index 28d38b3b..7d2cc41a 100644 --- a/quanta/data/dtep/schema/schema.tag +++ b/quanta/data/dtep/schema/schema.tag @@ -85,7 +85,7 @@ <attr name="finalDefault" type="input"> <location col="1" row="7"/> </attr> - <children> + <tqchildren> <child name="include" /> <child name="import" /> <child name="redefine" /> @@ -97,6 +97,6 @@ <child name="element" /> <child name="attribute" /> <child name="notation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/selector.tag b/quanta/data/dtep/schema/selector.tag index 33ab2ad3..ce5ec026 100644 --- a/quanta/data/dtep/schema/selector.tag +++ b/quanta/data/dtep/schema/selector.tag @@ -21,8 +21,8 @@ <whatsthis>An XPath expression, relative to the element being declared, that identifies the child elements to which the identity constraint applies.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/sequence.tag b/quanta/data/dtep/schema/sequence.tag index 08aa3e04..c3bcc82b 100644 --- a/quanta/data/dtep/schema/sequence.tag +++ b/quanta/data/dtep/schema/sequence.tag @@ -31,13 +31,13 @@ <whatsthis>Maximum number of times the element can occur. Value can be >=0 or unbounded. Default is 1.</whatsthis> <location col="1" row="2"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="element" /> <child name="group" /> <child name="choice" /> <child name="sequence" /> <child name="any" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/simpleContent.tag b/quanta/data/dtep/schema/simpleContent.tag index 7c55c717..9ae47f7e 100644 --- a/quanta/data/dtep/schema/simpleContent.tag +++ b/quanta/data/dtep/schema/simpleContent.tag @@ -11,10 +11,10 @@ <whatsthis>A unique ID for the element.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="restriction" /> <child name="extension" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/simpleType.tag b/quanta/data/dtep/schema/simpleType.tag index 7b3f7534..2476e6fc 100644 --- a/quanta/data/dtep/schema/simpleType.tag +++ b/quanta/data/dtep/schema/simpleType.tag @@ -34,11 +34,11 @@ <stoppingtag name="attribute" /> <stoppingtag name="notation" /> </stoppingtags> - <children> + <tqchildren> <child name="annotation" /> <child name="restriction" /> <child name="list" /> <child name="union" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/totalDigits.tag b/quanta/data/dtep/schema/totalDigits.tag index 73001d4e..b46744ee 100644 --- a/quanta/data/dtep/schema/totalDigits.tag +++ b/quanta/data/dtep/schema/totalDigits.tag @@ -11,8 +11,8 @@ <whatsthis>Exact number of digits allowed, which must be >=0.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/union.tag b/quanta/data/dtep/schema/union.tag index bb598cec..37b647e7 100644 --- a/quanta/data/dtep/schema/union.tag +++ b/quanta/data/dtep/schema/union.tag @@ -21,9 +21,9 @@ <whatsthis>List of built-in data types or simpleType elements defined in a schema.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="simpleType" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/unique.tag b/quanta/data/dtep/schema/unique.tag index e8083013..d6ebb689 100644 --- a/quanta/data/dtep/schema/unique.tag +++ b/quanta/data/dtep/schema/unique.tag @@ -21,10 +21,10 @@ <whatsthis>Name for the element. Usage is required.</whatsthis> <location col="1" row="1"/> </attr> - <children> + <tqchildren> <child name="annotation" /> <child name="selector" /> <child name="field" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/schema/whiteSpace.tag b/quanta/data/dtep/schema/whiteSpace.tag index 4210eb25..dfda451b 100644 --- a/quanta/data/dtep/schema/whiteSpace.tag +++ b/quanta/data/dtep/schema/whiteSpace.tag @@ -9,15 +9,15 @@ <attr name="value" type="list"> <items> <item>preserve</item> - <item>replace</item> + <item>tqreplace</item> <item>collapse</item> </items> <tooltip>How white space (line feeds, tabs, spaces, and carriage returns) is handled.</tooltip> <whatsthis>How white space (line feeds, tabs, spaces, and carriage returns) is handled.</whatsthis> <location col="1" row="0"/> </attr> - <children> + <tqchildren> <child name="annotation" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/tagxml/attr.tag b/quanta/data/dtep/tagxml/attr.tag index 1d56e92d..bf08eb6c 100644 --- a/quanta/data/dtep/tagxml/attr.tag +++ b/quanta/data/dtep/tagxml/attr.tag @@ -30,12 +30,12 @@ <location col="1" row="1" /> </attr> -<children> +<tqchildren> <child name="items" /> <child name="tooltip" /> <child name="location" /> <child name="label" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/tagxml/nonparams.tag b/quanta/data/dtep/tagxml/nonparams.tag index b1244f82..f3af056d 100644 --- a/quanta/data/dtep/tagxml/nonparams.tag +++ b/quanta/data/dtep/tagxml/nonparams.tag @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE TAGS> <TAGS> -<tag name="items"><children><child name="item" /></children></tag> +<tag name="items"><tqchildren><child name="item" /></tqchildren></tag> <tag name="item" /> -<tag name="label"><children><child name="text" /><child name="location" /><child name="textlocation" /></children></tag> +<tag name="label"><tqchildren><child name="text" /><child name="location" /><child name="textlocation" /></tqchildren></tag> <tag name="text" /> <tag name="tooltip" /> <tag name="whatsthis" /> -<tag name="children"><children><child name="child" /></children></tag> -<tag name="stoppingtags"><children><child name="stoppingtag" /></children></tag> +<tag name="tqchildren"><tqchildren><child name="child" /></tqchildren></tag> +<tag name="stoppingtags"><tqchildren><child name="stoppingtag" /></tqchildren></tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/tagxml/spacer.tag b/quanta/data/dtep/tagxml/spacer.tag index 71d776ae..463f991a 100644 --- a/quanta/data/dtep/tagxml/spacer.tag +++ b/quanta/data/dtep/tagxml/spacer.tag @@ -3,7 +3,7 @@ <tag name="spacer"> <label> - <text>Orientation</text> + <text>Qt::Orientation</text> <location col="0" row="0" /> </label> diff --git a/quanta/data/dtep/xhtml-basic/a.tag b/quanta/data/dtep/xhtml-basic/a.tag index 7d02f942..82b0b0a1 100644 --- a/quanta/data/dtep/xhtml-basic/a.tag +++ b/quanta/data/dtep/xhtml-basic/a.tag @@ -48,7 +48,7 @@ <attr name="accesskey" type="input" /> <attr name="tabindex" type="input" /> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="acronym" /> @@ -69,7 +69,7 @@ <child name="strong" /> <child name="textarea" /> <child name="var" /> -</children> +</tqchildren> </tag> diff --git a/quanta/data/dtep/xhtml-basic/blockquote.tag b/quanta/data/dtep/xhtml-basic/blockquote.tag index ad642e61..fc4701fd 100644 --- a/quanta/data/dtep/xhtml-basic/blockquote.tag +++ b/quanta/data/dtep/xhtml-basic/blockquote.tag @@ -10,7 +10,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="div" /> @@ -27,7 +27,7 @@ <child name="pre" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/body.tag b/quanta/data/dtep/xhtml-basic/body.tag index c9bcca72..c7bf368e 100644 --- a/quanta/data/dtep/xhtml-basic/body.tag +++ b/quanta/data/dtep/xhtml-basic/body.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="body" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="div" /> @@ -19,6 +19,6 @@ <child name="pre" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/div.tag b/quanta/data/dtep/xhtml-basic/div.tag index 9dfc2599..5073c953 100644 --- a/quanta/data/dtep/xhtml-basic/div.tag +++ b/quanta/data/dtep/xhtml-basic/div.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="div" hasCore="1" hasI18n="1" scope="paragraph"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -41,6 +41,6 @@ <child name="textarea" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/xhtml-basic/form.tag b/quanta/data/dtep/xhtml-basic/form.tag index d4e0b368..36fe22f5 100644 --- a/quanta/data/dtep/xhtml-basic/form.tag +++ b/quanta/data/dtep/xhtml-basic/form.tag @@ -29,7 +29,7 @@ </items> </attr> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="div" /> @@ -45,7 +45,7 @@ <child name="pre" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/head.tag b/quanta/data/dtep/xhtml-basic/head.tag index bdcc1ef7..16f8b252 100644 --- a/quanta/data/dtep/xhtml-basic/head.tag +++ b/quanta/data/dtep/xhtml-basic/head.tag @@ -9,12 +9,12 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="link" /> <child name="meta" /> <child name="object" /> <child name="title" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/headings.tag b/quanta/data/dtep/xhtml-basic/headings.tag index af41ba13..408e31e3 100644 --- a/quanta/data/dtep/xhtml-basic/headings.tag +++ b/quanta/data/dtep/xhtml-basic/headings.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="h1" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -25,11 +25,11 @@ <child name="strong" /> <child name="textarea" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h2" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -51,12 +51,12 @@ <child name="strong" /> <child name="textarea" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h3" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -78,10 +78,10 @@ <child name="strong" /> <child name="textarea" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h4" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -103,11 +103,11 @@ <child name="strong" /> <child name="textarea" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h5" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -129,11 +129,11 @@ <child name="strong" /> <child name="textarea" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h6" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -155,7 +155,7 @@ <child name="strong" /> <child name="textarea" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/html.tag b/quanta/data/dtep/xhtml-basic/html.tag index 4d9b566e..922b9086 100644 --- a/quanta/data/dtep/xhtml-basic/html.tag +++ b/quanta/data/dtep/xhtml-basic/html.tag @@ -15,10 +15,10 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="body" /> <child name="head" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/input.tag b/quanta/data/dtep/xhtml-basic/input.tag index 379ececb..e52a3fa5 100644 --- a/quanta/data/dtep/xhtml-basic/input.tag +++ b/quanta/data/dtep/xhtml-basic/input.tag @@ -67,7 +67,7 @@ <tooltip>Shortcut</tooltip> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -99,6 +99,6 @@ <child name="td" /> <child name="th" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/li.tag b/quanta/data/dtep/xhtml-basic/li.tag index 570d70c7..f1fbda6e 100644 --- a/quanta/data/dtep/xhtml-basic/li.tag +++ b/quanta/data/dtep/xhtml-basic/li.tag @@ -5,7 +5,7 @@ <stoppingtags> <stoppingtag name="li" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -43,6 +43,6 @@ <child name="textarea" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/ol.tag b/quanta/data/dtep/xhtml-basic/ol.tag index 4e9adab9..355b08cf 100644 --- a/quanta/data/dtep/xhtml-basic/ol.tag +++ b/quanta/data/dtep/xhtml-basic/ol.tag @@ -2,8 +2,8 @@ <!DOCTYPE TAGS> <TAGS> <tag name="ol" hasCore="1" hasI18n="1"> - <children> + <tqchildren> <child name="li" usage="required" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/p.tag b/quanta/data/dtep/xhtml-basic/p.tag index eadc4781..cba2d813 100644 --- a/quanta/data/dtep/xhtml-basic/p.tag +++ b/quanta/data/dtep/xhtml-basic/p.tag @@ -13,7 +13,7 @@ <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -35,7 +35,7 @@ <child name="strong" /> <child name="textarea" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/select.tag b/quanta/data/dtep/xhtml-basic/select.tag index 241684e6..532cedb5 100644 --- a/quanta/data/dtep/xhtml-basic/select.tag +++ b/quanta/data/dtep/xhtml-basic/select.tag @@ -20,8 +20,8 @@ <stoppingtag name="select" /> </stoppingtags> -<children> +<tqchildren> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/table.tag b/quanta/data/dtep/xhtml-basic/table.tag index ead404b5..9f20ac09 100644 --- a/quanta/data/dtep/xhtml-basic/table.tag +++ b/quanta/data/dtep/xhtml-basic/table.tag @@ -4,9 +4,9 @@ <tag name="table" hasCore="1" hasI18n="1"> <attr name="summary" type="input" /> -<children> +<tqchildren> <child name="caption" /> <child name="tr" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/td.tag b/quanta/data/dtep/xhtml-basic/td.tag index cde92e8f..d09b988e 100644 --- a/quanta/data/dtep/xhtml-basic/td.tag +++ b/quanta/data/dtep/xhtml-basic/td.tag @@ -61,7 +61,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -98,6 +98,6 @@ <child name="textarea" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/textarea.tag b/quanta/data/dtep/xhtml-basic/textarea.tag index 35161dd7..cb0f0874 100644 --- a/quanta/data/dtep/xhtml-basic/textarea.tag +++ b/quanta/data/dtep/xhtml-basic/textarea.tag @@ -23,7 +23,7 @@ <attr name="accesskey" type="input" /> </tag> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/th.tag b/quanta/data/dtep/xhtml-basic/th.tag index d6851796..7a58b71f 100644 --- a/quanta/data/dtep/xhtml-basic/th.tag +++ b/quanta/data/dtep/xhtml-basic/th.tag @@ -61,7 +61,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -98,6 +98,6 @@ <child name="textarea" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/tr.tag b/quanta/data/dtep/xhtml-basic/tr.tag index 5a544503..d7d689d4 100644 --- a/quanta/data/dtep/xhtml-basic/tr.tag +++ b/quanta/data/dtep/xhtml-basic/tr.tag @@ -33,9 +33,9 @@ <stoppingtag name="tfoot" /> </stoppingtags> -<children> +<tqchildren> <child name="td" /> <child name="th" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-basic/ul.tag b/quanta/data/dtep/xhtml-basic/ul.tag index a2ce9a38..46385c7a 100644 --- a/quanta/data/dtep/xhtml-basic/ul.tag +++ b/quanta/data/dtep/xhtml-basic/ul.tag @@ -3,9 +3,9 @@ <TAGS> <tag name="ul" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/a.tag b/quanta/data/dtep/xhtml-frameset/a.tag index 9140cd66..9fc9aeb4 100644 --- a/quanta/data/dtep/xhtml-frameset/a.tag +++ b/quanta/data/dtep/xhtml-frameset/a.tag @@ -61,7 +61,7 @@ <location col="1" row="6" /> </attr> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <text>Shape</text> <textlocation col="0" row="7" /> <location col="1" row="7" /> @@ -85,7 +85,7 @@ <location col="1" row="9" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="applet" /> @@ -126,7 +126,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/abbr.tag b/quanta/data/dtep/xhtml-frameset/abbr.tag index 93aa69d7..59a267d1 100644 --- a/quanta/data/dtep/xhtml-frameset/abbr.tag +++ b/quanta/data/dtep/xhtml-frameset/abbr.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/acronym.tag b/quanta/data/dtep/xhtml-frameset/acronym.tag index 93d73b08..35634a11 100644 --- a/quanta/data/dtep/xhtml-frameset/acronym.tag +++ b/quanta/data/dtep/xhtml-frameset/acronym.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/address.tag b/quanta/data/dtep/xhtml-frameset/address.tag index 7626fbf5..5cedd95f 100644 --- a/quanta/data/dtep/xhtml-frameset/address.tag +++ b/quanta/data/dtep/xhtml-frameset/address.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="address" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,6 +45,6 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/applet.tag b/quanta/data/dtep/xhtml-frameset/applet.tag index 1da9149e..8da60ec1 100644 --- a/quanta/data/dtep/xhtml-frameset/applet.tag +++ b/quanta/data/dtep/xhtml-frameset/applet.tag @@ -73,7 +73,7 @@ <location col="1" row="9" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -140,7 +140,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/area.tag b/quanta/data/dtep/xhtml-frameset/area.tag index 7bbf41b0..24dee60f 100644 --- a/quanta/data/dtep/xhtml-frameset/area.tag +++ b/quanta/data/dtep/xhtml-frameset/area.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="area" hasFocus="1" hasScript="1" hasCore="1" hasI18n="1" single="1"> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <text>Shape</text> <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2"/> diff --git a/quanta/data/dtep/xhtml-frameset/b.tag b/quanta/data/dtep/xhtml-frameset/b.tag index dac70a04..86cbb519 100644 --- a/quanta/data/dtep/xhtml-frameset/b.tag +++ b/quanta/data/dtep/xhtml-frameset/b.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="b" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/bdo.tag b/quanta/data/dtep/xhtml-frameset/bdo.tag index 676eb609..eea7e5ad 100644 --- a/quanta/data/dtep/xhtml-frameset/bdo.tag +++ b/quanta/data/dtep/xhtml-frameset/bdo.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="bdo" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/big.tag b/quanta/data/dtep/xhtml-frameset/big.tag index bbf21a7c..6ebf8aad 100644 --- a/quanta/data/dtep/xhtml-frameset/big.tag +++ b/quanta/data/dtep/xhtml-frameset/big.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="big" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/blockquote.tag b/quanta/data/dtep/xhtml-frameset/blockquote.tag index 82709643..07170c99 100644 --- a/quanta/data/dtep/xhtml-frameset/blockquote.tag +++ b/quanta/data/dtep/xhtml-frameset/blockquote.tag @@ -10,7 +10,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -76,7 +76,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/body.tag b/quanta/data/dtep/xhtml-frameset/body.tag index 36982ce4..c956b5d3 100644 --- a/quanta/data/dtep/xhtml-frameset/body.tag +++ b/quanta/data/dtep/xhtml-frameset/body.tag @@ -56,7 +56,7 @@ <location col="1" row="7" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -122,7 +122,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/button.tag b/quanta/data/dtep/xhtml-frameset/button.tag index 011def6a..52a481c6 100644 --- a/quanta/data/dtep/xhtml-frameset/button.tag +++ b/quanta/data/dtep/xhtml-frameset/button.tag @@ -32,7 +32,7 @@ <tooltip>Disable the element</tooltip> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="acronym" /> @@ -88,6 +88,6 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/caption.tag b/quanta/data/dtep/xhtml-frameset/caption.tag index 7917420e..0ef0acf1 100644 --- a/quanta/data/dtep/xhtml-frameset/caption.tag +++ b/quanta/data/dtep/xhtml-frameset/caption.tag @@ -15,7 +15,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -57,7 +57,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/center.tag b/quanta/data/dtep/xhtml-frameset/center.tag index 67943607..039a85ab 100644 --- a/quanta/data/dtep/xhtml-frameset/center.tag +++ b/quanta/data/dtep/xhtml-frameset/center.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="center" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -69,7 +69,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/cite.tag b/quanta/data/dtep/xhtml-frameset/cite.tag index 815bac00..4f3c8c6c 100644 --- a/quanta/data/dtep/xhtml-frameset/cite.tag +++ b/quanta/data/dtep/xhtml-frameset/cite.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="cite" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/code.tag b/quanta/data/dtep/xhtml-frameset/code.tag index 28759903..219089d8 100644 --- a/quanta/data/dtep/xhtml-frameset/code.tag +++ b/quanta/data/dtep/xhtml-frameset/code.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="code" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/colgroup.tag b/quanta/data/dtep/xhtml-frameset/colgroup.tag index d4ecc9a8..20c27974 100644 --- a/quanta/data/dtep/xhtml-frameset/colgroup.tag +++ b/quanta/data/dtep/xhtml-frameset/colgroup.tag @@ -54,8 +54,8 @@ You can add multiple values with commas</tooltip> <location col="1" row="5" /> </attr> -<children> +<tqchildren> <child name="col" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/dd.tag b/quanta/data/dtep/xhtml-frameset/dd.tag index b6a135ef..c7ff069f 100644 --- a/quanta/data/dtep/xhtml-frameset/dd.tag +++ b/quanta/data/dtep/xhtml-frameset/dd.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="dd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -69,7 +69,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/del.tag b/quanta/data/dtep/xhtml-frameset/del.tag index 4d07e4b9..34bef391 100644 --- a/quanta/data/dtep/xhtml-frameset/del.tag +++ b/quanta/data/dtep/xhtml-frameset/del.tag @@ -15,7 +15,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -81,7 +81,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/dfn.tag b/quanta/data/dtep/xhtml-frameset/dfn.tag index 99e3daff..6fe0b46a 100644 --- a/quanta/data/dtep/xhtml-frameset/dfn.tag +++ b/quanta/data/dtep/xhtml-frameset/dfn.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/dir.tag b/quanta/data/dtep/xhtml-frameset/dir.tag index 13612182..a63731e9 100644 --- a/quanta/data/dtep/xhtml-frameset/dir.tag +++ b/quanta/data/dtep/xhtml-frameset/dir.tag @@ -8,9 +8,9 @@ <location col="0" row="0" /> </attr> -<children> +<tqchildren> <child name="li" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/div.tag b/quanta/data/dtep/xhtml-frameset/div.tag index ca4b037a..4b59e711 100644 --- a/quanta/data/dtep/xhtml-frameset/div.tag +++ b/quanta/data/dtep/xhtml-frameset/div.tag @@ -16,7 +16,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -82,7 +82,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/dl.tag b/quanta/data/dtep/xhtml-frameset/dl.tag index 1f38c5a0..32c9f645 100644 --- a/quanta/data/dtep/xhtml-frameset/dl.tag +++ b/quanta/data/dtep/xhtml-frameset/dl.tag @@ -8,9 +8,9 @@ <location col="0" row="0" /> </attr> -<children> +<tqchildren> <child name="dt" /> <child name="dd" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/dt.tag b/quanta/data/dtep/xhtml-frameset/dt.tag index 4d9192aa..18d1d506 100644 --- a/quanta/data/dtep/xhtml-frameset/dt.tag +++ b/quanta/data/dtep/xhtml-frameset/dt.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="dt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/em.tag b/quanta/data/dtep/xhtml-frameset/em.tag index 3c5005b1..b2765e02 100644 --- a/quanta/data/dtep/xhtml-frameset/em.tag +++ b/quanta/data/dtep/xhtml-frameset/em.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="em" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/fieldset.tag b/quanta/data/dtep/xhtml-frameset/fieldset.tag index f2e942bd..b80d46dc 100644 --- a/quanta/data/dtep/xhtml-frameset/fieldset.tag +++ b/quanta/data/dtep/xhtml-frameset/fieldset.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="fieldset" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -70,7 +70,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/font.tag b/quanta/data/dtep/xhtml-frameset/font.tag index 4cc18db6..d7784288 100644 --- a/quanta/data/dtep/xhtml-frameset/font.tag +++ b/quanta/data/dtep/xhtml-frameset/font.tag @@ -39,7 +39,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -81,7 +81,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/xhtml-frameset/form.tag b/quanta/data/dtep/xhtml-frameset/form.tag index b3d554b1..1a87abc0 100644 --- a/quanta/data/dtep/xhtml-frameset/form.tag +++ b/quanta/data/dtep/xhtml-frameset/form.tag @@ -80,7 +80,7 @@ <location col="1" row="8" colspan="3"/> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -145,7 +145,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/frameset.tag b/quanta/data/dtep/xhtml-frameset/frameset.tag index 7e0b6f09..d1addb63 100644 --- a/quanta/data/dtep/xhtml-frameset/frameset.tag +++ b/quanta/data/dtep/xhtml-frameset/frameset.tag @@ -27,11 +27,11 @@ <location col="1" row="3" colspan="2"/> </attr> -<children> +<tqchildren> <child name="frame" /> <child name="frameset" /> <child name="noframes" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/head.tag b/quanta/data/dtep/xhtml-frameset/head.tag index 9305caea..74e94d81 100644 --- a/quanta/data/dtep/xhtml-frameset/head.tag +++ b/quanta/data/dtep/xhtml-frameset/head.tag @@ -15,7 +15,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="base" /> <child name="link" /> <child name="meta" usage="required" /> @@ -24,7 +24,7 @@ <child name="script" /> <child name="style" /> <child name="isindex" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/headings.tag b/quanta/data/dtep/xhtml-frameset/headings.tag index 5469ac0b..a943a2ec 100644 --- a/quanta/data/dtep/xhtml-frameset/headings.tag +++ b/quanta/data/dtep/xhtml-frameset/headings.tag @@ -16,7 +16,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -58,7 +58,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -77,7 +77,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -119,7 +119,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -138,7 +138,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -180,7 +180,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -199,7 +199,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -241,7 +241,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -260,7 +260,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -302,7 +302,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -321,7 +321,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -363,7 +363,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/html.tag b/quanta/data/dtep/xhtml-frameset/html.tag index d401f801..639ac562 100644 --- a/quanta/data/dtep/xhtml-frameset/html.tag +++ b/quanta/data/dtep/xhtml-frameset/html.tag @@ -18,10 +18,10 @@ </items> </attr> -<children> +<tqchildren> <child name="head" /> <child name="frameset" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/i.tag b/quanta/data/dtep/xhtml-frameset/i.tag index eefb38d4..e605fba6 100644 --- a/quanta/data/dtep/xhtml-frameset/i.tag +++ b/quanta/data/dtep/xhtml-frameset/i.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/iframe.tag b/quanta/data/dtep/xhtml-frameset/iframe.tag index fb5ffb99..9d5b5d15 100644 --- a/quanta/data/dtep/xhtml-frameset/iframe.tag +++ b/quanta/data/dtep/xhtml-frameset/iframe.tag @@ -88,7 +88,7 @@ <location col="1" row="12" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -154,7 +154,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/ins.tag b/quanta/data/dtep/xhtml-frameset/ins.tag index de225ae1..eeb636a6 100644 --- a/quanta/data/dtep/xhtml-frameset/ins.tag +++ b/quanta/data/dtep/xhtml-frameset/ins.tag @@ -15,7 +15,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -81,7 +81,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/kbd.tag b/quanta/data/dtep/xhtml-frameset/kbd.tag index 6cfaa511..563ebdd0 100644 --- a/quanta/data/dtep/xhtml-frameset/kbd.tag +++ b/quanta/data/dtep/xhtml-frameset/kbd.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/label.tag b/quanta/data/dtep/xhtml-frameset/label.tag index 3e53f7ba..23878a5e 100644 --- a/quanta/data/dtep/xhtml-frameset/label.tag +++ b/quanta/data/dtep/xhtml-frameset/label.tag @@ -27,7 +27,7 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -69,7 +69,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/legend.tag b/quanta/data/dtep/xhtml-frameset/legend.tag index 685ae528..417b9c78 100644 --- a/quanta/data/dtep/xhtml-frameset/legend.tag +++ b/quanta/data/dtep/xhtml-frameset/legend.tag @@ -22,7 +22,7 @@ <location col="1" row="1" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -64,7 +64,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/li.tag b/quanta/data/dtep/xhtml-frameset/li.tag index c4acfaa2..efff88aa 100644 --- a/quanta/data/dtep/xhtml-frameset/li.tag +++ b/quanta/data/dtep/xhtml-frameset/li.tag @@ -29,7 +29,7 @@ <stoppingtag name="li" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -95,7 +95,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/map.tag b/quanta/data/dtep/xhtml-frameset/map.tag index b64d44f2..9852af99 100644 --- a/quanta/data/dtep/xhtml-frameset/map.tag +++ b/quanta/data/dtep/xhtml-frameset/map.tag @@ -9,7 +9,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="address" /> <child name="area" /> <child name="blockquote" /> @@ -38,7 +38,7 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/menu.tag b/quanta/data/dtep/xhtml-frameset/menu.tag index 10322fc8..a98f6d53 100644 --- a/quanta/data/dtep/xhtml-frameset/menu.tag +++ b/quanta/data/dtep/xhtml-frameset/menu.tag @@ -8,9 +8,9 @@ <location col="0" row="0" /> </attr> -<children> +<tqchildren> <child name="li" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/noframes.tag b/quanta/data/dtep/xhtml-frameset/noframes.tag index 59ff061b..a3e207cd 100644 --- a/quanta/data/dtep/xhtml-frameset/noframes.tag +++ b/quanta/data/dtep/xhtml-frameset/noframes.tag @@ -3,9 +3,9 @@ <TAGS> <tag name="noframes" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="body" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/noscript.tag b/quanta/data/dtep/xhtml-frameset/noscript.tag index a973201b..6bb56abc 100644 --- a/quanta/data/dtep/xhtml-frameset/noscript.tag +++ b/quanta/data/dtep/xhtml-frameset/noscript.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -69,7 +69,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/object.tag b/quanta/data/dtep/xhtml-frameset/object.tag index baebd55d..10513193 100644 --- a/quanta/data/dtep/xhtml-frameset/object.tag +++ b/quanta/data/dtep/xhtml-frameset/object.tag @@ -136,7 +136,7 @@ <location col="3" row="7" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -203,7 +203,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/ol.tag b/quanta/data/dtep/xhtml-frameset/ol.tag index 4a33b85a..2d2e2fb1 100644 --- a/quanta/data/dtep/xhtml-frameset/ol.tag +++ b/quanta/data/dtep/xhtml-frameset/ol.tag @@ -28,9 +28,9 @@ <location col="0" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/optgroup.tag b/quanta/data/dtep/xhtml-frameset/optgroup.tag index 08a52ff5..56839297 100644 --- a/quanta/data/dtep/xhtml-frameset/optgroup.tag +++ b/quanta/data/dtep/xhtml-frameset/optgroup.tag @@ -15,9 +15,9 @@ <location col="1" row="0" colspan="1" /> </attr> -<children> +<tqchildren> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/p.tag b/quanta/data/dtep/xhtml-frameset/p.tag index 48008e82..907587d5 100644 --- a/quanta/data/dtep/xhtml-frameset/p.tag +++ b/quanta/data/dtep/xhtml-frameset/p.tag @@ -26,7 +26,7 @@ <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -68,7 +68,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/pre.tag b/quanta/data/dtep/xhtml-frameset/pre.tag index ad3955f7..5a9acb0c 100644 --- a/quanta/data/dtep/xhtml-frameset/pre.tag +++ b/quanta/data/dtep/xhtml-frameset/pre.tag @@ -17,7 +17,7 @@ <item>preserve</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -48,6 +48,6 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/q.tag b/quanta/data/dtep/xhtml-frameset/q.tag index 241bde5b..09d64568 100644 --- a/quanta/data/dtep/xhtml-frameset/q.tag +++ b/quanta/data/dtep/xhtml-frameset/q.tag @@ -9,7 +9,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -51,7 +51,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/s.tag b/quanta/data/dtep/xhtml-frameset/s.tag index 98ad6cf7..9fd600cb 100644 --- a/quanta/data/dtep/xhtml-frameset/s.tag +++ b/quanta/data/dtep/xhtml-frameset/s.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="s" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/samp.tag b/quanta/data/dtep/xhtml-frameset/samp.tag index 6cecf4e0..e84d0525 100644 --- a/quanta/data/dtep/xhtml-frameset/samp.tag +++ b/quanta/data/dtep/xhtml-frameset/samp.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="samp" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/select.tag b/quanta/data/dtep/xhtml-frameset/select.tag index d0c87373..fb17bd73 100644 --- a/quanta/data/dtep/xhtml-frameset/select.tag +++ b/quanta/data/dtep/xhtml-frameset/select.tag @@ -53,10 +53,10 @@ <stoppingtag name="select" /> </stoppingtags> -<children> +<tqchildren> <child name="optgroup" /> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/small.tag b/quanta/data/dtep/xhtml-frameset/small.tag index 538b3b7a..7392cde2 100644 --- a/quanta/data/dtep/xhtml-frameset/small.tag +++ b/quanta/data/dtep/xhtml-frameset/small.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="small" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/span.tag b/quanta/data/dtep/xhtml-frameset/span.tag index 2ff722d0..aaae5401 100644 --- a/quanta/data/dtep/xhtml-frameset/span.tag +++ b/quanta/data/dtep/xhtml-frameset/span.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="span" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/strike.tag b/quanta/data/dtep/xhtml-frameset/strike.tag index 478e692c..c49e498e 100644 --- a/quanta/data/dtep/xhtml-frameset/strike.tag +++ b/quanta/data/dtep/xhtml-frameset/strike.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="strike" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/strong.tag b/quanta/data/dtep/xhtml-frameset/strong.tag index 0424fa5e..6d3f007d 100644 --- a/quanta/data/dtep/xhtml-frameset/strong.tag +++ b/quanta/data/dtep/xhtml-frameset/strong.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/style.tag b/quanta/data/dtep/xhtml-frameset/style.tag index aa052448..afa3fe55 100644 --- a/quanta/data/dtep/xhtml-frameset/style.tag +++ b/quanta/data/dtep/xhtml-frameset/style.tag @@ -50,8 +50,8 @@ <item>preserve</item> </items> </attr> - <children> + <tqchildren> <child name="#text" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/sub.tag b/quanta/data/dtep/xhtml-frameset/sub.tag index ec46544b..315c5ab0 100644 --- a/quanta/data/dtep/xhtml-frameset/sub.tag +++ b/quanta/data/dtep/xhtml-frameset/sub.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="sub" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/sup.tag b/quanta/data/dtep/xhtml-frameset/sup.tag index d441423a..dec7d2c8 100644 --- a/quanta/data/dtep/xhtml-frameset/sup.tag +++ b/quanta/data/dtep/xhtml-frameset/sup.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="sup" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/table.tag b/quanta/data/dtep/xhtml-frameset/table.tag index b76d5095..d5296fb2 100644 --- a/quanta/data/dtep/xhtml-frameset/table.tag +++ b/quanta/data/dtep/xhtml-frameset/table.tag @@ -83,7 +83,7 @@ <tooltip>Deprecated</tooltip> </attr> -<children> +<tqchildren> <child name="caption" /> <child name="col" /> <child name="colgroup" /> @@ -91,7 +91,7 @@ <child name="tfoot" /> <child name="tbody" /> <child name="tr" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/tbody.tag b/quanta/data/dtep/xhtml-frameset/tbody.tag index db13711d..c04eebf6 100644 --- a/quanta/data/dtep/xhtml-frameset/tbody.tag +++ b/quanta/data/dtep/xhtml-frameset/tbody.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/td.tag b/quanta/data/dtep/xhtml-frameset/td.tag index e46c9414..39e99979 100644 --- a/quanta/data/dtep/xhtml-frameset/td.tag +++ b/quanta/data/dtep/xhtml-frameset/td.tag @@ -115,7 +115,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -181,7 +181,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/textarea.tag b/quanta/data/dtep/xhtml-frameset/textarea.tag index 9c94dc0f..50f9210a 100644 --- a/quanta/data/dtep/xhtml-frameset/textarea.tag +++ b/quanta/data/dtep/xhtml-frameset/textarea.tag @@ -42,8 +42,8 @@ <textlocation col="0" row="4" colspan="1" /> <location col="1" row="4" colspan="3" /> </attr> - <children> + <tqchildren> <child name="#text" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/tfoot.tag b/quanta/data/dtep/xhtml-frameset/tfoot.tag index e07605f4..cca684ca 100644 --- a/quanta/data/dtep/xhtml-frameset/tfoot.tag +++ b/quanta/data/dtep/xhtml-frameset/tfoot.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/th.tag b/quanta/data/dtep/xhtml-frameset/th.tag index 27ff8b6a..7e1e3d97 100644 --- a/quanta/data/dtep/xhtml-frameset/th.tag +++ b/quanta/data/dtep/xhtml-frameset/th.tag @@ -115,7 +115,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -181,7 +181,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/thead.tag b/quanta/data/dtep/xhtml-frameset/thead.tag index 059263d1..5bb973ca 100644 --- a/quanta/data/dtep/xhtml-frameset/thead.tag +++ b/quanta/data/dtep/xhtml-frameset/thead.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/title.tag b/quanta/data/dtep/xhtml-frameset/title.tag index f24df571..02ef0059 100644 --- a/quanta/data/dtep/xhtml-frameset/title.tag +++ b/quanta/data/dtep/xhtml-frameset/title.tag @@ -7,8 +7,8 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/tr.tag b/quanta/data/dtep/xhtml-frameset/tr.tag index 4baf805c..e1611664 100644 --- a/quanta/data/dtep/xhtml-frameset/tr.tag +++ b/quanta/data/dtep/xhtml-frameset/tr.tag @@ -45,9 +45,9 @@ <stoppingtag name="tfoot" /> </stoppingtags> -<children> +<tqchildren> <child name="th" /> <child name="td" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/tt.tag b/quanta/data/dtep/xhtml-frameset/tt.tag index 08f25532..768f3791 100644 --- a/quanta/data/dtep/xhtml-frameset/tt.tag +++ b/quanta/data/dtep/xhtml-frameset/tt.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="tt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/u.tag b/quanta/data/dtep/xhtml-frameset/u.tag index bc931d0d..be82dd1c 100644 --- a/quanta/data/dtep/xhtml-frameset/u.tag +++ b/quanta/data/dtep/xhtml-frameset/u.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="u" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/ul.tag b/quanta/data/dtep/xhtml-frameset/ul.tag index 21443c5d..bb30c1c6 100644 --- a/quanta/data/dtep/xhtml-frameset/ul.tag +++ b/quanta/data/dtep/xhtml-frameset/ul.tag @@ -20,9 +20,9 @@ <location col="0" row="1" /> </attr> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-frameset/var.tag b/quanta/data/dtep/xhtml-frameset/var.tag index ad5627b0..c2ea19b3 100644 --- a/quanta/data/dtep/xhtml-frameset/var.tag +++ b/quanta/data/dtep/xhtml-frameset/var.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="var" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/a.tag b/quanta/data/dtep/xhtml-strict/a.tag index 07c82584..701ee488 100644 --- a/quanta/data/dtep/xhtml-strict/a.tag +++ b/quanta/data/dtep/xhtml-strict/a.tag @@ -61,7 +61,7 @@ <location col="1" row="6" /> </attr> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <text>Shape</text> <textlocation col="0" row="7" /> <location col="1" row="7" /> @@ -79,7 +79,7 @@ <location col="1" row="8" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="acronym" /> @@ -113,7 +113,7 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/abbr.tag b/quanta/data/dtep/xhtml-strict/abbr.tag index b988c322..08fc6d94 100644 --- a/quanta/data/dtep/xhtml-strict/abbr.tag +++ b/quanta/data/dtep/xhtml-strict/abbr.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/acronym.tag b/quanta/data/dtep/xhtml-strict/acronym.tag index 12bf30f1..c2a2eba5 100644 --- a/quanta/data/dtep/xhtml-strict/acronym.tag +++ b/quanta/data/dtep/xhtml-strict/acronym.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/address.tag b/quanta/data/dtep/xhtml-strict/address.tag index 3b1f699e..c74c8141 100644 --- a/quanta/data/dtep/xhtml-strict/address.tag +++ b/quanta/data/dtep/xhtml-strict/address.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="address" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/area.tag b/quanta/data/dtep/xhtml-strict/area.tag index 578166c8..77286795 100644 --- a/quanta/data/dtep/xhtml-strict/area.tag +++ b/quanta/data/dtep/xhtml-strict/area.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="area" hasFocus="1" hasScript="1" hasCore="1" hasI18n="1" single="1"> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <text>Shape</text> <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2"/> diff --git a/quanta/data/dtep/xhtml-strict/b.tag b/quanta/data/dtep/xhtml-strict/b.tag index 54e28332..736049f5 100644 --- a/quanta/data/dtep/xhtml-strict/b.tag +++ b/quanta/data/dtep/xhtml-strict/b.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="b" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/bdo.tag b/quanta/data/dtep/xhtml-strict/bdo.tag index 7435ea68..1e6919b4 100644 --- a/quanta/data/dtep/xhtml-strict/bdo.tag +++ b/quanta/data/dtep/xhtml-strict/bdo.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="bdo" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -38,6 +38,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/big.tag b/quanta/data/dtep/xhtml-strict/big.tag index b951e28b..c9ca87ac 100644 --- a/quanta/data/dtep/xhtml-strict/big.tag +++ b/quanta/data/dtep/xhtml-strict/big.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="big" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/blockquote.tag b/quanta/data/dtep/xhtml-strict/blockquote.tag index c85ecfb9..f3acbe4a 100644 --- a/quanta/data/dtep/xhtml-strict/blockquote.tag +++ b/quanta/data/dtep/xhtml-strict/blockquote.tag @@ -10,7 +10,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="del" /> @@ -33,6 +33,6 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/body.tag b/quanta/data/dtep/xhtml-strict/body.tag index c2e67cdf..e991819e 100644 --- a/quanta/data/dtep/xhtml-strict/body.tag +++ b/quanta/data/dtep/xhtml-strict/body.tag @@ -14,7 +14,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="del" /> @@ -37,7 +37,7 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/button.tag b/quanta/data/dtep/xhtml-strict/button.tag index bf88752c..4cea665b 100644 --- a/quanta/data/dtep/xhtml-strict/button.tag +++ b/quanta/data/dtep/xhtml-strict/button.tag @@ -32,7 +32,7 @@ <tooltip>Disable the element</tooltip> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="acronym" /> @@ -78,6 +78,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/caption.tag b/quanta/data/dtep/xhtml-strict/caption.tag index 0d433812..956ed2bd 100644 --- a/quanta/data/dtep/xhtml-strict/caption.tag +++ b/quanta/data/dtep/xhtml-strict/caption.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="caption" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/cite.tag b/quanta/data/dtep/xhtml-strict/cite.tag index 58cb492f..b3e2e76b 100644 --- a/quanta/data/dtep/xhtml-strict/cite.tag +++ b/quanta/data/dtep/xhtml-strict/cite.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="cite" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/code.tag b/quanta/data/dtep/xhtml-strict/code.tag index b29a87d4..625050da 100644 --- a/quanta/data/dtep/xhtml-strict/code.tag +++ b/quanta/data/dtep/xhtml-strict/code.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="code" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/colgroup.tag b/quanta/data/dtep/xhtml-strict/colgroup.tag index d4ecc9a8..20c27974 100644 --- a/quanta/data/dtep/xhtml-strict/colgroup.tag +++ b/quanta/data/dtep/xhtml-strict/colgroup.tag @@ -54,8 +54,8 @@ You can add multiple values with commas</tooltip> <location col="1" row="5" /> </attr> -<children> +<tqchildren> <child name="col" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/dd.tag b/quanta/data/dtep/xhtml-strict/dd.tag index 97992bf9..53fda2d1 100644 --- a/quanta/data/dtep/xhtml-strict/dd.tag +++ b/quanta/data/dtep/xhtml-strict/dd.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="dd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -56,6 +56,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/del.tag b/quanta/data/dtep/xhtml-strict/del.tag index eab2ed61..27d93048 100644 --- a/quanta/data/dtep/xhtml-strict/del.tag +++ b/quanta/data/dtep/xhtml-strict/del.tag @@ -14,7 +14,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -68,6 +68,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/dfn.tag b/quanta/data/dtep/xhtml-strict/dfn.tag index fbeb6d72..42d4d6fc 100644 --- a/quanta/data/dtep/xhtml-strict/dfn.tag +++ b/quanta/data/dtep/xhtml-strict/dfn.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/div.tag b/quanta/data/dtep/xhtml-strict/div.tag index aba511ae..1f83d680 100644 --- a/quanta/data/dtep/xhtml-strict/div.tag +++ b/quanta/data/dtep/xhtml-strict/div.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="div" hasScript="1" hasCore="1" hasI18n="1" scope="paragraph"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -57,6 +57,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/dl.tag b/quanta/data/dtep/xhtml-strict/dl.tag index 430067b8..d1edcf28 100644 --- a/quanta/data/dtep/xhtml-strict/dl.tag +++ b/quanta/data/dtep/xhtml-strict/dl.tag @@ -2,9 +2,9 @@ <!DOCTYPE TAGS> <TAGS> <tag name="dl" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="dt" /> <child name="dd" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/dt.tag b/quanta/data/dtep/xhtml-strict/dt.tag index ef239795..efc31477 100644 --- a/quanta/data/dtep/xhtml-strict/dt.tag +++ b/quanta/data/dtep/xhtml-strict/dt.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="dt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/em.tag b/quanta/data/dtep/xhtml-strict/em.tag index 807065df..f858197f 100644 --- a/quanta/data/dtep/xhtml-strict/em.tag +++ b/quanta/data/dtep/xhtml-strict/em.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="em" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/fieldset.tag b/quanta/data/dtep/xhtml-strict/fieldset.tag index 588944d5..9384f3d1 100644 --- a/quanta/data/dtep/xhtml-strict/fieldset.tag +++ b/quanta/data/dtep/xhtml-strict/fieldset.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="fieldset" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -58,7 +58,7 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/form.tag b/quanta/data/dtep/xhtml-strict/form.tag index d8b0e6dc..d4d7d9c3 100644 --- a/quanta/data/dtep/xhtml-strict/form.tag +++ b/quanta/data/dtep/xhtml-strict/form.tag @@ -68,7 +68,7 @@ <location col="1" row="6" colspan="3"/> </attr> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="del" /> @@ -90,6 +90,6 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/head.tag b/quanta/data/dtep/xhtml-strict/head.tag index 917a21b3..6aeac10b 100644 --- a/quanta/data/dtep/xhtml-strict/head.tag +++ b/quanta/data/dtep/xhtml-strict/head.tag @@ -15,7 +15,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="base" /> <child name="link" /> <child name="meta" usage="required" /> @@ -23,7 +23,7 @@ <child name="title" usage="required" /> <child name="script" /> <child name="style" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/headings.tag b/quanta/data/dtep/xhtml-strict/headings.tag index b7190ebc..259cf843 100644 --- a/quanta/data/dtep/xhtml-strict/headings.tag +++ b/quanta/data/dtep/xhtml-strict/headings.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="h1" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -38,12 +38,12 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h2" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -78,12 +78,12 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h3" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -118,12 +118,12 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h4" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -158,12 +158,12 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h5" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -198,12 +198,12 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h6" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -238,7 +238,7 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/html.tag b/quanta/data/dtep/xhtml-strict/html.tag index afc592c3..45a26694 100644 --- a/quanta/data/dtep/xhtml-strict/html.tag +++ b/quanta/data/dtep/xhtml-strict/html.tag @@ -18,10 +18,10 @@ </items> </attr> -<children> +<tqchildren> <child name="head" /> <child name="body" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/i.tag b/quanta/data/dtep/xhtml-strict/i.tag index 36dbd43a..f7bcd0ef 100644 --- a/quanta/data/dtep/xhtml-strict/i.tag +++ b/quanta/data/dtep/xhtml-strict/i.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/ins.tag b/quanta/data/dtep/xhtml-strict/ins.tag index eed48a2c..5bd2e4a4 100644 --- a/quanta/data/dtep/xhtml-strict/ins.tag +++ b/quanta/data/dtep/xhtml-strict/ins.tag @@ -14,7 +14,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -68,6 +68,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/kbd.tag b/quanta/data/dtep/xhtml-strict/kbd.tag index 2b222085..246f6230 100644 --- a/quanta/data/dtep/xhtml-strict/kbd.tag +++ b/quanta/data/dtep/xhtml-strict/kbd.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/label.tag b/quanta/data/dtep/xhtml-strict/label.tag index 9b898aee..f675a366 100644 --- a/quanta/data/dtep/xhtml-strict/label.tag +++ b/quanta/data/dtep/xhtml-strict/label.tag @@ -26,7 +26,7 @@ <textlocation col="0" row="3" /> <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -61,6 +61,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/legend.tag b/quanta/data/dtep/xhtml-strict/legend.tag index 1a5f486c..034fbaa2 100644 --- a/quanta/data/dtep/xhtml-strict/legend.tag +++ b/quanta/data/dtep/xhtml-strict/legend.tag @@ -9,7 +9,7 @@ <location col="3" row="0" colspan="1" /> <tooltip>Shortcut</tooltip> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -44,6 +44,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/li.tag b/quanta/data/dtep/xhtml-strict/li.tag index 5ceb4358..66fd4600 100644 --- a/quanta/data/dtep/xhtml-strict/li.tag +++ b/quanta/data/dtep/xhtml-strict/li.tag @@ -6,7 +6,7 @@ <stoppingtags> <stoppingtag name="li" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -60,6 +60,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/map.tag b/quanta/data/dtep/xhtml-strict/map.tag index 8f6a1e9d..5104be41 100644 --- a/quanta/data/dtep/xhtml-strict/map.tag +++ b/quanta/data/dtep/xhtml-strict/map.tag @@ -9,7 +9,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="address" /> <child name="area" /> <child name="blockquote" /> @@ -33,7 +33,7 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/noscript.tag b/quanta/data/dtep/xhtml-strict/noscript.tag index 451adfd4..7dad1ffe 100644 --- a/quanta/data/dtep/xhtml-strict/noscript.tag +++ b/quanta/data/dtep/xhtml-strict/noscript.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="del" /> @@ -26,6 +26,6 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/object.tag b/quanta/data/dtep/xhtml-strict/object.tag index add63d74..fc8a1d5a 100644 --- a/quanta/data/dtep/xhtml-strict/object.tag +++ b/quanta/data/dtep/xhtml-strict/object.tag @@ -102,7 +102,7 @@ <location col="1" row="12" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -157,7 +157,7 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/ol.tag b/quanta/data/dtep/xhtml-strict/ol.tag index 25c76d7a..98e58f38 100644 --- a/quanta/data/dtep/xhtml-strict/ol.tag +++ b/quanta/data/dtep/xhtml-strict/ol.tag @@ -3,9 +3,9 @@ <TAGS> <tag name="ol" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/optgroup.tag b/quanta/data/dtep/xhtml-strict/optgroup.tag index 08a52ff5..56839297 100644 --- a/quanta/data/dtep/xhtml-strict/optgroup.tag +++ b/quanta/data/dtep/xhtml-strict/optgroup.tag @@ -15,9 +15,9 @@ <location col="1" row="0" colspan="1" /> </attr> -<children> +<tqchildren> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/p.tag b/quanta/data/dtep/xhtml-strict/p.tag index 4c5e225f..9146892d 100644 --- a/quanta/data/dtep/xhtml-strict/p.tag +++ b/quanta/data/dtep/xhtml-strict/p.tag @@ -13,7 +13,7 @@ <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -48,7 +48,7 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/pre.tag b/quanta/data/dtep/xhtml-strict/pre.tag index 9abff9a7..7c5f6909 100644 --- a/quanta/data/dtep/xhtml-strict/pre.tag +++ b/quanta/data/dtep/xhtml-strict/pre.tag @@ -11,7 +11,7 @@ <item>preserve</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -40,6 +40,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/q.tag b/quanta/data/dtep/xhtml-strict/q.tag index ebb1b878..76d13722 100644 --- a/quanta/data/dtep/xhtml-strict/q.tag +++ b/quanta/data/dtep/xhtml-strict/q.tag @@ -8,7 +8,7 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -43,6 +43,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/samp.tag b/quanta/data/dtep/xhtml-strict/samp.tag index 2ec41eb4..e0f7bdf7 100644 --- a/quanta/data/dtep/xhtml-strict/samp.tag +++ b/quanta/data/dtep/xhtml-strict/samp.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="samp" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/select.tag b/quanta/data/dtep/xhtml-strict/select.tag index d0c87373..fb17bd73 100644 --- a/quanta/data/dtep/xhtml-strict/select.tag +++ b/quanta/data/dtep/xhtml-strict/select.tag @@ -53,10 +53,10 @@ <stoppingtag name="select" /> </stoppingtags> -<children> +<tqchildren> <child name="optgroup" /> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/small.tag b/quanta/data/dtep/xhtml-strict/small.tag index 0fdbe561..0d2c4263 100644 --- a/quanta/data/dtep/xhtml-strict/small.tag +++ b/quanta/data/dtep/xhtml-strict/small.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="small" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/span.tag b/quanta/data/dtep/xhtml-strict/span.tag index ca85ab65..6218d5d7 100644 --- a/quanta/data/dtep/xhtml-strict/span.tag +++ b/quanta/data/dtep/xhtml-strict/span.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="span" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/strong.tag b/quanta/data/dtep/xhtml-strict/strong.tag index 98d57d89..3bc13488 100644 --- a/quanta/data/dtep/xhtml-strict/strong.tag +++ b/quanta/data/dtep/xhtml-strict/strong.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/style.tag b/quanta/data/dtep/xhtml-strict/style.tag index aa052448..afa3fe55 100644 --- a/quanta/data/dtep/xhtml-strict/style.tag +++ b/quanta/data/dtep/xhtml-strict/style.tag @@ -50,8 +50,8 @@ <item>preserve</item> </items> </attr> - <children> + <tqchildren> <child name="#text" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/sub.tag b/quanta/data/dtep/xhtml-strict/sub.tag index 5691c5f0..0a195674 100644 --- a/quanta/data/dtep/xhtml-strict/sub.tag +++ b/quanta/data/dtep/xhtml-strict/sub.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="sub" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/sup.tag b/quanta/data/dtep/xhtml-strict/sup.tag index 33e052d3..815c4e35 100644 --- a/quanta/data/dtep/xhtml-strict/sup.tag +++ b/quanta/data/dtep/xhtml-strict/sup.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="sup" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/table.tag b/quanta/data/dtep/xhtml-strict/table.tag index aa22e02c..39d145c9 100644 --- a/quanta/data/dtep/xhtml-strict/table.tag +++ b/quanta/data/dtep/xhtml-strict/table.tag @@ -65,7 +65,7 @@ <location col="1" row="4" colspan="3"/> </attr> -<children> +<tqchildren> <child name="caption" /> <child name="col" /> <child name="colgroup" /> @@ -73,7 +73,7 @@ <child name="tfoot" /> <child name="tbody" /> <child name="tr" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/tbody.tag b/quanta/data/dtep/xhtml-strict/tbody.tag index db13711d..c04eebf6 100644 --- a/quanta/data/dtep/xhtml-strict/tbody.tag +++ b/quanta/data/dtep/xhtml-strict/tbody.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/td.tag b/quanta/data/dtep/xhtml-strict/td.tag index 48775d37..26c47877 100644 --- a/quanta/data/dtep/xhtml-strict/td.tag +++ b/quanta/data/dtep/xhtml-strict/td.tag @@ -88,7 +88,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -142,6 +142,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/textarea.tag b/quanta/data/dtep/xhtml-strict/textarea.tag index 9c94dc0f..50f9210a 100644 --- a/quanta/data/dtep/xhtml-strict/textarea.tag +++ b/quanta/data/dtep/xhtml-strict/textarea.tag @@ -42,8 +42,8 @@ <textlocation col="0" row="4" colspan="1" /> <location col="1" row="4" colspan="3" /> </attr> - <children> + <tqchildren> <child name="#text" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/tfoot.tag b/quanta/data/dtep/xhtml-strict/tfoot.tag index e07605f4..cca684ca 100644 --- a/quanta/data/dtep/xhtml-strict/tfoot.tag +++ b/quanta/data/dtep/xhtml-strict/tfoot.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/th.tag b/quanta/data/dtep/xhtml-strict/th.tag index d5c619f2..84230d57 100644 --- a/quanta/data/dtep/xhtml-strict/th.tag +++ b/quanta/data/dtep/xhtml-strict/th.tag @@ -88,7 +88,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -142,7 +142,7 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/thead.tag b/quanta/data/dtep/xhtml-strict/thead.tag index 059263d1..5bb973ca 100644 --- a/quanta/data/dtep/xhtml-strict/thead.tag +++ b/quanta/data/dtep/xhtml-strict/thead.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/title.tag b/quanta/data/dtep/xhtml-strict/title.tag index f24df571..02ef0059 100644 --- a/quanta/data/dtep/xhtml-strict/title.tag +++ b/quanta/data/dtep/xhtml-strict/title.tag @@ -7,8 +7,8 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/tr.tag b/quanta/data/dtep/xhtml-strict/tr.tag index 4baf805c..e1611664 100644 --- a/quanta/data/dtep/xhtml-strict/tr.tag +++ b/quanta/data/dtep/xhtml-strict/tr.tag @@ -45,9 +45,9 @@ <stoppingtag name="tfoot" /> </stoppingtags> -<children> +<tqchildren> <child name="th" /> <child name="td" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/tt.tag b/quanta/data/dtep/xhtml-strict/tt.tag index a7506a8b..91138326 100644 --- a/quanta/data/dtep/xhtml-strict/tt.tag +++ b/quanta/data/dtep/xhtml-strict/tt.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="tt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/ul.tag b/quanta/data/dtep/xhtml-strict/ul.tag index bd4404c4..9f1450f6 100644 --- a/quanta/data/dtep/xhtml-strict/ul.tag +++ b/quanta/data/dtep/xhtml-strict/ul.tag @@ -3,9 +3,9 @@ <TAGS> <tag name="ul" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml-strict/var.tag b/quanta/data/dtep/xhtml-strict/var.tag index 1c20c088..4c4e8dc3 100644 --- a/quanta/data/dtep/xhtml-strict/var.tag +++ b/quanta/data/dtep/xhtml-strict/var.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="var" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/a.tag b/quanta/data/dtep/xhtml/a.tag index 9140cd66..9fc9aeb4 100644 --- a/quanta/data/dtep/xhtml/a.tag +++ b/quanta/data/dtep/xhtml/a.tag @@ -61,7 +61,7 @@ <location col="1" row="6" /> </attr> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <text>Shape</text> <textlocation col="0" row="7" /> <location col="1" row="7" /> @@ -85,7 +85,7 @@ <location col="1" row="9" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="applet" /> @@ -126,7 +126,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/abbr.tag b/quanta/data/dtep/xhtml/abbr.tag index 9748630f..76cab4bd 100644 --- a/quanta/data/dtep/xhtml/abbr.tag +++ b/quanta/data/dtep/xhtml/abbr.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/acronym.tag b/quanta/data/dtep/xhtml/acronym.tag index 93d73b08..35634a11 100644 --- a/quanta/data/dtep/xhtml/acronym.tag +++ b/quanta/data/dtep/xhtml/acronym.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/address.tag b/quanta/data/dtep/xhtml/address.tag index 6a309b43..45b2c9fc 100644 --- a/quanta/data/dtep/xhtml/address.tag +++ b/quanta/data/dtep/xhtml/address.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="address" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,6 +45,6 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/applet.tag b/quanta/data/dtep/xhtml/applet.tag index 98aed01a..4372bef9 100644 --- a/quanta/data/dtep/xhtml/applet.tag +++ b/quanta/data/dtep/xhtml/applet.tag @@ -73,7 +73,7 @@ <location col="1" row="9" /> </attr> -<children> +<tqchildren> <child name="a" /> <child name="abbr" /> <child name="acronym" /> @@ -139,7 +139,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/area.tag b/quanta/data/dtep/xhtml/area.tag index 7bbf41b0..24dee60f 100644 --- a/quanta/data/dtep/xhtml/area.tag +++ b/quanta/data/dtep/xhtml/area.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="area" hasFocus="1" hasScript="1" hasCore="1" hasI18n="1" single="1"> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <text>Shape</text> <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2"/> diff --git a/quanta/data/dtep/xhtml/b.tag b/quanta/data/dtep/xhtml/b.tag index dac70a04..86cbb519 100644 --- a/quanta/data/dtep/xhtml/b.tag +++ b/quanta/data/dtep/xhtml/b.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="b" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/bdo.tag b/quanta/data/dtep/xhtml/bdo.tag index 2a592a37..ed648538 100644 --- a/quanta/data/dtep/xhtml/bdo.tag +++ b/quanta/data/dtep/xhtml/bdo.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="bdo" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/big.tag b/quanta/data/dtep/xhtml/big.tag index bbf21a7c..6ebf8aad 100644 --- a/quanta/data/dtep/xhtml/big.tag +++ b/quanta/data/dtep/xhtml/big.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="big" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/blockquote.tag b/quanta/data/dtep/xhtml/blockquote.tag index 82709643..07170c99 100644 --- a/quanta/data/dtep/xhtml/blockquote.tag +++ b/quanta/data/dtep/xhtml/blockquote.tag @@ -10,7 +10,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -76,7 +76,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/body.tag b/quanta/data/dtep/xhtml/body.tag index c7fe5941..d2d20457 100644 --- a/quanta/data/dtep/xhtml/body.tag +++ b/quanta/data/dtep/xhtml/body.tag @@ -56,7 +56,7 @@ <location col="1" row="7" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -122,7 +122,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/button.tag b/quanta/data/dtep/xhtml/button.tag index 011def6a..52a481c6 100644 --- a/quanta/data/dtep/xhtml/button.tag +++ b/quanta/data/dtep/xhtml/button.tag @@ -32,7 +32,7 @@ <tooltip>Disable the element</tooltip> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="acronym" /> @@ -88,6 +88,6 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/caption.tag b/quanta/data/dtep/xhtml/caption.tag index 8936eb10..92a47799 100644 --- a/quanta/data/dtep/xhtml/caption.tag +++ b/quanta/data/dtep/xhtml/caption.tag @@ -15,7 +15,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -57,7 +57,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/center.tag b/quanta/data/dtep/xhtml/center.tag index 860eff90..2351c61a 100644 --- a/quanta/data/dtep/xhtml/center.tag +++ b/quanta/data/dtep/xhtml/center.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="center" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -69,7 +69,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/cite.tag b/quanta/data/dtep/xhtml/cite.tag index 57f00da6..1a92b725 100644 --- a/quanta/data/dtep/xhtml/cite.tag +++ b/quanta/data/dtep/xhtml/cite.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="cite" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/code.tag b/quanta/data/dtep/xhtml/code.tag index e96dfd0b..29f1147c 100644 --- a/quanta/data/dtep/xhtml/code.tag +++ b/quanta/data/dtep/xhtml/code.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="code" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/colgroup.tag b/quanta/data/dtep/xhtml/colgroup.tag index d4ecc9a8..20c27974 100644 --- a/quanta/data/dtep/xhtml/colgroup.tag +++ b/quanta/data/dtep/xhtml/colgroup.tag @@ -54,8 +54,8 @@ You can add multiple values with commas</tooltip> <location col="1" row="5" /> </attr> -<children> +<tqchildren> <child name="col" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/dd.tag b/quanta/data/dtep/xhtml/dd.tag index 7b6779b9..a56729a4 100644 --- a/quanta/data/dtep/xhtml/dd.tag +++ b/quanta/data/dtep/xhtml/dd.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="dd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -69,7 +69,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/del.tag b/quanta/data/dtep/xhtml/del.tag index f4026744..1ae3dae3 100644 --- a/quanta/data/dtep/xhtml/del.tag +++ b/quanta/data/dtep/xhtml/del.tag @@ -15,7 +15,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -81,7 +81,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/dfn.tag b/quanta/data/dtep/xhtml/dfn.tag index dcd1fbb9..432f3931 100644 --- a/quanta/data/dtep/xhtml/dfn.tag +++ b/quanta/data/dtep/xhtml/dfn.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/dir.tag b/quanta/data/dtep/xhtml/dir.tag index 13612182..a63731e9 100644 --- a/quanta/data/dtep/xhtml/dir.tag +++ b/quanta/data/dtep/xhtml/dir.tag @@ -8,9 +8,9 @@ <location col="0" row="0" /> </attr> -<children> +<tqchildren> <child name="li" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/div.tag b/quanta/data/dtep/xhtml/div.tag index 21a5b47c..6b033710 100644 --- a/quanta/data/dtep/xhtml/div.tag +++ b/quanta/data/dtep/xhtml/div.tag @@ -16,7 +16,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -82,7 +82,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/dl.tag b/quanta/data/dtep/xhtml/dl.tag index 1f38c5a0..32c9f645 100644 --- a/quanta/data/dtep/xhtml/dl.tag +++ b/quanta/data/dtep/xhtml/dl.tag @@ -8,9 +8,9 @@ <location col="0" row="0" /> </attr> -<children> +<tqchildren> <child name="dt" /> <child name="dd" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/dt.tag b/quanta/data/dtep/xhtml/dt.tag index 4d9192aa..18d1d506 100644 --- a/quanta/data/dtep/xhtml/dt.tag +++ b/quanta/data/dtep/xhtml/dt.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="dt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/em.tag b/quanta/data/dtep/xhtml/em.tag index 3c5005b1..b2765e02 100644 --- a/quanta/data/dtep/xhtml/em.tag +++ b/quanta/data/dtep/xhtml/em.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="em" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/fieldset.tag b/quanta/data/dtep/xhtml/fieldset.tag index 550b5e7f..8db70f7d 100644 --- a/quanta/data/dtep/xhtml/fieldset.tag +++ b/quanta/data/dtep/xhtml/fieldset.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="fieldset" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -70,7 +70,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/font.tag b/quanta/data/dtep/xhtml/font.tag index 61c00a64..bb1df39f 100644 --- a/quanta/data/dtep/xhtml/font.tag +++ b/quanta/data/dtep/xhtml/font.tag @@ -39,7 +39,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -81,7 +81,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/form.tag b/quanta/data/dtep/xhtml/form.tag index e913755e..cb7798e4 100644 --- a/quanta/data/dtep/xhtml/form.tag +++ b/quanta/data/dtep/xhtml/form.tag @@ -80,7 +80,7 @@ <location col="1" row="8" colspan="3"/> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -145,7 +145,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/head.tag b/quanta/data/dtep/xhtml/head.tag index 9305caea..74e94d81 100644 --- a/quanta/data/dtep/xhtml/head.tag +++ b/quanta/data/dtep/xhtml/head.tag @@ -15,7 +15,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="base" /> <child name="link" /> <child name="meta" usage="required" /> @@ -24,7 +24,7 @@ <child name="script" /> <child name="style" /> <child name="isindex" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/headings.tag b/quanta/data/dtep/xhtml/headings.tag index 37e6eca2..6f2ab4f5 100644 --- a/quanta/data/dtep/xhtml/headings.tag +++ b/quanta/data/dtep/xhtml/headings.tag @@ -16,7 +16,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -58,7 +58,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -77,7 +77,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -119,7 +119,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -138,7 +138,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -180,7 +180,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -199,7 +199,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -241,7 +241,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -260,7 +260,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -302,7 +302,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> @@ -321,7 +321,7 @@ </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -363,7 +363,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/html.tag b/quanta/data/dtep/xhtml/html.tag index afc592c3..45a26694 100644 --- a/quanta/data/dtep/xhtml/html.tag +++ b/quanta/data/dtep/xhtml/html.tag @@ -18,10 +18,10 @@ </items> </attr> -<children> +<tqchildren> <child name="head" /> <child name="body" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/i.tag b/quanta/data/dtep/xhtml/i.tag index 45855df4..0b4e0b1e 100644 --- a/quanta/data/dtep/xhtml/i.tag +++ b/quanta/data/dtep/xhtml/i.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/iframe.tag b/quanta/data/dtep/xhtml/iframe.tag index 7c09ad13..3f4420e6 100644 --- a/quanta/data/dtep/xhtml/iframe.tag +++ b/quanta/data/dtep/xhtml/iframe.tag @@ -88,7 +88,7 @@ <location col="1" row="12" /> </attr> -<children> +<tqchildren> <child name="a" /> <child name="abbr" /> <child name="acronym" /> @@ -153,7 +153,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/ins.tag b/quanta/data/dtep/xhtml/ins.tag index e3b082e8..16dadd0c 100644 --- a/quanta/data/dtep/xhtml/ins.tag +++ b/quanta/data/dtep/xhtml/ins.tag @@ -15,7 +15,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -81,7 +81,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/kbd.tag b/quanta/data/dtep/xhtml/kbd.tag index 433d0310..f71fcb58 100644 --- a/quanta/data/dtep/xhtml/kbd.tag +++ b/quanta/data/dtep/xhtml/kbd.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/label.tag b/quanta/data/dtep/xhtml/label.tag index 249d512a..bf1fce54 100644 --- a/quanta/data/dtep/xhtml/label.tag +++ b/quanta/data/dtep/xhtml/label.tag @@ -27,7 +27,7 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -69,7 +69,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/legend.tag b/quanta/data/dtep/xhtml/legend.tag index 18de65d3..0b7d7cb3 100644 --- a/quanta/data/dtep/xhtml/legend.tag +++ b/quanta/data/dtep/xhtml/legend.tag @@ -22,7 +22,7 @@ <location col="1" row="1" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -64,7 +64,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/li.tag b/quanta/data/dtep/xhtml/li.tag index f6644cee..5bc5ca06 100644 --- a/quanta/data/dtep/xhtml/li.tag +++ b/quanta/data/dtep/xhtml/li.tag @@ -29,7 +29,7 @@ <stoppingtag name="li" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -95,7 +95,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/map.tag b/quanta/data/dtep/xhtml/map.tag index b64d44f2..9852af99 100644 --- a/quanta/data/dtep/xhtml/map.tag +++ b/quanta/data/dtep/xhtml/map.tag @@ -9,7 +9,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="address" /> <child name="area" /> <child name="blockquote" /> @@ -38,7 +38,7 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/menu.tag b/quanta/data/dtep/xhtml/menu.tag index 10322fc8..a98f6d53 100644 --- a/quanta/data/dtep/xhtml/menu.tag +++ b/quanta/data/dtep/xhtml/menu.tag @@ -8,9 +8,9 @@ <location col="0" row="0" /> </attr> -<children> +<tqchildren> <child name="li" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/noframes.tag b/quanta/data/dtep/xhtml/noframes.tag index 758e6cb2..b932929e 100644 --- a/quanta/data/dtep/xhtml/noframes.tag +++ b/quanta/data/dtep/xhtml/noframes.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="noframes" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="a" /> <child name="abbr" /> <child name="acronym" /> @@ -68,7 +68,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/noscript.tag b/quanta/data/dtep/xhtml/noscript.tag index 0c604a67..ec2f3ac3 100644 --- a/quanta/data/dtep/xhtml/noscript.tag +++ b/quanta/data/dtep/xhtml/noscript.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -69,7 +69,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/object.tag b/quanta/data/dtep/xhtml/object.tag index baebd55d..10513193 100644 --- a/quanta/data/dtep/xhtml/object.tag +++ b/quanta/data/dtep/xhtml/object.tag @@ -136,7 +136,7 @@ <location col="3" row="7" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -203,7 +203,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/ol.tag b/quanta/data/dtep/xhtml/ol.tag index 4a33b85a..2d2e2fb1 100644 --- a/quanta/data/dtep/xhtml/ol.tag +++ b/quanta/data/dtep/xhtml/ol.tag @@ -28,9 +28,9 @@ <location col="0" row="2" colspan="2" /> </attr> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/optgroup.tag b/quanta/data/dtep/xhtml/optgroup.tag index 08a52ff5..56839297 100644 --- a/quanta/data/dtep/xhtml/optgroup.tag +++ b/quanta/data/dtep/xhtml/optgroup.tag @@ -15,9 +15,9 @@ <location col="1" row="0" colspan="1" /> </attr> -<children> +<tqchildren> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/p.tag b/quanta/data/dtep/xhtml/p.tag index aabd50f8..b9bea07e 100644 --- a/quanta/data/dtep/xhtml/p.tag +++ b/quanta/data/dtep/xhtml/p.tag @@ -26,7 +26,7 @@ <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -68,7 +68,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/pre.tag b/quanta/data/dtep/xhtml/pre.tag index 0b861099..b4d70015 100644 --- a/quanta/data/dtep/xhtml/pre.tag +++ b/quanta/data/dtep/xhtml/pre.tag @@ -17,7 +17,7 @@ <item>preserve</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -48,6 +48,6 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/q.tag b/quanta/data/dtep/xhtml/q.tag index abc31b1b..b1577c29 100644 --- a/quanta/data/dtep/xhtml/q.tag +++ b/quanta/data/dtep/xhtml/q.tag @@ -9,7 +9,7 @@ <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -51,7 +51,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/s.tag b/quanta/data/dtep/xhtml/s.tag index 419cb720..5f072e92 100644 --- a/quanta/data/dtep/xhtml/s.tag +++ b/quanta/data/dtep/xhtml/s.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="s" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="a" /> <child name="abbr" /> <child name="applet" /> @@ -44,7 +44,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/samp.tag b/quanta/data/dtep/xhtml/samp.tag index 6cecf4e0..e84d0525 100644 --- a/quanta/data/dtep/xhtml/samp.tag +++ b/quanta/data/dtep/xhtml/samp.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="samp" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/select.tag b/quanta/data/dtep/xhtml/select.tag index d0c87373..fb17bd73 100644 --- a/quanta/data/dtep/xhtml/select.tag +++ b/quanta/data/dtep/xhtml/select.tag @@ -53,10 +53,10 @@ <stoppingtag name="select" /> </stoppingtags> -<children> +<tqchildren> <child name="optgroup" /> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/small.tag b/quanta/data/dtep/xhtml/small.tag index 4d045201..9799ee96 100644 --- a/quanta/data/dtep/xhtml/small.tag +++ b/quanta/data/dtep/xhtml/small.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="small" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/span.tag b/quanta/data/dtep/xhtml/span.tag index d674850e..82241f9c 100644 --- a/quanta/data/dtep/xhtml/span.tag +++ b/quanta/data/dtep/xhtml/span.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="span" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/strike.tag b/quanta/data/dtep/xhtml/strike.tag index 4907d5be..03d9e85c 100644 --- a/quanta/data/dtep/xhtml/strike.tag +++ b/quanta/data/dtep/xhtml/strike.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="strike" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="a" /> <child name="abbr" /> <child name="applet" /> @@ -44,7 +44,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/strong.tag b/quanta/data/dtep/xhtml/strong.tag index 2be3da65..0ec79185 100644 --- a/quanta/data/dtep/xhtml/strong.tag +++ b/quanta/data/dtep/xhtml/strong.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/style.tag b/quanta/data/dtep/xhtml/style.tag index 781181b4..5cad56d6 100644 --- a/quanta/data/dtep/xhtml/style.tag +++ b/quanta/data/dtep/xhtml/style.tag @@ -50,8 +50,8 @@ <item>preserve</item> </items> </attr> - <children> + <tqchildren> <child name="#text" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/sub.tag b/quanta/data/dtep/xhtml/sub.tag index ec46544b..315c5ab0 100644 --- a/quanta/data/dtep/xhtml/sub.tag +++ b/quanta/data/dtep/xhtml/sub.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="sub" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/sup.tag b/quanta/data/dtep/xhtml/sup.tag index 176cf71a..07eac389 100644 --- a/quanta/data/dtep/xhtml/sup.tag +++ b/quanta/data/dtep/xhtml/sup.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="sup" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/table.tag b/quanta/data/dtep/xhtml/table.tag index b76d5095..d5296fb2 100644 --- a/quanta/data/dtep/xhtml/table.tag +++ b/quanta/data/dtep/xhtml/table.tag @@ -83,7 +83,7 @@ <tooltip>Deprecated</tooltip> </attr> -<children> +<tqchildren> <child name="caption" /> <child name="col" /> <child name="colgroup" /> @@ -91,7 +91,7 @@ <child name="tfoot" /> <child name="tbody" /> <child name="tr" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/tbody.tag b/quanta/data/dtep/xhtml/tbody.tag index db13711d..c04eebf6 100644 --- a/quanta/data/dtep/xhtml/tbody.tag +++ b/quanta/data/dtep/xhtml/tbody.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/td.tag b/quanta/data/dtep/xhtml/td.tag index e46c9414..39e99979 100644 --- a/quanta/data/dtep/xhtml/td.tag +++ b/quanta/data/dtep/xhtml/td.tag @@ -115,7 +115,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -181,7 +181,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/textarea.tag b/quanta/data/dtep/xhtml/textarea.tag index ea019898..6612247b 100644 --- a/quanta/data/dtep/xhtml/textarea.tag +++ b/quanta/data/dtep/xhtml/textarea.tag @@ -42,8 +42,8 @@ <textlocation col="0" row="4" colspan="1" /> <location col="1" row="4" colspan="3" /> </attr> - <children> + <tqchildren> <child name="#text" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/tfoot.tag b/quanta/data/dtep/xhtml/tfoot.tag index e07605f4..cca684ca 100644 --- a/quanta/data/dtep/xhtml/tfoot.tag +++ b/quanta/data/dtep/xhtml/tfoot.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/th.tag b/quanta/data/dtep/xhtml/th.tag index 78b82c25..6720e4e0 100644 --- a/quanta/data/dtep/xhtml/th.tag +++ b/quanta/data/dtep/xhtml/th.tag @@ -115,7 +115,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -181,7 +181,7 @@ <child name="u" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/thead.tag b/quanta/data/dtep/xhtml/thead.tag index 059263d1..5bb973ca 100644 --- a/quanta/data/dtep/xhtml/thead.tag +++ b/quanta/data/dtep/xhtml/thead.tag @@ -40,9 +40,9 @@ <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/title.tag b/quanta/data/dtep/xhtml/title.tag index f24df571..02ef0059 100644 --- a/quanta/data/dtep/xhtml/title.tag +++ b/quanta/data/dtep/xhtml/title.tag @@ -7,8 +7,8 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/tr.tag b/quanta/data/dtep/xhtml/tr.tag index 4baf805c..e1611664 100644 --- a/quanta/data/dtep/xhtml/tr.tag +++ b/quanta/data/dtep/xhtml/tr.tag @@ -45,9 +45,9 @@ <stoppingtag name="tfoot" /> </stoppingtags> -<children> +<tqchildren> <child name="th" /> <child name="td" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/tt.tag b/quanta/data/dtep/xhtml/tt.tag index 08f25532..768f3791 100644 --- a/quanta/data/dtep/xhtml/tt.tag +++ b/quanta/data/dtep/xhtml/tt.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="tt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/u.tag b/quanta/data/dtep/xhtml/u.tag index 38e47050..56a4e61e 100644 --- a/quanta/data/dtep/xhtml/u.tag +++ b/quanta/data/dtep/xhtml/u.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="u" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/ul.tag b/quanta/data/dtep/xhtml/ul.tag index 21443c5d..bb30c1c6 100644 --- a/quanta/data/dtep/xhtml/ul.tag +++ b/quanta/data/dtep/xhtml/ul.tag @@ -20,9 +20,9 @@ <location col="0" row="1" /> </attr> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml/var.tag b/quanta/data/dtep/xhtml/var.tag index 74e336d4..2b0bddb5 100644 --- a/quanta/data/dtep/xhtml/var.tag +++ b/quanta/data/dtep/xhtml/var.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="var" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -45,7 +45,7 @@ <child name="tt" /> <child name="u" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/a.tag b/quanta/data/dtep/xhtml11/a.tag index eda33421..34ccd660 100644 --- a/quanta/data/dtep/xhtml11/a.tag +++ b/quanta/data/dtep/xhtml11/a.tag @@ -59,7 +59,7 @@ <attr name="charset" type="input" /> <attr name="accesskey" type="input" /> <attr name="tabindex" type="input" /> - <attr name="shape" type="list"> + <attr name="tqshape" type="list"> <items> <item>rect</item> <item>circle</item> @@ -69,7 +69,7 @@ </attr> <attr name="coords" type="input" /> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="acronym" /> @@ -103,6 +103,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/abbr.tag b/quanta/data/dtep/xhtml11/abbr.tag index b988c322..08fc6d94 100644 --- a/quanta/data/dtep/xhtml11/abbr.tag +++ b/quanta/data/dtep/xhtml11/abbr.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="abbr" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/acronym.tag b/quanta/data/dtep/xhtml11/acronym.tag index 12bf30f1..c2a2eba5 100644 --- a/quanta/data/dtep/xhtml11/acronym.tag +++ b/quanta/data/dtep/xhtml11/acronym.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="acronym" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/address.tag b/quanta/data/dtep/xhtml11/address.tag index 3b1f699e..c74c8141 100644 --- a/quanta/data/dtep/xhtml11/address.tag +++ b/quanta/data/dtep/xhtml11/address.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="address" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/applet.tag b/quanta/data/dtep/xhtml11/applet.tag index 1a9d5acd..e4bec12d 100644 --- a/quanta/data/dtep/xhtml11/applet.tag +++ b/quanta/data/dtep/xhtml11/applet.tag @@ -63,7 +63,7 @@ <location col="3" row="9" colspan="1" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -117,7 +117,7 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/area.tag b/quanta/data/dtep/xhtml11/area.tag index 1c992e3b..67c45a1d 100644 --- a/quanta/data/dtep/xhtml11/area.tag +++ b/quanta/data/dtep/xhtml11/area.tag @@ -3,8 +3,8 @@ <TAGS> <tag name="area" hasFocus="1" hasScript="1" hasCore="1" hasI18n="1" single="1"> - <attr name="shape" type="list"> - <text>shape</text> + <attr name="tqshape" type="list"> + <text>tqshape</text> <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2"/> <items> diff --git a/quanta/data/dtep/xhtml11/b.tag b/quanta/data/dtep/xhtml11/b.tag index 54e28332..736049f5 100644 --- a/quanta/data/dtep/xhtml11/b.tag +++ b/quanta/data/dtep/xhtml11/b.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="b" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/bdo.tag b/quanta/data/dtep/xhtml11/bdo.tag index 47fc984f..6981975c 100644 --- a/quanta/data/dtep/xhtml11/bdo.tag +++ b/quanta/data/dtep/xhtml11/bdo.tag @@ -13,7 +13,7 @@ <item>rtl</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -48,6 +48,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/big.tag b/quanta/data/dtep/xhtml11/big.tag index b951e28b..c9ca87ac 100644 --- a/quanta/data/dtep/xhtml11/big.tag +++ b/quanta/data/dtep/xhtml11/big.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="big" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/blockquote.tag b/quanta/data/dtep/xhtml11/blockquote.tag index b74910eb..1ac79dbf 100644 --- a/quanta/data/dtep/xhtml11/blockquote.tag +++ b/quanta/data/dtep/xhtml11/blockquote.tag @@ -8,7 +8,7 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="del" /> @@ -31,6 +31,6 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/body.tag b/quanta/data/dtep/xhtml11/body.tag index 6b46aba5..50117437 100644 --- a/quanta/data/dtep/xhtml11/body.tag +++ b/quanta/data/dtep/xhtml11/body.tag @@ -14,7 +14,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="del" /> @@ -37,6 +37,6 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/button.tag b/quanta/data/dtep/xhtml11/button.tag index c659c0e3..0c204c06 100644 --- a/quanta/data/dtep/xhtml11/button.tag +++ b/quanta/data/dtep/xhtml11/button.tag @@ -15,7 +15,7 @@ <attr name="disabled" type="check" /> -<children> +<tqchildren> <child name="#text" /> <child name="abbr" /> <child name="acronym" /> @@ -61,6 +61,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/caption.tag b/quanta/data/dtep/xhtml11/caption.tag index 0d433812..956ed2bd 100644 --- a/quanta/data/dtep/xhtml11/caption.tag +++ b/quanta/data/dtep/xhtml11/caption.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="caption" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/cite.tag b/quanta/data/dtep/xhtml11/cite.tag index 58cb492f..b3e2e76b 100644 --- a/quanta/data/dtep/xhtml11/cite.tag +++ b/quanta/data/dtep/xhtml11/cite.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="cite" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/code.tag b/quanta/data/dtep/xhtml11/code.tag index b29a87d4..625050da 100644 --- a/quanta/data/dtep/xhtml11/code.tag +++ b/quanta/data/dtep/xhtml11/code.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="code" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/col.tag b/quanta/data/dtep/xhtml11/col.tag index 9bad383d..e900365a 100644 --- a/quanta/data/dtep/xhtml11/col.tag +++ b/quanta/data/dtep/xhtml11/col.tag @@ -45,14 +45,14 @@ You can add multiple values with commas</tooltip> <attr name="char" type="input"> <text>char</text> <textlocation col="0" row="4" /> - <tooltip>alignment character for cells</tooltip> + <tooltip>tqalignment character for cells</tooltip> <location col="1" row="4" /> </attr> <attr name="charoff" type="input"> <text>charoff</text> <textlocation col="0" row="5" /> - <tooltip>alignment character offset</tooltip> + <tooltip>tqalignment character offset</tooltip> <location col="1" row="5" /> </attr> diff --git a/quanta/data/dtep/xhtml11/colgroup.tag b/quanta/data/dtep/xhtml11/colgroup.tag index a0dfb5d2..548a7cb8 100644 --- a/quanta/data/dtep/xhtml11/colgroup.tag +++ b/quanta/data/dtep/xhtml11/colgroup.tag @@ -45,19 +45,19 @@ You can add multiple values with commas</tooltip> <attr name="char" type="input"> <text>char</text> <textlocation col="0" row="4" /> - <tooltip>alignment character for cells</tooltip> + <tooltip>tqalignment character for cells</tooltip> <location col="1" row="4" /> </attr> <attr name="charoff" type="input"> <text>charoff</text> <textlocation col="0" row="5" /> - <tooltip>alignment character offset</tooltip> + <tooltip>tqalignment character offset</tooltip> <location col="1" row="5" /> </attr> -<children> +<tqchildren> <child name="col" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/dd.tag b/quanta/data/dtep/xhtml11/dd.tag index 97992bf9..53fda2d1 100644 --- a/quanta/data/dtep/xhtml11/dd.tag +++ b/quanta/data/dtep/xhtml11/dd.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="dd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -56,6 +56,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/del.tag b/quanta/data/dtep/xhtml11/del.tag index 1a7c17db..dc48ab2b 100644 --- a/quanta/data/dtep/xhtml11/del.tag +++ b/quanta/data/dtep/xhtml11/del.tag @@ -14,7 +14,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -68,6 +68,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/dfn.tag b/quanta/data/dtep/xhtml11/dfn.tag index fbeb6d72..42d4d6fc 100644 --- a/quanta/data/dtep/xhtml11/dfn.tag +++ b/quanta/data/dtep/xhtml11/dfn.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="dfn" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/div.tag b/quanta/data/dtep/xhtml11/div.tag index 1f8500f0..dde0e712 100644 --- a/quanta/data/dtep/xhtml11/div.tag +++ b/quanta/data/dtep/xhtml11/div.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="div" hasScript="1" hasCore="1" hasI18n="1" scope="paragraph"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -56,6 +56,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/dl.tag b/quanta/data/dtep/xhtml11/dl.tag index 430067b8..d1edcf28 100644 --- a/quanta/data/dtep/xhtml11/dl.tag +++ b/quanta/data/dtep/xhtml11/dl.tag @@ -2,9 +2,9 @@ <!DOCTYPE TAGS> <TAGS> <tag name="dl" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="dt" /> <child name="dd" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/dt.tag b/quanta/data/dtep/xhtml11/dt.tag index ef239795..efc31477 100644 --- a/quanta/data/dtep/xhtml11/dt.tag +++ b/quanta/data/dtep/xhtml11/dt.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="dt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/em.tag b/quanta/data/dtep/xhtml11/em.tag index 807065df..f858197f 100644 --- a/quanta/data/dtep/xhtml11/em.tag +++ b/quanta/data/dtep/xhtml11/em.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="em" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/fieldset.tag b/quanta/data/dtep/xhtml11/fieldset.tag index c2bc156f..7ab940b3 100644 --- a/quanta/data/dtep/xhtml11/fieldset.tag +++ b/quanta/data/dtep/xhtml11/fieldset.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="fieldset" hasScript="1" hasCore="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -59,7 +59,7 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/form.tag b/quanta/data/dtep/xhtml11/form.tag index c332c515..5f851d9d 100644 --- a/quanta/data/dtep/xhtml11/form.tag +++ b/quanta/data/dtep/xhtml11/form.tag @@ -57,7 +57,7 @@ <location col="3" row="6"/> </attr> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="del" /> @@ -79,6 +79,6 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/head.tag b/quanta/data/dtep/xhtml11/head.tag index b53932b3..30b8fad8 100644 --- a/quanta/data/dtep/xhtml11/head.tag +++ b/quanta/data/dtep/xhtml11/head.tag @@ -15,7 +15,7 @@ <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="base" /> <child name="link" /> <child name="meta" usage="required" /> @@ -23,7 +23,7 @@ <child name="title" usage="required" /> <child name="script" /> <child name="style" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/headings.tag b/quanta/data/dtep/xhtml11/headings.tag index eb0b4fa0..dc23edec 100644 --- a/quanta/data/dtep/xhtml11/headings.tag +++ b/quanta/data/dtep/xhtml11/headings.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="h1" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -38,11 +38,11 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h2" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -77,11 +77,11 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h3" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -116,11 +116,11 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h4" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -155,11 +155,11 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h5" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -194,11 +194,11 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> <tag name="h6" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -233,7 +233,7 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/html.tag b/quanta/data/dtep/xhtml11/html.tag index 22894f8d..7794c33a 100644 --- a/quanta/data/dtep/xhtml11/html.tag +++ b/quanta/data/dtep/xhtml11/html.tag @@ -16,10 +16,10 @@ <items><item>http://www.w3.org/1999/xhtml</item></items> </attr> -<children> +<tqchildren> <child name="body" /> <child name="head" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/i.tag b/quanta/data/dtep/xhtml11/i.tag index 36dbd43a..f7bcd0ef 100644 --- a/quanta/data/dtep/xhtml11/i.tag +++ b/quanta/data/dtep/xhtml11/i.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/ins.tag b/quanta/data/dtep/xhtml11/ins.tag index c088199f..37c7be63 100644 --- a/quanta/data/dtep/xhtml11/ins.tag +++ b/quanta/data/dtep/xhtml11/ins.tag @@ -14,7 +14,7 @@ <textlocation col="0" row="1" /> <location col="1" row="1" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -68,6 +68,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/kbd.tag b/quanta/data/dtep/xhtml11/kbd.tag index 2b222085..246f6230 100644 --- a/quanta/data/dtep/xhtml11/kbd.tag +++ b/quanta/data/dtep/xhtml11/kbd.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="kbd" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/label.tag b/quanta/data/dtep/xhtml11/label.tag index 75fb81c6..efb6174a 100644 --- a/quanta/data/dtep/xhtml11/label.tag +++ b/quanta/data/dtep/xhtml11/label.tag @@ -26,7 +26,7 @@ <textlocation col="0" row="3" /> <location col="1" row="3" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -61,6 +61,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/legend.tag b/quanta/data/dtep/xhtml11/legend.tag index 048dff82..a55a5880 100644 --- a/quanta/data/dtep/xhtml11/legend.tag +++ b/quanta/data/dtep/xhtml11/legend.tag @@ -9,7 +9,7 @@ <location col="3" row="0" colspan="1" /> <tooltip>Shortcut</tooltip> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -44,6 +44,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/li.tag b/quanta/data/dtep/xhtml11/li.tag index 5ceb4358..66fd4600 100644 --- a/quanta/data/dtep/xhtml11/li.tag +++ b/quanta/data/dtep/xhtml11/li.tag @@ -6,7 +6,7 @@ <stoppingtags> <stoppingtag name="li" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -60,6 +60,6 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/map.tag b/quanta/data/dtep/xhtml11/map.tag index 156f895f..4edddf1e 100644 --- a/quanta/data/dtep/xhtml11/map.tag +++ b/quanta/data/dtep/xhtml11/map.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="map" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="address" /> <child name="area" /> <child name="blockquote" /> @@ -27,7 +27,7 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/noscript.tag b/quanta/data/dtep/xhtml11/noscript.tag index 86b73ab5..8a9cb611 100644 --- a/quanta/data/dtep/xhtml11/noscript.tag +++ b/quanta/data/dtep/xhtml11/noscript.tag @@ -3,7 +3,7 @@ <TAGS> <tag name="noscript" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="address" /> <child name="blockquote" /> <child name="del" /> @@ -26,6 +26,6 @@ <child name="script" /> <child name="table" /> <child name="ul" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/object.tag b/quanta/data/dtep/xhtml11/object.tag index 3953c45b..a76d9589 100644 --- a/quanta/data/dtep/xhtml11/object.tag +++ b/quanta/data/dtep/xhtml11/object.tag @@ -121,7 +121,7 @@ <location col="3" row="15" colspan="1" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -175,7 +175,7 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/ol.tag b/quanta/data/dtep/xhtml11/ol.tag index 25c76d7a..98e58f38 100644 --- a/quanta/data/dtep/xhtml11/ol.tag +++ b/quanta/data/dtep/xhtml11/ol.tag @@ -3,9 +3,9 @@ <TAGS> <tag name="ol" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/optgroup.tag b/quanta/data/dtep/xhtml11/optgroup.tag index 82452057..57c7c978 100644 --- a/quanta/data/dtep/xhtml11/optgroup.tag +++ b/quanta/data/dtep/xhtml11/optgroup.tag @@ -15,9 +15,9 @@ <location col="1" row="1" colspan="1" /> </attr> -<children> +<tqchildren> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/p.tag b/quanta/data/dtep/xhtml11/p.tag index bffe7b97..52233810 100644 --- a/quanta/data/dtep/xhtml11/p.tag +++ b/quanta/data/dtep/xhtml11/p.tag @@ -13,7 +13,7 @@ <stoppingtag name="dd" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -48,7 +48,7 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/pre.tag b/quanta/data/dtep/xhtml11/pre.tag index 623064c4..03f41221 100644 --- a/quanta/data/dtep/xhtml11/pre.tag +++ b/quanta/data/dtep/xhtml11/pre.tag @@ -11,7 +11,7 @@ <item>preserve</item> </items> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -40,6 +40,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/q.tag b/quanta/data/dtep/xhtml11/q.tag index 1eaefcd1..ad91bfe2 100644 --- a/quanta/data/dtep/xhtml11/q.tag +++ b/quanta/data/dtep/xhtml11/q.tag @@ -8,7 +8,7 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -43,6 +43,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/rbc.tag b/quanta/data/dtep/xhtml11/rbc.tag index fbd5b7ec..5f73674a 100644 --- a/quanta/data/dtep/xhtml11/rbc.tag +++ b/quanta/data/dtep/xhtml11/rbc.tag @@ -2,8 +2,8 @@ <!DOCTYPE TAGS> <TAGS> <tag name="rbc" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="rb" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/rtc.tag b/quanta/data/dtep/xhtml11/rtc.tag index 97c21176..67abdda7 100644 --- a/quanta/data/dtep/xhtml11/rtc.tag +++ b/quanta/data/dtep/xhtml11/rtc.tag @@ -2,8 +2,8 @@ <!DOCTYPE TAGS> <TAGS> <tag name="rtc" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="rt" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/ruby.tag b/quanta/data/dtep/xhtml11/ruby.tag index d133114f..5a55cdff 100644 --- a/quanta/data/dtep/xhtml11/ruby.tag +++ b/quanta/data/dtep/xhtml11/ruby.tag @@ -2,12 +2,12 @@ <!DOCTYPE TAGS> <TAGS> <tag name="ruby" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="rb" /> <child name="rt" /> <child name="rp" /> <child name="rtc" /> <child name="rbc" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/samp.tag b/quanta/data/dtep/xhtml11/samp.tag index 2ec41eb4..e0f7bdf7 100644 --- a/quanta/data/dtep/xhtml11/samp.tag +++ b/quanta/data/dtep/xhtml11/samp.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="samp" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/select.tag b/quanta/data/dtep/xhtml11/select.tag index 74eb9e58..31ada1cc 100644 --- a/quanta/data/dtep/xhtml11/select.tag +++ b/quanta/data/dtep/xhtml11/select.tag @@ -47,9 +47,9 @@ <stoppingtag name="select" /> </stoppingtags> -<children> +<tqchildren> <child name="optgroup" /> <child name="option" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/small.tag b/quanta/data/dtep/xhtml11/small.tag index 0fdbe561..0d2c4263 100644 --- a/quanta/data/dtep/xhtml11/small.tag +++ b/quanta/data/dtep/xhtml11/small.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="small" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/span.tag b/quanta/data/dtep/xhtml11/span.tag index ca85ab65..6218d5d7 100644 --- a/quanta/data/dtep/xhtml11/span.tag +++ b/quanta/data/dtep/xhtml11/span.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="span" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/strong.tag b/quanta/data/dtep/xhtml11/strong.tag index 98d57d89..3bc13488 100644 --- a/quanta/data/dtep/xhtml11/strong.tag +++ b/quanta/data/dtep/xhtml11/strong.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/style.tag b/quanta/data/dtep/xhtml11/style.tag index d3c16a0e..648217c5 100644 --- a/quanta/data/dtep/xhtml11/style.tag +++ b/quanta/data/dtep/xhtml11/style.tag @@ -53,8 +53,8 @@ <textlocation col="0" row="5" /> <location col="1" row="5" colspan="2" /> </attr> - <children> + <tqchildren> <child name="#text" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/sub.tag b/quanta/data/dtep/xhtml11/sub.tag index 5691c5f0..0a195674 100644 --- a/quanta/data/dtep/xhtml11/sub.tag +++ b/quanta/data/dtep/xhtml11/sub.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="sub" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/sup.tag b/quanta/data/dtep/xhtml11/sup.tag index 33e052d3..815c4e35 100644 --- a/quanta/data/dtep/xhtml11/sup.tag +++ b/quanta/data/dtep/xhtml11/sup.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="sup" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/table.tag b/quanta/data/dtep/xhtml11/table.tag index 2680b2d3..334a0d91 100644 --- a/quanta/data/dtep/xhtml11/table.tag +++ b/quanta/data/dtep/xhtml11/table.tag @@ -65,7 +65,7 @@ <location col="1" row="5" colspan="2"/> </attr> -<children> +<tqchildren> <child name="caption" /> <child name="col" /> <child name="colgroup" /> @@ -73,7 +73,7 @@ <child name="tfoot" /> <child name="tbody" /> <child name="tr" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/tbody.tag b/quanta/data/dtep/xhtml11/tbody.tag index 62814633..62e80ac3 100644 --- a/quanta/data/dtep/xhtml11/tbody.tag +++ b/quanta/data/dtep/xhtml11/tbody.tag @@ -31,9 +31,9 @@ <attr name="char" type="input" /> <attr name="charoff" type="input" /> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/td.tag b/quanta/data/dtep/xhtml11/td.tag index 4ace9ce3..30ec67d6 100644 --- a/quanta/data/dtep/xhtml11/td.tag +++ b/quanta/data/dtep/xhtml11/td.tag @@ -72,7 +72,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -126,7 +126,7 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/textarea.tag b/quanta/data/dtep/xhtml11/textarea.tag index e19a6061..a0233b03 100644 --- a/quanta/data/dtep/xhtml11/textarea.tag +++ b/quanta/data/dtep/xhtml11/textarea.tag @@ -36,8 +36,8 @@ <textlocation col="2" row="5" colspan="1" /> <location col="3" row="5" colspan="1" /> </attr> - <children> + <tqchildren> <child name="#text" /> - </children> + </tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/tfoot.tag b/quanta/data/dtep/xhtml11/tfoot.tag index ec0b79a2..dadde62b 100644 --- a/quanta/data/dtep/xhtml11/tfoot.tag +++ b/quanta/data/dtep/xhtml11/tfoot.tag @@ -31,8 +31,8 @@ <attr name="char" type="input" /> <attr name="charoff" type="input" /> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/th.tag b/quanta/data/dtep/xhtml11/th.tag index bd944333..3d8e539c 100644 --- a/quanta/data/dtep/xhtml11/th.tag +++ b/quanta/data/dtep/xhtml11/th.tag @@ -72,7 +72,7 @@ <stoppingtag name="th" /> </stoppingtags> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -126,7 +126,7 @@ <child name="tt" /> <child name="ul" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/thead.tag b/quanta/data/dtep/xhtml11/thead.tag index 326a1b87..f5df6cc5 100644 --- a/quanta/data/dtep/xhtml11/thead.tag +++ b/quanta/data/dtep/xhtml11/thead.tag @@ -31,8 +31,8 @@ <attr name="char" type="input" /> <attr name="charoff" type="input" /> -<children> +<tqchildren> <child name="tr" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/title.tag b/quanta/data/dtep/xhtml11/title.tag index 4c9f61b7..76f9045c 100644 --- a/quanta/data/dtep/xhtml11/title.tag +++ b/quanta/data/dtep/xhtml11/title.tag @@ -7,8 +7,8 @@ <textlocation col="0" row="0" /> <location col="1" row="0" colspan="2" /> </attr> -<children> +<tqchildren> <child name="#text" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/tr.tag b/quanta/data/dtep/xhtml11/tr.tag index 27c68366..1ca8aa0e 100644 --- a/quanta/data/dtep/xhtml11/tr.tag +++ b/quanta/data/dtep/xhtml11/tr.tag @@ -36,9 +36,9 @@ <stoppingtag name="tfoot" /> </stoppingtags> -<children> +<tqchildren> <child name="th" /> <child name="td" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/tt.tag b/quanta/data/dtep/xhtml11/tt.tag index a7506a8b..91138326 100644 --- a/quanta/data/dtep/xhtml11/tt.tag +++ b/quanta/data/dtep/xhtml11/tt.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="tt" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/ul.tag b/quanta/data/dtep/xhtml11/ul.tag index bd4404c4..9f1450f6 100644 --- a/quanta/data/dtep/xhtml11/ul.tag +++ b/quanta/data/dtep/xhtml11/ul.tag @@ -3,9 +3,9 @@ <TAGS> <tag name="ul" hasScript="1" hasCore="1" hasI18n="1"> -<children> +<tqchildren> <child name="li" usage="required" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/dtep/xhtml11/var.tag b/quanta/data/dtep/xhtml11/var.tag index 1c20c088..4c4e8dc3 100644 --- a/quanta/data/dtep/xhtml11/var.tag +++ b/quanta/data/dtep/xhtml11/var.tag @@ -2,7 +2,7 @@ <!DOCTYPE TAGS> <TAGS> <tag name="var" hasCore="1" hasI18n="1" hasScript="1"> -<children> +<tqchildren> <child name="#text" /> <child name="a" /> <child name="abbr" /> @@ -37,6 +37,6 @@ <child name="textarea" /> <child name="tt" /> <child name="var" /> -</children> +</tqchildren> </tag> </TAGS> diff --git a/quanta/data/templates/pages/docbook/kde-doc-template.docbook b/quanta/data/templates/pages/docbook/kde-doc-template.docbook index 65a5773c..e9b610fb 100644 --- a/quanta/data/templates/pages/docbook/kde-doc-template.docbook +++ b/quanta/data/templates/pages/docbook/kde-doc-template.docbook @@ -271,7 +271,7 @@ Programming &kmyapplication; plugins is a joy to behold. Just read through the n should consult the docbook reference for further details. The example below was taken from that reference and shortened a bit for readability. --> -<refentry id="re-1007-unmanagechildren-1"> +<refentry id="re-1007-unmanagetqchildren-1"> <refmeta> <refentrytitle>XtUnmanageChildren</refentrytitle> <refmiscinfo>Xt - Geometry Management</refmiscinfo> @@ -279,10 +279,10 @@ taken from that reference and shortened a bit for readability. --> <refnamediv> <refname>XtUnmanageChildren </refname> -<refpurpose>remove a list of children from a parent widget's managed +<refpurpose>remove a list of tqchildren from a tqparent widget's managed list. -<indexterm id="ix-1007-unmanagechildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm> -<indexterm id="ix-1007-unmanagechildren-2"><primary>XtUnmanageChildren</primary></indexterm> +<indexterm id="ix-1007-unmanagetqchildren-1"><primary>widgets</primary><secondary>removing</secondary></indexterm> +<indexterm id="ix-1007-unmanagetqchildren-2"><primary>XtUnmanageChildren</primary></indexterm> </refpurpose> </refnamediv> @@ -291,16 +291,16 @@ list. <date>4 March 1996</date> </refsynopsisdivinfo> <synopsis> -void XtUnmanageChildren(<replaceable class="parameter">children</replaceable>, <replaceable class="parameter">num_children</replaceable>) - WidgetList <replaceable class="parameter">children</replaceable>; - Cardinal <replaceable class="parameter">num_children</replaceable>; +void XtUnmanageChildren(<replaceable class="parameter">tqchildren</replaceable>, <replaceable class="parameter">num_tqchildren</replaceable>) + WidgetList <replaceable class="parameter">tqchildren</replaceable>; + Cardinal <replaceable class="parameter">num_tqchildren</replaceable>; </synopsis> -<refsect2 id="r2-1007-unmanagechildren-1"> +<refsect2 id="r2-1007-unmanagetqchildren-1"> <title>Inputs</title> <variablelist> <varlistentry> -<term><replaceable class="parameter">children</replaceable> +<term><replaceable class="parameter">tqchildren</replaceable> </term> <listitem> <para>Specifies an array of child widgets. Each child must be of @@ -309,40 +309,40 @@ class RectObj or any subclass thereof. </listitem> </varlistentry> <varlistentry> -<term><replaceable class="parameter">num_children</replaceable> +<term><replaceable class="parameter">num_tqchildren</replaceable> </term> <listitem> -<para>Specifies the number of elements in <replaceable class="parameter">children</replaceable>. +<para>Specifies the number of elements in <replaceable class="parameter">tqchildren</replaceable>. </para> </listitem> </varlistentry> </variablelist> </refsect2></refsynopsisdiv> -<refsect1 id="r1-1007-unmanagechildren-1"> +<refsect1 id="r1-1007-unmanagetqchildren-1"> <title>Description </title> <para><function>XtUnmanageChildren()</function> unmaps the specified widgets -and removes them from their parent's geometry management. +and removes them from their tqparent's tqgeometry management. The widgets will disappear from the screen, and (depending -on its parent) may no longer have screen space allocated for +on its tqparent) may no longer have screen space allocated for them. </para> -<para>Each of the widgets in the <replaceable class="parameter">children</replaceable> array must have -the same parent. +<para>Each of the widgets in the <replaceable class="parameter">tqchildren</replaceable> array must have +the same tqparent. </para> <para>See the “Algorithm” section below for full details of the widget unmanagement procedure. </para> </refsect1> -<refsect1 id="r1-1007-unmanagechildren-2"> +<refsect1 id="r1-1007-unmanagetqchildren-2"> <title>Usage</title> <para>Unmanaging widgets is the usual method for temporarily making them invisible. They can be re-managed with <function>XtManageChildren()</function>. </para> -<para>You can unmap a widget, but leave it under geometry +<para>You can unmap a widget, but leave it under tqgeometry management by calling <function>XtUnmapWidget()</function>. You can destroy a widget's window without destroying the widget by calling <function>XtUnrealizeWidget()</function>. You can destroy a @@ -354,12 +354,12 @@ often more convenient to call <function>XtUnmanageChild()</function> several times than it is to declare and initialize an array of widgets to pass to <function>XtUnmanageChildren()</function>. Calling <function>XtUnmanageChildren()</function> is more efficient, however, -because it only calls the parent's <function>change_managed()</function> +because it only calls the tqparent's <function>change_managed()</function> method once. </para> </refsect1> -<refsect1 id="r1-1007-unmanagechildren-3"> +<refsect1 id="r1-1007-unmanagetqchildren-3"> <title>Algorithm </title> <para><function>XtUnmanageChildren()</function> performs the following: @@ -388,11 +388,11 @@ by unmapping it. </para> </refsect1> -<refsect1 id="r1-1007-unmanagechildren-4"> +<refsect1 id="r1-1007-unmanagetqchildren-4"> <title>Structures</title> <para>The <type>WidgetList</type> type is simply an array of widgets: </para> -<screen id="sc-1007-unmanagechildren-1">typedef Widget *WidgetList; +<screen id="sc-1007-unmanagetqchildren-1">typedef Widget *WidgetList; </screen> </refsect1> </refentry> diff --git a/quanta/data/templates/scripts/javascript/overlib.js b/quanta/data/templates/scripts/javascript/overlib.js index 4ec178bd..ed75a9ea 100644 --- a/quanta/data/templates/scripts/javascript/overlib.js +++ b/quanta/data/templates/scripts/javascript/overlib.js @@ -182,7 +182,7 @@ if (typeof ol_background == 'undefined') { var ol_background = ""; } // Normal is "Close".
if (typeof ol_close == 'undefined') { var ol_close = "Close"; }
-// Default vertical alignment for popups.
+// Default vertical tqalignment for popups.
// It's best to leave RIGHT here. Other options are LEFT and CENTER.
if (typeof ol_hpos == 'undefined') { var ol_hpos = RIGHT; }
@@ -196,11 +196,11 @@ if (typeof ol_autostatus == 'undefined') { var ol_autostatus = 0; } // Default height for popup. Often best left alone.
if (typeof ol_height == 'undefined') { var ol_height = -1; }
-// Horizontal grid spacing that popups will snap to.
+//Qt::Horizontal grid spacing that popups will snap to.
// 0 makes no grid, anything else will cause a snap to that grid spacing.
if (typeof ol_snapx == 'undefined') { var ol_snapx = 0; }
-// Vertical grid spacing that popups will snap to.
+//Qt::Vertical grid spacing that popups will snap to.
// 0 makes no grid, andthing else will cause a snap to that grid spacing.
if (typeof ol_snapy == 'undefined') { var ol_snapy = 0; }
diff --git a/quanta/data/tips b/quanta/data/tips index 609ed245..1a23291c 100644 --- a/quanta/data/tips +++ b/quanta/data/tips @@ -201,7 +201,7 @@ Just go to <b>Settings > Configure Shortcuts</b>. <tip category="Project"> <html> -<p>...that you can set the <b>Upload Status</b> of files and folders in the project tree? Right click on a project file or folder and select <i>Upload Status</i> and set the appropriate actions. This enables you to set a project root below the document root and prevent support files from uploading while requiring confirmation on sensitive data files. +<p>...that you can set the <b>Upload tqStatus</b> of files and folders in the project tree? Right click on a project file or folder and select <i>Upload tqStatus</i> and set the appropriate actions. This enables you to set a project root below the document root and prevent support files from uploading while requiring confirmation on sensitive data files. </p> </html> </tip> @@ -278,7 +278,7 @@ Just go to <b>Settings > Configure Shortcuts</b>. <tip category="Application"> <html> -<p>...that you can visually check the status of your links from within Quanta? <b>Select KLinkStatus from the Plugins menu</b> and Quanta will load a visual link checker. +<p>...that you can visually check the status of your links from within Quanta? <b>Select KLinktqStatus from the Plugins menu</b> and Quanta will load a visual link checker. </p> </html> </tip> diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index de63fc3e..d823fc1f 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -50,10 +50,10 @@ #include "tagaction.h" #include "toolbartabwidget.h" -ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* parent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) - :ActionConfigDialogS( parent, name, modal, fl ) +ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* tqparent, const char* name, bool modal, WFlags fl, const TQString& defaultAction ) + :ActionConfigDialogS( tqparent, name, modal, fl ) { - m_mainWindow = parent; + m_mainWindow = tqparent; m_toolbarList = toolbarList; buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); @@ -89,7 +89,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, for (int i = 0; i < tb->count(); i++) { toolbarName = tb->label(i); - toolbarName.replace(r, ""); + toolbarName.tqreplace(r, ""); item = new KListViewItem(actionTreeView, oldItem, i18n(toolbarName.utf8())); actionTreeView->insertItem(item); @@ -106,13 +106,13 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, action = ac->action(node.toElement().attribute("name").ascii()); if (action) { - oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name()); + oldActionItem = new KListViewItem(item, oldActionItem, action->text().tqreplace(r,""), action->shortcut().toString(), action->name()); oldActionItem->setPixmap(0, SmallIcon(action->icon()) ); } } node = node.nextSibling(); } - if (tb->label(tb->currentPageIndex()).replace(r, "") == toolbarName) + if (tb->label(tb->currentPageIndex()).tqreplace(r, "") == toolbarName) { item->setOpen(true); if (item->firstChild()) @@ -142,7 +142,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, for (uint i = 0; i < acCount; i++) { action = ac->action(i); - item = new KListViewItem(allActionsItem, action->text().replace(r, ""), action->shortcut().toString(), action->name()); + item = new KListViewItem(allActionsItem, action->text().tqreplace(r, ""), action->shortcut().toString(), action->name()); item->setPixmap(0, SmallIcon(action->icon()) ); } allActionsItem->sortChildItems(0, true); @@ -168,11 +168,11 @@ void ActionConfigDialog::slotAddToolbar() for (int i = 0; i < tb->count(); i++) { toolbarName = tb->label(i); - if (!actionTreeView->findItem(toolbarName, 0)) + if (!actionTreeView->tqfindItem(toolbarName, 0)) { item = actionTreeView->lastItem(); - if (item->parent()) - item = item->parent(); + if (item->tqparent()) + item = item->tqparent(); new KListViewItem(actionTreeView, item, i18n(toolbarName.utf8())); break; } @@ -183,14 +183,14 @@ void ActionConfigDialog::slotRemoveToolbar() { TQListViewItem *item = actionTreeView->currentItem(); TQString s = item->text(0); - if (item->parent()) + if (item->tqparent()) { - item = item->parent(); + item = item->tqparent(); s = item->text(0); } if (s != i18n("All")) { - if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").tqarg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); @@ -213,8 +213,8 @@ void ActionConfigDialog::slotEditToolbar() TQString toolbarId; TQListViewItem *oldItem; TQListViewItem *item = actionTreeView->currentItem(); - if (item->parent()) - item = item->parent(); + if (item->tqparent()) + item = item->tqparent(); toolbarName = item->text(0); if ( toolbarName != i18n("All")) { @@ -231,7 +231,7 @@ void ActionConfigDialog::slotEditToolbar() ToolbarEntry *p_toolbar = m_toolbarList[toolbarId]; if (p_toolbar) { - oldItem = actionTreeView->findItem(toolbarName, 0); + oldItem = actionTreeView->tqfindItem(toolbarName, 0); item = new KListViewItem(actionTreeView, oldItem, toolbarName); item->setOpen(oldItem->isOpen()); delete oldItem; @@ -243,7 +243,7 @@ void ActionConfigDialog::slotEditToolbar() action = ac->action(node.toElement().attribute("name").ascii()); if (action) { - oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name()); + oldItem = new KListViewItem(item, oldItem, action->text().tqreplace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name()); oldItem->setPixmap(0, SmallIcon(action->icon())); } } @@ -266,7 +266,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) if (currentAction && currentAction->inherits("TagAction")) { if ( buttonApply->isEnabled() && - KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes ) + KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes ) { saveCurrentAction(); } @@ -309,7 +309,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) actionIcon->setIcon(s); } TQString actionText = el.attribute("text"); - actionText.replace(TQRegExp("\\&(?!\\&)"),""); + actionText.tqreplace(TQRegExp("\\&(?!\\&)"),""); lineText->setText(actionText); lineToolTip->setText( el.attribute("tooltip") ); selectedShortcut = action->shortcut(); @@ -344,7 +344,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) node.toElement().attribute("name") == el.attribute("name")) { toolbarListBox->insertItem(toolbarName); - if (item->parent()->text(0) == toolbarName) + if (item->tqparent()->text(0) == toolbarName) current = count; count++; } @@ -406,7 +406,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) { outputBox->setCurrentItem(2); } else - if (s == "replace") + if (s == "tqreplace") { outputBox->setCurrentItem(3); } else @@ -431,7 +431,7 @@ void ActionConfigDialog::slotSelectionChanged(TQListViewItem *item) { errorBox->setCurrentItem(2); } else - if (s == "replace") + if (s == "tqreplace") { errorBox->setCurrentItem(3); } else @@ -472,7 +472,7 @@ void ActionConfigDialog::saveCurrentAction() currentAction->setIcon(s); TQString oldText = el.attribute("text"); s = lineText->text(); - s.replace('&', "&&"); + s.tqreplace('&', "&&"); el.setAttribute("text", s); currentAction->setText(s); s = lineToolTip->text(); @@ -549,7 +549,7 @@ void ActionConfigDialog::saveCurrentAction() case 2:{ item.setAttribute("output", "selection"); break; } - case 3:{ item.setAttribute("output", "replace"); + case 3:{ item.setAttribute("output", "tqreplace"); break; } case 4:{ item.setAttribute("output", "new"); @@ -570,7 +570,7 @@ void ActionConfigDialog::saveCurrentAction() case 2:{ item.setAttribute("error", "selection"); break; } - case 3:{ item.setAttribute("error", "replace"); + case 3:{ item.setAttribute("error", "tqreplace"); break; } case 4:{ item.setAttribute("error", "new"); @@ -618,7 +618,7 @@ void ActionConfigDialog::saveCurrentAction() if (p_toolbar) { TQDomNode node = p_toolbar->guiClient->domDocument().firstChild().firstChild().firstChild(); - bool placeOnToolbar = toolbarListBox->findItem(toolbarName, Qt::ExactMatch); + bool placeOnToolbar = toolbarListBox->tqfindItem(toolbarName, TQt::ExactMatch); while (!node.isNull()) { if (node.nodeName() == "Action" && @@ -630,12 +630,12 @@ void ActionConfigDialog::saveCurrentAction() { currentAction->unplug(tb->page(i)); currentAction->unplug(p_toolbar->menu); - node.parentNode().removeChild(node); + node.tqparentNode().removeChild(node); TQListViewItemIterator iter(actionTreeView); while (iter.current()) { listItem = iter.current(); - if (listItem->depth() > 0 && listItem->parent()->text(0) == toolbarName + if (listItem->depth() > 0 && listItem->tqparent()->text(0) == toolbarName && listItem->text(2) == el.attribute("name")) { delete listItem; @@ -658,7 +658,7 @@ void ActionConfigDialog::saveCurrentAction() item.setAttribute("name",el.attribute("name")); p_toolbar->guiClient->domDocument().firstChild().firstChild().appendChild(item); //put it also in the treeview - listItem = actionTreeView->findItem(toolbarName, 0); + listItem = actionTreeView->tqfindItem(toolbarName, 0); if (listItem) { TQListViewItem *after = listItem->firstChild(); @@ -682,7 +682,7 @@ void ActionConfigDialog::saveCurrentAction() p_toolbar->guiClient->xmlFile(), p_toolbar->guiClient->instance()); } TQWidget *toolBar = tb->page(i); - if (toolBar->minimumSizeHint().height() > 20) + if (toolBar->tqminimumSizeHint().height() > 20) { toolBar->adjustSize(); toolBar->setGeometry(0,0, tb->width(), toolBar->height()); @@ -698,29 +698,29 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) { TQString shortcutText = shortcut.toString(); TQString shortcutText2; - int pos = shortcutText.find(';'); + int pos = shortcutText.tqfind(';'); if (pos != -1) { shortcutText2 = shortcutText.mid(pos + 1); shortcutText = shortcutText.left(pos); } TQString s = shortcutText; - s.replace('+', "\\+"); + s.tqreplace('+', "\\+"); TQRegExp shortcutRx("\\(" + s + "\\)|" + s + "$|" + s + ";"); s = shortcutText2; - s.replace('+', "\\+"); + s.tqreplace('+', "\\+"); TQRegExp shortcutRx2("\\(" + s + "\\)|" + s + "$|" + s + ";"); TQString global; //check for conflicting global shortcuts TQMap<TQString, TQString>::Iterator it; for ( it = globalShortcuts.begin(); it != globalShortcuts.end(); ++it ) { - if (it.data().contains(shortcutRx)) + if (it.data().tqcontains(shortcutRx)) { global = it.key(); break; } - if (!shortcutText2.isEmpty() && it.data().contains(shortcutRx2)) + if (!shortcutText2.isEmpty() && it.data().tqcontains(shortcutRx2)) { shortcutText = shortcutText2; global = it.key(); @@ -737,12 +737,12 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) for (uint i = 0; i < ac->count(); i++) { KAction *action = ac->action(i); - if (action != currentAction && action->shortcut().toString().contains(shortcutRx)) + if (action != currentAction && action->shortcut().toString().tqcontains(shortcutRx)) { global = action->text(); break; } - if (!shortcutText2.isEmpty() && action != currentAction && action->shortcut().toString().contains(shortcutRx)) + if (!shortcutText2.isEmpty() && action != currentAction && action->shortcut().toString().tqcontains(shortcutRx)) { shortcutText = shortcutText2; global = action->text(); @@ -761,11 +761,11 @@ void ActionConfigDialog::slotShortcutCaptured(const KShortcut &shortcut) selectedShortcut = shortcut; } else { - global.replace('&',""); + global.tqreplace('&',""); TQString s = i18n("The '%1' key combination has already been allocated " "to the \"%2\" action.\n" "Please choose a unique key combination."). - arg(shortcutText).arg(global); + tqarg(shortcutText).tqarg(global); KMessageBox::sorry( this, s, i18n("Conflicting Shortcuts")); } } @@ -779,7 +779,7 @@ void ActionConfigDialog::accept() void ActionConfigDialog::reject() { - if (buttonApply->isEnabled() && KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes ) + if (buttonApply->isEnabled() && KMessageBox::questionYesNo(this, i18n("Do you want to save the changes made to this action?"), TQString(), KStdGuiItem::save(), KStdGuiItem::discard()) == KMessageBox::Yes ) saveCurrentAction(); ActionConfigDialogS::reject(); } @@ -805,29 +805,29 @@ void ActionConfigDialog::slotNewAction() static_cast<TagAction*>(currentAction)->setModified(true); TQListViewItem *currentItem = actionTreeView->currentItem(); TQListViewItem *item = new KListViewItem(allActionsItem); - TQString actionText = TQString("Action_%1").arg(m_mainWindow->actionCollection()->count()); + TQString actionText = TQString("Action_%1").tqarg(m_mainWindow->actionCollection()->count()); currentAction->setText(actionText); item->setText(2, currentAction->name()); item->setText(0, actionText); item->setPixmap(0, SmallIcon("ball")); allActionsItem->sortChildItems(0, true); - if (currentItem->parent() && currentItem->parent() == allActionsItem) + if (currentItem->tqparent() && currentItem->tqparent() == allActionsItem) { actionTreeView->setCurrentItem(item); } else { - TQListViewItem *parentItem = currentItem->parent(); - if (!parentItem) - parentItem = currentItem; + TQListViewItem *tqparentItem = currentItem->tqparent(); + if (!tqparentItem) + tqparentItem = currentItem; - item = new KListViewItem(parentItem, currentItem); + item = new KListViewItem(tqparentItem, currentItem); item->setText(0, actionText); item->setText(2, currentAction->name()); item->setPixmap(0, SmallIcon("ball")); actionTreeView->setCurrentItem(item); - if (parentItem != allActionsItem) + if (tqparentItem != allActionsItem) { - toolbarListBox->insertItem(parentItem->text(0)); + toolbarListBox->insertItem(tqparentItem->text(0)); toolbarListBox->setCurrentItem(0); toolbarListBox->setSelected(0, true); } @@ -838,7 +838,7 @@ void ActionConfigDialog::slotNewAction() void ActionConfigDialog::slotDeleteAction() { - if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Removing the action removes all the references to it.\nAre you sure you want to remove the <b>%1</b> action?</qt>").arg(currentAction->text()),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Removing the action removes all the references to it.\nAre you sure you want to remove the <b>%1</b> action?</qt>").tqarg(currentAction->text()),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { TQString actionName = currentAction->name(); emit deleteUserAction(currentAction); @@ -876,7 +876,7 @@ void ActionConfigDialog::slotAddContainerToolbar() TQStringList lst; for (i = 0; i < tb->count(); i++) { - if (!toolbarListBox->findItem(tb->label(i), Qt::ExactMatch)) + if (!toolbarListBox->tqfindItem(tb->label(i), TQt::ExactMatch)) lst << tb->label(i); } diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h index d0bee34e..cbe44d1d 100644 --- a/quanta/dialogs/actionconfigdialog.h +++ b/quanta/dialogs/actionconfigdialog.h @@ -42,10 +42,11 @@ struct ToolbarEntry { class ActionConfigDialog: public ActionConfigDialogS { Q_OBJECT + TQ_OBJECT public: - ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString::null); + ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, KMainWindow* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 , const TQString& defaultAction = TQString()); ~ActionConfigDialog(); void createScriptAction(const TQString& a_name, const TQString& a_script); diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index baeb41bd..c5002777 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -11,7 +11,7 @@ ***************************************************************************/ </comment> <author>Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ActionConfigDialogS</cstring> </property> @@ -30,16 +30,16 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSplitter" row="0" column="0"> + <widget class="TQSplitter" row="0" column="0"> <property name="name"> <cstring>splitter2</cstring> </property> <property name="orientation"> <enum>Horizontal</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <grid> <property name="name"> @@ -56,7 +56,7 @@ <string>&Delete Action</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>addAction</cstring> </property> @@ -77,7 +77,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -94,14 +94,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -158,9 +158,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -177,7 +177,7 @@ <string>&Apply</string> </property> </widget> - <widget class="QPushButton" row="1" column="4"> + <widget class="TQPushButton" row="1" column="4"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -198,7 +198,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -209,7 +209,7 @@ <property name="name"> <cstring>buttonOk</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -225,7 +225,7 @@ <bool>true</bool> </property> </widget> - <widget class="QButtonGroup" row="0" column="1" rowspan="1" colspan="4"> + <widget class="TQButtonGroup" row="0" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>actionProperties</cstring> </property> @@ -239,7 +239,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="6" column="3" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="6" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>addToolbar</cstring> </property> @@ -247,7 +247,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton" row="7" column="3" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="7" column="3" rowspan="1" colspan="2"> <property name="name"> <cstring>removeToolbar</cstring> </property> @@ -265,14 +265,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -283,12 +283,12 @@ <cstring>lineToolTip</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="2" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="2" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>lineToolTip</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -311,13 +311,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>32</width> <height>32</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> @@ -330,12 +330,12 @@ <number>22</number> </property> </widget> - <widget class="QLineEdit" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>lineText</cstring> </property> </widget> - <widget class="QButtonGroup" row="4" column="0" rowspan="1" colspan="5"> + <widget class="TQButtonGroup" row="4" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>buttonGroup4_2</cstring> </property> @@ -346,7 +346,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>customShortcut</cstring> </property> @@ -365,7 +365,7 @@ <string>None</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>noShortcut</cstring> </property> @@ -383,7 +383,7 @@ <cstring>toolbarListBox</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -391,7 +391,7 @@ <string>Container toolbars:</string> </property> </widget> - <widget class="QComboBox" row="0" column="2" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="0" column="2" rowspan="1" colspan="3"> <item> <property name="text"> <string>Tag</string> @@ -419,7 +419,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -430,7 +430,7 @@ <cstring>typeCombo</cstring> </property> </widget> - <widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="5"> + <widget class="TQButtonGroup" row="8" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>buttonGroup13</cstring> </property> @@ -441,11 +441,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack" row="0" column="0"> + <widget class="TQWidgetStack" row="0" column="0"> <property name="name"> <cstring>widgetStack1</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -456,7 +456,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel5_2_2_2</cstring> </property> @@ -464,17 +464,17 @@ <string><tag> :</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineTag</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lineClosingTag</cstring> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>useClosingTag</cstring> </property> @@ -485,7 +485,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>useActionDialog</cstring> </property> @@ -498,7 +498,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -521,14 +521,14 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>64</width> <height>20</height> </size> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -547,7 +547,7 @@ <cstring>inputBox</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>None</string> @@ -575,7 +575,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -594,7 +594,7 @@ <cstring>outputBox</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>None</string> @@ -640,7 +640,7 @@ <number>5</number> </property> </widget> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>None</string> @@ -686,7 +686,7 @@ <number>5</number> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -707,7 +707,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>page</cstring> </property> @@ -718,7 +718,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QMultiLineEdit" row="0" column="0"> + <widget class="TQMultiLineEdit" row="0" column="0"> <property name="name"> <cstring>textEdit</cstring> </property> @@ -740,7 +740,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>55</width> <height>20</height> @@ -976,7 +976,7 @@ <include location="global" impldecl="in implementation">kkeybutton.h</include> <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> -<slots> +<Q_SLOTS> <slot>buttonOk_clicked()</slot> <slot>slotNewAction()</slot> <slot>slotDeleteAction()</slot> @@ -989,8 +989,8 @@ <slot>shortcutKeyButton_toggled(bool)</slot> <slot>slotToggled(bool)</slot> <slot>slotTextChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kicondialog.h</includehint> diff --git a/quanta/dialogs/casewidget.ui b/quanta/dialogs/casewidget.ui index f7f064f9..916332dd 100644 --- a/quanta/dialogs/casewidget.ui +++ b/quanta/dialogs/casewidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>CaseWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CaseWidget</cstring> </property> @@ -12,7 +12,7 @@ <height>158</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>500</width> <height>100</height> @@ -22,7 +22,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>upperTag</cstring> </property> @@ -41,7 +41,7 @@ <string>Upper case</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>lowerTag</cstring> </property> @@ -49,7 +49,7 @@ <string>Lower case</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>unchangedTag</cstring> </property> @@ -62,7 +62,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="0" column="1"> + <widget class="TQButtonGroup" row="0" column="1"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -73,7 +73,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>upperAttr</cstring> </property> @@ -81,7 +81,7 @@ <string>Upper case</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>lowerAttr</cstring> </property> @@ -89,7 +89,7 @@ <string>Lower case</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>unchangedAttr</cstring> </property> @@ -104,5 +104,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index 9f66cb11..7a4c596d 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -46,9 +46,9 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) targetDirURL.adjustPath(1); bool doCopy = true; - if (!QExtFileInfo::exists(targetDirURL, false, 0L)) + if (!TQExtFileInfo::exists(targetDirURL, false, 0L)) { - doCopy = QExtFileInfo::createDir(targetDirURL, 0L); + doCopy = TQExtFileInfo::createDir(targetDirURL, 0L); } KURL destURL; @@ -93,9 +93,9 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) targetDirURL = destination; } bool doCopy = true; - if (!QExtFileInfo::exists(targetDirURL, false, 0L)) + if (!TQExtFileInfo::exists(targetDirURL, false, 0L)) { - doCopy = QExtFileInfo::createDir(targetDirURL, 0L); + doCopy = TQExtFileInfo::createDir(targetDirURL, 0L); } KIO::UDSEntry entry; diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h index 452919aa..b46947db 100644 --- a/quanta/dialogs/copyto.h +++ b/quanta/dialogs/copyto.h @@ -28,8 +28,9 @@ class KURL; -class CopyTo : public QObject{ +class CopyTo : public TQObject{ Q_OBJECT + TQ_OBJECT public: CopyTo(const KURL& dirURL); ~CopyTo(); diff --git a/quanta/dialogs/debuggeroptionss.ui b/quanta/dialogs/debuggeroptionss.ui index 8e1910f4..d44b604e 100644 --- a/quanta/dialogs/debuggeroptionss.ui +++ b/quanta/dialogs/debuggeroptionss.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>DebuggerOptionsS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DebuggerOptionsS</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>220</height> @@ -36,7 +36,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkDebugger</cstring> </property> @@ -47,7 +47,7 @@ <bool>true</bool> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -72,7 +72,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioPhp3</cstring> </property> @@ -80,7 +80,7 @@ <string>PHP3 listener</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioPhp4</cstring> </property> @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -137,5 +137,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/dirtydialog.ui b/quanta/dialogs/dirtydialog.ui index 3d46130e..d339ebdc 100644 --- a/quanta/dialogs/dirtydialog.ui +++ b/quanta/dialogs/dirtydialog.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2002 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DirtyDialog</cstring> </property> @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>220</height> @@ -42,7 +42,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel</cstring> </property> @@ -58,7 +58,7 @@ <string>The file was changed outside of the Quanta editor.</string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>ButtonGroup2</cstring> </property> @@ -75,7 +75,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonIgnore</cstring> </property> @@ -83,7 +83,7 @@ <string>&Do not load the modified version from disk</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonLoad</cstring> </property> @@ -91,7 +91,7 @@ <string>&Use the version from disk (will lose the current content)</string> </property> </widget> - <widget class="QLabel" row="3" column="1"> + <widget class="TQLabel" row="3" column="1"> <property name="name"> <cstring>warningLabel</cstring> </property> @@ -106,7 +106,7 @@ <property name="text"> <string>(If you later save the document, you will lose what was on the disk.)</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -120,14 +120,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonCompare</cstring> </property> @@ -150,5 +150,5 @@ <tabstop>buttonIgnore</tabstop> <tabstop>buttonLoad</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 70d06c86..18301045 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -34,14 +34,14 @@ #include "resource.h" #include "qextfileinfo.h" -DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup, TQWidget *parent, const char *name ) : KDialogBase(parent, name, true, i18n("File Changed"), KDialogBase::Ok) +DirtyDlg::DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup, TQWidget *tqparent, const char *name ) : KDialogBase(tqparent, name, true, i18n("File Changed"), KDialogBase::Ok) { m_src.setPath(srcName); m_dest.setPath(destName); m_busy = false; m_createBackup = createBackup; m_mainWidget = new DirtyDialog(this); - m_mainWidget->textLabel->setText(i18n("<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>").arg(srcName)); + m_mainWidget->textLabel->setText(i18n("<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>").tqarg(srcName)); setMainWidget(m_mainWidget); } @@ -78,7 +78,7 @@ void DirtyDlg::slotCompareDone(KProcess* proc) { KURL backupURL = m_src; backupURL.setPath(backupURL.path()+".backup"); - QExtFileInfo::copy(m_src, backupURL, -1, true, false, this); + TQExtFileInfo::copy(m_src, backupURL, -1, true, false, this); } KIO::UDSEntry entry; diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index ec457d25..c850ab25 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -28,9 +28,10 @@ class TQCloseEvent; class DirtyDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup = false, TQWidget *parent=0, const char *name=0); + DirtyDlg(const TQString& srcName, const TQString& destName, bool createBackup = false, TQWidget *tqparent=0, const char *name=0); ~DirtyDlg(); protected slots: // Protected slots diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui index e5aab152..0921fa98 100644 --- a/quanta/dialogs/donationdialog.ui +++ b/quanta/dialogs/donationdialog.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2002, 2003 Andras Mantia <amantia@kde.org>, (C) 2002, 2003, 2004 Eric Laffoon <sequitur@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>DonationDialog</cstring> </property> @@ -86,7 +86,7 @@ is the future of software, but it is no guarantee of success. How many open sour <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>365</width> <height>20</height> @@ -108,13 +108,13 @@ is the future of software, but it is no guarantee of success. How many open sour <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>30</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>40</height> @@ -143,10 +143,10 @@ is the future of software, but it is no guarantee of success. How many open sour <tabstop>KTextBrowser2</tabstop> <tabstop>closeButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>init()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>ktextbrowser.h</includehint> diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui index 525a0429..60c47e20 100644 --- a/quanta/dialogs/dtdselectdialog.ui +++ b/quanta/dialogs/dtdselectdialog.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2002, 2003 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DTDSelectDialog</cstring> </property> @@ -21,7 +21,7 @@ <height>161</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>440</width> <height>160</height> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>messageLabel</cstring> </property> @@ -45,16 +45,16 @@ Dialog message2:</string> <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>dtdCombo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel</cstring> </property> @@ -62,7 +62,7 @@ Dialog message2:</string> <string>Current DTD:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>comboLabel</cstring> </property> @@ -70,7 +70,7 @@ Dialog message2:</string> <string>Select DTD:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>currentDTD</cstring> </property> @@ -78,7 +78,7 @@ Dialog message2:</string> <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>convertDTD</cstring> </property> @@ -86,7 +86,7 @@ Dialog message2:</string> <string>Conver&t the document to the selected DTD</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>useClosestMatching</cstring> </property> @@ -105,8 +105,8 @@ Dialog message2:</string> <includes> <include location="local" impldecl="in implementation">dtdselectdialog.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>init()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/dtepeditdlg.cpp b/quanta/dialogs/dtepeditdlg.cpp index c2595716..72759a00 100644 --- a/quanta/dialogs/dtepeditdlg.cpp +++ b/quanta/dialogs/dtepeditdlg.cpp @@ -40,8 +40,8 @@ #include "resource.h" #include "quantacommon.h" -DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent, const char *name) - : DTEPEditDlgS(parent, name) +DTEPEditDlg::DTEPEditDlg(const TQString& descriptionFile, TQWidget *tqparent, const char *name) + : DTEPEditDlgS(tqparent, name) { nameEdit->setFocus(); m_descriptionFile = descriptionFile; @@ -94,7 +94,7 @@ void DTEPEditDlg::readGeneral() TQString inherits = m_config->readEntry("Inherits"); TQStringList lst(DTDs::ref()->nameList()); inheritsCombo->insertStringList(lst); - int idx = lst.findIndex(inherits); + int idx = lst.tqfindIndex(inherits); if (idx == -1) inheritsCombo->insertItem(inherits, 0); else @@ -113,9 +113,9 @@ void DTEPEditDlg::readGeneral() void DTEPEditDlg::readPages() { int i = 1; - while (m_config->hasGroup(TQString("Page%1").arg(i)) && i < 6) + while (m_config->hasGroup(TQString("Page%1").tqarg(i)) && i < 6) { - m_config->setGroup(TQString("Page%1").arg(i)); + m_config->setGroup(TQString("Page%1").tqarg(i)); TQString title = m_config->readEntry("Title"); TQString groups = m_config->readEntry("Groups"); if (i == 1) @@ -203,7 +203,7 @@ void DTEPEditDlg::saveResult() { if (f.exists()) { - if (KMessageBox::questionYesNo(this, i18n("<qt>The file <b>%1</b> is not writable.<br>Do you want to save the configuration to a different file?</qt>").arg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("<qt>The file <b>%1</b> is not writable.<br>Do you want to save the configuration to a different file?</qt>").tqarg(f.filePath()),i18n("Save As"),i18n("Save to Different File"), i18n("Do Not Save")) == KMessageBox::Yes) { targetFile = KFileDialog::getSaveFileName(locateLocal("data", resourceDir + "dtep/description.rc"), i18n("*.rc|DTEP Description"), this, i18n("Save Description As")); } else @@ -255,35 +255,35 @@ void DTEPEditDlg::writePages(KConfig *config) if (enablePage1->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit1->text()); writeEntry(config, "Groups", groupsEdit1->text()); } if (enablePage2->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit2->text()); writeEntry(config, "Groups", groupsEdit2->text()); } if (enablePage3->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit3->text()); writeEntry(config, "Groups", groupsEdit3->text()); } if (enablePage4->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit4->text()); writeEntry(config, "Groups", groupsEdit4->text()); } if (enablePage5->isChecked()) { num++; - config->setGroup(TQString("Page%1").arg(num)); + config->setGroup(TQString("Page%1").tqarg(num)); writeEntry(config, "Title", pageTitleEdit5->text()); writeEntry(config, "Groups", groupsEdit5->text()); } @@ -343,10 +343,10 @@ void DTEPEditDlg::readStructures() int objectGroupId = m_config->readNumEntry("ObjectGroupIndex", -1); int i = 1; - while (m_config->hasGroup(TQString("StructGroup_%1").arg(i))) + while (m_config->hasGroup(TQString("StructGroup_%1").tqarg(i))) { StructGroup group; - m_config->setGroup(TQString("StructGroup_%1").arg(i)); + m_config->setGroup(TQString("StructGroup_%1").tqarg(i)); group.name = m_config->readEntry("Name"); group.noName = m_config->readEntry("No_Name"); group.icon = m_config->readEntry("Icon"); @@ -354,7 +354,7 @@ void DTEPEditDlg::readStructures() group.hasFileName = m_config->readBoolEntry("HasFileName", false); group.fileNameRx = m_config->readEntry("FileNameRx"); group.appendToTags = m_config->readBoolEntry("AppendToTags", false); - group.parentGroup = m_config->readEntry("ParentGroup"); + group.tqparentGroup = m_config->readEntry("ParentGroup"); group.definitionRx = m_config->readEntry("DefinitionRx"); group.definitionRxMinimal = m_config->readBoolEntry("DefinitionRx_Minimal", false); group.usageRx = m_config->readEntry("UsageRx"); @@ -387,7 +387,7 @@ void DTEPEditDlg::writeStructures(KConfig *config) for (TQValueList<StructGroup>::ConstIterator it = m_structGroups.constBegin(); it != m_structGroups.constEnd(); ++it) { StructGroup group = *it; - config->setGroup(TQString("StructGroup_%1").arg(i)); + config->setGroup(TQString("StructGroup_%1").tqarg(i)); writeEntry(config, "Name", group.name); writeEntry(config, "No_Name", group.noName); writeEntry(config, "Icon", group.icon); @@ -397,7 +397,7 @@ void DTEPEditDlg::writeStructures(KConfig *config) config->writeEntry("AppendToTags", group.appendToTags); if (m_family == 1) { - writeEntry(config, "ParentGroup", group.parentGroup); + writeEntry(config, "ParentGroup", group.tqparentGroup); writeEntry(config, "DefinitionRx", group.definitionRx); config->writeEntry("DefinitionRx_Minimal", group.definitionRxMinimal); writeEntry(config, "UsageRx", group.usageRx); @@ -453,7 +453,7 @@ void DTEPEditDlg::slotEditStructGroup() structDlg.hasFilename->setChecked(group.hasFileName); structDlg.fileNameRxEdit->setText(group.fileNameRx); structDlg.appendToTags->setChecked(group.appendToTags); - structDlg.parentGroupEdit->setText(group.parentGroup); + structDlg.tqparentGroupEdit->setText(group.tqparentGroup); for (int i = 0; i < structDlg.tagTypeCombo->count(); i++) { if (structDlg.tagTypeCombo->text(i) == group.tagType) @@ -513,7 +513,7 @@ StructGroup DTEPEditDlg::readFromStructDlg(DTEPStructureEditDlgS *structDlg) group.hasFileName = structDlg->hasFilename->isChecked(); group.fileNameRx = structDlg->fileNameRxEdit->text(); group.appendToTags = structDlg->appendToTags->isChecked(); - group.parentGroup = structDlg->parentGroupEdit->text(); + group.tqparentGroup = structDlg->tqparentGroupEdit->text(); group.tagType = structDlg->tagTypeCombo->currentText(); group.definitionRx = structDlg->definitionRxEdit->text(); group.definitionRxMinimal = structDlg->definitionRxMinimal->isChecked(); @@ -536,7 +536,7 @@ void DTEPEditDlg::slotDeleteStructGroup() int currentItem = structuresList->currentItem(); if (currentItem != -1) { - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to delete the <b>%1</b> group?</qt>").arg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to delete the <b>%1</b> group?</qt>").tqarg(structuresList->currentText()), i18n("Delete Group"),KStdGuiItem::del()) == KMessageBox::Continue) { m_structGroups.remove(m_structGroups.at(currentItem)); structuresList->removeItem(currentItem); diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h index ed921a5a..6906e40d 100644 --- a/quanta/dialogs/dtepeditdlg.h +++ b/quanta/dialogs/dtepeditdlg.h @@ -37,7 +37,7 @@ struct StructGroup { bool hasFileName; TQString fileNameRx; bool appendToTags; - TQString parentGroup; + TQString tqparentGroup; TQString definitionRx; bool definitionRxMinimal; TQString usageRx; @@ -56,8 +56,9 @@ struct StructGroup { class DTEPEditDlg : public DTEPEditDlgS { Q_OBJECT + TQ_OBJECT public: - DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent = 0, const char *name = 0); + DTEPEditDlg(const TQString& descriptionFile, TQWidget *tqparent = 0, const char *name = 0); ~DTEPEditDlg(); void saveResult(); void slotFamilyChanged(int family); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 739ffcc5..3b36feeb 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2005 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DTEPEditDlgS</cstring> </property> @@ -28,11 +28,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>tabWidget</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -43,7 +43,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -68,7 +68,7 @@ <string>The real name of the DTEP. In case of XML DTEPs this should be the DTD definition string, like -<i>//W3C//DTD&nbsp;HTML&nbsp;4.01&nbsp;Transitional//EN</i>.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -158,14 +158,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> </size> </property> </spacer> - <widget class="QGroupBox" row="8" column="0" rowspan="1" colspan="6"> + <widget class="TQGroupBox" row="8" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -176,11 +176,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack" row="0" column="0"> + <widget class="TQWidgetStack" row="0" column="0"> <property name="name"> <cstring>generalWidgetStack</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -191,7 +191,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -208,7 +208,7 @@ <string>URL pointing to the DTD definiton file, like <i>http://www.w3.org/TR/html4/loose.dtd</i>.</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="1" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -251,14 +251,14 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> <attribute name="id"> <number>1</number> </attribute> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>topLevel</cstring> </property> @@ -284,7 +284,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -312,7 +312,7 @@ <string>The name of the folder where the toolbars are stored. This is a relative name to <br><i>$KDEDIR(&nbsp;or&nbsp;$KDEHOME)/share/apps/quanta/toolbars</i> .</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -340,7 +340,7 @@ <string>Comma separated list of toolbars from the toolbar folder that will be loaded when a document with this DTEP is loaded.</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>caseSensitive</cstring> </property> @@ -365,7 +365,7 @@ <string>Indicates whether the DTEP has case sensitive tags. In case of XML this should be checked, but for example HTML variants are not case sensitive.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel7</cstring> </property> @@ -388,7 +388,7 @@ <p><b>Pseudo type</b>:DTEP describing some other language, where the notion of a tag is not the same as in XML. Examples are <i>PHP, JavaScript, CSS</i>.</p></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel8</cstring> </property> @@ -432,7 +432,7 @@ <p><b>Pseudo type</b>:DTEP describing some other language, where the notion of a tag is not the same as in XML. Examples are <i>PHP, JavaScript, CSS</i>.</p></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -484,7 +484,7 @@ <string>The default extension of files belonging to this DTEP</string> </property> </widget> - <widget class="QLabel" row="4" column="4"> + <widget class="TQLabel" row="4" column="4"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -505,7 +505,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -514,7 +514,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -535,14 +535,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>enablePage1</cstring> </property> @@ -556,7 +556,7 @@ <string>Every tab edit dialog will have one more extra page aside of the main page. You can configure what will be on this page in the below fields.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel11</cstring> </property> @@ -573,7 +573,7 @@ <string>The title of the page, like <b>Core && i18n</b>. As you see, the ampersand must be doubled.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel12</cstring> </property> @@ -595,7 +595,7 @@ </b></p></string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>enablePage2</cstring> </property> @@ -609,7 +609,7 @@ <string>See the tooltip and "What's This?" information for the first checkbox</string> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>enablePage3</cstring> </property> @@ -623,7 +623,7 @@ <string>See the tooltip and "What's This?" information for the first checkbox</string> </property> </widget> - <widget class="QCheckBox" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>enablePage4</cstring> </property> @@ -637,7 +637,7 @@ <string>See the tooltip and "What's This?" information for the first checkbox</string> </property> </widget> - <widget class="QCheckBox" row="12" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="12" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>enablePage5</cstring> </property> @@ -695,7 +695,7 @@ <string>See the tooltip and "What's This?" information for the first page fields</string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel12_3</cstring> </property> @@ -720,7 +720,7 @@ <string>See the tooltip and "What's This?" information for the first page fields</string> </property> </widget> - <widget class="QLabel" row="10" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="10" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel11_3_2</cstring> </property> @@ -734,7 +734,7 @@ <string>See the tooltip and "What's This?" information for the first page fields</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel11_2</cstring> </property> @@ -748,7 +748,7 @@ <string>See the tooltip and "What's This?" information for the first page fields</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel12_2</cstring> </property> @@ -762,7 +762,7 @@ <string>See the tooltip and "What's This?" information for the first page fields</string> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class="TQLabel" row="7" column="0"> <property name="name"> <cstring>textLabel11_3</cstring> </property> @@ -776,7 +776,7 @@ <string>See the tooltip and "What's This?" information for the first page fields</string> </property> </widget> - <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel12_3_2</cstring> </property> @@ -801,7 +801,7 @@ <string>See the tooltip and "What's This?" information for the first page fields</string> </property> </widget> - <widget class="QLabel" row="13" column="0"> + <widget class="TQLabel" row="13" column="0"> <property name="name"> <cstring>textLabel11_5</cstring> </property> @@ -826,7 +826,7 @@ <string>See the tooltip and "What's This?" information for the first page fields</string> </property> </widget> - <widget class="QLabel" row="14" column="0"> + <widget class="TQLabel" row="14" column="0"> <property name="name"> <cstring>textLabel12_5</cstring> </property> @@ -886,7 +886,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -897,7 +897,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>enableMinusInWords</cstring> </property> @@ -911,7 +911,7 @@ <string>If enabled <b>this-is-a-word</b> is treated like a word. Otherwise it is treated like 4 words.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel13</cstring> </property> @@ -929,7 +929,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> </property> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="5"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>groupBox7</cstring> </property> @@ -948,11 +948,11 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack" row="0" column="0"> + <widget class="TQWidgetStack" row="0" column="0"> <property name="name"> <cstring>rulesWidgetStack</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -963,7 +963,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="7"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="7"> <property name="name"> <cstring>xmlStyleTags</cstring> </property> @@ -980,7 +980,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <string>Check to use XML style single tags (<b>&lt;single_tag /&gt;</b>), otherwise HTML style single tags (<b>&lt;single_tag&gt;</b>) are used.</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="7"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="7"> <property name="name"> <cstring>useCommonRules</cstring> </property> @@ -1002,7 +1002,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> </b></p></string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>extendedBooleans</cstring> </property> @@ -1059,7 +1059,7 @@ See the <b>True</b> and <b>False</b> boxes to define the <string>The value of "true" in case of extended booleans</string> </property> </widget> - <widget class="QLabel" row="3" column="5"> + <widget class="TQLabel" row="3" column="5"> <property name="name"> <cstring>textLabel39</cstring> </property> @@ -1069,11 +1069,11 @@ See the <b>True</b> and <b>False</b> boxes to define the <property name="text"> <string>False:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="3"> + <widget class="TQLabel" row="3" column="3"> <property name="name"> <cstring>textLabel38</cstring> </property> @@ -1083,7 +1083,7 @@ See the <b>True</b> and <b>False</b> boxes to define the <property name="text"> <string>True:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -1097,7 +1097,7 @@ See the <b>True</b> and <b>False</b> boxes to define the <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -1117,7 +1117,7 @@ See the <b>True</b> and <b>False</b> boxes to define the A special area can be a pseudo DTD, a comment or something like that, for example <i>&lt;!--&nbsp;--&gt;</i>.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel27</cstring> </property> @@ -1144,7 +1144,7 @@ See the <b>True</b> and <b>False</b> boxes to define the <string>Comma-separated list of the names for the above-defined special areas</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel28</cstring> </property> @@ -1158,7 +1158,7 @@ See the <b>True</b> and <b>False</b> boxes to define the <string>Comma-separated list of the names for the above-defined special areas</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel40</cstring> </property> @@ -1187,7 +1187,7 @@ Example:<b>script(language)</b> means that any <b>&lt;scri </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -1198,7 +1198,7 @@ Example:<b>script(language)</b> means that any <b>&lt;scri <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel21</cstring> </property> @@ -1212,14 +1212,14 @@ Example:<b>script(language)</b> means that any <b>&lt;scri <string>Tags and attributes defining this DTEP</string> </property> <property name="whatsThis" stdset="0"> - <string>Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the parent (a real) DTEP has a tag with <i>tagname</i> and + <string>Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the tqparent (a real) DTEP has a tag with <i>tagname</i> and the <i>attribute value</i> of this tag is equal with the name of this DTEP, the tag area is parsed according to the rules of this DTEP.<br> If <i>[defaultvalue]</i> is present, it means that if the attribute is not present in the tag it is taken as present with <i>value = defaultvalue</i>.<br> Example: <b>Tags=style(type[text/css])</b> means that both <b>&lt;style&gt;</b> and <b>&lt;style&nbsp;type="text/css"&gt;</b> are treated the same way and the DTEP defined by this tag is named <b>text/css</b>.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel20</cstring> </property> @@ -1237,7 +1237,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <b>&lt;?&nbsp;?&gt;,&nbsp;&lt;*&nbsp;*&gt;,&nbsp;&lt;%&nbsp;%&gt;</b></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel22</cstring> </property> @@ -1254,7 +1254,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>Comma separated list of structure keywords. The keywords used here are used to create new node (nodes for structures) in the structure tree, like for a function, class or if block.</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel26</cstring> </property> @@ -1271,7 +1271,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>Regular expression that finds the beginning or end of a structure. This is usually the combination of <b>Structure beginning</b> and <b>Structure end</b>, like <b>\{&nbsp;|&nbsp;\}</b></string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel24</cstring> </property> @@ -1288,7 +1288,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>A string specifying the beginning of a structure, like <b>{</b> in many cases.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel23</cstring> </property> @@ -1302,7 +1302,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>Comma separated list of the local scope defining keywords</string> </property> <property name="whatsThis" stdset="0"> - <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>.</string> + <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>.</string> </property> </widget> <widget class="KLineEdit" row="3" column="1" rowspan="1" colspan="3"> @@ -1313,7 +1313,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>Comma separated list of the local scope defining keywords</string> </property> <property name="whatsThis" stdset="0"> - <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list contains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>.</string> + <string>Comma separated list of the local scope defining keywords. Other structure group elements found under a structure node that was created based on a keyword from this list are treated as local elements. For example if this list tqcontains <b>function</b>, it means that elements, like variables found under a <b>function</b> are local, relative to the node that holds the <b>function</b>.</string> </property> </widget> <widget class="KLineEdit" row="2" column="1" rowspan="1" colspan="3"> @@ -1335,7 +1335,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>Tags and attributes defining this DTEP</string> </property> <property name="whatsThis" stdset="0"> - <string>Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the parent (a real) DTEP has a tag with <i>tagname</i> and + <string>Comma separated list of tags that define this DTEP. The format used is <i>tagname(attribute[defaultvalue])</i>. If the tqparent (a real) DTEP has a tag with <i>tagname</i> and the <i>attribute value</i> of this tag is equal with the name of this DTEP, the tag area is parsed according to the rules of this DTEP.<br> If <i>[defaultvalue]</i> is present, it means that if the attribute is not present in the tag it is taken as present with <i>value = defaultvalue</i>.<br> @@ -1365,7 +1365,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>A string specifying the end of a structure, like <b>}</b> in many cases.</string> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>textLabel25</cstring> </property> @@ -1393,7 +1393,7 @@ Example: <b>Tags=style(type[text/css])</b> means that both <b> <string>A string specifying the beginning of a structure, like <b>{</b> in many cases.</string> </property> </widget> - <widget class="QLabel" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel19</cstring> </property> @@ -1424,7 +1424,7 @@ Example:<br> The regular expression must be terminated with <b>$</b> (match end of line).</string> </property> </widget> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel18</cstring> </property> @@ -1487,7 +1487,7 @@ Example:<br> </widget> </grid> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel15</cstring> </property> @@ -1516,7 +1516,7 @@ Example:<br> Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel17</cstring> </property> @@ -1533,7 +1533,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <string>Comma-separated list of DTEPs that can be present inside this DTEP. The list consist usually of pseudo DTEPs.</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel16</cstring> </property> @@ -1577,7 +1577,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <string>The character specifying the end of a tag. See the information for the attribute separator for details.</string> </property> </widget> - <widget class="QLabel" row="3" column="3"> + <widget class="TQLabel" row="3" column="3"> <property name="name"> <cstring>textLabel14</cstring> </property> @@ -1615,7 +1615,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1626,7 +1626,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel29</cstring> </property> @@ -1647,7 +1647,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>270</height> @@ -1678,7 +1678,7 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <string>&Delete</string> </property> </widget> - <widget class="QListBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQListBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>structuresList</cstring> </property> @@ -1957,11 +1957,11 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <tabstop>editStructButton</tabstop> <tabstop>deleteStructButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected">slotEditStructGroup()</slot> <slot>slotAddStructGroup()</slot> <slot>slotDeleteStructGroup()</slot> <slot>slotFamilyChanged(int)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index 12abe665..2e2e4153 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2005 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DTEPStructureEditDlgS</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel30</cstring> </property> @@ -50,14 +50,14 @@ <string>The user visible name of the group. It will be shown in the structure tree as a top node when there are elements belonging to this group in the document.</string> </property> </widget> - <widget class="QLabel" row="0" column="4"> + <widget class="TQLabel" row="0" column="4"> <property name="name"> <cstring>textLabel32</cstring> </property> <property name="text"> <string>&Icon:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -76,13 +76,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>50</width> <height>50</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>50</height> @@ -92,7 +92,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel34</cstring> </property> @@ -112,7 +112,7 @@ <string>Regular expression to get the filename. The expression is used to <b>remove</b> the unnecessary strings from the element's text.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>hasFilename</cstring> </property> @@ -137,7 +137,7 @@ <string>Regular expression to get the filename. The expression is used to <b>remove</b> the unnecessary strings from the element's text.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel33</cstring> </property> @@ -154,7 +154,7 @@ <string>Defines which tags belong to this group. The format is <i>tagname(attribute1, attribute2, ...)</i>. Tags with name <i>tagname</i> will appear under this group. The item text of the corresponding node in the tree will be <i>attribute1_value | attribute2_value | ...</i>Currently only one tag may be listed here.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel31</cstring> </property> @@ -206,14 +206,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>appendToTags</cstring> </property> @@ -227,7 +227,7 @@ <string>Treat elements as new tags, so they will show up during tag autocompletion.</string> </property> </widget> - <widget class="QGroupBox" row="7" column="0" rowspan="1" colspan="6"> + <widget class="TQGroupBox" row="7" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>pseudoGroupBox</cstring> </property> @@ -250,11 +250,11 @@ Example (simplified):<br> <b>DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;<br> TypeRx=new\\s([a-zA-Z]+);</b><br><br> -This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will find <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> +This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will tqfind <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> So the type of <b>$fooObj</b> is <b>foo</b>.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel36</cstring> </property> @@ -280,7 +280,7 @@ Example 3:<br> - variables are used as <b>$i</b>. In this case <i>UsageRx </i>is the same as <i>DefinitionRx</i>.</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel37</cstring> </property> @@ -298,11 +298,11 @@ Example 3:<br> Example (simplified):<br> <b>DefinitionRx=\$+([a-zA-Z]+)=new\\s[a-zA-Z]+;<br> TypeRx=new\\s([a-zA-Z]+);</b><br><br> -This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will find <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> +This will match strings like <b>$fooObj=new foo;</b>. Now this string is searched and it will tqfind <b>new foo;</b>, where <b>foo</b> is the first captured text (the regular expression matching <b>foo</b> is between brackets).<br> So the type of <b>$fooObj</b> is <b>foo</b>.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel35</cstring> </property> @@ -342,7 +342,7 @@ Example 3:<br> - variables are used as <b>$i</b>. In this case <i>UsageRx </i>is the same as <i>DefinitionRx</i>.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel41</cstring> </property> @@ -350,24 +350,24 @@ Example 3:<br> <string>Parent group:</string> </property> <property name="toolTip" stdset="0"> - <string>The name of the group that may be the parent of this</string> + <string>The name of the group that may be the tqparent of this</string> </property> <property name="whatsThis" stdset="0"> - <string>The name of the group that may be the parent of this. For example <b>classes</b> might be a parent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion.</string> + <string>The name of the group that may be the tqparent of this. For example <b>classes</b> might be a tqparent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion.</string> </property> </widget> <widget class="KLineEdit" row="0" column="1" rowspan="1" colspan="4"> <property name="name"> - <cstring>parentGroupEdit</cstring> + <cstring>tqparentGroupEdit</cstring> </property> <property name="toolTip" stdset="0"> - <string>The name of the group that may be the parent of this</string> + <string>The name of the group that may be the tqparent of this</string> </property> <property name="whatsThis" stdset="0"> - <string>The name of the group that may be the parent of this. For example <b>classes</b> might be a parent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion.</string> + <string>The name of the group that may be the tqparent of this. For example <b>classes</b> might be a tqparent of <b>functions</b> in case of member functions. This entry indicates this possible relationship and is used to provide functionality like member autocompletion.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel42</cstring> </property> @@ -378,7 +378,7 @@ Example 3:<br> <string>Only tags of this type can be part of the group</string> </property> </widget> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel44</cstring> </property> @@ -389,7 +389,7 @@ Example 3:<br> <string>Regular expression used to remove unwanted strings from the completion text</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel43</cstring> </property> @@ -482,14 +482,14 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>340</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>parseFile</cstring> </property> @@ -503,7 +503,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& <string>Check if the filename that is in the elements text should be parsed. This makes sense only if the element may contain a filename and the <i>FileNameRx</i> is specified.</string> </property> </widget> - <widget class="QButtonGroup" row="8" column="0" rowspan="1" colspan="5"> + <widget class="TQButtonGroup" row="8" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -514,7 +514,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>simpleGroup</cstring> </property> @@ -525,7 +525,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& <string>This is a simple group, nothing special</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>variableGroup</cstring> </property> @@ -536,7 +536,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& <string>The group's elements are variables</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>functionGroup</cstring> </property> @@ -547,7 +547,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& <string>The group's elements are functions</string> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>classGroup</cstring> </property> @@ -558,7 +558,7 @@ Example:<b>\bnew[\\s]+$</b> tells that after typing <b>new& <string>The group's elements are classes</string> </property> </widget> - <widget class="QRadioButton" row="0" column="2"> + <widget class="TQRadioButton" row="0" column="2"> <property name="name"> <cstring>objectGroup</cstring> </property> @@ -585,7 +585,7 @@ Example for a <i>class</i> group:<br> The first captured area (between "<b>(</b>" and "<b>)</b>") holds the class name.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="4"> + <widget class="TQCheckBox" row="2" column="4"> <property name="name"> <cstring>definitionRxMinimal</cstring> </property> @@ -624,7 +624,7 @@ The first captured area (between "<b>(</b>" and "<b>)</b> <tabstop>hasFilename</tabstop> <tabstop>fileNameRxEdit</tabstop> <tabstop>appendToTags</tabstop> - <tabstop>parentGroupEdit</tabstop> + <tabstop>tqparentGroupEdit</tabstop> <tabstop>tagTypeCombo</tabstop> <tabstop>definitionRxEdit</tabstop> <tabstop>definitionRxMinimal</tabstop> @@ -639,7 +639,7 @@ The first captured area (between "<b>(</b>" and "<b>)</b> <tabstop>variableGroup</tabstop> <tabstop>classGroup</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kicondialog.h</includehint> </includehints> diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 63fd1e58..818df7ac 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -29,13 +29,13 @@ #include "filecombo.h" #include "qextfileinfo.h" -FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) - :TQWidget(parent,name) +FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *tqparent, const char *name ) + :TQWidget(tqparent,name) { baseURL = a_baseURL; m_absolutePath = false; - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); combo->setEditable(true); @@ -44,8 +44,8 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - layout ->addWidget( combo ); - layout ->addWidget( button ); + tqlayout ->addWidget( combo ); + tqlayout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); @@ -53,12 +53,12 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) setFocusProxy(combo); } -FileCombo::FileCombo( TQWidget *parent, const char *name ) - :TQWidget( parent, name ) +FileCombo::FileCombo( TQWidget *tqparent, const char *name ) + :TQWidget( tqparent, name ) { baseURL.setPath("."); - TQHBoxLayout *layout = new TQHBoxLayout(this); + TQHBoxLayout *tqlayout = new TQHBoxLayout(this); combo = new TQComboBox(true,this); button = new TQPushButton(this); @@ -66,8 +66,8 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) button ->setFixedSize(35,25); button ->setText(i18n("...")); - layout ->addWidget( combo ); - layout ->addWidget( button ); + tqlayout ->addWidget( combo ); + tqlayout ->addWidget( button ); connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); @@ -97,7 +97,7 @@ void FileCombo::slotFileSelect() delete dlg; if ( !url.isEmpty() ) { - if (!m_absolutePath) url = QExtFileInfo::toRelative(url, baseURL); + if (!m_absolutePath) url = TQExtFileInfo::toRelative(url, baseURL); combo->setEditText( url.path() ); } } diff --git a/quanta/dialogs/filecombo.h b/quanta/dialogs/filecombo.h index 6991243b..e8610816 100644 --- a/quanta/dialogs/filecombo.h +++ b/quanta/dialogs/filecombo.h @@ -31,9 +31,10 @@ class KURL; class FileCombo : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FileCombo(const KURL& a_baseURL, TQWidget *parent=0, const char *name=0); - FileCombo(TQWidget *parent=0, const char *name=0); + FileCombo(const KURL& a_baseURL, TQWidget *tqparent=0, const char *name=0); + FileCombo(TQWidget *tqparent=0, const char *name=0); ~FileCombo(); TQString text() const; diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui index fba27fc4..22ef785f 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2003 Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>FourButtonMessageBox</cstring> </property> @@ -21,7 +21,7 @@ <height>150</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>150</height> @@ -31,18 +31,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pixmapLabel</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32</height> </size> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel</cstring> </property> @@ -50,9 +50,9 @@ <string></string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -151,14 +151,14 @@ <variables> <variable>int m_status;</variable> </variables> -<slots> +<Q_SLOTS> <slot>cancelButton_clicked()</slot> <slot>user1Button_clicked()</slot> <slot>user2Button_clicked()</slot> <slot>user3Button_clicked()</slot> -</slots> +</Q_SLOTS> <functions> <function specifier="non virtual" returnType="int">status()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/fourbuttonmessagebox.ui.h b/quanta/dialogs/fourbuttonmessagebox.ui.h index 00f31046..85f8c148 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui.h +++ b/quanta/dialogs/fourbuttonmessagebox.ui.h @@ -3,7 +3,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui index dffdaa17..b2684e01 100644 --- a/quanta/dialogs/loadentitydlgs.ui +++ b/quanta/dialogs/loadentitydlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>LoadEntityDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>LoadEntityDlgS</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -27,7 +27,7 @@ <string>Source DTD:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -59,7 +59,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -68,5 +68,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 79dc4bc1..1f1728ae 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -41,8 +41,8 @@ #include "dtds.h" -AbbreviationDlg::AbbreviationDlg(TQWidget *parent, const char *name): - AbbreviationDlgS(parent, name) +AbbreviationDlg::AbbreviationDlg(TQWidget *tqparent, const char *name): + AbbreviationDlgS(tqparent, name) { m_oldItem = 0L; m_currentAbbrev = 0L; @@ -76,8 +76,8 @@ void AbbreviationDlg::slotGroupChanged(const TQString& newGroupName) for ( it = m_currentAbbrev->abbreviations.constBegin(); it != m_currentAbbrev->abbreviations.constEnd(); ++it ) { templateStr = it.key(); - templateName = templateStr.mid(templateStr.find(' ') + 1); - templateStr = templateStr.left(templateStr.find(' ')); + templateName = templateStr.mid(templateStr.tqfind(' ') + 1); + templateStr = templateStr.left(templateStr.tqfind(' ')); new KListViewItem(templatesList, templateStr, templateName); } for ( TQStringList::ConstIterator dtepit = m_currentAbbrev->dteps.constBegin(); dtepit != m_currentAbbrev->dteps.constEnd(); ++dtepit ) @@ -95,9 +95,9 @@ void AbbreviationDlg::slotNewGroup() TQString groupName = KInputDialog::getText(i18n("New Abbreviation Group"), i18n("Group name:"), "", &ok, this); if (ok && !groupName.isEmpty()) { - if (qConfig.abbreviations.contains(groupName)) + if (qConfig.abbreviations.tqcontains(groupName)) { - KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists")); + KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").tqarg(groupName), i18n("Group already exists")); TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); } else { @@ -187,7 +187,7 @@ void AbbreviationDlg::slotRemoveTemplate() { TQListViewItem *item = templatesList->currentItem(); if (item && - KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> template?</qt>").arg(item->text(1)),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue) + KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> template?</qt>").tqarg(item->text(1)),TQString(),KStdGuiItem::del()) == KMessageBox::Continue) { m_currentAbbrev->abbreviations.remove(item->text(0)+" "+item->text(1)); delete item; @@ -248,7 +248,7 @@ void AbbreviationDlg::saveTemplates() el.setAttribute("code", it.data()); s = it.key(); s2 = ""; - pos = s.find(' '); + pos = s.tqfind(' '); if (pos != -1) { s2 = s.mid(pos+1); @@ -270,7 +270,7 @@ void AbbreviationDlg::saveTemplates() f.close(); } else { - KMessageBox::error(this, i18n("<qt>Cannot open the file <b>%1</b> for writing.\nModified abbreviations will be lost when you quit Quanta.</qt>").arg(s)); + KMessageBox::error(this, i18n("<qt>Cannot open the file <b>%1</b> for writing.\nModified abbreviations will be lost when you quit Quanta.</qt>").tqarg(s)); } } diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h index d2ba7ea6..949ad663 100644 --- a/quanta/dialogs/settings/abbreviation.h +++ b/quanta/dialogs/settings/abbreviation.h @@ -27,8 +27,9 @@ struct DTDStruct; class AbbreviationDlg : public AbbreviationDlgS { Q_OBJECT + TQ_OBJECT public: - AbbreviationDlg(TQWidget *parent, const char *name = 0); + AbbreviationDlg(TQWidget *tqparent, const char *name = 0); ~AbbreviationDlg(); void saveTemplates(); diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index 9274fdc6..8e115d0f 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2003 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AbbreviationDlgS</cstring> </property> @@ -52,7 +52,7 @@ <string>&New...</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -71,7 +71,7 @@ <cstring>groupCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -103,7 +103,7 @@ </sizepolicy> </property> </widget> - <widget class="QTextEdit" row="10" column="0" rowspan="1" colspan="4"> + <widget class="TQTextEdit" row="10" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>codeEdit</cstring> </property> @@ -152,7 +152,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="5" column="2" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="5" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>addButton</cstring> </property> @@ -170,14 +170,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QPushButton" row="6" column="2" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="6" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -185,7 +185,7 @@ <string>&Remove</string> </property> </widget> - <widget class="QPushButton" row="7" column="2" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="7" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>editButton</cstring> </property> @@ -193,7 +193,7 @@ <string>&Edit...</string> </property> </widget> - <widget class="QLabel" row="9" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -210,7 +210,7 @@ <cstring>codeEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -269,9 +269,9 @@ <connections> <connection> <sender>templatesList</sender> - <signal>selectionChanged(QListViewItem*)</signal> + <signal>selectionChanged(TQListViewItem*)</signal> <receiver>AbbreviationDlgS</receiver> - <slot>slotTemplateSelectionChanged(QListViewItem*)</slot> + <slot>slotTemplateSelectionChanged(TQListViewItem*)</slot> </connection> <connection> <sender>addButton</sender> @@ -317,7 +317,7 @@ </connection> <connection> <sender>templatesList</sender> - <signal>doubleClicked(QListViewItem*)</signal> + <signal>doubleClicked(TQListViewItem*)</signal> <receiver>AbbreviationDlgS</receiver> <slot>slotEditTemplate()</slot> </connection> @@ -334,19 +334,19 @@ <tabstop>editButton</tabstop> <tabstop>codeEdit</tabstop> </tabstops> -<slots> - <slot>slotTemplateSelectionChanged(QListViewItem*)</slot> +<Q_SLOTS> + <slot>slotTemplateSelectionChanged(TQListViewItem*)</slot> <slot>dtdCombo_activated(const QString&)</slot> <slot>slotGroupChanged(const QString&)</slot> <slot>slotAddTemplate()</slot> <slot>slotRemoveTemplate()</slot> - <slot>templatesList_currentChanged(QListViewItem*)</slot> + <slot>templatesList_currentChanged(TQListViewItem*)</slot> <slot>slotEditTemplate()</slot> <slot>slotAddDTEP()</slot> <slot>slotRemoveDTEP()</slot> <slot>slotNewGroup()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistbox.h</includehint> diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 5aa9254f..733b66eb 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2003 by Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CodeTemplateDlgS</cstring> </property> @@ -21,7 +21,7 @@ <height>72</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>70</height> @@ -34,7 +34,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -45,7 +45,7 @@ <cstring>templateEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -56,12 +56,12 @@ <cstring>descriptionEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>templateEdit</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>descriptionEdit</cstring> </property> @@ -72,10 +72,10 @@ <tabstop>templateEdit</tabstop> <tabstop>descriptionEdit</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>accept()</slot> <slot>reject()</slot> <slot>pushButton4_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index fee135f8..5f96a2eb 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - filesmask.cpp - description + filestqmask.cpp - description ------------------- begin : Fri May 19 2000 copyright : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky <pdima@mail.univ.kiev.ua> @@ -23,15 +23,15 @@ //kde includes #include <kmimetype.h> -FileMasks::FileMasks(TQWidget *parent, const char *name) - :FileMasksS(parent,name) +FileMasks::FileMasks(TQWidget *tqparent, const char *name) + :FileMasksS(tqparent,name) { connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); } FileMasks::~FileMasks(){ } -/** set masks to default */ +/** set tqmasks to default */ void FileMasks::setToDefault() { KMimeType::List list = KMimeType::allMimeTypes(); @@ -43,12 +43,12 @@ void FileMasks::setToDefault() for ( it = list.begin(); it != list.end(); ++it ) { name = (*it)->name(); - if (name.contains("text")) + if (name.tqcontains("text")) { - if (!markup.contains(name) && !script.contains(name)) + if (!markup.tqcontains(name) && !script.tqcontains(name)) text += name+"; "; } - if (name.contains("image")) + if (name.tqcontains("image")) { image += name +"; "; } diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h index 965eb190..cc596259 100644 --- a/quanta/dialogs/settings/filemasks.h +++ b/quanta/dialogs/settings/filemasks.h @@ -1,5 +1,5 @@ /*************************************************************************** - filesmask.h - description + filestqmask.h - description ------------------- begin : Fri May 19 2000 copyright : (C) 2000 by Yacovlev Alexander & Dmitry Poplavsky <pdima@mail.univ.kiev.ua> @@ -24,8 +24,9 @@ class FileMasks : public FileMasksS { Q_OBJECT + TQ_OBJECT public: - FileMasks(TQWidget *parent=0, const char *name=0); + FileMasks(TQWidget *tqparent=0, const char *name=0); ~FileMasks(); public slots: diff --git a/quanta/dialogs/settings/filemaskss.ui b/quanta/dialogs/settings/filemaskss.ui index f8cdb4f6..fb7d322a 100644 --- a/quanta/dialogs/settings/filemaskss.ui +++ b/quanta/dialogs/settings/filemaskss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FileMasksS</cstring> </property> @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -39,12 +39,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>defaultDTDCombo</cstring> </property> @@ -52,7 +52,7 @@ <string>New files will have the extension and highlighting according to this setting</string> </property> </widget> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -69,23 +69,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineMarkup</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignLeft</set> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineImage</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignLeft</set> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>buttonDefault</cstring> </property> @@ -93,7 +93,7 @@ <string>&Reset to Default</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -104,7 +104,7 @@ <cstring>lineText</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -115,7 +115,7 @@ <cstring>lineMarkup</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -126,15 +126,15 @@ <cstring>lineImage</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineText</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignLeft</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -146,7 +146,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -172,38 +172,38 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>153</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineScript</cstring> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignLeft</set> </property> </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> <property name="text"> <string>Default character &encoding:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_2_3</cstring> </property> @@ -224,14 +224,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>50</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup7</cstring> </property> @@ -242,7 +242,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>reloadFiles</cstring> </property> @@ -250,7 +250,7 @@ <string>L&oad last-opened files</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>showSplash</cstring> </property> @@ -258,7 +258,7 @@ <string>S&how splashscreen</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>reloadProject</cstring> </property> @@ -268,15 +268,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>tlAutoSave</cstring> </property> @@ -284,7 +284,7 @@ <string>Create backups every</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>sbAutoSave</cstring> </property> @@ -298,7 +298,7 @@ <number>15</number> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -308,7 +308,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>showDTDSelectDialog</cstring> </property> @@ -332,5 +332,5 @@ <tabstop>reloadProject</tabstop> <tabstop>reloadFiles</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/settings/parseroptions.cpp b/quanta/dialogs/settings/parseroptions.cpp index 24e3c6a6..c38e2875 100644 --- a/quanta/dialogs/settings/parseroptions.cpp +++ b/quanta/dialogs/settings/parseroptions.cpp @@ -22,11 +22,11 @@ #include <kconfig.h> /* - * Constructs a ParserOptions which is a child of 'parent', with the + * Constructs a ParserOptions which is a child of 'tqparent', with the * name 'name' and widget flags set to 'f' */ -ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent, const char* name ) - : ParserOptionsUI( parent, name ) +ParserOptions::ParserOptions( KConfig *a_config, TQWidget* tqparent, const char* name ) + : ParserOptionsUI( tqparent, name ) { config = a_config; config->setGroup("Parser options"); @@ -70,7 +70,7 @@ ParserOptions::ParserOptions( KConfig *a_config, TQWidget* parent, const char* */ ParserOptions::~ParserOptions() { - // no need to delete child widgets, Qt does it all for us + // no need to delete child widgets, TQt does it all for us } diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h index a4c5f6f3..55710161 100644 --- a/quanta/dialogs/settings/parseroptions.h +++ b/quanta/dialogs/settings/parseroptions.h @@ -23,9 +23,10 @@ class KConfig; class ParserOptions : public ParserOptionsUI { Q_OBJECT + TQ_OBJECT public: - ParserOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); + ParserOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0); ~ParserOptions(); void updateConfig(); diff --git a/quanta/dialogs/settings/parseroptionsui.ui b/quanta/dialogs/settings/parseroptionsui.ui index 34a54cd6..2a5fed0b 100644 --- a/quanta/dialogs/settings/parseroptionsui.ui +++ b/quanta/dialogs/settings/parseroptionsui.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2002 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ParserOptionsUI</cstring> </property> @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -50,7 +50,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSpinBox" row="3" column="2"> + <widget class="TQSpinBox" row="3" column="2"> <property name="name"> <cstring>refreshFrequency</cstring> </property> @@ -74,14 +74,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>122</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>instantUpdate</cstring> </property> @@ -102,14 +102,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>122</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>showClosingTags</cstring> </property> @@ -117,7 +117,7 @@ <string>Show closing tags</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>showEmptyNodes</cstring> </property> @@ -125,7 +125,7 @@ <string>Show empt&y nodes and groups</string> </property> </widget> - <widget class="QSpinBox" row="4" column="2"> + <widget class="TQSpinBox" row="4" column="2"> <property name="name"> <cstring>spinExpand</cstring> </property> @@ -136,7 +136,7 @@ <string>Set to 0 in order to expand the whole tree</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel1_5</cstring> </property> @@ -144,7 +144,7 @@ <string>Refresh frequency (in seconds):</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -154,7 +154,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -168,7 +168,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="3" column="1"> + <widget class="TQComboBox" row="3" column="1"> <item> <property name="text"> <string>Select Tag Area</string> @@ -183,7 +183,7 @@ <cstring>comboDoubleClick</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Find Tag</string> @@ -198,7 +198,7 @@ <cstring>comboLBM</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -206,7 +206,7 @@ <string>Left button:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>Popup Menu</string> @@ -216,7 +216,7 @@ <cstring>comboRBM</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -224,7 +224,7 @@ <string>Double click:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -232,7 +232,7 @@ <string>Middle button:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -240,7 +240,7 @@ <string>Right button:</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Find Tag & Open Tree</string> @@ -282,7 +282,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -310,5 +310,5 @@ <tabstop>refreshFrequency</tabstop> <tabstop>spinExpand</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/settings/previewoptions.cpp b/quanta/dialogs/settings/previewoptions.cpp index 2df03ea9..3c0e3c1b 100644 --- a/quanta/dialogs/settings/previewoptions.cpp +++ b/quanta/dialogs/settings/previewoptions.cpp @@ -23,17 +23,17 @@ #include <klocale.h> #include <kmessagebox.h> -PreviewOptions::PreviewOptions(TQWidget *parent, const char *name) - : PreviewOptionsS(parent,name) +PreviewOptions::PreviewOptions(TQWidget *tqparent, const char *name) + : PreviewOptionsS(tqparent,name) { } PreviewOptions::~PreviewOptions(){ } -void PreviewOptions::setWindowLayout(const TQString& layout ) +void PreviewOptions::setWindowLayout(const TQString& tqlayout ) { - if ( layout == "Default") resetLayout->setChecked(true); + if ( tqlayout == "Default") resetLayout->setChecked(true); else resetLayout->setChecked(false); } @@ -64,12 +64,12 @@ TQString PreviewOptions::docPosition() return position; } -TQString PreviewOptions::layout() +TQString PreviewOptions::tqlayout() { - TQString layout = "Custom"; + TQString tqlayout = "Custom"; if ( resetLayout->isChecked() ) - layout = "Default"; - return layout; + tqlayout = "Default"; + return tqlayout; } TQString PreviewOptions::closeButtons() diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index 3cc5b820..ebddcc32 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -24,12 +24,13 @@ class KConfig; class PreviewOptions : public PreviewOptionsS { Q_OBJECT + TQ_OBJECT public: - PreviewOptions(TQWidget *parent=0, const char *name=0); + PreviewOptions(TQWidget *tqparent=0, const char *name=0); ~PreviewOptions(); TQString position(); - TQString layout(); + TQString tqlayout(); TQString closeButtons(); TQString docPosition(); uint toolviewTabs(); diff --git a/quanta/dialogs/settings/previewoptionss.ui b/quanta/dialogs/settings/previewoptionss.ui index a27a164b..e3743258 100644 --- a/quanta/dialogs/settings/previewoptionss.ui +++ b/quanta/dialogs/settings/previewoptionss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PreviewOptionsS</cstring> </property> @@ -21,7 +21,7 @@ <height>512</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>220</height> @@ -31,15 +31,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>resetLayout</cstring> </property> <property name="text"> - <string>Reset window layout to the default on the next startup</string> + <string>Reset window tqlayout to the default on the next startup</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>showHidden</cstring> </property> @@ -47,7 +47,7 @@ <string>Show hidden files in files tree</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>saveLocalTrees</cstring> </property> @@ -55,7 +55,7 @@ <string>Save tree status for local trees</string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>buttonGroup3</cstring> </property> @@ -66,7 +66,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioShowCloseButtons</cstring> </property> @@ -77,7 +77,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioNoCloseButtons</cstring> </property> @@ -85,7 +85,7 @@ <string>&Do not show</string> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioDelayedCloseButtons</cstring> </property> @@ -95,7 +95,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="0" column="1"> + <widget class="TQButtonGroup" row="0" column="1"> <property name="name"> <cstring>buttonGroup3_2</cstring> </property> @@ -106,7 +106,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioNewDocTab</cstring> </property> @@ -117,7 +117,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioSeparateDocView</cstring> </property> @@ -127,7 +127,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="1" column="1"> + <widget class="TQButtonGroup" row="1" column="1"> <property name="name"> <cstring>buttonGroup4</cstring> </property> @@ -138,7 +138,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioIconText</cstring> </property> @@ -149,7 +149,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="2" column="0"> + <widget class="TQRadioButton" row="2" column="0"> <property name="name"> <cstring>radioText</cstring> </property> @@ -157,7 +157,7 @@ <string>Text</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioIcon</cstring> </property> @@ -167,7 +167,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -184,7 +184,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioToolview</cstring> </property> @@ -192,7 +192,7 @@ <string>Separate toolview</string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioEditor</cstring> </property> @@ -215,14 +215,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -233,7 +233,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>warnBinaryOpening</cstring> </property> @@ -241,7 +241,7 @@ <string>Warn about opening binar&y/unknown files</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>warnEventActions</cstring> </property> @@ -249,7 +249,7 @@ <string>Warn when executing &actions associated with events</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>warnAll</cstring> </property> @@ -276,5 +276,5 @@ <tabstop>radioNoCloseButtons</tabstop> <tabstop>radioDelayedCloseButtons</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/settings/styleoptionss.ui b/quanta/dialogs/settings/styleoptionss.ui index 13ed198d..242e7e7c 100644 --- a/quanta/dialogs/settings/styleoptionss.ui +++ b/quanta/dialogs/settings/styleoptionss.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>StyleOptionsS</cstring> </property> @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>410</width> <height>250</height> @@ -39,7 +39,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -47,7 +47,7 @@ <string>Attribute quotation:</string> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <item> <property name="text"> <string>Double Quotes</string> @@ -62,7 +62,7 @@ <cstring>attributeQuotation</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -70,7 +70,7 @@ <string>Tag case:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -78,7 +78,7 @@ <string>Attribute case:</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>Default Case</string> @@ -98,7 +98,7 @@ <cstring>attributeCase</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>optionalTagAutoClose</cstring> </property> @@ -106,7 +106,7 @@ <string>Auto-close o&ptional tags</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>Default Case</string> @@ -126,7 +126,7 @@ <cstring>tagCase</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>tagAutoClose</cstring> </property> @@ -144,14 +144,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>tagUpdateClosing</cstring> </property> @@ -159,7 +159,7 @@ <string>&Update opening/closing tag automatically</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>useAutoCompletion</cstring> </property> @@ -175,7 +175,7 @@ <string>Use &auto-completion</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>replaceAccented</cstring> </property> @@ -183,8 +183,8 @@ <string>Automatic &replacement of the accented characters</string> </property> <property name="whatsThis" stdset="0"> - <string>If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their unicode style notation, for the above case with <b>&#038;#225;</b>.<br> -We suggest to leave this option off and use an unicode or locale encoding for your documents.</string> + <string>If this option is turned on the accented characters, like <b>&#225;</b>, will be automatically replaced by their tqunicode style notation, for the above case with <b>&#038;#225;</b>.<br> +We suggest to leave this option off and use an tqunicode or locale encoding for your documents.</string> </property> </widget> </grid> @@ -197,5 +197,5 @@ We suggest to leave this option off and use an unicode or locale encoding for yo <tabstop>tagAutoClose</tabstop> <tabstop>useAutoCompletion</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index 200b5afe..2caa497e 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -28,8 +28,8 @@ #include "specialchardialog.h" #include "resource.h" -SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl) - :SpecialCharDialogS( parent, name, modal, fl ) +SpecialCharDialog::SpecialCharDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl) + :SpecialCharDialogS( tqparent, name, modal, fl ) { connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(filterChars(const TQString&)) ); @@ -52,7 +52,7 @@ void SpecialCharDialog::filterChars(const TQString& filter) CharsListBox->insertStringList(charList); else { for (TQStringList::ConstIterator it = charList.begin(); it != charList.end(); ++it) - if ( (*it).contains(filter, false) ) + if ( (*it).tqcontains(filter, false) ) CharsListBox->insertItem(*it); } if (CharsListBox->currentItem() == -1 && CharsListBox->count()) @@ -67,8 +67,8 @@ TQString SpecialCharDialog::selection() void SpecialCharDialog::insertCode() { TQString selected = CharsListBox->text(CharsListBox->currentItem()); - int begin = selected.find("(&")+1; - int length = selected.find(";)") - begin + 1; + int begin = selected.tqfind("(&")+1; + int length = selected.tqfind(";)") - begin + 1; m_selection = selected.mid(begin, length); done(TQDialog::Accepted); } diff --git a/quanta/dialogs/specialchardialog.h b/quanta/dialogs/specialchardialog.h index 4155e081..dec3320e 100644 --- a/quanta/dialogs/specialchardialog.h +++ b/quanta/dialogs/specialchardialog.h @@ -24,10 +24,11 @@ class SpecialCharDialog : public SpecialCharDialogS { Q_OBJECT + TQ_OBJECT public: - SpecialCharDialog( TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0); + SpecialCharDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0); ~SpecialCharDialog(); TQString selection(); diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index acc52e53..c0ed272f 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>SpecialCharDialogS</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SpecialCharDialogS</cstring> </property> @@ -22,19 +22,19 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -50,11 +50,11 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonChar</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -74,18 +74,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>112</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>0</height> @@ -103,15 +103,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -145,7 +145,7 @@ <tabstop>buttonChar</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klistbox.h</includehint> diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 878216e3..10ea4273 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -21,10 +21,10 @@ // // 1999-09-27 Espen Sand <espensa@online.no> // KColorDialog is now subclassed from KDialogBase. I have also extended -// KColorDialog::getColor() so that in contains a parent argument. This +// KColorDialog::getColor() so that in contains a tqparent argument. This // improves centering capability. // -// layout management added Oct 1997 by Mario Weilguni +// tqlayout management added Oct 1997 by Mario Weilguni // <mweilguni@sime.com> // @@ -66,8 +66,8 @@ #define STANDARD_PAL_SIZE 17 -ColorCombo::ColorCombo( TQWidget *parent, const char *name ) - : TQComboBox( parent, name ) +ColorCombo::ColorCombo( TQWidget *tqparent, const char *name ) + : TQComboBox( tqparent, name ) { customColor.setRgb( 255, 255, 255 ); internalcolor.setRgb( 255, 255, 255 ); @@ -165,7 +165,7 @@ void ColorCombo::slotActivated( int index ) TQPainter painter; TQPen pen; - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -219,7 +219,7 @@ void ColorCombo::addColors() insertItem( i18n("None") ); - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -270,23 +270,23 @@ void ColorCombo::createStandardPalette() int i = 0; - standardPalette[i++] = Qt::red; - standardPalette[i++] = Qt::green; - standardPalette[i++] = Qt::blue; - standardPalette[i++] = Qt::cyan; - standardPalette[i++] = Qt::magenta; - standardPalette[i++] = Qt::yellow; - standardPalette[i++] = Qt::darkRed; - standardPalette[i++] = Qt::darkGreen; - standardPalette[i++] = Qt::darkBlue; - standardPalette[i++] = Qt::darkCyan; - standardPalette[i++] = Qt::darkMagenta; - standardPalette[i++] = Qt::darkYellow; - standardPalette[i++] = Qt::white; - standardPalette[i++] = Qt::lightGray; - standardPalette[i++] = Qt::gray; - standardPalette[i++] = Qt::darkGray; - standardPalette[i++] = Qt::black; + standardPalette[i++] = TQt::red; + standardPalette[i++] = TQt::green; + standardPalette[i++] = TQt::blue; + standardPalette[i++] = TQt::cyan; + standardPalette[i++] = TQt::magenta; + standardPalette[i++] = TQt::yellow; + standardPalette[i++] = TQt::darkRed; + standardPalette[i++] = TQt::darkGreen; + standardPalette[i++] = TQt::darkBlue; + standardPalette[i++] = TQt::darkCyan; + standardPalette[i++] = TQt::darkMagenta; + standardPalette[i++] = TQt::darkYellow; + standardPalette[i++] = TQt::white; + standardPalette[i++] = TQt::lightGray; + standardPalette[i++] = TQt::gray; + standardPalette[i++] = TQt::darkGray; + standardPalette[i++] = TQt::black; standardPaletteNames = new TQString [STANDARD_PAL_SIZE]; diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index b6f851e0..a1f92a31 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -19,7 +19,7 @@ //----------------------------------------------------------------------------- // KDE color selection combo box -// layout management added Oct 1997 by Mario Weilguni +// tqlayout management added Oct 1997 by Mario Weilguni // <mweilguni@sime.com> @@ -37,11 +37,12 @@ /** * Combobox for colours. */ -class ColorCombo : public QComboBox +class ColorCombo : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - ColorCombo( TQWidget *parent = 0L, const char *name = 0L ); + ColorCombo( TQWidget *tqparent = 0L, const char *name = 0L ); ~ColorCombo(); void setColor( const TQColor &col ); diff --git a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp index 8e52ae01..f45eea8f 100644 --- a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp +++ b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp @@ -21,8 +21,8 @@ #include <tqdict.h> #include <tqlineedit.h> -CoreWidgetDlg::CoreWidgetDlg(TQWidget *parent, const char *name) - :CoreWidgetDlgS(parent,name), TagWidget(parent,name) +CoreWidgetDlg::CoreWidgetDlg(TQWidget *tqparent, const char *name) + :CoreWidgetDlgS(tqparent,name), TagWidget(tqparent,name) { } @@ -48,13 +48,13 @@ void CoreWidgetDlg::writeAttributes( TQDict<TQString> *d ) dict = d; TQString *t; // value of attr. - if (( t=d->find("id") )) setValue(*t, lineId); - if (( t=d->find("class") )) setValue(*t, lineClass); - if (( t=d->find("style") )) setValue(*t, lineStyle); - if (( t=d->find("title") )) setValue(*t, lineTitle); + if (( t=d->tqfind("id") )) setValue(*t, lineId); + if (( t=d->tqfind("class") )) setValue(*t, lineClass); + if (( t=d->tqfind("style") )) setValue(*t, lineStyle); + if (( t=d->tqfind("title") )) setValue(*t, lineTitle); - if (( t=d->find("lang") )) setValue(*t, lineLang); - if (( t=d->find("dir") )) setValue(*t, lineDir); + if (( t=d->tqfind("lang") )) setValue(*t, lineLang); + if (( t=d->tqfind("dir") )) setValue(*t, lineDir); } diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index 713ccf2c..a7954793 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -24,8 +24,8 @@ #include <tqstring.h> #include <tqstringlist.h> -ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) - :KDialogBase(parent,name), listbox(new KListBox(this)) +ListDlg::ListDlg(TQStringList &entryList,TQWidget* tqparent, const char *name ) + :KDialogBase(tqparent,name), listbox(new KListBox(this)) { Q_CHECK_PTR(listbox); setMainWidget(listbox); @@ -40,7 +40,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) } listbox->setMinimumSize(350,150); adjustSize(); - resize(sizeHint()); + resize(tqsizeHint()); connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); } diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h index ea455d70..4615e495 100644 --- a/quanta/dialogs/tagdialogs/listdlg.h +++ b/quanta/dialogs/tagdialogs/listdlg.h @@ -32,8 +32,9 @@ selected item with the getEntry() method. class ListDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ListDlg(TQStringList &entryList,TQWidget* parent=0, const char *name =0); + ListDlg(TQStringList &entryList,TQWidget* tqparent=0, const char *name =0); ~ListDlg(); TQString getEntry(); int getEntryNum(); diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp index 65102ba8..7579c47a 100644 --- a/quanta/dialogs/tagdialogs/pictureview.cpp +++ b/quanta/dialogs/tagdialogs/pictureview.cpp @@ -20,7 +20,7 @@ #include "tqpainter.h" #include <tqimage.h> -PictureView::PictureView(TQWidget *parent, char *file, const char *name ) : TQFrame(parent,name) +PictureView::PictureView(TQWidget *tqparent, char *file, const char *name ) : TQFrame(tqparent,name) { if ( file ) { pix = new TQImage(file); @@ -69,7 +69,7 @@ void PictureView::slotSetImage(const TQString& file) picheight = pix->height(); scale(); - repaint(); + tqrepaint(); } /** try scale image */ diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h index 59a71609..e8fadc31 100644 --- a/quanta/dialogs/tagdialogs/pictureview.h +++ b/quanta/dialogs/tagdialogs/pictureview.h @@ -29,8 +29,9 @@ used by TagImgDlg class PictureView : public TQFrame { Q_OBJECT + TQ_OBJECT public: - PictureView(TQWidget *parent=0, char *file=0, const char *name=0); + PictureView(TQWidget *tqparent=0, char *file=0, const char *name=0); /** try scale image */ void scale(); public slots: // Public slots diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp index 251c4b8b..1ab0bdde 100644 --- a/quanta/dialogs/tagdialogs/tagattr.cpp +++ b/quanta/dialogs/tagdialogs/tagattr.cpp @@ -39,7 +39,7 @@ TQString Attr::attrName() const } -Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) +Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { combo = (TQComboBox *)w; @@ -50,7 +50,7 @@ Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) TQString method = el.attribute("method"); TQString interface = el.attribute("interface", "QuantaIf"); TQString arguments = el.attribute("arguments"); - arguments.replace("%tagname%", m_dtdTag->name()); + arguments.tqreplace("%tagname%", m_dtdTag->name()); DCOPReply reply = QuantaCommon::callDCOPMethod(interface, method, arguments); if (reply.isValid()) { @@ -87,9 +87,9 @@ void Attr_list::setValue(const TQString &value) } -TQDomNode findChild( TQDomNode &parent, const TQString &name ) +TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name ) { - for ( TQDomNode n = parent.firstChild(); !n.isNull(); n = n.nextSibling() ) + for ( TQDomNode n = tqparent.firstChild(); !n.isNull(); n = n.nextSibling() ) if ( n.nodeName() == name ) return n; return TQDomNode(); diff --git a/quanta/dialogs/tagdialogs/tagattr.h b/quanta/dialogs/tagdialogs/tagattr.h index bbd562c6..c9567eda 100644 --- a/quanta/dialogs/tagdialogs/tagattr.h +++ b/quanta/dialogs/tagdialogs/tagattr.h @@ -34,16 +34,16 @@ class TQDomElement; class TQWidget; -class QTag; +class TQTag; -TQDomNode findChild( TQDomNode &parent, const TQString &name ); +TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name ); class Attr { public: - Attr( TQDomElement const& el, TQWidget *, QTag *dtdTag ) + Attr( TQDomElement const& el, TQWidget *, TQTag *dtdTag ) : domEl(el), name(domEl.attribute("name","")), m_dtdTag(dtdTag) {} //{ domEl = el; name = domEl->attribute("name",""); m_dtdTag = dtdTag;} virtual ~Attr(){} @@ -57,7 +57,7 @@ class Attr protected: TQDomElement domEl; TQString name; - QTag *m_dtdTag; + TQTag *m_dtdTag; }; @@ -67,7 +67,7 @@ class Attr_line : public Attr TQLineEdit *line; public: - Attr_line( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_line( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { line = (TQLineEdit *)w; } virtual ~Attr_line(){}; @@ -82,7 +82,7 @@ class Attr_color : public Attr ColorCombo *color; public: - Attr_color( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_color( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { color = (ColorCombo *)w; } virtual ~Attr_color(){}; @@ -96,7 +96,7 @@ class Attr_file : public Attr FileCombo *file; public: - Attr_file( TQDomElement const& el, TQWidget *w , QTag * dtdTag ) : Attr(el, w, dtdTag) + Attr_file( TQDomElement const& el, TQWidget *w , TQTag * dtdTag ) : Attr(el, w, dtdTag) { file = (FileCombo *)w; } virtual ~Attr_file(){}; @@ -110,7 +110,7 @@ class Attr_list : public Attr TQComboBox *combo; public: - Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ); + Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ); virtual ~Attr_list(){}; virtual TQString value() { return combo->currentText(); } @@ -124,7 +124,7 @@ class Attr_check : public Attr TQCheckBox *check; public: - Attr_check( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_check( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { check = (TQCheckBox *)w; } virtual ~Attr_check(){}; diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index bc5800ae..12ecec0d 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -42,7 +42,7 @@ #include "qtag.h" #include "kafkacommon.h" -TagDialog::TagDialog(QTag* dtdTag, Tag *tag, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, Tag *tag, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true) { init(dtdTag, a_baseURL); @@ -60,7 +60,7 @@ TagDialog::TagDialog(QTag* dtdTag, Tag *tag, KURL a_baseURL) } -TagDialog::TagDialog(QTag* dtdTag, Tag *tag, const TQString& selection, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, Tag *tag, const TQString& selection, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true), m_selection(selection) { init(dtdTag, a_baseURL); @@ -77,7 +77,7 @@ TagDialog::TagDialog(QTag* dtdTag, Tag *tag, const TQString& selection, KURL a_b parseTag(); } -TagDialog::TagDialog(QTag* dtdTag, TQString attrs, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, TQString attrs, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true) { init(dtdTag, a_baseURL); @@ -90,7 +90,7 @@ TagDialog::TagDialog(QTag* dtdTag, TQString attrs, KURL a_baseURL) parseTag(); } -TagDialog::TagDialog(QTag* dtdTag, const TQString& selection, TQString attrs, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, const TQString& selection, TQString attrs, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true), m_selection(selection) { init(dtdTag, a_baseURL); @@ -113,7 +113,7 @@ TagDialog::~TagDialog() } -void TagDialog::init(QTag *a_dtdTag, KURL a_baseURL) +void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL) { setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); @@ -123,7 +123,7 @@ void TagDialog::init(QTag *a_dtdTag, KURL a_baseURL) if (!a_dtdTag) //the tag is invalid, let's create a default one { - dtdTag = new QTag(); + dtdTag = new TQTag(); dtdTag->setName(i18n("Unknown tag")); deleteTag = true; } else @@ -148,7 +148,7 @@ void TagDialog::parseTag() TQDomDocument doc; if (dtdTag->name().lower() == "img") //NOTE: HTML specific code! { - mainDlg = new TagImgDlg(dtdTag->parentDTD, this); + mainDlg = new TagImgDlg(dtdTag->tqparentDTD, this); ((TagImgDlg *)mainDlg)->writeAttributes( dict ); } //read the tag file it is available @@ -164,7 +164,7 @@ void TagDialog::parseTag() { TQDomNode n = nodeList.item(i); TQString nodeTagName = n.toElement().attribute("name"); - if (!dtdTag->parentDTD->caseSensitive) + if (!dtdTag->tqparentDTD->caseSensitive) nodeTagName = nodeTagName.upper(); if (nodeTagName == tagName && n.toElement().elementsByTagName("attr").count() > 0) //read a tag { @@ -179,7 +179,7 @@ void TagDialog::parseTag() else { TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n"; - docString += TQString("<tag name=\"%1\">\n").arg(dtdTag->name()); + docString += TQString("<tag name=\"%1\">\n").tqarg(dtdTag->name()); docString += QuantaCommon::xmlFromAttributes(dtdTag->attributes()); docString += "</tag>\n</TAGS>\n"; doc.setContent(docString); @@ -192,7 +192,7 @@ void TagDialog::parseTag() addTab( mainDlg, i18n("Main") ); } - KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName); + KConfig *dtdConfig = new KConfig(dtdTag->tqparentDTD->fileName); dtdConfig->setGroup("General"); int numOfPages = dtdConfig->readNumEntry("NumOfPages"); extraPageList = new TQPtrList<Tagxml>(); @@ -200,14 +200,14 @@ void TagDialog::parseTag() for (int i = 1; i <= numOfPages; i++) { Tagxml *extraPage = 0L; - dtdConfig->setGroup(TQString("Page%1").arg(i)); + dtdConfig->setGroup(TQString("Page%1").tqarg(i)); TQString title = dtdConfig->readEntry("Title"); TQStringList groupList; groupList = dtdConfig->readListEntry("Groups"); TQDomDocument extraDoc; //build an internal tag XML for the groups bool addPage = false; TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n"; - docString += TQString("<tag name=\"Page%1\">\n").arg(i); + docString += TQString("<tag name=\"Page%1\">\n").tqarg(i); for (uint j = 0; j < groupList.count(); j++) { groupList[j] = groupList[j].stripWhiteSpace(); @@ -226,7 +226,7 @@ void TagDialog::parseTag() { TQDomNode node = nodeList.item(j); TQString nodeTagName = node.toElement().attribute("name"); - if (groupList.contains(nodeTagName) && dtdTag->commonGroups.contains(nodeTagName)) //add the attributes of this common tag to a new tab + if (groupList.tqcontains(nodeTagName) && dtdTag->commonGroups.tqcontains(nodeTagName)) //add the attributes of this common tag to a new tab { TQString s; TQTextStream str(&s, IO_ReadWrite); @@ -325,15 +325,15 @@ TQString TagDialog::getAttributeString() TQString TagDialog::getAttribute(const TQString& attr) { TQString attrStr = getAttributeString()+" "; - int pos = attrStr.upper().find(attr.upper()); + int pos = attrStr.upper().tqfind(attr.upper()); if (pos != -1) { - pos = attrStr.find("=",pos+1) + 1; - return attrStr.mid(pos, attrStr.find(" ",pos) - pos); + pos = attrStr.tqfind("=",pos+1) + 1; + return attrStr.mid(pos, attrStr.tqfind(" ",pos) - pos); } else { - return TQString::null; + return TQString(); } } @@ -429,7 +429,7 @@ void TagDialog::insertTag(Document *w, bool insertInLine) TQString newTag = getAttributeString(); newTag = TQString("<")+QuantaCommon::tagCase(dtdTag->name())+newTag; - if ( dtdTag->parentDTD->singleTagStyle == "xml" && + if ( dtdTag->tqparentDTD->singleTagStyle == "xml" && (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional())) ) { diff --git a/quanta/dialogs/tagdialogs/tagdialog.h b/quanta/dialogs/tagdialogs/tagdialog.h index c715085f..c3e6c2d4 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.h +++ b/quanta/dialogs/tagdialogs/tagdialog.h @@ -32,13 +32,14 @@ class Document; class TagWidget; class Tagxml; -class QTag; +class TQTag; class Tag; class KURL; class TQShowEvent; class TagDialog : public TQTabDialog { Q_OBJECT + TQ_OBJECT public: /** @@ -50,10 +51,10 @@ public: </a> */ - TagDialog(QTag* dtdTag, Tag* tag, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, Tag* tag, const TQString& selection, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, TQString attrs=TQString::null, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, const TQString& selection, TQString attrs=TQString::null, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, Tag* tag, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, Tag* tag, const TQString& selection, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, TQString attrs=TQString(), KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, const TQString& selection, TQString attrs=TQString(), KURL a_baseURL = KURL()); ~TagDialog(); /** Insert an attribute to dict*/ void insertAttribute(TQString *attr, TQString *value); @@ -90,12 +91,12 @@ protected slots: private: bool deleteTag; Tag *m_tag; - QTag* dtdTag; + TQTag* dtdTag; TQString m_selection; TQPtrList<Tagxml> *extraPageList; - void init(QTag* dtdTag, KURL a_baseURL); + void init(TQTag* dtdTag, KURL a_baseURL); void parseAttributes(const TQString &attrs); }; diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 9448f48d..b8f08324 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -35,8 +35,8 @@ #include "tagimgdlg.moc" -TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(parent,name) +TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name) { m_dtd = dtd; img = 0L; @@ -108,7 +108,7 @@ void TagImgDlg::slotFileSelect() if ( !url.isEmpty() ) { slotImageSet( url ); - url = QExtFileInfo::toRelative(url, baseURL); + url = TQExtFileInfo::toRelative(url, baseURL); lineImgSource->setText( url.path() ); } } @@ -145,26 +145,26 @@ void TagImgDlg::writeAttributes( TQDict<TQString> *d ) dict = d; TQString *t; // value of attr. - if (( t=d->find("src") )) + if (( t=d->tqfind("src") )) { lineImgSource->setText(*t); KURL url = baseURL; QuantaCommon::setUrl(url, *t); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); slotImageSet( url ); } - if ( (t=d->find("alt")) ) + if ( (t=d->tqfind("alt")) ) setValue(*t, lineAltText); - if ( (t=d->find("width")) && lineWidth ) + if ( (t=d->tqfind("width")) && lineWidth ) setValue(*t, lineWidth); - if ( (t=d->find("height")) && lineHeight ) + if ( (t=d->tqfind("height")) && lineHeight ) setValue(*t, lineHeight); - if ( (t=d->find("hspace")) && lineHSpace) + if ( (t=d->tqfind("hspace")) && lineHSpace) setValue(*t, lineHSpace); - if ( (t=d->find("vspace")) && lineVSpace ) + if ( (t=d->tqfind("vspace")) && lineVSpace ) setValue(*t, lineVSpace); - if ( (t=d->find("align")) && comboAlign ) + if ( (t=d->tqfind("align")) && comboAlign ) setValue(*t, comboAlign); - if ( (t=d->find("border")) && spinBorder ) + if ( (t=d->tqfind("border")) && spinBorder ) setValue(*t, spinBorder); } diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h index 9f67d0f9..488d2377 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.h +++ b/quanta/dialogs/tagdialogs/tagimgdlg.h @@ -40,8 +40,9 @@ class TQImage; class TagImgDlg : public TQWidget, TagWidget { Q_OBJECT + TQ_OBJECT public: - TagImgDlg(const DTDStruct *dtd, TQWidget *parent=0, const char *name=0); + TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent=0, const char *name=0); ~TagImgDlg(); public: @@ -51,19 +52,19 @@ public: KLineEdit *lineImgSource; TQPushButton *buttonImgSource; TQPushButton *buttonRecalcImgSize; - TQLabel *QLabel_4; + TQLabel *TQLabel_4; KLineEdit *lineWidth; - TQLabel *QLabel_5; + TQLabel *TQLabel_5; KLineEdit *lineHeight; - TQLabel *QLabel_6; + TQLabel *TQLabel_6; KLineEdit *lineHSpace; - TQLabel *QLabel_7; + TQLabel *TQLabel_7; KLineEdit *lineVSpace; - TQLabel *QLabel_8; + TQLabel *TQLabel_8; KLineEdit *lineAltText; - TQLabel *QLabel_9; + TQLabel *TQLabel_9; TQSpinBox *spinBorder; - TQLabel *QLabel_10; + TQLabel *TQLabel_10; TQComboBox *comboAlign; PictureView *widgetImg; TQPushButton *buttonOk; diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp index 69d6a72e..07a44394 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp @@ -34,7 +34,7 @@ void TagImgDlg::initDialog(){ buttonImgSource->setText(i18n("...")); grid->addMultiCellWidget(buttonImgSource, 0, 0, 4, 4); - QTag *imgTag = m_dtd->tagsList->find("img"); + TQTag *imgTag = m_dtd->tagsList->tqfind("img"); if (!imgTag) return; @@ -42,9 +42,9 @@ void TagImgDlg::initDialog(){ lineWidth = 0L; if (imgTag->attribute("width")) { - QLabel_4= new TQLabel(this,"NoName"); - QLabel_4->setText(i18n("Width:")); - grid->addMultiCellWidget(QLabel_4, 1, 1, 0, 0); + TQLabel_4= new TQLabel(this,"NoName"); + TQLabel_4->setText(i18n("Width:")); + grid->addMultiCellWidget(TQLabel_4, 1, 1, 0, 0); lineWidth= new KLineEdit(this,"NoName"); lineWidth->setValidator( new KFloatValidator( lineWidth ) ); @@ -54,9 +54,9 @@ void TagImgDlg::initDialog(){ lineHeight = 0L; if (imgTag->attribute("height")) { - QLabel_5= new TQLabel(this,"NoName"); - QLabel_5->setText(i18n("Height:")); - grid->addMultiCellWidget(QLabel_5, 1, 1, 2, 2); + TQLabel_5= new TQLabel(this,"NoName"); + TQLabel_5->setText(i18n("Height:")); + grid->addMultiCellWidget(TQLabel_5, 1, 1, 2, 2); lineHeight= new KLineEdit(this,"NoName"); lineHeight->setValidator( new KFloatValidator( lineHeight ) ); @@ -70,9 +70,9 @@ void TagImgDlg::initDialog(){ lineHSpace = 0L; if (imgTag->attribute("hspace")) { - QLabel_6= new TQLabel(this,"NoName"); - QLabel_6->setText(i18n("HSpace:")); - grid->addMultiCellWidget(QLabel_6, 2, 2, 0, 0); + TQLabel_6= new TQLabel(this,"NoName"); + TQLabel_6->setText(i18n("HSpace:")); + grid->addMultiCellWidget(TQLabel_6, 2, 2, 0, 0); lineHSpace= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineHSpace, 2, 2, 1, 1); @@ -81,17 +81,17 @@ void TagImgDlg::initDialog(){ lineVSpace = 0L; if (imgTag->attribute("vspace")) { - QLabel_7= new TQLabel(this,"NoName"); - QLabel_7->setText(i18n("VSpace:")); - grid->addMultiCellWidget(QLabel_7, 2, 2, 2, 2); + TQLabel_7= new TQLabel(this,"NoName"); + TQLabel_7->setText(i18n("VSpace:")); + grid->addMultiCellWidget(TQLabel_7, 2, 2, 2, 2); lineVSpace= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineVSpace, 2, 2, 3, 3); } - QLabel_8= new TQLabel(this,"NoName"); - QLabel_8->setText(i18n("Alternate text:")); - grid->addMultiCellWidget(QLabel_8, 3, 3, 0, 0); + TQLabel_8= new TQLabel(this,"NoName"); + TQLabel_8->setText(i18n("Alternate text:")); + grid->addMultiCellWidget(TQLabel_8, 3, 3, 0, 0); lineAltText= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineAltText, 3, 3, 1, 4); @@ -99,9 +99,9 @@ void TagImgDlg::initDialog(){ spinBorder = 0L; if (imgTag->attribute("border")) { - QLabel_9= new TQLabel(this,"NoName"); - QLabel_9->setText(i18n("Border:")); - grid->addMultiCellWidget(QLabel_9, 4, 4, 0, 0); + TQLabel_9= new TQLabel(this,"NoName"); + TQLabel_9->setText(i18n("Border:")); + grid->addMultiCellWidget(TQLabel_9, 4, 4, 0, 0); spinBorder= new TQSpinBox(this,"NoName"); spinBorder->setRange(0,20); @@ -111,9 +111,9 @@ void TagImgDlg::initDialog(){ comboAlign = 0L; if (imgTag->attribute("align")) { - QLabel_10= new TQLabel(this,"NoName"); - QLabel_10->setText(i18n("Align:")); - grid->addMultiCellWidget(QLabel_10, 4, 4, 2, 2); + TQLabel_10= new TQLabel(this,"NoName"); + TQLabel_10->setText(i18n("Align:")); + grid->addMultiCellWidget(TQLabel_10, 4, 4, 2, 2); comboAlign= new TQComboBox(this,"NoName"); grid->addMultiCellWidget(comboAlign, 4, 4, 3, 4); diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui index 1ec00314..d3e03fd5 100644 --- a/quanta/dialogs/tagdialogs/tagmail.ui +++ b/quanta/dialogs/tagdialogs/tagmail.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TagMail</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>TagMail</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>AddressLabel</cstring> </property> @@ -27,7 +27,7 @@ <string>Email address:</string> </property> </widget> - <widget class="QPushButton" row="0" column="4"> + <widget class="TQPushButton" row="0" column="4"> <property name="name"> <cstring>buttonAddressSelect</cstring> </property> @@ -39,7 +39,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -49,17 +49,17 @@ <string>...</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lineEmail</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lineSubject</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>SubjectLabel</cstring> </property> @@ -67,7 +67,7 @@ <string>Subject:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TitleLabel</cstring> </property> @@ -83,7 +83,7 @@ <string>Title:</string> </property> </widget> - <widget class="QTextEdit" row="2" column="1" rowspan="1" colspan="4"> + <widget class="TQTextEdit" row="2" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>titleEdit</cstring> </property> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -126,5 +126,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index 3ed62c57..0aa689d2 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -34,8 +34,8 @@ #include <tqregexp.h> -TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) - :TagMail(parent, name) +TagMailDlg::TagMailDlg(TQWidget *tqparent, const char *name) + :TagMail(tqparent, name) { setCaption(name); setModal(true); @@ -68,18 +68,18 @@ void TagMailDlg::slotSelectAddress() n = n.simplifyWhiteSpace(); for( unsigned int i = 0; i < emails.count(); ++i ) { if (!emails[i].isEmpty()) { - if (n.isEmpty() || (emails[i].find( "<" ) != -1)) + if (n.isEmpty() || (emails[i].tqfind( "<" ) != -1)) addr = ""; else { /* do we really need quotes around this name ? */ - if (n.find(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1) + if (n.tqfind(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1) addr = qConfig.attrValueQuotation + n + qConfig.attrValueQuotation + " "; else addr = n + " "; } email = emails[i]; - if (!addr.isEmpty() && (email.find( "<" ) == -1) - && (email.find( ">" ) == -1) - && (email.find( "," ) == -1)) + if (!addr.isEmpty() && (email.tqfind( "<" ) == -1) + && (email.tqfind( ">" ) == -1) + && (email.tqfind( "," ) == -1)) addr += "<" + email + ">"; else addr += email; diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.h b/quanta/dialogs/tagdialogs/tagmaildlg.h index 32dffaa5..1b739954 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.h +++ b/quanta/dialogs/tagdialogs/tagmaildlg.h @@ -24,8 +24,9 @@ class TagMailDlg : public TagMail { Q_OBJECT + TQ_OBJECT public: - TagMailDlg(TQWidget *parent=0, const char *name=0); + TagMailDlg(TQWidget *tqparent=0, const char *name=0); ~TagMailDlg(); private slots: // Private slots /** Select a mail address, using the KABC */ diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui index 39f044c9..4d39033d 100644 --- a/quanta/dialogs/tagdialogs/tagmisc.ui +++ b/quanta/dialogs/tagdialogs/tagmisc.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2001, 2003 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TagMisc</cstring> </property> @@ -21,7 +21,7 @@ <height>61</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>60</height> @@ -34,12 +34,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>elementName</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -47,7 +47,7 @@ <string>Element name:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>addClosingTag</cstring> </property> @@ -64,5 +64,5 @@ <tabstop>elementName</tabstop> <tabstop>addClosingTag</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index 9313bb08..70c5600c 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -19,8 +19,8 @@ #include <tqlineedit.h> #include <tqcheckbox.h> -TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, const TQString &element ) - :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) +TagMiscDlg::TagMiscDlg( TQWidget* tqparent, const char* name, bool addClosingTag, const TQString &element ) + :KDialogBase( tqparent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) { miscWidget = new TagMisc(this); connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) ); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.h b/quanta/dialogs/tagdialogs/tagmiscdlg.h index e8d68c3d..4ac7c2a8 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.h +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.h @@ -24,9 +24,10 @@ class TagMisc; class TagMiscDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TagMiscDlg( TQWidget* parent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString::null ); + TagMiscDlg( TQWidget* tqparent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString() ); ~TagMiscDlg(); TQString elementTagName() const; diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 7a9edbdb..2b116855 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -23,8 +23,8 @@ #include <tqradiobutton.h> #include <tqgroupbox.h> -TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) - : TQDialog(parent,name,true) +TagQuickListDlg::TagQuickListDlg(TQWidget *tqparent, const char *name) + : TQDialog(tqparent,name,true) { setCaption(name); diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h index 15f0f21d..e9c13189 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef TAGQUICKLISTDLG_H -#define TAGQUICKLISTDLG_H +#ifndef TAGTQUICKLISTDLG_H +#define TAGTQUICKLISTDLG_H #include <tqwidget.h> @@ -33,16 +33,17 @@ class TQButtonGroup; class TagQuickListDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: - TagQuickListDlg(TQWidget *parent=0, const char *name=0); + TagQuickListDlg(TQWidget *tqparent=0, const char *name=0); ~TagQuickListDlg(); public: void initDialog(); - TQLabel *QLabel_1; + TQLabel *TQLabel_1; TQSpinBox *spinBoxRows; TQPushButton *buttonOk; - TQLabel *QLabel_2; + TQLabel *TQLabel_2; TQRadioButton *radioOrdered; TQRadioButton *radioUnordered; TQPushButton *buttonCancel; diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp index f7e7b713..7f499c14 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp @@ -21,10 +21,10 @@ void TagQuickListDlg::initDialog() { resize(230,150); - QLabel_1= new TQLabel(this,"NoName"); - QLabel_1->setGeometry(10,10,100,30); - QLabel_1->setMinimumSize(0,0); - QLabel_1->setText(i18n("Rows:")); + TQLabel_1= new TQLabel(this,"NoName"); + TQLabel_1->setGeometry(10,10,100,30); + TQLabel_1->setMinimumSize(0,0); + TQLabel_1->setText(i18n("Rows:")); spinBoxRows= new TQSpinBox(this,"NoName"); spinBoxRows->setGeometry(120,10,100,25); @@ -35,10 +35,10 @@ void TagQuickListDlg::initDialog() buttonOk->setGeometry(10,110,100,30); buttonOk->setMinimumSize(0,0); - QLabel_2= new TQLabel(this,"NoName"); - QLabel_2->setGeometry(10,40,100,30); - QLabel_2->setMinimumSize(0,0); - QLabel_2->setText(i18n("Style:")); + TQLabel_2= new TQLabel(this,"NoName"); + TQLabel_2->setGeometry(10,40,100,30); + TQLabel_2->setMinimumSize(0,0); + TQLabel_2->setText(i18n("Style:")); buttonCancel= new TQPushButton(this,"NoName"); buttonCancel->setGeometry(120,110,100,30); diff --git a/quanta/dialogs/tagdialogs/tagwidget.cpp b/quanta/dialogs/tagdialogs/tagwidget.cpp index 014549bc..4eb79f24 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.cpp +++ b/quanta/dialogs/tagdialogs/tagwidget.cpp @@ -30,9 +30,9 @@ #include "tagdialog.h" #include "resource.h" -TagWidget::TagWidget(TQObject *parent, const char *) +TagWidget::TagWidget(TQObject *tqparent, const char *) { - baseURL = ((TagDialog *)parent)->baseURL(); + baseURL = ((TagDialog *)tqparent)->baseURL(); } TagWidget::~TagWidget(){ @@ -47,7 +47,7 @@ void TagWidget::updateDict(const TQString &attr, TQComboBox *combo ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::setValue(const TQString &val, TQComboBox *combo) @@ -92,7 +92,7 @@ void TagWidget::updateDict(const TQString &attr, TQLineEdit *line ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin ) @@ -104,7 +104,7 @@ void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::updateDict(const TQString &attr, TQCheckBox *check ) @@ -113,7 +113,7 @@ void TagWidget::updateDict(const TQString &attr, TQCheckBox *check ) dict->remove(attr); else { - if (!dict->find(attr)) + if (!dict->tqfind(attr)) dict->insert(attr, new TQString("")); } } diff --git a/quanta/dialogs/tagdialogs/tagwidget.h b/quanta/dialogs/tagdialogs/tagwidget.h index b73c6782..38f67877 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.h +++ b/quanta/dialogs/tagdialogs/tagwidget.h @@ -33,7 +33,7 @@ class KURL; class TagWidget { public: - TagWidget(TQObject *parent=0, const char *name=0); + TagWidget(TQObject *tqparent=0, const char *name=0); virtual ~TagWidget(); virtual void readAttributes(TQDict<TQString> *) {}; diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 5c07b341..41388efc 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -29,14 +29,14 @@ #include "styleeditor.h" -Tagxml::Tagxml( TQDomNode &d, QTag *dtdTag, TQWidget *parent, const char *name) - :TQWidget(parent,name), TagWidget(parent,name), doc(d) +Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *tqparent, const char *name) + :TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d) { initialize(d, dtdTag); } -Tagxml::Tagxml( TQDomNode &d, QTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(parent,name), doc(d), m_selection(selection) +Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d), m_selection(selection) { initialize(d, dtdTag); } @@ -45,9 +45,9 @@ Tagxml::~Tagxml() { } -void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) +void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) { - m_dtd = dtdTag->parentDTD; + m_dtd = dtdTag->tqparentDTD; m_dtdTag = dtdTag; TQGridLayout *grid = new TQGridLayout( this ); grid->setSpacing( 13 ); @@ -56,7 +56,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) //parse the tag XML file, in order to build up the dialog for ( TQDomNode n = d.firstChild(); !n.isNull(); n = n.nextSibling() ) { - TQDomNode location = findChild(n,"location"); + TQDomNode location = tqfindChild(n,"location"); if ( location.isNull() ) continue; @@ -69,7 +69,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) int colspan = el.attribute("colspan","1").toInt()-1; int rowspan = el.attribute("rowspan","1").toInt()-1; - location = findChild(n,"textlocation"); + location = tqfindChild(n,"textlocation"); el = location.toElement(); int textrow = el.attribute("row","0").toInt(); int textcol = el.attribute("col","0").toInt(); @@ -79,7 +79,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) // qDebug("%s col:%d row:%d cs:%d, rs:%d", n.nodeName().data(), col,row,colspan,rowspan ); TQString tip; - TQDomNode tooltip = findChild( n ,"tooltip" ); + TQDomNode tooltip = tqfindChild( n ,"tooltip" ); if ( !tooltip.isNull() ) { if ( tooltip.firstChild().isText() ) { TQDomText text = tooltip.firstChild().toText(); @@ -87,7 +87,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) } } TQString whatsThis; - TQDomNode what = findChild( n ,"whatsthis" ); + TQDomNode what = tqfindChild( n ,"whatsthis" ); if ( !what.isNull() ) { if ( what.firstChild().isText() ) { TQDomText text = what.firstChild().toText(); @@ -98,7 +98,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) if ( n.nodeName() == "label" ) //a static label { TQLabel *label = new TQLabel(this); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() ) label->setText( ltext.text().isEmpty() ? TQString("") : (ltext.text()+":") ); @@ -116,7 +116,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) TQDomElement el(n.toElement()); TQString type = el.attribute("type","input"); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() && (type != "check") ) //if there is a text label for the attribute { TQLabel *label = new TQLabel(this); @@ -152,7 +152,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) TQCheckBox *w = new TQCheckBox(this); grid->addMultiCellWidget( w, row, row+rowspan, col, col+colspan ); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() ) w->setText( ltext.text() ); if ( !tip.isNull() ) @@ -270,10 +270,10 @@ void Tagxml::readAttributes( TQDict<TQString> *d ) { if (m_dtd->booleanAttributes == "simple") { - d->replace(name, new TQString("") ); + d->tqreplace(name, new TQString("") ); } else { - d->replace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all + d->tqreplace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all } } else @@ -283,16 +283,16 @@ void Tagxml::readAttributes( TQDict<TQString> *d ) /* } else { value = (value == "checked")?m_dtd->booleanTrue:m_dtd->booleanFalse; - d->replace(name, new TQString(value)); + d->tqreplace(name, new TQString(value)); } */ } else if (dynamic_cast<Attr_file *>(attr)) { // value = KURL::encode_string(value); - d->replace(name, new TQString(value)); + d->tqreplace(name, new TQString(value)); } else { - value.replace(TQRegExp("&(?!amp;)"), "&"); - d->replace(name, new TQString(value) ); + value.tqreplace(TQRegExp("&(?!amp;)"), "&"); + d->tqreplace(name, new TQString(value) ); } } @@ -313,9 +313,9 @@ void Tagxml::writeAttributes( TQDict<TQString> *d ) name = attr->attrName(); - TQString *v = d->find(name); + TQString *v = d->tqfind(name); if ( v ) { - v->replace("&","&"); + v->tqreplace("&","&"); if ( dynamic_cast<Attr_check *>(attr) ) // checkbox value = "checked"; else diff --git a/quanta/dialogs/tagdialogs/tagxml.h b/quanta/dialogs/tagdialogs/tagxml.h index 780b6b91..c08853a0 100644 --- a/quanta/dialogs/tagdialogs/tagxml.h +++ b/quanta/dialogs/tagdialogs/tagxml.h @@ -28,10 +28,11 @@ class Tagxml : public TQWidget, TagWidget { Q_OBJECT + TQ_OBJECT public: /** construtor */ - Tagxml(TQDomNode &d, QTag *dtdTag, TQWidget* parent=0, const char *name=0); - Tagxml(TQDomNode &d, QTag *dtdTag, const TQString& selection, TQWidget* parent=0, const char *name=0); + Tagxml(TQDomNode &d, TQTag *dtdTag, TQWidget* tqparent=0, const char *name=0); + Tagxml(TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget* tqparent=0, const char *name=0); /** destructor */ ~Tagxml(); @@ -42,12 +43,12 @@ class Tagxml : public TQWidget, TagWidget { void focusToFirstItem(); private: - void initialize(TQDomNode &d, QTag *dtdTag); + void initialize(TQDomNode &d, TQTag *dtdTag); TQDomNode doc; const DTDStruct *m_dtd; TQWidget *m_firstItem; - QTag *m_dtdTag; + TQTag *m_dtdTag; TQString m_selection; }; diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 48ebb7fd..b666f7b6 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -35,8 +35,8 @@ #include "quantacommon.h" #include "viewmanager.h" -AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) - : KTabWidget(parent, name) +AnnotationOutput::AnnotationOutput(TQWidget *tqparent, const char *name) + : KTabWidget(tqparent, name) { m_currentFileAnnotations = new MessageOutput(this); addTab(m_currentFileAnnotations, i18n("Current File")); @@ -81,11 +81,11 @@ void AnnotationOutput::tabChanged(TQWidget *w) readAnnotations(); } -void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const QPair<TQString, TQString>& annotation) +void AnnotationOutput::insertAnnotation(uint line, const TQString& fileName, const TQPair<TQString, TQString>& annotation) { line++; - TQString s = i18n("Line %1: %2").arg(line).arg(annotation.first); - s.replace('\n', ' '); + TQString s = i18n("Line %1: %2").tqarg(line).tqarg(annotation.first); + s.tqreplace('\n', ' '); m_currentFileAnnotations->showMessage(line, 1, fileName, s); } @@ -147,15 +147,15 @@ void AnnotationOutput::readAnnotations() TQString fileName = el.attribute("url"); KURL u = baseURL; QuantaCommon::setUrl(u, fileName); - u = QExtFileInfo::toAbsolute(u, baseURL); - if (Project::ref()->contains(u)) + u = TQExtFileInfo::toAbsolute(u, baseURL); + if (Project::ref()->tqcontains(u)) { bool ok; int line = el.attribute("line").toInt(&ok, 10); TQString text = el.attribute("text"); TQString receiver = el.attribute("receiver"); - text.replace('\n',' '); - TQString lineText = TQString("%1").arg(line); + text.tqreplace('\n',' '); + TQString lineText = TQString("%1").tqarg(line); if (lineText.length() < 20) { TQString s; @@ -170,12 +170,12 @@ void AnnotationOutput::readAnnotations() m_fileNames[fileIt] = u.url(); } KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText); - if (openedItems.contains(fileName)) + if (openedItems.tqcontains(fileName)) fileIt->setOpen(true); m_fileNames[it] = u.url(); m_lines[it] = line; - if (!yourself.isEmpty() && (receiver == yourself || roles.contains(receiver))) + if (!yourself.isEmpty() && (receiver == yourself || roles.tqcontains(receiver))) { m_yourAnnotationsNum++; KListViewItem *fileIt = m_yourFileItems[fileName]; @@ -186,7 +186,7 @@ void AnnotationOutput::readAnnotations() m_yourFileNames[fileIt] = u.url(); } KListViewItem *it = new KListViewItem(fileIt, fileIt, text, lineText); - if (yourOpenedItems.contains(fileName)) + if (yourOpenedItems.tqcontains(fileName)) fileIt->setOpen(true); m_yourFileNames[it] = u.url(); m_yourLines[it] = line; @@ -198,14 +198,14 @@ void AnnotationOutput::readAnnotations() } if (m_yourAnnotationsNum > 0) { - setTabLabel(m_yourAnnotations, i18n("For You: %1").arg(m_yourAnnotationsNum)); + setTabLabel(m_yourAnnotations, i18n("For You: %1").tqarg(m_yourAnnotationsNum)); } else { setTabLabel(m_yourAnnotations, i18n("For You")); } } -void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<uint, QPair<TQString, TQString> > &a_annotations) +void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<uint, TQPair<TQString, TQString> > &a_annotations) { m_annotatedFileItems.clear(); m_fileNames.clear(); @@ -215,7 +215,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui m_yourLines.clear(); bool modified = false; - TQMap<uint, QPair<TQString, TQString> > annotations = a_annotations; + TQMap<uint, TQPair<TQString, TQString> > annotations = a_annotations; TQDomDocument *dom = Project::ref()->dom(); TQDomElement annotationElement = dom->firstChild().firstChild().namedItem("annotations").toElement(); if (annotationElement.isNull()) @@ -234,16 +234,16 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui TQString text = el.attribute("text"); bool ok; int line = el.attribute("line").toInt(&ok, 10); - if (!annotations.contains(line) || (annotations[line].first != text)) + if (!annotations.tqcontains(line) || (annotations[line].first != text)) { - n.parentNode().removeChild(n); + n.tqparentNode().removeChild(n); modified = true; } else annotations.remove(line); } n = n2; } - for (TQMap<uint, QPair<TQString, TQString> >::ConstIterator it = annotations.constBegin(); it != annotations.constEnd(); ++it) + for (TQMap<uint, TQPair<TQString, TQString> >::ConstIterator it = annotations.constBegin(); it != annotations.constEnd(); ++it) { TQDomElement el = dom->createElement("annotation"); el.setAttribute("url", fileName); @@ -261,7 +261,7 @@ void AnnotationOutput::writeAnnotations(const TQString &fileName, const TQMap<ui void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item) { - if (dynamic_cast<KListView*> (item->parent()) != m_allAnnotations) + if (dynamic_cast<KListView*> (item->tqparent()) != m_allAnnotations) { emit clicked(m_fileNames[item], m_lines[item], 0); } else @@ -270,7 +270,7 @@ void AnnotationOutput::allAnnotationsItemExecuted(TQListViewItem *item) void AnnotationOutput::yourAnnotationsItemExecuted(TQListViewItem *item) { - if (dynamic_cast<KListView*> (item->parent()) != m_yourAnnotations) + if (dynamic_cast<KListView*> (item->tqparent()) != m_yourAnnotations) { emit clicked(m_yourFileNames[item], m_yourLines[item], 0); } else @@ -299,7 +299,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) TQFile f(url.path()); if (f.open(IO_ReadOnly)) { - TQMap<uint, QPair<TQString, TQString> > annotations; + TQMap<uint, TQPair<TQString, TQString> > annotations; uint i = 0; TQTextStream stream(&f); stream.setEncoding(TQTextStream::UnicodeUTF8); @@ -307,7 +307,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) while (!stream.atEnd()) { line = stream.readLine(); - int pos = line.find("@annotation"); + int pos = line.tqfind("@annotation"); if (pos != -1) { TQString receiver; @@ -315,7 +315,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) if (line[pos] == '(') { int p = pos; - pos = line.find(')'); + pos = line.tqfind(')'); if (pos != -1) { receiver = line.mid(p + 1, pos - p - 1); @@ -323,15 +323,15 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) } } else pos++; - int pos2 = line.find(rx); - annotations.insert(i, qMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); + int pos2 = line.tqfind(rx); + annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); } ++i; } f.close(); if (!annotations.isEmpty()) { - KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()); + KURL u = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()); writeAnnotations(QuantaCommon::qUrl(u), annotations); } } diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h index 51c08ead..ac87d705 100644 --- a/quanta/messages/annotationoutput.h +++ b/quanta/messages/annotationoutput.h @@ -37,13 +37,14 @@ enum AnnotationScope class AnnotationOutput : public KTabWidget { Q_OBJECT + TQ_OBJECT public: - AnnotationOutput(TQWidget *parent = 0, const char *name = 0); + AnnotationOutput(TQWidget *tqparent = 0, const char *name = 0); ~AnnotationOutput(); MessageOutput *currentFileAnnotations() const {return m_currentFileAnnotations;} KListView *allAnnotations() const {return m_allAnnotations;} - void writeAnnotations(const TQString &fileName, const TQMap<uint, QPair<TQString, TQString> > &annotations); + void writeAnnotations(const TQString &fileName, const TQMap<uint, TQPair<TQString, TQString> > &annotations); public slots: /** @@ -52,7 +53,7 @@ public slots: void updateAnnotations(); void readAnnotations(); void clearAnnotations(); - void insertAnnotation(uint line, const TQString& fileName, const QPair<TQString, TQString>& annotation); + void insertAnnotation(uint line, const TQString& fileName, const TQPair<TQString, TQString>& annotation); private slots: void tabChanged(TQWidget *w); diff --git a/quanta/messages/messageitem.cpp b/quanta/messages/messageitem.cpp index dc1c7ad8..ab8c1ef1 100644 --- a/quanta/messages/messageitem.cpp +++ b/quanta/messages/messageitem.cpp @@ -31,7 +31,7 @@ int MessageItem::line() } else { // try to find first number in text TQString s = text(); - int pos = s.find( TQRegExp("[0-9]")); + int pos = s.tqfind( TQRegExp("[0-9]")); if ( pos == -1 ) return lineNumber; int pos2 = pos; @@ -70,10 +70,10 @@ TQString MessageItem::fileName() { TQString fname; TQString s = text(); - int pos = s.find(i18n("File: ")); + int pos = s.tqfind(i18n("File: ")); if (pos != -1) { - int pos2 = s.find(i18n(", "), pos); + int pos2 = s.tqfind(i18n(", "), pos); if (pos2 != -1) fname = s.mid(pos, pos2-pos); else diff --git a/quanta/messages/messageitem.h b/quanta/messages/messageitem.h index 64894e25..82653fab 100644 --- a/quanta/messages/messageitem.h +++ b/quanta/messages/messageitem.h @@ -28,7 +28,7 @@ class MessageItem : public TQListBoxText { public: - MessageItem( TQListBox *listbox, const TQString &text = TQString::null, int line = -1, int column = -1, const TQString &fname = TQString::null); + MessageItem( TQListBox *listbox, const TQString &text = TQString(), int line = -1, int column = -1, const TQString &fname = TQString()); /** return line number for file , associated with this message */ int line(); diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index de4627ca..666d98d3 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -24,7 +24,7 @@ #include <kpopupmenu.h> #include <kiconloader.h> -// Qt includes +// TQt includes #include <tqclipboard.h> #include <tqfile.h> #include <tqtextstream.h> @@ -32,8 +32,8 @@ #include "messageoutput.h" #include "messageitem.h" -MessageOutput::MessageOutput(TQWidget *parent, const char *name ) - : TQListBox(parent,name) +MessageOutput::MessageOutput(TQWidget *tqparent, const char *name ) + : TQListBox(tqparent,name) { m_maxItems = 2000; @@ -41,7 +41,7 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Normal, TQColorGroup::Text)); pal.setColor(TQColorGroup::Highlight, pal.color(TQPalette::Normal, TQColorGroup::Mid)); setPalette(pal); - setFocusPolicy( NoFocus ); + setFocusPolicy( TQ_NoFocus ); m_popupMenu = new KPopupMenu(this); connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), @@ -85,7 +85,7 @@ void MessageOutput::showMessage(int line, int col, const TQString &fileName, con int endPos; if ( !count() || (!append && !text(count()-1).stripWhiteSpace().isEmpty()) ) it = insertItem(""); - while ( ( endPos = message.find('\n') ) != -1 ) { + while ( ( endPos = message.tqfind('\n') ) != -1 ) { if (it) { it->setLine(line); @@ -146,7 +146,7 @@ TQString MessageOutput::content() void MessageOutput::copyContent() { - kapp->clipboard()->setText(content(), QClipboard::Clipboard); + kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard); } void MessageOutput::saveContent() @@ -159,13 +159,13 @@ void MessageOutput::saveContent() TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>") - .arg(url.path()), TQString::null, i18n("Overwrite")) == KMessageBox::Cancel) + .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) return; TQFile file(url.path()); if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("<qt>Cannot save log file<br><b>%1</b></qt>") - .arg(url.url())); + .tqarg(url.url())); return; } diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h index 125b85e2..b90198f7 100644 --- a/quanta/messages/messageoutput.h +++ b/quanta/messages/messageoutput.h @@ -32,8 +32,9 @@ weblint output class MessageOutput : public TQListBox { Q_OBJECT + TQ_OBJECT public: - MessageOutput(TQWidget *parent=0, const char *name=0); + MessageOutput(TQWidget *tqparent=0, const char *name=0); ~MessageOutput(); // Return whole content as a single string with EOLs TQString content(); diff --git a/quanta/parsers/dtd/dtd.cpp b/quanta/parsers/dtd/dtd.cpp index 964c35fb..c0942441 100644 --- a/quanta/parsers/dtd/dtd.cpp +++ b/quanta/parsers/dtd/dtd.cpp @@ -30,8 +30,8 @@ #include <ktempfile.h> #include "dtd.h" -#include "../quantacommon.h" -#include "../qextfileinfo.h" +#include "../tquantacommon.h" +#include "../tqextfileinfo.h" DTD::DTD(const KURL &dtdURL, const TQString &dtepDir) @@ -51,7 +51,7 @@ TQStringList DTD::getTags() AttributeList* DTD::getTagAttributes(TQString tag) { - return tagAttributes.find(tag); + return tagAttributes.tqfind(tag); } @@ -84,7 +84,7 @@ void DTD::writeTagFiles() TQString dirName = m_dtepDir; KURL u; u.setPath(dirName); - if (!QExtFileInfo::createDir(dirName)) { + if (!TQExtFileInfo::createDir(dirName)) { QuantaCommon::dirCreationError(0, u); return; } @@ -121,10 +121,10 @@ void DTD::writeTagFiles() bool DTD::parseDTD(const KURL &url) { - TQString fileName = TQString::null; + TQString fileName = TQString(); if (!KIO::NetAccess::download(url, fileName)) { - KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } TQFile file(fileName); @@ -183,7 +183,7 @@ bool DTD::parseDTD(const KURL &url) parseDTD(entityURL); } else { - kdDebug(24000) << TQString("Unknown tag: [%1]").arg(line) << endl; + kdDebug(24000) << TQString("Unknown tag: [%1]").tqarg(line) << endl; } if (it != lines.end()) ++it; @@ -195,14 +195,14 @@ void DTD::parseDTDEntity(TQString line) { TQString name; TQString *value; - line.replace("\\end", " "); + line.tqreplace("\\end", " "); name = line.mid(11); - int firstSpace = name.find(' '); + int firstSpace = name.tqfind(' '); name = name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(11+firstSpace)); - value->remove(0, value->find("\"")+1); - value->remove(value->findRev("\""), value->length()); + value->remove(0, value->tqfind("\"")+1); + value->remove(value->tqfindRev("\""), value->length()); parseDTDReplace(value); stripSpaces(value); @@ -217,14 +217,14 @@ void DTD::parseDTDElement(const TQString &l) { TQString *value; TQString line = l; - line.replace("\\end", " "); + line.tqreplace("\\end", " "); name = line.mid(10); - int firstSpace = name.find(' '); + int firstSpace = name.tqfind(' '); name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(10+firstSpace)); - //value->remove(0, value->find("\"")+1); - value->remove(value->find(">"), 10000); + //value->remove(0, value->tqfind("\"")+1); + value->remove(value->tqfind(">"), 10000); parseDTDReplace(&name); parseDTDReplace(value); @@ -254,14 +254,14 @@ void DTD::parseDTDAttlist(const TQString &l) { TQString *value; TQString line = l; - line.replace("\\end", " "); + line.tqreplace("\\end", " "); name = line.mid(10); - int firstSpace = name.find(' '); + int firstSpace = name.tqfind(' '); name.remove(firstSpace, name.length()-firstSpace); value = new TQString(line.mid(10+firstSpace)); - //value->remove(0, value->find("\"")+1); - value->remove(value->find(">"), 10000); + //value->remove(0, value->tqfind("\"")+1); + value->remove(value->tqfind(">"), 10000); parseDTDReplace(&name); parseDTDReplace(value); @@ -362,51 +362,51 @@ void DTD::parseTagAttributeValues(const TQString &name, TQString *value) { void DTD::parseDTDReplace(TQString *value) { int begin, end; - begin = value->find("%"); - end = value->find(";"); + begin = value->tqfind("%"); + end = value->tqfind(";"); while (begin != -1 && end != -1) { TQString replaceText = value->mid(begin+1, end-begin-1); - TQString *replaceValue = entities.find(replaceText); + TQString *replaceValue = entities.tqfind(replaceText); if (replaceValue != 0L) { - value->replace(begin, end-begin+1, *replaceValue); + value->tqreplace(begin, end-begin+1, *replaceValue); } else { kdDebug(24000) << "Can not find entity: " << replaceText << endl; return; } - begin = value->find("%"); - end = value->find(";"); + begin = value->tqfind("%"); + end = value->tqfind(";"); } } void DTD::stripSpaces(TQString *value) { int index=-1; - while ( (index=value->find(' ',++index)) != -1 ) { - if ( value->findRev('(',index) != -1 && value->find(')',index) != -1) + while ( (index=value->tqfind(' ',++index)) != -1 ) { + if ( value->tqfindRev('(',index) != -1 && value->tqfind(')',index) != -1) value->remove(index,1); } } void DTD::removeComments(TQString &value) { int begin, end; - begin = value.find("<!--"); - end = value.find("-->",begin+2); + begin = value.tqfind("<!--"); + end = value.tqfind("-->",begin+2); while (begin != -1 && end != -1) { value.remove(begin, end-begin+3); - begin = value.find("<!--"); - end = value.find("-->",begin+2); + begin = value.tqfind("<!--"); + end = value.tqfind("-->",begin+2); } - begin = value.find("--"); - end = value.find("--",begin+2); + begin = value.tqfind("--"); + end = value.tqfind("--",begin+2); while (begin != -1 && end != -1) { value.remove(begin, end-begin+2); - begin = value.find("--"); - end = value.find("--",begin+2); + begin = value.tqfind("--"); + end = value.tqfind("--",begin+2); } - value.replace(TQRegExp("<!>"), ""); + value.tqreplace(TQRegExp("<!>"), ""); } bool DTD::parseDTD() diff --git a/quanta/parsers/dtd/dtd.h b/quanta/parsers/dtd/dtd.h index cc0cf238..723ee4b6 100644 --- a/quanta/parsers/dtd/dtd.h +++ b/quanta/parsers/dtd/dtd.h @@ -22,7 +22,7 @@ #include <tqdict.h> //app includes -#include "qtag.h" +#include "tqtag.h" class KURL; diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 0d623978..577d2734 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -72,10 +72,10 @@ DTDParser::~DTDParser() bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) { bool fineTune = false; - TQString fileName = TQString::null; + TQString fileName = TQString(); if (!KIO::NetAccess::download(m_dtdURL, fileName, 0)) { - KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").arg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(0, i18n("<qt>Cannot download the DTD from <b>%1</b>.</qt>").tqarg( m_dtdURL.prettyURL(0, KURL::StripFileProtocol))); return false; } DTD::dtd_ptr = xmlParseDTD(NULL, xmlCharStrndup(fileName.utf8(), fileName.utf8().length())); @@ -86,23 +86,23 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) xmlErrorPtr errorPtr = xmlGetLastError(); if (errorPtr != NULL) { - TQString s = TQString::fromLatin1(errorPtr->message); + TQString s = TQString::tqfromLatin1(errorPtr->message); if (!s.isEmpty()) errorStr = s; - s = TQString::fromLatin1(errorPtr->str1); + s = TQString::tqfromLatin1(errorPtr->str1); if (!s.isEmpty()) errorStr += "<br>" + s; - s = TQString::fromLatin1(errorPtr->str2); + s = TQString::tqfromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "<br>" + s; - s = TQString::fromLatin1(errorPtr->str2); + s = TQString::tqfromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "<br>" + s; - errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); + errorStr += TQString("(%1, %2)").tqarg(errorPtr->line).tqarg(errorPtr->int2); xmlResetError(errorPtr); } #endif - KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr)); + KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").tqarg(errorStr)); return false; } if (targetDir.isEmpty()) @@ -123,8 +123,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) m_name = w.dtdName->text(); m_nickName = w.nickName->text(); m_doctype = w.doctype->text(); - m_doctype.replace(TQRegExp("<!doctype", false), ""); - m_doctype = m_doctype.left(m_doctype.findRev(">")); + m_doctype.tqreplace(TQRegExp("<!doctype", false), ""); + m_doctype = m_doctype.left(m_doctype.tqfindRev(">")); m_dtdURLLine = w.dtdURL->text(); m_defaultExtension = w.defaultExtension->text(); m_caseSensitive = w.caseSensitive->isChecked(); @@ -134,7 +134,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) DTD::dirName = targetDir; KURL u; u.setPath(DTD::dirName); - if (!QExtFileInfo::createDir(u, 0L)) { + if (!TQExtFileInfo::createDir(u, 0L)) { QuantaCommon::dirCreationError(0L, u); return false; } @@ -144,7 +144,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) TQFile file( DTD::dirName + "entities.tag" ); if ( file.open( IO_WriteOnly ) ) { - DTD::entityStream.setDevice(&file); + DTD::entityStream.setDevice(TQT_TQIODEVICE(&file)); DTD::entityStream.setEncoding(TQTextStream::UnicodeUTF8); DTD::entityStream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl; DTD::entityStream << "<!DOCTYPE TAGS>" << endl @@ -154,8 +154,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) file.close(); } else { - KMessageBox::error(0L, i18n("<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write permission in the parent folder.</qt>") - .arg(file.name())); + KMessageBox::error(0L, i18n("<qt>Cannot create the <br><b>%1</b> file.<br>Check that you have write permission in the tqparent folder.</qt>") + .tqarg(file.name())); return false; } } @@ -235,7 +235,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) attr->name = TQString((const char*)at_ptr->name); switch (at_ptr->def) { case 1: {attr->status = "optional"; break;} //NONE - case 2: {attr->status = "required"; break;} //REQUIRED + case 2: {attr->status = "required"; break;} //RETQUIRED case 3: {attr->status = "implied"; break;} //IMPLIED case 4: {attr->status = "fixed"; break;} //FIXED } @@ -265,7 +265,7 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) if (childNum > 0) { - stream << "<children>" << endl; + stream << "<tqchildren>" << endl; for( int i = 0; i < childNum; i++ ) { stream << " <child name=\"" << TQString((const char*)list_ptr[i]) << "\""; @@ -293,14 +293,14 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) stream << " />" << endl; } - stream << "</children>" << endl; + stream << "</tqchildren>" << endl; stream << endl; } /* xmlElementContentPtr content_ptr = el_ptr->content; if (content_ptr) { - stream << "<children>" << endl; + stream << "<tqchildren>" << endl; while (content_ptr) { if (!TQString((const char*)content_ptr->name).isEmpty()) @@ -325,17 +325,17 @@ void saveElement(xmlElementPtr elem, xmlBufferPtr buf) { if (content_ptr == el_ptr->content) break; - if (content_ptr->parent) + if (content_ptr->tqparent) { - if (content_ptr == content_ptr->parent->c1) + if (content_ptr == content_ptr->tqparent->c1) content_ptr->c1 = 0L; else content_ptr->c2 = 0L; } - content_ptr = content_ptr->parent; + content_ptr = content_ptr->tqparent; } } - stream << "</children>" << endl; + stream << "</tqchildren>" << endl; } */ } stream << "</tag>" << endl diff --git a/quanta/parsers/dtd/dtdparser.h b/quanta/parsers/dtd/dtdparser.h index 800fa445..b9948ea6 100644 --- a/quanta/parsers/dtd/dtdparser.h +++ b/quanta/parsers/dtd/dtdparser.h @@ -35,7 +35,7 @@ public: * @param entitiesOnly if true, only the entities are extracted from the DTD into the entities.tag file * @return true on success, false if some error happened */ - bool parse(const TQString &targetDir = TQString::null, bool entitiesOnly = false); + bool parse(const TQString &targetDir = TQString(), bool entitiesOnly = false); protected: void writeDescriptionRC(); diff --git a/quanta/parsers/dtd/dtepcreationdlg.ui b/quanta/parsers/dtd/dtepcreationdlg.ui index 3247c7ae..adaeabc4 100644 --- a/quanta/parsers/dtd/dtepcreationdlg.ui +++ b/quanta/parsers/dtd/dtepcreationdlg.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2003 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DTEPCreationDlg</cstring> </property> @@ -21,7 +21,7 @@ <height>285</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>500</width> <height>200</height> @@ -37,17 +37,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>nickName</cstring> </property> </widget> - <widget class="QLineEdit" row="4" column="1"> + <widget class="TQLineEdit" row="4" column="1"> <property name="name"> <cstring>dtdURL</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -55,7 +55,7 @@ <string>Name: </string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -63,7 +63,7 @@ <string>Nickname:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -71,22 +71,22 @@ <string>!DOCTYPE definition line:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>directory</cstring> </property> </widget> - <widget class="QLineEdit" row="3" column="1"> + <widget class="TQLineEdit" row="3" column="1"> <property name="name"> <cstring>doctype</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>dtdName</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -94,7 +94,7 @@ <string>DTD URL:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -102,7 +102,7 @@ <string>Target directory name:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -110,12 +110,12 @@ <string>Default extension:</string> </property> </widget> - <widget class="QLineEdit" row="5" column="1"> + <widget class="TQLineEdit" row="5" column="1"> <property name="name"> <cstring>defaultExtension</cstring> </property> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>caseSensitive</cstring> </property> @@ -126,7 +126,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>fineTune</cstring> </property> @@ -148,5 +148,5 @@ <tabstop>defaultExtension</tabstop> <tabstop>caseSensitive</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/parsers/node.cpp b/quanta/parsers/node.cpp index 219716e9..ef7599b8 100644 --- a/quanta/parsers/node.cpp +++ b/quanta/parsers/node.cpp @@ -33,9 +33,9 @@ int NN = 0; //for debugging purposes: count the Node objects GroupElementMapList globalGroupMap; -Node::Node(Node *parent) +Node::Node(Node *tqparent) { - this->parent = parent; + this->tqparent = tqparent; prev = next = child = 0L; tag = 0L; mainListItem = 0L; @@ -48,7 +48,7 @@ Node::Node(Node *parent) m_leafNode = 0L; m_groupElements.clear(); NN++; -// if (nodes.contains(this) == 0) +// if (nodes.tqcontains(this) == 0) nodes[this] = 1; // else // { @@ -60,7 +60,7 @@ bool Node::deleteNode(Node *node) { if (!node) return true; - if (!nodes.contains(node)) + if (!nodes.tqcontains(node)) { kdDebug(24000) << "Trying to delete a node with address " << node << " that was not allocated!" << endl; return false; @@ -71,7 +71,7 @@ bool Node::deleteNode(Node *node) Node::~Node() { -// if (!nodes.contains(this)) +// if (!nodes.tqcontains(this)) // { // kdError(24000) << "No node with this address " << this << " was allocated!" << endl; // return; @@ -89,8 +89,8 @@ Node::~Node() nodes.erase(this); if (prev && prev->next == this) prev->next = 0L; - if (parent && parent->child == this) - parent->child = 0L; + if (tqparent && tqparent->child == this) + tqparent->child = 0L; if (removeAll) { deleteNode(child); @@ -101,8 +101,8 @@ Node::~Node() { if (next && next->prev == this) next->prev = 0L; - if (child && child->parent == this) - child->parent = 0L; + if (child && child->tqparent == this) + child->tqparent = 0L; } delete tag; @@ -148,7 +148,7 @@ void Node::save(TQDomElement& element) const element.setAttribute("removeAll", removeAll); // bool element.setAttribute("insideSpecial", insideSpecial); // bool element.setAttribute("specialInsideXml", specialInsideXml); // bool - element.setAttribute("fileName", fileName); // QString + element.setAttribute("fileName", fileName); // TQString /* TQString s_element; TQTextStream stream(&s_element, IO_WriteOnly); @@ -174,13 +174,13 @@ bool Node::load(TQDomElement const& element) { next = new Node(0); next->prev = this; - next->parent = this->parent; + next->tqparent = this->tqparent; next->load(e); } else if(e.tagName() == "nodeChild") { child = new Node(0); - child->parent = this; + child->tqparent = this; child->load(e); } else if(e.tagName() == "nodeClosing") @@ -201,7 +201,7 @@ bool Node::load(TQDomElement const& element) removeAll = TQString(element.attribute("removeAll")).toInt(); // bool insideSpecial = TQString(element.attribute("insideSpecial")).toInt(); // bool specialInsideXml = TQString(element.attribute("specialInsideXml")).toInt(); // bool - fileName = element.attribute("fileName"); // QString + fileName = element.attribute("fileName"); // TQString //kafkaCommon::coutTree(this, 3); @@ -225,14 +225,14 @@ Node *Node::nextSibling() Node *n = this; while (n) { - if (n->parent && n->parent->next) + if (n->tqparent && n->tqparent->next) { - result = n->parent->next; + result = n->tqparent->next; break; } else { - n = n->parent; + n = n->tqparent; } } } @@ -257,7 +257,7 @@ Node *Node::previousSibling() } else { - result = parent; + result = tqparent; } return result; @@ -272,14 +272,14 @@ Node *Node::nextNotChild() Node *n = this; while (n) { - if (n->parent && n->parent->next) + if (n->tqparent && n->tqparent->next) { - n = n->parent->next; + n = n->tqparent->next; break; } else { - n = n->parent; + n = n->tqparent; } } @@ -291,14 +291,14 @@ TQString Node::nodeName() { if(tag) return tag->name; - return TQString::null; + return TQString(); } TQString Node::nodeValue() { if(tag) return tag->tagStr(); - return TQString::null; + return TQString(); } void Node::setNodeValue(const TQString &value) @@ -358,15 +358,15 @@ Node *Node::SPrev() Node *node = prev; int bCol, bLine, eCol, eLine, col, line; - if(parent) + if(tqparent) { - parent->tag->beginPos(bLine, bCol); - parent->tag->endPos(eLine, eCol); + tqparent->tag->beginPos(bLine, bCol); + tqparent->tag->endPos(eLine, eCol); } while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text) { - if (parent && node->tag->type == Tag::ScriptTag) + if (tqparent && node->tag->type == Tag::ScriptTag) { //Check if it is an embedded ScriptTag. If it is, continue. node->tag->beginPos(line, col); @@ -384,7 +384,7 @@ Node *Node::SNext() Node *node = next; int bCol, bLine, eCol, eLine, col, line; - if(parent) + if(tqparent) { tag->beginPos(bLine, bCol); tag->endPos(eLine, eCol); @@ -392,7 +392,7 @@ Node *Node::SNext() while(node && node->tag->type != Tag::XmlTag && node->tag->type != Tag::Text) { - if (parent && node->tag->type == Tag::ScriptTag) + if (tqparent && node->tag->type == Tag::ScriptTag) { //Check if it is an embedded ScriptTag. If it is, continue. node->tag->beginPos(line, col); @@ -509,7 +509,7 @@ void Node::operator =(Node* node) (*this) = (*node); prev = 0L; next = 0L; - parent = 0L; + tqparent = 0L; child = 0L; mainListItem = 0L; m_groupElements.clear(); @@ -520,7 +520,7 @@ void Node::operator =(Node* node) void Node::detachNode() { - if (nodes.contains(this) == 0) + if (nodes.tqcontains(this) == 0) { kdError(24000) << "No node with this address " << this << " was allocated!" << endl; return; diff --git a/quanta/parsers/node.h b/quanta/parsers/node.h index 4e3451af..ab8e6267 100644 --- a/quanta/parsers/node.h +++ b/quanta/parsers/node.h @@ -36,8 +36,8 @@ struct GroupElement{ Node *node; /* The tag which point to the actual place in the node */ Tag *tag; - /*The parent node indicating the beginning of a structure */ - Node *parentNode; + /*The tqparent node indicating the beginning of a structure */ + Node *tqparentNode; bool global; bool deleted; TQString type; @@ -48,7 +48,7 @@ typedef TQValueList<GroupElement*> GroupElementList; typedef TQMap<TQString, GroupElementList> GroupElementMapList; /** - * A Node is a basic unit of a Tree. It keeps track of his parent, his left neighbour, his right neighbour + * A Node is a basic unit of a Tree. It keeps track of his tqparent, his left neighbour, his right neighbour * and his first child. * It contains some functions to navigate through the tree, but some more are located at kafkacommon.h * (and should be moved here...) @@ -61,7 +61,7 @@ typedef TQMap<TQString, GroupElementList> GroupElementMapList; class Node { public: - Node( Node *parent ); + Node( Node *tqparent ); ~Node(); /** @@ -73,7 +73,7 @@ public: static bool deleteNode(Node *node); /** - * Copy everything from node except prev, next, child, parent, listItem, group, groupTag, which are set to Null + * Copy everything from node except prev, next, child, tqparent, listItem, group, groupTag, which are set to Null * The groupElementsList is cleared. */ void operator =(Node* node); @@ -84,22 +84,22 @@ public: Node *next; Node *prev; - Node *parent; + Node *tqparent; Node *child; - /** Returns the child if available, else the next node, else the next node of the first parent which has one, else 0L. + /** Returns the child if available, else the next node, else the next node of the first tqparent which has one, else 0L. WARNING: it doesn't behave like DOM::Node::nextSibling() which give the next Node, or 0L if there is no next Node */ Node *nextSibling(); Node *previousSibling(); - /** Returns the next node, or the parent's next, if next doesn't exists, - or the granparent's next, if parent's next doesn't exists, etc. */ + /** Returns the next node, or the tqparent's next, if next doesn't exists, + or the grantqparent's next, if tqparent's next doesn't exists, etc. */ Node *nextNotChild(); /** DOM like functions cf dom/dom_node.h */ TQString nodeName(); TQString nodeValue(); void setNodeValue(const TQString &value); - Node* parentNode() {return parent;} + Node* tqparentNode() {return tqparent;} Node* firstChild() {return child;} Node* lastChild(); Node* DOMpreviousSibling() {return prev;} @@ -113,7 +113,7 @@ public: /** Others functions. */ // check if Node has node in its child subtree (and grand-child,...) bool hasForChild(Node *node); - void setParent(Node *nodeParent) {parent = nodeParent;} + void setParent(Node *nodeParent) {tqparent = nodeParent;} //If Node is of type XmlTag or ScriptTag, return the corresponding XmlTagEnd if available Node *getClosingNode(); //If Node is of type XmlTagEnd, return the corresponding XmlTag or ScriptTag if available @@ -130,7 +130,7 @@ public: Node *lastChildNE(); /** - * The main problem manipulating the default links prev/next/parent/child is that we often want + * The main problem manipulating the default links prev/next/tqparent/child is that we often want * to manipulate only the "significant" Nodes e.g. XmlTag, Text, ScriptNode, like in a DOM::Node tree. * These functions, prefixed with "S" which stands for "simplified" or "significant", will only return * and manipulate XmlTag, Text and ScriptNode. diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index 707d97b0..0a9441db 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -115,13 +115,13 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No bool nodeFound = false; bool goUp; Node *rootNode = 0L; - Node *parentNode = a_node; + Node *tqparentNode = a_node; Node *currentNode = a_node; if (currentNode && (currentNode->tag->type != Tag::XmlTag || currentNode->tag->single)) - parentNode = currentNode->parent; + tqparentNode = currentNode->tqparent; Tag *tag = 0L; - QTag *qTag = 0L; + TQTag *qTag = 0L; textLine.append(write->text(startLine, startCol, startLine, write->editIf->lineLength(startLine))); if (line == endLine) { @@ -137,21 +137,21 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No nodeFound = false; goUp = false; //find the first "<" and the first special area start definition in this line - tagStartPos = textLine.find('<', col); - specialStartPos = specialAreaCount ? textLine.find(m_dtd->specialAreaStartRx, col): -1; + tagStartPos = textLine.tqfind('<', col); + specialStartPos = specialAreaCount ? textLine.tqfind(m_dtd->specialAreaStartRx, col): -1; //if the special area start definition is before the first "<" it means //that we have found a special area if ( specialStartPos != -1 && (specialStartPos <= tagStartPos || tagStartPos == -1) ) { - currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, parentNode); + currentNode = ParserCommon::createTextNode(write, currentNode, line, specialStartPos, tqparentNode); if (!rootNode) rootNode = currentNode; TQString foundText = m_dtd->specialAreaStartRx.cap(); //create a toplevel node for the special area AreaStruct area(line, specialStartPos, line, specialStartPos + foundText.length() - 1); - Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, parentNode, currentNode); - if (node->parent && node->prev == node->parent) //some strange cases, but it's possible, eg.: <a href="<? foo ?>""></a><input size="<? foo ?>" > + Node *node = ParserCommon::createScriptTagNode(write, area, foundText, m_dtd, tqparentNode, currentNode); + if (node->tqparent && node->prev == node->tqparent) //some strange cases, but it's possible, eg.: <a href="<? foo ?>""></a><input size="<? foo ?>" > { node->prev->next = 0L; node->prev = 0L; @@ -263,37 +263,37 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No tag->name.truncate(tag->name.length() - 1); } //the tag we found indicates the beginning of a special area, like <script type=... > - if (m_dtd->specialTags.contains(tag->name.lower()) && !tag->single) + if (m_dtd->specialTags.tqcontains(tag->name.lower()) && !tag->single) { //TODO: handle goUp here - Node *node = new Node(parentNode); + Node *node = new Node(tqparentNode); nodeNum++; node->tag = tag; node->insideSpecial = true; - if (currentNode && currentNode != parentNode) + if (currentNode && currentNode != tqparentNode) { currentNode->next = node; node->prev = currentNode; } else { - if (parentNode) - parentNode->child = node; + if (tqparentNode) + tqparentNode->child = node; } if (!rootNode) rootNode = node; //find the DTD that needs to be used for the special area TQString tmpStr = m_dtd->specialTags[tag->name.lower()]; - int defPos = tmpStr.find('['); + int defPos = tmpStr.tqfind('['); TQString defValue; if (defPos != 0) { - defValue = tmpStr.mid(defPos+1, tmpStr.findRev(']')-defPos-1).stripWhiteSpace(); + defValue = tmpStr.mid(defPos+1, tmpStr.tqfindRev(']')-defPos-1).stripWhiteSpace(); tmpStr = tmpStr.left(defPos); } TQString s = tag->attributeValue(tmpStr); if (s.isEmpty()) s = defValue; - const DTDStruct *dtd = DTDs::ref()->find(s); + const DTDStruct *dtd = DTDs::ref()->tqfind(s); if (!dtd) dtd = m_dtd; //a trick here: replace the node's DTD with this one //Note: with the new SAParser, the top level nodes must be Tag::ScriptTag-s! @@ -315,21 +315,21 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No } qTag = 0L; - goUp = ( parentNode && - ( (tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(parentNode->tag, tag) + goUp = ( tqparentNode && + ( (tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(tqparentNode->tag, tag) ) || - parentNode->tag->single ) + tqparentNode->tag->single ) ); - if (parentNode && !goUp) + if (tqparentNode && !goUp) { - qTag = QuantaCommon::tagFromDTD(m_dtd, parentNode->tag->name); + qTag = QuantaCommon::tagFromDTD(m_dtd, tqparentNode->tag->name); if ( qTag ) { TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper(); searchFor.remove('/'); - if ( qTag->stoppingTags.contains(searchFor)) + if ( qTag->stoppingTags.tqcontains(searchFor)) { - parentNode->tag->closingMissing = true; //parent is single... + tqparentNode->tag->closingMissing = true; //tqparent is single... goUp = true; } } @@ -340,9 +340,9 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No if (nodeFound) { //first create a text/empty node between the current position and the last node - Node *savedParentNode = parentNode; - currentNode = ParserCommon::createTextNode(write, currentNode, tagStartLine, tagStartPos, parentNode); - if (savedParentNode != parentNode) + Node *savedParentNode = tqparentNode; + currentNode = ParserCommon::createTextNode(write, currentNode, tagStartLine, tagStartPos, tqparentNode); + if (savedParentNode != tqparentNode) goUp = false; if (!rootNode) rootNode = currentNode; @@ -351,31 +351,31 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No if (goUp) { //handle cases like <ul><li></ul> - if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(parentNode->tag, tag)) + if (tag->type == Tag::XmlTagEnd && !QuantaCommon::closesTag(tqparentNode->tag, tag)) { - while ( parentNode->parent && - QuantaCommon::closesTag(parentNode->parent->tag, tag) + while ( tqparentNode->tqparent && + QuantaCommon::closesTag(tqparentNode->tqparent->tag, tag) ) { - parentNode = parentNode->parent; + tqparentNode = tqparentNode->tqparent; } } else if (qTag && tag->type != Tag::XmlTagEnd) { - //handle the case when a tag is a stopping tag for parent, and grandparent and so on. - Node *n = parentNode; + //handle the case when a tag is a stopping tag for tqparent, and grandtqparent and so on. + Node *n = tqparentNode; TQString searchFor = (m_dtd->caseSensitive)?tag->name:tag->name.upper(); while (qTag && n) { qTag = QuantaCommon::tagFromDTD(m_dtd, n->tag->name); if ( qTag ) { - if ( qTag->stoppingTags.contains(searchFor) ) + if ( qTag->stoppingTags.tqcontains(searchFor) ) { - n->tag->closingMissing = true; //parent is single... - if (n->parent) - parentNode = n; - n = n->parent; + n->tag->closingMissing = true; //tqparent is single... + if (n->tqparent) + tqparentNode = n; + n = n->tqparent; } else { break; @@ -384,29 +384,29 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No } } - node = new Node(parentNode->parent); + node = new Node(tqparentNode->tqparent); nodeNum++; - node->prev = parentNode; - parentNode->next = node; - parentNode = parentNode->parent; + node->prev = tqparentNode; + tqparentNode->next = node; + tqparentNode = tqparentNode->tqparent; node->closesPrevious = true; } else { - node = new Node(parentNode); + node = new Node(tqparentNode); nodeNum++; - if (currentNode && currentNode != parentNode) + if (currentNode && currentNode != tqparentNode) { currentNode->next = node; node->prev = currentNode; } else { - if (parentNode) + if (tqparentNode) { - if (!parentNode->child) - parentNode->child = node; + if (!tqparentNode->child) + tqparentNode->child = node; else { - Node *n = parentNode->child; + Node *n = tqparentNode->child; while (n->next) n = n->next; n->next = node; @@ -416,7 +416,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No } } if (!tag->single) - parentNode = node; + tqparentNode = node; node->tag = tag; if (tag->type == Tag::NeedsParsing) @@ -467,7 +467,7 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No #endif cleanGroups(); m_saParser->setParsingEnabled(true); - currentNode = m_saParser->parseArea(area, "", "", parentNode, true, true); //TODO: don't parse in detail here + currentNode = m_saParser->parseArea(area, "", "", tqparentNode, true, true); //TODO: don't parse in detail here m_saParser->setParsingEnabled(false); el = m_saParser->lastParsedLine(); ec = m_saParser->lastParsedColumn(); @@ -484,16 +484,16 @@ Node *Parser::parseArea(int startLine, int startCol, int endLine, int endCol, No el = endLine; ec = endCol + 1; } - currentNode = ParserCommon::createTextNode(write, currentNode, el, ec, parentNode); + currentNode = ParserCommon::createTextNode(write, currentNode, el, ec, tqparentNode); } else if (el != endLine || ec != endCol) { if (currentNode && currentNode->tag->type == Tag::ScriptTag) { - parentNode = currentNode; + tqparentNode = currentNode; currentNode = 0L; } - currentNode = ParserCommon::createTextNode(write, currentNode, endLine, endCol, parentNode); + currentNode = ParserCommon::createTextNode(write, currentNode, endLine, endCol, tqparentNode); } if (!rootNode) rootNode = currentNode; @@ -621,13 +621,13 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact) node = node->child; } else { - if (node->parent) + if (node->tqparent) { - int parentEl, parentEc; - node->parent->tag->endPos(parentEl, parentEc); - if (!exact && QuantaCommon::isBetween(line, col, bl, bc, parentEl, parentEc) == 0) + int tqparentEl, tqparentEc; + node->tqparent->tag->endPos(tqparentEl, tqparentEc); + if (!exact && QuantaCommon::isBetween(line, col, bl, bc, tqparentEl, tqparentEc) == 0) { - node = node->parent; + node = node->tqparent; } } break; //we found the node @@ -635,8 +635,8 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact) } else if (result == -1) { - if (node->parent) - node = node->parent; + if (node->tqparent) + node = node->tqparent; break; //we found the node } else { @@ -653,9 +653,9 @@ Node *Parser::nodeAt(int line, int col, bool findDeepest, bool exact) if (node && node->tag->type == Tag::Empty && (findDeepest || (bl == el && ec < bc)) ) { - if (node->parent) + if (node->tqparent) { - node = node->parent; + node = node->tqparent; } else if (node->prev) { @@ -807,7 +807,7 @@ bool Parser::invalidArea(Document *w, AreaStruct &area, Node **firstNode, Node * void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) { - Node *nextNode, *child, *parent, *next, *prev; + Node *nextNode, *child, *tqparent, *next, *prev; int i, j; Node *node = firstNode; bool closesPrevious = false; @@ -819,7 +819,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) nextNode = node->nextSibling(); node->removeAll = false; child = node->child; - parent = node->parent; + tqparent = node->tqparent; next = node->next; prev = node->prev; closesPrevious = node->closesPrevious; @@ -827,9 +827,9 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) { nextNode->prev = prev; } - if (nextNode && nextNode->parent == node) + if (nextNode && nextNode->tqparent == node) { - nextNode->parent = parent; + nextNode->tqparent = tqparent; } if (next) next->prev = prev; @@ -845,9 +845,9 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) modif->setLocation(kafkaCommon::getLocation(node)); if (prev && prev->next == node) prev->next = 0L; - if(parent && parent->child == node) - parent->child = 0L; - node->parent = 0L; + if(tqparent && tqparent->child == node) + tqparent->child = 0L; + node->tqparent = 0L; node->next = 0L; node->prev = 0L; @@ -860,17 +860,17 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) j = 0; if (!closesPrevious) { - //move the children up one level + //move the tqchildren up one level Node *n = child; Node *m = child; while (n) { m = n; - n->parent = parent; + n->tqparent = tqparent; n = n->next; i++; } - //connect the first child to the tree (after prev, or as the first child of the parent) + //connect the first child to the tree (after prev, or as the first child of the tqparent) if (prev && child) { prev->next = child; @@ -882,7 +882,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) } } else { - if (!child) //when there is no child, connect the next as the first child of the parent + if (!child) //when there is no child, connect the next as the first child of the tqparent child = next; else if (next) @@ -893,14 +893,14 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) n->next = next; next->prev = n; } - if (parent && !parent->child) + if (tqparent && !tqparent->child) { - parent->child = child; + tqparent->child = child; } } } else { - //change the parent of children, so the prev will be the new parent + //change the tqparent of tqchildren, so the prev will be the new tqparent if (child) { Node *n = child; @@ -908,7 +908,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) while (n) { m = n; - n->parent = prev; + n->tqparent = prev; n = n->next; i++; } @@ -928,7 +928,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) prev->child = child; } } - //move down the nodes starting with next one level and append to the list of children of prev + //move down the nodes starting with next one level and append to the list of tqchildren of prev if (next) { if (prev->child) //if the previous node has a child, append the next node after the last child @@ -953,7 +953,7 @@ void Parser::deleteNodes(Node *firstNode, Node *lastNode, NodeModifsSet *modifs) Node *n = next; while (n) { - n->parent = prev; + n->tqparent = prev; n = n->next; j++; } @@ -1020,7 +1020,7 @@ Node *Parser::rebuild(Document *w) return n; } - kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").arg(area.bLine).arg(area.bCol).arg(area.eLine).arg(area.eCol) << "\n"; + kdDebug(24000) << TQString("Invalid area: %1,%2,%3,%4").tqarg(area.bLine).tqarg(area.bCol).tqarg(area.eLine).tqarg(area.eCol) << "\n"; // kdDebug(24000) << "lastNode1: " << lastNode << " " << lastNode->tag << endl; deleteNodes(firstNode->nextSibling(), lastNode, modifs); @@ -1053,8 +1053,8 @@ Node *Parser::rebuild(Document *w) { if (lastNode->prev ) lastNode->prev->next = 0L; - if (lastNode->parent && lastNode->parent->child == lastNode) - lastNode->parent->child = 0L; + if (lastNode->tqparent && lastNode->tqparent->child == lastNode) + lastNode->tqparent->child = 0L; } Node::deleteNode(lastNode); nodeNum--; @@ -1077,7 +1077,7 @@ Node *Parser::rebuild(Document *w) lastNode->prev = lastInserted->prev; if (lastInserted->prev) lastInserted->prev->next = lastNode; - lastNode->parent = lastInserted->parent; + lastNode->tqparent = lastInserted->tqparent; lastInserted->tag->beginPos(area.bLine, area.bCol); lastNode->tag->endPos(area.eLine, area.eCol); Tag *_tag = new Tag(*(lastNode->tag)); @@ -1091,9 +1091,9 @@ Node *Parser::rebuild(Document *w) { lastNode->tag->type = Tag::Empty; } - if (lastInserted->parent && lastInserted->parent->child == lastInserted) - //lastInserted->parent->child = lastInserted->next; lastInserted has no next! - lastInserted->parent->child = lastNode; + if (lastInserted->tqparent && lastInserted->tqparent->child == lastInserted) + //lastInserted->tqparent->child = lastInserted->next; lastInserted has no next! + lastInserted->tqparent->child = lastNode; //here, lastNode is at the pos of lastInserted. modif = new NodeModif(); @@ -1102,11 +1102,11 @@ Node *Parser::rebuild(Document *w) if(lastInserted->prev) lastInserted->prev->next = 0L; - if(lastInserted->parent && lastInserted->parent->child == lastInserted) - lastInserted->parent->child = 0L; + if(lastInserted->tqparent && lastInserted->tqparent->child == lastInserted) + lastInserted->tqparent->child = 0L; lastInserted->prev = 0L; lastInserted->next = 0L; - lastInserted->parent = 0L; + lastInserted->tqparent = 0L; lastInserted->child = 0L; // delete lastInserted; @@ -1127,63 +1127,63 @@ Node *Parser::rebuild(Document *w) node = lastInserted; // kdDebug(24000) << "lastNode5: " << lastNode << " " << lastNode->tag << endl; - QTag *qTag = 0L; + TQTag *qTag = 0L; while (node && lastNode) { // kdDebug(24000) << "lastNode6: " << lastNode << " " << lastNode->tag << endl; qTag = 0L; - goUp = ( node->parent && - ( (lastNode->tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(node->parent->tag, lastNode->tag) ) || - node->parent->tag->single ) + goUp = ( node->tqparent && + ( (lastNode->tag->type == Tag::XmlTagEnd && QuantaCommon::closesTag(node->tqparent->tag, lastNode->tag) ) || + node->tqparent->tag->single ) ); - if (node->parent && !goUp) + if (node->tqparent && !goUp) { - qTag = QuantaCommon::tagFromDTD(m_dtd, node->parent->tag->name); + qTag = QuantaCommon::tagFromDTD(m_dtd, node->tqparent->tag->name); if ( qTag ) { TQString searchFor = (m_dtd->caseSensitive)?lastNode->tag->name:lastNode->tag->name.upper(); searchFor.remove('/'); - if ( qTag->stoppingTags.contains( searchFor ) ) + if ( qTag->stoppingTags.tqcontains( searchFor ) ) { - node->parent->tag->closingMissing = true; //parent is single... + node->tqparent->tag->closingMissing = true; //tqparent is single... goUp = true; } } } if (goUp && - ( (m_dtd->caseSensitive && node->tag->name == node->parent->tag->name) || - (!m_dtd->caseSensitive && node->tag->name.lower() == node->parent->tag->name.lower())) ) - goUp = false; //it can happen that the tag closes the previous and not the parent + ( (m_dtd->caseSensitive && node->tag->name == node->tqparent->tag->name) || + (!m_dtd->caseSensitive && node->tag->name.lower() == node->tqparent->tag->name.lower())) ) + goUp = false; //it can happen that the tag closes the previous and not the tqparent - if (goUp) //lastnode closes the node->parent + if (goUp) //lastnode closes the node->tqparent { //handle cases like <ul><li></ul> if (lastNode->tag->type == Tag::XmlTagEnd && - !QuantaCommon::closesTag(node->parent->tag, lastNode->tag)) + !QuantaCommon::closesTag(node->tqparent->tag, lastNode->tag)) { - while ( node->parent->parent && - QuantaCommon::closesTag(node->parent->parent->tag, lastNode->tag) + while ( node->tqparent->tqparent && + QuantaCommon::closesTag(node->tqparent->tqparent->tag, lastNode->tag) ) { - node = node->parent; + node = node->tqparent; } } else if (qTag && lastNode->tag->type != Tag::XmlTagEnd) { - //handle the case when a tag is a stopping tag for parent, and grandparent and so on. I'm not sure it's needed here, but anyway... - Node *n = node->parent; + //handle the case when a tag is a stopping tag for tqparent, and grandtqparent and so on. I'm not sure it's needed here, but anyway... + Node *n = node->tqparent; TQString searchFor = (m_dtd->caseSensitive) ? lastNode->tag->name : lastNode->tag->name.upper(); while (qTag && n) { qTag = QuantaCommon::tagFromDTD(m_dtd, n->tag->name); if ( qTag ) { - if ( qTag->stoppingTags.contains(searchFor) ) + if ( qTag->stoppingTags.tqcontains(searchFor) ) { - n->tag->closingMissing = true; //parent is single... - if (n->parent) + n->tag->closingMissing = true; //tqparent is single... + if (n->tqparent) node = n; - n = n->parent; + n = n->tqparent; } else { break; @@ -1193,15 +1193,15 @@ Node *Parser::rebuild(Document *w) } if (lastNode->prev && lastNode->prev->next == lastNode) lastNode->prev->next = 0L; - if (lastNode->parent && lastNode->parent->child == lastNode) - lastNode->parent->child = 0L; - if (node->parent) - node->parent->next = lastNode; - lastNode->prev = node->parent; - if (node->parent) - lastNode->parent = node->parent->parent; + if (lastNode->tqparent && lastNode->tqparent->child == lastNode) + lastNode->tqparent->child = 0L; + if (node->tqparent) + node->tqparent->next = lastNode; + lastNode->prev = node->tqparent; + if (node->tqparent) + lastNode->tqparent = node->tqparent->tqparent; else - lastNode->parent = 0L; + lastNode->tqparent = 0L; node->next = 0L; lastNode->closesPrevious = true; } else @@ -1210,14 +1210,14 @@ Node *Parser::rebuild(Document *w) lastNode->prev->next = 0L; node->next = lastNode; lastNode->prev = node; - lastNode->parent = node->parent; + lastNode->tqparent = node->tqparent; // kdDebug(24000) << "lastNode7: " << lastNode << " " << lastNode->tag << endl; } node = lastNode; lastNode = lastNode->nextNotChild(); //For some reason this can happen, the lastNode can point to an invalid place. //To avoid crashes, forget the rebuild and do a full parse instead. - if (!nodes.contains(lastNode)) + if (!nodes.tqcontains(lastNode)) { kdDebug(24000) << "Lastnode is invalid, do a full reparse!" << endl; logReparse(modifs, w); @@ -1433,12 +1433,12 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) TQString specialEndStr; while (areaPos != -1) { - areaPos = content.find(dtd->specialAreaStartRx, lastAreaPos); + areaPos = content.tqfind(dtd->specialAreaStartRx, lastAreaPos); if (areaPos != -1) { foundStr = dtd->specialAreaStartRx.cap(); specialEndStr = dtd->specialAreas[foundStr]; - int areaPos2 = content.find(specialEndStr, areaPos); + int areaPos2 = content.tqfind(specialEndStr, areaPos); if (areaPos2 == -1) { areaPos2 = content.length(); @@ -1456,7 +1456,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) int structPos = 0; while (structPos !=-1) { - structPos = foundStr.find(dtd->structBeginStr, structPos); + structPos = foundStr.tqfind(dtd->structBeginStr, structPos); if (structPos != -1) { structPositions.append(structPos); @@ -1494,14 +1494,14 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) foundStr = foundStr.left(pos); TQString spaces; spaces.fill(' ', pos - structPos + 1); - foundStr.replace(structPos, pos - structPos + 1, spaces); + foundStr.tqreplace(structPos, pos - structPos + 1, spaces); //FIXME: This code replaces the content between ( ) with //empty spaces. This is quite PHP (or functions) //specific, and it's done in order to not find variables //declared as function arguments. A generic way is needed //to exclude unwanted areas. - int openBracketPos = foundStr.findRev(dtd->structKeywordsRx, structPos); - openBracketPos = foundStr.find('(', openBracketPos); + int openBracketPos = foundStr.tqfindRev(dtd->structKeywordsRx, structPos); + openBracketPos = foundStr.tqfind('(', openBracketPos); openNum = 1; if (openBracketPos != -1) { @@ -1517,7 +1517,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) } closeBracketPos--; spaces.fill(' ', closeBracketPos - openBracketPos); - foundStr.replace(openBracketPos, closeBracketPos - openBracketPos, spaces); + foundStr.tqreplace(openBracketPos, closeBracketPos - openBracketPos, spaces); } //now check which groups are present in this area @@ -1548,29 +1548,29 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) } TQString s = content.mid(areaPos + pos, l); pos += l; - if (!(*elements)[group.name].contains(s)) + if (!(*elements)[group.name].tqcontains(s)) { Tag *tag = new Tag(); tag->name = s; tag->setDtd(dtd); tag->setWrite(write); TQString s2 = content.left(areaPos + pos); - int newLineNum = s2.contains('\n'); - int tmpCol = s2.length() - s2.findRev('\n') - 1; + int newLineNum = s2.tqcontains('\n'); + int tmpCol = s2.length() - s2.tqfindRev('\n') - 1; tag->setTagPosition(newLineNum, tmpCol - s.length(), newLineNum, tmpCol); Node *node = new Node(0L); node->tag = tag; node->fileName = fileName; GroupElement *groupElement = new GroupElement; groupElement->node = node; - groupElement->parentNode = 0L; + groupElement->tqparentNode = 0L; int minPos = areaPos + pos + 1; for (TQValueList<GroupElementPosition>::Iterator gPosIt = gPositions.begin(); gPosIt != gPositions.end(); ++gPosIt) { GroupElementPosition gPos = (*gPosIt); if ( (areaPos + pos > gPos.startPos) && (areaPos + pos < gPos.endPos) && (gPos.startPos < minPos)) { - groupElement->parentNode = gPos.element->node; + groupElement->tqparentNode = gPos.element->node; minPos = gPos.startPos; } } @@ -1585,12 +1585,12 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) if (group.appendToTags) { - QTag *qTag = new QTag(); - qTag->setName(s.left(s.find('('))); + TQTag *qTag = new TQTag(); + qTag->setName(s.left(s.tqfind('('))); qTag->className = ""; - if (groupElement->parentNode) - qTag->className = groupElement->parentNode->tag->name; - write->userTagList.replace(s.lower(), qTag); + if (groupElement->tqparentNode) + qTag->className = groupElement->tqparentNode->tag->name; + write->userTagList.tqreplace(s.lower(), qTag); } } } @@ -1606,7 +1606,7 @@ void Parser::parseIncludedFile(const TQString& fileName, const DTDStruct *dtd) void Parser::slotIncludedFileChanged(const TQString& fileName) { - int pos = ParserCommon::includedFiles.findIndex(fileName); + int pos = ParserCommon::includedFiles.tqfindIndex(fileName); if (pos != -1) { const DTDStruct *dtd = ParserCommon::includedFilesDTD.at(pos); @@ -1635,7 +1635,7 @@ void Parser::slotIncludedFileChanged(const TQString& fileName) void Parser::parseForXMLGroup(Node *node) { - xmlGroupIt = node->tag->dtd()->xmlStructTreeGroups.find(node->tag->name.lower()); + xmlGroupIt = node->tag->dtd()->xmlStructTreeGroups.tqfind(node->tag->name.lower()); if (xmlGroupIt != node->tag->dtd()->xmlStructTreeGroups.end()) { XMLStructGroup group = xmlGroupIt.data(); @@ -1658,7 +1658,7 @@ void Parser::parseForXMLGroup(Node *node) groupElement->deleted = false; groupElement->tag = newTag; groupElement->node = node; - groupElement->parentNode = 0L; + groupElement->tqparentNode = 0L; groupElement->global = true; groupElement->group = const_cast<XMLStructGroup*>(&(xmlGroupIt.data())); node->m_groupElements.append(groupElement); @@ -1690,17 +1690,17 @@ bool Parser::parseScriptInsideTag(Node *startNode) while (pos != -1) { - pos = text.find(dtd->specialAreaStartRx, col); + pos = text.tqfind(dtd->specialAreaStartRx, col); if (pos != -1) { foundText = dtd->specialAreaStartRx.cap(); //Calculate the beginning coordinates s = text.left(pos); - n = s.contains('\n'); + n = s.tqcontains('\n'); bl = node_bl + n; if (n > 0) { - bc = pos - s.findRev('\n') - 1; + bc = pos - s.tqfindRev('\n') - 1; } else { bc = node_bc + pos; diff --git a/quanta/parsers/parser.h b/quanta/parsers/parser.h index 8c4b2335..37716379 100644 --- a/quanta/parsers/parser.h +++ b/quanta/parsers/parser.h @@ -45,6 +45,7 @@ typedef TQMap<TQString, IncludedGroupElements> IncludedGroupElementsMap; class Parser: public TQObject { Q_OBJECT + TQ_OBJECT public: Parser(); diff --git a/quanta/parsers/parsercommon.cpp b/quanta/parsers/parsercommon.cpp index be660255..8a9a4be5 100644 --- a/quanta/parsers/parsercommon.cpp +++ b/quanta/parsers/parsercommon.cpp @@ -78,7 +78,7 @@ void appendAreaToTextNode(Document *write, const AreaStruct &area, Node *node) node->tag->setTagPosition(bLine, bCol, area.eLine, area.eCol); } -Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *parentNode) +Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqparentNode) { Tag *textTag = 0L; Node *textNode = 0L; @@ -89,10 +89,10 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par { node->tag->endPos(bLine, bCol); } else - if (parentNode) - parentNode->tag->endPos(bLine, bCol); - if (parentNode) - dtd = parentNode->tag->dtd(); + if (tqparentNode) + tqparentNode->tag->endPos(bLine, bCol); + if (tqparentNode) + dtd = tqparentNode->tag->dtd(); eCol--; if (bLine == 0 && bCol == 0) bCol = -1; @@ -110,13 +110,13 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par textTag->type = Tag::Text; } - if (parentNode && parentNode->tag->single) + if (tqparentNode && tqparentNode->tag->single) { - textNode = new Node(parentNode->parent); + textNode = new Node(tqparentNode->tqparent); nodeNum++; - textNode->prev = parentNode; - parentNode->next = textNode; - parentNode = parentNode->parent; + textNode->prev = tqparentNode; + tqparentNode->next = textNode; + tqparentNode = tqparentNode->tqparent; } else { if ( node && @@ -129,21 +129,21 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par textTag = 0L; } else { - textNode = new Node(parentNode); + textNode = new Node(tqparentNode); nodeNum++; - if (node && node != parentNode) + if (node && node != tqparentNode) { node->next = textNode; textNode->prev = node; } else { - if (parentNode) + if (tqparentNode) { - Node *n = parentNode->child; + Node *n = tqparentNode->child; while (n && n->next) n = n->next; if (!n) - parentNode->child = textNode; + tqparentNode->child = textNode; else { n->next = textNode; @@ -163,32 +163,32 @@ Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *par } Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName, - const DTDStruct *dtd, Node *parentNode, Node *currentNode) + const DTDStruct *dtd, Node *tqparentNode, Node *currentNode) { Tag *tag = new Tag(); tag->setTagPosition(area); tag->setStr(areaName); tag->setWrite(write); - const DTDStruct *d = DTDs::ref()->find(dtd->specialAreaNames[areaName]); + const DTDStruct *d = DTDs::ref()->tqfind(dtd->specialAreaNames[areaName]); if (d) tag->setDtd(d); else tag->setDtd(dtd); - tag->name = i18n("%1 block").arg(dtd->specialAreaNames[areaName].upper()); + tag->name = i18n("%1 block").tqarg(dtd->specialAreaNames[areaName].upper()); tag->type = Tag::ScriptTag; tag->validXMLTag = false; - Node *node = new Node(parentNode); + Node *node = new Node(tqparentNode); nodeNum++; node->tag = tag; node->insideSpecial = true; - if (parentNode) + if (tqparentNode) { - if (!parentNode->child) - parentNode->child = node; + if (!tqparentNode->child) + tqparentNode->child = node; else { - Node *n = parentNode->child; + Node *n = tqparentNode->child; while (n->next) n = n->next; n->next = node; @@ -216,11 +216,11 @@ void coutTree(Node *node, int indent) node->tag->beginPos(bLine, bCol); node->tag->endPos(eLine, eCol); if (node->tag->type != Tag::Text) - output += node->tag->name.replace('\n'," "); + output += node->tag->name.tqreplace('\n'," "); else - output+= node->tag->tagStr().replace('\n'," "); + output+= node->tag->tagStr().tqreplace('\n'," "); kdDebug(24000) << output <<" (" << node->tag->type << ") at pos " << - bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->parent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << " Tag:" << node->tag << endl; + bLine << ":" << bCol << " - " << eLine << ":" << eCol << " This: "<< node << " Parent: " << node->tqparent << " Prev: " << node->prev << " Next: " << node->next << " Child: " << node->child << " Tag:" << node->tag << endl; /* for(j = 0; j < node->tag->attrCount(); j++) { kdDebug(24000)<< " attr" << j << " " << @@ -245,7 +245,7 @@ void verifyTree(Node *node) if (!node->tag) { kdDebug(24000) << "Bad node: " << node << endl; - kdDebug(24000) << "Parent: " << node->parent << " " << node->parent->tag->tagStr() << endl; + kdDebug(24000) << "Parent: " << node->tqparent << " " << node->tqparent->tag->tagStr() << endl; } if (node->child) verifyTree(node->child); diff --git a/quanta/parsers/parsercommon.h b/quanta/parsers/parsercommon.h index 9b0c01f4..021541b0 100644 --- a/quanta/parsers/parsercommon.h +++ b/quanta/parsers/parsercommon.h @@ -39,16 +39,16 @@ namespace ParserCommon{ /** Appends a text area to a text node. */ void appendAreaToTextNode(Document *write, const AreaStruct &area, Node *node); /** Creates a text/empty node between node and the provided position */ - Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *parentNode); + Node* createTextNode(Document *write, Node *node, int eLine, int eCol, Node *tqparentNode); /** Creates a head node for special areas. area: the area belonging to this node areaName: the special area name (type) - dtd: the parent DTD - parentNode: the parent of the node - currentNode: the last child of the parent, if it exists + dtd: the tqparent DTD + tqparentNode: the tqparent of the node + currentNode: the last child of the tqparent, if it exists */ Node* createScriptTagNode(Document *write, const AreaStruct &area, const TQString &areaName, - const DTDStruct *dtd, Node *parentNode, Node *currentNode); + const DTDStruct *dtd, Node *tqparentNode, Node *currentNode); /** Print the doc structure tree to the standard output. Only for debugging purposes. */ diff --git a/quanta/parsers/qtag.cpp b/quanta/parsers/qtag.cpp index 46b5b411..d31f91b8 100644 --- a/quanta/parsers/qtag.cpp +++ b/quanta/parsers/qtag.cpp @@ -18,22 +18,22 @@ #include "tag.h" #include <kdebug.h> -QTag::QTag() +TQTag::TQTag() { attrs.setAutoDelete(true); single = false; optional = false; type = "xmltag"; - parentDTD = 0L; + tqparentDTD = 0L; } -QTag::QTag( QTag &t) +TQTag::TQTag( TQTag &t) { tagName = t.tagName; single = t.single; optional = t.optional; m_fileName = t.m_fileName; - parentDTD = t.parentDTD; + tqparentDTD = t.tqparentDTD; type = t.type; returnType = t.returnType; comment = t.comment; @@ -48,12 +48,12 @@ QTag::QTag( QTag &t) } } -QTag::~QTag() +TQTag::~TQTag() { } /** Add an attribute to the tag. */ -void QTag::addAttribute(Attribute* attr) +void TQTag::addAttribute(Attribute* attr) { if (attr) { @@ -79,24 +79,24 @@ void QTag::addAttribute(Attribute* attr) } } /** Returns the number of attributes for the tag. */ -int QTag::attributeCount() +int TQTag::attributeCount() { return attrs.count(); } /** Returns the attribute at index. */ -Attribute* QTag::attributeAt(int index) +Attribute* TQTag::attributeAt(int index) { return attrs.at(index); } /** Returns true if the attribute exists */ -bool QTag::isAttribute(const TQString &attrName) +bool TQTag::isAttribute(const TQString &attrName) { Attribute *a; int i; AttributeList *groupAttrs; - //Check in the QTag specific attributes + //Check in the TQTag specific attributes for(a = attrs.first(); a; a = attrs.next()) { if(a->name == attrName) @@ -105,7 +105,7 @@ bool QTag::isAttribute(const TQString &attrName) //Check in the common attributes for(i = 0; i < (signed)commonGroups.count(); i++) { - groupAttrs = parentDTD->commonAttrs->find(commonGroups[i]); + groupAttrs = tqparentDTD->commonAttrs->tqfind(commonGroups[i]); if(groupAttrs) { for(a = groupAttrs->first(); a; a = groupAttrs->next()) @@ -119,57 +119,57 @@ bool QTag::isAttribute(const TQString &attrName) } /** No descriptions */ -void QTag::setSingle(bool isSingle) +void TQTag::setSingle(bool isSingle) { single = isSingle; } /** No descriptions */ -void QTag::setOptional(bool isOptional) +void TQTag::setOptional(bool isOptional) { optional = isOptional; } /** No descriptions */ -void QTag::setName(const TQString& theName) +void TQTag::setName(const TQString& theName) { tagName = theName; } /** No descriptions */ -TQString QTag::name(bool doNotConvert) +TQString TQTag::name(bool doNotConvert) { - if (doNotConvert || !parentDTD || parentDTD->caseSensitive) + if (doNotConvert || !tqparentDTD || tqparentDTD->caseSensitive) return tagName; else return tagName.upper(); } /** No descriptions */ -bool QTag::isSingle() +bool TQTag::isSingle() { return single; } /** No descriptions */ -bool QTag::isOptional() +bool TQTag::isOptional() { return optional; } /** No descriptions */ -void QTag::setFileName(const TQString& fileName) +void TQTag::setFileName(const TQString& fileName) { m_fileName = fileName; } /** No descriptions */ -TQString QTag::fileName() +TQString TQTag::fileName() { return m_fileName; } -QTag QTag::operator = (QTag &t) +TQTag TQTag::operator = (TQTag &t) { tagName = t.tagName; single = t.single; optional = t.optional; m_fileName = t.m_fileName; - parentDTD = t.parentDTD; + tqparentDTD = t.tqparentDTD; type = t.type; returnType = t.returnType; comment = t.comment; @@ -186,7 +186,7 @@ QTag QTag::operator = (QTag &t) } /** Returns the attribute with name, or 0 if the tag does not have any attribute with name. */ -Attribute* QTag::attribute(const TQString& name) +Attribute* TQTag::attribute(const TQString& name) { Attribute *attr = 0L; for (uint i = 0; i < attrs.count(); i++) @@ -201,17 +201,17 @@ Attribute* QTag::attribute(const TQString& name) return attr; } -bool QTag::isChild(const TQString& tag, bool trueIfNoChildsDefined) +bool TQTag::isChild(const TQString& tag, bool trueIfNoChildsDefined) { TQString tagName = tag; - tagName = parentDTD->caseSensitive ? tagName : tagName.upper(); + tagName = tqparentDTD->caseSensitive ? tagName : tagName.upper(); if(trueIfNoChildsDefined) - return (childTags.isEmpty() || childTags.contains(tagName)); + return (childTags.isEmpty() || childTags.tqcontains(tagName)); else - return (!childTags.isEmpty() && childTags.contains(tagName)); + return (!childTags.isEmpty() && childTags.tqcontains(tagName)); } -bool QTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesAsText) +bool TQTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesAsText) { TQString nodeName; @@ -220,18 +220,18 @@ bool QTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesA else if(node->tag->type == Tag::Text) { if(trueIfNoChildsDefined) - return(childTags.isEmpty() || childTags.contains("#text") || childTags.contains("#TEXT")); + return(childTags.isEmpty() || childTags.tqcontains("#text") || childTags.tqcontains("#TEXT")); else - return(!childTags.isEmpty() && (childTags.contains("#text") || childTags.contains("#TEXT"))); + return(!childTags.isEmpty() && (childTags.tqcontains("#text") || childTags.tqcontains("#TEXT"))); } else if(node->tag->type == Tag::Empty && !treatEmptyNodesAsText) return true; else if(node->tag->type == Tag::Empty && treatEmptyNodesAsText) { if(trueIfNoChildsDefined) - return(childTags.isEmpty() || childTags.contains("#text") || childTags.contains("#TEXT")); + return(childTags.isEmpty() || childTags.tqcontains("#text") || childTags.tqcontains("#TEXT")); else - return(!childTags.isEmpty() && (childTags.contains("#text") || childTags.contains("#TEXT"))); + return(!childTags.isEmpty() && (childTags.tqcontains("#text") || childTags.tqcontains("#TEXT"))); } else if(node->tag->type == Tag::XmlTagEnd) { @@ -247,10 +247,10 @@ bool QTag::isChild(Node *node, bool trueIfNoChildsDefined, bool treatEmptyNodesA return isChild(node->tag->name, trueIfNoChildsDefined); } -TQPtrList<QTag> QTag::parents() +TQPtrList<TQTag> TQTag::tqparents() { - TQPtrList<QTag> qTagList; - TQDictIterator<QTag> it((*parentDTD->tagsList)); + TQPtrList<TQTag> qTagList; + TQDictIterator<TQTag> it((*tqparentDTD->tagsList)); for(; it.current(); ++it) { if(it.current()->isChild(name())) diff --git a/quanta/parsers/qtag.h b/quanta/parsers/qtag.h index c7839c23..679fbc55 100644 --- a/quanta/parsers/qtag.h +++ b/quanta/parsers/qtag.h @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QTAG_H -#define QTAG_H +#ifndef TQTAG_H +#define TQTAG_H /**Quanta style tag (XML tag or code tag), as they are defined in the DTD. Contains @@ -33,7 +33,7 @@ //app includes -class QTag; +class TQTag; class Node; //an attribute of a tag looks like: @@ -58,7 +58,7 @@ class XMLStructGroup { bool hasFileName; ///<the group contains filename(s) TQRegExp fileNameRx; ///<delete the matches of this regexp to obtain a filename (eg. linked, included file name) bool appendToTags; ///<true if the group elements must be used as normal tags in autocompletion - TQString parentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the parent name. Makes sense only if appentToTags is true + TQString tqparentGroup; ///<if the group element can be a child of another group (eg. member function of a class), holds the tqparent name. Makes sense only if appentToTags is true }; @@ -80,7 +80,7 @@ class StructTreeGroup:public XMLStructGroup { typedef TQPtrList<Attribute> AttributeList; typedef TQDict<AttributeList> AttributeListDict; -typedef TQDict<QTag> QTagList; +typedef TQDict<TQTag> TQTagList; enum DTDFamily{Unknown = 0, Xml, Script}; @@ -101,7 +101,7 @@ struct DTDStruct int family; ///< xml, script type bool toplevel; ///< true if the DTD can be the main DTD of a document. Always true for XML like DTD's TQString documentation; ///< the name of the documentation package - QTagList* tagsList; ///< the list of all defined tags in the DTD + TQTagList* tagsList; ///< the list of all defined tags in the DTD TQString fileName; ///< the DTD decription.rc with path AttributeListDict* commonAttrs; ///< the attributes of the common groups @@ -205,12 +205,12 @@ defined in the structure after the keyword have local scope */ }; -class QTag { +class TQTag { public: - QTag(); - QTag( QTag&); - ~QTag(); - QTag operator = ( QTag& ); + TQTag(); + TQTag( TQTag&); + ~TQTag(); + TQTag operator = ( TQTag& ); /** Add an attribute to the tag. */ void addAttribute(Attribute* attr); /** Returns the number of attributes for the tag. */ @@ -243,12 +243,12 @@ public: void setScope(TQString const& scope) {m_scope = scope;} /** Returns true if tag is a possible child of this tag, or if - there are no children defined and if trueIfNoChildsDefined is set to true. */ + there are no tqchildren defined and if trueIfNoChildsDefined is set to true. */ bool isChild(const TQString& tag, bool trueIfNoChildsDefined = true); //prefer using this variant, it handle Text, Empty, XmlTagEnd nodes! bool isChild(Node *node, bool trueIfNoChildsDefined = true, bool treatEmptyNodesAsText = false); - /*** Returns the list of parent of this tag. */ - TQPtrList<QTag> parents(); + /*** Returns the list of tqparent of this tag. */ + TQPtrList<TQTag> tqparents(); /** No descriptions */ TQString fileName(); @@ -258,7 +258,7 @@ public: Attribute* attribute(const TQString& name); /** The tag belongs to this DTD */ - const DTDStruct *parentDTD; + const DTDStruct *tqparentDTD; /** The tag has the attributes of the above common groups */ TQStringList commonGroups; TQStringList stoppingTags; diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp index 6e409509..e28abe78 100644 --- a/quanta/parsers/sagroupparser.cpp +++ b/quanta/parsers/sagroupparser.cpp @@ -35,14 +35,14 @@ extern GroupElementMapList globalGroupMap; -SAGroupParser::SAGroupParser(SAParser *parent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup) +SAGroupParser::SAGroupParser(SAParser *tqparent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup) { g_node = startNode; g_endNode = endNode; m_synchronous = synchronous; m_lastGroupParsed = paringLastGroup; m_parsingLastNode = parsingLastNode; - m_parent = parent; + m_parent = tqparent; m_write = write; m_count = 0; m_parseForGroupTimer = new TQTimer(this); @@ -117,7 +117,7 @@ void SAGroupParser::parseForScriptGroup(Node *node) StructTreeGroup group; GroupElement *groupElement; GroupElementList* groupElementList; - KURL baseURL = QExtFileInfo::path(m_write->url()); + KURL baseURL = TQExtFileInfo::path(m_write->url()); TQString str = node->tag->cleanStr; TQString tagStr = node->tag->tagStr(); const DTDStruct* dtd = node->tag->dtd(); @@ -144,20 +144,20 @@ void SAGroupParser::parseForScriptGroup(Node *node) title = tagStr.mid(pos, group.definitionRx.matchedLength()); node->tag->beginPos(bl, bc); tmpStr = tagStr.left(pos); - int newLines = tmpStr.contains('\n'); + int newLines = tmpStr.tqcontains('\n'); bl += newLines; - int l = tmpStr.findRev('\n'); //the last EOL + int l = tmpStr.tqfindRev('\n'); //the last EOL bc = (l == -1) ? bc + pos : pos - l - 1; - newLines = title.contains('\n'); + newLines = title.tqcontains('\n'); l = title.length(); el = bl + newLines; - ec = (newLines > 0) ? l - title.findRev('\n') : bc + l - 1; + ec = (newLines > 0) ? l - title.tqfindRev('\n') : bc + l - 1; pos += l; AreaStruct area(bl, bc, el, ec); //get the list of elements which are present in this group and //have the same title. For example get the list of all group //element which are variable and the matched string was "$i" - int cap1Pos = str.find(group.definitionRx.cap(1)); + int cap1Pos = str.tqfind(group.definitionRx.cap(1)); TQString s = tagStr.mid(cap1Pos, group.definitionRx.cap(1).length()); groupElementList = & (globalGroupMap[group.name + "|" + s]); //Create a new tag which point to the exact location of the matched string. @@ -178,40 +178,40 @@ void SAGroupParser::parseForScriptGroup(Node *node) Node *tmpNode = node; while (tmpNode && tmpNode->tag->dtd() == dtd && tmpNode->tag->type != Tag::ScriptStructureBegin) { - tmpNode = tmpNode->parent; + tmpNode = tmpNode->tqparent; } if (tmpNode && tmpNode->tag->type == Tag::ScriptStructureBegin) { - groupElement->parentNode = tmpNode; + groupElement->tqparentNode = tmpNode; } else { - groupElement->parentNode = 0L; + groupElement->tqparentNode = 0L; } groupElement->global = true; - tmpNode = node->parent; + tmpNode = node->tqparent; while (tmpNode && tmpNode->tag->dtd() == dtd) { if ( tmpNode->tag->type == Tag::ScriptStructureBegin && tmpNode->tag->dtd()->localScopeKeywordsRx.search(tmpNode->tag->cleanStr) != -1) { groupElement->global = false; - groupElement->parentNode = tmpNode; + groupElement->tqparentNode = tmpNode; break; } - tmpNode = tmpNode->parent; + tmpNode = tmpNode->tqparent; } if (group.appendToTags) { - QTag *qTag = new QTag(); + TQTag *qTag = new TQTag(); // The location of the first open bracket '(', also the end of the tag name - int nameEnd = s.find('('); + int nameEnd = s.tqfind('('); qTag->setName(s.left(nameEnd)); qTag->className = ""; - if (groupElement->parentNode) + if (groupElement->tqparentNode) { - for (GroupElementList::ConstIterator it2 = groupElement->parentNode->m_groupElements.constBegin(); it2 != groupElement->parentNode->m_groupElements.constEnd(); ++it2) + for (GroupElementList::ConstIterator it2 = groupElement->tqparentNode->m_groupElements.constBegin(); it2 != groupElement->tqparentNode->m_groupElements.constEnd(); ++it2) { - if ((*it2)->group->name == group.parentGroup) + if ((*it2)->group->name == group.tqparentGroup) { qTag->className = (*it2)->tag->name; break; @@ -219,24 +219,24 @@ void SAGroupParser::parseForScriptGroup(Node *node) } } // Test for variable or function Type by checking for an opening bracket "(" used by functions - // and store the type in the QTag type variable. + // and store the type in the TQTag type variable. bool isArgument=false; if (nameEnd == -1) { qTag->type="variable"; // If this tag is a class function argument, it should not belong to the class, so we need to remove it - if(qTag->className.length() != 0 && tagStr.contains('(') && tagStr.contains(')')) + if(qTag->className.length() != 0 && tagStr.tqcontains('(') && tagStr.tqcontains(')')) { // First we want to determine the whole line the tag is on TQString tagWholeLineStr = tagStr; // Remove lines before target line while(tagWholeLineStr.length() > 0) // this stops infinit looping in case something goes wrong! { - int firstNewline = tagWholeLineStr.find('\n'); + int firstNewline = tagWholeLineStr.tqfind('\n'); if(firstNewline == -1) //no new lines so we must be on the last break; TQString checkLineStr = tagWholeLineStr.mid(firstNewline+1,tagWholeLineStr.length()); - if(checkLineStr.contains(s)) + if(checkLineStr.tqcontains(s)) tagWholeLineStr = checkLineStr; else break; @@ -244,23 +244,23 @@ void SAGroupParser::parseForScriptGroup(Node *node) // Remove lines after target line - essentially same as above while(tagWholeLineStr.length() > 0) { - int lastNewLine = tagWholeLineStr.findRev('\n'); + int lastNewLine = tagWholeLineStr.tqfindRev('\n'); if(lastNewLine == -1) break; TQString checkLineStr = tagWholeLineStr.mid(0,lastNewLine); - if(checkLineStr.contains(s)) + if(checkLineStr.tqcontains(s)) tagWholeLineStr = checkLineStr; else break; } - // Now we are left with the current line, lets check if the variable is inside parentheses - int lineOpenParenth=tagWholeLineStr.find('('); + // Now we are left with the current line, lets check if the variable is inside tqparentheses + int lineOpenParenth=tagWholeLineStr.tqfind('('); if(lineOpenParenth != -1) { - int lineCloseParenth=tagWholeLineStr.find(')'); + int lineCloseParenth=tagWholeLineStr.tqfind(')'); if(lineCloseParenth != -1) { - int lineNameLocation=tagWholeLineStr.find(s); + int lineNameLocation=tagWholeLineStr.tqfind(s); if(lineNameLocation > lineOpenParenth || lineNameLocation < lineCloseParenth) // Write the current tag to the list isArgument=true; } @@ -272,7 +272,7 @@ void SAGroupParser::parseForScriptGroup(Node *node) qTag->type="function"; } if(!isArgument) - m_write->userTagList.replace(s.lower(), qTag); + m_write->userTagList.tqreplace(s.lower(), qTag); } @@ -294,7 +294,7 @@ void SAGroupParser::parseForScriptGroup(Node *node) s.remove(group.fileNameRx); KURL url; QuantaCommon::setUrl(url, s.stripWhiteSpace()); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); ParserCommon::includedFiles += url.path(); ParserCommon::includedFilesDTD.append(dtd); ParserCommon::includeWatch->addFile(url.path()); diff --git a/quanta/parsers/sagroupparser.h b/quanta/parsers/sagroupparser.h index 1045cc74..35e8d1f9 100644 --- a/quanta/parsers/sagroupparser.h +++ b/quanta/parsers/sagroupparser.h @@ -29,12 +29,13 @@ class SAParser; /** This class is used to parse for special area (script) groups in the node tree. */ -class SAGroupParser : public QObject +class SAGroupParser : public TQObject { Q_OBJECT + TQ_OBJECT public: public: - SAGroupParser(SAParser *parent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup); + SAGroupParser(SAParser *tqparent, Document *write, Node *startNode, Node *endNode, bool synchronous, bool parsingLastNode, bool paringLastGroup); ~SAGroupParser() {}; TQTimer *m_parseForGroupTimer; diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index f402e0c8..e562d47b 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -86,29 +86,29 @@ bool SAParser::slotParseOneLine() //search for different s_contexts if (s_searchContent) //search for quoted strings, comments, groups only in non-comment special areas { - quotedStringPos = s_textLine.find(m_quotesRx, s_col); //quoted strings + quotedStringPos = s_textLine.tqfind(m_quotesRx, s_col); //quoted strings s_searchedString = s_textLine.left(quotedStringPos); - commentPos = s_searchedString.find(s_dtd->commentsStartRx, s_col); //comments + commentPos = s_searchedString.tqfind(s_dtd->commentsStartRx, s_col); //comments s_searchedString = s_textLine.left(commentPos); if (s_fullParse) - groupKeywordPos = s_searchedString.find(s_dtd->structRx, s_col); //groups, like { } + groupKeywordPos = s_searchedString.tqfind(s_dtd->structRx, s_col); //groups, like { } } else s_searchedString = s_textLine; int specialAreaPos = -1; if (s_searchForSpecialAreas) //special area inside special area { s_searchedString = s_textLine.left(groupKeywordPos); - specialAreaPos = s_searchedString.find(s_dtd->specialAreaStartRx, s_col); + specialAreaPos = s_searchedString.tqfind(s_dtd->specialAreaStartRx, s_col); } if (s_searchForAreaEnd) //the end of the special area { s_searchedString = s_textLine.left(specialAreaPos); - areaEndPos = s_searchedString.find(s_areaEndString, s_col); + areaEndPos = s_searchedString.tqfind(s_areaEndString, s_col); } else if (s_searchForForcedAreaEnd) //the end of the special area if a forcing string was specified { s_searchedString = s_textLine.left(specialAreaPos); - areaEndPos = s_searchedString.find(s_forcedAreaRx, s_col); + areaEndPos = s_searchedString.tqfind(s_forcedAreaRx, s_col); if (areaEndPos != -1) s_areaEndString = s_forcedAreaRx.cap(); } @@ -157,7 +157,7 @@ bool SAParser::slotParseOneLine() s_currentNode->tag->type == Tag::Empty) ) ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode); else - s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.parentNode); + s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, s_currentContext.area.eCol + 1, s_currentContext.tqparentNode); s_currentNode->tag->type = Tag::ScriptStructureBegin; s_currentNode->tag->single = false; @@ -166,7 +166,7 @@ bool SAParser::slotParseOneLine() s_currentContext.lastNode = s_currentNode; s_contextStack.push(s_currentContext); - s_currentContext.parentNode = s_currentNode; + s_currentContext.tqparentNode = s_currentNode; s_col = s_context.area.bCol + s_context.startString.length(); s_currentContext.area.bLine = s_line; s_currentContext.area.bCol = s_col; @@ -201,21 +201,21 @@ bool SAParser::slotParseOneLine() } s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = groupKeywordPos - 1; - //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Group Struct s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; if (s_currentNode && (s_currentNode->tag->type == Tag::Text || s_currentNode->tag->type == Tag::Empty) ) ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode); else - s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.parentNode); + s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, groupKeywordPos, s_currentContext.tqparentNode); if (s_currentNode) { s_currentNode->insideSpecial = true; s_currentNode->specialInsideXml = m_specialInsideXml; } s_previousContext = s_contextStack.pop(); - s_currentContext.parentNode = s_previousContext.parentNode; + s_currentContext.tqparentNode = s_previousContext.tqparentNode; s_currentContext.lastNode = s_previousContext.lastNode; s_currentContext.type = s_previousContext.type; s_currentContext.area.bLine = s_line; @@ -232,14 +232,14 @@ bool SAParser::slotParseOneLine() tag->setDtd(s_dtd); tag->type = Tag::ScriptStructureEnd; tag->single = true; - Node *node = new Node(s_currentContext.parentNode); + Node *node = new Node(s_currentContext.tqparentNode); nodeNum++; node->tag = tag; node->insideSpecial = true; node->specialInsideXml = m_specialInsideXml; - if (s_currentContext.parentNode && !s_currentContext.parentNode->child) + if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child) { - s_currentContext.parentNode->child = node; + s_currentContext.tqparentNode->child = node; } else if (s_currentContext.lastNode) { @@ -275,7 +275,7 @@ bool SAParser::slotParseOneLine() s_currentNode->tag->type == Tag::Empty) ) ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode); else - s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.parentNode); + s_currentNode = ParserCommon::createTextNode(m_write, s_currentNode, s_line, specialAreaPos, s_currentContext.tqparentNode); if (s_currentNode) { s_currentNode->insideSpecial = true; @@ -284,7 +284,7 @@ bool SAParser::slotParseOneLine() } //create a toplevel node for the included special area AreaStruct area(s_line, specialAreaPos, s_line, specialAreaPos + foundText.length() - 1); - Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.parentNode, s_currentNode); + Node *node = ParserCommon::createScriptTagNode(m_write, area, foundText, s_dtd, s_currentContext.tqparentNode, s_currentNode); #ifdef DEBUG_PARSER kdDebug(24001) << "Parsing a nested area." << endl; #endif @@ -316,11 +316,11 @@ bool SAParser::slotParseOneLine() } else //when we look only for the area end string if (s_searchForAreaEnd) { - areaEndPos = s_textLine.find(s_areaEndString, s_col); + areaEndPos = s_textLine.tqfind(s_areaEndString, s_col); } else if (s_searchForForcedAreaEnd) { - areaEndPos = s_textLine.find(s_forcedAreaRx, s_col); + areaEndPos = s_textLine.tqfind(s_forcedAreaRx, s_col); if (areaEndPos != -1) s_areaEndString = s_forcedAreaRx.cap(); } @@ -351,7 +351,7 @@ bool SAParser::slotParseOneLine() s_currentNode->specialInsideXml = m_specialInsideXml; } } - //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").arg(s_dtd->name).arg(s_line).arg(lastCol) << endl; + //kdDebug(24000) << TQString("Special area %1 ends at %2, %3").tqarg(s_dtd->name).tqarg(s_line).tqarg(lastCol) << endl; //create a closing node for the special area Tag *tag = new Tag(); @@ -363,7 +363,7 @@ bool SAParser::slotParseOneLine() tag->single = true; //at this point s_parentNode = the opening node of the special area (eg. <?) //and it should always exist - Node *node = new Node(s_parentNode->parent); + Node *node = new Node(s_parentNode->tqparent); nodeNum++; s_parentNode->next = node; node->prev = s_parentNode; @@ -419,10 +419,10 @@ bool SAParser::slotParseOneLine() { s_context.area.bLine = s_line; s_context.area.eLine = s_context.area.eCol = -1; - s_context.parentNode = s_currentContext.parentNode; + s_context.tqparentNode = s_currentContext.tqparentNode; s_currentContext.area.eLine = s_context.area.bLine; s_currentContext.area.eCol = s_context.area.bCol - 1; - // s_currentContext.parentNode = s_parentNode; + // s_currentContext.tqparentNode = s_parentNode; s_contextStack.push(s_currentContext); if (s_fullParse) { @@ -451,14 +451,14 @@ bool SAParser::slotParseOneLine() } tag->single = true; //create a node with the above tag - Node *node = new Node(s_currentContext.parentNode); + Node *node = new Node(s_currentContext.tqparentNode); nodeNum++; node->tag = tag; node->insideSpecial = true; node->specialInsideXml = m_specialInsideXml; - if (s_currentContext.parentNode && !s_currentContext.parentNode->child) + if (s_currentContext.tqparentNode && !s_currentContext.tqparentNode->child) { - s_currentContext.parentNode->child = node; + s_currentContext.tqparentNode->child = node; } else if (s_currentNode) { @@ -468,7 +468,7 @@ bool SAParser::slotParseOneLine() s_currentNode = node; } } - //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").arg(s_currentContext.type).arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("%1 s_context: %2, %3, %4, %5").tqarg(s_currentContext.type).tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; s_currentContext = s_context; s_col = s_context.area.bCol + s_context.startString.length(); @@ -487,7 +487,7 @@ bool SAParser::slotParseOneLine() int l = s_textLine.length(); while (p < l) { - p = s_textLine.find(s_currentContext.startString, p); + p = s_textLine.tqfind(s_currentContext.startString, p); if (p != -1) { if (p >= 0) @@ -514,7 +514,7 @@ bool SAParser::slotParseOneLine() // if (pos != 0) pos++; s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = pos; - //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Quoted String s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; if (s_fullParse) { if ( s_currentNode && @@ -522,12 +522,12 @@ bool SAParser::slotParseOneLine() s_currentNode->tag->type == Tag::Empty) ) ParserCommon::appendAreaToTextNode(m_write, s_currentContext.area, s_currentNode); else - s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.parentNode); + s_currentNode = ParserCommon::createTextNode(m_write, 0L, s_line, pos, s_currentContext.tqparentNode); s_currentNode->insideSpecial = true; s_currentNode->specialInsideXml = m_specialInsideXml; } s_previousContext = s_contextStack.pop(); - s_currentContext.parentNode = s_previousContext.parentNode; + s_currentContext.tqparentNode = s_previousContext.tqparentNode; s_currentContext.type = s_previousContext.type; s_currentContext.area.bLine = s_line; s_currentContext.area.bCol = pos + 1; @@ -544,10 +544,10 @@ bool SAParser::slotParseOneLine() } case Comment: { - int pos = s_textLine.find(s_dtd->comments[s_currentContext.startString], s_col); + int pos = s_textLine.tqfind(s_dtd->comments[s_currentContext.startString], s_col); if (pos == -1 && s_dtd->comments[s_currentContext.startString] == "\n") { - int pos2 = s_textLine.find(s_areaEndString, s_col); + int pos2 = s_textLine.tqfind(s_areaEndString, s_col); if (pos2 != -1) { pos = pos2 - 1; @@ -561,7 +561,7 @@ bool SAParser::slotParseOneLine() s_currentContext.area.eLine = s_line; s_currentContext.area.eCol = pos + s_dtd->comments[s_currentContext.startString].length() - 1; s_currentContext.type = s_previousContext.type; - //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").arg( s_currentContext.bLine).arg(s_currentContext.bCol).arg(s_currentContext.eLine).arg(s_currentContext.eCol) << endl; + //kdDebug(24000) << TQString("Comment s_context: %1, %2, %3, %4").tqarg( s_currentContext.bLine).tqarg(s_currentContext.bCol).tqarg(s_currentContext.eLine).tqarg(s_currentContext.eCol) << endl; if (s_fullParse) { @@ -570,22 +570,22 @@ bool SAParser::slotParseOneLine() tag->type = Tag::Comment; tag->single = true; //create a node with the above tag - Node *node = new Node(s_currentContext.parentNode); + Node *node = new Node(s_currentContext.tqparentNode); nodeNum++; node->tag = tag; node->insideSpecial = true; node->specialInsideXml = m_specialInsideXml; - if (s_currentNode && s_currentNode != node->parent) + if (s_currentNode && s_currentNode != node->tqparent) { s_currentNode->next = node; node->prev = s_currentNode; } else - if (node->parent && !node->parent->child) - node->parent->child = node; + if (node->tqparent && !node->tqparent->child) + node->tqparent->child = node; s_currentNode = node; } s_previousContext = s_contextStack.pop(); - s_currentContext.parentNode = s_previousContext.parentNode; + s_currentContext.tqparentNode = s_previousContext.tqparentNode; s_currentContext.type = s_previousContext.type; s_currentContext.area.bLine = s_line; s_currentContext.area.bCol = s_currentContext.area.eCol + 1; @@ -635,11 +635,11 @@ bool SAParser::slotParseOneLine() Node* SAParser::parseArea(const AreaStruct &specialArea, const TQString &areaStartString, const TQString &forcedAreaEndString, - Node *parentNode, + Node *tqparentNode, bool fullParse, bool synchronous) { m_synchronous = synchronous; - s_parentNode = parentNode; + s_parentNode = tqparentNode; s_fullParse = fullParse; #ifdef DEBUG_PARSER kdDebug(24001) << "parseArea full: " << s_fullParse << " synch: " << m_synchronous <<endl; @@ -649,18 +649,18 @@ Node* SAParser::parseArea(const AreaStruct &specialArea, int s_startCol = specialArea.bCol; s_endLine = specialArea.eLine; s_endCol = specialArea.eCol; - //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").arg(s_startLine).arg(s_startCol).arg(areaStartString) << endl; + //kdDebug(24000) << TQString("Starting to parse at %1, %2 for %3").tqarg(s_startLine).tqarg(s_startCol).tqarg(areaStartString) << endl; s_searchForAreaEnd = false; s_searchForForcedAreaEnd = false; s_dtd = 0L; if (s_parentNode && !areaStartString.isEmpty()) { - const DTDStruct *parentDTD = m_dtd; - if (s_parentNode->parent) - parentDTD = s_parentNode->parent->tag->dtd(); - s_dtd = DTDs::ref()->find(parentDTD->specialAreaNames[areaStartString]); - s_areaEndString = parentDTD->specialAreas[areaStartString]; + const DTDStruct *tqparentDTD = m_dtd; + if (s_parentNode->tqparent) + tqparentDTD = s_parentNode->tqparent->tag->dtd(); + s_dtd = DTDs::ref()->tqfind(tqparentDTD->specialAreaNames[areaStartString]); + s_areaEndString = tqparentDTD->specialAreas[areaStartString]; s_searchForAreaEnd = true; } if (!forcedAreaEndString.isEmpty()) @@ -702,7 +702,7 @@ Node* SAParser::parseArea(const AreaStruct &specialArea, s_currentContext.area.bLine = s_line; s_currentContext.area.bCol = s_col; s_currentContext.area.eLine = s_currentContext.area.eCol = -1; - s_currentContext.parentNode = s_parentNode; + s_currentContext.tqparentNode = s_parentNode; s_currentNode = s_parentNode; m_lastParsedNode = 0L; s_useReturnVars = false; diff --git a/quanta/parsers/saparser.h b/quanta/parsers/saparser.h index 74b00b3e..d344fb55 100644 --- a/quanta/parsers/saparser.h +++ b/quanta/parsers/saparser.h @@ -38,9 +38,10 @@ class SAGroupParser; /** This class is used to parse a special area (script) in the document. */ -class SAParser: public QObject +class SAParser: public TQObject { Q_OBJECT + TQ_OBJECT public: SAParser(); @@ -56,7 +57,7 @@ public: area. It may end before the end position. areaStartString: the special area starting string forcedAreaEndString: force this as the special area ending string. - parentNode: the Node under where the special area goes + tqparentNode: the Node under where the special area goes fullParse: the script node will be fully parsed for groups, structures or so. If false, only the script beginning and end will be determined. synchronous: if true, the function does not return until the parsing is finished, otherwise return immediately. @@ -65,7 +66,7 @@ public: Node* parseArea(const AreaStruct &specialArea, const TQString &areaStartString, const TQString &forcedAreaEndString, - Node *parentNode, + Node *tqparentNode, bool fullParse, bool synchronous); /** Returns the line where the last parsing run ended. */ int lastParsedLine() {return m_lastParsedLine;} @@ -96,7 +97,7 @@ private: int type; AreaStruct area; TQString startString; - Node *parentNode; + Node *tqparentNode; Node *lastNode; }; enum ContextType { diff --git a/quanta/parsers/tag.cpp b/quanta/parsers/tag.cpp index 54779d57..f6460fce 100644 --- a/quanta/parsers/tag.cpp +++ b/quanta/parsers/tag.cpp @@ -33,8 +33,8 @@ void TagAttr::save(TQDomElement& element) const { - element.setAttribute("name", name); // QString - element.setAttribute("value", value); // QString + element.setAttribute("name", name); // TQString + element.setAttribute("value", value); // TQString element.setAttribute("nameLine", nameLine); // int element.setAttribute("nameCol", nameCol); // int element.setAttribute("valueLine", valueLine); // int @@ -127,13 +127,13 @@ void Tag::init() void Tag::save(TQDomElement& element) const { - element.setAttribute("name", name); // QString - element.setAttribute("nameSpace", nameSpace); // QString - element.setAttribute("cleanStr", cleanStr); // QString + element.setAttribute("name", name); // TQString + element.setAttribute("nameSpace", nameSpace); // TQString + element.setAttribute("cleanStr", cleanStr); // TQString element.setAttribute("type", type); // int element.setAttribute("single", single); // bool element.setAttribute("closingMissing", closingMissing); // bool - element.setAttribute("structBeginStr", structBeginStr); // QString + element.setAttribute("structBeginStr", structBeginStr); // TQString element.setAttribute("validXMLTag", validXMLTag); // bool element.setAttribute("cleanStrBuilt", m_cleanStrBuilt); // bool element.setAttribute("indentationDone", m_indentationDone); // bool @@ -149,18 +149,18 @@ void Tag::save(TQDomElement& element) const (*it).save(child_element); } - element.setAttribute("tagStr", m_tagStr); // QString + element.setAttribute("tagStr", m_tagStr); // TQString } bool Tag::load(TQDomElement const& element) { - name = element.attribute("name"); // QString - nameSpace = element.attribute("nameSpace"); // QString - cleanStr = element.attribute("cleanStr"); // QString + name = element.attribute("name"); // TQString + nameSpace = element.attribute("nameSpace"); // TQString + cleanStr = element.attribute("cleanStr"); // TQString type = TQString(element.attribute("type")).toInt(); // int single = TQString(element.attribute("single")).toInt(); // bool closingMissing = TQString(element.attribute("closingMissing")).toInt(); // bool - structBeginStr = element.attribute("structBeginStr"); // QString + structBeginStr = element.attribute("structBeginStr"); // TQString validXMLTag = TQString(element.attribute("validXMLTag")).toInt(); // bool m_cleanStrBuilt = TQString(element.attribute("cleanStrBuilt")).toInt(); // bool m_indentationDone = TQString(element.attribute("indentationDone")).toInt(); // bool @@ -183,7 +183,7 @@ bool Tag::load(TQDomElement const& element) } } - m_tagStr = element.attribute("tagStr"); // QString + m_tagStr = element.attribute("tagStr"); // TQString return true; } @@ -209,7 +209,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) pos++; } name = m_tagStr.mid(1, pos - 1); - int nameSpacePos = name.find(':'); + int nameSpacePos = name.tqfind(':'); if (nameSpacePos != -1) { nameSpace = name.left(nameSpacePos); @@ -237,7 +237,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) attr.name = attr.name.left(attr.name.length() - 1).lower(); if (!attr.name.stripWhiteSpace().isEmpty()) { - attr.nameLine = m_tagStr.left(sPos).contains('\n') + m_area.bLine; + attr.nameLine = m_tagStr.left(sPos).tqcontains('\n') + m_area.bLine; if (attr.nameLine == m_area.bLine) attr.nameCol = sPos + m_area.bCol; else @@ -252,7 +252,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) } if (m_dtd && !m_dtd->caseSensitive) attr.name = attr.name.lower(); - attr.nameLine = m_tagStr.left(sPos).contains('\n') + m_area.bLine; + attr.nameLine = m_tagStr.left(sPos).tqcontains('\n') + m_area.bLine; if (attr.nameLine == m_area.bLine) attr.nameCol = sPos + m_area.bCol; else @@ -298,7 +298,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) pos--; attr.value = m_tagStr.mid(valueStartPos, pos - valueStartPos); } - attr.valueLine = m_tagStr.left(valueStartPos).contains('\n') + m_area.bLine; + attr.valueLine = m_tagStr.left(valueStartPos).tqcontains('\n') + m_area.bLine; if (attr.valueLine == m_area.bLine) attr.valueCol = valueStartPos + m_area.bCol; else @@ -322,13 +322,13 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) if ( !QuantaCommon::isKnownTag(m_dtd->name, tagName) && name[0] != '/' ) { - QTag *newTag = m_write->userTagList.find(tagName); + TQTag *newTag = m_write->userTagList.tqfind(tagName); bool insertNew = !newTag; if (insertNew) { - newTag = new QTag(); + newTag = new TQTag(); newTag->setName(name); - newTag->parentDTD = m_dtd; + newTag->tqparentDTD = m_dtd; } for (int i = 0; i >attrCount(); i++) { @@ -340,7 +340,7 @@ void Tag::parse(const TQString &p_tagStr, Document *p_write) } if (insertNew) { - m_write->userTagList.replace(tagName, newTag); + m_write->userTagList.tqreplace(tagName, newTag); } } } @@ -566,7 +566,7 @@ void Tag::deleteAttribute(const TQString& attrName) void Tag::modifyAttributes(TQDict<TQString> *attrDict) { - QTag *qTag = QuantaCommon::tagFromDTD(m_dtd, name); + TQTag *qTag = QuantaCommon::tagFromDTD(m_dtd, name); TQDictIterator<TQString> it(*attrDict); TQString attribute; TQString value; @@ -574,7 +574,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict) { attribute = it.currentKey(); value = *(it.current()); - if (qTag && qTag->parentDTD->singleTagStyle == "xml" && attribute=="/") + if (qTag && qTag->tqparentDTD->singleTagStyle == "xml" && attribute=="/") { ++it; continue; @@ -584,7 +584,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict) } for (uint i = 0 ; i < attrs.count(); i++) { - if ( !attrDict->find(attrs[i].name) ) + if ( !attrDict->tqfind(attrs[i].name) ) { attrs.remove(attrs.at(i)); } @@ -593,7 +593,7 @@ void Tag::modifyAttributes(TQDict<TQString> *attrDict) TQString Tag::toString() { - QTag *qTag = QuantaCommon::tagFromDTD(m_dtd, name); + TQTag *qTag = QuantaCommon::tagFromDTD(m_dtd, name); TQValueList<TagAttr>::Iterator it; TagAttr attr; TQString attrString; @@ -622,7 +622,7 @@ TQString Tag::toString() attrString.append(QuantaCommon::tagCase(name)); tagString.prepend(attrString); - if (attrs.isEmpty() && qTag && qTag->parentDTD->singleTagStyle == "xml" && + if (attrs.isEmpty() && qTag && qTag->tqparentDTD->singleTagStyle == "xml" && (qTag->isSingle() || (!qConfig.closeOptionalTags && qTag->isOptional()) || single) ) @@ -660,10 +660,10 @@ bool Tag::isInsideScript(const TQString &str) //This detects if the last char from str is inside a script area or not, to //treat cases like <a href="<? echo "foo" ?>"> correctly //TODO: speed up if you can... - if (str.find(m_dtd->specialAreaStartRx) != -1) + if (str.tqfind(m_dtd->specialAreaStartRx) != -1) { TQString foundString = m_dtd->specialAreaStartRx.cap(); - if (str.find(m_dtd->specialAreas[foundString]) == -1) + if (str.tqfind(m_dtd->specialAreas[foundString]) == -1) { return true; } diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index 5ed55a1b..33ad81ac 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -27,7 +27,7 @@ #include "domtreeview.moc" -DOMTreeView::DOMTreeView(TQWidget *parent, KHTMLPart *currentpart, const char * name) : KListView(parent, name) +DOMTreeView::DOMTreeView(TQWidget *tqparent, KHTMLPart *currentpart, const char * name) : KListView(tqparent, name) { setCaption(name); setRootIsDecorated(true); @@ -137,10 +137,10 @@ void DOMTreeView::slotItemClicked(TQListViewItem *cur_item) } } -KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *parent, KHTMLPart *part, const char* name, bool modal, WFlags fl ) - : TQDialog(parent, name, modal, fl) +KafkaDOMTreeDialog::KafkaDOMTreeDialog(TQWidget *tqparent, KHTMLPart *part, const char* name, bool modal, WFlags fl ) + : TQDialog(tqparent, name, modal, fl) { - setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) ); + tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) ); DialogLayout = new TQGridLayout( this, 1, 1, 11, 6, "DialogLayout"); domview = new DOMTreeView(this, part, name); domview->setTitle(i18n( "Debugging KafkaWidget DOM Tree " )); diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h index e8899b59..2f3ea65a 100644 --- a/quanta/parts/kafka/domtreeview.h +++ b/quanta/parts/kafka/domtreeview.h @@ -38,8 +38,9 @@ class TQGridLayout; class DOMTreeView : public KListView { Q_OBJECT + TQ_OBJECT public: - DOMTreeView(TQWidget *parent, KHTMLPart *part, const char * name = 0); + DOMTreeView(TQWidget *tqparent, KHTMLPart *part, const char * name = 0); ~DOMTreeView(); void setTitle(const TQString &str); void recursive(const DOM::Node &pNode, const DOM::Node &node); @@ -63,11 +64,12 @@ class DOMTreeView : public KListView }; -class KafkaDOMTreeDialog : public QDialog +class KafkaDOMTreeDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KafkaDOMTreeDialog(TQWidget *parent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KafkaDOMTreeDialog(TQWidget *tqparent = 0, KHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~KafkaDOMTreeDialog(); DOMTreeView *domview; TQGridLayout *DialogLayout; diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index d8fee439..a6fdd8bb 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -44,9 +44,9 @@ #include "viewmanager.h" -htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInsertionOfBasicNodes, const char* name, +htmlDocumentProperties::htmlDocumentProperties( TQWidget* tqparent, bool forceInsertionOfBasicNodes, const char* name, bool modal, WFlags fl) : - htmlDocumentPropertiesui(parent, name, modal, fl), titleNode( 0L ), htmlNode( 0L ), + htmlDocumentPropertiesui(tqparent, name, modal, fl), titleNode( 0L ), htmlNode( 0L ), headNode( 0L ), linkNode( 0L ), bodyNode( 0L), doctypeNode( 0L ), CSSNode ( 0L ), xmlNode( 0L ), titleDirty(false), linkDirty(false) { @@ -69,7 +69,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse ok->setAutoDefault(true); //set the taborder and disable focus for some widgets. - currentDTD->setFocusPolicy(TQWidget::NoFocus); + currentDTD->setFocusPolicy(TQ_NoFocus); TQWidget::setTabOrder(title, metaItems); TQWidget::setTabOrder(metaItems, metaItemsAdd); TQWidget::setTabOrder(metaItemsAdd, metaItemsDelete); @@ -98,7 +98,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cssRules->addColumn(i18n("Rule")); cssRules->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); cssRules->setLineWidth( 2 ); - //cssRules->setFocusPolicy(TQWidget::ClickFocus); + //cssRules->setFocusPolicy(TQ_ClickFocus); cssRules->setSorting(-1); //search for the head, html, title Node @@ -108,7 +108,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse while(node) { nodeName = node->tag->name.lower(); - if(nodeName == "?xml" || nodeName.contains("xml pi block")) + if(nodeName == "?xml" || nodeName.tqcontains("xml pi block")) xmlNode = node; if(nodeName == "html") htmlNode = node; @@ -116,7 +116,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse headNode = node; if(nodeName == "body") bodyNode = node; - if(nodeName == "!doctype" || nodeName.contains("dtd block")) + if(nodeName == "!doctype" || nodeName.tqcontains("dtd block")) doctypeNode = node; if(nodeName == "title") titleNode = node; @@ -219,7 +219,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cssStylesheet->setMode(KFile::File | KFile::ExistingOnly ); baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory()); QuantaCommon::setUrl(url, linkNode->tag->attributeValue(index)); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); cssStylesheet->setURL(url.url()); } } @@ -285,10 +285,10 @@ void htmlDocumentProperties::loadCSS(Node *node) if(node->tag->type == Tag::ScriptStructureBegin) { selector = node->tag->tagStr(); - selector = selector.left((uint)selector.find("{")).stripWhiteSpace(); + selector = selector.left((uint)selector.tqfind("{")).stripWhiteSpace(); if(node->child) item = new NodeLinkedViewItem(cssRules, selector, - node->child->tag->tagStr().replace('\n'," ")); + node->child->tag->tagStr().tqreplace('\n'," ")); else item = new NodeLinkedViewItem(cssRules, selector, ""); item->node = node; @@ -537,7 +537,7 @@ void htmlDocumentProperties::accept() QuantaCommon::setUrl(url, cssStylesheet->url()); baseURL = view->document()->url(); baseURL.setPath(baseURL.directory()); - url = QExtFileInfo::toRelative(url, baseURL); + url = TQExtFileInfo::toRelative(url, baseURL); finalURL = url.url(); if (url.protocol() == view->document()->url().protocol()) finalURL.remove(0, url.protocol().length() + 1); @@ -594,7 +594,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) Node *allTheNodes, *lastHeadChild, *lastBodyChild, *lastHtmlChild; Node *n, *nextNode; bool htmlNodeCreated = false, bodyNodeCreated = false; - QTag *qHead, *qBody; + TQTag *qHead, *qBody; TQString tagName; if(headNode) @@ -602,7 +602,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) QuantaView *view = ViewManager::ref()->activeView(); - if(!xmlNode && view->document()->defaultDTD()->name.contains("XHTML", false)) + if(!xmlNode && view->document()->defaultDTD()->name.tqcontains("XHTML", false)) { //if the xml node is not present and the current DTD is a xhtml like, create it. allTheNodes = baseNode; @@ -618,7 +618,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) if(!doctypeNode) { //if the !doctype node is not present, create it - if(!view->document()->defaultDTD()->name.contains("XHTML", false)) + if(!view->document()->defaultDTD()->name.tqcontains("XHTML", false)) { allTheNodes = baseNode; baseNode = 0L; @@ -645,13 +645,13 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) //TODO: hardcoded //If it is XML, it add the namespace. - if(view->document()->defaultDTD()->name.contains("XHTML", false)) + if(view->document()->defaultDTD()->name.tqcontains("XHTML", false)) htmlNode->tag->editAttribute("xmlns", "http://www.w3.org/1999/xhtml"); htmlNode->child = allTheNodes; while(allTheNodes) { - allTheNodes->parent = htmlNode; + allTheNodes->tqparent = htmlNode; allTheNodes = allTheNodes->next; } htmlNodeCreated = true; @@ -685,7 +685,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) if(qHead->isChild(allTheNodes)) { /*//TODO:LOG this into the modif!! - allTheNodes->parent = headNode; + allTheNodes->tqparent = headNode; if(lastHeadChild) { lastHeadChild->next = allTheNodes; @@ -701,7 +701,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) else if(bodyNodeCreated && htmlNodeCreated && qBody->isChild(allTheNodes)) { //TODO:log!! - /**allTheNodes->parent = bodyNode; + /**allTheNodes->tqparent = bodyNode; if(lastBodyChild) { lastBodyChild->next = allTheNodes; @@ -717,7 +717,7 @@ void htmlDocumentProperties::addBasicNodes(NodeModifsSet *modifs) else { //TODO:log? no. - /**allTheNodes->parent = htmlNode; + /**allTheNodes->tqparent = htmlNode; lastHtmlChild->next = allTheNodes; allTheNodes->prev = lastHtmlChild; lastHtmlChild = allTheNodes;*/ diff --git a/quanta/parts/kafka/htmldocumentproperties.h b/quanta/parts/kafka/htmldocumentproperties.h index 3bcfdcb1..bc0c9423 100644 --- a/quanta/parts/kafka/htmldocumentproperties.h +++ b/quanta/parts/kafka/htmldocumentproperties.h @@ -45,12 +45,13 @@ public: class htmlDocumentProperties : public htmlDocumentPropertiesui { Q_OBJECT + TQ_OBJECT public: /** * @param forceInsertionOfBasicNodes Force the insertion of the basic Nodes (HTML, BODY, HEAD, ...) if pressing OK * without having made any changes. */ - htmlDocumentProperties( TQWidget* parent = 0, bool forceInsertionOfBasicNodes = false, + htmlDocumentProperties( TQWidget* tqparent = 0, bool forceInsertionOfBasicNodes = false, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~htmlDocumentProperties(); diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui index 6314ca62..e83d6303 100644 --- a/quanta/parts/kafka/htmldocumentpropertiesui.ui +++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>htmlDocumentPropertiesui</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>htmlDocumentPropertiesui</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QListView" row="0" column="0"> + <widget class="TQListView" row="0" column="0"> <column> <property name="text"> <string>Column 1</string> @@ -42,7 +42,7 @@ <property name="name"> <cstring>listView1</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>0</width> <height>0</height> @@ -63,7 +63,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -79,7 +79,7 @@ <string>Current DTD: </string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -95,7 +95,7 @@ <string>Title: </string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class="TQLabel" row="8" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -111,7 +111,7 @@ <string>Link CSS stylesheet:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -137,14 +137,14 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>86</height> </size> </property> </spacer> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -170,7 +170,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>84</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>226</width> <height>21</height> @@ -220,7 +220,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> @@ -374,7 +374,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>0</height> @@ -393,7 +393,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>250</width> <height>0</height> @@ -441,16 +441,16 @@ <tabstop>ok</tabstop> <tabstop>cancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot access="protected" specifier="pure virtual">newMetaItem()</slot> <slot access="protected" specifier="pure virtual">deleteCurrentMetaItem()</slot> <slot access="protected" specifier="pure virtual">newCSSRule()</slot> <slot access="protected" specifier="pure virtual">editCSSRule()</slot> <slot access="protected" specifier="pure virtual">deleteCurrentCSSRule()</slot> - <slot access="protected" specifier="pure virtual">titleChanged(const QString &)</slot> - <slot access="protected" specifier="pure virtual">metaChanged(QListViewItem * )</slot> - <slot access="protected" specifier="pure virtual">CSSChanged(QListViewItem * )</slot> - <slot access="protected" specifier="pure virtual">linkChanged( const QString& )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot access="protected" specifier="pure virtual">titleChanged(const TQString &)</slot> + <slot access="protected" specifier="pure virtual">metaChanged(TQListViewItem * )</slot> + <slot access="protected" specifier="pure virtual">CSSChanged(TQListViewItem * )</slot> + <slot access="protected" specifier="pure virtual">linkChanged( const TQString& )</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/parts/kafka/htmlenhancer.cpp b/quanta/parts/kafka/htmlenhancer.cpp index d900d77d..3f757a48 100644 --- a/quanta/parts/kafka/htmlenhancer.cpp +++ b/quanta/parts/kafka/htmlenhancer.cpp @@ -47,7 +47,7 @@ HTMLEnhancer::~HTMLEnhancer() delete m_stddirs; } -bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode) +bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode) { DOM::Node domNode, domNode2, attr, *ptDomNode; bool tbody, goUp; @@ -64,7 +64,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next { baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory()); QuantaCommon::setUrl(url, domNode.nodeValue().string()); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); domNode.setNodeValue(url.url()); #ifdef HEAVY_DEBUG kdDebug(25001)<< "HTMLTranslator::translateNode() - new src : " << url.url() << endl; @@ -80,7 +80,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next { baseURL.setPath(ViewManager::ref()->activeDocument()->url().directory()); QuantaCommon::setUrl(url, domNode.nodeValue().string()); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); domNode.setNodeValue(url.url()); #ifdef HEAVY_DEBUG kdDebug(25001)<< "HTMLTranslator::translateNode() - new href : " << url.url() << endl; @@ -91,7 +91,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next //THEN if it is the style element, add a DOM::Node::TEXT_NODE child gathering all the CSS //by default, the parser parse it as a script, which can't be translated in DOM::Nodes. if((node->tag->type == Tag::XmlTag && node->tag->name.lower() == "style") || - (node->tag->type == Tag::ScriptTag && node->tag->name.lower().contains("style") != 0)) + (node->tag->type == Tag::ScriptTag && node->tag->name.lower().tqcontains("style") != 0)) { //If the style Node doesn't exists, create it if(!node->rootNode()) @@ -126,13 +126,13 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next } } - QTag* qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(), - parentDNode.nodeName().string()); + TQTag* qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(), + tqparentDNode.nodeName().string()); - //THEN replace, if asked, scripts by a little icon. + //THEN tqreplace, if asked, scripts by a little icon. if(node->tag->type == Tag::ScriptTag && m_showIconForScripts && qTag->isChild("IMG", false)) { - script = node->tag->name.left(node->tag->name.find("block", 0, false) - 1).lower(); + script = node->tag->name.left(node->tag->name.tqfind("block", 0, false) - 1).lower(); #ifdef LIGHT_DEBUG kdDebug(25001)<< "HTMLTranslator::translateNode() - BLOCK:" << script << ":" << endl; #endif @@ -160,7 +160,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next kafkaCommon::editDomNodeAttribute(domNode, "img", m_wkafkapart->defaultDTD(), "title", text, m_wkafkapart->getKafkaWidget()->document()); - if(!kafkaCommon::insertDomNode(domNode, parentDNode, nextDNode)) + if(!kafkaCommon::insertDomNode(domNode, tqparentDNode, nextDNode)) return false; m_wkafkapart->connectDomNodeToQuantaNode(domNode, node); } @@ -196,7 +196,7 @@ bool HTMLEnhancer::enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node next kafkaCommon::editDomNodeAttribute(domNode, "img", m_wkafkapart->defaultDTD(), "title", text, m_wkafkapart->getKafkaWidget()->document()); - if(!kafkaCommon::insertDomNode(domNode, parentDNode, nextDNode)) + if(!kafkaCommon::insertDomNode(domNode, tqparentDNode, nextDNode)) return false; m_wkafkapart->connectDomNodeToQuantaNode(domNode, node); } @@ -282,13 +282,13 @@ void HTMLEnhancer::postEnhanceNode(DOM::Node domNode) { DOM::Node textNode; kNodeAttrs *props; - QTag *qTag; + TQTag *qTag; bool isInline; if(domNode.isNull()) return; - //If domNode is a Block and there is no text around, and if domNode's parent can handle + //If domNode is a Block and there is no text around, and if domNode's tqparent can handle //text or a P tag, add an empty text DOM::Node // so that the user can access this area. qTag = QuantaCommon::tagFromDTD(m_wkafkapart->getCurrentDoc()->defaultDTD(), diff --git a/quanta/parts/kafka/htmlenhancer.h b/quanta/parts/kafka/htmlenhancer.h index 29ebe82f..73c62251 100644 --- a/quanta/parts/kafka/htmlenhancer.h +++ b/quanta/parts/kafka/htmlenhancer.h @@ -47,10 +47,10 @@ public: * The DOM::Node must be built before calling this * function. * @param node The Node we want to enhance. - * @param parentDNode the parent DOM::Node of the root DOM::Node of node. + * @param tqparentDNode the tqparent DOM::Node of the root DOM::Node of node. * @param nextDNode the DOM::Node next to the root DOM::Node of node. */ - virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode); + virtual bool enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode); /** * This functions is called once the whole DOM::Node tree is built. It will add empty diff --git a/quanta/parts/kafka/kafkacommon.cpp b/quanta/parts/kafka/kafkacommon.cpp index 5d4c5714..0d15ca02 100644 --- a/quanta/parts/kafka/kafkacommon.cpp +++ b/quanta/parts/kafka/kafkacommon.cpp @@ -52,9 +52,9 @@ Node *kafkaCommon::getNextNode(Node *node, bool &goUp, Node *endNode) } else { - if(node->parent == endNode) + if(node->tqparent == endNode) return 0L; - return getNextNode(node->parent, goUp); + return getNextNode(node->tqparent, goUp); } } else @@ -74,9 +74,9 @@ Node *kafkaCommon::getNextNode(Node *node, bool &goUp, Node *endNode) else { goUp = true; - if(node->parent == endNode) + if(node->tqparent == endNode) return 0L; - return getNextNode(node->parent, goUp); + return getNextNode(node->tqparent, goUp); } } } @@ -119,7 +119,7 @@ Node* kafkaCommon::getPrevNode(Node *node, Node *endNode) } else { - n = n->parent; + n = n->tqparent; if(n == endNode) return 0L; } @@ -171,13 +171,13 @@ Node* kafkaCommon::DTDGetCommonParent(Node* startNode, Node* endNode, if(commonParent && (commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty)) { Node* oldCommonParent = commonParent; - commonParent = commonParent->parent; + commonParent = commonParent->tqparent; commonParentStartChild = oldCommonParent; commonParentEndChild = oldCommonParent; } //startNode or endNode can't be the commonParent. else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())) - commonParent = commonParent->parent; + commonParent = commonParent->tqparent; commonParentStartChildLocation = getLocation(commonParentStartChild); commonParentEndChildLocation = getLocation(commonParentEndChild); @@ -222,18 +222,18 @@ Node* kafkaCommon::DTDGetNonInlineCommonParent(Node* startNode, Node* endNode, commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty)) { Node* oldCommonParent = commonParent; - commonParent = commonParent->parent; + commonParent = commonParent->tqparent; while(commonParent && isInline(commonParent->tag->name)) { oldCommonParent = commonParent; - commonParent = commonParent->parent; + commonParent = commonParent->tqparent; } commonParentStartChild = oldCommonParent; commonParentEndChild = oldCommonParent; } //startNode or endNode can't be the commonParent. else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())) - commonParent = commonParent->parent; + commonParent = commonParent->tqparent; commonParentStartChildLocation = getLocation(commonParentStartChild); commonParentEndChildLocation = getLocation(commonParentEndChild); @@ -365,7 +365,7 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod kdDebug(25001)<< "kafkaCommon::applyIndentation()" << endl; #endif - Node *parent, *nextNE, *prevNE, *realPrevNE, *realNextNE, *realPrev, *realNext, *prev, *next; + Node *tqparent, *nextNE, *prevNE, *realPrevNE, *realNextNE, *realPrev, *realNext, *prev, *next; int nonInlineDepth = 0, nonInlineDepth2 = 0, i; bool b = false; TQString indentation1, indentation2, text; @@ -383,12 +383,12 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod realNext = node->next; if(inlineNodeIndentation && - !node->prev && getNodeDisplay(node->parent, true) == kafkaCommon::blockDisplay) + !node->prev && getNodeDisplay(node->tqparent, true) == kafkaCommon::blockDisplay) { AreaStruct node_area = node->tag->area(); - AreaStruct parent_area = node->parent->tag->area(); + AreaStruct tqparent_area = node->tqparent->tag->area(); - if(node_area.bLine == parent_area.bLine) + if(node_area.bLine == tqparent_area.bLine) { node->tag->setIndentationDone(true); return; @@ -400,30 +400,30 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod setTagString(node, removeUnnecessaryWhitespaces(node->tag->tagStr()), modifs); //compute the "non-inline depth" of the Node and of the next NE (not Empty) Node - // i.e. we count how many non-inline parent they have. - parent = node->parent; - while(parent) + // i.e. we count how many non-inline tqparent they have. + tqparent = node->tqparent; + while(tqparent) { - if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) + if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) ++nonInlineDepth; - parent = parent->parent; + tqparent = tqparent->tqparent; } //compute the "non-inline depth" of the next non-empty Node. if (nextNE) - parent = nextNE->parent; + tqparent = nextNE->tqparent; else - parent = 0L; - while(parent) + tqparent = 0L; + while(tqparent) { - if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) + if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) ++nonInlineDepth2; - parent = parent->parent; + tqparent = tqparent->tqparent; } - parent = node->parent; + tqparent = node->tqparent; - if(!parent || getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) + if(!tqparent || getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) { //prepare the indentation indentation1 = "\n"; @@ -507,7 +507,7 @@ void kafkaCommon::applyIndentation(Node *node, int nbOfSpaces, int nbOfTabs, Nod } else { - //The parent is inline, so no indentation. + //The tqparent is inline, so no indentation. //Nothing to do. } node->tag->setIndentationDone(true); @@ -519,7 +519,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) kdDebug(25001)<< "kafkaCommon::fitIndentationNodes()" << endl; #endif - Node *parent, *child, *node, *emptyNode = 0L, *emptyNode2 = 0L; + Node *tqparent, *child, *node, *emptyNode = 0L, *emptyNode2 = 0L; int nbEmptyNodes = 0, n1Depth, n2Depth; bool lastChild = false, firstChild = false; @@ -534,16 +534,16 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) if(n1Depth > n2Depth) { child = n1; - parent = n2; + tqparent = n2; } else { child = n2; - parent = n1; + tqparent = n1; } - if(child->parent->firstChildNE() == child) + if(child->tqparent->firstChildNE() == child) firstChild = true; - if(child->parent->lastChildNE() == child) + if(child->tqparent->lastChildNE() == child) lastChild = true; //counting the Empty Nodes and deleting them to have only one empty node. @@ -591,11 +591,11 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) //adding/deleting a empty node if necessary if(firstChild) { - if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) + if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) { if(child->tag->type != Tag::Text && !emptyNode) { - createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->parent, + createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->tqparent, child, child, modifs); } } @@ -610,11 +610,11 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) if(lastChild) { - if(getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) + if(getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) { if(child->tag->type != Tag::Text && !emptyNode2) { - createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->parent, + createAndInsertNode("", "", Tag::Empty, n2->tag->write(), child->tqparent, 0L, 0L, modifs); } } @@ -654,8 +654,8 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) } //adding/deleting a empty node if necessary - parent = n1->parent; - if(!parent || getNodeDisplay(parent, true) == kafkaCommon::blockDisplay) + tqparent = n1->tqparent; + if(!tqparent || getNodeDisplay(tqparent, true) == kafkaCommon::blockDisplay) { if(getNodeDisplay(n1, true) == kafkaCommon::blockDisplay && n1->tag->type != Tag::Text) @@ -672,7 +672,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) } else { - createAndInsertNode("", "", Tag::Empty, n2->tag->write(), parent, n2, n2, modifs); + createAndInsertNode("", "", Tag::Empty, n2->tag->write(), tqparent, n2, n2, modifs); } } } @@ -694,7 +694,7 @@ void kafkaCommon::fitIndentationNodes(Node *n1, Node *n2, NodeModifsSet *modifs) } else { - createAndInsertNode("", "", Tag::Empty, n2->tag->write(), parent, n2, n2, modifs); + createAndInsertNode("", "", Tag::Empty, n2->tag->write(), tqparent, n2, n2, modifs); } } } @@ -770,7 +770,7 @@ int kafkaCommon::getNodeDisplay(Node *node, bool closingNodeToo) closingNodeToo)) { //If we areusing a non (X)HTML DTD, make everything blockDisplay by default - if(node->tag->dtd() && node->tag->dtd()->name.contains("HTML", false) == 0) + if(node->tag->dtd() && node->tag->dtd()->name.tqcontains("HTML", false) == 0) return kafkaCommon::blockDisplay; nodeName = node->tag->name.lower(); @@ -948,7 +948,7 @@ Node *kafkaCommon::createXmlDeclarationNode(Document *doc, const TQString &encod Node* kafkaCommon::createMandatoryNodeSubtree(Node *node, Document *doc) { - QTag *nodeQTag, *oldNodeQTag; + TQTag *nodeTQTag, *oldNodeTQTag; bool searchForMandatoryNode; Node *currentParent; TQMap<TQString, bool>::iterator it; @@ -956,28 +956,28 @@ Node* kafkaCommon::createMandatoryNodeSubtree(Node *node, Document *doc) if(!node) return 0L; - nodeQTag = QuantaCommon::tagFromDTD(node); - if(!nodeQTag) + nodeTQTag = QuantaCommon::tagFromDTD(node); + if(!nodeTQTag) return false; searchForMandatoryNode = true; currentParent = node; while(searchForMandatoryNode) { - oldNodeQTag = nodeQTag; - for(it = nodeQTag->childTags.begin(); it != nodeQTag->childTags.end(); ++it) + oldNodeTQTag = nodeTQTag; + for(it = nodeTQTag->childTags.begin(); it != nodeTQTag->childTags.end(); ++it) { if(it.data()) { - nodeQTag = QuantaCommon::tagFromDTD(nodeQTag->parentDTD, it.key()); - if(!nodeQTag) + nodeTQTag = QuantaCommon::tagFromDTD(nodeTQTag->tqparentDTD, it.key()); + if(!nodeTQTag) return node; - currentParent = createAndInsertNode(nodeQTag->name(), "", Tag::XmlTag, doc, + currentParent = createAndInsertNode(nodeTQTag->name(), "", Tag::XmlTag, doc, currentParent, 0L, 0L, (NodeModifsSet*)0L); break; } } - if(oldNodeQTag == nodeQTag) + if(oldNodeTQTag == nodeTQTag) searchForMandatoryNode = false; } @@ -998,7 +998,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, if(!node) return 0L; - //Reset the listviews items pointers for node and its children + //Reset the listviews items pointers for node and its tqchildren n = node; b = false; while(n) @@ -1028,7 +1028,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, nodeIsFirstChild = true; parentNode->child = node; } - node->parent = parentNode; + node->tqparent = parentNode; if(nextSibling && nextSibling->prev) { @@ -1099,7 +1099,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N if(!node) return 0L; - //Reset the listviews items pointers for node and its children + //Reset the listviews items pointers for node and its tqchildren n = node; b = false; while(n) @@ -1129,7 +1129,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N nodeIsFirstChild = true; parentNode->child = node; } - node->parent = parentNode; + node->tqparent = parentNode; if(nextSibling && nextSibling->prev) { @@ -1186,7 +1186,7 @@ Node* kafkaCommon::insertNode(Node *node, Node* parentNode, Node* nextSibling, N return node; } -Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, Node *nextEndSibling, +Node *kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs, bool merge) { #ifdef LIGHT_DEBUG @@ -1199,7 +1199,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, No return 0L; //place the new Node. - newNode = insertNode(newNode, parent, nextSibling, modifs, merge); + newNode = insertNode(newNode, tqparent, nextSibling, modifs, merge); if(!newNode->tag->single && newNode->tag->type == Tag::XmlTag) { @@ -1208,7 +1208,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, No nodeEnd->closesPrevious = true; //place the new closing Node. - nodeEnd = insertNode(nodeEnd, parent, nextEndSibling, modifs, merge); + nodeEnd = insertNode(nodeEnd, tqparent, nextEndSibling, modifs, merge); } //If nextSibling != nextEndSibling, move all Nodes between node and nodeEnd as child of node @@ -1222,7 +1222,7 @@ Node *kafkaCommon::insertNode(Node *newNode, Node *parent, Node *nextSibling, No return newNode; } -Node* kafkaCommon::insertNode(Node *newNode, Node *parent, Node *startNodeToSurround, +Node* kafkaCommon::insertNode(Node *newNode, Node *tqparent, Node *startNodeToSurround, Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs) { #ifdef LIGHT_DEBUG @@ -1246,7 +1246,7 @@ Node* kafkaCommon::insertNode(Node *newNode, Node *parent, Node *startNodeToSurr endNodeToSurround = endNodeToSurround->next; //Then create and insert the new Node. - return insertNode(newNode, parent, startNodeToSurround, + return insertNode(newNode, tqparent, startNodeToSurround, endNodeToSurround, modifs); } @@ -1389,13 +1389,13 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti { *cursorNode = newNode; cursorOffset = newNode->tag->tagStr().length(); - return insertNodeSubtree(newNode, startNode->parent, endNode, modifs); + return insertNodeSubtree(newNode, startNode->tqparent, endNode, modifs); } //Then we "split" the lastValidStartParent - startNode subtree into two : the first part is untouched // and the second will be surrounded by the new Node. Same thing for endNode. Node* node = startNode; - Node* parentNode = startNode->parent; + Node* parentNode = startNode->tqparent; Node* newParentNode = 0, *child = 0, *next = 0; while(parentNode && commonParent && parentNode != commonParent) { @@ -1404,10 +1404,10 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and //all its next sibling as child of the new parentNode. /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(), - parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(), + parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(), parentNode, parentNode, modifs);*/ newParentNode = duplicateNode(parentNode); - insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs); + insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs); child = parentNode->firstChild(); if(cursorOffset != 0) { @@ -1433,13 +1433,13 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti } //commonParentStartChild = parentNode; node = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } if(endNode) { node = endNode; - parentNode = endNode->parent; + parentNode = endNode->tqparent; while(parentNode && commonParent && parentNode != commonParent) { if(true/*node != parentNode->firstChild()*/) @@ -1447,10 +1447,10 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and //all its next sibling as child of the new parentNode. /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(), - parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(), + parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(), parentNode, parentNode, modifs);*/ newParentNode = duplicateNode(parentNode); - insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs); + insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs); child = parentNode->firstChild(); while(child /*&& child == endNode*/ && (child == endNode || child->hasForChild(endNode)/* || @@ -1464,7 +1464,7 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti commonParentStartChild = newParentNode; node = parentNode; Node* aux = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; // Remove node subtree if empty if(!aux->hasChildNodes()) extractAndDeleteNode(aux, modifs); @@ -1487,8 +1487,8 @@ Node* kafkaCommon::DTDInsertNodeSubtree(Node *newNode, NodeSelectionInd& selecti Node* kafkaCommon::DTDInsertNodeSubtree(Node* newNode, Node* parentNode, Node* nextSibling, NodeSelection& /*cursorHolder*/, NodeModifsSet *modifs) { - QTag* nodeQTag = QuantaCommon::tagFromDTD(parentNode); - if(!nodeQTag || !nodeQTag->isChild(newNode)) + TQTag* nodeTQTag = QuantaCommon::tagFromDTD(parentNode); + if(!nodeTQTag || !nodeTQTag->isChild(newNode)) return 0; else return insertNodeSubtree(newNode, parentNode, nextSibling, modifs); @@ -1506,7 +1506,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, Node *commonParent = 0L, *commonParentStartChild, *commonParentEndChild, *parentNode, *node; Node *lastValidStartParent = 0L, *lastValidEndParent = 0L, *newParentNode, *child, *next; Node *oldCommonParent, *lastNewNode, *oldParentNode; - QTag *parentNodeQTag = 0, *newNodeQTag, *lastNewNodeQTag; + TQTag *parentNodeTQTag = 0, *newNodeTQTag, *lastNewNodeTQTag; NodeModif modif; int locOffset = 1; bool newNodeIsInline, isAfter; @@ -1519,16 +1519,16 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, //FIrst get the mandatory Nodes if necessary, and get the qTag of the first and last Node. lastNewNode = createMandatoryNodeSubtree(newNode, doc); - lastNewNodeQTag = QuantaCommon::tagFromDTD(lastNewNode); - newNodeQTag = QuantaCommon::tagFromDTD(newNode); - if(!newNodeQTag || !lastNewNodeQTag) + lastNewNodeTQTag = QuantaCommon::tagFromDTD(lastNewNode); + newNodeTQTag = QuantaCommon::tagFromDTD(newNode); + if(!newNodeTQTag || !lastNewNodeTQTag) { Node::deleteNode(newNode); return false; } - //Then search for the common parent of startNode and endNode (commonParent) - //and for the childs of commonParent which are parent of startNode and endNode + //Then search for the common tqparent of startNode and endNode (commonParent) + //and for the childs of commonParent which are tqparent of startNode and endNode //(commonParentStartChild && commonParentEndChild) //CommonParent will be the limit (startNode -- commonNode) where Nodes can //be splitted in order to insert the newNode. @@ -1559,51 +1559,51 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, commonParent->tag->type == Tag::Text || commonParent->tag->type == Tag::Empty)) { oldCommonParent = commonParent; - commonParent = commonParent->parent; + commonParent = commonParent->tqparent; while(commonParent && isInline(commonParent->tag->name)) { oldCommonParent = commonParent; - commonParent = commonParent->parent; + commonParent = commonParent->tqparent; } commonParentStartChild = oldCommonParent; commonParentEndChild = oldCommonParent; } //startNode or endNode can't be the commonParent. else if(commonParent && (itStart == startNodeLocation.end() || itEnd == endNodeLocation.end())) - commonParent = commonParent->parent; + commonParent = commonParent->tqparent; - //Now look if at least one of the parent Nodes between startNode and commonParent + //Now look if at least one of the tqparent Nodes between startNode and commonParent //can have nodeName as child. If so for startNode and endNode, let's find the last - //parent Nodes which can have nodeName as child. - parentNode = startNode->parent; + //tqparent Nodes which can have nodeName as child. + parentNode = startNode->tqparent; oldParentNode = startNode; - while(parentNode && commonParent && parentNode != commonParent->parent) + while(parentNode && commonParent && parentNode != commonParent->tqparent) { - parentNodeQTag = QuantaCommon::tagFromDTD(parentNode); - if(parentNodeQTag && parentNodeQTag->isChild(newNode) && - lastNewNodeQTag->isChild(oldParentNode)) + parentNodeTQTag = QuantaCommon::tagFromDTD(parentNode); + if(parentNodeTQTag && parentNodeTQTag->isChild(newNode) && + lastNewNodeTQTag->isChild(oldParentNode)) lastValidStartParent = parentNode; else if(newNodeIsInline || !isInline(parentNode->tag->name)) break; //else if(!newNodeIsInline && isInline(parentNode)), we continue : BLOCK element can //cut some inline tag in order to be inserted. oldParentNode = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } - parentNode = endNode->parent; + parentNode = endNode->tqparent; oldParentNode = endNode; - while(parentNode && commonParent && parentNode != commonParent->parent) + while(parentNode && commonParent && parentNode != commonParent->tqparent) { - parentNodeQTag = QuantaCommon::tagFromDTD(parentNode); - if(parentNodeQTag && parentNodeQTag->isChild(newNode) && - lastNewNodeQTag->isChild(oldParentNode)) + parentNodeTQTag = QuantaCommon::tagFromDTD(parentNode); + if(parentNodeTQTag && parentNodeTQTag->isChild(newNode) && + lastNewNodeTQTag->isChild(oldParentNode)) lastValidEndParent = parentNode; else if(newNodeIsInline || !isInline(parentNode->tag->name)) break; //else if(!newNodeIsInline && isInline(parentNode)), we continue : BLOCK element can //cut some inline tag in order to be inserted. oldParentNode = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } /**if(!lastValidEndParent || !lastValidStartParent) @@ -1662,7 +1662,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, node = startNode; if (!startNode) //Andras: it can happen. return false; - parentNode = startNode->parent; + parentNode = startNode->tqparent; while(lastValidStartParent && parentNode && parentNode != lastValidStartParent) { if(node != parentNode->firstChild()) @@ -1670,10 +1670,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, //node is not the first Child of parentNode, we have to duplicate parentNode, and put node and //all its next sibling as child of the new parentNode. /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(), - parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(), + parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(), parentNode, parentNode, modifs);*/ newParentNode = duplicateNode(parentNode); - insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs); + insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs); child = parentNode->firstChild(); while(child && child != startNode && !child->hasForChild(startNode)) { @@ -1683,10 +1683,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, } } node = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } node = endNode; - parentNode = endNode->parent; + parentNode = endNode->tqparent; while(lastValidEndParent && parentNode && parentNode != lastValidEndParent) { if(node != parentNode->lastChild()) @@ -1694,10 +1694,10 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, //node is not the last Child of parentNode, we have to duplicate parentNode, and put all //the next sibling of node as child of the new parentNode /**newParentNode = insertNode(parentNode->tag->name, parentNode->tag->tagStr(), - parentNode->tag->type, parentNode->tag->write(), parentNode->parentNode(), + parentNode->tag->type, parentNode->tag->write(), parentNode->tqparentNode(), parentNode, parentNode, modifs);*/ newParentNode = duplicateNode(parentNode); - insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs); + insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs); if(parentNode == commonParentStartChild) commonParentStartChild = newParentNode; if(parentNode == commonParentEndChild) @@ -1717,7 +1717,7 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, } } node = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } //Now if startNode is after endNode, this means that a selectionless insertion is being done. @@ -1728,19 +1728,19 @@ bool kafkaCommon::DTDinsertNode(Node *newNode, Node *startNode, int startOffset, (signed)startNode->tag->tagStr().length() == startOffset)) { if(isAfter) - parentNodeQTag = QuantaCommon::tagFromDTD(commonParent); + parentNodeTQTag = QuantaCommon::tagFromDTD(commonParent); else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTag) - parentNodeQTag = QuantaCommon::tagFromDTD(startNode); + parentNodeTQTag = QuantaCommon::tagFromDTD(startNode); else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTagEnd) - parentNodeQTag = QuantaCommon::tagFromDTD(startNode->parent); - if(!parentNodeQTag || (parentNodeQTag && parentNodeQTag->isChild(newNode))) + parentNodeTQTag = QuantaCommon::tagFromDTD(startNode->tqparent); + if(!parentNodeTQTag || (parentNodeTQTag && parentNodeTQTag->isChild(newNode))) { if(isAfter) insertNodeSubtree(newNode, commonParent, commonParentStartChild, modifs); else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTag) insertNodeSubtree(newNode, startNode, 0L, modifs); else if((signed)startNode->tag->tagStr().length() == startOffset && startNode->tag->type == Tag::XmlTagEnd) - insertNodeSubtree(newNode, startNode->parent, startNode->next, modifs); + insertNodeSubtree(newNode, startNode->tqparent, startNode->next, modifs); //<TEMPORARY> (*cursorNode) = lastNewNode; cursorOffset = 0; @@ -1798,7 +1798,7 @@ bool kafkaCommon::DTDinsertRemoveNode(Node *newNode, Node *startNode, int startO } Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString, - int nodeType, Document *doc, Node* parent, Node* nextSibling, NodeModifsSet *modifs, + int nodeType, Document *doc, Node* tqparent, Node* nextSibling, NodeModifsSet *modifs, bool merge) { #ifdef LIGHT_DEBUG @@ -1812,13 +1812,13 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString node = createNode(nodeName, tagString, nodeType, doc); //insert the new Node. - insertNode(node, parent, nextSibling, modifs, merge); + insertNode(node, tqparent, nextSibling, modifs, merge); return node; } Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString, - int nodeType, Document *doc, Node *parent, Node *nextSibling, Node *nextEndSibling, + int nodeType, Document *doc, Node *tqparent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs) { #ifdef LIGHT_DEBUG @@ -1832,13 +1832,13 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString node = createNode(nodeName, tagString, nodeType, doc); //insert the new Node. - insertNode(node, parent, nextSibling, nextEndSibling, modifs); + insertNode(node, tqparent, nextSibling, nextEndSibling, modifs); return node; } Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString &tagString, - int nodeType, Document *doc, Node *parent, Node *startNodeToSurround, + int nodeType, Document *doc, Node *tqparent, Node *startNodeToSurround, Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs) { #ifdef LIGHT_DEBUG @@ -1855,7 +1855,7 @@ Node *kafkaCommon::createAndInsertNode(const TQString &nodeName, const TQString node = createNode(nodeName, tagString, nodeType, doc); //insert the new Node. - insertNode(node, parent, startNodeToSurround, endNodeToSurround, startOffset, endOffset, + insertNode(node, tqparent, startNodeToSurround, endNodeToSurround, startOffset, endOffset, modifs); return node; @@ -1891,18 +1891,18 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode, NodeModifsSet *modifs) { - QTag *leafNodeQTag, *currentNodeParentQTag; + TQTag *leafNodeTQTag, *currentNodeParentTQTag; Node *startSelection = 0L, *endSelection = 0L, *oldCurrentNode, *copyNewNode; bool selectionInProgress = false, validCurNodeParent = false; - leafNodeQTag = QuantaCommon::tagFromDTD(leafNode); - if(!leafNodeQTag) + leafNodeTQTag = QuantaCommon::tagFromDTD(leafNode); + if(!leafNodeTQTag) return false; - if(currentNode && currentNode->parent) + if(currentNode && currentNode->tqparent) { - currentNodeParentQTag = QuantaCommon::tagFromDTD(currentNode->parent); - if(currentNodeParentQTag && currentNodeParentQTag->isChild(newNode)) + currentNodeParentTQTag = QuantaCommon::tagFromDTD(currentNode->tqparent); + if(currentNodeParentTQTag && currentNodeParentTQTag->isChild(newNode)) validCurNodeParent = true; } @@ -1924,7 +1924,7 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode, //if the examination has started and currentNode doesn't have endExaminationNode as //child, let's start/extend the selection over this node. if((currentNode->tag->type == Tag::XmlTag || currentNode->tag->type == Tag::Text) && - leafNodeQTag->isChild(currentNode) && validCurNodeParent && examinationStarted && + leafNodeTQTag->isChild(currentNode) && validCurNodeParent && examinationStarted && !currentNode->hasForChild(endExaminationNode)) { #ifdef HEAVY_DEBUG @@ -1986,10 +1986,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode, if (startSelection && endSelection) { /**copyNewNode = duplicateNode(newNode); - insertNode(copyNewNode, startSelection->parentNode(), startSelection, + insertNode(copyNewNode, startSelection->tqparentNode(), startSelection, endSelection->next, modifs);*/ copyNewNode = duplicateNodeSubtree(newNode); - insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection, + insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection, endSelection->next, modifs); nodeInserted = true; } @@ -2067,10 +2067,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode, if (startSelection && endSelection) { /**copyNewNode = duplicateNode(newNode); - insertNode(copyNewNode, startSelection->parentNode(), startSelection, + insertNode(copyNewNode, startSelection->tqparentNode(), startSelection, endSelection->next, modifs);*/ copyNewNode = duplicateNodeSubtree(newNode); - insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection, + insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection, endSelection->next, modifs); nodeInserted = true; } @@ -2097,10 +2097,10 @@ bool kafkaCommon::addNodeRecursively(Node *newNode, Node *leafNode, while(endSelection && endSelection->tag->type == Tag::Empty) endSelection = endSelection->prev; /**copyNewNode = duplicateNode(newNode); - insertNode(copyNewNode, startSelection->parentNode(), startSelection, + insertNode(copyNewNode, startSelection->tqparentNode(), startSelection, endSelection->next, modifs);*/ copyNewNode = duplicateNodeSubtree(newNode); - insertNodeSubtree(copyNewNode, startSelection->parentNode(), startSelection, + insertNodeSubtree(copyNewNode, startSelection->tqparentNode(), startSelection, endSelection->next, modifs); nodeInserted = true; } @@ -2184,7 +2184,7 @@ Node *kafkaCommon::duplicateNodeSubtree(Node *node, bool childAndClosingTagOnly) newPrev = 0L; for(link = nodeLinkList.first(); link; link = nodeLinkList.next()) { - if(link->m_n1 == currentNode->parent) + if(link->m_n1 == currentNode->tqparent) newParent = link->m_n2; else if(link->m_n1 == currentNode->next) newNext = link->m_n2; @@ -2217,7 +2217,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh { NodeModif *modif = 0, *modifChild; Node *lastChild, *curNode; - Node *parent, *next, *child, *n; + Node *tqparent, *next, *child, *n; //Node *prev; bool isSingle; int type; @@ -2231,7 +2231,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh if(!node->child) extractChildren = true; - parent = node->parent; + tqparent = node->tqparent; next = node->next; //prev = node->prev; //Should this be used at all? child = node->child; @@ -2252,7 +2252,7 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh modif->setType(NodeModif::NodeRemoved); modif->setLocation(getLocation(node)); - //log the children move if we don't extract the children + //log the tqchildren move if we don't extract the tqchildren if(!extractChildren) { location = getLocation(node); @@ -2284,18 +2284,18 @@ Node* kafkaCommon::extractNode(Node *node, NodeModifsSet *modifs, bool extractCh curNode = node->child; while(curNode) { - curNode->parent = node->parent; + curNode->tqparent = node->tqparent; curNode = curNode->next; } } - if(node->parent && node->parent->child == node) + if(node->tqparent && node->tqparent->child == node) { if(extractChildren) - node->parent->child = node->next; + node->tqparent->child = node->next; else - node->parent->child = node->child; + node->tqparent->child = node->child; } - node->parent = 0L; + node->tqparent = 0L; if(node->prev) { if(extractChildren) @@ -2643,7 +2643,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset, NodeModifsSet *modifs) { - QTag *nodeNameQTag, *parentQTag; + TQTag *nodeNameTQTag, *tqparentTQTag; Node *node, *lastNodeNameStartNode, *lastNodeNameEndNode; Node *parentNode, *newParentNode, *child, *next; bool goUp, nodesRemoved = false, DTDError = false, result; @@ -2653,8 +2653,8 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s return kafkaCommon::extractionBadParameters; //First check that nodeName is really inline and that an area is selected. - nodeNameQTag = QuantaCommon::tagFromDTD(doc->defaultDTD(), nodeName); - if(!nodeNameQTag) + nodeNameTQTag = QuantaCommon::tagFromDTD(doc->defaultDTD(), nodeName); + if(!nodeNameTQTag) return kafkaCommon::extractionBadParameters; if(!isInline(nodeName)) return kafkaCommon::extractionBadParameters; @@ -2671,8 +2671,8 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s if(startNode == endNode && startOffset == endOffset) return kafkaCommon::extractionBadParameters; - //Then, process startNode and endNode : look if a nodeName parent is one of - //startNode/endNode's inline parents and if it is the case, split the necessary Nodes. + //Then, process startNode and endNode : look if a nodeName tqparent is one of + //startNode/endNode's inline tqparents and if it is the case, split the necessary Nodes. //The comparaison is made in lowercase, even in xml : it could be strange, for an user, to have //its nodes not removed because there are in the wrong case. node = startNode; @@ -2681,7 +2681,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s { if(node->tag->name.lower() == nodeName.lower()) lastNodeNameStartNode = node; - node = node->parent; + node = node->tqparent; } node = endNode; lastNodeNameEndNode = 0L; @@ -2689,7 +2689,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s { if(node->tag->name.lower() == nodeName.lower()) lastNodeNameEndNode = node; - node = node->parent; + node = node->tqparent; } if(startNode->tag->type == Tag::Text) @@ -2724,13 +2724,13 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s if(lastNodeNameStartNode) { node = startNode; - parentNode = startNode->parent; - while(parentNode && parentNode != lastNodeNameStartNode->parent) + parentNode = startNode->tqparent; + while(parentNode && parentNode != lastNodeNameStartNode->tqparent) { if(node != parentNode->firstChild()) { newParentNode = duplicateNode(parentNode); - insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs); + insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs); child = parentNode->firstChild(); while(child && child != startNode && !child->hasForChild(startNode)) { @@ -2740,19 +2740,19 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s } } node = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } } if(lastNodeNameEndNode) { node = endNode; - parentNode = endNode->parent; - while(parentNode && parentNode != lastNodeNameEndNode->parent) + parentNode = endNode->tqparent; + while(parentNode && parentNode != lastNodeNameEndNode->tqparent) { if(node != parentNode->SLastChild()) { newParentNode = duplicateNode(parentNode); - insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs); + insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs); if(parentNode == lastNodeNameStartNode) lastNodeNameStartNode = newParentNode; child = parentNode->firstChild(); @@ -2770,7 +2770,7 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s } } node = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } } @@ -2782,13 +2782,13 @@ int kafkaCommon::DTDExtractNode(const TQString &nodeName, Document *doc, Node *s next = getNextNode(node, goUp); if(node->tag->type == Tag::XmlTag && node->tag->name.lower() == nodeName.lower()) { - parentQTag = QuantaCommon::tagFromDTD(node->parent); - if(parentQTag) + tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent); + if(tqparentTQTag) { child = node->firstChild(); while(child) { - if(!parentQTag->isChild(child)) + if(!tqparentTQTag->isChild(child)) DTDError = true; child = child->next; } @@ -2927,10 +2927,10 @@ bool kafkaCommon::splitNode(Node *n, int offset, NodeModifsSet *modifs) if(n->tag->type == Tag::Text) node = createAndInsertNode("#text", tagStr.right(tagStr.length() - offset), Tag::Text, n->tag->write(), - n->parent, n->next, modifs, false); + n->tqparent, n->next, modifs, false); else node = createAndInsertNode("", tagStr.right(tagStr.length() - offset), Tag::Empty, n->tag->write(), - n->parent, n->next, modifs, false); + n->tqparent, n->next, modifs, false); //Node's string is a part of n's clean string node->tag->setCleanStrBuilt(true); @@ -2944,14 +2944,14 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent, //Then we "split" the lastValidStartParent - startNode subtree into two : the first part is untouched // and the second will be surrounded by the new Node. Same thing for endNode. Node* node = startNode; - Node* parentNode = startNode->parent; + Node* parentNode = startNode->tqparent; Node* commonParentStartChild = 0; while(parentNode && commonParent && parentNode != commonParent) { if(node != parentNode->firstChild()) { Node* newParentNode = duplicateNode(parentNode); - insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs); + insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs); Node* child = parentNode->firstChild(); while(child && child != startNode && !child->hasForChild(startNode)) { @@ -2962,7 +2962,7 @@ void kafkaCommon::splitStartNodeSubtree(Node* startNode, Node* commonParent, } commonParentStartChild = parentNode; node = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } if(commonParentStartChild) @@ -2975,7 +2975,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent, bool subTree, NodeModifsSet* modifs) { Node* node = endNode; - Node* parentNode = endNode->parent; + Node* parentNode = endNode->tqparent; Node* aux = 0; if(subTree) @@ -2989,7 +2989,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent, if(node != parentNode->lastChild()) { Node* newParentNode = duplicateNode(parentNode); - insertNode(newParentNode, parentNode->parentNode(), parentNode, parentNode, modifs); + insertNode(newParentNode, parentNode->tqparentNode(), parentNode, parentNode, modifs); if(parentNode == commonParentStartChild) commonParentStartChild = newParentNode; if(parentNode == commonParentEndChild) @@ -3009,7 +3009,7 @@ void kafkaCommon::splitEndNodeSubtree(Node* endNode, Node* commonParent, } } node = parentNode; - parentNode = parentNode->parent; + parentNode = parentNode->tqparent; } commonParentStartChildLocation = getLocation(commonParentStartChild); commonParentEndChildLocation = getLocation(commonParentEndChild); @@ -3029,11 +3029,11 @@ void kafkaCommon::splitStartAndEndNodeSubtree(Node*& startNode, int startOffset, startNode = getCorrectStartNode(startNode, startOffset); endNode = getCorrectEndNode(endNode, endOffset); - // look for common parent + // look for common tqparent if(!commonParent) { if(extractInlineParentNodes) - // get the non inline common parent + // get the non inline common tqparent commonParent = DTDGetNonInlineCommonParent(startNode, endNode, commonParentStartChildLocation, commonParentEndChildLocation, subTree); else @@ -3075,7 +3075,7 @@ void kafkaCommon::splitStartAndEndNodeSubtree(Node*& startNode, int startOffset, } splitNode(endNode, endOffset, modifs); - // split start and end nodes subtree in function of common parent + // split start and end nodes subtree in function of common tqparent commonParentStartChildLocation = kafkaCommon::getLocation(commonParentStartChild); splitStartNodeSubtree(startNode, commonParent, commonParentStartChildLocation, modifs); @@ -3208,21 +3208,21 @@ bool kafkaCommon::mergeNodes(Node *n, Node *n2, NodeSelection& cursorHolder, Nod void kafkaCommon::mergeInlineNode(Node *startNode, Node *endNode, Node **cursorNode, long &cursorOffset, NodeModifsSet *modifs) { - Node *startNodeLastInlineParent, *parent, *node, *next; + Node *startNodeLastInlineParent, *tqparent, *node, *next; bool goUp, success, isCursorNode, isEndNode; int nodeLength; if(!startNode || !endNode) return; - //first search for the last inline parent of startNode, and then its last prev neighbour + //first search for the last inline tqparent of startNode, and then its last prev neighbour // which is also inline : the merge will start from this Node. startNodeLastInlineParent = startNode; - parent = startNode->parent; - while(parent && isInline(parent->tag->name)) + tqparent = startNode->tqparent; + while(tqparent && isInline(tqparent->tag->name)) { - startNodeLastInlineParent = parent; - parent = parent->parent; + startNodeLastInlineParent = tqparent; + tqparent = tqparent->tqparent; } if(startNodeLastInlineParent->prev) { @@ -3297,7 +3297,7 @@ void kafkaCommon::getEndPosition(const TQString &tagString, int bLine, int bCol, { /**int result, oldResult; - result = tagString.find("\n", 0); + result = tagString.tqfind("\n", 0); if(result == -1) { eLine = bLine; @@ -3310,7 +3310,7 @@ void kafkaCommon::getEndPosition(const TQString &tagString, int bLine, int bCol, { eLine++; oldResult = result; - result = tagString.find("\n", result + 1); + result = tagString.tqfind("\n", result + 1); } eCol = tagString.length() - oldResult - 2; }*/ @@ -3420,7 +3420,7 @@ TQValueList<int> kafkaCommon::getLocation(Node * node) node = node->prev; } loc.prepend(i); - node = node->parent; + node = node->tqparent; } return loc; } @@ -3634,11 +3634,11 @@ int kafkaCommon::nodeDepth(Node *node) if(!node) return -1; - node = node->parent; + node = node->tqparent; while(node) { depth++; - node = node->parent; + node = node->tqparent; } return depth; @@ -3646,12 +3646,12 @@ int kafkaCommon::nodeDepth(Node *node) Node* kafkaCommon::hasParent(Node *node, const TQString &name) { - node = node->parent; + node = node->tqparent; while(node) { if(node->tag->name.lower() == name.lower()) return node; - node = node->parent; + node = node->tqparent; } return 0L; @@ -3673,31 +3673,31 @@ Node* kafkaCommon::hasParent(Node* startNode, Node* endNode, const TQString &nam { if(node->tag->name.lower() == name.lower()) return node; - node = node->parent; + node = node->tqparent; } return 0; } -bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node nextSibling, +bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node nextSibling, DOM::Node rootNode) { if(node.isNull()) return false; - if(parent.isNull()) + if(tqparent.isNull()) { if(rootNode.isNull()) return false; - parent = rootNode; + tqparent = rootNode; } //Andras: avoid exceptions - if (!nextSibling.isNull() && nextSibling.parentNode() != parent) + if (!nextSibling.isNull() && nextSibling.parentNode() != tqparent) { kdDebug(25001)<< "kafkaCommon::insertDomNode() - invalid nextSibling!" << endl; return false; } - if (node.ownerDocument() != parent.ownerDocument()) + if (node.ownerDocument() != tqparent.ownerDocument()) { kdDebug(25001)<< "kafkaCommon::insertDomNode() - ownerDocument is different!" << endl; return false; @@ -3705,7 +3705,7 @@ bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node next try { - parent.insertBefore(node, nextSibling); + tqparent.insertBefore(node, nextSibling); } catch(DOM::DOMException e) { @@ -3716,12 +3716,12 @@ bool kafkaCommon::insertDomNode(DOM::Node node, DOM::Node parent, DOM::Node next bool kafkaCommon::removeDomNode(DOM::Node node) { - DOM::Node parent = node.parentNode(); + DOM::Node tqparent = node.parentNode(); - if(parent.isNull()) + if(tqparent.isNull()) return false; - parent.removeChild(node); + tqparent.removeChild(node); return true; } @@ -3733,7 +3733,7 @@ DOM::Node kafkaCommon::createDomNode(const TQString &nodeName, const DTDStruct* //this will change with the futur multi-DTDs support //It does not use exceptions handling, so everything is checked via the DTEP definitions. DOM::Node dn; - QTag *qTag = 0L; + TQTag *qTag = 0L; qTag = QuantaCommon::tagFromDTD(dtd, nodeName); @@ -3766,7 +3766,7 @@ DOM::Node kafkaCommon::createDomNodeAttribute(const TQString &nodeName, const DT const TQString &attrName, const TQString &attrValue, DOM::Document rootNode) { DOM::Node attr; - QTag *qTag = 0L; + TQTag *qTag = 0L; qTag = QuantaCommon::tagFromDTD(dtd, nodeName); if(!qTag) @@ -3908,24 +3908,24 @@ bool kafkaCommon::isInline(DOM::Node domNode) return isInline(domNode.nodeName().string()); } -bool kafkaCommon::parentSupports(DOM::Node parent, DOM::Node startNode, DOM::Node endNode, +bool kafkaCommon::tqparentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode, const DTDStruct* dtd) { - QTag *parentQTag; + TQTag *tqparentTQTag; DOM::Node child; - if(!dtd || parent.isNull()) + if(!dtd || tqparent.isNull()) return false; - parentQTag = QuantaCommon::tagFromDTD(dtd, parent.nodeName().string()); + tqparentTQTag = QuantaCommon::tagFromDTD(dtd, tqparent.nodeName().string()); - if(!parentQTag) + if(!tqparentTQTag) return false; child = startNode; while(!child.isNull()) { - if(!parentQTag->isChild(child.nodeName().string())) + if(!tqparentTQTag->isChild(child.nodeName().string())) return false; if(child == endNode) return true; @@ -3974,17 +3974,17 @@ void kafkaCommon::coutDomTree(DOM::Node, int) dots.fill('_', indent); output = dots; if (node.nodeType() != DOM::Node::TEXT_NODE) - output += node.nodeName().string().replace('\n'," "); + output += node.nodeName().string().tqreplace('\n'," "); else { output += "\""; - output+= node.nodeValue().string().replace('\n'," "); + output+= node.nodeValue().string().tqreplace('\n'," "); output += "\""; } kdDebug(25001) << output <<" (" << node.nodeType() << ") "<< node.handle() << endl; kdDebug(25001)<< dots << " +++ prev " << node.previousSibling().handle() << " next " << - node.nextSibling().handle() << " parent " << + node.nextSibling().handle() << " tqparent " << node.parentNode().handle() << " child " << node.firstChild().handle() << endl; for(j = 0; j < (int)node.attributes().length(); ++j) { @@ -4016,18 +4016,18 @@ void kafkaCommon::coutTree(Node *node, int indent) node->tag->endPos(eLine, eCol); if (node->tag->type == Tag::XmlTag || node->tag->type == Tag::XmlTagEnd || node->tag->type == Tag::ScriptTag) - output += node->tag->name.replace('\n',"<return>"); + output += node->tag->name.tqreplace('\n',"<return>"); else { output += "\""; - output+= node->tag->tagStr().replace('\n',"<return>"); + output+= node->tag->tagStr().tqreplace('\n',"<return>"); output += "\""; } kdDebug(25001) << output <<" (" << node->tag->type << ", " << node->tag->cleanStrBuilt() << ", " << node->tag->indentationDone() << ") "<< node << " at pos " << bLine << ":" << bCol << " - " << eLine << ":" << eCol << endl; - kdDebug(25001)<< dots << " +++ prev " << node->prev << " next " << node->next << " parent " << - node->parent << " child " << node->child << endl; + kdDebug(25001)<< dots << " +++ prev " << node->prev << " next " << node->next << " tqparent " << + node->tqparent << " child " << node->child << endl; for(j = 0; j < node->tag->attrCount(); ++j) { kdDebug(25001)<< dots << " *** attr" << j << " " << @@ -4069,13 +4069,13 @@ int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& t tag_start = hasParent(start_node, tag_name); if(tag_start) - return 0; // only start_node has tag_name as parent + return 0; // only start_node has tag_name as tqparent tag_start = hasParent(end_node, tag_name); if(tag_start) - return 0; // only end_node has tag_name as parent + return 0; // only end_node has tag_name as tqparent - return -1; // neither the nodes have tag_name as parent + return -1; // neither the nodes have tag_name as tqparent } int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& tag_name, @@ -4092,13 +4092,13 @@ int kafkaCommon::isInsideTag(Node* start_node, Node* end_node, TQString const& t tag_start = hasParent(start_node, tag_name); if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value) - return 0; // only start_node has tag_name as parent + return 0; // only start_node has tag_name as tqparent tag_start = hasParent(end_node, tag_name); if(tag_start && tag_start->tag->hasAttribute(attribute_name) && tag_start->tag->attributeValue(attribute_name, true) == attribute_value) - return 0; // only end_node has tag_name as parent + return 0; // only end_node has tag_name as tqparent - return -1; // neither the nodes have tag_name as parent + return -1; // neither the nodes have tag_name as tqparent } bool kafkaCommon::isBetweenWords(Node* node, int offset) diff --git a/quanta/parts/kafka/kafkacommon.h b/quanta/parts/kafka/kafkacommon.h index 7de7d77e..0a1d25bd 100644 --- a/quanta/parts/kafka/kafkacommon.h +++ b/quanta/parts/kafka/kafkacommon.h @@ -58,7 +58,7 @@ public: /** * This function returns the next Node after node : the first child of * node if available, else its next sibling if available, else the next - * available next sibling of a parent of node. + * available next sibling of a tqparent of node. * @param _node It is the Node from which we want the next Node. * @param goUp This boolean specifies if we should go up (torwards the root Node) * i.e. not looking at the childs of node, or make a standart iteration. @@ -87,20 +87,20 @@ public: /** - * Returns the first common parent to startNode and endNode that isn't inline. + * Returns the first common tqparent to startNode and endNode that isn't inline. * @param startNode Start node. * @param endNode End node. - * @param commonParentStartChildLocation Is the child of commonParent which is parent of startNode - * @param commonParentEndChildLocation Is the child of commonParent which is parent of endNode + * @param commonParentStartChildLocation Is the child of commonParent which is tqparent of startNode + * @param commonParentEndChildLocation Is the child of commonParent which is tqparent of endNode * @param nodeSubtree When startNode and endNode doesn't belong to the current document tree. Pass 0 if they do. - * @return The first, non inline, common parent of startNode and endNode. + * @return The first, non inline, common tqparent of startNode and endNode. */ static Node* DTDGetNonInlineCommonParent(Node* startNode, Node* endNode, TQValueList<int>& commonParentStartChildLocation, TQValueList<int>& commonParentEndChildLocation, Node* nodeSubtree); /** - * Same as above, only that the common parent can be inline. + * Same as above, only that the common tqparent can be inline. */ static Node* DTDGetCommonParent(Node* startNode, Node* endNode, TQValueList<int>& commonParentStartChildLocation, @@ -109,14 +109,14 @@ public: /** * This function returns the next DOM::Node after node : the first child of * DOM::Node if available, else its next sibling if available, else the next - * available next sibling of a parent of node. + * available next sibling of a tqparent of node. * @param node The DOM::Node the search starts from. * @param goUp This boolean specifies if we should go up or down in the tree. * For a normal use, It must be set to false at the * beginning and then the same boolean must be used when using * several times this function. * @param returnParentNode Specifies if there are no child and next sibling, if - * we should return the parent. + * we should return the tqparent. * @param endNode Specifies at which DOM::Node the search should end. It is useful * when setting returnParentNode to false. * @return the next Node. @@ -153,7 +153,7 @@ public: static Node* getCorrectEndNode(Node* endNode, int& endOffset); /** - * Get the first child of commonParent which is parent of node + * Get the first child of commonParent which is tqparent of node * @param node * @param commonParent * @return @@ -186,7 +186,7 @@ public: * generated by the undoRedo system. The undoRedo system can't create itself these Nodes * because it will create them only during the synchronization, making all the TQValueList<int> * Nodes location wrong. - * WARNING n1 and n2 must be siblings or parent-child. If there are sibling and n1 is a XmlTag, + * WARNING n1 and n2 must be siblings or tqparent-child. If there are sibling and n1 is a XmlTag, * n1 should not have non empty childs. * @param n1 The start node. * @param n2 The end node. @@ -290,29 +290,29 @@ public: * WARNING : baseNode is used as the rootNode. * It will also try to merge text/Empty Nodes. * @param node The node to insert. - * @param parentNode This Node will be the parent of node. + * @param tqparentNode This Node will be the tqparent of node. * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at - * the child list of parentNode. + * the child list of tqparentNode. * TODO: @param rootNode The rootNode of the tree we want to insert the Node (usually &baseNode). * @param modifs The changes made are logged into modifs. Put 0L if you don't want to log * and if you know what you're doing! * @param merge Try to merge with the siblings if possible. * @return Returns a pointer to the node inserted. */ - static Node* insertNode(Node *node, Node* parentNode, Node* nextSibling, + static Node* insertNode(Node *node, Node* tqparentNode, Node* nextSibling, NodeModifsSet *modifs/**, Node **rootNode*/, bool merge = true); - static Node* insertNode(Node *node, Node* parentNode, Node* nextSibling, NodeSelection& selection, + static Node* insertNode(Node *node, Node* tqparentNode, Node* nextSibling, NodeSelection& selection, NodeModifsSet *modifs, bool merge = true); /** * It behaves essentially like the above function except that it can "surround" a set of Nodes with the * new Node. Thus, the closing Node is created if necessary. - * nextSibling and nextEndSibling MUST have the same parent. If not, use the + * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the * DTDinsertNode. * This function does not try to know if the location of the new Node is DTD valid. * @param newNode The new Node to insert. - * @param parent The parent of the Node. + * @param tqparent The tqparent of the Node. * @param nextSibling The next sibling of the Node. * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling == * nextSibling, the closing Node will be placed at the right of the newly created Node. @@ -320,13 +320,13 @@ public: * @param modifs The changes made are logged into modifs. * @return Returns a pointer to the node inserted. */ - static Node *insertNode(Node *newNode, Node *parent, Node *nextSibling, Node *nextEndSibling, + static Node *insertNode(Node *newNode, Node *tqparent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs, bool merge = true); /** * It behaves essentially like the above function except that it can split the endNodeToSurround and * startNodeToSurround if necessary, according to the offsets. - * startNodeToSurround et endNodeToSurround MUST have the same parent. If not, use the last + * startNodeToSurround et endNodeToSurround MUST have the same tqparent. If not, use the last * DTDinsertNode. * This function does not try to know if the location of the new Node is valid. * @param startNodeToSurround The first Node which will be enclosed by the new Node. @@ -334,7 +334,7 @@ public: * @param startOffset The first Node will be splitted at offset startOffset, the right part will be enclosed. * @param endOffset The last Node will be splitted at offset endOffset, the left part will be enclosed. */ - static Node* insertNode(Node *newNode, Node *parent, Node *startNodeToSurround, + static Node* insertNode(Node *newNode, Node *tqparent, Node *startNodeToSurround, Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs); /** @@ -353,7 +353,7 @@ public: * @param cursorNode The cursor is inside cursorNode. * @param cursorOffset The offset of the cursor inside cursorNode. * </TEMPORARY> - * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid parent. + * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid tqparent. */ static bool DTDinsertNode(Node *newNode, Node *startNode, int startOffset, Node *endNode, int endOffset, Document *doc, Node **cursorNode, long &cursorOffset, NodeModifsSet *modifs); @@ -373,26 +373,26 @@ public: * WARNING : baseNode is used as the rootNode. * It will also try to merge text/Empty Nodes. * @param node The root node of the Node subtree to insert. - * @param parentNode This Node will be the parent of node. + * @param tqparentNode This Node will be the tqparent of node. * @param nextSibling This Node will be the next Sibling of Node. If null, node will be appended at - * the child list of parentNode. + * the child list of tqparentNode. * @param modifs The changes made are logged into modifs. Put 0L if you don't want to log * and if you know what you're doing! * @param merge Try to merge with the siblings if possible. * @return Returns a pointer to the node inserted. */ - static Node* insertNodeSubtree(Node *node, Node* parentNode, Node* nextSibling, + static Node* insertNodeSubtree(Node *node, Node* tqparentNode, Node* nextSibling, NodeModifsSet *modifs, bool merge = true); /** * It behaves essentially like the above function except that it can "surround" a set of Nodes with the * new Node. Thus, the closing Node is created if necessary. - * nextSibling and nextEndSibling MUST have the same parent. If not, use the + * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the * DTDinsertNode. - * The Node Subtree MUST be a single-Node-per-parent subtree. + * The Node Subtree MUST be a single-Node-per-tqparent subtree. * This function does not try to know if the location of the new Node is DTD valid. * @param node The root node of the Node subtree to insert. - * @param parent The parent of the Node. + * @param tqparent The tqparent of the Node. * @param nextSibling The next sibling of the Node. * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling == * nextSibling, the closing Node will be placed at the right of the newly created Node. @@ -401,7 +401,7 @@ public: * @param modifs The changes made are logged into modifs. * @return Returns a pointer to the node inserted. */ - static Node* insertNodeSubtree(Node *node, Node* parentNode, Node* nextSibling, + static Node* insertNodeSubtree(Node *node, Node* tqparentNode, Node* nextSibling, Node* nextEndSibling, NodeModifsSet *modifs, bool merge = true); /** @@ -414,7 +414,7 @@ public: static Node* DTDInsertNodeSubtree(Node *node, NodeSelectionInd& selection, Node **cursorNode, long& cursorOffset, NodeModifsSet *modifs); - static Node* DTDInsertNodeSubtree(Node* newNode, Node* parentNode, Node* nextSibling, + static Node* DTDInsertNodeSubtree(Node* newNode, Node* tqparentNode, Node* nextSibling, NodeSelection& cursorHolder, NodeModifsSet *modifs); /** @@ -425,17 +425,17 @@ public: * @param tagString The string of the tag. * @param nodeType The type of the Node cf Tag::TokenType. * @param doc The Node belongs to this Document. - * @param parent The parent of the Node. + * @param tqparent The tqparent of the Node. * @param nextSibling The next sibling of the Node. * @return Returns a pointer to the newly created Node. */ static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType, - Document *doc, Node* parent, Node* nextSibling, NodeModifsSet *modifs, bool merge = true); + Document *doc, Node* tqparent, Node* nextSibling, NodeModifsSet *modifs, bool merge = true); /** * It behaves essentially like the above function except that it reate its closing Node if necessary - * and then insert them with parent as Node's parent. - * nextSibling and nextEndSibling MUST have the same parent. If not, use the + * and then insert them with tqparent as Node's tqparent. + * nextSibling and nextEndSibling MUST have the same tqparent. If not, use the * DTDcreateAndInsertNode. * @param nextEndSibling The next sibling of the closing Node if created. If nextEndSibling == * nextSibling, the closing Node will be placed at the right of the newly created Node. @@ -443,11 +443,11 @@ public: * @param modifs The changes made are logged into modifs. */ static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType, - Document *doc, Node *parent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs); + Document *doc, Node *tqparent, Node *nextSibling, Node *nextEndSibling, NodeModifsSet *modifs); /** * It behaves essentially like the above function except that if necessary, it will split the Nodes. - * startNodeToSurround et endNodeToSurround MUST have the same parent. If not, use the + * startNodeToSurround et endNodeToSurround MUST have the same tqparent. If not, use the * DTDcreateAndInsertNode. * This function does not try to know if the location of the new Node is valid. * @param startNodeToSurround The first Node which will be enclosed by the new Node. @@ -456,7 +456,7 @@ public: * @param endOffset The last Node will be splitted at offset endOffset, the left part will be enclosed. */ static Node *createAndInsertNode(const TQString &nodeName, const TQString &tagString, - int nodeType, Document *doc, Node *parent, Node *startNodeToSurround, + int nodeType, Document *doc, Node *tqparent, Node *startNodeToSurround, Node *endNodeToSurround, int startOffset, int endOffset, NodeModifsSet *modifs); /** @@ -470,7 +470,7 @@ public: * @param startOffset If firstNode is a text, specify at which offset the new Node must begin to surround. * @param endNode The last Node which must be surrounded by the new Node. * @param endOffset If endNode is a text, specify at which offset the new Node must stop to surround. - * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid parent. + * @return Returns false if it wasn't possible to insert the tag because e.g. of an invalid tqparent. */ static bool DTDcreateAndInsertNode(const TQString &nodeName, const TQString &tagString, int nodeType, Document *doc, Node *startNode, int startOffset, Node *endNode, int endOffset, @@ -522,8 +522,8 @@ public: * This mean that the undo/redo system will delete it when necessary so don't reuse it!!!! * @param node The node to delete. * @param modifs The changes made are logged into modifs. - * @param extractChilds If we extract or move up the children. WARNING: it don't check - * if the children of node are legal childs of the parent of node. + * @param extractChilds If we extract or move up the tqchildren. WARNING: it don't check + * if the tqchildren of node are legal childs of the tqparent of node. * @param removeClosingTag Extract the closingTag if node isn't single and is Tag::XmlTag. * TODO: @param removeEmbeddedTags Specifies if we delete the embedded Nodes e.g. * <a href="<? boo ?>" > : the PHP block is an embedded block. @@ -544,7 +544,7 @@ public: /** * Extract a node subtree in the tree. WARNING This function will log that the nodes were added. - * This funtion not only extract the start node but also will extract inline parents. + * This funtion not only extract the start node but also will extract inline tqparents. * @param startNode The node from which we start the removal. * @param startOffset The offset of startNode from which we start the removal. * @param endNode The node from which we end the removal. @@ -576,7 +576,7 @@ public: * Get a node subtree from the tree. It is similar to extractNodeSubtree() * but it doesn't extract anything. * It's useful to get a copy of the Node subtree from a selection, for example. - * This funtion not only extract the start node but also will extract inline parents. + * This funtion not only extract the start node but also will extract inline tqparents. * @param startNode The starting Node. * @param startOffset If firstNode is a text, specify at which offset the new start Node will be splitted. * @param endNode The ending Node. @@ -588,12 +588,12 @@ public: /** * An enumeration of all the possible return states of DTDExtractNode */ - enum extractNodeStatus + enum extractNodetqStatus { //The node to extract was not found. nothingExtracted = 0, //The extract operation stopped because of a DTD error : if the node was removed, the child - //weren't able to be childs of the node's parent, according to the DTD. Should not occur + //weren't able to be childs of the node's tqparent, according to the DTD. Should not occur //except really bad HTML. extractionStoppedDueToBadNodes, //everything has gone fine @@ -619,7 +619,7 @@ public: * @param cursorOffset The offset of the cursor inside cursorNode. * </TEMPORARY> * @param modifs The usual modifs to log the modifications made for the undo/redo system. - * @return Returns a kafkaCommon::extractNodeStatus. + * @return Returns a kafkaCommon::extractNodetqStatus. */ static int DTDExtractNode(const TQString &nodeName, Document *doc, Node *startNode, int startOffset, Node *endNode, int endOffset, Node **cursorNode, long &cursorOffset, @@ -628,9 +628,9 @@ public: /** * Moves a Node somewhere else. * @param nodeToMove The node to move :-) - * @param newParent The new parent of nodeToMove. + * @param newParent The new tqparent of nodeToMove. * @param newNextSibling The new next Sibling of nodeToMove. If null, node will be appended at - * the child list of parentNode. + * the child list of tqparentNode. * @param modifs The changes made are logged into modifs. * @param merge Specifies if it should try to merge the Node at its new location. */ @@ -695,10 +695,10 @@ public: * @param startOffset * @param endNode The node where a selection ends, for example. * @param endOffset - * @param commonParent This is the common parent between start and end node. + * @param commonParent This is the common tqparent between start and end node. * If 0, it tries to find the commonParent, else it uses the passed node. - * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode is stored here. - * @param commonParentEndChildLocation The first child of commonParent which is parent of endNode is stored here. + * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode is stored here. + * @param commonParentEndChildLocation The first child of commonParent which is tqparent of endNode is stored here. * @param cursorNode The cursor node is stored here. * @param cursorOffset The cursor offset is stored here. * @param subTree The node corresponding to the start of a subtree that doesn't belong to the current document, or 0. @@ -809,8 +809,8 @@ public: /** * Get the node corresponding to a sublocation. * @param loc A location of a Node. - * @locOffset We want the (totalNumberOfParent - locOffset)th parent of Node. - * @return Returns a parent of the node pointed by loc. + * @locOffset We want the (totalNumberOfParent - locOffset)th tqparent of Node. + * @return Returns a tqparent of the node pointed by loc. */ static Node* getNodeFromSubLocation(TQValueList<int> loc, int locOffset); @@ -855,19 +855,19 @@ public: /** * Get the node's depth in the tree. * @param node The node we want the depth. - * @return Returns the depth of node. It is basically the number of parents of node. - * It will return 0 if node has no parent Nodes, and -1 if node doesn't exists. + * @return Returns the depth of node. It is basically the number of tqparents of node. + * It will return 0 if node has no tqparent Nodes, and -1 if node doesn't exists. */ static int nodeDepth(Node *node); /** - * Looks if node has a parent which is named name. - * @return Returns the first parent which is named name or 0L if not found. + * Looks if node has a tqparent which is named name. + * @return Returns the first tqparent which is named name or 0L if not found. */ static Node* hasParent(Node *node, const TQString &name); /** - * Tries to find the common parent to startNode and endNode, in the same conditions as above. + * Tries to find the common tqparent to startNode and endNode, in the same conditions as above. */ static Node* hasParent(Node* startNode, Node* endNode, const TQString &name); @@ -879,12 +879,12 @@ public: * WARNING : The postEnhancement is not done (cf htmlenhancer.h) * Prefer using KafkaDocument::insertDomNode() * @param node The node to insert. - * @param parent The new parent of node. If null, insert node at the top level. + * @param tqparent The new tqparent of node. If null, insert node at the top level. * @param nextSibling The new next sibling of node. If null, append node at the end of the child list. - * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no parent is provided. + * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no tqparent is provided. * @return Returns true if the operation was successfull. */ - static bool insertDomNode(DOM::Node node, DOM::Node parent = DOM::Node(), + static bool insertDomNode(DOM::Node node, DOM::Node tqparent = DOM::Node(), DOM::Node nextSibling = DOM::Node(), DOM::Node rootNode = DOM::Node()); @@ -978,25 +978,25 @@ public: const TQString &attrName, const TQString &attrValue, DOM::Document rootNode); /** - * Looks if domNode has a parent which is named name. - * @return Returns the first parent which is named name or an empty DOM::Node if not found. + * Looks if domNode has a tqparent which is named name. + * @return Returns the first tqparent which is named name or an empty DOM::Node if not found. */ static DOM::Node hasParent(DOM::Node domNode, const TQString &name); /** * Returns the position of the child domNode. * @param domNode This is the DOM::Node we want the position. - * @return Returns the position of domNode inside domNode's parent's children or -1 if not found. + * @return Returns the position of domNode inside domNode's tqparent's tqchildren or -1 if not found. */ static int childPosition(DOM::Node domNode); /** - * Returns the position'th child of parentNode. - * @param parentNode The parent Node of the node to return. + * Returns the position'th child of tqparentNode. + * @param tqparentNode The tqparent Node of the node to return. * @param position We return the position'th child Node. * @param fallback If set to true, it will always return a valid Node (except if there is no child!!) */ - static DOM::Node getChildNode(DOM::Node parentNode, int position, bool fallback = false); + static DOM::Node getChildNode(DOM::Node tqparentNode, int position, bool fallback = false); /** * Specify if a DOM::Node is inline (as specified in isInline()) or text. @@ -1005,10 +1005,10 @@ public: static bool isInline(DOM::Node domNode); /** - * Specify if parent supports the siblings DOM::Nodes starting from startNode to endNode + * Specify if tqparent supports the siblings DOM::Nodes starting from startNode to endNode * according to the DTD dtd. */ - static bool parentSupports(DOM::Node parent, DOM::Node startNode, DOM::Node endNode, + static bool tqparentSupports(DOM::Node tqparent, DOM::Node startNode, DOM::Node endNode, const DTDStruct* dtd); @@ -1030,7 +1030,7 @@ public: /** * Prints in stdout the current Node tree. * @param node The startNode - * @param indent The number of little dots per parent relationship. + * @param indent The number of little dots per tqparent relationship. */ static void coutTree(Node *node, int indent); @@ -1085,7 +1085,7 @@ public: private: /** - * Split the last valid start parent (commonParentStartChild) into two. + * Split the last valid start tqparent (commonParentStartChild) into two. * This and the method above are related and are used in sequence. * The following tree: * <body> @@ -1120,14 +1120,14 @@ private: * </b> * </body> * @param startNode The node where a selection starts, for example. - * @param commonParent This is the common parent between start and end node. - * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode + * @param commonParent This is the common tqparent between start and end node. + * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode * @param modifs The changes made are logged into modifs. */ static void splitStartNodeSubtree(Node* startNode, Node* commonParent, TQValueList<int>& commonParentStartChildLocation, NodeModifsSet* modifs); /** - * Split the last valid start parent (commonParentStartChild) into two. + * Split the last valid start tqparent (commonParentStartChild) into two. * The following tree: * <body> * <b> --> commonParent @@ -1162,9 +1162,9 @@ private: * </b> * </body> * @param endNode The node where a selection ends, for example. - * @param commonParent This is the common parent between start and end node. - * @param commonParentStartChildLocation The first child of commonParent which is parent of startNode. - * @param commonParentEndChildLocation The first child of commonParent which is parent of endNode. + * @param commonParent This is the common tqparent between start and end node. + * @param commonParentStartChildLocation The first child of commonParent which is tqparent of startNode. + * @param commonParentEndChildLocation The first child of commonParent which is tqparent of endNode. * @param subTree True if we are dealing with a tree that doesn't belong to the current document. * @param modifs The changes made are logged into modifs. */ diff --git a/quanta/parts/kafka/kafkadragobject.cpp b/quanta/parts/kafka/kafkadragobject.cpp index 7d546036..4b609998 100644 --- a/quanta/parts/kafka/kafkadragobject.cpp +++ b/quanta/parts/kafka/kafkadragobject.cpp @@ -51,7 +51,7 @@ KafkaDragObject::KafkaDragObject(Node const* item, TQWidget* dragSource, const c KafkaDragObject::~KafkaDragObject() {} -TQByteArray KafkaDragObject::encodedData(const char* mimetype) const +TQByteArray KafkaDragObject::tqencodedData(const char* mimetype) const { if(m_mimetype == mimetype) return m_array; @@ -74,7 +74,7 @@ bool KafkaDragObject::decode(TQMimeSource* e, Node* node) if(!node || !e->provides(m_mimetype)) return false; - TQByteArray data = e->encodedData(m_mimetype); + TQByteArray data = e->tqencodedData(m_mimetype); //kdDebug(25001) << TQString(data) << endl; TQDomDocument doc; doc.setContent(data, false); diff --git a/quanta/parts/kafka/kafkadragobject.h b/quanta/parts/kafka/kafkadragobject.h index 8b6c2e6e..f9c0b540 100644 --- a/quanta/parts/kafka/kafkadragobject.h +++ b/quanta/parts/kafka/kafkadragobject.h @@ -26,15 +26,16 @@ class Node; /** @author Paulo Moura Guedes */ -class KafkaDragObject: public QStoredDrag +class KafkaDragObject: public TQStoredDrag { Q_OBJECT + TQ_OBJECT public: KafkaDragObject(Node const* item, TQWidget* dragSource = 0, const char* name = 0); ~KafkaDragObject(); - TQByteArray encodedData(const char* c) const; + TQByteArray tqencodedData(const char* c) const; Node const* getItem() const; static bool canDecode(TQMimeSource*); diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index bcbc7611..4dfe3f7d 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -83,9 +83,9 @@ public: #endif }; -KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part, +KafkaWidget::KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part, const char *name) - : KHTMLPart(widgetParent, name, parent, name), + : KHTMLPart(widgetParent, name, TQT_TQOBJECT(tqparent), name), w(part) { m_contextPopupMenu = new TQPopupMenu(); @@ -205,10 +205,10 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) else if(position == 0) { DOM::Text textNode = document().createTextNode(text); - DOM::Node parent = node.parentNode(); -//FIXME: Andras: safety checks, as parent can be null. Maybe it just hides the error... - if (!parent.isNull()) - parent.insertBefore(textNode, node); + DOM::Node tqparent = node.parentNode(); +//FIXME: Andras: safety checks, as tqparent can be null. Maybe it just hides the error... + if (!tqparent.isNull()) + tqparent.insertBefore(textNode, node); else node.appendChild(textNode); m_currentNode = textNode; @@ -223,15 +223,15 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) else if(position == 3 || (position == 1 && (focus == kNodeAttrs::singleNodeAndItself))) { DOM::Text textNode = document().createTextNode(text); - DOM::Node parent = node.parentNode(); -//FIXME: Andras: safety checks, as parent and node.nextSibling can be null. Maybe it just hides the error... + DOM::Node tqparent = node.parentNode(); +//FIXME: Andras: safety checks, as tqparent and node.nextSibling can be null. Maybe it just hides the error... //Also it seems that position can be 3 and node is "body". See bug 112733. - if (node.nodeName().string().lower() != "body" && !parent.isNull()) + if (node.nodeName().string().lower() != "body" && !tqparent.isNull()) { if (!node.nextSibling().isNull()) - parent.insertBefore(textNode, node.nextSibling()); + tqparent.insertBefore(textNode, node.nextSibling()); else - parent.insertBefore(textNode, node); + tqparent.insertBefore(textNode, node); } else node.appendChild(textNode); @@ -308,7 +308,7 @@ void KafkaWidget::keyReturn(bool specialPressed) //WARNING : HTML-specific function DOM::Node text, text2, pDomNode, pDomNode2, brDomNode, brDomNode2, tmp, PNode, emptyText; int focus; - // QTag *qTag; + // TQTag *qTag; bool childOfP; //kNodeAttrs *props; @@ -506,7 +506,7 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) if(event->type() == TQEvent::KeyPress) { - TQKeyEvent *keyevent = static_cast<TQKeyEvent *>(event); + TQKeyEvent *keyevent = TQT_TQKEYEVENT(event); //Create a new NodeModifsSet where the changes will be logged. m_modifs = new NodeModifsSet(); @@ -655,7 +655,7 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) kdDebug(25001) << "KafkaWidget::eventFilter() Text - " << keyevent->text() << endl; #endif - //if(( keyevent->state() & Qt::ShiftButton) || ( keyevent->state() == Qt::NoButton)) + //if(( keyevent->state() & TQt::ShiftButton) || ( keyevent->state() == Qt::NoButton)) if( keyevent->text().length() && ( !( keyevent->state() & ControlButton ) && !( keyevent->state() & AltButton ) && @@ -947,7 +947,7 @@ void KafkaWidget::keyDelete() #endif _nodeParent = _nodeNext.parentNode(); - //If this empty text contains the cursor, change node to its parent. + //If this empty text contains the cursor, change node to its tqparent. if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext && _nodeNext.nextSibling().isNull()) { @@ -964,7 +964,7 @@ void KafkaWidget::keyDelete() //Else if the current Node is a BLOCK which can be entered/leaved e.g. H1 else if(attrs->chCurFoc() == kNodeAttrs::blockNode) { - //First look if it is one of _node's parent + //First look if it is one of _node's tqparent isParent = false; temp = _node; while(!temp.isNull()) @@ -1034,12 +1034,12 @@ void KafkaWidget::keyDelete() } else if(isParent && !nextIsBlock) { - if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2, + if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2, w->getCurrentDoc()->defaultDTD())) moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false); else { - if(kafkaCommon::parentSupports(commonParent, startNode, endNode, + if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode, w->getCurrentDoc()->defaultDTD())) moveDomNodes(commonParent, startNode, endNode, childOfCommonParent2, true); @@ -1051,13 +1051,13 @@ void KafkaWidget::keyDelete() } else if(isParent && nextIsBlock) { - if(kafkaCommon::parentSupports(toplevelBlock, startNode2, endNode2, + if(kafkaCommon::tqparentSupports(toplevelBlock, startNode2, endNode2, w->getCurrentDoc()->defaultDTD())) moveDomNodes(toplevelBlock, startNode2, endNode2, DOM::Node(), false); else { - if(kafkaCommon::parentSupports(commonParent, startNode, endNode, - w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports( + if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode, + w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports( commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD())) { moveDomNodes(commonParent, startNode, endNode, childOfCommonParent, @@ -1073,7 +1073,7 @@ void KafkaWidget::keyDelete() } else if(!isParent && nextIsBlock) { - if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2, + if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD())) moveDomNodes(commonParent, startNode2, endNode2, childOfCommonParent2, true); else @@ -1127,7 +1127,7 @@ void KafkaWidget::keyDelete() #endif _nodeParent = _nodeNext.parentNode(); - //If this block is used to define the cursor pos, change node to its parent. + //If this block is used to define the cursor pos, change node to its tqparent. if(_nodeNext == _node && _nodeParent.firstChild() == _nodeNext && _nodeNext.nextSibling().isNull()) { @@ -1392,7 +1392,7 @@ void KafkaWidget::keyBackspace() //Else if the current Node if a BLOCK which can be entered/leaved e.g. H1, P else if(attrs->chCurFoc() == kNodeAttrs::blockNode) { - //First look if it is one of _node's parent + //First look if it is one of _node's tqparent isParent = false; temp = _node; while(!temp.isNull()) @@ -1460,13 +1460,13 @@ void KafkaWidget::keyBackspace() } else if(isParent && !prevIsBlock) { - if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode, + if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode, w->getCurrentDoc()->defaultDTD())) moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(), true); else { - if(kafkaCommon::parentSupports(commonParent, startNode2, endNode2, + if(kafkaCommon::tqparentSupports(commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD())) moveDomNodes(commonParent, startNode2, endNode2, childOfCommonParent2, true); @@ -1478,14 +1478,14 @@ void KafkaWidget::keyBackspace() } else if(isParent && prevIsBlock) { - if(kafkaCommon::parentSupports(toplevelBlock2, startNode, endNode, + if(kafkaCommon::tqparentSupports(toplevelBlock2, startNode, endNode, w->getCurrentDoc()->defaultDTD())) moveDomNodes(toplevelBlock2, startNode, endNode, toplevelBlock2.firstChild(), true); else { - if(kafkaCommon::parentSupports(commonParent, startNode, endNode, - w->getCurrentDoc()->defaultDTD()) && kafkaCommon::parentSupports( + if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode, + w->getCurrentDoc()->defaultDTD()) && kafkaCommon::tqparentSupports( commonParent, startNode2, endNode2, w->getCurrentDoc()->defaultDTD())) { moveDomNodes(commonParent, startNode, endNode, childOfCommonParent, @@ -1501,7 +1501,7 @@ void KafkaWidget::keyBackspace() } else if(!isParent && prevIsBlock) { - if(kafkaCommon::parentSupports(commonParent, startNode, endNode, + if(kafkaCommon::tqparentSupports(commonParent, startNode, endNode, w->getCurrentDoc()->defaultDTD())) moveDomNodes(commonParent, startNode, endNode, childOfCommonParent, false); else @@ -2039,9 +2039,9 @@ void KafkaWidget::khtmlMouseMoveEvent(khtml::MouseMoveEvent *event) return; } if(mouseNode.nodeType() == DOM::Node::TEXT_NODE) - view()->setCursor(Qt::ibeamCursor); + view()->setCursor(TQt::ibeamCursor); else - view()->setCursor(Qt::arrowCursor); + view()->setCursor(TQt::arrowCursor); KHTMLPart::khtmlMouseMoveEvent(event); } diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h index 53a872dc..9365f925 100644 --- a/quanta/parts/kafka/kafkahtmlpart.h +++ b/quanta/parts/kafka/kafkahtmlpart.h @@ -46,8 +46,9 @@ class TQPopupMenu; class KafkaWidget : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: - KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part, + KafkaWidget(TQWidget *tqparent, TQWidget *widgetParent, KafkaDocument *part, const char *name = 0); ~KafkaWidget(); @@ -84,7 +85,7 @@ public: * @param goUp A needed boolean for several consecutive call to * this function. Setting it to false by default, or to true if we don't want to go through * the childs of _node. - * @param skipParentNodes Specifies if we should skip the parent Node when going up : + * @param skipParentNodes Specifies if we should skip the tqparent Node when going up : * this implies that Nodes will not be returned two times. * @param dontBlock Specifies if the search should or not be blocked by BlockingTags. * @param _endNode Specifies at which DOM::Node the search should end. It is useful @@ -112,9 +113,9 @@ public: /** --------------- DOM::Node modifications -------------------------- */ /** - * It will move DOM::Nodes from startNode to endNode as children of newParent. It does NOT check - * if the move is valid, so it may crash. Please check before with kafkaCommon::parentSupports(). - * @param newParent The new parent of the DOM::Nodes. + * It will move DOM::Nodes from startNode to endNode as tqchildren of newParent. It does NOT check + * if the move is valid, so it may crash. Please check before with kafkaCommon::tqparentSupports(). + * @param newParent The new tqparent of the DOM::Nodes. * @param startNode The first node to move. * @param endNode Starting from endNode, the last sibling to move. * @param refNode The reference DOM::Node. @@ -150,7 +151,7 @@ public slots: * sections, and entity references) separates Text nodes, i.e., there are * neither adjacent Text nodes nor empty Text nodes. * Should be used instead of DOM::Node::normalize(). - * @param _node This node is the parent node of the childs normalized + * @param _node This node is the tqparent node of the childs normalized */ void normalize(DOM::Node _node); @@ -210,7 +211,7 @@ signals: /** * Is emitted whenever a DOM::Node is about to be moved in the tree. * @param node The DOM::Node which will be moved. - * @param newParent The new parent of domNode. + * @param newParent The new tqparent of domNode. * @param before domNode will be placed before before. * @param modifs The changes made are logged into modifs. */ diff --git a/quanta/parts/kafka/kafkasyncoptions.cpp b/quanta/parts/kafka/kafkasyncoptions.cpp index e7066187..45170859 100644 --- a/quanta/parts/kafka/kafkasyncoptions.cpp +++ b/quanta/parts/kafka/kafkasyncoptions.cpp @@ -25,8 +25,8 @@ #include "kafkasyncoptions.h" #include "kafkasyncoptions.moc" -KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* parent, const char* name ) - : KafkaSyncOptionsUI( parent, name ) +KafkaSyncOptions::KafkaSyncOptions( KConfig *a_config, TQWidget* tqparent, const char* name ) + : KafkaSyncOptionsUI( tqparent, name ) { config = a_config; diff --git a/quanta/parts/kafka/kafkasyncoptions.h b/quanta/parts/kafka/kafkasyncoptions.h index daf67117..85a1eb88 100644 --- a/quanta/parts/kafka/kafkasyncoptions.h +++ b/quanta/parts/kafka/kafkasyncoptions.h @@ -25,9 +25,10 @@ class KConfig; class KafkaSyncOptions : public KafkaSyncOptionsUI { Q_OBJECT + TQ_OBJECT public: - KafkaSyncOptions( KConfig *config, TQWidget* parent = 0, const char* name = 0); + KafkaSyncOptions( KConfig *config, TQWidget* tqparent = 0, const char* name = 0); ~KafkaSyncOptions(); void updateConfig(); diff --git a/quanta/parts/kafka/kafkasyncoptionsui.ui b/quanta/parts/kafka/kafkasyncoptionsui.ui index 2fb73661..54d7d5d0 100644 --- a/quanta/parts/kafka/kafkasyncoptionsui.ui +++ b/quanta/parts/kafka/kafkasyncoptionsui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KafkaSyncOptionsUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KafkaSyncOptionsUI</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>views</cstring> </property> @@ -27,7 +27,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>kafkaGroup</cstring> </property> @@ -51,14 +51,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>31</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>ms2</cstring> </property> @@ -66,7 +66,7 @@ <string>ms</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>kafkaDelay</cstring> </property> @@ -77,7 +77,7 @@ <number>10</number> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>kafkaFocusRefresh</cstring> </property> @@ -85,7 +85,7 @@ <string>Refresh the VPL editor on click</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>kafkaDelayRefresh</cstring> </property> @@ -95,7 +95,7 @@ </widget> </grid> </widget> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>sourceGroup</cstring> </property> @@ -119,14 +119,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>27</width> <height>31</height> </size> </property> </spacer> - <widget class="QLabel" row="1" column="3"> + <widget class="TQLabel" row="1" column="3"> <property name="name"> <cstring>ms</cstring> </property> @@ -134,7 +134,7 @@ <string>ms</string> </property> </widget> - <widget class="QSpinBox" row="1" column="2"> + <widget class="TQSpinBox" row="1" column="2"> <property name="name"> <cstring>sourceDelay</cstring> </property> @@ -145,7 +145,7 @@ <number>10</number> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>sourceFocusRefresh</cstring> </property> @@ -153,7 +153,7 @@ <string>Refresh the source editor on click</string> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>sourceDelayRefresh</cstring> </property> @@ -175,14 +175,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>167</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>showScriptsIcon</cstring> </property> @@ -192,5 +192,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/parts/kafka/nodeenhancer.h b/quanta/parts/kafka/nodeenhancer.h index 376379f1..22737082 100644 --- a/quanta/parts/kafka/nodeenhancer.h +++ b/quanta/parts/kafka/nodeenhancer.h @@ -45,10 +45,10 @@ public: * The DOM::Node must be built before calling this * function. * @param node The Node we want to enhance. - * @param parentDNode the parent DOM::Node of the root DOM::Node of node. + * @param tqparentDNode the tqparent DOM::Node of the root DOM::Node of node. * @param nextDNode the DOM::Node next to the root DOM::Node of node. */ - virtual bool enhanceNode(Node *node, DOM::Node parentDNode, DOM::Node nextDNode) = 0; + virtual bool enhanceNode(Node *node, DOM::Node tqparentDNode, DOM::Node nextDNode) = 0; /** * This function apply some modifications once the whole DOM::Node tree is built. diff --git a/quanta/parts/kafka/undoredo.cpp b/quanta/parts/kafka/undoredo.cpp index dfe07142..8eb6cfbe 100644 --- a/quanta/parts/kafka/undoredo.cpp +++ b/quanta/parts/kafka/undoredo.cpp @@ -51,7 +51,7 @@ NodeModif::NodeModif() m_type = -1; m_node = 0L; m_tag = 0L; - m_childrenMovedUp = 0; + m_tqchildrenMovedUp = 0; m_neighboursMovedDown = 0; } @@ -59,7 +59,7 @@ NodeModif::~NodeModif() { if(m_node) { - m_node->parent = 0L; + m_node->tqparent = 0L; m_node->next = 0L; m_node->prev = 0L; if(m_type == NodeRemoved) @@ -87,7 +87,7 @@ void NodeModif::setNode(Node *node) m_node = node; if(m_node) { - m_node->parent = 0L; + m_node->tqparent = 0L; m_node->next = 0L; m_node->prev = 0L; if(m_type == NodeRemoved) @@ -544,14 +544,14 @@ bool undoRedo::undoNodeModif(NodeModif *nodeModif) node = kafkaCommon::getNodeFromLocation(nodeModif->location()); if(!node) { - // No node at this location, getting the parent Node and appending newNode after - // the last child of the parent. + // No node at this location, getting the tqparent Node and appending newNode after + // the last child of the tqparent. ref = nodeModif->location(); TQValueList<int> loc(ref); loc.remove(loc.fromLast()); if(loc.empty()) { - // No parent, adding it on top of the tree. + // No tqparent, adding it on top of the tree. kafkaCommon::insertNode(newNode, 0L, 0L, 0L, false); } else @@ -568,7 +568,7 @@ bool undoRedo::undoNodeModif(NodeModif *nodeModif) else { // A node is already here. Moving it to the right and adding newNode here. - kafkaCommon::insertNode(newNode, node->parent, node, 0L, false); + kafkaCommon::insertNode(newNode, node->tqparent, node, 0L, false); } } if(nodeModif->type() == NodeModif::NodeTreeRemoved) @@ -703,10 +703,10 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) { //try //{ - dn = n->_rootNode.parentNode().removeChild(n->_rootNode); + dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode); //} catch(DOM::DOMException e) {kafkaSyncError();} //try{ - domNode.parentNode().insertBefore(dn, domNode); + domNode.tqparentNode().insertBefore(dn, domNode); //} catch(DOM::DOMException e) {} } else if(n->tag->type == Tag::XmlTag || n->tag->type == Tag::Text) @@ -733,7 +733,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) } } //try{ - domNode.parentNode().removeChild(domNode); + domNode.tqparentNode().removeChild(domNode); //} catch(DOM::DOMException e) {kafkaSyncError();} } else if(_node->tag->type == Tag::XmlTagEnd && _node->closesPrevious && @@ -756,7 +756,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) while(n->next) n = n->next; } - if(n->parent->_leafNode.isNull()) + if(n->tqparent->_leafNode.isNull()) { dm = domNode.nextSibling(); goUp = false; @@ -764,18 +764,18 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) { kafkaInterface->disconnectDomNodeFromQuantaNode(dm); //try{ - dm.parentNode().removeChild(dm); + dm.tqparentNode().removeChild(dm); //} catch(DOM::DOMException e) {kafkaSyncError();} - dm = kafkaCommon::getNextDomNode(dm, goUp, false, domNode.parentNode()); + dm = kafkaCommon::getNextDomNode(dm, goUp, false, domNode.tqparentNode()); } } else { - domNode2 = n->parent->_leafNode; + domNode2 = n->tqparent->_leafNode; while(!domNode.nextSibling().isNull()) { //try{ - dn = domNode.parentNode().removeChild(domNode.nextSibling()); + dn = domNode.tqparentNode().removeChild(domNode.nextSibling()); //} catch(DOM::DOMException e) {kafkaSyncError();} //try{ domNode2.appendChild(dn); @@ -788,7 +788,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) while(!domNode.nextSibling().isNull()) { //try{ - dn = domNode.parentNode().removeChild(domNode.nextSibling()); + dn = domNode.tqparentNode().removeChild(domNode.nextSibling()); //} catch(DOM::DOMException e) {kafkaSyncError();} //try{ domNode2.appendChild(dn); @@ -810,7 +810,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) return true;//no kafka node here, due to an invalid pos. domNode = _node->_rootNode; //try{ - domNode.parentNode().removeChild(domNode); + domNode.tqparentNode().removeChild(domNode); //} catch(DOM::DOMException e) {kafkaSyncError();} kafkaInterface->disconnectDomNodeFromQuantaNode(domNode); kafkaInterface->buildKafkaNodeFromNode(_node); @@ -837,7 +837,7 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) if(!n->_rootNode.isNull()) { //try{ - dn = n->_rootNode.parentNode().removeChild(n->_rootNode); + dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode); //} catch(DOM::DOMException e) {kafkaSyncError();} //try{ domNode.appendChild(dn); @@ -857,10 +857,10 @@ bool undoRedo::undoNodeModifInKafka(NodeModif */**_nodeModif*/) if(!n->_rootNode.isNull()) { //try{ - dn = n->_rootNode.parentNode().removeChild(n->_rootNode); + dn = n->_rootNode.tqparentNode().removeChild(n->_rootNode); //} catch(DOM::DOMException e) {kafkaSyncError();} //try{ - domNode.parentNode().appendChild(dn); + domNode.tqparentNode().appendChild(dn); //} catch(DOM::DOMException e) {} } else if(n->tag->type == Tag::XmlTag || n->tag->type == Tag::Text) @@ -968,15 +968,15 @@ void undoRedo::reloadQuantaEditor(bool force, bool syncQuantaCursor, bool encode while(node) { //kdDebug(25001)<< "CurNode : " << _node->tag->name << " - " << _node->tag->tagStr() << endl; - if(node->parent) + if(node->tqparent) { - node->parent->tag->beginPos(bLine3, bCol3); - node->parent->tag->endPos(eLine3, eCol3); + node->tqparent->tag->beginPos(bLine3, bCol3); + node->tqparent->tag->endPos(eLine3, eCol3); } node->tag->beginPos(bLine2, bCol2); //if we are in a Script inside a tag e.g. <a href="<? PHP stuff here ?>">, skip it - if(node->tag->type == Tag::ScriptTag && node->parent && + if(node->tag->type == Tag::ScriptTag && node->tqparent && QuantaCommon::isBetween(bLine2, bCol2, bLine3, bCol3, eLine3,eCol3) == 0) { goUp = true; @@ -990,7 +990,7 @@ void undoRedo::reloadQuantaEditor(bool force, bool syncQuantaCursor, bool encode allText += node->tag->tagStr(); //If a child is a Script inside this Tag e.g. <a href="<? PHP stuff here ?>">, make - //its position fits inside the parent + //its position fits inside the tqparent node->tag->beginPos(bLine3, bCol3); node->tag->endPos(eLine3, eCol3); child = node->firstChild(); @@ -1477,7 +1477,7 @@ void undoRedo::debugOutput() " - contents: " << (*it2)->tag()->tagStr() << endl; if(((*it2)->type() == NodeModif::NodeRemoved && !afterEditorIt) || ((*it2)->type() == NodeModif::NodeAdded && afterEditorIt)) - kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->childrenMovedUp() << + kdDebug(24000)<< "==== ChildsNumber1 : " << (*it2)->tqchildrenMovedUp() << " - ChildsNumber2 : " << (*it2)->neighboursMovedDown() << endl; } kdDebug(24000)<< "== End Node Modifications set #" << i << endl; diff --git a/quanta/parts/kafka/undoredo.h b/quanta/parts/kafka/undoredo.h index 390dc5bb..1bd0cff5 100644 --- a/quanta/parts/kafka/undoredo.h +++ b/quanta/parts/kafka/undoredo.h @@ -95,17 +95,17 @@ public: /** * TODO:REMOVE - * For non-XmlEnd Node deletion without its children. - * @param childrenNumber The number of children which are moved up + * For non-XmlEnd Node deletion without its tqchildren. + * @param tqchildrenNumber The number of tqchildren which are moved up * at the location where was the deleted Node. */ - void setChildrenMovedUp(int childrenNumber) {m_childrenMovedUp = childrenNumber;} + void setChildrenMovedUp(int tqchildrenNumber) {m_tqchildrenMovedUp = tqchildrenNumber;} /** * TODO:REMOVE * @return Returns the number of childs which were moved up. */ - int childrenMovedUp() {return m_childrenMovedUp;} + int tqchildrenMovedUp() {return m_tqchildrenMovedUp;} /** * TODO:REMOVE @@ -139,7 +139,7 @@ public: NodeTreeRemoved, //Moving a Node from one location to another. Implemented. NodeMoved, - //Moving a Node and its children from one location to another. + //Moving a Node and its tqchildren from one location to another. NodeAndChildsMoved }; @@ -148,7 +148,7 @@ private: TQValueList<int> m_location, m_finalLocation; Node *m_node; Tag *m_tag; - int m_childrenMovedUp; + int m_tqchildrenMovedUp; int m_neighboursMovedDown; }; @@ -248,7 +248,7 @@ private: * This class, basically a new undo/redo system, also helps KafkaDocument to synchronize the * kafka and quanta view. */ -class undoRedo : public QObject +class undoRedo : public TQObject { public: /** diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 73e2a019..6eae1afc 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -61,7 +61,7 @@ KafkaWidget *kafkaWidget; KafkaDocument *kafkaDoc; -KafkaDocument::KafkaDocument(TQWidget *parent, TQWidget *widgetParent, const char *name) +KafkaDocument::KafkaDocument(TQWidget *tqparent, TQWidget *widgetParent, const char *name) :domNodeProps(1021), _docLoaded(false) { // i18n reserve @@ -88,7 +88,7 @@ TQString ab = i18n("Ident all"); kafkaDoc = this; - m_kafkaPart = new KafkaWidget(parent, widgetParent,this, name); + m_kafkaPart = new KafkaWidget(tqparent, widgetParent,this, name); kafkaWidget = m_kafkaPart; //m_kafkaPart->showDomTree(); m_currentDoc = 0L; @@ -107,9 +107,9 @@ TQString ab = i18n("Ident all"); { tmp = t.readLine(); if(tmp.left(2) == "//") continue;//comments - int begin = tmp.find("(") + 1; + int begin = tmp.tqfind("(") + 1; if(begin == (-1 + 1)) continue;//"(" not found : invalid line - int length = tmp.find(")") - begin; + int length = tmp.tqfind(")") - begin; decodedChars.insert(tmp.left(1), tmp.mid(begin, length)); encodedChars.insert(tmp.mid(begin, length), tmp.left(1)); } @@ -428,7 +428,7 @@ kNodeAttrs* KafkaDocument::connectDomNodeToQuantaNode(DOM::Node domNode, Node *n else { kdDebug(25001)<< "KafkaDocument::connectDomNodeToQuantaNode () - " << - "No QTag found! Setting default parameters..." << endl; + "No TQTag found! Setting default parameters..." << endl; props->setCHCursorFocus(kNodeAttrs::no); props->setCCEnter(false); props->setCBModified(false); @@ -513,7 +513,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) DOM::Node newNode, newNode2, attr, nextNode, parentNode, *ptDomNode; bool removeLeftWhitespaces, removeRightWhitespaces; TQString str, nodeValue; - Node *n, *parent; + Node *n, *tqparent; int i; // Don't create DOM::Nodes from Quanta empty nodes outside the body or inside other not allowed element, or KHTML @@ -521,14 +521,14 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) bool canInsertEmptyNode = false; if(node->tag->type == Tag::Empty) { - if(!m_currentDoc->defaultDTD()->name.contains("HTML", false)) + if(!m_currentDoc->defaultDTD()->name.tqcontains("HTML", false)) canInsertEmptyNode = true; else canInsertEmptyNode = kafkaCommon::hasParent(node, "body"); - Node* parent_node = node->parent; - QTag* parent_node_description_tag = QuantaCommon::tagFromDTD(parent_node); - if(parent_node_description_tag && !parent_node_description_tag->isChild(node, false, true)) + Node* tqparent_node = node->tqparent; + TQTag* tqparent_node_description_tag = QuantaCommon::tagFromDTD(tqparent_node); + if(tqparent_node_description_tag && !tqparent_node_description_tag->isChild(node, false, true)) canInsertEmptyNode = false; } @@ -540,7 +540,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) //The basics DOM::Nodes HTML, HEAD and BODY are loaded anyway, but we must now // link the real HTML,... to their Nodes. //A basic Common tree is !doctype<-html<-(head, body) - if(!node->parent) + if(!node->tqparent) {//FIXME:html, head and body are HTML-specific tag, for others DTDs it might result to some pbs. if(str == "html") { @@ -575,30 +575,30 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) } } } - else if(str == "html" && (!node->parent || (node->parent && !node->parent->parent))) + else if(str == "html" && (!node->tqparent || (node->tqparent && !node->tqparent->tqparent))) { if(!html.isNull())//delete the empty Node disconnectDomNodeFromQuantaNode(html); newNode = html; insertNode = false; } - else if(str == "body" && ((node->parent && !node->parent->parent) || (node->parent && - node->parent->parent && !node->parent->parent->parent))) + else if(str == "body" && ((node->tqparent && !node->tqparent->tqparent) || (node->tqparent && + node->tqparent->tqparent && !node->tqparent->tqparent->tqparent))) { if(!body.isNull()) disconnectDomNodeFromQuantaNode(body); newNode = body; insertNode = false; } - else if(str == "head" && ((node->parent && !node->parent->parent) || (node->parent && - node->parent->parent && !node->parent->parent->parent))) + else if(str == "head" && ((node->tqparent && !node->tqparent->tqparent) || (node->tqparent && + node->tqparent->tqparent && !node->tqparent->tqparent->tqparent))) { if(!head.isNull()) disconnectDomNodeFromQuantaNode(head); newNode = head; insertNode = false; } - /** else if(node->parent->tag->str == "html")*/ + /** else if(node->tqparent->tag->str == "html")*/ else { if(node->tag->type == Tag::Text || node->tag->type == Tag::Empty) @@ -631,16 +631,16 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) //- It is the last child of a BLOCK removeLeftWhitespaces = false; n = node; - parent = node->parent; - while(parent && parent->SFirstChild() == n) + tqparent = node->tqparent; + while(tqparent && tqparent->SFirstChild() == n) { - if(!kafkaCommon::isInline(parent->tag->name)) + if(!kafkaCommon::isInline(tqparent->tag->name)) { removeLeftWhitespaces = true; break; } - n = parent; - parent = parent->parent; + n = tqparent; + tqparent = tqparent->tqparent; } if(!removeLeftWhitespaces) { @@ -661,16 +661,16 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) removeRightWhitespaces = false; n = node; - parent = node->parent; - while(parent && parent->SLastChild() == n) + tqparent = node->tqparent; + while(tqparent && tqparent->SLastChild() == n) { - if(!kafkaCommon::isInline(parent->tag->name)) + if(!kafkaCommon::isInline(tqparent->tag->name)) { removeRightWhitespaces = true; break; } - n = parent; - parent = parent->parent; + n = tqparent; + tqparent = tqparent->tqparent; } nodeValue = node->tag->tagStr(); @@ -714,11 +714,11 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) break; } } - if(node->parent && node->parent->leafNode()) - parentNode = *node->parent->leafNode(); - else if(node->parent && !node->parent->leafNode()) + if(node->tqparent && node->tqparent->leafNode()) + parentNode = *node->tqparent->leafNode(); + else if(node->tqparent && !node->tqparent->leafNode()) { - //the parent tag was invalid and khtml refuse to insert it + //the tqparent tag was invalid and khtml refuse to insert it //so impossible to inser the current node disconnectDomNodeFromQuantaNode(newNode); if(node->rootNode()) @@ -734,7 +734,7 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) node->setLeafNode(ptDomNode); mainEnhancer->enhanceNode(node, parentNode, nextNode); - QTag* qTag = QuantaCommon::tagFromDTD(getCurrentDoc()->defaultDTD(), + TQTag* qTag = QuantaCommon::tagFromDTD(getCurrentDoc()->defaultDTD(), parentNode.nodeName().string()); if(qTag && qTag->isChild(node, false)) @@ -774,8 +774,8 @@ bool KafkaDocument::buildKafkaNodeFromNode(Node *node, bool insertNode) } else { - if(node->parent && node->parent->leafNode()) - parentNode = *node->parent->leafNode(); + if(node->tqparent && node->tqparent->leafNode()) + parentNode = *node->tqparent->leafNode(); else parentNode = body; n = node; @@ -807,8 +807,8 @@ void KafkaDocument::buildNodeFromKafkaNode(Node *node, DOM::Node domNode) if(domNode.nodeType() == DOM::Node::TEXT_NODE) { TQString text = domNode.nodeValue().string(); - text.replace("<", "<"); - text.replace(">", ">"); + text.tqreplace("<", "<"); + text.tqreplace(">", ">"); node->tag->setStr(text); } else @@ -875,7 +875,7 @@ Node * KafkaDocument::buildNodeFromKafkaNode(DOM::Node domNode, Node *nodeParent TQString KafkaDocument::getDecodedChar(const TQString &encodedChar) { - TQMap<TQString, TQString>::Iterator it = encodedChars.find(encodedChar); + TQMap<TQString, TQString>::Iterator it = encodedChars.tqfind(encodedChar); if(it == encodedChars.end()) { //try this @@ -950,7 +950,7 @@ TQString KafkaDocument::getEncodedChar(const TQString &decodedChar, const TQStri else if(decodedChar[0].isSpace()) //FIXME:for an unknown reason, by default it return ¿ instead of return " "; - TQMap<TQString, TQString>::Iterator it = decodedChars.find(decodedChar); + TQMap<TQString, TQString>::Iterator it = decodedChars.tqfind(decodedChar); if(it == decodedChars.end()) return decodedChar; @@ -1074,10 +1074,10 @@ TQString KafkaDocument::generateCodeFromNode(Node *node, int bLine, int bCol, in openingNode = node->getOpeningNode(); if(openingNode && openingNode->tag->type == Tag::ScriptTag) { - if(openingNode->tag->name.contains("XML PI", false) || - openingNode->tag->name.contains("PHP", false)) + if(openingNode->tag->name.tqcontains("XML PI", false) || + openingNode->tag->name.tqcontains("PHP", false)) text = "?>"; - else if(openingNode->tag->name.contains("DTD", false)) + else if(openingNode->tag->name.tqcontains("DTD", false)) text = ">"; else text = ">"; @@ -1102,26 +1102,26 @@ TQString KafkaDocument::generateCodeFromNode(Node *node, int bLine, int bCol, in /** Can't use KGlobal::charsets()->toEntity() : * It translate all chars into entities! */ else if(!hasPreParent) - text = node->tag->tagStr().replace(TQRegExp("\\s+"), " "); + text = node->tag->tagStr().tqreplace(TQRegExp("\\s+"), " "); else text = node->tag->tagStr(); } else if(node->tag->type == Tag::ScriptTag) { //WARNING : HTML SPECIFIC - if(node->tag->name.contains("style", false)) + if(node->tag->name.tqcontains("style", false)) { text = "<" + QuantaCommon::tagCase("style") + ">"; } - else if(node->tag->name.contains("DTD", false)) + else if(node->tag->name.tqcontains("DTD", false)) { text = "<!"; } - else if(node->tag->name.contains("XML PI", false)) + else if(node->tag->name.tqcontains("XML PI", false)) { text = "<?xml"; } - else if(node->tag->name.contains("PHP", false)) + else if(node->tag->name.tqcontains("PHP", false)) { text = "<?php"; } @@ -1697,13 +1697,13 @@ void KafkaDocument::translateNodeIntoQuantaCursorPosition(Node *node, int offset } } -bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node parent, +bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node tqparent, DOM::Node nextSibling, DOM::Node rootNode) { DOM::Node siblingNSpecial; //First insert the node - if(!kafkaCommon::insertDomNode(node, parent, nextSibling, rootNode)) + if(!kafkaCommon::insertDomNode(node, tqparent, nextSibling, rootNode)) return false; //Then unEnhance and reEnhance the nearest non special nodes so that everything's fine. @@ -1728,12 +1728,12 @@ bool KafkaDocument::insertDomNode(DOM::Node node, DOM::Node parent, bool KafkaDocument::removeDomNode(DOM::Node node) { - DOM::Node nextSiblingNSpecial, prevSiblingNSpecial, parent; + DOM::Node nextSiblingNSpecial, prevSiblingNSpecial, tqparent; //First remove the node prevSiblingNSpecial = getPrevSiblingNSpecial(node); nextSiblingNSpecial = getNextSiblingNSpecial(node); - parent = node.parentNode(); + tqparent = node.parentNode(); if(!kafkaCommon::removeDomNode(node)) return false; @@ -1748,8 +1748,8 @@ bool KafkaDocument::removeDomNode(DOM::Node node) mainEnhancer->postUnenhanceNode(nextSiblingNSpecial); mainEnhancer->postEnhanceNode(nextSiblingNSpecial); } - mainEnhancer->postUnenhanceNode(parent); - mainEnhancer->postEnhanceNode(parent); + mainEnhancer->postUnenhanceNode(tqparent); + mainEnhancer->postEnhanceNode(tqparent); return true; } @@ -1832,9 +1832,9 @@ void KafkaDocument::coutLinkTree(Node *, int) dots.fill('*', indent); output = dots; if (node->tag->type != Tag::Text) - output += node->tag->name.replace('\n'," "); + output += node->tag->name.tqreplace('\n'," "); else - output+= node->tag->tagStr().replace('\n'," "); + output+= node->tag->tagStr().tqreplace('\n'," "); output += " ("; output += node->tag->type; output += ") "; @@ -1930,9 +1930,9 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs Node *node = 0L; NodeModif *modif; kNodeAttrs *props, *newProps; - DOM::Node newDomNode, parentDomNode, nextSiblingDomNode; + DOM::Node newDomNode, tqparentDomNode, nextSiblingDomNode; DOM::Node *ptDomNode; - QTag *qTag; + TQTag *qTag; #ifdef LIGHT_DEBUG TQTime t; @@ -1985,7 +1985,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs //let's create the corresponding Text Node and the P tag only if necessary modifs = new NodeModifsSet(); modif = new NodeModif(); - parentDomNode = domNode.parentNode(); + tqparentDomNode = domNode.parentNode(); nextSiblingDomNode = domNode.nextSibling(); if(!qTag->isChild("#text", false)) @@ -1993,7 +1993,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs newDomNode = kafkaCommon::createDomNode("p", getNode(domNode.parentNode())->tag->dtd(), m_kafkaPart->document()); kafkaCommon::removeDomNode(domNode); - kafkaCommon::insertDomNode(newDomNode, parentDomNode, nextSiblingDomNode); + kafkaCommon::insertDomNode(newDomNode, tqparentDomNode, nextSiblingDomNode); kafkaCommon::insertDomNode(domNode, newDomNode); node = kafkaCommon::createNode("p", "", Tag::XmlTag, m_currentDoc); @@ -2002,12 +2002,12 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs node->setRootNode(ptDomNode); ptDomNode = new DOM::Node(newDomNode); node->setLeafNode(ptDomNode); - node = kafkaCommon::insertNode(node, getNode(parentDomNode), + node = kafkaCommon::insertNode(node, getNode(tqparentDomNode), getNode(nextSiblingDomNode), getNode(nextSiblingDomNode), modifs); newProps->setNode(node); modifs->addNodeModif(modif); - parentDomNode = newDomNode; + tqparentDomNode = newDomNode; nextSiblingDomNode = DOM::Node(); modif = new NodeModif(); } @@ -2019,7 +2019,7 @@ void KafkaDocument::slotDomNodeModified(DOM::Node domNode, NodeModifsSet* modifs ptDomNode = new DOM::Node(domNode); node->setLeafNode(ptDomNode); //avoid the merging of Text Nodes - node = kafkaCommon::insertNode(node, getNode(parentDomNode), + node = kafkaCommon::insertNode(node, getNode(tqparentDomNode), getNode(nextSiblingDomNode), modifs, false); props->setNode(node); modifs->addNodeModif(modif); @@ -2080,13 +2080,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC //If we are deleting a PHP Node which is embedded into a tag e.g. <a <? echo boo; ?> > //We must regenerate the <a> tag string. - if(_node->tag->type == Tag::ScriptTag && _node->parent) + if(_node->tag->type == Tag::ScriptTag && _node->tqparent) { - _node->parent->tag->beginPos(bLine, bCol); - _node->parent->tag->endPos(eLine, eCol); + _node->tqparent->tag->beginPos(bLine, bCol); + _node->tqparent->tag->endPos(eLine, eCol); _node->tag->beginPos(bLine2, bCol2); if(QuantaCommon::isBetween(bLine2, bCol2, bLine, bCol, eLine,eCol) == 0) - _node->parent->tag->setCleanStrBuilt(false); + _node->tqparent->tag->setCleanStrBuilt(false); } if(_node->prev) @@ -2099,15 +2099,15 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC modif = new NodeModif(); modif->setType(NodeModif::NodeRemoved); modif->setLocation(kafkaCommon::getLocation(_node)); - if(_node->parent && _node->parent->child == _node) - _node->parent->child = _node->next; + if(_node->tqparent && _node->tqparent->child == _node) + _node->tqparent->child = _node->next; if(_node->prev) _node->prev->next = _node->next; if(_node->next) _node->next->prev = _node->prev; if(_node == baseNode) baseNode = _node->next; - _node->parent = 0L; + _node->tqparent = 0L; _node->prev = 0L; _node->next = 0L; _node->child = 0L; @@ -2131,8 +2131,8 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC hasClosingNode = false; //_node->removeAll = false; - if(_node->parent && _node->parent->child == _node) - _node->parent->child = _node->next; + if(_node->tqparent && _node->tqparent->child == _node) + _node->tqparent->child = _node->next; if(_node->next) _node->next->prev = _node->prev; if(_node->prev) @@ -2155,15 +2155,15 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC } else if(_node->child)// && !deleteChilds { - if(_node->parent && !_node->parent->child) - _node->parent->child = _node->child; + if(_node->tqparent && !_node->tqparent->child) + _node->tqparent->child = _node->child; if(_node->prev) _node->prev->next = _node->child; _tmpNode = _node->child; while(_tmpNode) { i++; - _tmpNode->parent = _node->parent; + _tmpNode->tqparent = _node->tqparent; n = _tmpNode; _tmpNode = _tmpNode->next; if(!_tmpNode) @@ -2181,7 +2181,7 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC disconnectDomNodeFromQuantaNode(*_node->rootNode()); if(_node->leafNode()) disconnectDomNodeFromQuantaNode(*_node->leafNode()); - _node->parent = 0L; + _node->tqparent = 0L; _nodeNext = _node->next; _node->next = 0L; _node->prev = 0L; @@ -2195,13 +2195,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC if(hasClosingNode) { //delete the closing Node if present - if(_node->parent && _node->parent->child == _node) - _node->parent->child = _node->next; + if(_node->tqparent && _node->tqparent->child == _node) + _node->tqparent->child = _node->next; if(_node->prev) _node->prev->next = _node->next; if(_node->next) _node->next->prev = _node->prev; - _node->parent = 0L; + _node->tqparent = 0L; _nodeNext = _node->next; _node->next = 0L; _node->prev = 0L; @@ -2221,13 +2221,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC modif = new NodeModif(); modif->setType(NodeModif::NodeRemoved); modif->setLocation(kafkaCommon::getLocation(_node)); - if(_node->parent && _node->parent->child == _node) - _node->parent->child = _node->next; + if(_node->tqparent && _node->tqparent->child == _node) + _node->tqparent->child = _node->next; if(_node->prev) _node->prev->next = _node->next; if(_node->next) _node->next->prev = _node->prev; - _node->parent = 0L; + _node->tqparent = 0L; _nodeNext = _node->next; _node->prev = 0L; _node->next = 0L; @@ -2251,13 +2251,13 @@ void KafkaDocument::slotDomNodeAboutToBeRemoved(DOM::Node _domNode, bool deleteC void KafkaDocument::slotDomNodeIsAboutToBeMoved(DOM::Node domNode, DOM::Node newParent, DOM::Node before, NodeModifsSet* modifs) { - Node *node, *parent, *nextSibling, *closingNode; + Node *node, *tqparent, *nextSibling, *closingNode; if(domNode.isNull()) return; node = getNode(domNode); - parent = getNode(newParent); + tqparent = getNode(newParent); nextSibling = getNode(before); if(!node) @@ -2265,10 +2265,10 @@ void KafkaDocument::slotDomNodeIsAboutToBeMoved(DOM::Node domNode, DOM::Node new closingNode = node->getClosingNode(); - kafkaCommon::moveNode(node, parent, nextSibling, modifs, false); + kafkaCommon::moveNode(node, tqparent, nextSibling, modifs, false); if(closingNode) - kafkaCommon::moveNode(closingNode, parent, nextSibling, modifs, false); + kafkaCommon::moveNode(closingNode, tqparent, nextSibling, modifs, false); } @@ -2328,7 +2328,7 @@ void KafkaDocument::slotCut(Node* startNode, int startOffset, Node* endNode, int drag_object->addDragObject(node_drag); drag_object->addDragObject(text_drag); - TQApplication::clipboard()->setData(drag_object); + TQApplication::tqclipboard()->setData(drag_object); #ifdef LIGHT_DEBUG kafkaCommon::coutTree(subtree_root, 3); #endif @@ -2365,7 +2365,7 @@ void KafkaDocument::slotCopy(Node* startNode, int startOffset, Node* endNode, in drag_object->addDragObject(node_drag); drag_object->addDragObject(text_drag); - TQApplication::clipboard()->setData(drag_object); + TQApplication::tqclipboard()->setData(drag_object); // FIXME delete the subtree #ifdef LIGHT_DEBUG kafkaCommon::coutTree(subtree_root, 3); @@ -2375,7 +2375,7 @@ void KafkaDocument::slotCopy(Node* startNode, int startOffset, Node* endNode, in void KafkaDocument::slotPaste() { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQMimeSource* e = cb->data(); Node* node = new Node(0); diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h index 712dc2e2..3c0ca23c 100644 --- a/quanta/parts/kafka/wkafkapart.h +++ b/quanta/parts/kafka/wkafkapart.h @@ -47,15 +47,16 @@ class NodeModifsSet; * By Kafka Node, i mean DOM::Node (cf <dom/dom_node.h>) * It is a singleton class. */ -class KafkaDocument : public QObject +class KafkaDocument : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Returns a reference to the KafkaDocument object */ - static KafkaDocument* const ref(TQWidget *parent = 0L, TQWidget *widgetParent = 0L, const char *name = 0L) + static KafkaDocument* const ref(TQWidget *tqparent = 0L, TQWidget *widgetParent = 0L, const char *name = 0L) { static KafkaDocument *m_ref; - if (!m_ref) m_ref = new KafkaDocument(parent, widgetParent, name); + if (!m_ref) m_ref = new KafkaDocument(tqparent, widgetParent, name); return m_ref; } @@ -160,7 +161,7 @@ public: * and thus make them its childs. Usefull when adding a Node on a selected range of Nodes. * It also create empty Nodes between Nodes. * @param domNode The Node returned is synchronized from this DOM::Node. - * @param nodeParent The parent Node of the Node returned. + * @param nodeParent The tqparent Node of the Node returned. * @param beginNode The new Node will be placed before or within _beginNode. * @param beginOffset NOT IMLEMENTED If set to 0 or -1, the new Node will be placed before _beginNode, * else _beginNode will be splitted at offset #beginOffset and the new Node will be placed @@ -308,12 +309,12 @@ public: * Insert a DOM::Node in the DOM::Node tree. It takes care to handle the exceptions and * to postEnhance (cf htmlenhancer.h) * @param node The node to insert. - * @param parent The new parent of node. If null, insert node at the top level. + * @param tqparent The new tqparent of node. If null, insert node at the top level. * @param nextSibling The new next sibling of node. If null, append node at the end of the child list. - * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no parent is provided. + * @param rootNode The root DOM::Node of the DOM::Node tree. Useful when no tqparent is provided. * @return Returns true if the operation was successfull. */ - bool insertDomNode(DOM::Node node, DOM::Node parent = DOM::Node(), + bool insertDomNode(DOM::Node node, DOM::Node tqparent = DOM::Node(), DOM::Node nextSibling = DOM::Node(), DOM::Node rootNode = DOM::Node()); @@ -368,7 +369,7 @@ public: /** * Prints in stdout the current Node tree + Node->DOM::Node->Node relationship. * @node The startNode - * @indent The number of little dots per parent relationship. + * @indent The number of little dots per tqparent relationship. */ void coutLinkTree(Node *node, int indent); @@ -432,7 +433,7 @@ public slots: /** * Called whenever a DOM::Node is moved. * @param domNode The DOM::Node to move. - * @param newParent The new parent DOM::Node of domNode. + * @param newParent The new tqparent DOM::Node of domNode. * @param before domNode will be inserted before before. * @param modifs The changes made are logged into modifs. */ @@ -459,7 +460,7 @@ private: /** * Create a KafkaWidget. */ - KafkaDocument(TQWidget *parent, TQWidget *widgetParent, const char *name); + KafkaDocument(TQWidget *tqparent, TQWidget *widgetParent, const char *name); TQMap<TQString, TQString> decodedChars; TQMap<TQString, TQString> encodedChars; diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 47c1ca70..068bc9d3 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -33,11 +33,11 @@ #include "whtmlpart.h" #include "resource.h" -WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enableViewSource, - TQObject *parent, const char *name, GUIProfile prof) - : KHTMLPart(parentWidget, widgetName, parent, name, prof), m_contextMenu(0) +WHTMLPart::WHTMLPart(TQWidget *tqparentWidget, const char *widgetName, bool enableViewSource, + TQObject *tqparent, const char *name, GUIProfile prof) + : KHTMLPart(tqparentWidget, widgetName, tqparent, name, prof), m_contextMenu(0) { - //kdDebug(24000) << "WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << this << endl; + //kdDebug(24000) << "WHTMLPart: " << tqparentWidget << " " << widgetName << " " << tqparent << " " << name << this << endl; hpos = 0; // get settings from konq. KConfig konqConfig("konquerorrc"); @@ -52,7 +52,7 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable m_enableViewSource = enableViewSource; if (m_enableViewSource) { - m_contextMenu = new KPopupMenu(parentWidget); + m_contextMenu = new KPopupMenu(tqparentWidget); m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource())); connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&))); @@ -103,7 +103,7 @@ void WHTMLPart::forward() hpos++; openURL( KURL( history.at(hpos) ) ); - emit updateStatus( backEnable() , forwardEnable() ); + emit updatetqStatus( backEnable() , forwardEnable() ); } } @@ -115,7 +115,7 @@ void WHTMLPart::back() hpos--; openURL(KURL(history.at(hpos))); - emit updateStatus(backEnable(), forwardEnable()); + emit updatetqStatus(backEnable(), forwardEnable()); } } @@ -133,7 +133,7 @@ void WHTMLPart::addToHistory(const TQString &url) hpos = history.count()-1; - emit updateStatus( backEnable() , forwardEnable() ); + emit updatetqStatus( backEnable() , forwardEnable() ); } @@ -149,21 +149,21 @@ bool WHTMLPart::forwardEnable() return hpos < history.count()-1; } -KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * parentWidget, const char *widgetName, - TQObject *parent, const char *name, +KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQString &, TQString &, TQStringList &, const TQStringList &) { - //kdDebug(24000) << "Create WHTMLPart: " << parentWidget << " " << widgetName << " " << parent << " " << name << endl; - return new WHTMLPart(parentWidget, widgetName, m_enableViewSource, parent, name); + //kdDebug(24000) << "Create WHTMLPart: " << tqparentWidget << " " << widgetName << " " << tqparent << " " << name << endl; + return new WHTMLPart(tqparentWidget, widgetName, m_enableViewSource, tqparent, name); } bool WHTMLPart::eventFilter(TQObject *watched, TQEvent *e) { - if (watched == view() && e->type() == TQEvent::FocusOut && (!m_contextMenu || !m_contextMenu->hasFocus())) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(view()) && e->type() == TQEvent::FocusOut && (!m_contextMenu || !m_contextMenu->hasFocus())) emit previewHasFocus(false); else - if (watched == view() && e->type() == TQEvent::FocusIn) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(view()) && e->type() == TQEvent::FocusIn) emit previewHasFocus(true); return false; } diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h index 63be955b..4133b045 100644 --- a/quanta/parts/preview/whtmlpart.h +++ b/quanta/parts/preview/whtmlpart.h @@ -29,9 +29,10 @@ class KPopupMenu; class WHTMLPart : public KHTMLPart { Q_OBJECT + TQ_OBJECT public: - WHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0, bool enableViewSource = false, - TQObject *parent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); + WHTMLPart(TQWidget *tqparentWidget = 0, const char *widgetname = 0, bool enableViewSource = false, + TQObject *tqparent = 0, const char *name = 0, GUIProfile prof = DefaultGUI ); virtual ~WHTMLPart(); /** Specify the URL where the preview was started */ @@ -53,15 +54,15 @@ public slots: virtual bool eventFilter(TQObject *watched, TQEvent *e); signals: - void updateStatus( bool back, bool forward ); + void updatetqStatus( bool back, bool forward ); void previewHasFocus(bool focus); void showPreview(bool show); void openFile(const KURL&, const TQString&, bool); protected: virtual void urlSelected( const TQString &url, int button, int state, const TQString &_target, KParts::URLArgs args = KParts::URLArgs()); - virtual KParts::ReadOnlyPart *createPart( TQWidget *parentWidget, const char *widgetName, - TQObject *parent, const char *name, + virtual KParts::ReadOnlyPart *createPart( TQWidget *tqparentWidget, const char *widgetName, + TQObject *tqparent, const char *name, const TQString &mimetype, TQString &serviceName, TQStringList &serviceTypes, const TQStringList ¶ms); diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui index a4cc6052..03f6de6d 100644 --- a/quanta/plugins/pluginconfig.ui +++ b/quanta/plugins/pluginconfig.ui @@ -11,7 +11,7 @@ </comment> <author>(C) 2002 by Marc Britton <consume@optushome.com.au>, (C) 2003 by Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PluginConfig</cstring> </property> @@ -23,7 +23,7 @@ <height>281</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>560</width> <height>280</height> @@ -36,7 +36,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>validateCheckBox</cstring> </property> @@ -57,14 +57,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>247</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -89,7 +89,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3_2</cstring> </property> @@ -97,7 +97,7 @@ <string>Name:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>pluginName</cstring> </property> @@ -117,13 +117,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>48</width> <height>48</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>48</width> <height>48</height> @@ -133,7 +133,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -141,7 +141,7 @@ <string>Location:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>location</cstring> </property> @@ -149,7 +149,7 @@ <string>The exact location of the plugin. If not set the global search paths setting is used.</string> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>pluginFileName</cstring> </property> @@ -157,7 +157,7 @@ <string>The plugin executable or library name (with extension).</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> @@ -165,7 +165,7 @@ <string>File name:</string> </property> </widget> - <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="4"> + <widget class="TQComboBox" row="1" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>outputWindow</cstring> </property> @@ -178,7 +178,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -186,11 +186,11 @@ <string>Output window:</string> </property> </widget> - <widget class="QPushButton" row="2" column="4"> + <widget class="TQPushButton" row="2" column="4"> <property name="name"> <cstring>locationButton</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>28</width> <height>32767</height> @@ -200,7 +200,7 @@ <string>...</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>readOnlyBox</cstring> </property> @@ -208,7 +208,7 @@ <string>&Read only part</string> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -216,7 +216,7 @@ <string>Input:</string> </property> </widget> - <widget class="QComboBox" row="4" column="2" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="4" column="2" rowspan="1" colspan="3"> <item> <property name="text"> <string>None</string> @@ -259,11 +259,11 @@ <includes> <include location="global" impldecl="in implementation">kicondialog.h</include> </includes> -<slots> +<Q_SLOTS> <slot>pluginType_highlighted(const QString&)</slot> <slot>slotPluginTypeHighlighted(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kicondialog.h</includehint> </includehints> diff --git a/quanta/plugins/plugineditor.ui b/quanta/plugins/plugineditor.ui index 104d9923..5188166c 100644 --- a/quanta/plugins/plugineditor.ui +++ b/quanta/plugins/plugineditor.ui @@ -10,7 +10,7 @@ ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>pluginEditor</cstring> </property> @@ -22,7 +22,7 @@ <height>306</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>500</width> <height>224</height> @@ -41,7 +41,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -49,7 +49,7 @@ <string>Search paths:</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -66,7 +66,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListView" row="0" column="1" rowspan="5" colspan="1"> + <widget class="TQListView" row="0" column="1" rowspan="5" colspan="1"> <column> <property name="text"> <string>Name</string> @@ -126,7 +126,7 @@ <cstring>pluginList</cstring> </property> </widget> - <widget class="QPushButton" row="0" column="0"> + <widget class="TQPushButton" row="0" column="0"> <property name="name"> <cstring>addButton</cstring> </property> @@ -137,7 +137,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="1" column="0"> + <widget class="TQPushButton" row="1" column="0"> <property name="name"> <cstring>configureButton</cstring> </property> @@ -145,7 +145,7 @@ <string>Configure...</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>removeButton</cstring> </property> @@ -163,14 +163,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>67</height> </size> </property> </spacer> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>refreshButton</cstring> </property> @@ -180,7 +180,7 @@ </widget> </grid> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>addSearchPathButton</cstring> </property> @@ -188,7 +188,7 @@ <string>Add...</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>searchPaths</cstring> </property> @@ -204,5 +204,5 @@ <tabstop>refreshButton</tabstop> <tabstop>pluginList</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index 628f38a7..bfed02c1 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -114,19 +114,19 @@ bool QuantaPlugin::load() TQString ow = outputWindow(); m_targetWidget = new TQWidget(quantaApp); if (m_readOnlyPart) - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 ); else - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 ); if(!m_part) { - KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br> - <b>%2</b> is not installed;<br> - the file <i>%3</i> is not installed or it is not reachable.").arg(m_name).arg(m_name).arg(m_fileName)); + KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br> - <b>%2</b> is not installed;<br> - the file <i>%3</i> is not installed or it is not reachable.").tqarg(m_name).tqarg(m_name).tqarg(m_fileName)); delete m_targetWidget; m_targetWidget = 0L; return false; } m_part->setName(m_name.ascii()); // for better debug output m_part->widget()->setName(m_name.ascii()); //needed to be able to dock the same plugin twice in separate toolviews - m_part->widget()->setFocusPolicy(TQWidget::ClickFocus); + m_part->widget()->setFocusPolicy(TQ_ClickFocus); quantaApp->slotNewPart(m_part, false); // register the part in the partmanager return true; } @@ -155,7 +155,7 @@ bool QuantaPlugin::run() } case 3: { KURL url; if ( Project::ref()->hasProject() && - (Project::ref()->contains(view->document()->url()) || + (Project::ref()->tqcontains(view->document()->url()) || view->document()->isUntitled()) ) { diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h index e3cd1758..969268da 100644 --- a/quanta/plugins/quantaplugin.h +++ b/quanta/plugins/quantaplugin.h @@ -36,9 +36,10 @@ class KMdiToolViewAccessor; class QuantaView; -class QuantaPlugin : public QObject +class QuantaPlugin : public TQObject { Q_OBJECT + TQ_OBJECT public: QuantaPlugin(); ~QuantaPlugin(); @@ -122,7 +123,7 @@ protected: private: // Private attributes TQString m_standardName; KMdiToolViewAccessor* m_pluginToolView; - TQWidget *m_targetWidget; //this will be the parent, used only to make the plugin widget hidden until addWidget is called + TQWidget *m_targetWidget; //this will be the tqparent, used only to make the plugin widget hidden until addWidget is called }; #endif diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp index 30fd6ee2..62f25553 100644 --- a/quanta/plugins/quantapluginconfig.cpp +++ b/quanta/plugins/quantapluginconfig.cpp @@ -77,7 +77,7 @@ void QuantaPluginConfig::accept() /** Gets the plugin location */ void QuantaPluginConfig::selectLocation() { - TQString pluginLocation = KFileDialog::getExistingDirectory(TQString::null, this, i18n("Select Plugin Folder")); + TQString pluginLocation = KFileDialog::getExistingDirectory(TQString(), this, i18n("Select Plugin Folder")); if(!pluginLocation.isNull()) { m_pluginConfigWidget->location->setText(pluginLocation); diff --git a/quanta/plugins/quantapluginconfig.h b/quanta/plugins/quantapluginconfig.h index 26cf53e5..9390b61e 100644 --- a/quanta/plugins/quantapluginconfig.h +++ b/quanta/plugins/quantapluginconfig.h @@ -30,6 +30,7 @@ class TQString; class QuantaPluginConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT public: QuantaPluginConfig(TQWidget *, const char *); ~QuantaPluginConfig(); diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp index 42f6a237..db7f73ed 100644 --- a/quanta/plugins/quantaplugineditor.cpp +++ b/quanta/plugins/quantaplugineditor.cpp @@ -50,7 +50,7 @@ QuantaPluginEditor::QuantaPluginEditor(TQWidget *a_parent, const char *a_name) setMainWidget(m_pluginEditorWidget); m_pluginEditorWidget->pluginList->setSelectionMode(TQListView::Single); m_pluginEditorWidget->pluginList->setAllColumnsShowFocus(true); - m_pluginEditorWidget->pluginList->setColumnAlignment(2, Qt::AlignHCenter); + m_pluginEditorWidget->pluginList->setColumnAlignment(2, TQt::AlignHCenter); connect(this, TQT_SIGNAL(pluginsChanged()), TQT_SLOT(refreshPlugins())); connect(m_pluginEditorWidget->refreshButton, TQT_SIGNAL(clicked()), TQT_SLOT(refreshPlugins())); @@ -100,7 +100,7 @@ void QuantaPluginEditor::addPlugin() void QuantaPluginEditor::addSearchPath() { // Get a dir and append it to the line edit - TQString appendDir = KFileDialog::getExistingDirectory(TQString::null, 0, i18n("Select Folder")); + TQString appendDir = KFileDialog::getExistingDirectory(TQString(), 0, i18n("Select Folder")); if(!appendDir.isNull()) { m_pluginEditorWidget->searchPaths->setText(m_pluginEditorWidget->searchPaths->text()+appendDir+":"); @@ -115,10 +115,10 @@ void QuantaPluginEditor::configurePlugin() if(item) key = item->text(0); - if(!key.isNull() && m_plugins.find(key)) + if(!key.isNull() && m_plugins.tqfind(key)) { QuantaPluginConfig *configDlg = new QuantaPluginConfig(this, "pluginConfig"); - QuantaPlugin *curPlugin = m_plugins.find(key); + QuantaPlugin *curPlugin = m_plugins.tqfind(key); PluginConfig *configWidget = static_cast<PluginConfig*>(configDlg->mainWidget()); configWidget->outputWindow->setCurrentText(curPlugin->outputWindow()); @@ -186,7 +186,7 @@ void QuantaPluginEditor::removePlugin() TQListViewItem *currentItem = m_pluginEditorWidget->pluginList->currentItem(); if (currentItem) { - QuantaPlugin *plugin = m_plugins.find(currentItem->text(0)); + QuantaPlugin *plugin = m_plugins.tqfind(currentItem->text(0)); if(plugin) { m_plugins.remove(plugin->pluginName()); @@ -212,7 +212,7 @@ void PluginEditorItem::paintCell(TQPainter *a_painter, const TQColorGroup &a_cg, { /* if(a_column == 2) - a_align = Qt::AlignCenter; + a_align = TQt::AlignCenter; FIXME : Why won't QT let us align cell contents? */ TQListViewItem::paintCell(a_painter, a_cg, a_column, a_width, a_align); diff --git a/quanta/plugins/quantaplugineditor.h b/quanta/plugins/quantaplugineditor.h index 9f66e519..e26ad53f 100644 --- a/quanta/plugins/quantaplugineditor.h +++ b/quanta/plugins/quantaplugineditor.h @@ -42,6 +42,7 @@ class PluginEditor; class QuantaPluginEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: QuantaPluginEditor(TQWidget *, const char *); @@ -69,7 +70,7 @@ protected: PluginEditor *m_pluginEditorWidget; }; -class PluginEditorItem : public QListViewItem +class PluginEditorItem : public TQListViewItem { public: PluginEditorItem(TQListView *); diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index 098c7828..73ba5a48 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -38,12 +38,12 @@ #include "resource.h" #include "quantacommon.h" -QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent) +QuantaPluginInterface::QuantaPluginInterface(TQWidget *tqparent) { - m_parent = parent; + m_parent = tqparent; (void) new KAction( i18n( "Configure &Plugins..." ), 0, 0, this, TQT_SLOT( slotPluginsEdit() ), - ((KMainWindow*)parent)->actionCollection(), "configure_plugins" ); + ((KMainWindow*)tqparent)->actionCollection(), "configure_plugins" ); m_pluginMenu = 0L; // m_plugins.setAutoDelete(true); } @@ -71,7 +71,7 @@ void QuantaPluginInterface::readConfigFile(const TQString& configFile) // now that we have a list of the plugins, go through and get the details of them for(TQStringList::Iterator it = pList.begin();it != pList.end();++it) { - if (m_plugins.find(*it)) + if (m_plugins.tqfind(*it)) continue; config->setGroup(*it); @@ -90,7 +90,7 @@ void QuantaPluginInterface::readConfigFile(const TQString& configFile) if (pluginType == "Command Line") { emit hideSplash(); - KMessageBox::information(m_parent, i18n("<qt><b>%1</b> is a command line plugin. We have removed support for command-line plugins. However, the functionality has not been lost as script actions can still be used to run command-line tools. </qt>").arg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning"); + KMessageBox::information(m_parent, i18n("<qt><b>%1</b> is a command line plugin. We have removed support for command-line plugins. However, the functionality has not been lost as script actions can still be used to run command-line tools. </qt>").tqarg(*it), i18n("Unsupported Plugin Type"), "CommandLinePluginWarning"); continue; } @@ -176,7 +176,7 @@ bool QuantaPluginInterface::pluginAvailable(const TQString &a_name) { if (a_name.isEmpty()) return false; - QuantaPlugin *availPlugin = m_plugins.find(a_name); + QuantaPlugin *availPlugin = m_plugins.tqfind(a_name); if(availPlugin && QuantaPlugin::validatePlugin(availPlugin)) return true; @@ -257,7 +257,7 @@ void QuantaPluginInterface::slotPluginsValidate() { invalidNames += "<br>" + invalidPlugins[i]->name(); } - int answer = KMessageBox::questionYesNo(m_parent, i18n("<qt>The following plugins seems to be invalid:<b>%1</b>.<br><br>Do you want to edit the plugins?</qt>").arg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit")); + int answer = KMessageBox::questionYesNo(m_parent, i18n("<qt>The following plugins seems to be invalid:<b>%1</b>.<br><br>Do you want to edit the plugins?</qt>").tqarg(invalidNames), i18n("Invalid Plugins"), i18n("Edit Plugins"), i18n("Do Not Edit")); if(answer == KMessageBox::Yes) { slotPluginsEdit(); diff --git a/quanta/plugins/quantaplugininterface.h b/quanta/plugins/quantaplugininterface.h index 2749fbd0..6711e9e0 100644 --- a/quanta/plugins/quantaplugininterface.h +++ b/quanta/plugins/quantaplugininterface.h @@ -35,9 +35,10 @@ class QuantaPlugin; /**Provides an interface to the installed plugins *@author Marc Britton */ -class QuantaPluginInterface : public QObject +class QuantaPluginInterface : public TQObject { Q_OBJECT + TQ_OBJECT public: /** * since this class is a singleton you must use this function to access it @@ -45,10 +46,10 @@ public: * the parameters are only used at the first call to create the class * */ - static QuantaPluginInterface* const ref(TQWidget *parent = 0L) + static QuantaPluginInterface* const ref(TQWidget *tqparent = 0L) { static QuantaPluginInterface *m_ref; - if (!m_ref) m_ref = new QuantaPluginInterface (parent); + if (!m_ref) m_ref = new QuantaPluginInterface (tqparent); return m_ref; } @@ -76,7 +77,7 @@ private: * If you need the class use QuantaPluginInterface::ref() for * construction and reference */ - QuantaPluginInterface(TQWidget *parent); + QuantaPluginInterface(TQWidget *tqparent); protected slots: /** slot for the menu: validate */ diff --git a/quanta/project/eventconfigurationdlg.cpp b/quanta/project/eventconfigurationdlg.cpp index 29d23964..226c4bff 100644 --- a/quanta/project/eventconfigurationdlg.cpp +++ b/quanta/project/eventconfigurationdlg.cpp @@ -29,8 +29,8 @@ #include "eventeditordlg.h" #include "qpevents.h" -EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) -: EventConfigurationDlgS(parent,name,fl) +EventConfigurationDlg::EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl) +: EventConfigurationDlgS(tqparent,name,fl) { m_actionCollection = actionCollection; } @@ -48,7 +48,7 @@ void EventConfigurationDlg::initEvents(EventActions *events) for (TQValueList<EventAction>::ConstIterator it2 = evList.constBegin(); it2 != evList.constEnd(); ++it2) { EventAction ev = *it2; - item = new TQListViewItem(eventsListView, QPEvents::ref()->fullEventName(it.key()), QPEvents::ref()->fullActionName(ev.action)); + item = new TQListViewItem(eventsListView, TQPEvents::ref()->fullEventName(it.key()), TQPEvents::ref()->fullActionName(ev.action)); int argcount = ev.arguments.count(); if (argcount > 0) item->setText(2, ev.arguments[0]); @@ -78,8 +78,8 @@ void EventConfigurationDlg::saveEvents(TQDomDocument dom) node = dom.createElement("event"); eventsNode.appendChild(node); TQDomElement el = node.toElement(); - el.setAttribute("name", QPEvents::ref()->eventName(item->text(0))); - el.setAttribute("action", QPEvents::ref()->actionName(item->text(1))); + el.setAttribute("name", TQPEvents::ref()->eventName(item->text(0))); + el.setAttribute("action", TQPEvents::ref()->actionName(item->text(1))); if (el.attribute("action") == "script" || el.attribute("action") == "action") el.setAttribute("type", "external"); else @@ -141,7 +141,7 @@ void EventConfigurationDlg::slotDeleteEvent() { TQListViewItem *item = eventsListView->currentItem(); if (!item) return; - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove the configuration of the <b>%1</b> event?</qt>").arg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove the configuration of the <b>%1</b> event?</qt>").tqarg(item->text(0)), i18n("Delete Event Configuration"),KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h index c1451c81..0d8a305b 100644 --- a/quanta/project/eventconfigurationdlg.h +++ b/quanta/project/eventconfigurationdlg.h @@ -27,9 +27,10 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class EventConfigurationDlg : public EventConfigurationDlgS { Q_OBJECT + TQ_OBJECT public: - EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EventConfigurationDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~EventConfigurationDlg(); void initEvents(EventActions *events); void saveEvents(TQDomDocument dom); diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 329791b8..a9f8461d 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EventConfigurationDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EventConfigurationDlgS</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>enableEventsBox</cstring> </property> @@ -27,7 +27,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>172</width> <height>20</height> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>150</width> <height>20</height> @@ -211,12 +211,12 @@ <tabstop>editButton</tabstop> <tabstop>deleteButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotEditEvent()</slot> <slot>slotAddEvent()</slot> <slot>slotDeleteEvent()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/quanta/project/eventeditordlg.cpp b/quanta/project/eventeditordlg.cpp index 2926f916..db5c8b93 100644 --- a/quanta/project/eventeditordlg.cpp +++ b/quanta/project/eventeditordlg.cpp @@ -35,12 +35,12 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent, const char* name, WFlags fl) -: EventEditorDlgS(parent,name,fl) +EventEditorDlg::EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent, const char* name, WFlags fl) +: EventEditorDlgS(tqparent,name,fl) { m_actionCollection = actionCollection; - eventCombo->insertStringList(QPEvents::ref()->eventNames()); - actionCombo->insertStringList(QPEvents::ref()->actionNames()); + eventCombo->insertStringList(TQPEvents::ref()->eventNames()); + actionCombo->insertStringList(TQPEvents::ref()->actionNames()); slotActionChanged(actionCombo->currentText()); } @@ -79,7 +79,7 @@ TQString EventEditorDlg::argument1() { TQString s = argument1Combo->currentText(); TQString actionType = actionCombo->currentText(); - if (actionType == QPEvents::ref()->fullActionName("email")) + if (actionType == TQPEvents::ref()->fullActionName("email")) { if (s == i18n(teamLeaderStr.utf8())) s = "teamleader"; @@ -96,7 +96,7 @@ TQString EventEditorDlg::argument1() } return s; } else - if (actionType == QPEvents::ref()->fullActionName("script")) + if (actionType == TQPEvents::ref()->fullActionName("script")) { TQString s = argument1Combo->currentText(); for (TQMap<TQString, TQString>::ConstIterator it = m_scriptActions.constBegin(); it != m_scriptActions.constEnd(); ++it) @@ -109,7 +109,7 @@ TQString EventEditorDlg::argument1() } return s; } else - if (actionType == QPEvents::ref()->fullActionName("action")) + if (actionType == TQPEvents::ref()->fullActionName("action")) { TQString s = argument1Combo->currentText(); for (TQMap<TQString, TQString>::ConstIterator it = m_otherActions.constBegin(); it != m_otherActions.constEnd(); ++it) @@ -126,7 +126,7 @@ TQString EventEditorDlg::argument1() return s; } - return TQString::null; + return TQString(); } TQString EventEditorDlg::argument2() @@ -134,7 +134,7 @@ TQString EventEditorDlg::argument2() if (argument2Combo->isEnabled()) { TQString actionType = actionCombo->currentText(); - if (actionType == QPEvents::ref()->fullActionName("log")) + if (actionType == TQPEvents::ref()->fullActionName("log")) { int id = argument2Combo->currentItem(); if (id == 0) @@ -142,7 +142,7 @@ TQString EventEditorDlg::argument2() else return "minimal"; } else - if (actionType == QPEvents::ref()->fullActionName("script")) + if (actionType == TQPEvents::ref()->fullActionName("script")) { int id = argument2Combo->currentItem(); if (id == 0) @@ -152,7 +152,7 @@ TQString EventEditorDlg::argument2() } return argument2Combo->currentText(); } else - return TQString::null; + return TQString(); } TQString EventEditorDlg::argument3() @@ -160,7 +160,7 @@ TQString EventEditorDlg::argument3() if (argument3Combo->isEnabled()) { TQString actionType = actionCombo->currentText(); - if (actionType == QPEvents::ref()->fullActionName("log")) + if (actionType == TQPEvents::ref()->fullActionName("log")) { int id = argument3Combo->currentItem(); if (id == 0) @@ -170,7 +170,7 @@ TQString EventEditorDlg::argument3() } return argument3Combo->currentText(); } else - return TQString::null; + return TQString(); } TQString EventEditorDlg::argument4() @@ -179,13 +179,13 @@ TQString EventEditorDlg::argument4() { return argument4Combo->currentText(); } else - return TQString::null; + return TQString(); } void EventEditorDlg::setArguments(const TQStringList& arguments) { TQString actionType = actionCombo->currentText(); - if (actionType == QPEvents::ref()->fullActionName("email")) + if (actionType == TQPEvents::ref()->fullActionName("email")) { TQString s = arguments[0]; if (s == "teamleader") @@ -218,10 +218,10 @@ void EventEditorDlg::setArguments(const TQStringList& arguments) argument1Combo->setCurrentItem(0); } } else - if (actionType == QPEvents::ref()->fullActionName("script")) + if (actionType == TQPEvents::ref()->fullActionName("script")) { TQString s = arguments[0]; - if (m_scriptActions.contains(s)) + if (m_scriptActions.tqcontains(s)) s = m_scriptActions[s]; if (argument1Combo->contains(s)) { @@ -246,10 +246,10 @@ void EventEditorDlg::setArguments(const TQStringList& arguments) argument2Combo->setCurrentItem(1); return; //setup for script arguments completed } else - if (actionType == QPEvents::ref()->fullActionName("action")) + if (actionType == TQPEvents::ref()->fullActionName("action")) { TQString s = arguments[0]; - if (m_otherActions.contains(s)) + if (m_otherActions.tqcontains(s)) s = m_otherActions[s]; if (argument1Combo->contains(s)) { @@ -268,7 +268,7 @@ void EventEditorDlg::setArguments(const TQStringList& arguments) argument1Combo->setCurrentItem(0); } } else - if (actionType == QPEvents::ref()->fullActionName("log")) + if (actionType == TQPEvents::ref()->fullActionName("log")) { argument1Combo->insertItem(arguments[0], 0); argument1Combo->setCurrentItem(0); @@ -312,7 +312,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) resetArgumentWidgets(argument2Label, argument2Combo); resetArgumentWidgets(argument3Label, argument3Combo); resetArgumentWidgets(argument4Label, argument4Combo); - if (name == QPEvents::ref()->fullActionName("email")) + if (name == TQPEvents::ref()->fullActionName("email")) { argument1Label->setEnabled(true); argument1Label->setText(i18n("Receiver:")); @@ -331,7 +331,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) argument1Combo->insertItem(i18n(taskLeaderStr.utf8()) + " - " + tasks[i]); } } else - if (name == QPEvents::ref()->fullActionName("log")) + if (name == TQPEvents::ref()->fullActionName("log")) { argument1Label->setEnabled(true); argument1Label->setText(i18n("Log file:")); @@ -350,7 +350,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) argument3Combo->insertItem(i18n("Create New Log"), 0); argument3Combo->insertItem(i18n("Append to Existing Log"), 1); } else - if (name == QPEvents::ref()->fullActionName("script")) + if (name == TQPEvents::ref()->fullActionName("script")) { argument1Label->setEnabled(true); argument1Label->setText(i18n("Action name:")); @@ -363,7 +363,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) action = dynamic_cast<TagAction*>(m_actionCollection->action(i)); if (action && action->type() == "script") { - s = action->text().replace(r, ""); + s = action->text().tqreplace(r, ""); items.append(s); m_scriptActions[action->name()] = s; } @@ -378,7 +378,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) argument2Combo->insertItem(i18n("Yes"), 0); argument2Combo->insertItem(i18n("No"), 1); } else - if (name == QPEvents::ref()->fullActionName("action")) + if (name == TQPEvents::ref()->fullActionName("action")) { argument1Label->setEnabled(true); argument1Label->setText(i18n("Action name:")); @@ -392,7 +392,7 @@ void EventEditorDlg::slotActionChanged(const TQString &name) action = dynamic_cast<TagAction*>(a); if (!action || action->type() != "script") { - s = a->text().replace(r, ""); + s = a->text().tqreplace(r, ""); items.append(s); m_otherActions[a->name()] = s; } diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h index 9f89a09c..73897b39 100644 --- a/quanta/project/eventeditordlg.h +++ b/quanta/project/eventeditordlg.h @@ -27,9 +27,10 @@ class KComboBox; class EventEditorDlg : public EventEditorDlgS { Q_OBJECT + TQ_OBJECT public: - EventEditorDlg(KActionCollection *actionCollection, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + EventEditorDlg(KActionCollection *actionCollection, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); ~EventEditorDlg(); void setEvent(const TQString &name); void setAction(const TQString &name); diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui index a19a35d1..ba10f39b 100644 --- a/quanta/project/eventeditordlgs.ui +++ b/quanta/project/eventeditordlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EventEditorDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EventEditorDlgS</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>0</height> @@ -33,7 +33,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -62,7 +62,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -91,7 +91,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>argument1Label</cstring> </property> @@ -123,7 +123,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>argument2Label</cstring> </property> @@ -155,7 +155,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>argument3Label</cstring> </property> @@ -171,7 +171,7 @@ <string>Argument 3:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>argument4Label</cstring> </property> @@ -229,8 +229,8 @@ <slot>slotActionChanged(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotActionChanged(const QString &name)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/membereditdlg.cpp b/quanta/project/membereditdlg.cpp index 1b27d354..047ff302 100644 --- a/quanta/project/membereditdlg.cpp +++ b/quanta/project/membereditdlg.cpp @@ -38,8 +38,8 @@ TQString teamLeaderStr = I18N_NOOP("Team Leader"); TQString subprojectLeaderStr = I18N_NOOP("Subproject Leader"); -MemberEditDlg::MemberEditDlg(TQWidget *parent, const char *name) - : MemberEditDlgS(parent, name) +MemberEditDlg::MemberEditDlg(TQWidget *tqparent, const char *name) + : MemberEditDlgS(tqparent, name) { TQValueList<SubProject> *subprojects = Project::ref()->subprojects(); for (TQValueList<SubProject>::ConstIterator it = subprojects->constBegin(); it != subprojects->constEnd(); ++it) @@ -53,7 +53,7 @@ MemberEditDlg::MemberEditDlg(TQWidget *parent, const char *name) { nameCombo->insertItem(it.key()); } - nameCombo->insertItem(TQString::null, 0); + nameCombo->insertItem(TQString(), 0); roleCombo->insertItem(i18n(teamLeaderStr.utf8())); roleCombo->insertItem(i18n(subprojectLeaderStr.utf8())); @@ -123,7 +123,7 @@ void MemberEditDlg::slotMemberSelected() { TQString name = nameCombo->currentText(); TQMap<TQString, TeamMember> members = Project::ref()->allMembers(); - if (members.contains(name)) + if (members.tqcontains(name)) { emailEdit->setText(members[name].email); } diff --git a/quanta/project/membereditdlg.h b/quanta/project/membereditdlg.h index 3c6c94a8..c4173e91 100644 --- a/quanta/project/membereditdlg.h +++ b/quanta/project/membereditdlg.h @@ -25,8 +25,9 @@ class MemberEditDlg : public MemberEditDlgS { Q_OBJECT + TQ_OBJECT public: - MemberEditDlg(TQWidget *parent = 0, const char *name = 0); + MemberEditDlg(TQWidget *tqparent = 0, const char *name = 0); ~MemberEditDlg(); void selectMember(const TQString &name); diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui index 487e20bf..f8d22bbe 100644 --- a/quanta/project/membereditdlgs.ui +++ b/quanta/project/membereditdlgs.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>MemberEditDlgS</class> <author>(C) 2005 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>MemberEditDlgS</cstring> </property> @@ -33,7 +33,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -62,7 +62,7 @@ <cstring>taskEdit</cstring> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel5</cstring> </property> @@ -73,7 +73,7 @@ <cstring>taskEdit</cstring> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class="TQLabel" row="5" column="0"> <property name="name"> <cstring>textLabel6</cstring> </property> @@ -84,7 +84,7 @@ <cstring>subprojectCombo</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>textLabel4</cstring> </property> @@ -95,7 +95,7 @@ <cstring>roleCombo</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -119,7 +119,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3_2</cstring> </property> @@ -175,13 +175,13 @@ <tabstop>subprojectCombo</tabstop> <tabstop>editSubprojectsButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotRoleSelected(const QString& roleName)</slot> <slot>slotEditSubprojects()</slot> <slot>slotMemberSelected()</slot> <slot>slotSelectFromAddrBook()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index fa4af964..d5988c69 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -68,15 +68,15 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -Project::Project(KMainWindow *parent) +Project::Project(KMainWindow *tqparent) : TQObject() { d = new ProjectPrivate(this); connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); - d->m_mainWindow = parent; + d->m_mainWindow = tqparent; d->m_uploadDialog = 0L; keepPasswd = true; - d->initActions(parent->actionCollection()); + d->initActions(tqparent->actionCollection()); } Project::~Project() @@ -109,7 +109,7 @@ KURL::List Project::files() return list; } -void Project::insertFile(const KURL& nameURL, bool repaint ) +void Project::insertFile(const KURL& nameURL, bool tqrepaint ) { if (d->excludeRx.exactMatch(nameURL.path())) return; @@ -118,7 +118,7 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) if ( !d->baseURL.isParentOf(url) ) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(nameURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(nameURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); @@ -143,26 +143,26 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) TQDomElement el; while ( d->baseURL.isParentOf(url) ) { - if ( !d->m_projectFiles.contains(url) ) + if ( !d->m_projectFiles.tqcontains(url) ) { el = d->dom.createElement("item"); - el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(url, d->baseURL) )); + el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(url, d->baseURL) )); d->dom.firstChild().firstChild().appendChild( el ); KURL u = url.upURL(); - ProjectURL *parentURL = d->m_projectFiles.find(u); - int uploadStatus = 1; - if (parentURL) - uploadStatus = parentURL->uploadStatus; - d->m_projectFiles.insert( new ProjectURL(url, "", uploadStatus, false, el) ); + ProjectURL *tqparentURL = d->m_projectFiles.tqfind(u); + int uploadtqStatus = 1; + if (tqparentURL) + uploadtqStatus = tqparentURL->uploadtqStatus; + d->m_projectFiles.insert( new ProjectURL(url, "", uploadtqStatus, false, el) ); } url.setPath(url.directory(false)); } - emit eventHappened("after_project_add", url.url(), TQString::null); + emit eventHappened("after_project_add", url.url(), TQString()); setModified(); - if ( repaint ) + if ( tqrepaint ) { emit reloadTree( &(d->m_projectFiles), false, TQStringList()); - emit newStatus(); + emit newtqStatus(); } } @@ -213,7 +213,7 @@ void Project::loadLastProject(bool reload) { KURL tempURL = KURL().fromPathOrURL(tempPath); if (KIO::NetAccess::exists(tempURL, false, d->m_mainWindow) && - KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").arg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) + KMessageBox::questionYesNo(d->m_mainWindow, i18n("<qt>Found a backup for project <b>%1</b>.<br> Do you want to open it?</qt>").tqarg(url.prettyURL()), i18n("Open Project Backup"), KStdGuiItem::open(), i18n("Do Not Open") ) == KMessageBox::Yes) { d->m_tmpProjectFile = tempPath; @@ -258,11 +258,11 @@ void Project::slotOpenProject(const KURL &url) kdDebug(24000) << "Open recent project: " << url <<endl; if ( !url.isEmpty() ) { - if ( !QExtFileInfo::exists(url, true, d->m_mainWindow) ) + if ( !TQExtFileInfo::exists(url, true, d->m_mainWindow) ) { emit hideSplash(); if (KMessageBox::questionYesNo(d->m_mainWindow, - i18n("<qt>The file <b>%1</b> does not exist.<br> Do you want to remove it from the list?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString::null, KStdGuiItem::del(), i18n("Keep") ) + i18n("<qt>The file <b>%1</b> does not exist.<br> Do you want to remove it from the list?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep") ) == KMessageBox::Yes) { d->m_projectRecent->removeURL(url); @@ -271,7 +271,7 @@ void Project::slotOpenProject(const KURL &url) } else { d->loadProject ( url ); - emit eventHappened("after_project_open", url.url(), TQString::null); + emit eventHappened("after_project_open", url.url(), TQString()); } } } @@ -297,7 +297,7 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) if (showDlg) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( d->baseURL.prettyURL(), d->m_mainWindow, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); destination = urlRequesterDlg->selectedURL(); @@ -364,7 +364,7 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL) ProjectURL * curUrl = it.current(); if ( oldURL == *curUrl || (isFolder && oldURL.isParentOf(*curUrl)) ) { - curUrl->setPath( curUrl->path().replace(oldURL.path(), newURL.path()) ); + curUrl->setPath( curUrl->path().tqreplace(oldURL.path(), newURL.path()) ); el = curUrl->domElement; el.setAttribute("url", d->m_projectFiles.toRelative(*curUrl).path()); // el.setAttribute("upload_time", ""); @@ -379,12 +379,12 @@ void Project::slotRenamed(const KURL& oldURL, const KURL& newURL) progressBar->setValue(0); progressBar->setTextEnabled(false); - emit statusMsg(TQString::null); + emit statusMsg(TQString()); if (d->m_modified) setModified(); // there happens more than setting the flag ! emit reloadTree(&(d->m_projectFiles), false, TQStringList()); - emit newStatus(); + emit newtqStatus(); } @@ -406,7 +406,7 @@ void Project::slotRemove(const KURL& urlToRemove) { d->m_projectFiles.removeFromListAndXML(url); d->m_modified = true; - emit eventHappened("after_project_remove", url.url(), TQString::null); + emit eventHappened("after_project_remove", url.url(), TQString()); if (!isFolder) break; } @@ -417,17 +417,17 @@ void Project::slotRemove(const KURL& urlToRemove) progressBar->setValue(0); progressBar->setTextEnabled(false); - emit statusMsg(TQString::null); + emit statusMsg(TQString()); if (d->m_modified) setModified(); // there happens more than setting the flag ! emit reloadTree( &(d->m_projectFiles), false, TQStringList() ); - emit newStatus(); + emit newtqStatus(); - TQString urlPath = QExtFileInfo::toRelative(urlToRemove, d->baseURL).path(); + TQString urlPath = TQExtFileInfo::toRelative(urlToRemove, d->baseURL).path(); TQString nice = urlPath; nice = KStringHandler::lsqueeze(nice, 60); - if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("<qt>Do you want to remove <br><b>%1</b><br> from the server(s) as well?</qt>").arg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) + if (KMessageBox::warningContinueCancel(d->m_mainWindow, i18n("<qt>Do you want to remove <br><b>%1</b><br> from the server(s) as well?</qt>").tqarg(nice), i18n("Remove From Server"), KStdGuiItem::remove(), "RemoveFromServer") == KMessageBox::Continue ) { TQDomNode profilesNode = d->m_sessionDom.firstChild().firstChild().namedItem("uploadprofiles"); TQDomNodeList profileList = profilesNode.toElement().elementsByTagName("profile"); @@ -468,9 +468,9 @@ void Project::slotOptions() topLayout->addWidget(&optionsPage); optionsPage.linePrjName->setText( d->projectName ); - url = QExtFileInfo::toRelative(d->templateURL, d->baseURL); + url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL); optionsPage.linePrjTmpl->setText(QuantaCommon::qUrl(url)); - url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL); + url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL); optionsPage.linePrjToolbar->setText( QuantaCommon::qUrl(url) ); optionsPage.lineAuthor->setText( d->author ); @@ -627,16 +627,16 @@ void Project::slotOptions() QuantaCommon::setUrl(d->templateURL, optionsPage.linePrjTmpl->text()); d->templateURL.adjustPath(1); - d->templateURL = QExtFileInfo::toAbsolute(d->templateURL, d->baseURL); - if (!QExtFileInfo::createDir(d->templateURL, d->m_mainWindow)) + d->templateURL = TQExtFileInfo::toAbsolute(d->templateURL, d->baseURL); + if (!TQExtFileInfo::createDir(d->templateURL, d->m_mainWindow)) { QuantaCommon::dirCreationError(d->m_mainWindow, d->templateURL); } QuantaCommon::setUrl(d->toolbarURL, optionsPage.linePrjToolbar->text()); d->toolbarURL.adjustPath(1); - d->toolbarURL = QExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL); - if (!QExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow)) + d->toolbarURL = TQExtFileInfo::toAbsolute(d->toolbarURL, d->baseURL); + if (!TQExtFileInfo::createDir(d->toolbarURL, d->m_mainWindow)) { QuantaCommon::dirCreationError(d->m_mainWindow, d->toolbarURL); } @@ -658,14 +658,14 @@ void Project::slotOptions() el = projectNode.namedItem("author").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el =d->dom.createElement("author"); projectNode.appendChild( el ); el.appendChild(d->dom.createTextNode( d->author ) ); el = projectNode.namedItem("email").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el =d->dom.createElement("email"); projectNode.appendChild( el ); el.appendChild(d->dom.createTextNode( d->email ) ); @@ -673,7 +673,7 @@ void Project::slotOptions() // Debugger el =projectNode.namedItem("debuggerclient").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el =d->dom.createElement("debuggerclient"); projectNode.appendChild( el ); el.appendChild(d->dom.createTextNode( d->debuggerClient ) ); @@ -684,7 +684,7 @@ void Project::slotOptions() excludeStr = optionsPage.lineExclude->text(); el =projectNode.namedItem("exclude").toElement(); if (!el.isNull()) - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); el =d->dom.createElement("exclude"); if (d->m_excludeCvsignore) el.setAttribute("cvsignore", "true"); @@ -706,7 +706,7 @@ void Project::slotOptions() } el = projectNode.namedItem("templates").toElement(); - url = QExtFileInfo::toRelative(d->templateURL, d->baseURL); + url = TQExtFileInfo::toRelative(d->templateURL, d->baseURL); if(el.isNull()) { el =d->dom.createElement("templates"); @@ -718,7 +718,7 @@ void Project::slotOptions() el.firstChild().setNodeValue(QuantaCommon::qUrl(url)); } - url = QExtFileInfo::toRelative(d->toolbarURL, d->baseURL); + url = TQExtFileInfo::toRelative(d->toolbarURL, d->baseURL); el = projectNode.namedItem("toolbars").toElement(); if(el.isNull()) { @@ -826,7 +826,7 @@ void Project::slotOptions() //subprojects without a leader for (uint i = 0; i < d->m_subprojects.count(); i++) { - if (!savedSubprojects.contains(d->m_subprojects[i].name)) + if (!savedSubprojects.tqcontains(d->m_subprojects[i].name)) { el = d->dom.createElement("subproject"); el.setAttribute("name", d->m_subprojects[i].name); @@ -874,7 +874,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName if (!ViewManager::ref()->saveAll()) return; - KURL url = QExtFileInfo::toRelative( urlToUpload, d->baseURL); + KURL url = TQExtFileInfo::toRelative( urlToUpload, d->baseURL); if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii()); @@ -909,7 +909,7 @@ KURL Project::urlWithPrefix(const KURL& url) if (d->usePreviewPrefix) { - KURL tempUrl = QExtFileInfo::toRelative(url, d->baseURL ); + KURL tempUrl = TQExtFileInfo::toRelative(url, d->baseURL ); if ( !tempUrl.path().startsWith("/") ) { returnUrl = d->previewPrefix; @@ -921,16 +921,16 @@ KURL Project::urlWithPrefix(const KURL& url) /*Returns true if url is already in the project.*/ -bool Project::contains(const KURL& url) +bool Project::tqcontains(const KURL& url) { if (d->m_projectFiles.isEmpty()) d->m_projectFiles.readFromXML(d->dom, d->baseURL, d->templateURL, d->excludeRx); - return d->m_projectFiles.contains(url); + return d->m_projectFiles.tqcontains(url); } void Project::slotFileDescChanged(const KURL& url, const TQString& desc) { - ProjectURL *proUrl = d->m_projectFiles.find(url); + ProjectURL *proUrl = d->m_projectFiles.tqfind(url); if (! proUrl) return; @@ -942,7 +942,7 @@ void Project::slotFileDescChanged(const KURL& url, const TQString& desc) void Project::slotUploadStatusChanged(const KURL& url, int status) { - if (! d->m_projectFiles.contains(url)) + if (! d->m_projectFiles.tqcontains(url)) return; TQDomElement el; @@ -952,7 +952,7 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) { if ( it.currentKey().startsWith(urlStr) || it.currentKey() + "/" == urlStr) { - it.current()->uploadStatus = status; + it.current()->uploadtqStatus = status; el = it.current()->domElement; el.setAttribute("uploadstatus", status); } @@ -960,9 +960,9 @@ void Project::slotUploadStatusChanged(const KURL& url, int status) setModified(); } -void Project::slotChangeDocumentFolderStatus(const KURL &url, bool status) +void Project::slotChangeDocumentFoldertqStatus(const KURL &url, bool status) { - ProjectURL *proUrl = d->m_projectFiles.find(url); + ProjectURL *proUrl = d->m_projectFiles.tqfind(url); if (! proUrl) return; @@ -985,10 +985,10 @@ KURL Project::projectBaseURL() Document *w = ViewManager::ref()->activeDocument(); if ( !w || w->isUntitled() ) { - result = QExtFileInfo::home(); + result = TQExtFileInfo::home(); } else { - result = QExtFileInfo::path(w->url()); + result = TQExtFileInfo::path(w->url()); } } return result; @@ -1013,7 +1013,7 @@ void Project::savePassword(const TQString &entry, const TQString &passwd, bool s TQString Project::password(const TQString &entry) { - if (d->m_passwdList.contains(entry)) + if (d->m_passwdList.tqcontains(entry)) return d->m_passwdList[entry]; else { @@ -1187,7 +1187,7 @@ TeamMember Project::teamLeader() TeamMember Project::subprojectLeader(const TQString &name) { - if (d->m_subprojectLeaders.contains(name)) + if (d->m_subprojectLeaders.tqcontains(name)) return d->m_subprojectLeaders[name]; else return TeamMember(); @@ -1195,7 +1195,7 @@ TeamMember Project::subprojectLeader(const TQString &name) TeamMember Project::taskLeader(const TQString &name) { - if (d->m_taskLeaders.contains(name)) + if (d->m_taskLeaders.tqcontains(name)) return d->m_taskLeaders[name]; else return TeamMember(); @@ -1257,7 +1257,7 @@ bool Project::queryClose() bool canExit = true; if (hasProject()) { - emit eventHappened("before_project_close", d->baseURL.url(), TQString::null); + emit eventHappened("before_project_close", d->baseURL.url(), TQString()); d->config->setGroup("Projects"); KURL url = d->projectURL.url(); url.setPass(""); @@ -1270,7 +1270,7 @@ bool Project::queryClose() } if (canExit) { - emit eventHappened("after_project_close", d->baseURL.url(), TQString::null); + emit eventHappened("after_project_close", d->baseURL.url(), TQString()); // empty dom tree d->dom.clear(); d->m_sessionDom.clear(); @@ -1280,7 +1280,7 @@ bool Project::queryClose() reloadTree( &(d->m_projectFiles), true, TQStringList()); d->adjustActions(); d->m_projectRecent->setCurrentItem(-1); - newStatus(); + newtqStatus(); // kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } } @@ -1313,11 +1313,11 @@ void Project::slotShowProjectToolbar(bool show) void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { - if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks) + if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks) return; TQDomNodeList nl = d->dom.elementsByTagName("item"); TQDomElement el; - KURL u = QExtFileInfo::toRelative(url, d->baseURL); + KURL u = TQExtFileInfo::toRelative(url, d->baseURL); for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); @@ -1337,7 +1337,7 @@ void Project::loadBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { - if (!markIf || !hasProject() || !contains(url) || !d->m_persistentBookmarks) + if (!markIf || !hasProject() || !tqcontains(url) || !d->m_persistentBookmarks) return; TQStringList markList; TQPtrList<KTextEditor::Mark> marks = markIf->marks(); @@ -1345,11 +1345,11 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) { KTextEditor::Mark *mark = marks.at(i); if (mark->type == KTextEditor::MarkInterface::Bookmark) - markList << TQString("%1").arg(mark->line); + markList << TQString("%1").tqarg(mark->line); } TQDomNodeList nl = d->dom.elementsByTagName("item"); TQDomElement el; - KURL u = QExtFileInfo::toRelative(url, d->baseURL); + KURL u = TQExtFileInfo::toRelative(url, d->baseURL); for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); @@ -1363,11 +1363,11 @@ void Project::saveBookmarks(const KURL &url, KTextEditor::MarkInterface *markIf) void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf) { - if (!viewCursorIf || !hasProject() || !contains(url)) + if (!viewCursorIf || !hasProject() || !tqcontains(url)) return; TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item"); TQDomElement el; - KURL u = QExtFileInfo::toRelative(url, d->baseURL); + KURL u = TQExtFileInfo::toRelative(url, d->baseURL); for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); @@ -1387,20 +1387,20 @@ void Project::loadCursorPosition(const KURL &url, KTextEditor::ViewCursorInterfa } KURL u2 = d->baseURL; QuantaCommon::setUrl(u2, el.attribute("url")); - if (!contains(u2)) + if (!tqcontains(u2)) { - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); } } } void Project::saveCursorPosition(const KURL &url, KTextEditor::ViewCursorInterface *viewCursorIf) { - if (!viewCursorIf || !hasProject() || !contains(url)) + if (!viewCursorIf || !hasProject() || !tqcontains(url)) return; TQDomNodeList nl = d->m_sessionDom.elementsByTagName("item"); TQDomElement el; - KURL u = QExtFileInfo::toRelative(url, d->baseURL); + KURL u = TQExtFileInfo::toRelative(url, d->baseURL); uint line, col; viewCursorIf->cursorPosition(&line, &col); bool found = false; diff --git a/quanta/project/project.h b/quanta/project/project.h index 95995036..6315c058 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -22,7 +22,7 @@ #include "projecturl.h" -class QDom; +class TQDom; class ProjectPrivate; class ProjectList; namespace KTextEditor{ @@ -53,6 +53,7 @@ struct SubProject { class Project : public TQObject { Q_OBJECT + TQ_OBJECT friend class ProjectPrivate; // need this because I use the signals public: @@ -63,10 +64,10 @@ public: * the parameter is only used at the first call to create the class * */ - static Project* const ref(KMainWindow *parent = 0L) + static Project* const ref(KMainWindow *tqparent = 0L) { static Project *m_ref; - if (!m_ref) m_ref = new Project(parent); + if (!m_ref) m_ref = new Project(tqparent); return m_ref; } @@ -78,7 +79,7 @@ public: TQStringList fileNameList(); KURL::List files(); - void insertFile( const KURL& nameURL, bool repaint ); + void insertFile( const KURL& nameURL, bool tqrepaint ); void readConfig(KConfig *); /** loads the last project again if reload == true but checks in any case if there is a left over project from a crash @@ -86,7 +87,7 @@ public: void loadLastProject(bool reload); /** Returns the relative url with the prefix inserted. */ KURL urlWithPrefix(const KURL& url); - bool contains(const KURL &url); + bool tqcontains(const KURL &url); /** Read property of TQString defaultDTD. */ const TQString& defaultDTD(); const TQString& defaultEncoding(); @@ -173,7 +174,7 @@ public slots: void slotRescanPrjDir(); void slotFileDescChanged(const KURL& url, const TQString& desc); void slotUploadStatusChanged(const KURL& url, int status); - void slotChangeDocumentFolderStatus(const KURL& url, bool status); + void slotChangeDocumentFoldertqStatus(const KURL& url, bool status); void slotReloadProjectDocs(); @@ -193,7 +194,7 @@ signals: void messages(const TQString& ); void enableMessageWidget(); - void newStatus(); + void newtqStatus(); void statusMsg(const TQString &); /** No descriptions */ void newProjectLoaded(const TQString &, const KURL &, const KURL &); @@ -203,7 +204,7 @@ signals: void getUserToolbarFiles(KURL::List *); void loadToolbarFile(const KURL &); /** ask for the tree status for saving in project */ - void getTreeStatus(TQStringList *); + void getTreetqStatus(TQStringList *); void eventHappened(const TQString&, const TQString&, const TQString& ); private: @@ -211,7 +212,7 @@ private: * If you need the class use Project::ref() for * construction and reference */ - Project(KMainWindow *parent); + Project(KMainWindow *tqparent); ProjectPrivate *d; bool m_projectToolbarVisible; diff --git a/quanta/project/projectlist.cpp b/quanta/project/projectlist.cpp index fabec2fd..db162ce2 100644 --- a/quanta/project/projectlist.cpp +++ b/quanta/project/projectlist.cpp @@ -69,19 +69,19 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, } } path = url.path(); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); if ( el.nodeName() == "item" ) { - if (excludeRx.exactMatch(path) || find(url.url(-1))) + if (excludeRx.exactMatch(path) || tqfind(url.url(-1))) { - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); modified = true; i--; } else { bool docFolder = (el.attribute("documentFolder", "false") == "true"); - int uploadStatus = el.attribute("uploadstatus", "-1").toInt(); - if (uploadStatus == -1) + int uploadtqStatus = el.attribute("uploadstatus", "-1").toInt(); + if (uploadtqStatus == -1) el.setAttribute("uploadstatus", 1); //remove non-existent local files if ( url.isLocalFile() ) @@ -89,7 +89,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, TQFileInfo fi( url.path() ); if ( !fi.exists() ) { - el.parentNode().removeChild( el ); + el.tqparentNode().removeChild( el ); modified = true; i--; } else @@ -106,7 +106,7 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, } progressBar->advance(1); } - ProjectURL *proUrl = find(baseURL); + ProjectURL *proUrl = tqfind(baseURL); if (!proUrl) { el = dom.createElement("item"); @@ -126,10 +126,10 @@ bool ProjectList::readFromXML(TQDomDocument &dom, const KURL &baseURL, bool ProjectList::removeFromListAndXML(const KURL &url) { - ProjectURL *p = find(url); + ProjectURL *p = tqfind(url); if (p) { TQDomElement el = p->domElement; - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); remove(url.url(-1)); return true; } @@ -137,15 +137,15 @@ bool ProjectList::removeFromListAndXML(const KURL &url) } -bool ProjectList::contains(const KURL &url) const +bool ProjectList::tqcontains(const KURL &url) const { - return ProjectUrlList::find(url.url(-1)); + return ProjectUrlList::tqfind(url.url(-1)); } -ProjectURL * ProjectList::find(const KURL &url) const +ProjectURL * ProjectList::tqfind(const KURL &url) const { - return ProjectUrlList::find(url.url(-1)); + return ProjectUrlList::tqfind(url.url(-1)); } @@ -157,7 +157,7 @@ void ProjectList::insert(ProjectURL *url) bool ProjectList::isFolder(const KURL &url) const { - ProjectURL *p = find(url); + ProjectURL *p = tqfind(url); return ( p && url.url(-1) != (*p).url() ); } @@ -168,9 +168,9 @@ void ProjectList::insert(const TQString & key, const ProjectURL * item) } -ProjectURL * ProjectList::find ( const TQString & key ) const +ProjectURL * ProjectList::tqfind ( const TQString & key ) const { - return ProjectUrlList::find(key); + return ProjectUrlList::tqfind(key); } @@ -180,8 +180,8 @@ bool ProjectList::remove ( const TQString & key ) } -void ProjectList::replace(const TQString & key, const ProjectURL * item) +void ProjectList::tqreplace(const TQString & key, const ProjectURL * item) { - ProjectUrlList::replace(key, item); + ProjectUrlList::tqreplace(key, item); } diff --git a/quanta/project/projectlist.h b/quanta/project/projectlist.h index 7106e142..baec78ec 100644 --- a/quanta/project/projectlist.h +++ b/quanta/project/projectlist.h @@ -56,7 +56,7 @@ public: */ KURL toRelative(const KURL &url) const { - return QExtFileInfo::toRelative(url, m_baseURL, false); + return TQExtFileInfo::toRelative(url, m_baseURL, false); } /** @@ -68,11 +68,11 @@ public: /** @return true if url is in container */ - bool contains(const KURL &url) const; + bool tqcontains(const KURL &url) const; /** @return pointer to the entry or 0 if not found */ - ProjectURL * find(const KURL &url) const; + ProjectURL * tqfind(const KURL &url) const; /** Attention: never delete the object you have given here because the @@ -97,9 +97,9 @@ private: /** private because I want to control the key. - use find(const KURL &url) instead. + use tqfind(const KURL &url) instead. */ - ProjectURL *find ( const TQString & key ) const; + ProjectURL *tqfind ( const TQString & key ) const; /** private because I want to control the key. @@ -109,7 +109,7 @@ private: /** private because I want to control the key. */ - void replace(const TQString & key, const ProjectURL * item); + void tqreplace(const TQString & key, const ProjectURL * item); }; #endif // PROJECTFILES_H diff --git a/quanta/project/projectnewfinal.cpp b/quanta/project/projectnewfinal.cpp index b96e8b6f..033df99e 100644 --- a/quanta/project/projectnewfinal.cpp +++ b/quanta/project/projectnewfinal.cpp @@ -26,8 +26,8 @@ #include "projectnewfinal.h" #include "projectnewfinal.moc" -ProjectNewFinal::ProjectNewFinal(TQWidget *parent, const char *name ) - : ProjectNewFinalS(parent,name) +ProjectNewFinal::ProjectNewFinal(TQWidget *tqparent, const char *name ) + : ProjectNewFinalS(tqparent,name) { imagelabel->setPixmap( UserIcon("wiznewprjfin") ); } @@ -37,6 +37,6 @@ ProjectNewFinal::~ProjectNewFinal(){ void ProjectNewFinal::setMargin(int i) { - layout()->setMargin(i); + tqlayout()->setMargin(i); } diff --git a/quanta/project/projectnewfinal.h b/quanta/project/projectnewfinal.h index 16a40791..578aaa47 100644 --- a/quanta/project/projectnewfinal.h +++ b/quanta/project/projectnewfinal.h @@ -26,8 +26,9 @@ class ProjectNewFinal : public ProjectNewFinalS { Q_OBJECT + TQ_OBJECT public: - ProjectNewFinal(TQWidget *parent=0, const char *name=0); + ProjectNewFinal(TQWidget *tqparent=0, const char *name=0); ~ProjectNewFinal(); void setMargin(int); diff --git a/quanta/project/projectnewfinals.ui b/quanta/project/projectnewfinals.ui index ffaac915..50cb98f4 100644 --- a/quanta/project/projectnewfinals.ui +++ b/quanta/project/projectnewfinals.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectNewFinalS</cstring> </property> @@ -29,27 +29,27 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> </size> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>imagelabel</cstring> </property> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>115</width> <height>480</height> @@ -79,7 +79,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -95,22 +95,22 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -121,12 +121,12 @@ <string>Prefix:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>lineAuthor</cstring> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="5"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -137,11 +137,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3_2_3</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -151,16 +151,16 @@ <string>Default DTD:</string> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel3_2_2_2</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -170,14 +170,14 @@ <string>Default encoding:</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>dtdCombo</cstring> </property> </widget> </grid> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>insertLocalTemplates</cstring> </property> @@ -185,7 +185,7 @@ <string>Insert &local templates</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>insertGlobalTemplates</cstring> </property> @@ -193,7 +193,7 @@ <string>Insert &global templates</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>checkPrefix</cstring> </property> @@ -201,7 +201,7 @@ <string>Use preview prefi&x</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -209,7 +209,7 @@ <string>Author:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="4"> + <widget class="TQLineEdit" row="0" column="4"> <property name="name"> <cstring>lineEmail</cstring> </property> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -248,7 +248,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>linePrefix</cstring> </property> @@ -256,7 +256,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -292,5 +292,5 @@ <tabstop>insertGlobalTemplates</tabstop> <tabstop>insertLocalTemplates</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index 28c4b611..76a98a79 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -39,8 +39,8 @@ #include "quantacommon.h" #include "qextfileinfo.h" -ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name ) - : ProjectNewGeneralS(parent,name) +ProjectNewGeneral::ProjectNewGeneral(TQWidget *tqparent, const char *name ) + : ProjectNewGeneralS(tqparent,name) { imagelabel->setPixmap( UserIcon("wiznewprjglb") ); linePrjName->setFocus(); @@ -137,7 +137,7 @@ void ProjectNewGeneral::slotLinePrjFile( const TQString & ) baseUrl = url; if (baseUrl.isLocalFile()) { - s = QExtFileInfo::canonicalPath(baseUrl.path()); + s = TQExtFileInfo::canonicalPath(baseUrl.path()); if (!s.isEmpty()) baseUrl.setPath(s); } @@ -149,7 +149,7 @@ void ProjectNewGeneral::slotChangeNames( const TQString &text ) { int i; TQString fname = text.lower(); - while( (i=fname.find(" ")) >=0 ) fname.remove(i,1); + while( (i=fname.tqfind(" ")) >=0 ) fname.remove(i,1); linePrjFile->setText( fname+".webprj" ); } @@ -164,7 +164,7 @@ TQString ProjectNewGeneral::type() void ProjectNewGeneral::setMargin(int i) { - layout()->setMargin(i); + tqlayout()->setMargin(i); } void ProjectNewGeneral::slotButtonTmpl() @@ -177,7 +177,7 @@ void ProjectNewGeneral::slotButtonTmpl() linePrjTmpl->setText(KURL::relativeURL(baseUrl, url)); } else { - KMessageBox::sorry(this, i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(this, i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -192,7 +192,7 @@ void ProjectNewGeneral::slotButtonToolbar() } { KMessageBox::sorry(0, i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>") - .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); } } @@ -218,28 +218,28 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) { if (e->type() == TQEvent::FocusOut) { - if (watched == linePrjTmpl) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjTmpl)) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjTmpl->text()); - url = QExtFileInfo::toAbsolute(url, baseUrl); + url = TQExtFileInfo::toAbsolute(url, baseUrl); if (!baseUrl.isParentOf(url)) { - KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::sorry(this,i18n("<qt>The project templates must be stored under the main project folder: <br><br><b>%1</b></qt>").tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjTmpl->setFocus(); emit enableNextButton(this, false); } else emit enableNextButton(this, true); } else - if (watched == linePrjToolbar) + if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjToolbar)) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjToolbar->text()); - url = QExtFileInfo::toAbsolute(url, baseUrl); + url = TQExtFileInfo::toAbsolute(url, baseUrl); if (!baseUrl.isParentOf(url)) { KMessageBox::sorry(0,i18n("<qt>The project toolbars must be stored under the main project folder: <br><br><b>%1</b></qt>") - .arg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); + .tqarg(baseUrl.prettyURL(0, KURL::StripFileProtocol))); linePrjToolbar->setFocus(); emit enableNextButton(this, false); } else diff --git a/quanta/project/projectnewgeneral.h b/quanta/project/projectnewgeneral.h index 6f39fde6..21c594f3 100644 --- a/quanta/project/projectnewgeneral.h +++ b/quanta/project/projectnewgeneral.h @@ -28,8 +28,9 @@ class KURL; class ProjectNewGeneral : public ProjectNewGeneralS { Q_OBJECT + TQ_OBJECT public: - ProjectNewGeneral(TQWidget *parent=0, const char *name=0); + ProjectNewGeneral(TQWidget *tqparent=0, const char *name=0); ~ProjectNewGeneral(); TQString type(); diff --git a/quanta/project/projectnewgenerals.ui b/quanta/project/projectnewgenerals.ui index dfc0e55f..d64b0e92 100644 --- a/quanta/project/projectnewgenerals.ui +++ b/quanta/project/projectnewgenerals.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectNewGeneralS</cstring> </property> @@ -32,27 +32,27 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> </size> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>imagelabel</cstring> </property> @@ -64,13 +64,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>115</width> <height>480</height> @@ -82,7 +82,7 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> @@ -98,22 +98,22 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>GroupBox3</cstring> </property> @@ -124,12 +124,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="1" column="2"> + <widget class="TQLineEdit" row="1" column="2"> <property name="name"> <cstring>linePrjTmpl</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2_3</cstring> </property> @@ -137,17 +137,17 @@ <string>Templates directory:</string> </property> </widget> - <widget class="QPushButton" row="2" column="3"> + <widget class="TQPushButton" row="2" column="3"> <property name="name"> <cstring>buttonToolbar</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -157,12 +157,12 @@ <string>...</string> </property> </widget> - <widget class="QLineEdit" row="2" column="2"> + <widget class="TQLineEdit" row="2" column="2"> <property name="name"> <cstring>linePrjToolbar</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2_2_2</cstring> </property> @@ -170,17 +170,17 @@ <string>Toolbars directory:</string> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>buttonTmpl</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -190,7 +190,7 @@ <string>...</string> </property> </widget> - <widget class="QPushButton" row="0" column="3"> + <widget class="TQPushButton" row="0" column="3"> <property name="name"> <cstring>buttonDir</cstring> </property> @@ -202,7 +202,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -212,7 +212,7 @@ <string>...</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2_3</cstring> </property> @@ -220,19 +220,19 @@ <string>Main directory:</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>linePrjDir</cstring> </property> </widget> </grid> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>linePrjFile</cstring> </property> </widget> - <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="4"> + <widget class="TQButtonGroup" row="3" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>bGroupSources</cstring> </property> @@ -249,7 +249,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>radioLocal</cstring> </property> @@ -260,7 +260,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>radioWeb</cstring> </property> @@ -270,18 +270,18 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>TextLabel3</cstring> </property> <property name="text"> <string>File:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -289,7 +289,7 @@ <string>Name:</string> </property> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>GroupBox2</cstring> </property> @@ -300,31 +300,31 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> <property name="text"> <string>Protocol: </string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="hAlign" stdset="0"> </property> </widget> - <widget class="QLabel" row="1" column="4"> + <widget class="TQLabel" row="1" column="4"> <property name="name"> <cstring>TextLabel3_3</cstring> </property> <property name="text"> <string>Password:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="1" column="7"> + <widget class="TQLineEdit" row="1" column="7"> <property name="name"> <cstring>linePort</cstring> </property> @@ -337,7 +337,7 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="0" column="2"> + <widget class="TQComboBox" row="0" column="2"> <item> <property name="text"> <string>Local</string> @@ -347,7 +347,7 @@ <cstring>comboProtocol</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="5"> + <widget class="TQLineEdit" row="1" column="5"> <property name="name"> <cstring>linePasswd</cstring> </property> @@ -359,7 +359,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>26</height> @@ -374,34 +374,34 @@ <enum>Password</enum> </property> </widget> - <widget class="QLabel" row="1" column="6"> + <widget class="TQLabel" row="1" column="6"> <property name="name"> <cstring>TextLabel1_2_4</cstring> </property> <property name="text"> <string>Port:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLineEdit" row="0" column="4" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="0" column="4" rowspan="1" colspan="4"> <property name="name"> <cstring>lineHost</cstring> </property> </widget> - <widget class="QLabel" row="0" column="3"> + <widget class="TQLabel" row="0" column="3"> <property name="name"> <cstring>TextLabel4_2</cstring> </property> <property name="text"> <string>Host:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -409,7 +409,7 @@ <string>User:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lineUser</cstring> </property> @@ -424,7 +424,7 @@ </widget> </grid> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>linePrjName</cstring> </property> @@ -450,5 +450,5 @@ <tabstop>radioLocal</tabstop> <tabstop>radioWeb</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index e2d99d30..1de12e9e 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -45,17 +45,17 @@ #include "resource.h" #include "quantacommon.h" -ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name ) - : ProjectNewLocalS(parent,name) +ProjectNewLocal::ProjectNewLocal(TQWidget *tqparent, const char *name ) + : ProjectNewLocalS(tqparent,name) { imagelabel->setPixmap( UserIcon("wiznewprjloc") ); -// listView->setColumnAlignment(1,Qt::AlignRight); +// listView->setColumnAlignment(1,TQt::AlignRight); listView->setColumnText(1, i18n("Add")); listView->removeColumn(2); listView->removeColumn(2); - mask->setText("*"); + tqmask->setText("*"); checkInsertWeb->setChecked( true ); @@ -75,7 +75,7 @@ void ProjectNewLocal::setBaseURL(const KURL& a_baseURL) { baseURL = a_baseURL; baseURL.adjustPath(1); - checkInsert->setText(i18n("Insert files from %1.").arg(baseURL.prettyURL(0, KURL::StripFileProtocol))); + checkInsert->setText(i18n("Insert files from %1.").tqarg(baseURL.prettyURL(0, KURL::StripFileProtocol))); listView->clear(); fileList.clear(); checkInsert->setChecked(false); @@ -112,37 +112,37 @@ KURL::List ProjectNewLocal::projectFiles() { KURL::List list; - if (!QExtFileInfo::exists(baseURL, false, this) || + if (!TQExtFileInfo::exists(baseURL, false, this) || !baseURL.path().endsWith("/") || !checkInsert->isChecked() ) return list; - TQString fmask = "*"; + TQString ftqmask = "*"; if ( checkInsertWeb->isChecked() ) { KMimeType::List list = KMimeType::allMimeTypes(); KMimeType::List::iterator it; TQString name; - fmask = ""; + ftqmask = ""; for ( it = list.begin(); it != list.end(); ++it ) { name = (*it)->name(); - if (qConfig.markupMimeTypes.contains(name) || - qConfig.scriptMimeTypes.contains(name) || - qConfig.imageMimeTypes.contains(name)) + if (qConfig.markupMimeTypes.tqcontains(name) || + qConfig.scriptMimeTypes.tqcontains(name) || + qConfig.imageMimeTypes.tqcontains(name)) { TQStringList patterns = (*it)->patterns(); for (uint i = 0 ; i < patterns.count(); i++) { - fmask = fmask+patterns[i]+" "; + ftqmask = ftqmask+patterns[i]+" "; } } } } else { - fmask = mask->text(); + ftqmask = tqmask->text(); } - list = QExtFileInfo::allFilesRelative(baseURL, fmask, this, false); + list = TQExtFileInfo::allFilesRelative(baseURL, ftqmask, this, false); return list; } @@ -156,7 +156,7 @@ void ProjectNewLocal::slotSetFiles(bool) progressBar->setTextEnabled(true); for (uint i = 0; i < files.count(); i++) { - if ( !fileList.contains(files[i])) + if ( !fileList.tqcontains(files[i])) { fileList.append(files[i]); TQListViewItem *it = listView->addItem(files[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -180,7 +180,7 @@ void ProjectNewLocal::resizeEvent ( TQResizeEvent *t ) /** No descriptions */ void ProjectNewLocal::slotAddFiles() { - QExtFileInfo::createDir(baseURL, this); + TQExtFileInfo::createDir(baseURL, this); KURL::List list = KFileDialog::getOpenURLs( baseURL.url(), i18n("*"), this, i18n("Insert Files in Project")); @@ -188,7 +188,7 @@ void ProjectNewLocal::slotAddFiles() { KURL u = list.first(); - u = QExtFileInfo::toRelative( u, baseURL, false ); + u = TQExtFileInfo::toRelative( u, baseURL, false ); if ( u.path().startsWith("..") || u.path().startsWith("/")) { @@ -218,8 +218,8 @@ void ProjectNewLocal::slotAddFiles() progressBar->setTextEnabled(true); for (uint i = 0; i < list.count(); i++) { - list[i] = QExtFileInfo::toRelative(list[i], baseURL, false); - if (!fileList.contains(list[i])) + list[i] = TQExtFileInfo::toRelative(list[i], baseURL, false); + if (!fileList.tqcontains(list[i])) { fileList.append(list[i]); TQListViewItem *it = listView->addItem(list[i], KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -238,7 +238,7 @@ void ProjectNewLocal::slotAddFolder() { //TODO/FIXME: This returns null if the selected directory is not on the local disk. //I think this is a KDE bug - QExtFileInfo::createDir(baseURL, this); + TQExtFileInfo::createDir(baseURL, this); KURL dirURL ; dirURL = KFileDialog::getExistingURL( baseURL.url(), this, i18n("Insert Folder in Project")); @@ -248,13 +248,13 @@ void ProjectNewLocal::slotAddFolder() dirURL.adjustPath(1); KURL sdir = dirURL; - sdir = QExtFileInfo::toRelative( sdir, baseURL, false); + sdir = TQExtFileInfo::toRelative( sdir, baseURL, false); if ( sdir.path().startsWith("..") || sdir.path().startsWith("/") ) { KURLRequesterDlg *urlRequesterDlg = new KURLRequesterDlg( baseURL.prettyURL(), this, ""); - urlRequesterDlg->setCaption(i18n("%1: Copy to Project").arg(dirURL.prettyURL(0, KURL::StripFileProtocol))); + urlRequesterDlg->setCaption(i18n("%1: Copy to Project").tqarg(dirURL.prettyURL(0, KURL::StripFileProtocol))); urlRequesterDlg->urlRequester()->setMode( KFile::Directory | KFile::ExistingOnly); urlRequesterDlg->exec(); KURL destination = urlRequesterDlg->selectedURL(); @@ -293,14 +293,14 @@ void ProjectNewLocal::slotInsertFolderAfterCopying(const KURL::List& a_urlList) { dirURL = *it; // dirURL.adjustPath(1); - KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this, false); + KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this, false); progressBar->setTotalSteps(files.count() - 1); progressBar->setTextEnabled(true); KURL u; for (uint i = 0; i < files.count(); i++) { u = files[i]; - if ( !fileList.contains(u) && u.path() != "." && u.path() != ".." ) + if ( !fileList.tqcontains(u) && u.path() != "." && u.path() != ".." ) { fileList.append(u); listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); @@ -328,8 +328,8 @@ void ProjectNewLocal::slotInsertFilesAfterCopying(const KURL::List& a_urlList) progressBar->setTextEnabled(true); for (it = a_urlList.begin(); it != a_urlList.end(); ++it) { - u = QExtFileInfo::toRelative(*it, baseURL, false); - if ( !fileList.contains(u)) + u = TQExtFileInfo::toRelative(*it, baseURL, false); + if ( !fileList.tqcontains(u)) { fileList.append(u); TQListViewItem *it = listView->addItem(u, KFileItem(KFileItem::Unknown, KFileItem::Unknown, KURL())); diff --git a/quanta/project/projectnewlocal.h b/quanta/project/projectnewlocal.h index 498b336d..b1a984c9 100644 --- a/quanta/project/projectnewlocal.h +++ b/quanta/project/projectnewlocal.h @@ -30,8 +30,9 @@ class CopyTo; class ProjectNewLocal : public ProjectNewLocalS { Q_OBJECT + TQ_OBJECT public: - ProjectNewLocal(TQWidget *parent=0, const char *name=0); + ProjectNewLocal(TQWidget *tqparent=0, const char *name=0); ~ProjectNewLocal(); KURL::List files(); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index c752274f..7ebdc26f 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectNewLocalS</cstring> </property> @@ -29,27 +29,27 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> </size> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>imagelabel</cstring> </property> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>115</width> <height>480</height> @@ -85,21 +85,21 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>checkInsert</cstring> </property> @@ -107,7 +107,7 @@ <string>Insert files from</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel8</cstring> </property> @@ -123,7 +123,7 @@ <string>Included files:</string> </property> </widget> - <widget class="QButtonGroup" row="1" column="0"> + <widget class="TQButtonGroup" row="1" column="0"> <property name="name"> <cstring>ButtonGroup12</cstring> </property> @@ -151,23 +151,23 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>checkInsertWithMask</cstring> </property> <property name="text"> - <string>Insert files with the following &mask:</string> + <string>Insert files with the following &tqmask:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> - <cstring>mask</cstring> + <cstring>tqmask</cstring> </property> <property name="enabled"> <bool>false</bool> </property> </widget> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkInsertWeb</cstring> </property> @@ -182,9 +182,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -203,9 +203,9 @@ </sizepolicy> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -221,14 +221,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>85</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addFiles</cstring> </property> @@ -236,7 +236,7 @@ <string>&Add Files...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>addFolder</cstring> </property> @@ -244,7 +244,7 @@ <string>A&dd Folder...</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>clearList</cstring> </property> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>89</width> <height>20</height> @@ -281,7 +281,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -319,7 +319,7 @@ <connection> <sender>checkInsertWithMask</sender> <signal>toggled(bool)</signal> - <receiver>mask</receiver> + <receiver>tqmask</receiver> <slot>setEnabled(bool)</slot> </connection> <connection> @@ -332,12 +332,12 @@ <tabstops> <tabstop>checkInsert</tabstop> <tabstop>checkInsertWeb</tabstop> - <tabstop>mask</tabstop> + <tabstop>tqmask</tabstop> <tabstop>addFiles</tabstop> <tabstop>addFolder</tabstop> <tabstop>clearList</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>uploadtreeview.h</includehint> </includehints> diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index a087497c..08391dbe 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -38,8 +38,8 @@ #include "quantacommon.h" #include "uploadtreeview.h" -ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name ) - : ProjectNewWebS(parent,name) +ProjectNewWeb::ProjectNewWeb(TQWidget *tqparent, const char *name ) + : ProjectNewWebS(tqparent,name) { button->setEnabled(false); siteUrl->setFocus(); @@ -99,7 +99,7 @@ void ProjectNewWeb::slotStart() { emit enableMessagesWidget(); - if (QExtFileInfo::createDir(baseURL, this)) + if (TQExtFileInfo::createDir(baseURL, this)) { if (baseURL.protocol() == "file") { @@ -126,7 +126,7 @@ void ProjectNewWeb::slotStart() { start = true; button->setText( i18n("Stop") ); - emit enableNextButton((TQWidget *)this->parent(),false); + emit enableNextButton((TQWidget *)this->tqparent(),false); } else { KMessageBox::error(this, i18n("There was an error while trying to run the \"wget\" application.\ @@ -138,14 +138,14 @@ void ProjectNewWeb::slotStart() KMessageBox::sorry(this,i18n("This feature is available only if the project lies on a local disk.")); start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->parent(),true); + emit enableNextButton((TQWidget *)this->tqparent(),true); } } else { QuantaCommon::dirCreationError(this, baseURL); start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->parent(),true); + emit enableNextButton((TQWidget *)this->tqparent(),true); } } else { @@ -155,7 +155,7 @@ void ProjectNewWeb::slotStart() start = false; button->setText( i18n("Start") ); - emit enableNextButton((TQWidget *)this->parent(),true); + emit enableNextButton((TQWidget *)this->tqparent(),true); } } @@ -166,7 +166,7 @@ void ProjectNewWeb::slotGetWgetExited(KProcess*) start = false; button->setText( i18n("Start") ); emit messages(i18n("wget finished...\n")); - emit enableNextButton((TQWidget *)this->parent(),true); + emit enableNextButton((TQWidget *)this->tqparent(),true); } void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) @@ -178,7 +178,7 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) int pos; TQString basePath = baseURL.path(1); - while ( (pos = output.find("saved")) != -1 ) + while ( (pos = output.tqfind("saved")) != -1 ) { if (KLed1->state() == KLed::Off) { @@ -189,13 +189,13 @@ void ProjectNewWeb::slotGetWgetOutput(KProcess *, char *buffer, int buflen) KLed2->setState(KLed::On); KLed1->setState(KLed::Off); } - int begName = output.findRev('`',pos); + int begName = output.tqfindRev('`',pos); if ( begName == -1 ) { output = output.remove(0,pos+1); continue; } - int endName = output.find('\'',begName); + int endName = output.tqfind('\'',begName); if ( endName == -1 || endName > pos ) { output = output.remove(0,pos+1); continue; diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h index 28a395b4..4e9c7088 100644 --- a/quanta/project/projectnewweb.h +++ b/quanta/project/projectnewweb.h @@ -34,8 +34,9 @@ class KURL; class ProjectNewWeb : public ProjectNewWebS { Q_OBJECT + TQ_OBJECT public: - ProjectNewWeb(TQWidget *parent=0, const char *name=0); + ProjectNewWeb(TQWidget *tqparent=0, const char *name=0); ~ProjectNewWeb(); public slots: diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui index b0b726e4..97b7fc7f 100644 --- a/quanta/project/projectnewwebs.ui +++ b/quanta/project/projectnewwebs.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectNewWebS</cstring> </property> @@ -29,27 +29,27 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>410</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32000</width> <height>32000</height> </size> </property> - <property name="layoutMargin" stdset="0"> + <property name="tqlayoutMargin" stdset="0"> </property> - <property name="layoutSpacing" stdset="0"> + <property name="tqlayoutSpacing" stdset="0"> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQLabel" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>imagelabel</cstring> </property> @@ -61,13 +61,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>115</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>115</width> <height>480</height> @@ -79,15 +79,15 @@ <property name="scaledContents"> <bool>true</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignTop|AlignLeft</set> </property> <property name="vAlign" stdset="0"> </property> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>309</width> <height>16</height> @@ -126,7 +126,7 @@ <enum>Circular</enum> </property> </widget> - <widget class="QPushButton" row="1" column="3"> + <widget class="TQPushButton" row="1" column="3"> <property name="name"> <cstring>button</cstring> </property> @@ -176,15 +176,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel10</cstring> </property> @@ -202,14 +202,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>228</width> <height>20</height> </size> </property> </spacer> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <item> <property name="text"> <string>HTTP</string> @@ -224,12 +224,12 @@ <cstring>protocolCombo</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>siteUrl</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -237,12 +237,12 @@ <string>Protocol:</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>commandLine</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel9</cstring> </property> @@ -283,7 +283,7 @@ <tabstop>commandLine</tabstop> <tabstop>button</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kled.h</includehint> <includehint>uploadtreeview.h</includehint> diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui index 163f1d4c..a2879e94 100644 --- a/quanta/project/projectoptions.ui +++ b/quanta/project/projectoptions.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ProjectOptions</cstring> </property> @@ -36,17 +36,17 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="2" column="5"> + <widget class="TQPushButton" row="2" column="5"> <property name="name"> <cstring>buttonToolbar</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -56,17 +56,17 @@ <string>...</string> </property> </widget> - <widget class="QPushButton" row="1" column="5"> + <widget class="TQPushButton" row="1" column="5"> <property name="name"> <cstring>buttonTmpl</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -76,7 +76,7 @@ <string>...</string> </property> </widget> - <widget class="QLineEdit" row="3" column="4" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="3" column="4" rowspan="1" colspan="2"> <property name="name"> <cstring>lineEmail</cstring> </property> @@ -88,7 +88,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>0</height> @@ -98,7 +98,7 @@ <string></string> </property> </widget> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineAuthor</cstring> </property> @@ -111,7 +111,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="4" column="1" rowspan="1" colspan="5"> + <widget class="TQLineEdit" row="4" column="1" rowspan="1" colspan="5"> <property name="name"> <cstring>lineExclude</cstring> </property> @@ -124,7 +124,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>linePrjToolbar</cstring> </property> @@ -137,7 +137,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>linePrjTmpl</cstring> </property> @@ -150,7 +150,7 @@ </sizepolicy> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="5"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="5"> <property name="name"> <cstring>linePrjName</cstring> </property> @@ -162,7 +162,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>0</height> @@ -172,7 +172,7 @@ <string></string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -191,7 +191,7 @@ <cstring>linePrjName</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -202,7 +202,7 @@ <cstring>linePrjTmpl</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -219,7 +219,7 @@ <cstring>linePrjToolbar</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -238,7 +238,7 @@ <cstring>lineAuthor</cstring> </property> </widget> - <widget class="QLabel" row="3" column="3"> + <widget class="TQLabel" row="3" column="3"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -257,7 +257,7 @@ <cstring>lineEmail</cstring> </property> </widget> - <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="6"> + <widget class="TQGroupBox" row="6" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>GroupBox5</cstring> </property> @@ -276,7 +276,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel1_2_3</cstring> </property> @@ -287,7 +287,7 @@ <cstring>dtdCombo</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_3_2</cstring> </property> @@ -298,11 +298,11 @@ <cstring>viewCombo</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel3_2_2_2</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -315,17 +315,17 @@ <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>encodingCombo</cstring> </property> </widget> - <widget class="QComboBox" row="1" column="1"> + <widget class="TQComboBox" row="1" column="1"> <property name="name"> <cstring>viewCombo</cstring> </property> </widget> - <widget class="QComboBox" row="2" column="1"> + <widget class="TQComboBox" row="2" column="1"> <property name="name"> <cstring>dtdCombo</cstring> </property> @@ -335,7 +335,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -346,7 +346,7 @@ <cstring>lineExclude</cstring> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="6"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>checkCvsignore</cstring> </property> @@ -358,7 +358,7 @@ <b>NOTE:</b> This feature works only for local projects.</string> </property> </widget> - <widget class="QGroupBox" row="9" column="0" rowspan="1" colspan="6"> + <widget class="TQGroupBox" row="9" column="0" rowspan="1" colspan="6"> <property name="name"> <cstring>GroupBox5_debug</cstring> </property> @@ -377,7 +377,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> @@ -388,7 +388,7 @@ <cstring>comboDebuggerClient</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>comboDebuggerClient</cstring> </property> @@ -404,7 +404,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>buttonDebuggerOptions</cstring> </property> @@ -420,7 +420,7 @@ <string>Optio&ns</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkDebuggerPersistentBreakpoints</cstring> </property> @@ -428,7 +428,7 @@ <string>Remember &breakpoints across sessions</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkDebuggerPersistentWatches</cstring> </property> @@ -441,7 +441,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="8" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="8" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkPersistentBookmarks</cstring> </property> @@ -449,7 +449,7 @@ <string>Use persistent boo&kmarks</string> </property> </widget> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkPrefix</cstring> </property> @@ -465,7 +465,7 @@ <string>&Use preview prefix:</string> </property> </widget> - <widget class="QLineEdit" row="7" column="2" rowspan="1" colspan="4"> + <widget class="TQLineEdit" row="7" column="2" rowspan="1" colspan="4"> <property name="name"> <cstring>linePrefix</cstring> </property> @@ -531,10 +531,10 @@ <includes> <include location="local" impldecl="in implementation">projectoptions.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>buttonTemplate_clicked()</slot> <slot>buttonToolbar_clicked()</slot> <slot>comboDebuggerClient_activated( int idx )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectoptions.ui.h b/quanta/project/projectoptions.ui.h index b6fc2202..5ee550ee 100644 --- a/quanta/project/projectoptions.ui.h +++ b/quanta/project/projectoptions.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 86f4e221..871ae7bc 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -65,7 +65,7 @@ ProjectPrivate::ProjectPrivate(Project *p) : TQObject(), config(0L), m_dirWatch(0L), tempFile(0L), sessionTempFile(0L) { - parent = p; + tqparent = p; m_projectFiles.setAutoDelete(true); m_showUploadTreeviews = true; m_eventsEnabled = true; @@ -90,7 +90,7 @@ void ProjectPrivate::initActions(KActionCollection *ac) this, TQT_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = - KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)), + KStdAction::openRecent(tqparent, TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent"); m_projectRecent->setText(i18n("Open Recent Project")); m_projectRecent->setIcon("project_open"); @@ -131,25 +131,25 @@ void ProjectPrivate::initActions(KActionCollection *ac) ac, "project_insert_directory" ); rescanPrjDirAction = new KAction( i18n( "&Rescan Project Folder..." ), "reload", 0, - parent, TQT_SLOT( slotRescanPrjDir() ), + tqparent, TQT_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); uploadProjectAction = new KAction( i18n( "&Upload Project..." ), "up", Key_F8, - parent, TQT_SLOT( slotUpload() ), + tqparent, TQT_SLOT( slotUpload() ), ac, "project_upload" ); projectOptionAction = new KAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, - parent, TQT_SLOT( slotOptions() ), + tqparent, TQT_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = new KAction( i18n( "Save as Project Template..." ), 0, - m_mainWindow, TQT_SLOT( slotFileSaveAsProjectTemplate() ), + TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = new KAction( i18n( "Save Selection to Project Template File..." ), 0, - m_mainWindow, TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), + TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); } @@ -157,7 +157,7 @@ void ProjectPrivate::initActions(KActionCollection *ac) void ProjectPrivate::adjustActions() { - bool projectExists = parent->hasProject(); + bool projectExists = tqparent->hasProject(); closeprjAction->setEnabled(projectExists); openPrjViewAction->setEnabled(projectExists); savePrjViewAction->setEnabled(projectExists); @@ -173,7 +173,7 @@ void ProjectPrivate::adjustActions() saveSelectionAsProjectTemplateAction->setEnabled(projectExists); adjustViewActions(); - parent->slotShowProjectToolbar(projectExists); + tqparent->slotShowProjectToolbar(projectExists); } @@ -183,7 +183,7 @@ void ProjectPrivate::adjustViewActions() TQString oldItem = openPrjViewAction->currentText(); openPrjViewAction->clear(); openPrjViewAction->setItems(viewList); - int i = viewList.findIndex(oldItem); + int i = viewList.tqfindIndex(oldItem); if (i > -1) openPrjViewAction->setCurrentItem(i); deletePrjViewAction->clear(); @@ -211,7 +211,7 @@ void ProjectPrivate::init() { projectURL = KURL(); templateURL = KURL(); - projectName = TQString::null; + projectName = TQString(); m_modified = false; m_defaultDTD = qConfig.defaultDocType; excludeRx.setPattern(".*~$"); @@ -223,11 +223,11 @@ void ProjectPrivate::init() m_debuggerPersistentBreakpoints = false; m_debuggerPersistentWatches = false; m_excludeCvsignore = false; - currentProjectView = TQString::null; + currentProjectView = TQString(); m_projectFiles.clear(); - m_mailingList = TQString::null; - m_teamLeader.name = TQString::null; - m_teamLeader.email = TQString::null; + m_mailingList = TQString(); + m_teamLeader.name = TQString(); + m_teamLeader.email = TQString(); m_taskLeaders.clear(); m_subprojectLeaders.clear(); m_subprojects.clear(); @@ -254,34 +254,34 @@ void ProjectPrivate::openCurrentView() TQDomElement el2 = itemNodes.item(j).cloneNode().toElement(); KURL url = baseURL; QuantaCommon::setUrl(url,el2.attribute("url")); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); if (el2.nodeName() == "viewitem") { urlsInView.append(url); - if (!ViewManager::ref()->isOpened(url) && QExtFileInfo::exists(url, true, m_mainWindow)) + if (!ViewManager::ref()->isOpened(url) && TQExtFileInfo::exists(url, true, m_mainWindow)) urlsToOpen.append(url); } else { if (el2.nodeName() == "viewtoolbar") { - parent->loadToolbarFile(url); + tqparent->loadToolbarFile(url); } } } // first we open what we want, might be that a wanted file is already open! - parent->openFiles(urlsToOpen, m_defaultEncoding); + tqparent->openFiles(urlsToOpen, m_defaultEncoding); // second we close what we don't want KURL::List openURLs = ViewManager::ref()->openedFiles(true); // get open urls KURL::List::Iterator it; for ( it = openURLs.begin(); it != openURLs.end(); ++it ) { - if (urlsInView.findIndex( *it ) == -1) - parent->closeFile (*it); + if (urlsInView.tqfindIndex( *it ) == -1) + tqparent->closeFile (*it); } break; } } TQStringList viewList = projectViewList(); - int i = viewList.findIndex(currentProjectView); + int i = viewList.tqfindIndex(currentProjectView); if (i > -1) openPrjViewAction->setCurrentItem(i); adjustViewActions(); @@ -299,7 +299,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) { TQDomElement el; TQDomNodeList nl = dom.elementsByTagName("item"); - parent->statusMsg( i18n("Adding files to the project...") ); + tqparent->statusMsg( i18n("Adding files to the project...") ); progressBar->setTotalSteps(2 * files.count() - 2); progressBar->setValue(0); progressBar->setTextEnabled(true); @@ -307,7 +307,7 @@ void ProjectPrivate::insertFiles( KURL::List files ) KURL::List::Iterator it; for ( it = files.begin(); it != files.end(); ++it ) { - if (m_projectFiles.contains(*it)) + if (m_projectFiles.tqcontains(*it)) { it = files.erase(it); --it; @@ -322,13 +322,13 @@ void ProjectPrivate::insertFiles( KURL::List files ) url.setPath(url.directory(false)); while ( baseURL.isParentOf(url) ) { - if (!m_projectFiles.contains(url)) + if (!m_projectFiles.tqcontains(url)) { el = dom.createElement("item"); - el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false))); + el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL, false))); dom.firstChild().firstChild().appendChild(el); m_projectFiles.insert( new ProjectURL(url, "", 1, false, el) ); - emit eventHappened("after_project_add", url.url(), TQString::null); + emit eventHappened("after_project_add", url.url(), TQString()); m_modified = true; } url.setPath(url.directory(false)); @@ -337,10 +337,10 @@ void ProjectPrivate::insertFiles( KURL::List files ) url = *it; if (!excludeRx.exactMatch(url.path())) { - el.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL, false))); + el.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL, false))); dom.firstChild().firstChild().appendChild(el); m_projectFiles.insert( new ProjectURL(url, "", 1, false, el) ); - emit eventHappened("after_project_add", url.url(), TQString::null); + emit eventHappened("after_project_add", url.url(), TQString()); m_modified = true; } } @@ -350,19 +350,19 @@ void ProjectPrivate::insertFiles( KURL::List files ) progressBar->setValue(0); progressBar->setTextEnabled(false); - parent->reloadTree(&(m_projectFiles), false, TQStringList()); - parent->newStatus(); - parent->statusMsg(TQString::null); + tqparent->reloadTree(&(m_projectFiles), false, TQStringList()); + tqparent->newtqStatus(); + tqparent->statusMsg(TQString()); } /** insert files from dir recursive */ -void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& mask ) +void ProjectPrivate::insertFiles(const KURL& pathURL, const TQString& tqmask ) { KURL::List list; list.append(pathURL); - list += QExtFileInfo::allFiles(pathURL, mask, m_mainWindow); + list += TQExtFileInfo::allFiles(pathURL, tqmask, m_mainWindow); insertFiles(list); } @@ -371,7 +371,7 @@ void ProjectPrivate::loadProjectXML() { //TODO: Optimize reading. For example iterate through all the nodes and handle them //according to the found node type - parent->statusMsg( i18n("Reading the project file...") ); + tqparent->statusMsg( i18n("Reading the project file...") ); TQDomNode no; TQDomElement el; KURL url; @@ -380,7 +380,7 @@ void ProjectPrivate::loadProjectXML() if ( projectNode.isNull() || projectName.isEmpty() ) { - parent->hideSplash(); + tqparent->hideSplash(); KMessageBox::sorry(m_mainWindow, i18n("Invalid project file.") ); adjustActions(); return; @@ -464,7 +464,7 @@ void ProjectPrivate::loadProjectXML() if (tmpString != QuantaCommon::qUrl(templateURL) ) { el = no.toElement(); - url = QExtFileInfo::toRelative(templateURL, baseURL); + url = TQExtFileInfo::toRelative(templateURL, baseURL); if(el.isNull()) { el = dom.createElement("templates"); @@ -476,7 +476,7 @@ void ProjectPrivate::loadProjectXML() el.firstChild().setNodeValue(QuantaCommon::qUrl(url)); } } - templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL); + templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL); no = projectNode.namedItem("toolbars"); toolbarURL = baseURL; @@ -492,7 +492,7 @@ void ProjectPrivate::loadProjectXML() if (tmpString != QuantaCommon::qUrl(toolbarURL)) { el = no.toElement(); - url = QExtFileInfo::toRelative(toolbarURL, baseURL); + url = TQExtFileInfo::toRelative(toolbarURL, baseURL); if(el.isNull()) { el = dom.createElement("toolbars"); @@ -504,7 +504,7 @@ void ProjectPrivate::loadProjectXML() el.firstChild().setNodeValue(QuantaCommon::qUrl(url)); } } - toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL); + toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL); no = projectNode.namedItem("exclude"); m_excludeCvsignore = (no.toElement().attribute("cvsignore", "false") == "true"); @@ -524,9 +524,9 @@ void ProjectPrivate::loadProjectXML() } else if (!excludeStr.endsWith("*")) str = excludeStr + "/*|"+ excludeStr + "$"; - str.replace(".","\\."); - str.replace("*",".*"); - str.replace("?","."); + str.tqreplace(".","\\."); + str.tqreplace("*",".*"); + str.tqreplace("?","."); regExpStr.append(str); if (i+1 < excludeList.count()) regExpStr.append("|"); @@ -564,9 +564,9 @@ void ProjectPrivate::loadProjectXML() line = line + "/*|"+ line + "$"; if (!line.startsWith("*")) line.prepend("^"); - line.replace(".","\\."); - line.replace("*",".*"); - line.replace("?","."); + line.tqreplace(".","\\."); + line.tqreplace("*",".*"); + line.tqreplace("?","."); rxStr += line + "|"; } regExpStr.prepend(rxStr); @@ -595,7 +595,7 @@ void ProjectPrivate::loadProjectXML() if (s != "--not set--" && !s.isEmpty()) ev.arguments << s; } - if (m_events->contains(el.attribute("name"))) + if (m_events->tqcontains(el.attribute("name"))) { (*m_events)[el.attribute("name")].append(ev); } else @@ -696,10 +696,10 @@ void ProjectPrivate::loadProjectXML() } - parent->statusMsg(TQString::null); - parent->newProjectLoaded(projectName, baseURL, templateURL); - parent->reloadTree(&(m_projectFiles), true, treeStatusFromXML()); - parent->newStatus(); + tqparent->statusMsg(TQString()); + tqparent->newProjectLoaded(projectName, baseURL, templateURL); + tqparent->reloadTree(&(m_projectFiles), true, treeStatusFromXML()); + tqparent->newtqStatus(); adjustActions(); } @@ -723,7 +723,7 @@ void ProjectPrivate::slotAcceptCreateProject() /* it is important to set the fields only if there is some input otherwise you set them to an empty string and the treeview will - not recognize it as parent url because: + not recognize it as tqparent url because: TQString::Null != "" */ if (!png->lineHost->text().isEmpty()) @@ -739,7 +739,7 @@ void ProjectPrivate::slotAcceptCreateProject() if (baseURL.protocol() == i18n("Local")) baseURL.setProtocol("file"); baseURL.adjustPath(1); if (!baseURL.path().startsWith("/")) baseURL.setPath("/"+ baseURL.path()); - if (!QExtFileInfo::createDir(baseURL, m_mainWindow)) + if (!TQExtFileInfo::createDir(baseURL, m_mainWindow)) { QuantaCommon::dirCreationError(m_mainWindow, baseURL); baseURL = oldBaseURL; @@ -789,7 +789,7 @@ void ProjectPrivate::slotAcceptCreateProject() for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it ) { - url = *it;//QExtFileInfo::toRelative(*it, baseURL ); + url = *it;//TQExtFileInfo::toRelative(*it, baseURL ); el = dom.createElement("item"); el.setAttribute("url",QuantaCommon::qUrl(url)); dom.firstChild().firstChild().appendChild( el ); @@ -806,7 +806,7 @@ void ProjectPrivate::slotAcceptCreateProject() { KURL url; QuantaCommon::setUrl(url, qConfig.globalDataDir + resourceDir + "templates/"); - parent->slotAddDirectory(url, false); + tqparent->slotAddDirectory(url, false); QuantaCommon::setUrl(templateURL, "templates/"); createTemplateDir = false; } @@ -814,7 +814,7 @@ void ProjectPrivate::slotAcceptCreateProject() { KURL url; QuantaCommon::setUrl(url, locateLocal("data", resourceDir + "templates/")); - parent->slotAddDirectory(url, false); + tqparent->slotAddDirectory(url, false); QuantaCommon::setUrl(templateURL, "templates/"); createTemplateDir = false; } @@ -823,28 +823,28 @@ void ProjectPrivate::slotAcceptCreateProject() { QuantaCommon::setUrl(templateURL, png->linePrjTmpl->text()); templateURL.adjustPath(1); - templateURL = QExtFileInfo::toAbsolute(templateURL, baseURL); - if (!QExtFileInfo::createDir(templateURL, m_mainWindow)) + templateURL = TQExtFileInfo::toAbsolute(templateURL, baseURL); + if (!TQExtFileInfo::createDir(templateURL, m_mainWindow)) { QuantaCommon::dirCreationError(m_mainWindow, templateURL); } } //the nodes are already created in loadProjectXML() called from createEmptyDom() el = dom.firstChild().firstChild().namedItem("templates").toElement(); - url = QExtFileInfo::toRelative(templateURL, baseURL); + url = TQExtFileInfo::toRelative(templateURL, baseURL); el.firstChild().setNodeValue(QuantaCommon::qUrl(url)); //setup the toolbars directory toolbarURL = baseURL; QuantaCommon::setUrl(toolbarURL,png->linePrjToolbar->text()); toolbarURL.adjustPath(1); - toolbarURL = QExtFileInfo::toAbsolute(toolbarURL, baseURL); - if (!QExtFileInfo::createDir(toolbarURL, m_mainWindow)) + toolbarURL = TQExtFileInfo::toAbsolute(toolbarURL, baseURL); + if (!TQExtFileInfo::createDir(toolbarURL, m_mainWindow)) { QuantaCommon::dirCreationError(m_mainWindow, toolbarURL); } el = dom.firstChild().firstChild().namedItem("toolbars").toElement(); - url = QExtFileInfo::toRelative(toolbarURL, baseURL); + url = TQExtFileInfo::toRelative(toolbarURL, baseURL); el.firstChild().setNodeValue(QuantaCommon::qUrl(url)); #if KDE_IS_VERSION(3,4,89) @@ -887,10 +887,10 @@ void ProjectPrivate::slotDeleteProjectView(const TQString &view) el = node.cloneNode().toElement(); if (el.attribute("name") == view) { - node.parentNode().removeChild(node); + node.tqparentNode().removeChild(node); if (currentProjectView == view) currentProjectView = ""; - parent->setModified(); + tqparent->setModified(); adjustViewActions(); break; } @@ -917,9 +917,9 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) { if (!askForName || KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>A project view named <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>") - .arg(currentProjectView), TQString::null, i18n("Overwrite")) == KMessageBox::Continue) + .tqarg(currentProjectView), TQString(), i18n("Overwrite")) == KMessageBox::Continue) { - node.parentNode().removeChild(node); + node.tqparentNode().removeChild(node); break; } else { @@ -936,27 +936,27 @@ void ProjectPrivate::slotSaveAsProjectView(bool askForName) for ( it = openURLs.begin(); it != openURLs.end(); ++it ) { KURL url = (*it); - if (m_projectFiles.contains(url)) + if (m_projectFiles.tqcontains(url)) { item = dom.createElement("viewitem"); - item.setAttribute("url", QuantaCommon::qUrl(QExtFileInfo::toRelative(url, baseURL)) ); + item.setAttribute("url", QuantaCommon::qUrl(TQExtFileInfo::toRelative(url, baseURL)) ); el.appendChild(item); } } KURL::List toolbarList; - parent->getUserToolbarFiles(&toolbarList); + tqparent->getUserToolbarFiles(&toolbarList); for (uint i =0 ; i < toolbarList.count(); i++) { item = dom.createElement("viewtoolbar"); KURL url = toolbarList[i]; - url = QExtFileInfo::toRelative(url, baseURL); + url = TQExtFileInfo::toRelative(url, baseURL); item.setAttribute("url", QuantaCommon::qUrl(url) ); el.appendChild(item); } dom.firstChild().firstChild().appendChild( el ); - parent->setModified(); + tqparent->setModified(); adjustViewActions(); } @@ -994,7 +994,7 @@ bool ProjectPrivate::createEmptyDom() KURL sessionURL = projectURL; TQString fileName = projectURL.fileName(); if (fileName.endsWith(".webprj")) - fileName.replace(".webprj", ".session"); + fileName.tqreplace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); @@ -1008,7 +1008,7 @@ bool ProjectPrivate::createEmptyDom() tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8); *(tempFile->textStream()) << str; tempFile->close(); - result = QExtFileInfo::createDir(baseURL, m_mainWindow); + result = TQExtFileInfo::createDir(baseURL, m_mainWindow); if (result) result = KIO::NetAccess::upload(tempFile->name(), projectURL, m_mainWindow); if (result) @@ -1055,8 +1055,8 @@ bool ProjectPrivate::createEmptyDom() if (!result) { - parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").arg(projectURL.prettyURL(0, KURL::StripFileProtocol))); + tqparent->hideSplash(); + KMessageBox::sorry(m_mainWindow, i18n("<qt>Cannot open file <b>%1</b> for writing.</qt>").tqarg(projectURL.prettyURL(0, KURL::StripFileProtocol))); delete tempFile; tempFile = 0L; delete sessionTempFile; @@ -1095,12 +1095,12 @@ void ProjectPrivate::getStatusFromTree() for ( unsigned int i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); - el.parentNode().removeChild( el ); + el.tqparentNode().removeChild( el ); i--; } TQStringList folderList; - parent->getTreeStatus( &folderList ); - // toplevel folder is always open in a project and QExtFileInfo::toRelative + tqparent->getTreetqStatus( &folderList ); + // toplevel folder is always open in a project and TQExtFileInfo::toRelative // creates strange output -> we remove the toplevel folder if (folderList.count() > 0) folderList.remove(folderList.begin()); @@ -1110,7 +1110,7 @@ void ProjectPrivate::getStatusFromTree() m_sessionDom.firstChild().firstChild().appendChild(root); for (TQStringList::Iterator it = folderList.begin(); it != folderList.end(); ++it) { el = m_sessionDom.createElement("openfolder"); - el.setAttribute("url", QuantaCommon::qUrl( QExtFileInfo::toRelative(KURL(*it), baseURL) ) ); + el.setAttribute("url", QuantaCommon::qUrl( TQExtFileInfo::toRelative(KURL(*it), baseURL) ) ); root.appendChild( el ); } } @@ -1122,7 +1122,7 @@ void ProjectPrivate::slotNewProject() { TQWizard *wiz = new TQWizard(m_mainWindow, "new", true); wiz->setCaption(i18n("New Project Wizard")); - wiz->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + wiz->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); png = new ProjectNewGeneral(0L); @@ -1159,9 +1159,9 @@ void ProjectPrivate::slotNewProject() connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked())); connect( pnw, TQT_SIGNAL(enableMessagesWidget()), - parent, TQT_SIGNAL(enableMessageWidget())); + tqparent, TQT_SIGNAL(enableMessageWidget())); connect( pnw, TQT_SIGNAL(messages(const TQString&)), - parent, TQT_SLOT (slotGetMessages(const TQString&))); + tqparent, TQT_SLOT (slotGetMessages(const TQString&))); connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), @@ -1170,7 +1170,7 @@ void ProjectPrivate::slotNewProject() TQStringList lst = DTDs::ref()->nickNameList(true); pnf->dtdCombo->insertStringList(lst); TQString defaultDTDName = DTDs::ref()->getDTDNickNameFromName(qConfig.defaultDocType.lower()); - int pos = lst.findIndex(defaultDTDName); + int pos = lst.tqfindIndex(defaultDTDName); if (pos >= 0) pnf->dtdCombo->setCurrentItem(pos); @@ -1197,48 +1197,48 @@ void ProjectPrivate::slotNewProject() delete wiz; adjustActions(); - parent->newStatus(); + tqparent->newtqStatus(); } /** close project and edited files */ void ProjectPrivate::slotCloseProject() { - if (!parent->hasProject()) return; + if (!tqparent->hasProject()) return; connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); - parent->closeFiles(); + tqparent->closeFiles(); } void ProjectPrivate::slotProceedWithCloseProject(bool success) { disconnect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); if (!success) return; - emit eventHappened("before_project_close", baseURL.url(), TQString::null); + emit eventHappened("before_project_close", baseURL.url(), TQString()); if (!uploadProjectFile()) { if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("Saving of project failed. Do you want to continue with closing (might cause data loss)?"), i18n("Project Saving Error"), KStdGuiItem::close()) == KMessageBox::Cancel) return; } - emit eventHappened("after_project_close", baseURL.url(), TQString::null); + emit eventHappened("after_project_close", baseURL.url(), TQString()); // empty dom tree dom.clear(); m_sessionDom.clear(); m_events->clear(); config->setGroup("Projects"); - config->writePathEntry("Last Project", TQString::null); + config->writePathEntry("Last Project", TQString()); init(); - parent->newProjectLoaded(projectName, baseURL, templateURL); - parent->reloadTree( &(m_projectFiles), true, TQStringList()); + tqparent->newProjectLoaded(projectName, baseURL, templateURL); + tqparent->reloadTree( &(m_projectFiles), true, TQStringList()); adjustActions(); m_projectRecent->setCurrentItem(-1); - parent->newStatus(); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + tqparent->newtqStatus(); + kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); } /** open project file */ void ProjectPrivate::slotOpenProject() { - KURL url = KFileDialog::getOpenURL( TQString::null, + KURL url = KFileDialog::getOpenURL( TQString(), "*.wpj *.webprj"+i18n("|Project Files\n*|All Files"), m_mainWindow, i18n("Open Project")); @@ -1252,7 +1252,7 @@ void ProjectPrivate::slotOpenProject() /* save project file */ bool ProjectPrivate::saveProject() { - if ( !parent->hasProject() ) return false; + if ( !tqparent->hasProject() ) return false; bool result = true; // remove old opened files TQDomElement el; @@ -1263,7 +1263,7 @@ bool ProjectPrivate::saveProject() el = nl.item(i).toElement(); if ( el.nodeName() == "openfile" ) { - el.parentNode().removeChild( el ); + el.tqparentNode().removeChild( el ); i--; } } @@ -1284,11 +1284,11 @@ bool ProjectPrivate::saveProject() f.close(); } m_modified = false; - parent->statusMsg(i18n( "Wrote project file %1" ).arg(m_tmpProjectFile)); + tqparent->statusMsg(i18n( "Wrote project file %1" ).tqarg(m_tmpProjectFile)); } else { - parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").arg(m_tmpProjectFile)); + tqparent->hideSplash(); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for writing.</qt>").tqarg(m_tmpProjectFile)); result = false; } return result; @@ -1338,8 +1338,8 @@ void ProjectPrivate::loadProjectFromTemp(const KURL &url, const TQString &tempFi writeConfig(); } else { - parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").arg(tempFile)); + tqparent->hideSplash(); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot open the file <b>%1</b> for reading.</qt>").tqarg(tempFile)); } } @@ -1350,14 +1350,14 @@ bool ProjectPrivate::loadProject(const KURL &url) return true; if (!url.isValid()) { - parent->hideSplash(); - KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").arg(url.prettyURL())); + tqparent->hideSplash(); + KMessageBox::sorry(m_mainWindow, i18n("<qt>Malformed URL: <b>%1</b></qt>").tqarg(url.prettyURL())); return false; } if ( projectAlreadyOpen(url.url()) ) { - parent->hideSplash(); - if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").arg(url.prettyURL()), TQString::null, KStdGuiItem::open()) == KMessageBox::Cancel) + tqparent->hideSplash(); + if (KMessageBox::warningContinueCancel(m_mainWindow, i18n("<qt>The project<br><b>%1</b><br> seems to be used by another Quanta instance.<br>You may end up with data loss if you open the same project in two instances, modify and save them in both.<br><br>Do you want to proceed with open?</qt>").tqarg(url.prettyURL()), TQString(), KStdGuiItem::open()) == KMessageBox::Cancel) return false; } TQString projectTmpFile; @@ -1367,14 +1367,14 @@ bool ProjectPrivate::loadProject(const KURL &url) if (KIO::NetAccess::exists(url, false, m_mainWindow) && KIO::NetAccess::download(url, projectTmpFile, m_mainWindow)) { - if (parent->hasProject()) + if (tqparent->hasProject()) { slotCloseProject(); } KURL sessionURL = url; TQString fileName = url.fileName(); if (fileName.endsWith(".webprj")) - fileName.replace(".webprj", ".session"); + fileName.tqreplace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); @@ -1415,8 +1415,8 @@ bool ProjectPrivate::loadProject(const KURL &url) loadProjectFromTemp(url, projectTmpFile, sessionTmpFile); } else { - parent->hideSplash(); - KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); + tqparent->hideSplash(); + KMessageBox::error(m_mainWindow, i18n("<qt>Cannot access the project file <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); return false; } return true; @@ -1432,7 +1432,7 @@ void ProjectPrivate::slotAddFiles() if ( !list.isEmpty() ) { KURL firstURL = list.first(); - firstURL = QExtFileInfo::toRelative( firstURL, baseURL ); + firstURL = TQExtFileInfo::toRelative( firstURL, baseURL ); if ( firstURL.path().startsWith("/") || firstURL.path().startsWith(".")) { @@ -1448,7 +1448,7 @@ void ProjectPrivate::slotAddFiles() CopyTo *dlg = new CopyTo( baseURL); connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), TQT_SLOT (slotDeleteCopytoDlg(CopyTo*))); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent, + connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), tqparent, TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); list = dlg->copy( list, destination ); return; @@ -1470,7 +1470,7 @@ void ProjectPrivate::slotAddFiles() } } - parent->reloadTree( &(m_projectFiles), false, TQStringList()); + tqparent->reloadTree( &(m_projectFiles), false, TQStringList()); } } @@ -1487,7 +1487,7 @@ void ProjectPrivate::slotAddDirectory() KURL url = KURL(); url = KFileDialog::getExistingURL(baseURL.prettyURL(), m_mainWindow, i18n("Insert Folder in Project")); - parent->slotAddDirectory(url); + tqparent->slotAddDirectory(url); } @@ -1531,8 +1531,8 @@ void ProjectPrivate::slotDebuggerOptions() } else { - parent->hideSplash(); - KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").arg(errCode).arg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); + tqparent->hideSplash(); + KMessageBox::error(NULL, i18n("<qt>Unable to load the debugger plugin, error code %1 was returned: <b>%2</b>.</qt>").tqarg(errCode).tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Debugger Error")); } } } @@ -1556,7 +1556,7 @@ void ProjectPrivate::writeConfig() if (!projectURL.isEmpty()) { TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - if (projectList.contains( projectURL.url() ) == 0) + if (projectList.tqcontains( projectURL.url() ) == 0) { projectList.append( projectURL.url() ); config->writePathEntry("OpenProjects", projectList); @@ -1581,7 +1581,7 @@ void ProjectPrivate::removeFromConfig(const TQString & urlStr) config->reparseConfiguration(); config->setGroup("Projects"); TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - int i = projectList.findIndex( urlStr ); + int i = projectList.tqfindIndex( urlStr ); if ( i > -1) { projectList.remove(projectList.at(i)); @@ -1606,7 +1606,7 @@ bool ProjectPrivate::projectAlreadyOpen(const TQString & urlStr) config->reparseConfiguration(); config->setGroup("Projects"); TQStringList projectList = QuantaCommon::readPathListEntry(config, "OpenProjects"); - return (projectList.contains(urlStr) != 0); + return (projectList.tqcontains(urlStr) != 0); } @@ -1618,7 +1618,7 @@ bool ProjectPrivate::uploadProjectFile() KURL sessionURL = projectURL; TQString fileName = projectURL.fileName(); if (fileName.endsWith(".webprj")) - fileName.replace(".webprj", ".session"); + fileName.tqreplace(".webprj", ".session"); else fileName += ".session"; sessionURL.setFileName(fileName); @@ -1632,14 +1632,14 @@ bool ProjectPrivate::uploadProjectFile() tempFile = 0L; delete sessionTempFile; sessionTempFile = 0L; - m_tmpProjectFile = TQString::null; + m_tmpProjectFile = TQString(); return true; } if (KIO::NetAccess::upload(m_tmpProjectFile, projectURL, m_mainWindow) && KIO::NetAccess::upload(m_tmpSessionFile, sessionURL, m_mainWindow)) { removeFromConfig(projectURL.url()); // remove the project from the list of open projects if (quantaApp) - parent->statusMsg(i18n( "Uploaded project file %1" ).arg( projectURL.prettyURL())); + tqparent->statusMsg(i18n( "Uploaded project file %1" ).tqarg( projectURL.prettyURL())); // delete all temp files we used // first the one from creating a new project delete tempFile; @@ -1659,7 +1659,7 @@ bool ProjectPrivate::uploadProjectFile() { if (quantaApp) { - parent->statusMsg(TQString::null ); + tqparent->statusMsg(TQString() ); KMessageBox::error(m_mainWindow, KIO::NetAccess::lastErrorString()); } return false; diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index a0b37fa3..6c5adf12 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -48,15 +48,16 @@ struct EventAction; typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class ProjectPrivate - : public QObject + : public TQObject { Q_OBJECT + TQ_OBJECT public: ProjectPrivate(Project *p); ~ProjectPrivate(); - Project *parent; + Project *tqparent; /** Point to the .webprj file */ KURL projectURL; TQString projectName; @@ -147,7 +148,7 @@ upload.*/ void insertFiles( KURL::List files ); /** insert files from dir recursive */ - void insertFiles(const KURL& pathURL, const TQString& mask ); + void insertFiles(const KURL& pathURL, const TQString& tqmask ); void loadProjectXML(); diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index ce621c07..52f52908 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -63,7 +63,7 @@ #include "resource.h" ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool showOnlyProfiles, bool quickUpload, bool markOnly, const char* name) - :ProjectUploadS( 0L, name, false, Qt::WDestructiveClose) + :ProjectUploadS( 0L, name, false, TQt::WDestructiveClose) { m_quickUpload = quickUpload; m_profilesOnly = showOnlyProfiles; @@ -73,7 +73,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool startUrl = url; if (m_profilesOnly) { - clearWFlags(Qt::WDestructiveClose); + clearWFlags(TQt::WDestructiveClose); uploadFrame->hide(); buttonCancel->hide(); adjustSize(); @@ -172,13 +172,13 @@ void ProjectUpload::slotBuildTree() KURL u = m_project->projectBaseURL(); if (!startUrl.isEmpty()) { - u = QExtFileInfo::toAbsolute(startUrl, u); + u = TQExtFileInfo::toAbsolute(startUrl, u); } TQDict<KFileItem> projectDirFiles; if (startUrl.isEmpty() || strUrl.endsWith("/")) //upload a folder { - projectDirFiles = QExtFileInfo::allFilesDetailed(u, "*", this); + projectDirFiles = TQExtFileInfo::allFilesDetailed(u, "*", this); } else { projectDirFiles.insert(u.url(), new KFileItem(KFileItem::Unknown, KFileItem::Unknown, u, true)); @@ -197,9 +197,9 @@ void ProjectUpload::slotBuildTree() { QuantaCommon::setUrl(u, s); absUrl.setPath(m_project->projectBaseURL().path(1)+u.path(-1)); -/* if (!QExtFileInfo::exists(absUrl)) +/* if (!TQExtFileInfo::exists(absUrl)) continue; */ - KFileItem *p_item = projectDirFiles.find(absUrl.url()); + KFileItem *p_item = projectDirFiles.tqfind(absUrl.url()); if (!p_item) continue; KFileItem item(*p_item); @@ -207,19 +207,19 @@ void ProjectUpload::slotBuildTree() if ( it != 0 ) { int uploadedTime = -1; - if (m_uploadTimeList.contains(s)) + if (m_uploadTimeList.tqcontains(s)) uploadedTime = m_uploadTimeList[s]; int modifiedTime = item.time(KIO::UDS_MODIFICATION_TIME); el.setAttribute("modified_time", modifiedTime); - int uploadStatus = el.attribute("uploadstatus", "1").toInt(); - if (m_quickUpload || (forceUpload && uploadStatus == 0)) - uploadStatus = 1; - if (m_quickUpload || (uploadedTime != modifiedTime && uploadStatus != 0)) + int uploadtqStatus = el.attribute("uploadstatus", "1").toInt(); + if (m_quickUpload || (forceUpload && uploadtqStatus == 0)) + uploadtqStatus = 1; + if (m_quickUpload || (uploadedTime != modifiedTime && uploadtqStatus != 0)) { modified.append( u ); it->setSelected(true); } - if (uploadStatus == 2) + if (uploadtqStatus == 2) it->setConfirmUpload(true); totalProgress->setValue(i); } @@ -235,7 +235,7 @@ void ProjectUpload::slotBuildTree() totalText->setText(i18n("Total:")); totalProgress->setTotalSteps(1); totalProgress->setValue(0); - //hack to force repainting of the treeview + //hack to force tqrepainting of the treeview resize(width() + 1, height()); resize(width() - 1, height()); if (m_quickUpload) @@ -338,7 +338,7 @@ void ProjectUpload::startUpload() for ( uint i = 0; i < nl.count(); i++ ) { el = nl.item(i).toElement(); - if ( selectedList.contains(el.attribute("url"))) + if ( selectedList.tqcontains(el.attribute("url"))) { m_uploadTimeList[el.attribute("url")] = el.attribute("modified_time").toInt(); } @@ -362,7 +362,7 @@ void ProjectUpload::startUpload() if (!ok) return; for (it = needsConfirmation.begin(); it != needsConfirmation.end(); ++it) { - if (!confirmedList.contains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol))) + if (!confirmedList.tqcontains(((UploadTreeFile*)(*it))->url().prettyURL(0, KURL::StripFileProtocol))) toUpload.remove(*it); } @@ -375,14 +375,14 @@ void ProjectUpload::startUpload() buttonUpload->setEnabled(false); KURL u = *baseUrl; u.setPath(u.protocol() == "file" ? "/" : ""); - if (QExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && QExtFileInfo::exists(*baseUrl, false, this))) + if (TQExtFileInfo::exists(u, false, this) || (u.protocol() == "webdav" && TQExtFileInfo::exists(*baseUrl, false, this))) { upload(); return; } else { if (KMessageBox::warningContinueCancel(this, i18n("<qt><b>%1</b> seems to be unaccessible.<br>Do you want to proceed with upload?</qt>") - .arg(u.prettyURL(0, KURL::StripFileProtocol)),TQString::null,KStdGuiItem::cont()) == KMessageBox::Continue) + .tqarg(u.prettyURL(0, KURL::StripFileProtocol)),TQString(),KStdGuiItem::cont()) == KMessageBox::Continue) { upload(); return; @@ -425,7 +425,7 @@ void ProjectUpload::upload() } - KURL from = QExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL()); + KURL from = TQExtFileInfo::toAbsolute(currentURL, m_project->projectBaseURL()); to = *baseUrl; to.addPath( currentURL.path() ); if (to.fileName(false).isEmpty()) @@ -437,10 +437,10 @@ void ProjectUpload::upload() dir = to.upURL() ; } - if ( !madeDirs.contains(dir) ) + if ( !madeDirs.tqcontains(dir) ) { madeDirs.append( dir ); - if (!QExtFileInfo::createDir(dir, this)) + if (!TQExtFileInfo::createDir(dir, this)) { QuantaCommon::dirCreationError(this, KURL( dir.prettyURL(0, KURL::StripFileProtocol) )); buttonUpload->setEnabled(true); @@ -463,7 +463,7 @@ void ProjectUpload::upload() connect( job, TQT_SIGNAL( infoMessage( KIO::Job *,const TQString& ) ), this, TQT_SLOT( uploadMessage( KIO::Job *,const TQString& ) ) ); - labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); + labelCurFile->setText(i18n("Current: %1").tqarg(currentURL.fileName())); currentProgress->setProgress( 0 ); return; } else //it is a dir, so just go to the next item @@ -517,7 +517,7 @@ void ProjectUpload::selectModified() { TQListViewItem *it = list->findItem( (*file).path() ); it->setSelected(true); - it->repaint(); + it->tqrepaint(); } list->checkboxTree(); } @@ -564,7 +564,7 @@ void ProjectUpload::slotUploadNext() UploadTreeFile *itf = dynamic_cast<UploadTreeFile*>(it); if (itf) itf->setWhichPixmap( "check_clear" ); - it->repaint(); + it->tqrepaint(); } toUpload.remove( it ); @@ -639,7 +639,7 @@ void ProjectUpload::slotRemoveProfile() } else { TQString profileName = comboProfile->currentText(); - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").arg(profileName), + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Do you really want to remove the <b>%1</b> upload profile?</qt>").tqarg(profileName), i18n("Profile Removal"), KStdGuiItem::del()) == KMessageBox::Continue) { m_profilesNode.removeChild(m_currentProfileElement); @@ -652,7 +652,7 @@ void ProjectUpload::slotRemoveProfile() slotNewProfileSelected(currentProfile); if (profileName == defaultProfile()) { - KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").arg(currentProfile), i18n("Profile Removal")); + KMessageBox::information(this, i18n("<qt>You have removed your default profile.<br>The new default profile will be <b>%1</b>.</qt>").tqarg(currentProfile), i18n("Profile Removal")); m_profilesNode.toElement().setAttribute("defaultProfile", currentProfile); } comboProfile->removeItem(idx); @@ -800,10 +800,10 @@ void ProjectUpload::loadRemoteUploadInfo() void ProjectUpload::saveRemoteUploadInfo() { - TQDomNode parent = m_currentProfileElement.parentNode(); + TQDomNode tqparent = m_currentProfileElement.tqparentNode(); TQDomNode profileNode = m_currentProfileElement.cloneNode(false); - parent.removeChild(m_currentProfileElement); - parent.appendChild(profileNode); + tqparent.removeChild(m_currentProfileElement); + tqparent.appendChild(profileNode); TQMap<TQString, int>::ConstIterator it; for (it = m_uploadTimeList.constBegin(); it != m_uploadTimeList.constEnd(); ++it) { diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h index d76d1767..ca136dce 100644 --- a/quanta/project/projectupload.h +++ b/quanta/project/projectupload.h @@ -38,13 +38,14 @@ class UploadProfileDlgS; class ProjectUpload : public ProjectUploadS { Q_OBJECT + TQ_OBJECT public: /** Initializes the dialog. If showOnlyProfiles is true, the dialog displays only the list of profiles, no real upload can be performed. If quickUpload is true, the upload starts immediately without checking for modifications or confirmation from the user. The url will be uploaded to the default profile */ - ProjectUpload(const KURL& url, const TQString& profileName = TQString::null, bool showOnlyProfiles = false, bool quickUpload = false, bool markOnly = false, const char * name = 0); + ProjectUpload(const KURL& url, const TQString& profileName = TQString(), bool showOnlyProfiles = false, bool quickUpload = false, bool markOnly = false, const char * name = 0); ~ProjectUpload(); TQString defaultProfile(); diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index 19a2328c..9c94e17f 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -10,7 +10,7 @@ ***************************************************************************/ </comment> <author>(C) 2002-2004 Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ProjectUploadS</cstring> </property> @@ -30,7 +30,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>32767</height> @@ -46,15 +46,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -121,7 +121,7 @@ </widget> </hbox> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>buttonUpload</cstring> </property> @@ -143,7 +143,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="3" column="2"> + <widget class="TQPushButton" row="3" column="2"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -172,14 +172,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>400</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>keepPasswords</cstring> </property> @@ -187,7 +187,7 @@ <string>&Keep passwords in memory</string> </property> </widget> - <widget class="QFrame" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQFrame" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>uploadFrame</cstring> </property> @@ -209,7 +209,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>buttonInvert</cstring> </property> @@ -217,7 +217,7 @@ <string>&Invert</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>buttonClear</cstring> </property> @@ -225,7 +225,7 @@ <string>&None</string> </property> </widget> - <widget class="QPushButton" row="6" column="1"> + <widget class="TQPushButton" row="6" column="1"> <property name="name"> <cstring>buttonCollapse</cstring> </property> @@ -233,7 +233,7 @@ <string>C&ollapse All</string> </property> </widget> - <widget class="QPushButton" row="7" column="1"> + <widget class="TQPushButton" row="7" column="1"> <property name="name"> <cstring>buttonUpdate</cstring> </property> @@ -244,7 +244,7 @@ <string>This will cause all files to appear already uploaded</string> </property> </widget> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>buttonModified</cstring> </property> @@ -252,7 +252,7 @@ <string>&Modified</string> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>buttonExpand</cstring> </property> @@ -273,7 +273,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -289,7 +289,7 @@ <string>Selection:</string> </property> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>buttonAll</cstring> </property> @@ -305,7 +305,7 @@ <string>&All</string> </property> </widget> - <widget class="QCheckBox" row="8" column="0"> + <widget class="TQCheckBox" row="8" column="0"> <property name="name"> <cstring>markAsUploaded</cstring> </property> @@ -323,7 +323,7 @@ <cstring>currentProgress</cstring> </property> </widget> - <widget class="QLabel" row="9" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="9" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>labelCurFile</cstring> </property> @@ -338,11 +338,11 @@ <property name="text"> <string>Current: [none]</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> - <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>totalText</cstring> </property> @@ -476,7 +476,7 @@ <includes> <include location="global" impldecl="in declaration">../treeviews/uploadtreeview.h</include> </includes> -<slots> +<Q_SLOTS> <slot>clearSelection()</slot> <slot>startUpload()</slot> <slot>selectAll()</slot> @@ -489,8 +489,8 @@ <slot>slotEditProfile()</slot> <slot>slotRemoveProfile()</slot> <slot>slotNewProfileSelected(const QString&)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>uploadtreeview.h</includehint> </includehints> diff --git a/quanta/project/projecturl.h b/quanta/project/projecturl.h index cf3eae66..02232234 100644 --- a/quanta/project/projecturl.h +++ b/quanta/project/projecturl.h @@ -32,26 +32,26 @@ class ProjectURL : public KURL { public: TQString fileDesc; - int uploadStatus; ///< The upload state, see UploadStatus + int uploadtqStatus; ///< The upload state, see UploadtqStatus bool documentFolder; TQDomElement domElement; ProjectURL() - : KURL(), uploadStatus(1), documentFolder(false) {} + : KURL(), uploadtqStatus(1), documentFolder(false) {} ProjectURL(const KURL& url) - : KURL(url), uploadStatus(1), documentFolder(false) {} + : KURL(url), uploadtqStatus(1), documentFolder(false) {} ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder) - : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder) {} + : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder) {} ProjectURL(const KURL& url, const TQString& desc, int status, bool docFolder, TQDomElement el) - : KURL(url), fileDesc(desc), uploadStatus(status), documentFolder(docFolder), domElement(el) {} + : KURL(url), fileDesc(desc), uploadtqStatus(status), documentFolder(docFolder), domElement(el) {} virtual ~ProjectURL() {} /** The default state for a file when uploading */ - enum UploadStatus + enum UploadtqStatus { NeverUpload = 0, ///< the files is not selected for upload, even if it was modified AlwaysUpload, ///< the file is automatically selected for upload if it was modified diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index 1c467c7d..b24b123f 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -40,8 +40,8 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, - TQWidget *parent, const char *name, bool modal ) - : RescanPrjDir(parent,name,modal) + TQWidget *tqparent, const char *name, bool modal ) + : RescanPrjDir(tqparent,name,modal) { setCaption(name); @@ -87,7 +87,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) { KURL url = static_cast<KIO::ListJob *>(job)->url(); url.adjustPath(-1); - // avoid creating these QStrings again and again + // avoid creating these TQStrings again and again static const TQString& dot = KGlobal::staticQString("."); static const TQString& dotdot = KGlobal::staticQString(".."); @@ -115,7 +115,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) else u.setPath(linkDest); u.adjustPath(+1); - KURL u2 = QExtFileInfo::toRelative(u, baseURL); + KURL u2 = TQExtFileInfo::toRelative(u, baseURL); bool found = false; for (uint i = 0; i < urlList.count(); i++) if (urlList[i].url == u2) @@ -123,7 +123,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) found = true; break; } - if (!prjFileList.contains(u) && !found) + if (!prjFileList.tqcontains(u) && !found) { linkItems.append(new KFileItem(item)); } else @@ -137,7 +137,7 @@ void RescanPrj::addEntries(KIO::Job *job,const KIO::UDSEntryList &list) itemURL = item.url(); if (item.isDir()) itemURL.adjustPath(+1); - ProjectURL *proUrl = prjFileList.find(itemURL); + ProjectURL *proUrl = prjFileList.tqfind(itemURL); if (!proUrl) { urlEntry.url = prjFileList.toRelative(itemURL); @@ -162,7 +162,7 @@ void RescanPrj::resizeEvent ( TQResizeEvent *t ) { RescanPrjDir::resizeEvent(t); // listView->setColumnWidth(0,listView->width()-listView->columnWidth(1)-20); -// MainLayout->setGeometry(childrenRect()); +// MainLayout->setGeometry(tqchildrenRect()); } void RescanPrj::slotSelect() @@ -214,7 +214,7 @@ KURL::List RescanPrj::files() } if (!u.isEmpty()) - r.append( QExtFileInfo::toAbsolute(u, baseURL) ); + r.append( TQExtFileInfo::toAbsolute(u, baseURL) ); } } return r; @@ -227,7 +227,7 @@ void RescanPrj::slotListDone(KIO::Job *) if (m_listJobCount == 0) { progressText->setText(i18n("Building tree:")); - progressText->repaint(); + progressText->tqrepaint(); progress->setTotalSteps(urlList.count()); progress->setValue(0); URLListEntry urlEntry; diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h index e1e61f04..39a03bb0 100644 --- a/quanta/project/rescanprj.h +++ b/quanta/project/rescanprj.h @@ -34,9 +34,10 @@ struct URLListEntry{ class RescanPrj : public RescanPrjDir { Q_OBJECT + TQ_OBJECT public: RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, - TQWidget *parent=0, const char *name=0, bool modal = true); + TQWidget *tqparent=0, const char *name=0, bool modal = true); ~RescanPrj(); public slots: diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui index d4fdf556..8cdafab6 100644 --- a/quanta/project/rescanprjdir.ui +++ b/quanta/project/rescanprjdir.ui @@ -9,7 +9,7 @@ * * ***************************************************************************/ </comment> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>RescanPrjDir</cstring> </property> @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>620</width> <height>540</height> @@ -50,7 +50,7 @@ <cstring>progress</cstring> </property> </widget> - <widget class="QLabel" row="11" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="11" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>progressText</cstring> </property> @@ -71,7 +71,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -83,13 +83,13 @@ <property name="name"> <cstring>Line2</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>4</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32767</width> <height>4</height> @@ -105,7 +105,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QPushButton" row="9" column="1"> + <widget class="TQPushButton" row="9" column="1"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -116,7 +116,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="8" column="1"> + <widget class="TQPushButton" row="8" column="1"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -130,7 +130,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="6" column="1"> + <widget class="TQPushButton" row="6" column="1"> <property name="name"> <cstring>buttonCollapse</cstring> </property> @@ -148,14 +148,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>144</height> </size> </property> </spacer> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>buttonSelect</cstring> </property> @@ -163,7 +163,7 @@ <string>&All</string> </property> </widget> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>buttonDeselect</cstring> </property> @@ -171,7 +171,7 @@ <string>&None</string> </property> </widget> - <widget class="QPushButton" row="5" column="1"> + <widget class="TQPushButton" row="5" column="1"> <property name="name"> <cstring>buttonExpand</cstring> </property> @@ -179,7 +179,7 @@ <string>E&xpand All</string> </property> </widget> - <widget class="QPushButton" row="10" column="1"> + <widget class="TQPushButton" row="10" column="1"> <property name="name"> <cstring>buttonHelp</cstring> </property> @@ -190,7 +190,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>buttonInvert</cstring> </property> @@ -247,7 +247,7 @@ <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kprogress.h</includehint> <includehint>uploadtreeview.h</includehint> diff --git a/quanta/project/subprojecteditdlgs.ui b/quanta/project/subprojecteditdlgs.ui index 422bf2b8..ac9470ed 100644 --- a/quanta/project/subprojecteditdlgs.ui +++ b/quanta/project/subprojecteditdlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SubprojectEditDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SubprojectEditDlgS</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel9</cstring> </property> @@ -40,7 +40,7 @@ <cstring>nameEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel10</cstring> </property> @@ -51,7 +51,7 @@ <cstring>locationEdit</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>createNew</cstring> </property> @@ -69,5 +69,5 @@ <tabstop>locationEdit</tabstop> <tabstop>createNew</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/teammembersdlg.cpp b/quanta/project/teammembersdlg.cpp index ea3e415c..f2fe6ad2 100644 --- a/quanta/project/teammembersdlg.cpp +++ b/quanta/project/teammembersdlg.cpp @@ -42,8 +42,8 @@ extern TQString taskLeaderStr; extern TQString teamLeaderStr; extern TQString subprojectLeaderStr; -TeamMembersDlg::TeamMembersDlg(TQWidget *parent, const char *name) - : TeamMembersDlgS(parent, name) +TeamMembersDlg::TeamMembersDlg(TQWidget *tqparent, const char *name) + : TeamMembersDlgS(tqparent, name) { m_yourself = ""; } @@ -186,13 +186,13 @@ void TeamMembersDlg::slotDeleteMember() if (deleteYourself) { - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove yourself (<b>%1</b>) from the project team?<br>If you do so, you should select another member as yourself.</qt>").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove yourself (<b>%1</b>) from the project team?<br>If you do so, you should select another member as yourself.</qt>").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; setYourself(""); } } else - if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove <b>%1</b> from the project team?</qt>").arg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure that you want to remove <b>%1</b> from the project team?</qt>").tqarg(item->text(NAME_COL)), i18n("Delete Member"), KStdGuiItem::del()) == KMessageBox::Continue) { delete item; } @@ -213,7 +213,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, (role == i18n(subprojectLeaderStr.utf8()) && it.current()->text(SUBPROJECT_COL) == subProject) ) ) { - if (KMessageBox::warningYesNo(this, i18n("<qt>The <b>%1</b> role is already assigned to <b>%2</b>. Do you want to reassign it to the current member?</qt>").arg(role).arg(it.current()->text(NAME_COL)), TQString::null, i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) + if (KMessageBox::warningYesNo(this, i18n("<qt>The <b>%1</b> role is already assigned to <b>%2</b>. Do you want to reassign it to the current member?</qt>").tqarg(role).tqarg(it.current()->text(NAME_COL)), TQString(), i18n("Reassign"), i18n("Do Not Reassign")) == KMessageBox::Yes) { it.current()->setText(ROLE_COL, i18n(simpleMemberStr.utf8())); return true; @@ -223,7 +223,7 @@ bool TeamMembersDlg::checkDuplicates(TQListViewItem *item, const TQString &name, } else if (nick.lower() == nickName.lower() && it.current() != item && (it.current()->text(EMAIL_COL) != email || it.current()->text(NAME_COL) != name)) { - KMessageBox::error(this, i18n("<qt>The <b>%1</b> nickname is already assigned to <b>%2 <%3></b>.</qt>").arg(nickName).arg(it.current()->text(NAME_COL)).arg(it.current()->text(EMAIL_COL))); + KMessageBox::error(this, i18n("<qt>The <b>%1</b> nickname is already assigned to <b>%2 <%3></b>.</qt>").tqarg(nickName).tqarg(it.current()->text(NAME_COL)).tqarg(it.current()->text(EMAIL_COL))); return false; } ++it; diff --git a/quanta/project/teammembersdlg.h b/quanta/project/teammembersdlg.h index 045c0a7c..2884fb1c 100644 --- a/quanta/project/teammembersdlg.h +++ b/quanta/project/teammembersdlg.h @@ -25,8 +25,9 @@ class TeamMembersDlg : public TeamMembersDlgS { Q_OBJECT + TQ_OBJECT public: - TeamMembersDlg(TQWidget *parent = 0, const char *name = 0); + TeamMembersDlg(TQWidget *tqparent = 0, const char *name = 0); ~TeamMembersDlg(); void setYourself(const TQString &name); diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index eb2689dc..0949cf88 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TeamMembersDlgS</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TeamMembersDlgS</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -32,7 +32,7 @@ <cstring>mailingListEdit</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -40,7 +40,7 @@ <string>You are:</string> </property> </widget> - <widget class="QLabel" row="1" column="1"> + <widget class="TQLabel" row="1" column="1"> <property name="name"> <cstring>yourselfLabel</cstring> </property> @@ -52,11 +52,11 @@ <property name="text"> <string>Please select your identity from the member list.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>20</height> @@ -231,13 +231,13 @@ <tabstop>deleteMemberButton</tabstop> <tabstop>setToYourselfButton</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotAddMember()</slot> <slot>slotEditMember()</slot> <slot>slotDeleteMember()</slot> <slot>slotSetToYourself()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui index 851a133c..9d36a26e 100644 --- a/quanta/project/uploadprofiledlgs.ui +++ b/quanta/project/uploadprofiledlgs.ui @@ -10,7 +10,7 @@ ***************************************************************************/ </comment> <author>(C) 2004 Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>UploadProfileDlgS</cstring> </property> @@ -29,12 +29,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="3" column="1" rowspan="1" colspan="10"> + <widget class="TQLineEdit" row="3" column="1" rowspan="1" colspan="10"> <property name="name"> <cstring>linePath</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -45,7 +45,7 @@ <cstring>lineHost</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -56,7 +56,7 @@ <cstring>lineUser</cstring> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -67,7 +67,7 @@ <cstring>linePath</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -78,7 +78,7 @@ <cstring>lineProfileName</cstring> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="5"> <property name="name"> <cstring>defaultProfile</cstring> </property> @@ -86,7 +86,7 @@ <string>Use as &default profile</string> </property> </widget> - <widget class="QLineEdit" row="2" column="1" rowspan="1" colspan="2"> + <widget class="TQLineEdit" row="2" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>lineUser</cstring> </property> @@ -99,7 +99,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="2" column="3"> + <widget class="TQLabel" row="2" column="3"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -122,7 +122,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -144,7 +144,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>90</width> <height>0</height> @@ -167,14 +167,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>445</width> <height>20</height> </size> </property> </spacer> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lineHost</cstring> </property> @@ -187,12 +187,12 @@ </sizepolicy> </property> </widget> - <widget class="QComboBox" row="1" column="5" rowspan="1" colspan="3"> + <widget class="TQComboBox" row="1" column="5" rowspan="1" colspan="3"> <property name="name"> <cstring>comboProtocol</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="10"> + <widget class="TQLineEdit" row="1" column="10"> <property name="name"> <cstring>port</cstring> </property> @@ -205,7 +205,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="8" rowspan="1" colspan="2"> + <widget class="TQLabel" row="1" column="8" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -216,7 +216,7 @@ <cstring>port</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="6" rowspan="1" colspan="5"> + <widget class="TQCheckBox" row="2" column="6" rowspan="1" colspan="5"> <property name="name"> <cstring>keepPasswd</cstring> </property> @@ -256,14 +256,14 @@ is obscured, saving the password in any file is a security risk. Use this option </sizepolicy> </property> </widget> - <widget class="QLabel" row="1" column="4"> + <widget class="TQLabel" row="1" column="4"> <property name="name"> <cstring>TextLabel1</cstring> </property> <property name="text"> <string>&Protocol:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -306,5 +306,5 @@ is obscured, saving the password in any file is a security risk. Use this option <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/uploadprofiles.cpp b/quanta/project/uploadprofiles.cpp index cb54c27f..779903ab 100644 --- a/quanta/project/uploadprofiles.cpp +++ b/quanta/project/uploadprofiles.cpp @@ -55,12 +55,12 @@ void UploadProfiles::readFromXML(const TQDomDocument &dom) bool UploadProfiles::removeFromMapAndXML(const TQString &name) { - UploadProfiles::Iterator it = find(name); + UploadProfiles::Iterator it = tqfind(name); if ( it == end() ) return false; // ok now remove TQDomElement el = (*it).domElement; - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); erase(name); return true; } diff --git a/quanta/project/uploadprofiles.h b/quanta/project/uploadprofiles.h index db83e125..07011e2e 100644 --- a/quanta/project/uploadprofiles.h +++ b/quanta/project/uploadprofiles.h @@ -94,7 +94,7 @@ private: TQWidget * createTreeview(const UploadProfile &profile); /** - creates a KURL from a QDomElement + creates a KURL from a TQDomElement @param e a TQDomElement where the path is saved diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui index 745e0ba4..bd5ce2e4 100644 --- a/quanta/project/uploadprofilespage.ui +++ b/quanta/project/uploadprofilespage.ui @@ -11,7 +11,7 @@ ***************************************************************************/ </comment> <author>(C) 2004 by Andras Mantia</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>UploadProfilesPage</cstring> </property> @@ -30,15 +30,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>pLabel</cstring> </property> @@ -62,7 +62,7 @@ <string>Edit Profiles</string> </property> </widget> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>profileLabel</cstring> </property> @@ -78,7 +78,7 @@ <string>x</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>checkShowUploadTreeviews</cstring> </property> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -118,8 +118,8 @@ <includes> <include location="local" impldecl="in implementation">uploadprofilespage.ui.h</include> </includes> -<slots> +<Q_SLOTS> <slot>buttonEditProfiles_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/uploadprofilespage.ui.h b/quanta/project/uploadprofilespage.ui.h index cb7aad06..054a3622 100644 --- a/quanta/project/uploadprofilespage.ui.h +++ b/quanta/project/uploadprofilespage.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index 4dd81e39..a7cd94c0 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -13,12 +13,12 @@ <umlobjects> <UML:Class stereotype="" package="" xmi.id="74" abstract="0" documentation="This should contain a "view" of the document. This is not clearly implemented. The class contains a set of tabs, and each tab can hold one Document object. I think the tab (and such the MDI) handling should go to the QuantaApp class and here only the document view related things should be. Just as the Document/View model requests." name="QuantaView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="86" type="" abstract="0" documentation="" name="QuantaView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="88" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="89" type="void" abstract="0" documentation="" name="addWrite" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="90" value="" type="Document *" abstract="0" documentation="" name="w" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="91" value="" type="QString" abstract="0" documentation="" name="label" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="91" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="label" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="92" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="93" type="virtual void" abstract="0" documentation="" name="dragEnterEvent" static="0" scope="202" > @@ -31,8 +31,8 @@ <UML:Operation stereotype="" package="" xmi.id="98" type="void" abstract="0" documentation="" name="initActions" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="99" type="void" abstract="0" documentation="" name="initMenu" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="100" type="void" abstract="0" documentation="" name="insertNewTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="101" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="102" value="" type="QString" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="102" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="103" value="" type="bool" abstract="0" documentation="" name="insertInLine" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="104" type="void" abstract="0" documentation="" name="insertTag" static="0" scope="200" > @@ -49,11 +49,11 @@ <UML:Attribute stereotype="" package="" xmi.id="76" value="" type="bool" abstract="0" documentation="" name="beginOfScriptOutput" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="77" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="78" value="" type="QuantaDoc *" abstract="0" documentation="" name="doc" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="79" value="" type="QString" abstract="0" documentation="" name="dontShowSavePreview" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="79" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dontShowSavePreview" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="80" value="" type="Document *" abstract="0" documentation="" name="oldWrite" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="81" value="" type="QString" abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="82" value="" type="QString" abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="83" value="" type="QString" abstract="0" documentation="" name="space" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="81" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="82" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="83" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="space" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="84" value="" type="QTabWidget *" abstract="0" documentation="" name="toolbarTab" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="85" value="" type="QTabWidget *" abstract="0" documentation="" name="writeTab" static="0" scope="200" /> </UML:Class> @@ -62,12 +62,12 @@ <UML:Operation stereotype="" package="" xmi.id="206" type="QDomDocument *" abstract="0" documentation="" name="actions" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="207" type="bool" abstract="0" documentation="Returns true if the current DTD does not have any toolbars, or if all of the toolbars are removed or if the "Shov DTD Toolbar" is unchecked." name="allToolbarsHidden" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="208" type="QWidget *" abstract="0" documentation="" name="createContainer" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="210" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="211" value="" type="const QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="212" value="" type="int &" abstract="0" documentation="" name="id" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="213" type="QString" abstract="0" documentation="Returns the project default encoding if a project is loaded, otherwise it returns the global default encoding." name="defaultEncoding" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="213" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="Returns the project default encoding if a project is loaded, otherwise it returns the global default encoding." name="defaultEncoding" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="214" type="virtual void" abstract="0" documentation="Sets the focus to the editor window and checkes for changes in the edited file when the application gets back the focus." name="focusInEvent" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="215" value="" type="QFocusEvent *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> @@ -85,16 +85,16 @@ <UML:Operation stereotype="" package="" xmi.id="227" type="void" abstract="0" documentation="" name="initTagDict" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="228" type="void" abstract="0" documentation="" name="initView" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="229" type="void" abstract="0" documentation="" name="loadInitialProject" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="230" value="" type="QString" abstract="0" documentation="" name="url" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="230" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="231" type="void" abstract="0" documentation="" name="loadToolbarForDTD" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="232" value="" type="const QString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="233" type="QString" abstract="0" documentation="" name="newFileType" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="233" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="newFileType" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="234" type="KDockWidget *" abstract="0" documentation="" name="outputDockWidget" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="235" type="QPopupMenu *" abstract="0" documentation="" name="pluginMenu" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="236" type="void" abstract="0" documentation="" name="processDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="237" value="" type="QString" abstract="0" documentation="" name="documentType" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="237" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="documentType" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="238" type="KURL" abstract="0" documentation="" name="projectBaseURL" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="239" type="virtual bool" abstract="0" documentation="" name="queryClose" static="0" scope="202" /> @@ -103,13 +103,13 @@ <UML:Parameter stereotype="" package="" xmi.id="242" value="" type="QString &" abstract="0" documentation="" name="dirName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="243" type="uint" abstract="0" documentation="" name="readTagFile" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="244" value="" type="QString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="244" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fileName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="245" value="" type="DTDStruct *" abstract="0" documentation="" name="tqparentDTD" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="246" value="" type="QTagList *" abstract="0" documentation="" name="tagList" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="247" type="void" abstract="0" documentation="" name="removeContainer" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="248" value="" type="QWidget *" abstract="0" documentation="" name="container" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="250" value="" type="QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="251" value="" type="int" abstract="0" documentation="" name="id" static="0" scope="200" /> </UML:Operation> @@ -148,11 +148,11 @@ <UML:Attribute stereotype="" package="" xmi.id="116" value="" type="QWidgetStack *" abstract="0" documentation="" name="bottomWidgetStack" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="117" value="" type="KAction *" abstract="0" documentation="" name="closeprjAction" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="118" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="119" value="" type="QString" abstract="0" documentation="" name="currentToolbarDTD" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="119" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="currentToolbarDTD" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="120" value="" type="DocTreeView *" abstract="0" documentation="" name="dTab" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="121" value="" type="PHP3Debugger *" abstract="0" documentation="" name="dbg3" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="122" value="" type="PHP4Debugger *" abstract="0" documentation="" name="dbg4" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="123" value="" type="QString" abstract="0" documentation="" name="debuggerStyle" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="123" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="debuggerStyle" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="124" value="" type="QuantaDoc *" abstract="0" documentation="" name="doc" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="125" value="" type="KDockWidget *" abstract="0" documentation="" name="dtabdock" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="126" value="" type="KAction *" abstract="0" documentation="" name="editRedo" static="0" scope="201" /> @@ -206,8 +206,8 @@ <UML:Attribute stereotype="" package="" xmi.id="174" value="" type="KAction *" abstract="0" documentation="" name="saveSelectionAsLocalTemplateAction" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="175" value="" type="KAction *" abstract="0" documentation="" name="saveSelectionAsProjectTemplateAction" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="176" value="" type="KAction *" abstract="0" documentation="" name="saveprjAction" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="177" value="" type="QString" abstract="0" documentation="" name="scriptBeginRxStr" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="178" value="" type="QString" abstract="0" documentation="" name="scriptEndRxStr" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="177" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptBeginRxStr" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="178" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptEndRxStr" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="179" value="" type="KSelectAction *" abstract="0" documentation="" name="setEndOfLine" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="180" value="" type="KToggleAction *" abstract="0" documentation="" name="showDTDToolbar" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="181" value="" type="KToggleAction *" abstract="0" documentation="" name="showDTabAction" static="0" scope="201" /> @@ -238,7 +238,7 @@ <UML:Class stereotype="" package="" xmi.id="274" abstract="0" documentation="The document handling class. This is somewhat weird, as the Document class should handle all the document related things. The job is distrivute now between this the QuantaView and the QuantaApp class. This must be clearly seperated... See the operations in order to get a picture what's here." name="QuantaDoc" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="276" type="" abstract="0" documentation="" name="QuantaDoc" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="278" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="279" type="void" abstract="0" documentation="" name="changeFileTabName" static="0" scope="200" > @@ -257,7 +257,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="289" type="void" abstract="0" documentation="" name="nextDocument" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="290" type="void" abstract="0" documentation="" name="openDocument" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="291" value="" type="const KURL &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="292" value="" type="QString" abstract="0" documentation="" name="encoding" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="292" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="encoding" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="293" type="void" abstract="0" documentation="" name="prevDocument" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="294" type="void" abstract="0" documentation="" name="readConfig" static="0" scope="200" > @@ -282,7 +282,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="307" abstract="0" documentation="Common static functions used everywhere in the code. " name="QuantaCommon" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="308" type="" abstract="0" documentation="" name="QuantaCommon" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="309" type="QString" abstract="0" documentation="" name="attrCase" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="309" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrCase" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="310" value="" type="const QString" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="311" type="bool" abstract="0" documentation="" name="checkExactMimeType" static="0" scope="200" > @@ -304,13 +304,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="323" value="" type="QWidget *" abstract="0" documentation="" name="widget" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="324" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="325" type="QString" abstract="0" documentation="" name="getDTDNameFromNickName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="326" value="" type="QString" abstract="0" documentation="" name="nickName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="325" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDNameFromNickName" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="326" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="nickName" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="327" type="QString" abstract="0" documentation="" name="getDTDNickNameFromName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="328" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="327" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDNickNameFromName" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="328" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="329" type="QString" abstract="0" documentation="" name="i18n2normal" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="329" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="i18n2normal" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="330" value="" type="const QString &" abstract="0" documentation="" name="a_str" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="331" type="int" abstract="0" documentation="" name="isBetween" static="0" scope="200" > @@ -322,51 +322,51 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="337" value="" type="int" abstract="0" documentation="" name="eCol" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="338" type="bool" abstract="0" documentation="" name="isKnownTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="339" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="340" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="339" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="340" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="341" type="bool" abstract="0" documentation="" name="isOptionalTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="342" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="343" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="342" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="343" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="344" type="bool" abstract="0" documentation="" name="isSingleTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="345" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="346" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="345" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="346" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="347" type="QString" abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="347" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="348" value="" type="const QString" abstract="0" documentation="" name="s" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="349" type="KStandardDirs *" abstract="0" documentation="" name="pluginDirs" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="350" value="" type="const char *" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="351" type="QString" abstract="0" documentation="" name="qUrl" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="351" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="qUrl" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="352" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="353" type="void" abstract="0" documentation="" name="setUrl" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="354" value="" type="KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="355" value="" type="QString" abstract="0" documentation="" name="urlString" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="355" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="urlString" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="356" type="QStringList *" abstract="0" documentation="" name="tagAttributeValues" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="357" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="358" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="359" value="" type="QString" abstract="0" documentation="" name="attribute" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="357" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="358" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="359" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="360" type="AttributeList *" abstract="0" documentation="" name="tagAttributes" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="361" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="362" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="361" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="362" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="363" type="QString" abstract="0" documentation="" name="tagCase" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="363" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagCase" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="364" value="" type="const QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="365" type="QTag *" abstract="0" documentation="" name="tagFromDTD" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="366" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="367" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="367" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="368" type="QTag *" abstract="0" documentation="" name="tagFromDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="369" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="370" value="" type="QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="369" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="370" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="371" type="QString" abstract="0" documentation="" name="xmlFromAttributes" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="371" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="xmlFromAttributes" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="372" value="" type="AttributeList *" abstract="0" documentation="" name="attributes" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="373" type="" abstract="0" documentation="" name="~QuantaCommon" static="0" scope="200" /> @@ -390,7 +390,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="390" type="KURL" abstract="0" documentation="" name="path" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="391" value="" type="const KURL &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="392" type="QString" abstract="0" documentation="" name="shortName" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="392" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="shortName" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="393" value="" type="const QString &" abstract="0" documentation="" name="fname" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="394" type="KURL" abstract="0" documentation="" name="toAbsolute" static="0" scope="200" > @@ -403,7 +403,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="400" type="" abstract="0" documentation="" name="~QExtFileInfo" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="375" value="" type="bool" abstract="0" documentation="" name="bJobOK" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="376" value="" type="QString" abstract="0" documentation="" name="lastErrorMsg" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="376" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="lastErrorMsg" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="377" value="" type="QPtrList" abstract="0" documentation="" name="lstFilters" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="378" value="" type="QTimer *" abstract="0" documentation="" name="timer" static="0" scope="201" /> </UML:Class> @@ -420,7 +420,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="428" value="" type="KTextEditor :: Document *" abstract="0" documentation="" name="doc" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="429" value="" type="Project *" abstract="0" documentation="" name="project" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="430" value="" type="QuantaPluginInterface *" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="432" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="433" value="" type="WFlags" abstract="0" documentation="" name="f" static="0" scope="200" /> </UML:Operation> @@ -428,7 +428,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="435" value="" type="Tag *" abstract="0" documentation="" name="tag" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="436" value="" type="QDict < QString > *" abstract="0" documentation="" name="dict" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="437" type="void" abstract="0" documentation="" name="checkDirtyStatus" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="437" type="void" abstract="0" documentation="" name="checkDirtytqStatus" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="438" type="int" abstract="0" documentation="" name="checkOverwrite" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="439" value="" type="KURL" abstract="0" documentation="" name="u" static="0" scope="200" /> </UML:Operation> @@ -445,7 +445,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="449" type="bool" abstract="0" documentation="" name="evenQuotes" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="450" value="" type="const QString &" abstract="0" documentation="" name="text" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="451" type="QString" abstract="0" documentation="" name="find" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="451" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tqfind" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="452" value="" type="const QRegExp &" abstract="0" documentation="" name="rx" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="453" value="" type="int" abstract="0" documentation="" name="sLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="454" value="" type="int" abstract="0" documentation="" name="sCol" static="0" scope="200" /> @@ -454,10 +454,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="457" value="" type="int &" abstract="0" documentation="" name="feLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="458" value="" type="int &" abstract="0" documentation="" name="feCol" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="459" type="QString" abstract="0" documentation="" name="findDTDName" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="459" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findDTDName" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="460" value="" type="Tag * *" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="461" type="QString" abstract="0" documentation="" name="findRev" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="461" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tqfindRev" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="462" value="" type="const QRegExp &" abstract="0" documentation="" name="rx" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="463" value="" type="int" abstract="0" documentation="" name="sLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="464" value="" type="int" abstract="0" documentation="" name="sCol" static="0" scope="200" /> @@ -466,7 +466,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="467" value="" type="int &" abstract="0" documentation="" name="feLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="468" value="" type="int &" abstract="0" documentation="" name="feCol" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="469" type="QString" abstract="0" documentation="" name="findWordRev" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="469" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="findWordRev" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="470" value="" type="const QString &" abstract="0" documentation="" name="textToSearch" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="471" type="Tag *" abstract="0" documentation="" name="findXMLTag" static="0" scope="200" > @@ -477,24 +477,24 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="476" type="QValueList *" abstract="0" documentation="" name="getAttributeCompletions" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="477" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="478" value="" type="QString" abstract="0" documentation="" name="tagName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="479" value="" type="QString" abstract="0" documentation="" name="startsWith" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="478" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="479" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startsWith" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="480" type="QValueList *" abstract="0" documentation="" name="getAttributeValueCompletions" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="481" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="482" value="" type="QString" abstract="0" documentation="" name="tagName" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="483" value="" type="QString" abstract="0" documentation="" name="attribute" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="484" value="" type="QString" abstract="0" documentation="" name="startsWith" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="482" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="483" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="484" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startsWith" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="485" type="QValueList *" abstract="0" documentation="" name="getCharacterCompletions" static="0" scope="202" /> - <UML:Operation stereotype="" package="" xmi.id="486" type="QString" abstract="0" documentation="" name="getDTDIdentifier" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="487" type="QPoint" abstract="0" documentation="" name="getGlobalCursorPos" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="486" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getDTDIdentifier" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="487" type=TQPOINT_OBJECT_NAME_STRING abstract="0" documentation="" name="getGlobalCursorPos" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="488" type="QValueList *" abstract="0" documentation="" name="getTagCompletions" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="489" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="490" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="491" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="492" type="QString" abstract="0" documentation="" name="getTagNameAt" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="492" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getTagNameAt" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="493" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="494" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> @@ -507,22 +507,22 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="500" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="501" type="void" abstract="0" documentation="" name="insertTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="502" value="" type="QString" abstract="0" documentation="" name="s1" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="503" value="" type="QString" abstract="0" documentation="" name="s2" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="502" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s1" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="503" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s2" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="504" type="void" abstract="0" documentation="" name="insertText" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="505" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="505" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="506" value="" type="bool" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="507" type="bool" abstract="0" documentation="" name="isModified" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="508" type="bool" abstract="0" documentation="" name="isUntitled" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="509" type="void" abstract="0" documentation="" name="parseVariables" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="510" type="QString" abstract="0" documentation="" name="parsingDTD" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="510" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="parsingDTD" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="511" type="void" abstract="0" documentation="" name="readConfig" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="512" value="" type="KConfig *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="513" type="void" abstract="0" documentation="" name="replaceSelected" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="514" value="" type="QString" abstract="0" documentation="" name="s" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="514" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="s" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="515" type="void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="516" value="" type="QResizeEvent *" abstract="0" documentation="" name="e" static="0" scope="200" /> @@ -547,9 +547,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="532" value="" type="int" abstract="0" documentation="" name="y2" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="533" type="void" abstract="0" documentation="" name="setDTDIdentifier" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="534" value="" type="QString" abstract="0" documentation="" name="id" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="534" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="id" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="535" type="void" abstract="0" documentation="" name="setDirtyStatus" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="535" type="void" abstract="0" documentation="" name="setDirtytqStatus" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="536" value="" type="bool" abstract="0" documentation="" name="status" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="537" type="void" abstract="0" documentation="" name="setModified" static="0" scope="200" > @@ -559,13 +559,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="540" value="" type="const QString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="541" type="void" abstract="0" documentation="" name="setUntitledUrl" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="542" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="542" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="543" type="void" abstract="0" documentation="" name="showCodeCompletions" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="544" value="" type="QValueList < KTextEditor :: CompletionEntry > *" abstract="0" documentation="" name="completions" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="545" type="QString" abstract="0" documentation="" name="tempFileName" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="546" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="545" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tempFileName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="546" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="547" value="" type="int" abstract="0" documentation="" name="bLine" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="548" value="" type="int" abstract="0" documentation="" name="bCol" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="549" value="" type="int" abstract="0" documentation="" name="eLine" static="0" scope="200" /> @@ -590,21 +590,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="408" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="409" value="" type="bool" abstract="0" documentation="" name="busy" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="410" value="" type="bool" abstract="0" documentation="" name="completionInProgress" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="411" value="" type="QString" abstract="0" documentation="" name="dtdName" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="412" value="" type="QStringList" abstract="0" documentation="" name="includeList" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="411" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="412" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="includeList" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="413" value="" type="bool" abstract="0" documentation="" name="m_dirty" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="414" value="" type="QString" abstract="0" documentation="" name="m_parsingDTD" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="414" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_parsingDTD" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="415" value="" type="QuantaPluginInterface *" abstract="0" documentation="" name="m_pluginInterface" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="416" value="" type="Project *" abstract="0" documentation="" name="m_project" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="417" value="" type="QString" abstract="0" documentation="" name="m_tempFileName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="417" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_tempFileName" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="418" value="" type="bool" abstract="0" documentation="" name="oldstat" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="419" value="" type="int" abstract="0" documentation="" name="spellMoved" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="420" value="" type="QValueList *" abstract="0" documentation="" name="spellPos" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="421" value="" type="QString" abstract="0" documentation="" name="spellText" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="421" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="spellText" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="422" value="" type="KTempFile *" abstract="0" documentation="" name="tempFile" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="423" value="" type="QString" abstract="0" documentation="" name="untitledUrl" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="423" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="untitledUrl" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="424" value="" type="QTagList" abstract="0" documentation="" name="userTagList" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="425" value="" type="QStringList" abstract="0" documentation="" name="variableList" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="425" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="variableList" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="564" abstract="0" documentation="" name="KQApplication" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="565" type="" abstract="0" documentation="" name="KQApplication" static="0" scope="200" /> @@ -621,14 +621,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="574" abstract="0" documentation="" name="Node" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="583" type="" abstract="0" documentation="" name="Node" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="584" value="" type="Node *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="584" value="" type="Node *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="585" type="" abstract="0" documentation="" name="~Node" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="575" value="" type="Node *" abstract="0" documentation="" name="child" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="576" value="" type="QListViewItem *" abstract="0" documentation="" name="listItem" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="577" value="" type="Node *" abstract="0" documentation="" name="next" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="578" value="" type="bool" abstract="0" documentation="" name="opened" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="579" value="" type="Node *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="579" value="" type="Node *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="580" value="" type="Node *" abstract="0" documentation="" name="prev" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="581" value="" type="bool" abstract="0" documentation="" name="removeAll" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="582" value="" type="Tag *" abstract="0" documentation="" name="tag" static="0" scope="200" /> @@ -641,11 +641,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="605" type="" abstract="0" documentation="" name="Tag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="606" value="" type="const Tag &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="607" type="QString" abstract="0" documentation="" name="attribute" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="607" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attribute" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="608" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="609" type="int" abstract="0" documentation="" name="attributeIndex" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="610" value="" type="QString" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="610" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="611" type="int" abstract="0" documentation="" name="attributeIndexAtPos" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="612" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> @@ -656,10 +656,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="616" value="" type="int &" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="617" value="" type="int &" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="618" type="QString" abstract="0" documentation="" name="attributeValue" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="619" value="" type="QString" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="618" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attributeValue" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="619" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="620" type="QString" abstract="0" documentation="" name="attributeValue" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="620" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attributeValue" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="621" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="622" type="void" abstract="0" documentation="" name="attributeValuePos" static="0" scope="200" > @@ -686,7 +686,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="638" value="" type="Document *" abstract="0" documentation="" name="p_write" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="639" type="void" abstract="0" documentation="" name="parseAttr" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="640" value="" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="640" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="641" value="" type="int &" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="642" value="" type="int &" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> @@ -702,7 +702,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="650" type="void" abstract="0" documentation="" name="setWrite" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="651" value="" type="Document *" abstract="0" documentation="" name="p_write" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="652" type="QString" abstract="0" documentation="" name="tagStr" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="652" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagStr" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="653" type="int" abstract="0" documentation="" name="valueIndexAtPos" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="654" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="655" value="" type="int" abstract="0" documentation="" name="col" static="0" scope="200" /> @@ -713,16 +713,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="588" value="" type="TagAttr []" abstract="0" documentation="" name="attrs" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="589" value="" type="int" abstract="0" documentation="" name="beginCol" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="590" value="" type="int" abstract="0" documentation="" name="beginLine" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="591" value="" type="QString" abstract="0" documentation="" name="cleanStr" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="591" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="cleanStr" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="592" value="" type="bool" abstract="0" documentation="" name="closingMissing" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="593" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="594" value="" type="int" abstract="0" documentation="" name="endCol" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="595" value="" type="int" abstract="0" documentation="" name="endLine" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="596" value="" type="QString" abstract="0" documentation="" name="m_tagStr" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="596" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_tagStr" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="597" value="" type="Document *" abstract="0" documentation="" name="m_write" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="598" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="598" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="599" value="" type="bool" abstract="0" documentation="" name="single" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="600" value="" type="QString" abstract="0" documentation="" name="structBeginStr" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="600" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="structBeginStr" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="601" value="" type="int" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="658" abstract="0" documentation="" name="QTag" static="0" scope="200" > @@ -744,10 +744,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="680" type="int" abstract="0" documentation="" name="attributeCount" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="681" type="AttributeList *" abstract="0" documentation="" name="attributes" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="682" type="QString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="682" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fileName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="683" type="bool" abstract="0" documentation="" name="isOptional" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="684" type="bool" abstract="0" documentation="" name="isSingle" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="685" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="685" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="686" type="void" abstract="0" documentation="" name="setFileName" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="687" value="" type="QString &" abstract="0" documentation="" name="fileName" static="0" scope="200" /> </UML:Operation> @@ -762,15 +762,15 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="694" type="" abstract="0" documentation="" name="~QTag" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="659" value="" type="AttributeList" abstract="0" documentation="" name="attrs" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="660" value="" type="QStringList" abstract="0" documentation="" name="commonGroups" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="661" value="" type="QString" abstract="0" documentation="" name="m_fileName" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="660" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="commonGroups" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="661" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="662" value="" type="bool" abstract="0" documentation="" name="optional" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="parentDTD" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="664" value="" type="QString" abstract="0" documentation="" name="returnType" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="663" value="" type="DTDStruct *" abstract="0" documentation="" name="tqparentDTD" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="664" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="returnType" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="665" value="" type="bool" abstract="0" documentation="" name="single" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="666" value="" type="QStringList" abstract="0" documentation="" name="stoppingTags" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="667" value="" type="QString" abstract="0" documentation="" name="tagName" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="668" value="" type="QString" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="666" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="stoppingTags" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="667" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="tagName" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="668" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="695" abstract="0" documentation="" name="Parser" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="704" type="" abstract="0" documentation="" name="Parser" static="0" scope="200" /> @@ -803,9 +803,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="724" type="" abstract="0" documentation="" name="~Parser" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="696" value="" type="QValueList" abstract="0" documentation="" name="dtdList" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="697" value="" type="DTDStruct *" abstract="0" documentation="" name="m_dtd" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="698" value="" type="QString" abstract="0" documentation="" name="m_dtdName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="698" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_dtdName" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="699" value="" type="Node *" abstract="0" documentation="" name="m_node" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="700" value="" type="QString" abstract="0" documentation="" name="m_text" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="700" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_text" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="701" value="" type="int" abstract="0" documentation="" name="maxLines" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="702" value="" type="int" abstract="0" documentation="" name="oldMaxLines" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="703" value="" type="Document *" abstract="0" documentation="" name="write" static="0" scope="201" /> @@ -814,7 +814,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="728" type="" abstract="0" documentation="" name="QuantaCmdPlugin" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="729" type="virtual bool" abstract="0" documentation="" name="isLoaded" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="730" type="virtual bool" abstract="0" documentation="" name="load" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="731" type="QString" abstract="0" documentation="" name="makeQString" static="0" scope="202" > + <UML:Operation stereotype="" package="" xmi.id="731" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="makeQString" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="732" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="733" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> @@ -843,7 +843,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="751" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="752" type="QDict" abstract="0" documentation="" name="plugins" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="753" type="QStringList" abstract="0" documentation="" name="searchPathList" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="753" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="searchPathList" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="754" type="void" abstract="0" documentation="" name="setSearchPaths" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="755" value="" type="const QStringList &" abstract="0" documentation="" name="paths" static="0" scope="200" /> </UML:Operation> @@ -866,7 +866,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="767" abstract="0" documentation="This class handles the spellchecking. It should work with all KTextEditor's, not only Kate. This is not a real plugin. The code is based on SpellPlugin for Kate." name="SpellChecker" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="771" type="" abstract="0" documentation="" name="SpellChecker" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="QObject *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="QObject *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="773" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="774" type="void" abstract="0" documentation="" name="locatePosition" static="0" scope="202" > @@ -958,20 +958,20 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="852" type="" abstract="0" documentation="" name="~QuantaPlugin" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="794" value="" type="KToggleAction *" abstract="0" documentation="" name="m_action" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="795" value="" type="QString" abstract="0" documentation="" name="m_arguments" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="796" value="" type="QString" abstract="0" documentation="" name="m_fileName" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="797" value="" type="QString" abstract="0" documentation="" name="m_icon" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="795" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_arguments" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="796" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_fileName" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="797" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_icon" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="798" value="" type="bool" abstract="0" documentation="" name="m_isRunning" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="799" value="" type="QString" abstract="0" documentation="" name="m_location" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="800" value="" type="QString" abstract="0" documentation="" name="m_name" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="801" value="" type="QString" abstract="0" documentation="" name="m_outputWindow" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="799" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_location" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="800" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_name" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="801" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_outputWindow" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="802" value="" type="bool" abstract="0" documentation="" name="m_standard" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="803" value="" type="QString" abstract="0" documentation="" name="m_standardName" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="804" value="" type="QString" abstract="0" documentation="" name="m_type" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="803" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_standardName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="804" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_type" static="0" scope="202" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="853" abstract="0" documentation="Provides an interface to the installed plugins. " name="QuantaPluginInterface" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="856" type="" abstract="0" documentation="" name="QuantaPluginInterface" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="857" type="QStringList" abstract="0" documentation="" name="outputWindows" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="857" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="outputWindows" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="858" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="859" type="virtual QuantaPlugin *" abstract="0" documentation="" name="plugin" static="0" scope="200" > @@ -981,27 +981,27 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="862" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="863" type="virtual QStringList" abstract="0" documentation="" name="pluginNames" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="864" type="QStringList" abstract="0" documentation="" name="pluginTypes" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="864" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="pluginTypes" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="865" type="QDict" abstract="0" documentation="" name="plugins" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="866" type="virtual void" abstract="0" documentation="" name="readConfig" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="867" type="virtual QStringList" abstract="0" documentation="" name="searchPaths" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="868" type="virtual void" abstract="0" documentation="" name="setPluginNames" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="869" value="" type="QStringList" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="869" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="870" type="void" abstract="0" documentation="" name="setPlugins" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="871" value="" type="QDict < QuantaPlugin >" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="872" type="virtual void" abstract="0" documentation="" name="setSearchPaths" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="873" value="" type="QStringList" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="873" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="874" type="virtual void" abstract="0" documentation="" name="writeConfig" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="875" type="" abstract="0" documentation="" name="~QuantaPluginInterface" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="854" value="" type="QStringList" abstract="0" documentation="" name="m_pluginNames" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="854" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="m_pluginNames" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="855" value="" type="QDict" abstract="0" documentation="" name="m_plugins" static="0" scope="202" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="876" abstract="0" documentation="" name="Project" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="907" type="" abstract="0" documentation="" name="Project" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="909" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="910" type="bool" abstract="0" documentation="" name="createEmptyDom" static="0" scope="200" /> @@ -1010,14 +1010,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="913" type="bool" abstract="0" documentation="" name="hasProject" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="914" type="void" abstract="0" documentation="" name="insertFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="915" value="" type="const KURL &" abstract="0" documentation="" name="nameURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="916" value="" type="bool" abstract="0" documentation="" name="repaint" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="916" value="" type="bool" abstract="0" documentation="" name="tqrepaint" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="917" type="void" abstract="0" documentation="" name="insertFiles" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="918" value="" type="KURL :: List" abstract="0" documentation="" name="files" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="919" type="void" abstract="0" documentation="" name="insertFiles" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="920" value="" type="const KURL &" abstract="0" documentation="" name="pathURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const QString &" abstract="0" documentation="" name="mask" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const QString &" abstract="0" documentation="" name="tqmask" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="922" type="bool" abstract="0" documentation="" name="isModified" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="923" type="void" abstract="0" documentation="" name="loadProjectXML" static="0" scope="200" /> @@ -1039,28 +1039,28 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="935" value="" type="KConfig *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="936" type="" abstract="0" documentation="" name="~Project" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="877" value="" type="QString" abstract="0" documentation="" name="author" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="877" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="author" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="878" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="879" value="" type="QBuffer" abstract="0" documentation="" name="buff" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="880" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="881" value="" type="QString" abstract="0" documentation="" name="currentProjectView" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="881" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="currentProjectView" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="882" value="" type="QDomDocument" abstract="0" documentation="" name="dom" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="883" value="" type="QString" abstract="0" documentation="" name="email" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="883" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="email" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="884" value="" type="bool" abstract="0" documentation="" name="keepPasswd" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="885" value="" type="QString" abstract="0" documentation="" name="m_defaultDTD" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="886" value="" type="QString" abstract="0" documentation="" name="m_defaultEncoding" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="887" value="" type="QString" abstract="0" documentation="" name="m_newFileType" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="885" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_defaultDTD" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="886" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_defaultEncoding" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="887" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="m_newFileType" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="888" value="" type="bool" abstract="0" documentation="" name="modified" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="889" value="" type="KURL" abstract="0" documentation="" name="newURL" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="890" value="" type="KURL" abstract="0" documentation="" name="oldURL" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="891" value="" type="bool" abstract="0" documentation="" name="olfwprj" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="892" value="" type="QString" abstract="0" documentation="" name="passwd" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="892" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="passwd" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="893" value="" type="ProjectNewFinal *" abstract="0" documentation="" name="pnf" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="894" value="" type="ProjectNewGeneral *" abstract="0" documentation="" name="png" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="895" value="" type="ProjectNewLocal *" abstract="0" documentation="" name="pnl" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="896" value="" type="ProjectNewWeb *" abstract="0" documentation="" name="pnw" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="897" value="" type="KURL" abstract="0" documentation="" name="previewPrefix" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="898" value="" type="QString" abstract="0" documentation="" name="projectName" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="898" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="projectName" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="899" value="" type="KRecentFilesAction *" abstract="0" documentation="" name="projectRecent" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="900" value="" type="KURL" abstract="0" documentation="" name="projectURL" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="901" value="" type="KURL" abstract="0" documentation="" name="remoteDir" static="0" scope="200" /> @@ -1072,28 +1072,28 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="937" abstract="0" documentation="" name="FilesListView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="940" type="" abstract="0" documentation="" name="FilesListView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="941" value="" type="QString" abstract="0" documentation="" name="dir" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="942" value="" type="QStringList" abstract="0" documentation="" name="topList" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="941" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dir" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="942" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="topList" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="944" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="945" type="virtual QString" abstract="0" documentation="" name="currentFileName" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="946" type="void" abstract="0" documentation="" name="loadDir" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="947" value="" type="QString" abstract="0" documentation="" name="path" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="947" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="path" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="948" type="virtual void" abstract="0" documentation="" name="slotReload" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="949" type="" abstract="0" documentation="" name="~FilesListView" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="938" value="" type="QString" abstract="0" documentation="" name="dir" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="939" value="" type="QStringList" abstract="0" documentation="" name="dirList" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="938" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dir" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="939" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="dirList" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="950" abstract="0" documentation="An extended KListViewItem for folders." name="FilesTreeFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="955" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="956" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="957" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="958" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="959" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="961" value="" type="const QString &" abstract="0" documentation="" name="p_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="962" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> @@ -1117,24 +1117,24 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="976" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="977" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="978" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="978" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="979" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="980" type="virtual " abstract="0" documentation="" name="~FilesTreeFolder" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="951" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="951" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="952" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparentFolder" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="953" value="" type="FilesTreeView *" abstract="0" documentation="" name="tqparentView" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="954" value="" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="981" abstract="0" documentation="An extended KLIstViewItem for files." name="FilesTreeFile" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="984" type="" abstract="0" documentation="" name="FilesTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="985" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="986" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="985" value="" type="FilesTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="986" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="987" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="988" type="" abstract="0" documentation="" name="FilesTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="989" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="990" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="989" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="990" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="991" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="992" type="void" abstract="0" documentation="" name="setDirIcon" static="0" scope="200" /> @@ -1151,59 +1151,59 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="999" abstract="0" documentation="" name="DocItem" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1002" type="" abstract="0" documentation="" name="DocItem" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1003" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1004" value="" type="QString" abstract="0" documentation="" name="_name" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1005" value="" type="QString" abstract="0" documentation="" name="_url" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1003" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1004" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1005" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1006" type="" abstract="0" documentation="" name="DocItem" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1007" value="" type="QListViewItem *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1008" value="" type="QString" abstract="0" documentation="" name="_name" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1009" value="" type="QString" abstract="0" documentation="" name="_url" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1007" value="" type="QListViewItem *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1008" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1009" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_url" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1010" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1010" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1011" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1012" type="" abstract="0" documentation="" name="~DocItem" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1000" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1001" value="" type="QString" abstract="0" documentation="" name="url" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1000" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1001" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1013" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1017" type="" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1018" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1019" value="" type="QString" abstract="0" documentation="" name="_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1018" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1019" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1020" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1021" value="" type="QString" abstract="0" documentation="" name="basePath" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1021" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="basePath" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1022" type="" abstract="0" documentation="" name="DocFolder" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1023" value="" type="QListViewItem *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1024" value="" type="QString" abstract="0" documentation="" name="_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1023" value="" type="QListViewItem *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1024" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1025" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1026" value="" type="QString" abstract="0" documentation="" name="basePath" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1026" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="basePath" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1027" type="void" abstract="0" documentation="" name="setOpen" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1028" value="" type="bool" abstract="0" documentation="" name="o" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1029" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="1030" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1030" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1031" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1032" type="" abstract="0" documentation="" name="~DocFolder" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1014" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1014" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1015" value="" type="bool" abstract="0" documentation="" name="topLevel" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1016" value="" type="QString" abstract="0" documentation="" name="url" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1016" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1033" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1036" type="" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1037" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1038" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1038" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1039" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1040" type="" abstract="0" documentation="" name="UploadTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1041" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1042" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1042" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1043" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1044" type="QString" abstract="0" documentation="" name="fullName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1044" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fullName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1045" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1046" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1047" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> @@ -1212,26 +1212,26 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1049" value="" type="bool" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1050" type="void" abstract="0" documentation="" name="setWhichPixmap" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1051" value="" type="QString" abstract="0" documentation="" name="pixmap" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1051" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="pixmap" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1052" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1053" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1054" type="virtual " abstract="0" documentation="" name="~UploadTreeFolder" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1034" value="" type="KURL" abstract="0" documentation="" name="m_url" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1035" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parentFolder" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1035" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparentFolder" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1055" abstract="0" documentation="Item for project folders." name="ProjectTreeFolder" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1059" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1061" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1060" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1061" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1062" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1063" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="tqparentListView" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1066" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1067" type="bool" abstract="0" documentation="" name="contains" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1067" type="bool" abstract="0" documentation="" name="tqcontains" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1068" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1069" type="void" abstract="0" documentation="" name="insertItem" static="0" scope="200" > @@ -1251,38 +1251,38 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1080" type="void" abstract="0" documentation="" name="setup" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1081" type="" abstract="0" documentation="" name="~ProjectTreeFolder" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1056" value="" type="QPtrList" abstract="0" documentation="" name="filesTreeList" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="parentView" static="0" scope="202" /> - <UML:Attribute stereotype="" package="" xmi.id="1058" value="" type="QString" abstract="0" documentation="" name="path" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1057" value="" type="ProjectTreeView *" abstract="0" documentation="" name="tqparentView" static="0" scope="202" /> + <UML:Attribute stereotype="" package="" xmi.id="1058" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="path" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1082" abstract="0" documentation="Item for project files. It's different from a standard file as the project files are basically XML tag elements." name="ProjectTreeFile" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1084" type="" abstract="0" documentation="" name="ProjectTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1085" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1086" value="" type="QString" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1085" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1086" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1087" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1088" type="" abstract="0" documentation="" name="~ProjectTreeFile" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1083" value="" type="QString" abstract="0" documentation="" name="fname" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1083" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="fname" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1089" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1091" type="" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1093" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1094" type="QString *" abstract="0" documentation="" name="contextHelp" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1095" value="" type="QString" abstract="0" documentation="" name="keyword" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1095" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="keyword" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1096" type="" abstract="0" documentation="" name="~DocTreeView" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1090" value="" type="QDict *" abstract="0" documentation="" name="contextHelpDict" static="0" scope="201" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1097" abstract="0" documentation="A tree view used to display a set of files/directories explicitly added to it. It is used in several dialogs, e.g in Project Upload dialog, Rescan Project dialog, add files/folders to project dialogs." name="UploadTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1098" type="" abstract="0" documentation="" name="UploadTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1100" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1101" type="UploadTreeFile *" abstract="0" documentation="" name="addItem" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1102" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1103" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1104" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1103" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1104" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1105" type="int" abstract="0" documentation="" name="checkboxTree" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1106" value="" type="QListViewItem *" abstract="0" documentation="" name="it" static="0" scope="200" /> @@ -1308,7 +1308,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1120" type="UploadTreeFolder *" abstract="0" documentation="" name="printTree" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1121" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1122" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1122" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1123" type="virtual void" abstract="0" documentation="" name="selectAll" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1124" value="" type="bool" abstract="0" documentation="" name="select" static="0" scope="200" /> @@ -1319,7 +1319,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1144" type="" abstract="0" documentation="" name="StructTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1145" value="" type="Parser *" abstract="0" documentation="" name="parser" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1146" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1148" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1149" type="void" abstract="0" documentation="" name="buildTree" static="0" scope="202" > @@ -1347,7 +1347,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1166" type="" abstract="0" documentation="" name="~StructTreeView" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1127" value="" type="KConfig *" abstract="0" documentation="" name="config" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1128" value="" type="QStringList" abstract="0" documentation="" name="dtdList" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1128" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="dtdList" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1129" value="" type="QPopupMenu *" abstract="0" documentation="" name="dtdMenu" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1130" value="" type="bool" abstract="0" documentation="" name="followCursorFlag" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1131" value="" type="int" abstract="0" documentation="" name="followCursorId" static="0" scope="201" /> @@ -1366,23 +1366,23 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1167" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1170" type="" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1171" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1171" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1172" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1173" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1174" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1173" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1174" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1175" type="" abstract="0" documentation="" name="UploadTreeFile" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1176" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1176" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1177" value="" type="const KURL &" abstract="0" documentation="" name="a_url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1180" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1181" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1182" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1183" type="void" abstract="0" documentation="" name="setWhichPixmap" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1184" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1184" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1185" type="KURL" abstract="0" documentation="" name="url" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1186" type="" abstract="0" documentation="" name="~UploadTreeFile" static="0" scope="200" /> @@ -1392,7 +1392,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1187" abstract="0" documentation="TreeView for templates. As the templates are standard directories, it inherits from FilesTreeView." name="TemplatesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1195" type="" abstract="0" documentation="" name="TemplatesTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1196" value="" type="const KURL &" abstract="0" documentation="" name="projectBaseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1198" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1199" type="void" abstract="0" documentation="" name="contentsDropEvent" static="0" scope="202" > @@ -1400,14 +1400,14 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1201" type="virtual QDragObject *" abstract="0" documentation="" name="dragObject" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="1202" type="void" abstract="0" documentation="" name="readDirInfo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1203" value="" type="QString" abstract="0" documentation="" name="startDir" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1203" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="startDir" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1204" type="virtual void" abstract="0" documentation="" name="slotInsertTag" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1205" type="virtual void" abstract="0" documentation="" name="slotProperties" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1206" type="virtual void" abstract="0" documentation="" name="slotPropertiesApplied" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1207" type="virtual void" abstract="0" documentation="" name="slotReload" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1208" type="void" abstract="0" documentation="" name="writeDirInfo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1209" value="" type="QString" abstract="0" documentation="" name="dirInfoFile" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1209" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="dirInfoFile" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1210" type="" abstract="0" documentation="" name="~TemplatesTreeView" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1188" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="201" /> @@ -1420,17 +1420,17 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1211" abstract="0" documentation="KListViewItem specific for the structure tree." name="StructTreeTag" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1213" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1215" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1216" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1217" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1217" value="" type="StructTreeTag *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1218" value="" type="Node *" abstract="0" documentation="" name="a_node" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1219" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1220" value="" type="QListViewItem *" abstract="0" documentation="" name="after" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1221" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1222" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1222" value="" type="StructTreeTag *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1223" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1224" type="" abstract="0" documentation="" name="~StructTreeTag" static="0" scope="200" /> @@ -1438,7 +1438,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1225" abstract="0" documentation="A project specific KListView." name="ProjectTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1231" type="" abstract="0" documentation="" name="ProjectTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1233" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1234" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" /> @@ -1454,16 +1454,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1227" value="" type="int" abstract="0" documentation="" name="openInQuantaId" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1228" value="" type="ProjectTreeFolder *" abstract="0" documentation="" name="projectDir" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1229" value="" type="QPopupMenu *" abstract="0" documentation="" name="projectMenu" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1230" value="" type="QString" abstract="0" documentation="" name="projectName" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1230" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="projectName" static="0" scope="201" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1241" abstract="0" documentation="Extended FileManage to handle remote and local directory structures in a tree." name="FilesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1242" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1243" value="" type="KURL :: List" abstract="0" documentation="" name="topList" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1245" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1246" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1248" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1249" type="void" abstract="0" documentation="" name="addFileInfoPage" static="0" scope="202" > @@ -1494,7 +1494,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1267" abstract="0" documentation="A treeview which has some common file managing methods. It inherits from KListView." name="FileManage" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1272" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1273" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1275" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1276" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" /> @@ -1537,7 +1537,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1326" type="" abstract="0" documentation="" name="ProjectUpload" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1327" value="" type="Project *" abstract="0" documentation="" name="p" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1328" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1330" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1331" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1332" value="" type="WFlags" abstract="0" documentation="" name="fl" static="0" scope="200" /> @@ -1561,7 +1561,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1340" abstract="0" documentation="Create a new project from kio accessible files and folders." name="ProjectNewLocal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1342" type="" abstract="0" documentation="" name="ProjectNewLocal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1344" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1345" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > @@ -1574,7 +1574,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1351" type="" abstract="0" documentation="" name="RescanPrj" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1352" value="" type="KURL :: List" abstract="0" documentation="" name="p_prjFileList" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1353" value="" type="const KURL &" abstract="0" documentation="" name="p_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1355" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1356" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" /> </UML:Operation> @@ -1587,7 +1587,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1360" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1361" type="" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1363" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1364" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > @@ -1597,7 +1597,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1367" abstract="0" documentation="Create a new project with the help of wget." name="ProjectNewWeb" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1372" type="" abstract="0" documentation="" name="ProjectNewWeb" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1374" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1375" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > @@ -1605,19 +1605,19 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1377" type="" abstract="0" documentation="" name="~ProjectNewWeb" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1368" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1369" value="" type="QStringList" abstract="0" documentation="" name="filesList" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1369" value="" type=TQSTRINGLIST_OBJECT_NAME_STRING abstract="0" documentation="" name="filesList" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1370" value="" type="KProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1371" value="" type="bool" abstract="0" documentation="" name="start" static="0" scope="201" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1378" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1379" type="" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1381" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1382" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1383" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1384" type="QString" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1384" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="type" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1385" type="" abstract="0" documentation="" name="~ProjectNewGeneral" static="0" scope="200" /> </UML:Class> <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1378" roleb="307" multia="" multib="" package="" xmi.id="1386" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> @@ -1626,21 +1626,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1318" roleb="307" multia="" multib="" package="" xmi.id="1389" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> <UML:Class stereotype="" package="" xmi.id="1390" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1391" type="" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type="QString" abstract="0" documentation="" name="code" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1393" value="" type="bool" abstract="0" documentation="" name="editSelector" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1395" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1396" type="QString" abstract="0" documentation="" name="code" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1396" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1397" type="void" abstract="0" documentation="" name="splitValueTRBL" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="1398" value="" type="QString" abstract="0" documentation="" name="value" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1398" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="value" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1399" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1400" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1401" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1402" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1403" type="void" abstract="0" documentation="" name="widgetFromCode" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="1404" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1404" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1405" type="" abstract="0" documentation="" name="~CSSSelectorEditor" static="0" scope="200" /> </UML:Class> @@ -1648,7 +1648,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1407" abstract="0" documentation="" name="TagDialog" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1415" type="" abstract="0" documentation="" name="TagDialog" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1416" value="" type="QTag *" abstract="0" documentation="" name="dtdTag" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1417" value="" type="QString" abstract="0" documentation="" name="attrs" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1417" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrs" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1418" value="" type="KURL" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1419" type="" abstract="0" documentation="" name="TagDialog" static="0" scope="200" > @@ -1657,10 +1657,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1422" value="" type="KURL" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1423" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="1424" type="QString" abstract="0" documentation="" name="getAttribute" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1425" value="" type="QString" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1424" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getAttribute" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="1425" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1426" type="QString" abstract="0" documentation="" name="getAttributeString" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1426" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="getAttributeString" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1427" type="QDict *" abstract="0" documentation="" name="getAttributes" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1428" type="void" abstract="0" documentation="" name="init" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1429" value="" type="QTag *" abstract="0" documentation="" name="dtdTag" static="0" scope="200" /> @@ -1675,7 +1675,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1436" value="" type="bool" abstract="0" documentation="" name="insertInLine" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1437" type="void" abstract="0" documentation="" name="parseAttributes" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="1438" value="" type="QString" abstract="0" documentation="" name="attrs" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1438" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="attrs" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1439" type="void" abstract="0" documentation="" name="parseTag" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1440" type="" abstract="0" documentation="" name="~TagDialog" static="0" scope="200" /> @@ -1690,7 +1690,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1407" roleb="307" multia="" multib="" package="" xmi.id="1441" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> <UML:Class stereotype="" package="" xmi.id="1442" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1465" type="" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1467" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1468" type="void" abstract="0" documentation="" name="initDialog" static="0" scope="200" /> @@ -1721,7 +1721,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1470" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1472" type="" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1473" value="" type="Document *" abstract="0" documentation="" name="write" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1475" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1476" type="" abstract="0" documentation="" name="~TagQuickTable" static="0" scope="200" /> @@ -1755,8 +1755,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1481" value="" type="bool" abstract="0" documentation="" name="firstOutput" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1482" value="" type="QuantaView *" abstract="0" documentation="" name="m_view" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1483" value="" type="KProcess *" abstract="0" documentation="" name="proc" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1484" value="" type="QString" abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1485" value="" type="QString" abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1484" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptErrorDest" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1485" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="scriptOutputDest" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1486" value="" type="QDomElement" abstract="0" documentation="" name="tag" static="0" scope="201" /> </UML:Class> <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1479" roleb="307" multia="" multib="" package="" xmi.id="1504" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> @@ -1769,7 +1769,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1512" abstract="0" documentation="" name="CopyTo" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1515" type="" abstract="0" documentation="" name="CopyTo" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1516" value="" type="const KURL &" abstract="0" documentation="" name="dirURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1518" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1519" type="KURL" abstract="0" documentation="" name="copy" static="0" scope="200" > @@ -1790,7 +1790,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1530" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1532" type="" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1533" value="" type="const KURL &" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1535" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1536" type="" abstract="0" documentation="" name="~TagQuickStart" static="0" scope="200" /> @@ -1798,12 +1798,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1537" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1542" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1544" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1545" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1546" value="" type="const KURL &" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="QWidget *" abstract="0" documentation="" name="tqparent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1548" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1549" type="void" abstract="0" documentation="" name="setBaseURL" static="0" scope="200" > @@ -1813,9 +1813,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1552" value="" type="bool" abstract="0" documentation="" name="absolutePath" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1553" type="void" abstract="0" documentation="" name="setText" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1554" value="" type="QString" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1554" value="" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1555" type="QString" abstract="0" documentation="" name="text" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="1555" type=TQSTRING_OBJECT_NAME_STRING abstract="0" documentation="" name="text" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1556" type="" abstract="0" documentation="" name="~FileCombo" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1538" value="" type="KURL" abstract="0" documentation="" name="baseURL" static="0" scope="202" /> <UML:Attribute stereotype="" package="" xmi.id="1539" value="" type="QPushButton *" abstract="0" documentation="" name="button" static="0" scope="202" /> @@ -2506,7 +2506,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="814" id="408" label="baseURL" /> <listitem open="0" type="814" id="409" label="busy" /> <listitem open="0" type="815" id="434" label="changeTag" /> - <listitem open="0" type="815" id="437" label="checkDirtyStatus" /> + <listitem open="0" type="815" id="437" label="checkDirtytqStatus" /> <listitem open="0" type="815" id="438" label="checkOverwrite" /> <listitem open="0" type="815" id="440" label="clearTempFile" /> <listitem open="0" type="815" id="441" label="closeTempFile" /> @@ -2519,9 +2519,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="815" id="448" label="dirty" /> <listitem open="0" type="814" id="411" label="dtdName" /> <listitem open="0" type="815" id="449" label="evenQuotes" /> - <listitem open="0" type="815" id="451" label="find" /> + <listitem open="0" type="815" id="451" label="tqfind" /> <listitem open="0" type="815" id="459" label="findDTDName" /> - <listitem open="0" type="815" id="461" label="findRev" /> + <listitem open="0" type="815" id="461" label="tqfindRev" /> <listitem open="0" type="815" id="469" label="findWordRev" /> <listitem open="0" type="815" id="471" label="findXMLTag" /> <listitem open="0" type="815" id="476" label="getAttributeCompletions" /> @@ -2555,7 +2555,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="815" id="524" label="scriptCodeCompletion" /> <listitem open="0" type="815" id="528" label="selectText" /> <listitem open="0" type="815" id="533" label="setDTDIdentifier" /> - <listitem open="0" type="815" id="535" label="setDirtyStatus" /> + <listitem open="0" type="815" id="535" label="setDirtytqStatus" /> <listitem open="0" type="815" id="537" label="setModified" /> <listitem open="0" type="815" id="539" label="setParsingDTD" /> <listitem open="0" type="815" id="541" label="setUntitledUrl" /> @@ -2637,8 +2637,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="815" id="968" label="init" /> <listitem open="0" type="815" id="969" label="key" /> <listitem open="0" type="814" id="951" label="name" /> - <listitem open="0" type="814" id="952" label="parentFolder" /> - <listitem open="0" type="814" id="953" label="parentView" /> + <listitem open="0" type="814" id="952" label="tqparentFolder" /> + <listitem open="0" type="814" id="953" label="tqparentView" /> <listitem open="0" type="815" id="972" label="setOpen" /> <listitem open="0" type="815" id="974" label="setup" /> <listitem open="0" type="815" id="975" label="sortChildItems" /> @@ -2689,7 +2689,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="814" id="576" label="listItem" /> <listitem open="0" type="814" id="577" label="next" /> <listitem open="0" type="814" id="578" label="opened" /> - <listitem open="0" type="814" id="579" label="parent" /> + <listitem open="0" type="814" id="579" label="tqparent" /> <listitem open="0" type="814" id="580" label="prev" /> <listitem open="0" type="814" id="581" label="removeAll" /> <listitem open="0" type="814" id="582" label="tag" /> @@ -2803,11 +2803,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="813" id="1055" label="ProjectTreeFolder" > <listitem open="0" type="815" id="1063" label="ProjectTreeFolder" /> <listitem open="0" type="815" id="1059" label="ProjectTreeFolder" /> - <listitem open="0" type="815" id="1067" label="contains" /> + <listitem open="0" type="815" id="1067" label="tqcontains" /> <listitem open="0" type="814" id="1056" label="filesTreeList" /> <listitem open="0" type="815" id="1069" label="insertItem" /> <listitem open="0" type="815" id="1072" label="paintCell" /> - <listitem open="0" type="814" id="1057" label="parentView" /> + <listitem open="0" type="814" id="1057" label="tqparentView" /> <listitem open="0" type="814" id="1058" label="path" /> <listitem open="0" type="815" id="1078" label="setOpen" /> <listitem open="0" type="815" id="1080" label="setup" /> @@ -2875,7 +2875,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="814" id="661" label="m_fileName" /> <listitem open="0" type="815" id="685" label="name" /> <listitem open="0" type="814" id="662" label="optional" /> - <listitem open="0" type="814" id="663" label="parentDTD" /> + <listitem open="0" type="814" id="663" label="tqparentDTD" /> <listitem open="0" type="814" id="664" label="returnType" /> <listitem open="0" type="815" id="686" label="setFileName" /> <listitem open="0" type="815" id="688" label="setName" /> @@ -3395,7 +3395,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <listitem open="0" type="815" id="1044" label="fullName" /> <listitem open="0" type="815" id="1045" label="key" /> <listitem open="0" type="814" id="1034" label="m_url" /> - <listitem open="0" type="814" id="1035" label="parentFolder" /> + <listitem open="0" type="814" id="1035" label="tqparentFolder" /> <listitem open="0" type="815" id="1048" label="setOpen" /> <listitem open="0" type="815" id="1050" label="setWhichPixmap" /> <listitem open="0" type="815" id="1052" label="setup" /> diff --git a/quanta/scripts/TemplateMagic.pl b/quanta/scripts/TemplateMagic.pl index 40b3b2d1..261cd791 100644 --- a/quanta/scripts/TemplateMagic.pl +++ b/quanta/scripts/TemplateMagic.pl @@ -217,7 +217,7 @@ print OFH <<E </property> </widget> </widget> - <layoutdefaults spacing="6" margin="11"/> + <tqlayoutdefaults spacing="6" margin="11"/> </UI> E @@ -228,7 +228,7 @@ sub createUI() { =pod Structure for label widget: height is 20 - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -292,7 +292,7 @@ Structure for a text widget: height is 30 for $k (0..$#OrderedVars) { $Layouts{$OrderedVars[$k][0]}{y}=$y_loc; print OFH <<E - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>LBL_$OrderedVars[$k][0]</cstring> </property> diff --git a/quanta/scripts/checkxml.kmdr b/quanta/scripts/checkxml.kmdr index 4e83a9f6..27853adf 100755 --- a/quanta/scripts/checkxml.kmdr +++ b/quanta/scripts/checkxml.kmdr @@ -34,7 +34,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>Layout26</cstring> </property> @@ -48,7 +48,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -162,7 +162,7 @@ checkXML index.docbook 2>&1</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="3"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -207,7 +207,7 @@ checkXML index.docbook 2>&1</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -216,7 +216,7 @@ checkXML index.docbook 2>&1</string> </spacer> </hbox> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -237,7 +237,7 @@ checkXML index.docbook 2>&1</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>89</width> <height>0</height> @@ -282,5 +282,5 @@ checkXML index.docbook 2>&1</string> <tabstop>ExecButton2</tabstop> <tabstop>CloseButton1</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/docbook_table.kmdr b/quanta/scripts/docbook_table.kmdr index 69778134..b8f30a4e 100755 --- a/quanta/scripts/docbook_table.kmdr +++ b/quanta/scripts/docbook_table.kmdr @@ -27,7 +27,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -40,7 +40,7 @@ <property name="text"> <string>DocBook Table</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -80,7 +80,7 @@ echo '</table>' <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="3" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="3" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -108,7 +108,7 @@ echo '</table>' </stringlist> </property> </widget> - <widget class="QLabel" row="4" column="0" rowspan="1" colspan="2"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -116,7 +116,7 @@ echo '</table>' <string>Description:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -147,7 +147,7 @@ done </stringlist> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -246,5 +246,5 @@ echo ' </thead>';</string> <tabstop>CloseButton1</tabstop> <tabstop>CloseButton1_2</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/dwt.kmdr b/quanta/scripts/dwt.kmdr index 1fab1576..94eb7fbf 100755 --- a/quanta/scripts/dwt.kmdr +++ b/quanta/scripts/dwt.kmdr @@ -52,7 +52,7 @@ <property name="name"> <cstring>tabMain</cstring> </property> - <widget class="QWidget"> + <widget class=TQWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>tab</cstring> </property> @@ -69,7 +69,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>lblProject</cstring> </property> @@ -98,7 +98,7 @@ </stringlist> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0"> <property name="name"> <cstring>lblScript</cstring> </property> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>80</height> @@ -135,7 +135,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class=TQWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>tab</cstring> </property> @@ -152,7 +152,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>txtHelp</cstring> </property> @@ -162,7 +162,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> </widget> @@ -179,7 +179,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>225</width> <height>0</height> @@ -188,5 +188,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/dwt.pl b/quanta/scripts/dwt.pl index af823663..03a126ac 100644 --- a/quanta/scripts/dwt.pl +++ b/quanta/scripts/dwt.pl @@ -228,13 +228,13 @@ sub RemoveHtmlTags() { $p1=$p1+6; $templatesource=substr($templatesource,$p1); } else { - print "WARNING: Could not find <head> tag in template $templatename"; + print "WARNING: Could not tqfind <head> tag in template $templatename"; } $p1=index($templatesource,"</body>"); if ($p1>=0) { $templatesource=substr($templatesource,0,$p1); } else { - print "WARNING: Could not find </body> tag in template $templatename"; + print "WARNING: Could not tqfind </body> tag in template $templatename"; } return $templatesource; } @@ -252,13 +252,13 @@ sub AddHtmlTags() { $p1=$p1+6; $hstart=substr($source,0,$p1); } else { - print "WARNING: Could not find <head> tag in $filename"; + print "WARNING: Could not tqfind <head> tag in $filename"; } $p1=index($source,"</body>"); if ($p1>=0) { $hend=substr($source,$p1); } else { - print "WARNING: Could not find </body> tag in $filename"; + print "WARNING: Could not tqfind </body> tag in $filename"; } return "$hstart$templatesource$hend"; } diff --git a/quanta/scripts/gubed_install.kmdr b/quanta/scripts/gubed_install.kmdr index c362fabf..c0bdbf01 100755 --- a/quanta/scripts/gubed_install.kmdr +++ b/quanta/scripts/gubed_install.kmdr @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>332</width> <height>0</height> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>175</height> @@ -94,7 +94,7 @@ </rect> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>Layout5</cstring> </property> @@ -116,7 +116,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -124,7 +124,7 @@ <string>Target directory:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -276,12 +276,12 @@ fi echo "Cleaning up..." rm /tmp/gubed-install-log cd /tmp/gubed-install -find . | xargs rm -f > /dev/null +tqfind . | xargs rm -f > /dev/null cd /tmp/gubed-install cd $dirName rm -f "docs/Theory of operation" > /dev/null cd /tmp/gubed-install -find . | xargs rmdir -p > /dev/null +tqfind . | xargs rmdir -p > /dev/null rmdir /tmp/gubed-install > /dev/null </string> </stringlist> @@ -291,5 +291,5 @@ rmdir /tmp/gubed-install > /dev/null </property> </widget> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/htmlquickstart.kmdr b/quanta/scripts/htmlquickstart.kmdr index a182dcd4..66dd808b 100755 --- a/quanta/scripts/htmlquickstart.kmdr +++ b/quanta/scripts/htmlquickstart.kmdr @@ -30,14 +30,14 @@ <stringlist> <string></string> <string>@execBegin -quanta=`dcop quanta-@parentPid` +quanta=`dcop quanta-@tqparentPid` if [ -z "$quanta" ]; then quanta=`dcop quanta` if [ ! -z "$quanta" ]; then quantadcop=quanta fi else - quantadcop=quanta-@parentPid + quantadcop=quanta-@tqparentPid fi if [ ! -z "$quantadcop" ]; then @@ -61,7 +61,7 @@ fi <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -75,7 +75,7 @@ fi <property name="text"> <string>Quanta Plus Kommander Quick Start</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -89,7 +89,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>33</width> <height>0</height> @@ -108,7 +108,7 @@ fi <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -161,14 +161,14 @@ echo '@CBPHPFooter' echo '</body>' echo '</html>' -quanta=`dcop quanta-@parentPid` +quanta=`dcop quanta-@tqparentPid` if [ -z "$quanta" ]; then quanta=`dcop quanta` if [ ! -z "$quanta" ]; then quantadcop=quanta fi else - quantadcop=quanta-@parentPid + quantadcop=quanta-@tqparentPid fi if [ ! -z "$quantadcop" ]; then @@ -186,7 +186,7 @@ fi</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -815,7 +815,7 @@ echo "\"$TAGEND"</string> </stringlist> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -983,5 +983,5 @@ echo "$PADDING</script>"</string> <tabstop>CloseButton1</tabstop> <tabstop>CloseButton1_2</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/listwizard.kmdr b/quanta/scripts/listwizard.kmdr index 818a1b92..edd5ec00 100755 --- a/quanta/scripts/listwizard.kmdr +++ b/quanta/scripts/listwizard.kmdr @@ -34,7 +34,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>296</width> <height>0</height> @@ -150,7 +150,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>Layout7</cstring> </property> @@ -183,7 +183,7 @@ <string>Select or enter in this spin box the number of list entries or steps that should be created by the wizard. After using the wizard, you can add (or remove) more entries or steps manually.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -198,7 +198,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -217,7 +217,7 @@ Select the list type: </ul> </qt></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -437,5 +437,5 @@ Here is one example of a variablelist: <tabstop>CloseButton1_2</tabstop> <tabstop>ItemizedOption</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/meinproc.kmdr b/quanta/scripts/meinproc.kmdr index c931e426..d0c90a6a 100755 --- a/quanta/scripts/meinproc.kmdr +++ b/quanta/scripts/meinproc.kmdr @@ -95,7 +95,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>292</width> <height>0</height> @@ -124,7 +124,7 @@ fi</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -172,7 +172,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -181,7 +181,7 @@ fi</string> </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -195,7 +195,7 @@ fi</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -216,7 +216,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -280,5 +280,5 @@ fi</string> <tabstop>ExecButton2</tabstop> <tabstop>CloseButton1</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/picturewizard.kmdr b/quanta/scripts/picturewizard.kmdr index 95d488f1..414e0476 100755 --- a/quanta/scripts/picturewizard.kmdr +++ b/quanta/scripts/picturewizard.kmdr @@ -34,7 +34,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>342</width> <height>0</height> @@ -125,7 +125,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> @@ -143,7 +143,7 @@ Select the type of markup appropriated to wrap your image: </ul> </qt></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -286,7 +286,7 @@ echo '</inlinemediaobject>'</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -498,7 +498,7 @@ echo '</inlinemediaobject>'</string> <string>Enter the description of the image here. For instance, a screenshot of a configuration dialog should be described as "Configuration dialog.". This text will be used as caption text if the box below is checked.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0"> <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> @@ -509,7 +509,7 @@ echo '</inlinemediaobject>'</string> <string>Select the image format here. The image format is usually reflects the file extension of your image file (.png corresponds to PNG in the drop down, .jpg corresponds to JPG, etc.).</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -536,7 +536,7 @@ echo '</inlinemediaobject>'</string> <string>Enter the file name of the image here, including the extension (.png, .jpg, etc.). Enter only the file name, not the location (path) of the image file. The image files should be located in the same folder as the DocBook sources.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -583,5 +583,5 @@ echo '</inlinemediaobject>'</string> <tabstop>CloseButton1_2</tabstop> <tabstop>MediaOption</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/scriptinfo.kmdr b/quanta/scripts/scriptinfo.kmdr index c225a132..f84682e7 100755 --- a/quanta/scripts/scriptinfo.kmdr +++ b/quanta/scripts/scriptinfo.kmdr @@ -29,7 +29,7 @@ <property name="name"> <cstring>TabWidget1</cstring> </property> - <widget class="QWidget"> + <widget class=TQWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>tab</cstring> </property> @@ -46,7 +46,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="1" rowspan="1" colspan="2"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>TextLabel1_3</cstring> </property> @@ -61,7 +61,7 @@ <string>Please fill in all fields</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -90,7 +90,7 @@ <string>Enter the script name with the extension</string> </property> </widget> - <widget class="QLabel" row="8" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="8" column="0"> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -127,7 +127,7 @@ <string>The location of your up-to-date file on the web</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="3" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -135,7 +135,7 @@ <string>Script author:</string> </property> </widget> - <widget class="QLabel" row="7" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="7" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -200,7 +200,7 @@ <string>If other include in about</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0"> <property name="name"> <cstring>TextLabel1_4</cstring> </property> @@ -208,7 +208,7 @@ <string>Editor/Executor:</string> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="4" column="0"> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -216,7 +216,7 @@ <string>Author email:</string> </property> </widget> - <widget class="QLabel" row="5" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="5" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -224,7 +224,7 @@ <string>Web address:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="6" column="0"> <property name="name"> <cstring>TextLabel2_2</cstring> </property> @@ -344,7 +344,7 @@ <string>Optional: External program executor</string> </property> </widget> - <widget class="QLabel" row="9" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="9" column="0"> <property name="name"> <cstring>TextLabel6</cstring> </property> @@ -397,7 +397,7 @@ $options<name>@Name</name> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class=TQWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>tab</cstring> </property> @@ -450,5 +450,5 @@ $options<name>@Name</name> <tabstop>TabWidget1</tabstop> <tabstop>TextEdit3</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/tablewizard.kmdr b/quanta/scripts/tablewizard.kmdr index 6f78c3c8..b3fb3ddb 100755 --- a/quanta/scripts/tablewizard.kmdr +++ b/quanta/scripts/tablewizard.kmdr @@ -27,7 +27,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>141</width> <height>0</height> @@ -142,7 +142,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>Layout12</cstring> </property> @@ -156,7 +156,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>ColumnLabel</cstring> </property> @@ -167,7 +167,7 @@ <string>Select or enter in this spin box the number of columns that should be created by the wizard.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0"> <property name="name"> <cstring>TableIdLabel</cstring> </property> @@ -243,7 +243,7 @@ done; <string>Select or enter in this spin box the number of rows that should be created by the wizard. After using the wizard, you can add (or remove) more rows. To add more rows, add the same number of <entry> tags per <row> tag as in the rest of the table.</string> </property> </widget> - <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>LinesLabel</cstring> </property> @@ -254,7 +254,7 @@ done; <string>Select or enter in this spin box the number of rows that should be created by the wizard. After using the wizard, you can add (or remove) more rows. To add more rows, add the same number of <entry> tags per <row> tag as in the rest of the table.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="3" column="0"> <property name="name"> <cstring>TableTitleLabel5</cstring> </property> @@ -391,7 +391,7 @@ echo '</informaltable>'</string> </widget> </grid> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TableTypeLabel</cstring> </property> @@ -408,7 +408,7 @@ Select the table type: </ul> </qt></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -445,5 +445,5 @@ Select the table type: <tabstop>OKButton</tabstop> <tabstop>CloseButton1_2</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr index 4682470d..c01e75b7 100755 --- a/quanta/scripts/tidy.kmdr +++ b/quanta/scripts/tidy.kmdr @@ -29,7 +29,7 @@ <property name="name"> <cstring>TabWidget1</cstring> </property> - <widget class="QWidget"> + <widget class=TQWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>tab</cstring> </property> @@ -63,7 +63,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="1" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -108,7 +108,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -258,7 +258,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class=TQWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>tab</cstring> </property> @@ -275,7 +275,7 @@ instances of Quanta running.</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -379,7 +379,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -443,7 +443,7 @@ instances of Quanta running.</string> </stringlist> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -515,7 +515,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class=TQWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>tab</cstring> </property> @@ -791,7 +791,7 @@ instances of Quanta running.</string> </widget> </grid> </widget> - <widget class="QWidget"> + <widget class=TQWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>tab</cstring> </property> @@ -914,7 +914,7 @@ escape-cdata Boolean y/n, yes/no, t/f, true/false, 1/0 language String - ncr Boolean y/n, yes/no, t/f, true/false, 1/0 output-bom AutoBool auto, y/n, yes/no, t/f, true/false, 1/0 -replace-color Boolean y/n, yes/no, t/f, true/false, 1/0 +tqreplace-color Boolean y/n, yes/no, t/f, true/false, 1/0 css-prefix Name CSS1 selector new-inline-tags Tag names tagX, tagY, ... new-blocklevel-tags Tag names tagX, tagY, ... @@ -985,7 +985,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>0</height> @@ -1002,7 +1002,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>80</width> <height>0</height> @@ -1019,7 +1019,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>125</width> <height>0</height> @@ -1074,5 +1074,5 @@ fi <slot>setWidgetText(const QString&)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/xmlval.kmdr b/quanta/scripts/xmlval.kmdr index ea8b5078..ec4ae69d 100755 --- a/quanta/scripts/xmlval.kmdr +++ b/quanta/scripts/xmlval.kmdr @@ -70,7 +70,7 @@ CMDLINE="$VALSTR $FILE"</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>Layout10</cstring> </property> @@ -121,7 +121,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -130,7 +130,7 @@ fi</string> </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -144,7 +144,7 @@ fi</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>TextLabel3</cstring> </property> @@ -165,7 +165,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -187,7 +187,7 @@ fi</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -201,7 +201,7 @@ fi</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>TextLabel4</cstring> </property> @@ -219,7 +219,7 @@ fi</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -296,7 +296,7 @@ esac</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0"> <property name="name"> <cstring>Layout11</cstring> </property> @@ -343,7 +343,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -352,7 +352,7 @@ fi </spacer> </hbox> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0"> <property name="name"> <cstring>Layout6</cstring> </property> @@ -366,7 +366,7 @@ fi <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>TextLabel5</cstring> </property> @@ -384,7 +384,7 @@ fi <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -448,7 +448,7 @@ xmllint $CMDLINE 2>&1 <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>228</width> <height>0</height> @@ -495,5 +495,5 @@ xmllint $CMDLINE 2>&1 <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/scripts/xsltproc.kmdr b/quanta/scripts/xsltproc.kmdr index 0341f681..ffaceebe 100755 --- a/quanta/scripts/xsltproc.kmdr +++ b/quanta/scripts/xsltproc.kmdr @@ -27,7 +27,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -51,7 +51,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>0</height> @@ -121,7 +121,7 @@ CMDLINE="-o $HOME/$OPFILE $STYLESHEET $FILE"</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0"> <property name="name"> <cstring>Layout17</cstring> </property> @@ -159,7 +159,7 @@ fi</string> </stringlist> </property> </widget> - <widget class="QLayoutWidget"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>Layout15</cstring> </property> @@ -173,7 +173,7 @@ fi</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -199,7 +199,7 @@ fi</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>Layout14</cstring> </property> @@ -213,7 +213,7 @@ fi</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -233,7 +233,7 @@ fi</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING> <property name="name"> <cstring>Layout13</cstring> </property> @@ -247,7 +247,7 @@ fi</string> <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class=TQLABEL_OBJECT_NAME_STRING> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -290,5 +290,5 @@ fi</string> <slot>setDisabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/src/dcopquanta.cpp b/quanta/src/dcopquanta.cpp index 149240d6..8dde34bc 100644 --- a/quanta/src/dcopquanta.cpp +++ b/quanta/src/dcopquanta.cpp @@ -40,11 +40,11 @@ TQStringList DCOPQuanta::selectors(const TQString& tag) if (key.startsWith("Selectors|")) { TQString selectorName = key.mid(10); - int index = selectorName.find(':'); + int index = selectorName.tqfind(':'); if (index != -1) selectorName = selectorName.mid(0, index); TQString tmpStr; - index = selectorName.find(rx); + index = selectorName.tqfind(rx); if (index != -1) { tmpStr = selectorName.left(index).lower(); @@ -54,8 +54,8 @@ TQStringList DCOPQuanta::selectors(const TQString& tag) } if (tmpStr.isEmpty() || tag.lower() == tmpStr || tmpStr == "*") { - tmpStr = selectorName.mid(index + 1).replace('.',' '); - if (!tmpStr.isEmpty() && !selectorList.contains(tmpStr)) + tmpStr = selectorName.mid(index + 1).tqreplace('.',' '); + if (!tmpStr.isEmpty() && !selectorList.tqcontains(tmpStr)) selectorList << tmpStr; } } @@ -93,11 +93,11 @@ TQStringList DCOPQuanta::groupElements(const TQString& group) if (key.startsWith(group + "|")) { TQString name = key.mid(10); - int index = name.find(':'); + int index = name.tqfind(':'); if (index != -1) name = name.mid(0, index); TQString tmpStr; - index = name.find("|"); + index = name.tqfind("|"); if (index != -1) { tmpStr = name.left(index).lower(); diff --git a/quanta/src/dcopsettings.cpp b/quanta/src/dcopsettings.cpp index 504eca84..c640b956 100644 --- a/quanta/src/dcopsettings.cpp +++ b/quanta/src/dcopsettings.cpp @@ -28,9 +28,9 @@ DCOPSettings::DCOPSettings() : DCOPObject("SettingsIf") TQString DCOPSettings::encoding() { TQString encoding = quantaApp->defaultEncoding(); - encoding.replace("iso ", "iso-"); //it's said that "iso-8859-x" is the valid format - encoding.replace("utf", "utf-"); //it's said that "utf-x" is the valid format - encoding.replace("cp ", "windows-"); + encoding.tqreplace("iso ", "iso-"); //it's said that "iso-8859-x" is the valid format + encoding.tqreplace("utf", "utf-"); //it's said that "utf-x" is the valid format + encoding.tqreplace("cp ", "windows-"); return encoding; } diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index f42986ab..70fce267 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -93,8 +93,8 @@ extern GroupElementMapList globalGroupMap; Document::Document(KTextEditor::Document *doc, - TQWidget *parent, const char *name, WFlags f ) - : TQWidget(parent, name, f) + TQWidget *tqparent, const char *name, WFlags f ) + : TQWidget(tqparent, name, f) { m_dirty = false; busy = false; @@ -102,7 +102,7 @@ Document::Document(KTextEditor::Document *doc, m_md5sum = ""; m_doc = doc; m_view = 0L; //needed, because createView() calls processEvents() and the "this" may be deleted before m_view gets a value => crash on delete m_view; - m_view = m_doc->createView(parent, 0L); + m_view = m_doc->createView(tqparent, 0L); completionInProgress = false; argHintVisible = false; completionRequested = false; @@ -142,11 +142,11 @@ Document::Document(KTextEditor::Document *doc, //conflicting shortcuts, so change them a = m_view->actionCollection()->action("view_border"); if (a) - a->setShortcut(Qt::SHIFT + Qt::Key_F9); + a->setShortcut(TQt::SHIFT + TQt::Key_F9); a = m_view->actionCollection()->action("view_folding_markers"); if (a) - a->setShortcut(Qt::SHIFT + Qt::Key_F11); + a->setShortcut(TQt::SHIFT + TQt::Key_F11); KActionMenu *bookmarkAction = dynamic_cast<KActionMenu*>(m_view->actionCollection()->action( "bookmarks" )); if (bookmarkAction) @@ -190,15 +190,15 @@ Document::Document(KTextEditor::Document *doc, } tempFile = 0; - m_tempFileName = TQString::null; + m_tempFileName = TQString(); dtdName = Project::ref()->defaultDTD(); reparseEnabled = true; - repaintEnabled = true; + tqrepaintEnabled = true; delayedTextChangedEnabled = true; docUndoRedo = new undoRedo(this); //path of the backup copy file of the document - m_backupPathValue = TQString::null; + m_backupPathValue = TQString(); connect( m_doc, TQT_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), this, TQT_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); @@ -409,7 +409,7 @@ void Document::insertFile(const KURL& url) { if (!KIO::NetAccess::download(url, fileName, this)) { - KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").arg( url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>Cannot download <b>%1</b>.</qt>").tqarg( url.prettyURL(0, KURL::StripFileProtocol))); return; } } @@ -421,7 +421,7 @@ void Document::insertFile(const KURL& url) insertText(stream.read()); file.close(); } else - KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>Cannot open <b>%1</b> for reading.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); } /** Inserts text at the current cursor position */ @@ -461,8 +461,8 @@ void Document::insertText(const TQString &a_text, bool adjustCursor, bool repars } if (insideQuotes && closeQuotationFound) { - text.replace("\\\"", "\""); - text.replace("\"", "\\\""); + text.tqreplace("\\\"", "\""); + text.tqreplace("\"", "\\\""); } } @@ -552,7 +552,7 @@ void Document::insertText(const TQString &a_text, bool adjustCursor, bool repars } } -bool Document::insertChildTags(QTag *tag, QTag *lastTag) +bool Document::insertChildTags(TQTag *tag, TQTag *lastTag) { bool childInserted = false; if (!tag || tag == lastTag) //avoid infinite recursion @@ -565,9 +565,9 @@ bool Document::insertChildTags(QTag *tag, QTag *lastTag) if (it.data()) { childInserted = true; - QTag *childTag = QuantaCommon::tagFromDTD(tag->parentDTD, it.key()); + TQTag *childTag = QuantaCommon::tagFromDTD(tag->tqparentDTD, it.key()); TQString tagStr =QuantaCommon::tagCase(it.key()); - if ( tag->parentDTD->singleTagStyle == "xml" && + if ( tag->tqparentDTD->singleTagStyle == "xml" && ( childTag->isSingle() || (childTag->isOptional() && !qConfig.closeOptionalTags)) ) { @@ -648,7 +648,7 @@ void Document::closeTempFile() if (TQFileInfo(m_tempFileName).exists()) TQFile::remove(m_tempFileName); - m_tempFileName = TQString::null; + m_tempFileName = TQString(); } TQString Document::tempFileName() @@ -669,8 +669,8 @@ TQString Document::getTagNameAt(int line, int col ) while (line >= 0) { QuantaCommon::removeCommentsAndQuotes(textLine, completionDTD); - int pos = textLine.findRev("<"); - int pos2 = textLine.findRev(">"); + int pos = textLine.tqfindRev("<"); + int pos2 = textLine.tqfindRev(">"); if (pos != -1 && pos2 < pos) { textLine.remove(0, pos + 1); @@ -680,7 +680,7 @@ TQString Document::getTagNameAt(int line, int col ) textLine[pos] != '>') pos++; name = textLine.left(pos).stripWhiteSpace(); - pos = name.find(":"); + pos = name.tqfind(":"); if (pos != -1) name = name.mid(pos + 1); break; @@ -732,7 +732,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) viewCursorIf->setCursorPositionReal(line,col-1); if (dtd) { - QTag *tag = QuantaCommon::tagFromDTD(dtd,completion.userdata); + TQTag *tag = QuantaCommon::tagFromDTD(dtd,completion.userdata); if (tag) { m_lastCompletionList = getAttributeValueCompletions(tag->name(), completion.text); @@ -778,7 +778,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T { kdDebug(24000) << *string << endl; kdDebug(24000) << completion->userdata << endl; - int pos = completion->userdata.find("|"); + int pos = completion->userdata.tqfind("|"); TQString s = completion->userdata.left(pos); completion->userdata.remove(0,pos+1); string->remove(0, s.length()); @@ -791,7 +791,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T viewCursorIf->cursorPositionReal(&line, &col); TQString s2 = editIf->textLine(line).left(col); kdDebug(24000) << s2 << endl; - int pos = s2.findRev('&'); + int pos = s2.tqfindRev('&'); if (pos != -1) { s2 = s2.mid(pos + 1); @@ -820,7 +820,7 @@ void Document::slotFilterCompletion( KTextEditor::CompletionEntry *completion ,T s = *string; string->remove(0, string->length()); TQString s2 = TQString("public \""+DTDs::ref()->getDTDNameFromNickName(s)+"\""); - const DTDStruct *dtd = DTDs::ref()->find(DTDs::ref()->getDTDNameFromNickName(s)); + const DTDStruct *dtd = DTDs::ref()->tqfind(DTDs::ref()->getDTDNameFromNickName(s)); if (dtd && !dtd->url.isEmpty()) { s2 += " \""+dtd->url+"\""; @@ -858,7 +858,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri { m_replaceLine = line; m_replaceCol = column; - m_replaceStr = QuantaCommon::encodedChar(string[0].unicode()); + m_replaceStr = QuantaCommon::encodedChar(string[0].tqunicode()); TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); return; } @@ -866,7 +866,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri } if (qConfig.replaceAccented) { - uint c = string[0].unicode(); + uint c = string[0].tqunicode(); if (c > 191) { m_replaceLine = line; @@ -936,13 +936,13 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri */ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) { - QTag *tag; + TQTag *tag; TQString tagName; bool handled = false; tagName = getTagNameAt(line, column); tag = QuantaCommon::tagFromDTD(completionDTD, tagName); if (!tag && !tagName.isEmpty()) - tag = userTagList.find(tagName.lower()); + tag = userTagList.tqfind(tagName.lower()); TQString s = editIf->textLine(line).left(column + 1); bool namespacecompletion = false; @@ -978,13 +978,13 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) if (string == "/" && s.endsWith("</") && tagName.isEmpty()) { Node *node = parser->nodeAt(line, column, false); - if (node && node->parent ) + if (node && node->tqparent ) { - node = node->parent; + node = node->tqparent; if (node->tag->type == Tag::XmlTag && (!node->next || !QuantaCommon::closesTag(node->tag, node->next->tag))) { TQString name = node->tag->name; - name = name.left(name.find(" | ")); + name = name.left(name.tqfind(" | ")); if (!node->tag->nameSpace.isEmpty()) name.prepend(node->tag->nameSpace + ":"); editIf->insertText(line, column + 1, name + ">"); @@ -1000,7 +1000,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) if ( string == ">" && tagName[0] != '/' && !tagName.endsWith("/") && !s.endsWith("/>") && tag) { - if ( tag->parentDTD->singleTagStyle == "xml" && + if ( tag->tqparentDTD->singleTagStyle == "xml" && (tag->isSingle() || (!qConfig.closeOptionalTags && tag->isOptional())) ) { @@ -1052,10 +1052,10 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) { //we need to find the attribute name TQString textLine = editIf->textLine(line).left(column-1); - TQString attribute = textLine.mid(textLine.findRev(' ')+1); - if (attribute == "style" && completionDTD->insideDTDs.contains("css")) + TQString attribute = textLine.mid(textLine.tqfindRev(' ')+1); + if (attribute == "style" && completionDTD->insideDTDs.tqcontains("css")) { - completionDTD = DTDs::ref()->find("text/css"); + completionDTD = DTDs::ref()->tqfind("text/css"); completionRequested = true; return scriptAutoCompletion(line, column + 1, string); } @@ -1068,20 +1068,20 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) //check if we are inside a style attribute, and use css autocompletion if we are TQString textLine = editIf->textLine(line); textLine = textLine.left(column); - int pos = textLine.findRev('"'); + int pos = textLine.tqfindRev('"'); if (pos != -1) { - pos = textLine.findRev(' ', pos); + pos = textLine.tqfindRev(' ', pos); if (pos != -1) { textLine = textLine.mid(pos + 1); - pos = textLine.find('='); + pos = textLine.tqfind('='); if (pos != -1) { TQString attribute = textLine.left(pos); - if (attribute == "style" && completionDTD->insideDTDs.contains("css")) + if (attribute == "style" && completionDTD->insideDTDs.tqcontains("css")) { - completionDTD = DTDs::ref()->find("text/css"); + completionDTD = DTDs::ref()->tqfind("text/css"); completionRequested = true; return scriptAutoCompletion(line, column + 1, string); } @@ -1089,7 +1089,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string) } } TQString s = editIf->textLine(line).left(column + 1); - pos = s.findRev('&'); + pos = s.tqfindRev('&'); if (pos != -1) { //complete character codes @@ -1125,7 +1125,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n GroupElementList elementList = it.data(); for (uint i = 0; i < elementList.count(); i++) { - if (elementList[i]->parentNode == 0L || elementList[i]->global) + if (elementList[i]->tqparentNode == 0L || elementList[i]->global) { completion.text = it.key().section('|', -1).stripWhiteSpace(); completions->append(completion); @@ -1133,11 +1133,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n } else { Node *n = node; - while (n && n != elementList[i]->parentNode) + while (n && n != elementList[i]->tqparentNode) { - n = n->parent; + n = n->tqparent; } - if (n == elementList[i]->parentNode) + if (n == elementList[i]->tqparentNode) { completion.text = it.key().section('|', -1).stripWhiteSpace(); completions->append(completion); @@ -1169,18 +1169,18 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n bool Document::isDerivatedFrom(const TQString& className, const TQString &baseClass) { - if (className.isEmpty() || !completionDTD->classInheritance.contains(className)) + if (className.isEmpty() || !completionDTD->classInheritance.tqcontains(className)) return false; - TQString parentClass = completionDTD->classInheritance[className]; + TQString tqparentClass = completionDTD->classInheritance[className]; int result = 0; do { - if (parentClass == baseClass) + if (tqparentClass == baseClass) result = 1; //className extends baseClass else { - if (completionDTD->classInheritance.contains(parentClass)) - parentClass = completionDTD->classInheritance[parentClass]; + if (completionDTD->classInheritance.tqcontains(tqparentClass)) + tqparentClass = completionDTD->classInheritance[tqparentClass]; else result = -1;//nothing was found in the inheritance list } @@ -1205,12 +1205,12 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, } Node *node = parser->nodeAt(line, col); if (node && node->tag->type != Tag::XmlTag) - node = node->parent; + node = node->tqparent; if (node && node->tag->type != Tag::XmlTag) node = 0L; - QTag *parentQTag= 0L; - if (node && node->parent) - parentQTag = QuantaCommon::tagFromDTD(node->parent); + TQTag *tqparentTQTag= 0L; + if (node && node->tqparent) + tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent); TQString textLine = editIf->textLine(line).left(col); TQString word = findWordRev(textLine, completionDTD).upper(); TQString classStr = ""; @@ -1229,7 +1229,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, objStr = r->cap(1); if (objStr == "this") { - TQString parentGroupStr = ""; + TQString tqparentGroupStr = ""; bool classFound = false; parser->synchParseInDetail(); Node *n = parser->nodeAt(line, col); @@ -1244,11 +1244,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, while (it != n->m_groupElements.end()) { GroupElement *e = *it; - if (parentGroupStr.isEmpty() && e->group->appendToTags) + if (tqparentGroupStr.isEmpty() && e->group->appendToTags) { - parentGroupStr = e->group->parentGroup; + tqparentGroupStr = e->group->tqparentGroup; } - if (!parentGroupStr.isEmpty() && e->group->name == parentGroupStr) + if (!tqparentGroupStr.isEmpty() && e->group->name == tqparentGroupStr) { classStr = e->tag->name; classFound = true; @@ -1260,7 +1260,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, it = n->m_groupElements.erase(it); } delete gParser; - n = n->parent; + n = n->tqparent; } } else { @@ -1290,20 +1290,20 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, //A TQMap to hold the completion type (function/string/class/etc) TQMap<TQString, TQString> type; TQString tagName; - TQDictIterator<QTag> it(*(completionDTD->tagsList)); + TQDictIterator<TQTag> it(*(completionDTD->tagsList)); int i = 0; for( ; it.current(); ++it ) { - QTag *tag = it.current(); + TQTag *tag = it.current(); if ((tag->type != "entity") && (tag->className == classStr || isDerivatedFrom(classStr, tag->className))) { tagName = tag->name(); if (!tagName.isEmpty() && tagName.upper().startsWith(word)) { - if (!parentQTag || (parentQTag && parentQTag->isChild(tagName))) + if (!tqparentTQTag || (tqparentTQTag && tqparentTQTag->isChild(tagName))) { - tagName = tag->name() + TQString("%1").arg(i, 10); + tagName = tag->name() + TQString("%1").tqarg(i, 10); tagNameList += tagName; comments.insert(tagName, tag->comment); i++; @@ -1312,14 +1312,14 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, } } - TQDictIterator<QTag> it2(userTagList); + TQDictIterator<TQTag> it2(userTagList); for( ; it2.current(); ++it2 ) { - QTag *tag = it2.current(); + TQTag *tag = it2.current(); if ((tag->className == classStr || isDerivatedFrom(classStr, tag->className)) && tag->name().upper().startsWith(word)) { - tagName = tag->name() + TQString("%1").arg(i, 10); + tagName = tag->name() + TQString("%1").tqarg(i, 10); tagNameList += tagName; comments.insert(tagName, tag->comment); @@ -1366,7 +1366,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, // Here we actually append the completion type completion.type = type[tagNameList[i]]; // And here is out sorting... - if(completion.type.contains("variable")) + if(completion.type.tqcontains("variable")) { // Insert after the last variable variableIt++; @@ -1374,7 +1374,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line, } else { - if(completion.type.contains("script")) + if(completion.type.tqcontains("script")) { //Scripts can go at the end of the list completions->append(completion); @@ -1404,10 +1404,10 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con { TQValueList<KTextEditor::CompletionEntry> *completions = new TQValueList<KTextEditor::CompletionEntry>(); KTextEditor::CompletionEntry completion; - QTag *tag = QuantaCommon::tagFromDTD(completionDTD, tagName); + TQTag *tag = QuantaCommon::tagFromDTD(completionDTD, tagName); if (!tag) { - tag = userTagList.find(tagName.lower()); + tag = userTagList.tqfind(tagName.lower()); } TQString startsWith = a_startsWith.upper(); if (tag) @@ -1438,7 +1438,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con //list common attributes for this tag for (TQStringList::Iterator it = tag->commonGroups.begin(); it != tag->commonGroups.end(); ++it) { - AttributeList *attrs = tag->parentDTD->commonAttrs->find(*it); + AttributeList *attrs = tag->tqparentDTD->commonAttrs->tqfind(*it); for (uint j = 0; j < attrs->count(); j++) { TQString name = attrs->at(j)->name; @@ -1452,7 +1452,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con } } - if (tag->name().contains("!doctype",false)) //special case, list all the known document types + if (tag->name().tqcontains("!doctype",false)) //special case, list all the known document types { TQStringList nickNames = DTDs::ref()->nickNameList(true); for ( TQStringList::Iterator it = nickNames.begin(); it != nickNames.end(); ++it ) @@ -1538,7 +1538,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeValueCompletion } if (deleteValues) delete values; - int andSignPos = startsWith.find('&'); + int andSignPos = startsWith.tqfind('&'); if (andSignPos != -1) { TQValueList<KTextEditor::CompletionEntry> *charCompletions = getCharacterCompletions(startsWith.mid(andSignPos + 1)); @@ -1557,7 +1557,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getCharacterCompletions(con TQMap<TQString, KTextEditor::CompletionEntry> completionMap; //first search for entities defined in the document - const DTDStruct *dtdDTD = DTDs::ref()->find("dtd"); + const DTDStruct *dtdDTD = DTDs::ref()->tqfind("dtd"); if (dtdDTD) { StructTreeGroup group; @@ -1588,10 +1588,10 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getCharacterCompletions(con KTextEditor::CompletionEntry completion; completion.type = "charCompletion"; //add the entities from the tag files - TQDictIterator<QTag> it(*(completionDTD->tagsList)); + TQDictIterator<TQTag> it(*(completionDTD->tagsList)); for( ; it.current(); ++it ) { - QTag *tag = it.current(); + TQTag *tag = it.current(); if (tag->type == "entity") { TQString tagName = tag->name(true); @@ -1616,10 +1616,10 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getCharacterCompletions(con for ( TQStringList::Iterator it = charList.begin(); it != charList.end(); ++it ) { completion.text = *it; - int begin = completion.text.find("(&") + 2; + int begin = completion.text.tqfind("(&") + 2; if (begin == 1) continue; - int length = completion.text.find(";)") - begin + 1; + int length = completion.text.tqfind(";)") - begin + 1; TQString s = completion.text.mid(begin, length - 1); completion.text = s + " : " + completion.text.left(begin -2) + " - " + completion.text.mid(begin + length + 1); if (s.startsWith(startsWith)) @@ -1661,9 +1661,9 @@ const DTDStruct* Document::currentDTD(bool fallback) /** Get a pointer to the default DTD (document, or app). */ const DTDStruct* Document::defaultDTD() const { - const DTDStruct* dtd = DTDs::ref()->find(dtdName); - if (!dtd) dtd = DTDs::ref()->find(Project::ref()->defaultDTD()); - if (!dtd) dtd = DTDs::ref()->find(qConfig.defaultDocType); //this will always exists + const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); + if (!dtd) dtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD()); + if (!dtd) dtd = DTDs::ref()->tqfind(qConfig.defaultDocType); //this will always exists return dtd; } @@ -1682,17 +1682,17 @@ TQString Document::findDTDName(Tag **tag) { text = editIf->textLine(i); //search for !DOCTYPE tags - pos = text.find("!doctype",0,false); + pos = text.tqfind("!doctype",0,false); if (pos != -1) //parse the found !DOCTYPE tag { int bl, bc, el, ec; line = i; bl = line; - startPos = text.findRev('<',pos); + startPos = text.tqfindRev('<',pos); while (startPos == -1 && line >=0) { text = editIf->textLine(line); - startPos = text.findRev('<'); + startPos = text.tqfindRev('<'); bl = line; line--; } @@ -1704,12 +1704,12 @@ TQString Document::findDTDName(Tag **tag) bc = startPos; line = i; text = editIf->textLine(i); - startPos = text.find('>',pos); + startPos = text.tqfind('>',pos); el = line; while (startPos == -1 && line < endLine) { text = editIf->textLine(line); - startPos = text.find('>'); + startPos = text.tqfind('>'); el = line; line++; } @@ -1724,17 +1724,17 @@ TQString Document::findDTDName(Tag **tag) text = this->text(bl, bc, el, ec); (*tag)->parse(text, this); (*tag)->type = Tag::XmlTag; - text.replace("\\\"", "\""); - pos = text.find("public",0,false); + text.tqreplace("\\\"", "\""); + pos = text.tqfind("public",0,false); if (pos == -1) //if no PUBLIC info, use the word after !DOCTYPE as the doc.type { foundText = (*tag)->attribute(0); } else { //use the quoted string after PUBLIC as doc. type - pos = text.find("\"", pos+1); + pos = text.tqfind("\"", pos+1); if (pos !=-1) { - int endPos = text.find("\"",pos+1); + int endPos = text.tqfind("\"",pos+1); foundText = text.mid(pos+1, endPos-pos-1); } } @@ -1759,8 +1759,8 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert if (node->prev) node = node->prev; else - if (node->parent) - node = node->parent; + if (node->tqparent) + node = node->tqparent; int bl, bc; node->tag->beginPos(bl, bc); @@ -1794,11 +1794,11 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert { TQString textLine = s.left(i); TQString word = findWordRev(textLine, completionDTD); - TQValueList<QTag *> tags; + TQValueList<TQTag *> tags; if (!word.isEmpty()) { - tags.append(userTagList.find(word.lower())); - TQDictIterator<QTag> it(*(completionDTD->tagsList)); + tags.append(userTagList.tqfind(word.lower())); + TQDictIterator<TQTag> it(*(completionDTD->tagsList)); for( ; it.current(); ++it ) { if (it.currentKey() == word) @@ -1806,9 +1806,9 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert } } TQStringList argList; - for (TQValueList<QTag*>::ConstIterator it = tags.constBegin(); it != tags.constEnd(); ++it) + for (TQValueList<TQTag*>::ConstIterator it = tags.constBegin(); it != tags.constEnd(); ++it) { - QTag *tag = *it; + TQTag *tag = *it; if (!tag) continue; TQString arguments; @@ -1907,7 +1907,7 @@ TQString Document::text(const AreaStruct &area) const return text(area.bLine, area.bCol, area.eLine, area.eCol); } -TQString Document::find(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol) +TQString Document::tqfind(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol) { TQRegExp rx = regExp; @@ -1937,11 +1937,11 @@ TQString Document::find(const TQRegExp& regExp, int sLine, int sCol, int& fbLine { foundText = rx.cap(); TQString s = textToSearch.left(pos); - int linesUntilFound = s.contains("\n"); + int linesUntilFound = s.tqcontains("\n"); fbLine = sLine + linesUntilFound; - fbCol = s.length()-s.findRev("\n")-1; - int linesInFound = foundText.contains("\n"); - feCol = foundText.length()-foundText.findRev("\n")-2; + fbCol = s.length()-s.tqfindRev("\n")-1; + int linesInFound = foundText.tqcontains("\n"); + feCol = foundText.length()-foundText.tqfindRev("\n")-2; feLine = fbLine + linesInFound; if (linesUntilFound == 0) { @@ -1965,7 +1965,7 @@ TQString Document::find(const TQRegExp& regExp, int sLine, int sCol, int& fbLine return foundText; } -TQString Document::findRev(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol) +TQString Document::tqfindRev(const TQRegExp& regExp, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol) { TQRegExp rx = regExp; TQString foundText = ""; @@ -1993,8 +1993,8 @@ TQString Document::findRev(const TQRegExp& regExp, int sLine, int sCol, int& fbL foundText = rx.cap(); fbLine = line; fbCol = pos; - int linesInFound = foundText.contains("\n"); - feCol = foundText.length()-foundText.findRev("\n")-2; + int linesInFound = foundText.tqcontains("\n"); + feCol = foundText.length()-foundText.tqfindRev("\n")-2; feLine = fbLine + linesInFound; if (linesInFound == 0) { @@ -2047,7 +2047,7 @@ void Document::handleCodeCompletion() { completionDTD = defaultDTD(); TQString s = text(line, 0, line, col).stripWhiteSpace(); - if (s.findRev("<") != -1) + if (s.tqfindRev("<") != -1) { //showCodeCompletions(getTagCompletions(line, col + 1)); @@ -2079,8 +2079,8 @@ void Document::codeCompletionHintRequested() if (completionDTD->family == Script) { // TQString textLine = editIf->textLine(line).left(col); -// int pos = textLine.findRev("("); -// int pos2 = textLine.findRev(")"); +// int pos = textLine.tqfindRev("("); +// int pos2 = textLine.tqfindRev(")"); //if (pos > pos2 ) hintRequested = true; scriptAutoCompletion(line, col - 1, ""); @@ -2093,8 +2093,8 @@ TQString Document::currentWord() uint line, col; viewCursorIf->cursorPositionReal(&line, &col); TQString textLine = editIf->textLine(line); - int startPos = textLine.findRev(TQRegExp("\\W"), col); - int endPos = textLine.find(TQRegExp("\\W"), col); + int startPos = textLine.tqfindRev(TQRegExp("\\W"), col); + int endPos = textLine.tqfind(TQRegExp("\\W"), col); if (startPos == -1) startPos = 0; else @@ -2114,7 +2114,7 @@ TQString Document::findWordRev(const TQString& textToSearch, const DTDStruct *dt int pos; bool end = false; do{ - pos = t.findRev(TQRegExp("\\W"), startPos); + pos = t.tqfindRev(TQRegExp("\\W"), startPos); if (t[pos] == '_' || (dtd && dtd->minusAllowedInWord && t[pos] == '-')) { @@ -2155,9 +2155,9 @@ bool Document::xmlCodeCompletion(int line, int col) if (index != -1) //inside a value { s = tag->attribute(index); - if (s == "style" && completionDTD->insideDTDs.contains("css")) + if (s == "style" && completionDTD->insideDTDs.tqcontains("css")) { - completionDTD = DTDs::ref()->find("text/css"); + completionDTD = DTDs::ref()->tqfind("text/css"); return scriptAutoCompletion(line, col, ""); } else { @@ -2190,7 +2190,7 @@ bool Document::xmlCodeCompletion(int line, int col) if (!handled) { TQString s = editIf->textLine(line).left(col); - int pos = s.findRev('&'); + int pos = s.tqfindRev('&'); if (pos != -1) { s = s.mid(pos + 1); @@ -2212,7 +2212,7 @@ void Document::slotCompletionAborted() } /** Ask for user confirmation if the file was changed outside. */ -void Document::checkDirtyStatus() +void Document::checkDirtytqStatus() { TQString fileName; if (url().isLocalFile()) @@ -2236,7 +2236,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(f); + context.update(*TQT_TQIODEVICE(&f)); m_md5sum = context.hexDigest(); f.close(); } @@ -2252,7 +2252,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(f); + context.update(*TQT_TQIODEVICE(&f)); md5sum = context.hexDigest(); kdDebug(24000) << "MD5 sum of current doc: " << m_md5sum << endl; kdDebug(24000) << "MD5 sum of doc on disc : " << md5sum << endl; @@ -2323,7 +2323,7 @@ bool Document::saveAs(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(f); + context.update(*TQT_TQIODEVICE(&f)); m_md5sum = context.hexDigest(); f.close(); } @@ -2338,7 +2338,7 @@ void Document::enableGroupsForDTEP(const TQString& dtepName, bool enable) m_groupsForDTEPs = m_DTEPList; if (enable) { - if (m_groupsForDTEPs.contains(dtepName) == 0) + if (m_groupsForDTEPs.tqcontains(dtepName) == 0) m_groupsForDTEPs.append(dtepName); } else { @@ -2354,7 +2354,7 @@ void Document::resetGroupsForDTEPList() /** Returns true if the number of " (excluding \") inside text is even. */ bool Document::evenQuotes(const TQString &text) { - int num = text.contains(TQRegExp("[^\\\\]\"")); + int num = text.tqcontains(TQRegExp("[^\\\\]\"")); return (num /2 *2 == num); } @@ -2521,7 +2521,7 @@ TQStringList* Document::tagAttributeValues(const TQString& dtdName, const TQStri { TQStringList *values = 0L; deleteResult = true; - const DTDStruct* dtd = DTDs::ref()->find(dtdName); + const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); if (dtd) { TQString searchForAttr = (dtd->caseSensitive) ? attribute : attribute.upper(); @@ -2546,7 +2546,7 @@ TQStringList* Document::tagAttributeValues(const TQString& dtdName, const TQStri for (uint i = 0; i < values->count(); i++) { u = (*values)[i]; - u = QExtFileInfo::toRelative(u, base); + u = TQExtFileInfo::toRelative(u, base); (*values)[i] = u.path(); } values->remove(values->at(0)); @@ -2576,9 +2576,9 @@ bool Document::hasChanged() return b; } -void Document::setChanged(bool newStatus) +void Document::setChanged(bool newtqStatus) { - changed = newStatus; + changed = newtqStatus; } void Document::paste() @@ -2614,7 +2614,7 @@ TQStringList Document::tagAreas(const TQString& tag, bool includeCoordinates, bo TQString s = text(bl, bc, el, ec); if (includeCoordinates) { - s.prepend(TQString("%1,%2,%3,%4\n").arg(bl).arg(bc).arg(el).arg(ec)); + s.prepend(TQString("%1,%2,%3,%4\n").tqarg(bl).tqarg(bc).tqarg(el).tqarg(ec)); } result += s; if (skipFoundContent) @@ -2632,7 +2632,7 @@ TQStringList Document::tagAreas(const TQString& tag, bool includeCoordinates, bo void Document::activateRepaintView(bool activation) { - repaintEnabled = activation; + tqrepaintEnabled = activation; m_view->setUpdatesEnabled(activation); } @@ -2691,7 +2691,7 @@ void Document::createBackup(KConfig* config) config->setGroup("General Options"); TQStringList backedupFilesEntryList = QuantaCommon::readPathListEntry(config, "List of backedup files"); //the files that were backedup TQStringList autosavedFilesEntryList = QuantaCommon::readPathListEntry(config, "List of autosaved files"); //the list of actual backup files inside $KDEHOME/share/apps/quanta/backups - if (!autosavedFilesEntryList.contains(backupPathValueURL)) //not yet backed up, add an entry for this file + if (!autosavedFilesEntryList.tqcontains(backupPathValueURL)) //not yet backed up, add an entry for this file { autosavedFilesEntryList.append(backupPathValueURL); config->writePathEntry("List of autosaved files", autosavedFilesEntryList); @@ -2875,10 +2875,10 @@ void Document::open(const KURL &url, const TQString &encoding) connect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); connect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); if (!openURL(url)) - slotOpeningFailed(TQString::null); + slotOpeningFailed(TQString()); if (!url.isLocalFile()) { - QExtFileInfo internalFileInfo; + TQExtFileInfo internalFileInfo; internalFileInfo.enter_loop(); } } @@ -2889,7 +2889,7 @@ void Document::slotOpeningCompleted() if (!u.isLocalFile()) { m_modifTime = TQDateTime(); - qApp->exit_loop(); + tqApp->exit_loop(); } else { @@ -2910,7 +2910,7 @@ void Document::slotOpeningFailed(const TQString &errorMessage) m_md5sum = ""; Q_UNUSED(errorMessage); //TODO: append the error message to our own error message if (!url().isLocalFile()) - qApp->exit_loop(); + tqApp->exit_loop(); disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); emit openingFailed(url()); @@ -2943,11 +2943,11 @@ void Document::processDTD(const TQString& documentType) } } - if (!DTDs::ref()->find(foundName)) + if (!DTDs::ref()->tqfind(foundName)) { //try to find the closest matching DTD TQString s = foundName.lower(); - uint spaceNum = s.contains(' '); + uint spaceNum = s.tqcontains(' '); TQStringList dtdList = DTDs::ref()->nameList(); TQStringList lastDtdList; for (uint i = 0; i <= spaceNum && !dtdList.empty(); i++) @@ -3006,7 +3006,7 @@ void Document::processDTD(const TQString& documentType) { qConfig.showDTDSelectDialog = !dtdWidget->useClosestMatching->isChecked(); setDTDIdentifier(DTDs::ref()->getDTDNameFromNickName(dtdWidget->dtdCombo->currentText())); - const DTDStruct *dtd = DTDs::ref()->find(dtdName); + const DTDStruct *dtd = DTDs::ref()->tqfind(dtdName); if (dtdWidget->convertDTD->isChecked() && dtd->family == Xml) { int bLine, bCol, eLine, eCol; @@ -3024,12 +3024,12 @@ void Document::processDTD(const TQString& documentType) TQString dtdId = DTDs::ref()->DTDforURL(u)->name; // if (dtdId == "empty") { - const DTDStruct * dtd = DTDs::ref()->find(projectDTD); + const DTDStruct * dtd = DTDs::ref()->tqfind(projectDTD); if (DTDs::canHandle(dtd, u)) dtdId = projectDTD; else { - dtd = DTDs::ref()->find(qConfig.defaultDocType); + dtd = DTDs::ref()->tqfind(qConfig.defaultDocType); if (DTDs::canHandle(dtd, u)) dtdId = qConfig.defaultDocType; } @@ -3043,7 +3043,7 @@ void Document::processDTD(const TQString& documentType) if (!isUntitled()) { - quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").arg(DTDs::ref()->getDTDNickNameFromName(dtdName)).arg(url().prettyURL(0, KURL::StripFileProtocol))); + quantaApp->messageOutput()->showMessage(i18n("\"%1\" is used for \"%2\".\n").tqarg(DTDs::ref()->getDTDNickNameFromName(dtdName)).tqarg(url().prettyURL(0, KURL::StripFileProtocol))); } quantaApp->slotLoadToolbarForDTD(dtdName); StructTreeView::ref()->useOpenLevelSetting = true; @@ -3056,10 +3056,10 @@ void Document::slotFileDirty(const TQString& fileName) { if ( url().path() == fileName && !dirty() ) { - setDirtyStatus(true); + setDirtytqStatus(true); if (this == ViewManager::ref()->activeDocument()) { - checkDirtyStatus(); + checkDirtytqStatus(); } } } @@ -3083,7 +3083,7 @@ void Document::resetDTEPs() void Document::addDTEP(const TQString &dtepName) { - if (m_DTEPList.contains(dtepName) == 0) + if (m_DTEPList.tqcontains(dtepName) == 0) { m_DTEPList.append(dtepName); } @@ -3099,11 +3099,11 @@ TQStringList Document::groupsForDTEPs() TQString Document::annotationText(uint line) { - TQMap<uint, QPair<TQString, TQString> >::Iterator it = m_annotations.find(line); + TQMap<uint, TQPair<TQString, TQString> >::Iterator it = m_annotations.tqfind(line); if (it != m_annotations.end()) return it.data().first; else - return TQString::null; + return TQString(); } void Document::setAnnotationText(uint line, const TQString& text) @@ -3115,7 +3115,7 @@ void Document::setAnnotationText(uint line, const TQString& text) markIf->removeMark(line, KTextEditor::MarkInterface::markType08); } else { - m_annotations.insert(line, qMakePair(text, TQString(""))); + m_annotations.insert(line, tqMakePair(text, TQString(""))); if (markIf) markIf->setMark(line, KTextEditor::MarkInterface::markType08); uint line, column; @@ -3147,11 +3147,11 @@ void Document::setAnnotationText(uint line, const TQString& text) s.prepend(commentBegin + " "); s.append(" " + commentEnd + "\n"); insertText(s, true, true); - emit showAnnotation(line, "", qMakePair(text, TQString(""))); + emit showAnnotation(line, "", tqMakePair(text, TQString(""))); } } -void Document::addAnnotation(uint line, const QPair<TQString, TQString>& annotation) +void Document::addAnnotation(uint line, const TQPair<TQString, TQString>& annotation) { m_annotations.insert(line, annotation); if (markIf) @@ -3181,7 +3181,7 @@ bool Document::openURL(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(f); + context.update(*TQT_TQIODEVICE(&f)); m_md5sum = context.hexDigest(); f.close(); } diff --git a/quanta/src/document.h b/quanta/src/document.h index b812ddb9..975b9f31 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -66,12 +66,13 @@ namespace KTextEditor class Mark; } -class Document : public QWidget{ +class Document : public TQWidget{ Q_OBJECT + TQ_OBJECT public: Document(KTextEditor::Document *doc, - TQWidget *parent = 0, const char *name = 0, WFlags f=0); + TQWidget *tqparent = 0, const char *name = 0, WFlags f=0); ~Document(); KURL url(); @@ -85,7 +86,7 @@ public: void replaceSelected(const TQString &s); /** insert tag in document */ - void insertTag(const TQString &s1, const TQString &s2 = TQString::null); + void insertTag(const TQString &s1, const TQString &s2 = TQString()); /** Change the current tag's attributes with those from dict */ void changeTag(Tag *tag, TQDict<TQString> *dict ); /**Change the attr value of the called attrName to attrValue*/ @@ -99,11 +100,11 @@ public: void insertText(const TQString &text, bool adjustCursor = true, bool reparse = true); /** Recursively insert the mandatory childs of tag. Returns true if a child was inserted.*/ - bool insertChildTags(QTag *tag, QTag* lastTag = 0L); + bool insertChildTags(TQTag *tag, TQTag* lastTag = 0L); TQPoint getGlobalCursorPos(); - TQString find(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol); - TQString findRev(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol); + TQString tqfind(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol); + TQString tqfindRev(const TQRegExp& rx, int sLine, int sCol, int& fbLine, int&fbCol, int &feLine, int&feCol); /** Get the view of the document */ KTextEditor::View* view(); /** Get the KTextEditor::Document of the document */ @@ -118,7 +119,7 @@ public: void createTempFile(); /** Closes and removes the temporary file. */ void closeTempFile(); - /** Returns the name of the temporary file, TQString::null if no temporary file exists. */ + /** Returns the name of the temporary file, TQString() if no temporary file exists. */ TQString tempFileName(); /** Returns the DTD identifier for the document */ @@ -142,9 +143,9 @@ work correctly. */ void codeCompletionHintRequested(); /** Returns the dirty status. */ bool dirty() const {return m_dirty;}; - void setDirtyStatus(bool status) {m_dirty = status;}; + void setDirtytqStatus(bool status) {m_dirty = status;}; /** Ask for user confirmation if the file was changed outside. */ - void checkDirtyStatus(); + void checkDirtytqStatus(); /** Save the document and reset the dirty status. */ void save(); /** Save the document under a new name and calculate the new md5sum. */ @@ -158,7 +159,7 @@ work correctly. */ /** Returns the changed status since the last query. Resets changed.*/ bool hasChanged(); /** Sets the changed status.*/ - void setChanged(bool newStatus); + void setChanged(bool newtqStatus); /** Paste the contents of clipboard into the document */ void paste(); @@ -169,9 +170,9 @@ work correctly. */ /** returns all the areas that are between tag and it's closing pair */ TQStringList tagAreas(const TQString &tag, bool includeCoordinates, bool skipFoundContent); - /** disable/enable the repaint of the Kate view */ + /** disable/enable the tqrepaint of the Kate view */ void activateRepaintView(bool activation); - bool RepaintViewActivated() {return repaintEnabled;} + bool RepaintViewActivated() {return tqrepaintEnabled;} void setErrorMark(int line); void clearErrorMarks(); @@ -187,7 +188,7 @@ work correctly. */ */ bool openURL(const KURL& url); /** Reads the DTD info from the file, tries to find the correct DTD and builds the tag/attribute list from the DTD file. */ - void processDTD(const TQString& documentType = TQString::null); + void processDTD(const TQString& documentType = TQString()); /** Resets the list of DTEPs found in the document */ void resetDTEPs(); @@ -211,7 +212,7 @@ work correctly. */ KTextEditor::MarkInterface* markIf; /** Hold the list of user tags (real or not, like functions) that are in the document*/ - QTagList userTagList; + TQTagList userTagList; /** The undo/redo stack */ undoRedo *docUndoRedo; @@ -228,8 +229,8 @@ work correctly. */ static TQString hashFilePath(const TQString& p); TQString annotationText(uint line); void setAnnotationText(uint line, const TQString& text); - TQMap<uint, QPair<TQString, TQString> > annotations() {return m_annotations;} - void addAnnotation(uint line, const QPair<TQString, TQString>& annotation); + TQMap<uint, TQPair<TQString, TQString> > annotations() {return m_annotations;} + void addAnnotation(uint line, const TQPair<TQString, TQString>& annotation); void clearAnnotations(); public slots: @@ -259,7 +260,7 @@ signals: void breakpointMarked(Document*, int); void breakpointUnmarked(Document*, int); - void showAnnotation(uint, const TQString&, const QPair<TQString, TQString>&); + void showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&); private slots: void slotReplaceChar(); @@ -280,7 +281,7 @@ private: - TQMap<uint, QPair<TQString, TQString> > m_annotations; + TQMap<uint, TQPair<TQString, TQString> > m_annotations; TQString untitledUrl; int m_replaceLine; int m_replaceCol; @@ -306,7 +307,7 @@ private: bool argHintVisible; bool hintRequested; bool reparseEnabled; - bool repaintEnabled; + bool tqrepaintEnabled; bool delayedTextChangedEnabled; /** True if the document is dirty (has been modified outside). */ bool m_dirty; @@ -326,11 +327,11 @@ private: /** Get list of possibile tag name completions */ TQValueList<KTextEditor::CompletionEntry>* getTagCompletions(int line, int col); /** Get list of possibile tag attribute completions */ - TQValueList<KTextEditor::CompletionEntry>* getAttributeCompletions(const TQString& tagName,const TQString& startsWith=TQString::null); + TQValueList<KTextEditor::CompletionEntry>* getAttributeCompletions(const TQString& tagName,const TQString& startsWith=TQString()); /** Get list of possibile tag attribute value completions */ - TQValueList<KTextEditor::CompletionEntry>* getAttributeValueCompletions(const TQString& tagName, const TQString& attribute, const TQString& startsWith=TQString::null); + TQValueList<KTextEditor::CompletionEntry>* getAttributeValueCompletions(const TQString& tagName, const TQString& attribute, const TQString& startsWith=TQString()); /** Get list of possibile completions in normal text input (nt creating a tag) */ - TQValueList<KTextEditor::CompletionEntry>* getCharacterCompletions(const TQString& starstWith=TQString::null); + TQValueList<KTextEditor::CompletionEntry>* getCharacterCompletions(const TQString& starstWith=TQString()); /** Invoke code completion dialog for XML like tags according to the position (line, col), using DTD dtd. */ bool xmlCodeCompletion(int line, int col); /** Returns list of values for attribute. If deleteResult is true after the call, diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index cc25516f..e1c5a742 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -56,12 +56,12 @@ const TQString m_rcFilename("description.rc"); This constructor reads the dictionary of known dtd's, the attributes and tags will be loaded on the first access to one dtd. */ -DTDs::DTDs(TQObject *parent) - :TQObject(parent) +DTDs::DTDs(TQObject *tqparent) + :TQObject(tqparent) { - connect(this, TQT_SIGNAL(hideSplash()), parent, TQT_SLOT(slotHideSplash())); - connect(this, TQT_SIGNAL(enableIdleTimer(bool)), parent, TQT_SLOT(slotEnableIdleTimer(bool))); - connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&))); + connect(this, TQT_SIGNAL(hideSplash()), tqparent, TQT_SLOT(slotHideSplash())); + connect(this, TQT_SIGNAL(enableIdleTimer(bool)), tqparent, TQT_SLOT(slotEnableIdleTimer(bool))); + connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), tqparent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&))); // kdDebug(24000) << "dtds::dtds" << endl; m_dict = new TQDict<DTDStruct>(119, false); //optimized for max 119 DTD. This should be enough. m_dict->setAutoDelete(true); @@ -120,9 +120,9 @@ DTDs::DTDs(TQObject *parent) DTDStruct * dtd = it.current(); for (uint i = 0; i < dtd->insideDTDs.count(); i++) { - const DTDStruct *insideDTD = m_dict->find(dtd->insideDTDs[i]); // search but don't load + const DTDStruct *insideDTD = m_dict->tqfind(dtd->insideDTDs[i]); // search but don't load if (!insideDTD) - insideDTD = m_dict->find(getDTDNameFromNickName(dtd->insideDTDs[i])); // search but don't load + insideDTD = m_dict->tqfind(getDTDNameFromNickName(dtd->insideDTDs[i])); // search but don't load if (insideDTD && !insideDTD->toplevel) dtd->mimeTypes += insideDTD->mimeTypes; } @@ -168,7 +168,7 @@ bool DTDs::readTagDir(const TQString &dirName, bool loadAll) KConfig *dtdConfig = new KConfig(tmpStr, true); dtdConfig->setGroup("General"); TQString dtdName = dtdConfig->readEntry("Name", "Unknown"); - if (m_dict->find(dtdName.lower())) + if (m_dict->tqfind(dtdName.lower())) { delete dtdConfig; kdDebug(24000) << "dtds::readTagDir from " << dirName @@ -205,8 +205,8 @@ bool DTDs::readTagDir(const TQString &dirName, bool loadAll) for (uint i = 0; i < tmpStrList.count(); i++) { tmpStr = tmpStrList[i].stripWhiteSpace(); - int pos = tmpStr.find('('); - dtd->definitionTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.findRev(')')-pos-1).stripWhiteSpace(); + int pos = tmpStr.tqfind('('); + dtd->definitionTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.tqfindRev(')')-pos-1).stripWhiteSpace(); } //Which DTD can be present in this one? dtd->insideDTDs = dtdConfig->readListEntry("MayContain"); @@ -239,7 +239,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) if (!TQFile::exists(dtd->fileName)) return false; - kapp->setOverrideCursor( TQCursor(Qt::WaitCursor) ); + kapp->setOverrideCursor( TQCursor(TQt::WaitCursor) ); KConfig *dtdConfig = new KConfig(dtd->fileName, true); @@ -264,7 +264,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) dtd->defaultExtension = dtdConfig->readEntry("DefaultExtension"); dtd->caseSensitive = caseSensitive; int numOfTags = 0; - QTagList *tagList = new QTagList(119, false); //max 119 tag in a DTD + TQTagList *tagList = new TQTagList(119, false); //max 119 tag in a DTD tagList->setAutoDelete(true); //read all the tag files KURL dirURL(dtd->fileName); @@ -272,10 +272,10 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQString dirName = dirURL.path(1); if (TQFile::exists(dirName + "common.tag")) readTagFile(dirName + "common.tag", dtd, 0L); - //bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false); + //bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false); emit enableIdleTimer(false); - KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L); - //quantaApp->slotEnableIdleTimer(idleTimerStatus); + KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*.tag", 0L); + //quantaApp->slotEnableIdleTimer(idleTimertqStatus); emit enableIdleTimer(true); TQString tmpStr; KURL::List::ConstIterator end_f = files.constEnd(); @@ -313,16 +313,16 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQStrList attrList; for (uint i = 0 ; i < extraTagsList.count(); i++) { - QTag *tag = new QTag(); + TQTag *tag = new TQTag(); tag->setName(TQString(extraTagsList.at(i)).stripWhiteSpace()); tmpStr = (dtd->caseSensitive) ? tag->name() : tag->name().upper(); - if (tagList->find(tmpStr)) //the tag is already defined in a .tag file + if (tagList->tqfind(tmpStr)) //the tag is already defined in a .tag file { delete tag; continue; //skip this tag } - tag->parentDTD = dtd; + tag->tqparentDTD = dtd; //read the possible stopping tags TQStrList stoppingTags; dtdConfig->readListEntry(tag->name() + "_stoppingtags",stoppingTags); @@ -422,8 +422,8 @@ bool DTDs::readTagDir2(DTDStruct *dtd) for (uint i = 0; i < tmpStrList.count(); i++) { tmpStr = tmpStrList[i].stripWhiteSpace(); - int pos = tmpStr.find('('); - dtd->specialTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.findRev(')')-pos-1).stripWhiteSpace(); + int pos = tmpStr.tqfind('('); + dtd->specialTags[tmpStr.left(pos).stripWhiteSpace()] = tmpStr.mid(pos+1, tmpStr.tqfindRev(')')-pos-1).stripWhiteSpace(); } //static const TQString quotationStr = "\\\\\"|\\\\'"; @@ -533,7 +533,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQString tagStr; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(TQString("StructGroup_%1").arg(index)); + dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index)); //new code group.name = dtdConfig->readEntry("Name").stripWhiteSpace(); group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace(); @@ -547,7 +547,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd) group.hasDefinitionRx = !group.definitionRx.pattern().isEmpty(); group.isMinimalDefinitionRx = dtdConfig->readBoolEntry("DefinitionRx_Minimal", false); group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false); - group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace(); + group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace(); tagStr = dtdConfig->readEntry("TagType", "Text").stripWhiteSpace(); if (tagStr == "XmlTag") group.tagType = Tag::XmlTag; @@ -583,19 +583,19 @@ bool DTDs::readTagDir2(DTDStruct *dtd) TQString tagName; for (uint index = 1; index <= structGroupsCount; index++) { - dtdConfig->setGroup(TQString("StructGroup_%1").arg(index)); + dtdConfig->setGroup(TQString("StructGroup_%1").tqarg(index)); group.name = dtdConfig->readEntry("Name").stripWhiteSpace(); group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace(); group.icon = dtdConfig->readEntry("Icon").stripWhiteSpace(); group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false); - group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace(); + group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace(); TQString tagStr = dtdConfig->readEntry("Tag").stripWhiteSpace(); if (!tagStr.isEmpty()) { attrRx.search(tagStr); tmpStr = attrRx.cap(); tmpStrList = TQStringList::split(',', tmpStr.mid(1, tmpStr.length()-2)); - tagName = tagStr.left(tagStr.find('(')).lower(); + tagName = tagStr.left(tagStr.tqfind('(')).lower(); group.attributes.clear(); for (uint i = 0; i < tmpStrList.count(); i++) group.attributes += tmpStrList[i].stripWhiteSpace(); @@ -620,15 +620,15 @@ void DTDs::resolveInherited (DTDStruct *dtd) //Resolve the inheritence if (!dtd->inheritsTagsFrom.isEmpty()) { - DTDStruct *parent = (DTDStruct *) find(dtd->inheritsTagsFrom); // this loads the dtd, if not present in memory - TQDictIterator<QTag> tag_it(*(parent->tagsList)); + DTDStruct *tqparent = (DTDStruct *) tqfind(dtd->inheritsTagsFrom); // this loads the dtd, if not present in memory + TQDictIterator<TQTag> tag_it(*(tqparent->tagsList)); for ( ; tag_it.current(); ++tag_it) { - QTag *tag = tag_it.current(); + TQTag *tag = tag_it.current(); TQString searchForTag = (dtd->caseSensitive) ? tag->name() : tag->name().upper(); - if (!dtd->tagsList->find(searchForTag)) + if (!dtd->tagsList->tqfind(searchForTag)) { - QTag *newTag = new QTag(*tag); + TQTag *newTag = new TQTag(*tag); dtd->tagsList->insert(searchForTag, newTag); } } @@ -642,9 +642,9 @@ void DTDs::resolveInherited (DTDStruct *dtd) specialAreaStartRxStr += "|"; for (uint i = 0; i < dtd->insideDTDs.count(); i++) { - const DTDStruct *insideDTD = m_dict->find(dtd->insideDTDs[i]); // search but don't load + const DTDStruct *insideDTD = m_dict->tqfind(dtd->insideDTDs[i]); // search but don't load if (!insideDTD) - insideDTD = m_dict->find(getDTDNameFromNickName(dtd->insideDTDs[i])); // search but don't load + insideDTD = m_dict->tqfind(getDTDNameFromNickName(dtd->insideDTDs[i])); // search but don't load if (insideDTD) { for (mapIt = insideDTD->definitionAreas.begin(); mapIt != insideDTD->definitionAreas.end(); ++mapIt) @@ -667,7 +667,7 @@ void DTDs::resolveInherited (DTDStruct *dtd) /** Reads the tags for the tag files. Returns the number of read tags. */ -uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList *tagList) +uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList) { // kdDebug(24000) << "dtds::readTagFile:" << fileName << endl; TQFile f(fileName); @@ -678,14 +678,14 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList bool result = f.open( IO_ReadOnly ); if (! result) kdError() << "dtds::readTagFile unable to open:" << fileName - << " Status: " << f.status() << endl; + << " tqStatus: " << f.status() << endl; } TQString errorMsg; int errorLine, errorCol; if (!m_doc->setContent( &f, &errorMsg, &errorLine, &errorCol )) { emit hideSplash(); - KMessageBox::error(0L, i18n("<qt>The DTD tag file %1 is not valid.<br> The error message is: <i>%2 in line %3, column %4.</i></qt>").arg(fileName).arg(errorMsg).arg(errorLine).arg(errorCol), + KMessageBox::error(0L, i18n("<qt>The DTD tag file %1 is not valid.<br> The error message is: <i>%2 in line %3, column %4.</i></qt>").tqarg(fileName).tqarg(errorMsg).tqarg(errorLine).tqarg(errorCol), i18n("Invalid Tag File")); kdWarning() << fileName << ": " << errorMsg << ": " << errorLine << "," << errorCol << endl; } @@ -702,13 +702,13 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList TQString extends = e.attribute("extends"); TQString name = e.attribute("name"); if (!name.isEmpty() && !extends.isEmpty()) - parentDTD->classInheritance[name] = extends; + tqparentDTD->classInheritance[name] = extends; continue; } - QTag *tag = new QTag(); + TQTag *tag = new TQTag(); tag->setName(e.attribute("name")); tag->setFileName(fileName); - tag->parentDTD = parentDTD; + tag->tqparentDTD = tqparentDTD; bool common = false; setAttributes(&n, tag, common); if (common) @@ -720,15 +720,15 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList commonAttrList->setAutoDelete(true); *commonAttrList = *attrs; //delete tag; - parentDTD->commonAttrs->insert(groupName, commonAttrList); + tqparentDTD->commonAttrs->insert(groupName, commonAttrList); } else { - if (parentDTD->caseSensitive) + if (tqparentDTD->caseSensitive) { - tagList->replace(tag->name(), tag); //append the tag to the list for this DTD + tagList->tqreplace(tag->name(), tag); //append the tag to the list for this DTD } else { - tagList->replace(tag->name().upper(), tag); + tagList->tqreplace(tag->name().upper(), tag); } } } @@ -739,7 +739,7 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList /** Parse the dom document and retrieve the tag attributes */ -void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common) +void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common) { common = false; Attribute *attr; @@ -750,9 +750,9 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common) tmpStr = el.attribute("common"); if ((tmpStr != "1" && tmpStr != "yes")) //in case of common tags, we are not interested in these options { - if (tag->parentDTD->commonAttrs) + if (tag->tqparentDTD->commonAttrs) { - TQDictIterator<AttributeList> it(*(tag->parentDTD->commonAttrs)); + TQDictIterator<AttributeList> it(*(tag->tqparentDTD->commonAttrs)); for( ; it.current(); ++it ) { TQString lookForAttr = "has" + TQString(it.currentKey()).stripWhiteSpace(); @@ -794,7 +794,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common) for ( TQDomNode n = dom->firstChild(); !n.isNull(); n = n.nextSibling() ) { tmpStr = n.nodeName(); - if (tmpStr == "children") + if (tmpStr == "tqchildren") { TQDomElement el = n.toElement(); TQDomElement item = el.firstChild().toElement(); @@ -804,7 +804,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common) if (tmpStr == "child") { TQString childTag = item.attribute("name"); - if (!tag->parentDTD->caseSensitive) + if (!tag->tqparentDTD->caseSensitive) childTag = childTag.upper(); tag->childTags.insert(childTag, item.attribute("usage") == "required"); } @@ -820,7 +820,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common) if (item.tagName() == "stoppingtag") { TQString stopTag = item.attribute("name"); - if (!tag->parentDTD->caseSensitive) + if (!tag->tqparentDTD->caseSensitive) stopTag = stopTag.upper(); tag->stoppingTags.append(stopTag); } @@ -837,7 +837,7 @@ void DTDs::setAttributes(TQDomNode *dom, QTag* tag, bool &common) attr->method = el.attribute("method"); attr->arguments = el.attribute("arguments"); - attr->type = el.attribute("type",tag->parentDTD->defaultAttrType); + attr->type = el.attribute("type",tag->tqparentDTD->defaultAttrType); attr->defaultValue = el.attribute("defaultValue"); attr->status = el.attribute("status"); @@ -912,9 +912,9 @@ void DTDs::slotLoadDTD() dtdcfg.setGroup("General"); TQString dtdName = dtdcfg.readEntry("Name"); TQString nickName = dtdcfg.readEntry("NickName", dtdName); - DTDStruct * dtd = m_dict->find(dtdName) ; + DTDStruct * dtd = m_dict->tqfind(dtdName) ; if (dtd && - KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(nickName), TQString::null, i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) + KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) { return; } @@ -924,7 +924,7 @@ void DTDs::slotLoadDTD() TQString family = dtdcfg.readEntry("Family", "1"); Document *w = ViewManager::ref()->activeDocument(); if (family == "1" && w && - KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) + KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) { w->setDTDIdentifier(dtdName); emit loadToolbarForDTD(w->getDTDIdentifier()); @@ -944,20 +944,20 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) dtdcfg.setGroup("General"); TQString dtdName = dtdcfg.readEntry("Name"); TQString nickName = dtdcfg.readEntry("NickName", dtdName); - DTDStruct * dtd = m_dict->find(dtdName) ; + DTDStruct * dtd = m_dict->tqfind(dtdName) ; if ( dtd && - KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").arg(nickName), TQString::null, i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) + KMessageBox::warningYesNo(0L, i18n("<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>").tqarg(nickName), TQString(), i18n("Replace"), i18n("Do Not Replace")) == KMessageBox::No) { return; } removeDTD(dtd); if (!readTagDir(dirName)) { - KMessageBox::error(0L, i18n("<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid DTEP (<i>description.rc and *.tag files</i>).</qt>").arg(dirName), i18n("Error Loading DTEP")); + KMessageBox::error(0L, i18n("<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid DTEP (<i>description.rc and *.tag files</i>).</qt>").tqarg(dirName), i18n("Error Loading DTEP")); } else { TQString family = dtdcfg.readEntry("Family", "1"); - if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("<qt>Autoload the <b>%1</b> DTD in the future?</qt>").arg(nickName), TQString::null, i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes) + if (askForAutoload && KMessageBox::questionYesNo(0L, i18n("<qt>Autoload the <b>%1</b> DTD in the future?</qt>").tqarg(nickName), TQString(), i18n("Load"), i18n("Do Not Load")) == KMessageBox::Yes) { KURL src; src.setPath(dirName); @@ -968,7 +968,7 @@ void DTDs::slotLoadDTEP(const TQString &_dirName, bool askForAutoload) } Document *w = ViewManager::ref()->activeDocument(); if (family == "1" && w && - KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").arg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) + KMessageBox::questionYesNo(0L, i18n("<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>").tqarg(nickName), i18n("Change DTD"), i18n("Use"), i18n("Do Not Use")) == KMessageBox::Yes) { w->setDTDIdentifier(dtdName); emit loadToolbarForDTD(w->getDTDIdentifier()); @@ -987,12 +987,12 @@ void DTDs::slotLoadEntities() if (w) { TQString nickName = DTDs::ref()->getDTDNickNameFromName(w->getDTDIdentifier()); - entitiesWidget.targetDTEPCombo->setCurrentItem(lst.findIndex(nickName)); + entitiesWidget.targetDTEPCombo->setCurrentItem(lst.tqfindIndex(nickName)); } dlg.setMainWidget(&entitiesWidget); if (dlg.exec()) { - DTDStruct * dtd = m_dict->find(getDTDNameFromNickName(entitiesWidget.targetDTEPCombo->currentText())); + DTDStruct * dtd = m_dict->tqfind(getDTDNameFromNickName(entitiesWidget.targetDTEPCombo->currentText())); DTDParser dtdParser(KURL::fromPathOrURL(entitiesWidget.sourceDTDRequester->url()), KGlobal::dirs()->saveLocation("data") + resourceDir + "dtep"); TQString dtdDir = TQFileInfo(dtd->fileName).dirPath(); if (dtdParser.parse(dtdDir, true)) @@ -1077,7 +1077,7 @@ const DTDStruct * DTDs::DTDforURL(const KURL &url) } } if (foundList.isEmpty()) - return find("empty"); + return tqfind("empty"); else { TQString path = url.path(); @@ -1093,7 +1093,7 @@ const DTDStruct * DTDs::DTDforURL(const KURL &url) bool DTDs::canHandle(const DTDStruct *dtd, const KURL &url) { TQString mimetype = KMimeType::findByURL(url)->name(); - if (dtd->mimeTypes.contains(mimetype)) + if (dtd->mimeTypes.tqcontains(mimetype)) return true; if (url.path().endsWith('.' + dtd->defaultExtension)) return true; diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h index 120157a8..ae7c28f1 100644 --- a/quanta/src/dtds.h +++ b/quanta/src/dtds.h @@ -34,7 +34,7 @@ class TQDomNode; class TQDomDocument; -class QTag; +class TQTag; class TQString; class TQStringList; class KConfig; @@ -44,11 +44,12 @@ struct DTDStruct; /** @short This class manages the DTD's for Quanta. * * The constructor only loads the necessary information from the description.rc file. - * The rest is later loaded on demand of the find() function. + * The rest is later loaded on demand of the tqfind() function. */ -class DTDs : public QObject +class DTDs : public TQObject { Q_OBJECT + TQ_OBJECT public: @@ -56,10 +57,10 @@ public: * since this class is a singleton you must use this function to access it * @return the class pointer */ - static DTDs* ref(TQObject *parent = 0L) + static DTDs* ref(TQObject *tqparent = 0L) { static DTDs *m_ref; - if (!m_ref) m_ref = new DTDs(parent); + if (!m_ref) m_ref = new DTDs(tqparent); return m_ref; } @@ -72,10 +73,10 @@ public: * @param dtdName name of the dtd, will be converted to lowercase inside * @return the found dtd structure */ - const DTDStruct * find (const TQString &dtdName) + const DTDStruct * tqfind (const TQString &dtdName) { -// kdDebug(24000) << "dtds::find " << dtdName << endl; - DTDStruct *dtd = m_dict->find(dtdName.lower()) ; +// kdDebug(24000) << "dtds::tqfind " << dtdName << endl; + DTDStruct *dtd = m_dict->tqfind(dtdName.lower()) ; if (dtd && ! dtd->loaded ) readTagDir2(dtd); return dtd; } @@ -92,7 +93,7 @@ public: */ TQString getDTDNickNameFromName(const TQString& name) { - DTDStruct *dtd = m_dict->find(name); + DTDStruct *dtd = m_dict->tqfind(name); if ( dtd ) return dtd->nickName; else @@ -178,7 +179,7 @@ private: * If you need the class use DTDs::ref() for * construction and reference */ - DTDs(TQObject *parent); + DTDs(TQObject *tqparent); /** Reads the tag files and the description.rc from tagDir in order to @@ -208,19 +209,19 @@ private: /** Reads the tags from the tag files. * * @param fileName path of the tag file - * @param parentDTD the DTD where the tags belog to + * @param tqparentDTD the DTD where the tags belog to * @param tagList the list where the tags are inserted * @return the number of read tags. */ - uint readTagFile(const TQString& fileName, DTDStruct* parentDTD, QTagList *tagList); + uint readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList); /** Parses the dom document and retrieve the tag attributes * * @param dom the DOM node containing the tag definition - * @param tag the QTag object that will be initialized by using the information in dom + * @param tag the TQTag object that will be initialized by using the information in dom * @param common will be true, if the tag is a just a list of common group attributes */ - void setAttributes(TQDomNode *dom, QTag* tag, bool &common); + void setAttributes(TQDomNode *dom, TQTag* tag, bool &common); /** removes dtd from dictonary and deletes all components * * @param dtd the dtd to delete diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index 32e1044c..1f1f0401 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -1,5 +1,5 @@ /* - KQApplication.cpp + KTQApplication.cpp KNode, the KDE newsreader Copyright (c) 1999-2001 the KNode authors. @@ -59,7 +59,7 @@ KSplash::~KSplash() } -KQApplication::KQApplication() +KTQApplication::KTQApplication() : KApplication() { args = KCmdLineArgs::parsedArgs(); @@ -80,12 +80,12 @@ KQApplication::KQApplication() KConfig *config = kapp->config(); config->setGroup("General Options"); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); - TQString layout = config->readEntry("Window layout", "Default"); - if (layout == "Default" || args->isSet("resetlayout")) + TQString tqlayout = config->readEntry("Window tqlayout", "Default"); + if (tqlayout == "Default" || args->isSet("resettqlayout")) { mdiMode = KMdi::IDEAlMode; config->writeEntry("MDI mode", KMdi::IDEAlMode); - config->writeEntry("Window layout", "Default"); + config->writeEntry("Window tqlayout", "Default"); } quantaApp = new QuantaApp(mdiMode); config->setGroup("General Options"); @@ -101,16 +101,16 @@ KQApplication::KQApplication() } } -void KQApplication::slotInit() +void KTQApplication::slotInit() { - KQApplicationPrivate::init(); + KTQApplicationPrivate::init(); } -KQApplication::~KQApplication() +KTQApplication::~KTQApplication() { } -void KQApplication::slotSplashTimeout() +void KTQApplication::slotSplashTimeout() { delete splash; delete sp; @@ -118,19 +118,19 @@ void KQApplication::slotSplashTimeout() sp = 0L; } -KQUniqueApplication::KQUniqueApplication() +KTQUniqueApplication::KTQUniqueApplication() : KUniqueApplication() { KGlobal::dirs()->addPrefix(PREFIX); dcopClient()->registerAs("quanta", false); } -KQUniqueApplication::~KQUniqueApplication() +KTQUniqueApplication::~KTQUniqueApplication() { } -int KQUniqueApplication::newInstance() +int KTQUniqueApplication::newInstance() { args = KCmdLineArgs::parsedArgs(); if (mainWidget()) @@ -151,11 +151,11 @@ int KQUniqueApplication::newInstance() KConfig *config = kapp->config(); config->setGroup("General Options"); int mdiMode = config->readNumEntry("MDI mode", KMdi::IDEAlMode); - TQString layout = config->readEntry("Window layout", "Default"); - if (layout == "Default" || args->isSet("resetlayout")) + TQString tqlayout = config->readEntry("Window tqlayout", "Default"); + if (tqlayout == "Default" || args->isSet("resettqlayout")) { mdiMode = KMdi::IDEAlMode; - config->writeEntry("Window layout", "Default"); + config->writeEntry("Window tqlayout", "Default"); config->writeEntry("MDI mode", KMdi::IDEAlMode); } quantaApp = new QuantaApp(mdiMode); @@ -174,12 +174,12 @@ int KQUniqueApplication::newInstance() return 0; } -void KQUniqueApplication::slotInit() +void KTQUniqueApplication::slotInit() { - KQApplicationPrivate::init(); + KTQApplicationPrivate::init(); } -void KQUniqueApplication::slotSplashTimeout() +void KTQUniqueApplication::slotSplashTimeout() { delete splash; delete sp; @@ -188,7 +188,7 @@ void KQUniqueApplication::slotSplashTimeout() } -void KQApplicationPrivate::init() +void KTQApplicationPrivate::init() { if (quantaApp->quantaStarted) { @@ -203,7 +203,7 @@ void KQApplicationPrivate::init() { TQString arg = args->url(i).url(); - if(arg.findRev(TQRegExp(".+\\.webprj")) != -1) + if(arg.tqfindRev(TQRegExp(".+\\.webprj")) != -1) initialProject = arg; else initialFiles += arg; diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h index 1ecda501..ea4b9b7d 100644 --- a/quanta/src/kqapp.h +++ b/quanta/src/kqapp.h @@ -16,8 +16,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#ifndef KQAPPLICATION_H -#define KQAPPLICATION_H +#ifndef KTQAPPLICATION_H +#define KTQAPPLICATION_H #include <tqframe.h> #include <kuniqueapplication.h> @@ -25,20 +25,21 @@ class KCmdLineArgs; class KSplashScreen; -class KSplash : public QFrame +class KSplash : public TQFrame { Q_OBJECT + TQ_OBJECT public: KSplash(); ~KSplash(); }; -class KQApplicationPrivate +class KTQApplicationPrivate { public: - KQApplicationPrivate():splash(0L), sp(0L) {}; - ~KQApplicationPrivate() {}; + KTQApplicationPrivate():splash(0L), sp(0L) {}; + ~KTQApplicationPrivate() {}; protected: void init(); @@ -48,25 +49,27 @@ class KQApplicationPrivate KSplashScreen *sp; }; -class KQApplication : public KApplication, KQApplicationPrivate +class KTQApplication : public KApplication, KTQApplicationPrivate { Q_OBJECT + TQ_OBJECT public: - KQApplication(); - ~KQApplication(); + KTQApplication(); + ~KTQApplication(); public slots: void slotInit(); void slotSplashTimeout(); }; -class KQUniqueApplication : public KUniqueApplication, KQApplicationPrivate +class KTQUniqueApplication : public KUniqueApplication, KTQApplicationPrivate { Q_OBJECT + TQ_OBJECT public: - KQUniqueApplication(); - ~KQUniqueApplication(); + KTQUniqueApplication(); + ~KTQUniqueApplication(); /** Create new instance of Quanta. Make the existing main window active if Quanta is already running */ diff --git a/quanta/src/main.cpp b/quanta/src/main.cpp index 527c9956..7c2fe22a 100644 --- a/quanta/src/main.cpp +++ b/quanta/src/main.cpp @@ -56,7 +56,7 @@ static KCmdLineOptions options[] = { "+[File]", I18N_NOOP("File to open"), 0 }, { "unique", I18N_NOOP("Whether we start as a one-instance application"), 0 }, { "nologo", I18N_NOOP("Do not show the nice logo during startup"), 0 }, - { "resetlayout", I18N_NOOP("Reset the layout of the user interface to the default"), 0}, + { "resettqlayout", I18N_NOOP("Reset the tqlayout of the user interface to the default"), 0}, KCmdLineLastOption // INSERT YOUR COMMANDLINE OPTIONS HERE }; @@ -208,9 +208,9 @@ int main(int argc, char *argv[]) DCOPRef("quanta", QUANTA_PACKAGE).call("newInstance()"); exit(0); } - app = new KQUniqueApplication; + app = new KTQUniqueApplication; } else { - app = new KQApplication; + app = new KTQApplication; } return app->exec(); diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 16795ec9..ada60632 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -196,7 +196,7 @@ extern int NN; const TQString resourceDir = TQString(QUANTA_PACKAGE) + "/"; // from kfiledialog.cpp - avoid qt warning in STDERR (~/.xsessionerrors) -static void silenceQToolBar(QtMsgType, const char *){} +static void silenceTQToolBar(TQtMsgType, const char *){} QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( 0, "Quanta", (KMdi::MdiMode) mdiMode) @@ -206,13 +206,13 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_quantaInit = new QuantaInit(this); dcopSettings = new DCOPSettings; dcopQuanta = new DCOPQuanta; - DTDs::ref(this); + DTDs::ref(TQT_TQOBJECT(this)); quantaStarted = true; tempFileList.setAutoDelete(true); m_toolbarList.setAutoDelete(true); userToolbarsCount = 0; baseNode = 0L; - currentToolbarDTD = TQString::null; + currentToolbarDTD = TQString(); m_config=kapp->config(); idleTimer = new TQTimer(this); connect(idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimerExpired())); @@ -232,7 +232,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( qConfig.enableDTDToolbar = true; // connect up signals from KXXsldbgPart - connectDCOPSignal(0, 0, "debuggerPositionChangedQString,int)", "newDebuggerPosition(TQString,int)", false ); + connectDCOPSignal(0, 0, "debuggerPositionChangedTQString,int)", "newDebuggerPosition(TQString,int)", false ); connectDCOPSignal(0, 0, "editorPositionChanged(TQString,int,int)", "newCursorPosition(TQString,int,int)", false ); connectDCOPSignal(0, 0, "openFile(TQString,int,int)", "openFile(TQString,int,int)", false); @@ -258,7 +258,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_parserEnabled = true; cursorLine = 0; cursorCol = 0; - emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString::null); + emit eventHappened("quanta_start", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString()); setAcceptDrops(true); tabWidget()->installEventFilter(this); } @@ -320,7 +320,7 @@ QuantaApp::~QuantaApp() tmpDir = tmpDirs[0]; for (uint i = 0; i < tmpDirs.count(); i++) { - if (tmpDirs[i].contains("kde-")) + if (tmpDirs[i].tqcontains("kde-")) tmpDir = tmpDirs[i]; } TQString infoCss = tmpDir; @@ -373,9 +373,9 @@ void QuantaApp::slotFileOpen(const KURL::List &urls, const TQString& encoding) m_parserEnabled = false; for (KURL::List::ConstIterator i = urls.begin(); i != urls.end(); ++i) { - if (!QExtFileInfo::exists(*i, true, this)) + if (!TQExtFileInfo::exists(*i, true, this)) { - KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg((*i).prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg((*i).prettyURL(0, KURL::StripFileProtocol))); } else { @@ -409,10 +409,10 @@ void QuantaApp::slotFileOpen(const KURL &url, const TQString& encoding, bool rea void QuantaApp::slotFileOpenRecent(const KURL &url) { - if (!QExtFileInfo::exists(url, true, this)) + if (!TQExtFileInfo::exists(url, true, this)) { if (KMessageBox::questionYesNo(this, - i18n("The file %1 does not exist.\n Do you want to remove it from the list?").arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString::null, KStdGuiItem::del(), i18n("Keep")) + i18n("The file %1 does not exist.\n Do you want to remove it from the list?").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::del(), i18n("Keep")) == KMessageBox::Yes) { fileRecent->removeURL(url); @@ -433,7 +433,7 @@ void QuantaApp::slotFileSave() Document *w = view->document(); if (w) { - w->checkDirtyStatus(); + w->checkDirtytqStatus(); if (w->isUntitled()) slotFileSaveAs(); else @@ -457,7 +457,7 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave) if (w) { KURL oldURL = w->url(); - w->checkDirtyStatus(); + w->checkDirtytqStatus(); if (!w->isUntitled() && oldURL.isLocalFile()) { fileWatcher->removeFile(oldURL.path()); @@ -522,8 +522,8 @@ bool QuantaApp::slotFileSaveAs(QuantaView *viewToSave) if (QuantaCommon::checkOverwrite(saveUrl, this) && view->saveDocument(saveUrl)) { oldURL = saveUrl; - if (Project::ref()->hasProject() && !Project::ref()->contains(saveUrl) && - KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").arg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString::null, KStdGuiItem::add(), i18n("Do Not Add")) + if (Project::ref()->hasProject() && !Project::ref()->tqcontains(saveUrl) && + KMessageBox::Yes == KMessageBox::questionYesNo(0,i18n("<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>").tqarg(saveUrl.prettyURL(0, KURL::StripFileProtocol)), TQString(), KStdGuiItem::add(), i18n("Do Not Add")) ) { if (saveUrl.isLocalFile()) @@ -557,7 +557,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) KURL url; int query; KURL projectTemplateURL; - w->checkDirtyStatus(); + w->checkDirtytqStatus(); TQString localTemplateDir = locateLocal("data", resourceDir + "templates/"); do { @@ -565,10 +565,10 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) if (projectTemplate) { - url = KFileDialog::getSaveURL(Project::ref()->templateURL().url(), TQString::null, this); + url = KFileDialog::getSaveURL(Project::ref()->templateURL().url(), TQString(), this); } else { - url = KFileDialog::getSaveURL(locateLocal("data", resourceDir + "templates/"), TQString::null, this); + url = KFileDialog::getSaveURL(locateLocal("data", resourceDir + "templates/"), TQString(), this); } if (url.isEmpty()) return; @@ -584,7 +584,7 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) { if (projectTemplate) localTemplateDir = projectTemplateURL.path(1); - KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").arg(localTemplateDir)); + KMessageBox::sorry(this,i18n("You must save the templates in the following folder: \n\n%1").tqarg(localTemplateDir)); query = KMessageBox::No; } } while (query != KMessageBox::Yes); @@ -602,8 +602,8 @@ void QuantaApp::saveAsTemplate(bool projectTemplate, bool selectionOnly) stream << content; tempFile->file()->flush(); tempFile->close(); - if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false, this)) - KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); + if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url, -1, true, false, this)) + KMessageBox::error(this, i18n("<qt>There was an error while creating the template file.<br>Check that you have write access to <i>%1</i>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); delete tempFile; } else { @@ -684,7 +684,7 @@ void QuantaApp::slotFileCloseAll() part->write(" "); part->end(); - slotNewStatus(); + slotNewtqStatus(); } void QuantaApp::slotFileQuit() @@ -703,19 +703,19 @@ void QuantaApp::slotEditFindInFiles() void QuantaApp::slotHelpTip() { - KTipDialog::showTip(this, TQString::null, true); + KTipDialog::showTip(this, TQString(), true); } void QuantaApp::slotStatusMsg(const TQString &msg) { statusbarTimer->stop(); statusBar()->changeItem(" " + KStringHandler::cPixelSqueeze(msg, statusBar()->fontMetrics(), progressBar->x() - 20), IDS_STATUS); - statusBar()->repaint(); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + statusBar()->tqrepaint(); + kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); statusbarTimer->start(10000, true); } -/** repaint preview */ +/** tqrepaint preview */ void QuantaApp::slotRepaintPreview() { Document *w = ViewManager::ref()->activeDocument(); @@ -761,7 +761,7 @@ void QuantaApp::slotRepaintPreview() TQString noFramesText = w->text(0,0, bl, bc - 1); noFramesText += noframearea[0]; noFramesText += w->text(el, ec + 1, w->editIf->numLines() - 1, w->editIf->lineLength(w->editIf->numLines() - 1)); - noFramesText.replace(TQRegExp("</?noframes[^>]*>", false), ""); + noFramesText.tqreplace(TQRegExp("</?noframes[^>]*>", false), ""); //kdDebug(24000) << "NOFRAMES: " << noFramesText << endl; if (w->isUntitled()) m_htmlPart->begin(Project::ref()->projectBaseURL(), xOffset, yOffset); @@ -809,7 +809,7 @@ void QuantaApp::slotRepaintPreview() tmpFile->textStream()->setCodec(TQTextCodec::codecForName(encoding.ascii())); *(tmpFile->textStream()) << w->editIf->text(); tmpFile->close(); - if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) { + if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFileName), previewURL, -1, true)) { m_htmlPart->setPreviewedURL(KURL()); // copy failed, force the preview of the original }; delete tmpFile; @@ -864,7 +864,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo) baseURL = w->url(); baseURL.setFileName(""); } - KURL relURL = QExtFileInfo::toRelative(url, baseURL); + KURL relURL = TQExtFileInfo::toRelative(url, baseURL); TQString urlStr = relURL.url(); if (relURL.protocol() == baseURL.protocol()) urlStr = relURL.path(); @@ -876,7 +876,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo) } else { TQString mimetype = KMimeType::findByURL(url)->name(); - if (mimetype.contains("image")) + if (mimetype.tqcontains("image")) { TQString imgFileName; KIO::NetAccess::download(url, imgFileName, this); @@ -915,7 +915,7 @@ void QuantaApp::slotInsertTag(const KURL& url, DirInfo dirInfo) } } -void QuantaApp::slotNewStatus() +void QuantaApp::slotNewtqStatus() { fileRecent->setEnabled(true); actionCollection()->action("project_open_recent")->setEnabled(true); @@ -965,7 +965,7 @@ void QuantaApp::slotOptionsConfigureKeys() for( TQPtrListIterator<KXMLGUIClient> it( clients ); it.current(); ++it ) { - if (toolbarGuiClients.contains(*it) <= 0) //no need to insert the collections of the toolbars as they are present in the main actionCollection + if (toolbarGuiClients.tqcontains(*it) <= 0) //no need to insert the collections of the toolbars as they are present in the main actionCollection dlg.insert((*it)->actionCollection()); } if (dlg.configure() == KKeyDialog::Accepted) @@ -1026,7 +1026,7 @@ void QuantaApp::slotOptionsConfigureKeys() el.setAttribute("shortcut", action->shortcut().toString()); el = node.toElement(); node = node.nextSibling(); - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); } else { node = node.nextSibling(); @@ -1161,7 +1161,7 @@ void QuantaApp::slotOptions() KDialogBase::Ok, this, "tabdialog"); // Tag Style options - TQVBox *page=kd->addVBoxPage(i18n("Tag Style"), TQString::null, BarIcon("kwrite", KIcon::SizeMedium)); + TQVBox *page=kd->addVBoxPage(i18n("Tag Style"), TQString(), BarIcon("kwrite", KIcon::SizeMedium)); StyleOptionsS *styleOptionsS = new StyleOptionsS( (TQWidget *)page); styleOptionsS->tagCase->setCurrentItem( qConfig.tagCase); @@ -1175,7 +1175,7 @@ void QuantaApp::slotOptions() // Environment options //TODO FileMasks name is not good anymore - page=kd->addVBoxPage(i18n("Environment"), TQString::null, UserIcon("files", KIcon::SizeMedium ) ); + page=kd->addVBoxPage(i18n("Environment"), TQString(), UserIcon("files", KIcon::SizeMedium ) ); FileMasks *fileMasks = new FileMasks((TQWidget *)page); fileMasks->lineMarkup->setText( qConfig.markupMimeTypes ); @@ -1215,7 +1215,7 @@ void QuantaApp::slotOptions() fileMasks->defaultDTDCombo->setCurrentItem(pos); // Preview options - page=kd->addVBoxPage(i18n("User Interface"), TQString::null, BarIcon("view_choose", KIcon::SizeMedium ) ); + page=kd->addVBoxPage(i18n("User Interface"), TQString(), BarIcon("view_choose", KIcon::SizeMedium ) ); PreviewOptions *uiOptions = new PreviewOptions( (TQWidget *)page ); uiOptions->setPosition(qConfig.previewPosition); @@ -1238,10 +1238,10 @@ void QuantaApp::slotOptions() uiOptions->warnEventActions->setChecked(true); } //kafka options - page = kd->addVBoxPage(i18n("VPL View"), TQString::null, UserIcon("vpl_text", KIcon::SizeMedium)); + page = kd->addVBoxPage(i18n("VPL View"), TQString(), UserIcon("vpl_text", KIcon::SizeMedium)); KafkaSyncOptions *kafkaOptions = new KafkaSyncOptions( m_config, (TQWidget *)page ); - page=kd->addVBoxPage(i18n("Parser"), TQString::null, BarIcon("kcmsystem", KIcon::SizeMedium ) ); + page=kd->addVBoxPage(i18n("Parser"), TQString(), BarIcon("kcmsystem", KIcon::SizeMedium ) ); ParserOptions *parserOptions = new ParserOptions( m_config, (TQWidget *)page ); parserOptions->refreshFrequency->setValue(qConfig.refreshFrequency); @@ -1250,7 +1250,7 @@ void QuantaApp::slotOptions() parserOptions->showClosingTags->setChecked(qConfig.showClosingTags); parserOptions->spinExpand->setValue(qConfig.expandLevel); - page = kd->addVBoxPage(i18n("Abbreviations"), TQString::null, BarIcon("fontsizeup", KIcon::SizeMedium)); + page = kd->addVBoxPage(i18n("Abbreviations"), TQString(), BarIcon("fontsizeup", KIcon::SizeMedium)); AbbreviationDlg *abbreviationOptions = new AbbreviationDlg((TQWidget*)(page)); bool reloadTrees = false; @@ -1348,7 +1348,7 @@ void QuantaApp::slotOptions() if (previewSettingsChanged) slotShowPreviewWidget(true); qConfig.docPosition = uiOptions->docPosition(); - qConfig.windowLayout = uiOptions->layout(); + qConfig.windowLayout = uiOptions->tqlayout(); m_htmlPart->closeURL(); m_htmlPart->begin( Project::ref()->projectBaseURL()); @@ -1356,7 +1356,7 @@ void QuantaApp::slotOptions() m_htmlPart->end(); reparse(true); - slotNewStatus(); + slotNewtqStatus(); } m_config->sync(); @@ -1379,7 +1379,7 @@ void QuantaApp::slotShowPreviewWidget(bool show) { delete m_previewToolView; m_previewToolView = 0L; - view->addCustomWidget(m_htmlPart->view(), TQString::null); + view->addCustomWidget(m_htmlPart->view(), TQString()); } else { if (!m_previewToolView) @@ -1402,7 +1402,7 @@ void QuantaApp::slotShowPreviewWidget(bool show) m_htmlPart->view()->hide(); if (qConfig.previewPosition == "Editor") { - view->addCustomWidget(0L, TQString::null); + view->addCustomWidget(0L, TQString()); delete m_previewToolView; m_previewToolView = 0L; } else @@ -1437,7 +1437,7 @@ void QuantaApp::slotShowPreviewWidget(bool show) } } -void QuantaApp::slotChangePreviewStatus() +void QuantaApp::slotChangePreviewtqStatus() { if (qConfig.previewPosition == "Editor") { @@ -1446,7 +1446,7 @@ void QuantaApp::slotChangePreviewStatus() if (m_previewToolView && m_htmlPart->view()->isVisible()) { //hiding the preview when it's in a toolview means that the current tab has changed, - //so we just repaint the content and restore the document on the disc. + //so we just tqrepaint the content and restore the document on the disc. m_previewVisible = true; if (m_previewedDocument) { @@ -1511,7 +1511,7 @@ void QuantaApp::newCursorPosition(const TQString &file, int lineNumber, int colu startIdleTimer(); // updateTreeViews(); TQString linenumber; - linenumber = i18n("Line: %1 Col: %2").arg(lineNumber).arg(columnNumber); + linenumber = i18n("Line: %1 Col: %2").tqarg(lineNumber).tqarg(columnNumber); statusBar()->changeItem(linenumber, IDS_STATUS_CLM); statusBar()->changeItem(i18n(" R/O "),IDS_INS_OVR); statusBar()->changeItem("",IDS_MODIFIED); @@ -1525,7 +1525,7 @@ void QuantaApp::newDebuggerPosition(const TQString &file, int lineNumber) void QuantaApp::openFile(const TQString &file, int lineNumber, int columnNumber) { gotoFileAndLine(file, lineNumber, columnNumber); - slotNewStatus(); + slotNewtqStatus(); } void QuantaApp::slotNewLineColumn() @@ -1539,7 +1539,7 @@ void QuantaApp::slotNewLineColumn() Document *w = ViewManager::ref()->activeDocument(); if (w) w->viewCursorIf->cursorPosition(&cursorLine, &cursorCol); - linenumber = i18n("Line: %1 Col: %2").arg(cursorLine+1).arg(cursorCol+1); + linenumber = i18n("Line: %1 Col: %2").tqarg(cursorLine+1).tqarg(cursorCol+1); statusBar()->changeItem(linenumber, IDS_STATUS_CLM); } @@ -1781,7 +1781,7 @@ void QuantaApp::slotShowAnnotationView() makeDockVisible(dynamic_cast<KDockWidget*>(m_annotationOutputView->wrapperWidget())); } -TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) +TQWidget* QuantaApp::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id ) { TQString tabname = element.attribute( "i18ntabname", "" ); @@ -1790,12 +1790,12 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl if ( element.tagName().lower() == "toolbar" && !tabname.isEmpty()) { //avoid TQToolBar warning in the log - QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar ); + TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); ToolbarTabWidget *toolbarTab = ToolbarTabWidget::ref(); TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii()); QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true); tb->loadState(element); - tb->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); + tb->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); //kdDebug(24000) << "tb->iconSize() " << tb->iconSize() << endl; if (toolbarTab->iconText() == KToolBar::IconTextBottom) @@ -1813,7 +1813,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl kdDebug(24000) << "toolbarTab->tabHeight() " << toolbarTab->tabHeight() << endl; */ toolbarTab->insertTab(tb, tabname, idStr); - qInstallMsgHandler( oldHandler ); + tqInstallMsgHandler( oldHandler ); connect(tb, TQT_SIGNAL(removeAction(const TQString&, const TQString&)), TQT_SLOT(slotRemoveAction(const TQString&, const TQString&))); @@ -1822,18 +1822,18 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl return tb; } - return KMainWindow::createContainer( parent, index, element, id ); + return KMainWindow::createContainer( tqparent, index, element, id ); } -void QuantaApp::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id ) +void QuantaApp::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id ) { if (dynamic_cast<QuantaToolBar*>(container)) { ToolbarTabWidget::ref()->removePage(container); } else - KMainWindow::removeContainer( container, parent, element, id ); + KMainWindow::removeContainer( container, tqparent, element, id ); } void QuantaApp::slotBack() @@ -1911,14 +1911,14 @@ void QuantaApp::slotContextMenuAboutToShow() name = tagStr.mid(pos, group.definitionRx.matchedLength()); node->tag->beginPos(bl, bc); TQString tmpStr = tagStr.left(pos); - int newLines = tmpStr.contains('\n'); + int newLines = tmpStr.tqcontains('\n'); bl += newLines; - int l = tmpStr.findRev('\n'); //the last EOL + int l = tmpStr.tqfindRev('\n'); //the last EOL bc = (l == -1) ? bc+pos : pos - l - 1; - newLines = name.contains('\n'); + newLines = name.tqcontains('\n'); l = name.length(); el = bl + newLines; - ec = (newLines > 0) ? l - name.findRev('\n') : bc + l - 1; + ec = (newLines > 0) ? l - name.tqfindRev('\n') : bc + l - 1; pos += l; int p = group.definitionRx.search(cleanName); if (p != -1) @@ -1942,7 +1942,7 @@ void QuantaApp::slotContextMenuAboutToShow() } } else { - TQMap<TQString, XMLStructGroup>::ConstIterator it = node->tag->dtd()->xmlStructTreeGroups.find(node->tag->name.lower()); + TQMap<TQString, XMLStructGroup>::ConstIterator it = node->tag->dtd()->xmlStructTreeGroups.tqfind(node->tag->name.lower()); if (it != node->tag->dtd()->xmlStructTreeGroups.constEnd()) { @@ -1964,11 +1964,11 @@ void QuantaApp::slotContextMenuAboutToShow() { if (!name.isEmpty()) { - KURL baseUrl = QExtFileInfo::path(w->url()); + KURL baseUrl = TQExtFileInfo::path(w->url()); urlUnderCursor = baseUrl; QuantaCommon::setUrl(urlUnderCursor, name.stripWhiteSpace()); - urlUnderCursor = QExtFileInfo::toAbsolute(urlUnderCursor, baseUrl); - action->setText(i18n("Open File: %1").arg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80))); + urlUnderCursor = TQExtFileInfo::toAbsolute(urlUnderCursor, baseUrl); + action->setText(i18n("Open File: %1").tqarg(KStringHandler::lsqueeze(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol), 80))); action->setEnabled(true); } else { @@ -1979,7 +1979,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("upload_file"); if (action) { - action->setEnabled(Project::ref()->contains(w->url())); + action->setEnabled(Project::ref()->tqcontains(w->url())); } // If we have a debugger session active... @@ -1997,16 +1997,16 @@ void QuantaApp::slotContextMenuAboutToShow() { // Otherwise, find the word under the cursor word = w->editIf->textLine(w->viewCursorIf->cursorLine()); - startpos = word.findRev(TQRegExp("$|[^a-zA-Z0-9_]"), w->viewCursorIf->cursorColumn()); + startpos = word.tqfindRev(TQRegExp("$|[^a-zA-Z0-9_]"), w->viewCursorIf->cursorColumn()); word.remove(0, startpos); if(word.left(1) != "$") word.remove(0, 1); - word = word.left(word.find(TQRegExp("[^a-zA-Z0-9_]"), 1)); + word = word.left(word.tqfind(TQRegExp("[^a-zA-Z0-9_]"), 1)); } // If we have a linebreak, take everything before the break - startpos = word.find("\n"); + startpos = word.tqfind("\n"); if(startpos > 0) word = word.left(startpos); @@ -2027,7 +2027,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_addwatch"); if(action) { - action->setText(i18n("Add Watch: '%1'").arg(word)); + action->setText(i18n("Add Watch: '%1'").tqarg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2038,7 +2038,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_variable_set"); if(action) { - action->setText(i18n("Set Value of '%1'").arg(word)); + action->setText(i18n("Set Value of '%1'").tqarg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2049,7 +2049,7 @@ void QuantaApp::slotContextMenuAboutToShow() action = actionCollection()->action("debug_conditional_break"); if(action) { - action->setText(i18n("Break When '%1'...").arg(word)); + action->setText(i18n("Break When '%1'...").tqarg(word)); action->setEnabled(!word.isEmpty()); if(!action->isPlugged(popup)) @@ -2074,7 +2074,7 @@ void QuantaApp::slotContextMenuAboutToShow() void QuantaApp::slotOpenFileUnderCursor() { - if (QExtFileInfo::exists(urlUnderCursor, true, this)) + if (TQExtFileInfo::exists(urlUnderCursor, true, this)) { if (QuantaCommon::checkMimeGroup(urlUnderCursor, "text" )) { @@ -2087,7 +2087,7 @@ void QuantaApp::slotOpenFileUnderCursor() } } else { - KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg(urlUnderCursor.prettyURL(0, KURL::StripFileProtocol))); } } @@ -2166,8 +2166,8 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) { if ((nodeList.item(i).cloneNode().toElement().attribute("name").lower() ) == name.lower()) { - newName = origName + TQString(" (%1)").arg(count); - i18nName = i18n(origName.utf8()) + TQString(" (%1)").arg(count); + newName = origName + TQString(" (%1)").tqarg(count); + i18nName = i18n(origName.utf8()) + TQString(" (%1)").tqarg(count); nameModified = true; count++; found = true; @@ -2195,12 +2195,12 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) TQString s = i18nName.lower(); TQString toolbarId = s; TQRegExp rx("\\s|\\."); - toolbarId.replace(rx, "_"); + toolbarId.tqreplace(rx, "_"); int n = 1; - while (m_toolbarList.find(toolbarId) != 0L) + while (m_toolbarList.tqfind(toolbarId) != 0L) { - toolbarId = s + TQString("%1").arg(n); - toolbarId.replace(rx, "_"); + toolbarId = s + TQString("%1").tqarg(n); + toolbarId.tqreplace(rx, "_"); n++; } @@ -2250,7 +2250,7 @@ void QuantaApp::slotLoadToolbarFile(const KURL& url) //Compatility code (read the action shortcuts from quantaui.rc) //TODO: Remove after upgrade from 3.1 is not supported - if (oldShortcuts.contains(actionName)) + if (oldShortcuts.tqcontains(actionName)) { tagAction->setModified(true); tagAction->data().setAttribute("shortcut", oldShortcuts[actionName]); @@ -2438,7 +2438,7 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF TQString error; int el, ec; if (!dom->setContent(s, &error, &el, &ec)) - kdError(24000) << TQString("Error %1 at (%2, %3)").arg(error).arg(el).arg(ec)<<endl; + kdError(24000) << TQString("Error %1 at (%2, %3)").tqarg(error).tqarg(el).tqarg(ec)<<endl; p_toolbar->dom = dom; TQTextStream bufferStr(&buffer); @@ -2458,10 +2458,10 @@ KURL QuantaApp::saveToolbarToFile(const TQString& toolbarName, const KURL& destF if (!tar.writeFile(TQFileInfo(tarFile.path()).baseName()+".actions", "user", "group", buffer2.buffer().size(), buffer2.buffer().data())) return KURL(); tar.close(); - if (!QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this)) + if (!TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), tarFile, -1, true, false, this)) { KMessageBox::error(this, i18n("<qt>An error happened while saving the <b>%1</b> toolbar.<br>" - "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").arg(p_toolbar->name).arg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error")); + "Check that you have write permissions for<br><b>%2</b>.<br><br>This might happen if you tried save to save a global toolbar as a simple user. Use <i>Save As</i> or <i>Toolbars->Save Toolbars->Save as Local Toolbar</i> in this case. </qt>").tqarg(p_toolbar->name).tqarg(tarFile.prettyURL(0, KURL::StripFileProtocol)), i18n("Toolbar Saving Error")); tarFile = KURL(); delete p_toolbar->dom; p_toolbar->dom = oldDom; @@ -2554,7 +2554,7 @@ bool QuantaApp::saveToolbar(bool localToolbar, const TQString& toolbarToSave, co if (!localToolbar) localToolbarsDir = projectToolbarsURL.prettyURL(); KMessageBox::sorry(0,i18n("<qt>You must save the toolbars to the following folder: <br><br><b>%1</b></qt>") - .arg(localToolbarsDir)); + .tqarg(localToolbarsDir)); query = KMessageBox::No; } } while (query != KMessageBox::Yes); @@ -2591,16 +2591,16 @@ void QuantaApp::slotSaveProjectToolbar() void QuantaApp::slotAddToolbar() { bool ok; - TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").arg(userToolbarsCount), &ok, this); + TQString name = KInputDialog::getText(i18n("New Toolbar"), i18n("Enter toolbar name:"), i18n("User_%1").tqarg(userToolbarsCount), &ok, this); if (ok) { userToolbarsCount++; TQString toolbarId = name; int n = 1; - while (m_toolbarList.find(toolbarId) != 0L) + while (m_toolbarList.tqfind(toolbarId) != 0L) { - toolbarId = name + TQString("%1").arg(n); + toolbarId = name + TQString("%1").tqarg(n); n++; } toolbarId = toolbarId.lower(); @@ -2609,7 +2609,7 @@ void QuantaApp::slotAddToolbar() tempFile->setAutoDelete(true); tempFile->textStream()->setEncoding(TQTextStream::UnicodeUTF8); * (tempFile->textStream()) << TQString("<!DOCTYPE kpartgui SYSTEM \"kpartgui.dtd\">\n<kpartgui name=\"quanta\" version=\"2\">\n<ToolBar name=\"%1\" tabname=\"%2\" i18ntabname=\"%3\" id=\"%4\">\n<text>%5</text>\n</ToolBar>\n</kpartgui>\n") - .arg(name.lower()).arg(name).arg(name).arg(toolbarId).arg(name); + .tqarg(name.lower()).tqarg(name).tqarg(name).tqarg(toolbarId).tqarg(name); tempFile->close(); ToolbarXMLGUI * toolbarGUI = new ToolbarXMLGUI(tempFile->name()); @@ -2700,7 +2700,7 @@ TQString QuantaApp::createToolbarTarball() i18n( "Please select a toolbar:" ), lst, current, false, &ok, this ); if (!ok) - return TQString::null; + return TQString(); TQString toolbarName = res; for (uint i = 0; i < lst.count(); i++) @@ -2759,7 +2759,7 @@ void QuantaApp::slotSendToolbar() return; } - kapp->invokeMailer(toStr, TQString::null, TQString::null, subjectStr, message, TQString::null, toolbarFile); + kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), toolbarFile); } delete mailDlg; } @@ -2767,7 +2767,7 @@ void QuantaApp::slotSendToolbar() void QuantaApp::slotDownloadToolbar() { if (!m_newToolbarStuff) - m_newToolbarStuff = new QNewToolbarStuff("quanta/toolbar", this); + m_newToolbarStuff = new TQNewToolbarStuff("quanta/toolbar", this); m_newToolbarStuff->downloadResource(); } @@ -2777,7 +2777,7 @@ void QuantaApp::slotUploadToolbar() if (tempFileName.isNull()) return; if (!m_newToolbarStuff) - m_newToolbarStuff = new QNewToolbarStuff("quanta/toolbar", this); + m_newToolbarStuff = new TQNewToolbarStuff("quanta/toolbar", this); // tempDirList.append(m_newToolbarStuff->uploadResource(tempFileName)); m_newToolbarStuff->uploadResource(tempFileName); } @@ -2846,7 +2846,7 @@ void QuantaApp::slotRenameToolbar(const TQString& name) { if (tb->id(i) == name) { - tb->setTabLabel(tb->page(i)->parentWidget(), i18n(p_toolbar->name.utf8())); + tb->setTabLabel(tb->page(i)->tqparentWidget(), i18n(p_toolbar->name.utf8())); m_tagsMenu->changeItem(m_tagsMenu->idAt(i + 2), i18n(p_toolbar->name.utf8())); break; } @@ -2920,7 +2920,7 @@ void QuantaApp::slotDeleteAction(KAction *action) //we found a toolbar that contains the action if (nodeList.item(j).toElement().attribute("name") == actionName) { - nodeList.item(j).parentNode().removeChild(nodeList.item(j)); + nodeList.item(j).tqparentNode().removeChild(nodeList.item(j)); KXMLGUIFactory::saveConfigFile(guiClient->domDocument(), guiClient->xmlFile()); break; } @@ -2936,7 +2936,7 @@ void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_ { KAction *action = 0L; TQString actionName = a_actionName; - actionName.replace('&',"&&"); + actionName.tqreplace('&',"&&"); KActionCollection *ac = actionCollection(); uint actionCount = ac->count(); TQString str; @@ -2976,7 +2976,7 @@ void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_ { action->unplug(ToolbarTabWidget::ref()->page(toolbarName)); action->unplug(p_toolbar->menu); - node.parentNode().removeChild(node); + node.tqparentNode().removeChild(node); } node = node.nextSibling(); } @@ -3014,10 +3014,10 @@ void QuantaApp::setDtep(const TQString& dtepName, bool convert) if (w) { TQString dtep = DTDs::ref()->getDTDNameFromNickName(dtepName); - if (!DTDs::ref()->find(dtep)) + if (!DTDs::ref()->tqfind(dtep)) return; w->setDTDIdentifier(dtep); - const DTDStruct *dtd = DTDs::ref()->find(w->getDTDIdentifier()); + const DTDStruct *dtd = DTDs::ref()->tqfind(w->getDTDIdentifier()); if (convert && dtd->family == Xml) { Tag *tag = 0L; @@ -3096,7 +3096,7 @@ void QuantaApp::slotEditDTD() bool ok = false; TQString res = KInputDialog::getItem( i18n( "Edit DTD" ), - i18n( "Please select a DTD:" ), lst, lst.findIndex(nickName), false, &ok, this ); + i18n( "Please select a DTD:" ), lst, lst.tqfindIndex(nickName), false, &ok, this ); TQString s = i18n("Create a new DTEP description"); s = i18n("Load DTEP description from disk"); @@ -3106,7 +3106,7 @@ void QuantaApp::slotEditDTD() TQString dtdName = DTDs::ref()->getDTDNameFromNickName(res); KDialogBase editDlg(this, "edit_dtep", true, i18n("Configure DTEP"), KDialogBase::Ok | KDialogBase::Cancel); - DTEPEditDlg dtepDlg(DTDs::ref()->find(dtdName)->fileName, &editDlg); + DTEPEditDlg dtepDlg(DTDs::ref()->tqfind(dtdName)->fileName, &editDlg); editDlg.setMainWidget(&dtepDlg); if (editDlg.exec()) { @@ -3122,7 +3122,7 @@ void QuantaApp::focusInEvent(TQFocusEvent* e) if (w) { w->view()->setFocus(); - w->checkDirtyStatus(); + w->checkDirtytqStatus(); } } @@ -3166,17 +3166,17 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName) if (!currentToolbarDTD.isEmpty()) { - oldDtd = DTDs::ref()->find(currentToolbarDTD); + oldDtd = DTDs::ref()->tqfind(currentToolbarDTD); if (!oldDtd) - oldDtd = DTDs::ref()->find(Project::ref()->defaultDTD()); + oldDtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD()); } TQString fileName; - const DTDStruct *newDtd = DTDs::ref()->find(dtdName); + const DTDStruct *newDtd = DTDs::ref()->tqfind(dtdName); if (!newDtd) { - newDtd = DTDs::ref()->find(Project::ref()->defaultDTD()); + newDtd = DTDs::ref()->tqfind(Project::ref()->defaultDTD()); if (!newDtd) - newDtd = DTDs::ref()->find(qConfig.defaultDocType); //extreme case + newDtd = DTDs::ref()->tqfind(qConfig.defaultDocType); //extreme case } ToolbarEntry *p_toolbar; @@ -3200,7 +3200,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName) //first load the local version if it exists fileName = locateLocal("data", resourceDir + "toolbars/"+newDtd->toolbars[i]); QuantaCommon::setUrl(url, fileName); - if (QExtFileInfo::exists(url, true, this)) + if (TQExtFileInfo::exists(url, true, this)) { //showToolbarFile(url); newToolbars += url; @@ -3208,7 +3208,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName) { fileName = qConfig.globalDataDir + resourceDir + "toolbars/"+newDtd->toolbars[i]; QuantaCommon::setUrl(url, fileName); - if (QExtFileInfo::exists(url, true, this)) + if (TQExtFileInfo::exists(url, true, this)) { newToolbars += url;// showToolbarFile(url); } @@ -3225,7 +3225,7 @@ void QuantaApp::slotLoadToolbarForDTD(const TQString& dtdName) KURL urlLocal; fileName = locateLocal("data", resourceDir + "toolbars/"+oldDtd->toolbars[i]); QuantaCommon::setUrl(urlLocal, fileName); - if (newToolbars.contains(url) == 0) + if (newToolbars.tqcontains(url) == 0) { TQDictIterator<ToolbarEntry> iter(m_toolbarList); for( ; iter.current(); ++iter ) @@ -3309,8 +3309,8 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name) name1.remove(" tab"); TQString name2 = name1; name2.remove(TQRegExp("[\\s]\\([0-9]+\\)")); - s2.replace(name1, name2); - s2.replace(name1.lower(), name2.lower()); + s2.tqreplace(name1, name2); + s2.tqreplace(name1.lower(), name2.lower()); } bool useToolbarGUI = true; if ( s1 != s2 /*|| actionsModified */) @@ -3318,12 +3318,12 @@ bool QuantaApp::slotRemoveToolbar(const TQString& a_name) int result; if (p_toolbar->url.isEmpty()) { - result = KMessageBox::warningYesNoCancel(this, i18n("<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name), + result = KMessageBox::warningYesNoCancel(this, i18n("<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is removed?</qt>").tqarg(p_toolbar->name), i18n("Save Toolbar"), KStdGuiItem::save(), KStdGuiItem::discard()); } else { FourButtonMessageBox dlg(this, 0, true); - dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").arg(p_toolbar->name)); + dlg.textLabel->setText(i18n("<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is removed?</qt>").tqarg(p_toolbar->name)); dlg.setCaption(i18n("Save Toolbar")); dlg.pixmapLabel->setPixmap(BarIcon("messagebox_info", KIcon::SizeMedium)); dlg.exec(); @@ -3461,7 +3461,7 @@ void QuantaApp::slotBuildPrjToolbarsMenu() if (Project::ref()->hasProject()) { buildInProgress = true; - toolbarList = QExtFileInfo::allFiles(Project::ref()->toolbarURL(), "*"+toolbarExtension, this); + toolbarList = TQExtFileInfo::allFiles(Project::ref()->toolbarURL(), "*"+toolbarExtension, this); buildInProgress = false; projectToolbarFiles->setMaxItems(toolbarList.count()); for (uint i = 0; i < toolbarList.count(); i++) @@ -3542,7 +3542,7 @@ bool QuantaApp::allToolbarsHidden() const void QuantaApp::slotLoadDTEP() { - TQString dirName = KFileDialog::getExistingDirectory(TQString::null, 0, i18n("Select DTEP Directory")); + TQString dirName = KFileDialog::getExistingDirectory(TQString(), 0, i18n("Select DTEP Directory")); if (!dirName.isEmpty()) { DTDs::ref()->slotLoadDTEP(dirName, true); @@ -3559,10 +3559,10 @@ TQString QuantaApp::createDTEPTarball() bool ok = false; TQString res = KInputDialog::getItem( i18n( "Send DTD" ), - i18n( "Please select a DTD:" ), lst, lst.findIndex(nickName), false, &ok, this ); + i18n( "Please select a DTD:" ), lst, lst.tqfindIndex(nickName), false, &ok, this ); if (!ok) - return TQString::null; + return TQString(); TQString dtdName = DTDs::ref()->getDTDNameFromNickName(res); @@ -3570,17 +3570,17 @@ TQString QuantaApp::createDTEPTarball() KTempDir* tempDir = new KTempDir(tmpDir); tempDir->setAutoDelete(true); tempDirList.append(tempDir); - TQString tempFileName=tempDir->name() +"/"+ DTDs::ref()->getDTDNickNameFromName(dtdName).replace(TQRegExp("\\s|\\."), "_") + ".tgz"; + TQString tempFileName=tempDir->name() +"/"+ DTDs::ref()->getDTDNickNameFromName(dtdName).tqreplace(TQRegExp("\\s|\\."), "_") + ".tgz"; //pack the .tag files and the description.rc into a .tgz file KTar tar(tempFileName, "application/x-gzip"); tar.open(IO_WriteOnly); KURL dirURL; - dirURL.setPath(DTDs::ref()->find(dtdName)->fileName); + dirURL.setPath(DTDs::ref()->tqfind(dtdName)->fileName); dirURL.setPath(dirURL.directory(false)); - KURL::List files = QExtFileInfo::allFilesRelative(dirURL, "*", this); + KURL::List files = TQExtFileInfo::allFilesRelative(dirURL, "*", this); for ( KURL::List::Iterator it_f = files.begin(); it_f != files.end(); ++it_f ) { TQString name = (*it_f).fileName(); @@ -3595,7 +3595,7 @@ TQString QuantaApp::createDTEPTarball() tar.close(); return tempFileName; } - return TQString::null; + return TQString(); } void QuantaApp::slotEmailDTEP() @@ -3634,7 +3634,7 @@ void QuantaApp::slotEmailDTEP() return; } - kapp->invokeMailer(toStr, TQString::null, TQString::null, subjectStr, message, TQString::null, dtdFile); + kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), dtdFile); } delete mailDlg; } @@ -3643,7 +3643,7 @@ void QuantaApp::slotEmailDTEP() void QuantaApp::slotDownloadDTEP() { if (!m_newDTEPStuff) - m_newDTEPStuff = new QNewDTEPStuff("quanta/dtep", this); + m_newDTEPStuff = new TQNewDTEPStuff("quanta/dtep", this); m_newDTEPStuff->downloadResource(); } @@ -3653,7 +3653,7 @@ void QuantaApp::slotUploadDTEP() if (tempFileName.isNull()) return; if (!m_newDTEPStuff) - m_newDTEPStuff = new QNewDTEPStuff("quanta/dtep", this); + m_newDTEPStuff = new TQNewDTEPStuff("quanta/dtep", this); // tempDirList.append(m_newDTEPStuff->uploadResource(tempFileName)); m_newDTEPStuff->uploadResource(tempFileName); } @@ -3664,7 +3664,7 @@ void QuantaApp::slotSmartTagInsertion() if(!action) return; if(!ViewManager::ref()->activeDocument() || !ViewManager::ref()->activeView() || - ViewManager::ref()->activeDocument()->defaultDTD()->name.contains("HTML", false) == 0) + ViewManager::ref()->activeDocument()->defaultDTD()->name.tqcontains("HTML", false) == 0) { KMessageBox::error(this, "Smart Tag Insertion is available only for (X)HTML for the moment."); qConfig.smartTagInsertion = false; @@ -3677,14 +3677,14 @@ void QuantaApp::slotSmartTagInsertion() void QuantaApp::slotDownloadTemplate() { if (!m_newTemplateStuff) - m_newTemplateStuff = new QNewTemplateStuff("quanta/template", this); + m_newTemplateStuff = new TQNewTemplateStuff("quanta/template", this); m_newTemplateStuff->downloadResource(); } void QuantaApp::slotUploadTemplate(const TQString &fileName) { if (!m_newTemplateStuff) - m_newTemplateStuff = new QNewTemplateStuff("quanta/template", this); + m_newTemplateStuff = new TQNewTemplateStuff("quanta/template", this); // tempDirList.append(m_newTemplateStuff->uploadResource(fileName)); m_newTemplateStuff->uploadResource(fileName); } @@ -3692,14 +3692,14 @@ void QuantaApp::slotUploadTemplate(const TQString &fileName) void QuantaApp::slotDownloadScript() { if (!m_newScriptStuff) - m_newScriptStuff = new QNewScriptStuff("quanta/script", this); + m_newScriptStuff = new TQNewScriptStuff("quanta/script", this); m_newScriptStuff->downloadResource(); } void QuantaApp::slotUploadScript(const TQString &fileName) { if (!m_newScriptStuff) - m_newScriptStuff = new QNewScriptStuff("quanta/script", this); + m_newScriptStuff = new TQNewScriptStuff("quanta/script", this); // tempDirList.append(m_newScriptStuff->uploadResource(fileName)); m_newScriptStuff->uploadResource(fileName); } @@ -3708,7 +3708,7 @@ void QuantaApp::slotDownloadDoc() { if (!m_newDocStuff) { - m_newDocStuff = new QNewDocStuff("quanta/documentation", this); + m_newDocStuff = new TQNewDocStuff("quanta/documentation", this); connect(m_newDocStuff, TQT_SIGNAL(installFinished()), dTab, TQT_SLOT(slotRefreshTree())); } m_newDocStuff->downloadResource(); @@ -3736,7 +3736,7 @@ void QuantaApp::documentProperties(bool forceInsertionOfMinimalTree) Document *w = ViewManager::ref()->activeDocument(); if (w) { - if (w->defaultDTD()->name.contains("HTML", false) == 0) + if (w->defaultDTD()->name.tqcontains("HTML", false) == 0) { KMessageBox::information(this, i18n("The Document Properties Dialog is only for HTML and XHTML.")); return; @@ -3784,7 +3784,7 @@ TQStringList QuantaApp::openedURLs() const Document *w = qView->document(); if ( w ) { - list.prepend( TQString("%1:%2").arg(w->editIf->editInterfaceNumber()).arg(w->url().url())); + list.prepend( TQString("%1:%2").tqarg(w->editIf->editInterfaceNumber()).tqarg(w->url().url())); } } } @@ -3808,7 +3808,7 @@ void QuantaApp::slotExpandAbbreviation() { bool found = false; Abbreviation abbrev = it.data(); - if (abbrev.dteps.contains(dtd->name)) + if (abbrev.dteps.tqcontains(dtd->name)) { TQMap<TQString, TQString>::ConstIterator it2; for (it2 = abbrev.abbreviations.constBegin(); it2 != abbrev.abbreviations.constEnd(); ++it2) @@ -3830,20 +3830,20 @@ void QuantaApp::slotExpandAbbreviation() w->editIf->removeText(line, col - text.length() + 1, line, col); w->activateParser(true); col -= (text.length() - 1); - int pos = textToInsert.find('|'); + int pos = textToInsert.tqfind('|'); if (pos != -1) { text = textToInsert.left(pos); - if (text.contains('\n')) + if (text.tqcontains('\n')) { - line += text.contains('\n'); - col = text.length() - text.findRev('\n') - 1; + line += text.tqcontains('\n'); + col = text.length() - text.tqfindRev('\n') - 1; } else { col += pos; } } - textToInsert.replace('|',""); + textToInsert.tqreplace('|',""); w->insertText(textToInsert, false); w->viewCursorIf->setCursorPositionReal(line, col); } @@ -3957,7 +3957,7 @@ void QuantaApp::slotAutosaveTimer() void QuantaApp::slotGetScriptOutput(KProcess* ,char* buf,int buflen) { TQCString tmp( buf, buflen + 1 ); - m_scriptOutput = TQString::null; + m_scriptOutput = TQString(); m_scriptOutput = TQString::fromLocal8Bit(tmp).remove(" "); } @@ -3980,7 +3980,7 @@ void QuantaApp::slotProcessTimeout() { if (m_loopStarted) { - qApp->exit_loop(); + tqApp->exit_loop(); m_loopStarted = false; } } @@ -4040,7 +4040,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly) } Tag *commentTag = n->tag; TQString text = commentTag->tagStr(); - int pos = text.find("@annotation"); + int pos = text.tqfind("@annotation"); if (pos != -1) { pos += 11; @@ -4048,7 +4048,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly) if (text[pos] == '(') { int p = pos; - pos = text.find(')'); + pos = text.tqfind(')'); if (pos != -1) { receiver = text.mid(p + 1, pos - p - 1); @@ -4062,7 +4062,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly) n->next->tag->beginPos(l, c); else n->tag->endPos(l, c); - commentTag->write()->addAnnotation(l, qMakePair(text, receiver)); + commentTag->write()->addAnnotation(l, tqMakePair(text, receiver)); } } node = node->nextSibling(); @@ -4074,7 +4074,7 @@ TQString QuantaApp::saveCurrentFile() { Document *w = ViewManager::ref()->activeDocument(); if (!w) - return TQString::null; + return TQString(); if (w->isModified()) { if ( KMessageBox::questionYesNo(this, @@ -4094,7 +4094,7 @@ TQString QuantaApp::saveCurrentFile() } } else { - return TQString::null; + return TQString(); } } KURL url = Project::ref()->urlWithPrefix(w->url()); @@ -4160,7 +4160,7 @@ bool QuantaApp::queryClose() { saveOptions(); // kdDebug(24000) << "Quanta will exit" << endl; - emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString::null); + emit eventHappened("quanta_exit", TQDateTime::tqcurrentDateTime().toString(Qt::ISODate), TQString()); } else slotFileNew(); return canExit; @@ -4200,7 +4200,7 @@ void QuantaApp::saveOptions() m_config->writeEntry("Smart Tag Insertion", qConfig.smartTagInsertion); - m_config->writeEntry("Window layout", qConfig.windowLayout); + m_config->writeEntry("Window tqlayout", qConfig.windowLayout); m_config->writeEntry("Follow Cursor", StructTreeView::ref()->followCursor() ); //If user choose the timer interval, it needs to restart the timer too m_config->writeEntry("Autosave interval", qConfig.autosaveInterval); @@ -4297,10 +4297,10 @@ void QuantaApp::slotEditCurrentTag() if (dtd->family == Xml) { TQString currentLine = w->editIf->textLine(line); - int sPos = currentLine.findRev('<', col); + int sPos = currentLine.tqfindRev('<', col); if (sPos != -1) { - int ePos = currentLine.find('>', col); + int ePos = currentLine.tqfind('>', col); if (ePos != -1) { AreaStruct area(line, sPos, line, ePos); @@ -4327,7 +4327,7 @@ void QuantaApp::slotEditCurrentTag() slotEnableIdleTimer(true); if (isUnknown) { - TQString message = i18n("Unknown tag: %1").arg(tagName); + TQString message = i18n("Unknown tag: %1").tqarg(tagName); slotStatusMsg( message ); } } @@ -4442,21 +4442,21 @@ void QuantaApp::slotInsertCSS() if (styleNode->tag->type == Tag::XmlTagEnd && styleNode->prev) styleNode = styleNode->prev; - while (styleNode && styleNode->parent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css") - styleNode = styleNode->parent; + while (styleNode && styleNode->tqparent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css") + styleNode = styleNode->tqparent; - Node *parentNode = node; - if (parentNode->tag->type == Tag::XmlTagEnd && parentNode->prev) - parentNode = parentNode->prev; + Node *tqparentNode = node; + if (tqparentNode->tag->type == Tag::XmlTagEnd && tqparentNode->prev) + tqparentNode = tqparentNode->prev; else - while (parentNode && parentNode->parent && - parentNode->tag->type != Tag::XmlTag) - parentNode = parentNode->parent; + while (tqparentNode && tqparentNode->tqparent && + tqparentNode->tag->type != Tag::XmlTag) + tqparentNode = tqparentNode->tqparent; TQString fullDocument = w->editIf->text().stripWhiteSpace(); - if (styleNode->tag->name.lower() == "comment block" && styleNode->parent) { - if (styleNode->parent->tag->name.lower() == "style") { - styleNode = styleNode->parent; + if (styleNode->tag->name.lower() == "comment block" && styleNode->tqparent) { + if (styleNode->tqparent->tag->name.lower() == "style") { + styleNode = styleNode->tqparent; } } @@ -4469,7 +4469,7 @@ void QuantaApp::slotInsertCSS() styleNode->next->tag->beginPos(eLine, eCol); TQString styleTagContent(w->text(bLine, bCol+1, eLine, eCol-1).remove("<!--").remove("-->"));// <style></style> block content - kdDebug(24000) << "Style tag contains: " << endl << styleTagContent << endl; + kdDebug(24000) << "Style tag tqcontains: " << endl << styleTagContent << endl; CSSSelector *dlg = new CSSSelector; dlg->setCallingFrom("XHTML"); @@ -4513,29 +4513,29 @@ void QuantaApp::slotInsertCSS() } delete dlg; } else - if (parentNode && parentNode->tag->type == Tag::XmlTag) + if (tqparentNode && tqparentNode->tag->type == Tag::XmlTag) { - kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << parentNode->tag->name << endl; + kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << tqparentNode->tag->name << endl; CSSEditor *dlg = new CSSEditor(this); TQFileInfo fi(ViewManager::ref()->currentURL()); dlg->setFileToPreview(projectBaseURL().path() + fi.baseName(),false); - parentNode->tag->beginPos(bLine, bCol); - parentNode->tag->endPos(eLine, eCol); + tqparentNode->tag->beginPos(bLine, bCol); + tqparentNode->tag->endPos(eLine, eCol); dlg->setFooter(">" + w->text(eLine, eCol + 1, lastLine, lastCol)); TQString temp; - if (parentNode->tag->hasAttribute("style")) + if (tqparentNode->tag->hasAttribute("style")) { - dlg->setInlineStyleContent(parentNode->tag->attributeValue("style")); - Tag tempTag(*(parentNode->tag)); + dlg->setInlineStyleContent(tqparentNode->tag->attributeValue("style")); + Tag tempTag(*(tqparentNode->tag)); tempTag.deleteAttribute("style"); temp = tempTag.toString(); } else { - dlg->setInlineStyleContent(TQString::null); - temp = parentNode->tag->toString(); + dlg->setInlineStyleContent(TQString()); + temp = tqparentNode->tag->toString(); } //using TQString::mid sometimes generates strange results; maybe this is due to a (random) blank in temp temp = temp.left(temp.length()-1);//remove > @@ -4545,7 +4545,7 @@ void QuantaApp::slotInsertCSS() dlg->initialize(); if( dlg->exec() ) { - w->changeTagAttribute(parentNode->tag, "style", dlg->generateProperties()); + w->changeTagAttribute(tqparentNode->tag, "style", dlg->generateProperties()); } delete dlg; } else @@ -4786,7 +4786,7 @@ void QuantaApp::slotViewInKFM() } if ( !w->isUntitled() ) { - KProcess *show = new KProcess(this); + KProcess *show = new KProcess(TQT_TQOBJECT(this)); KURL url = Project::ref()->urlWithPrefix(w->url()); *show << "kfmclient" << "newTab" << url.url(); show->start( KProcess::DontCare ); @@ -4820,7 +4820,7 @@ void QuantaApp::slotViewInLynx() } if ( !w->isUntitled() ) { - KProcess *show = new KProcess(this); + KProcess *show = new KProcess(TQT_TQOBJECT(this)); KURL url = Project::ref()->urlWithPrefix(w->url()); *show << "konsole" << "--nohist" @@ -4840,15 +4840,15 @@ void QuantaApp::slotPasteHTMLQuoted() Document *w = ViewManager::ref()->activeDocument(); if (w) { - QClipboard *cb = qApp->clipboard(); + TQClipboard *cb = tqApp->tqclipboard(); TQString text = cb->text(); if ( ( !text.isNull() ) && (!text.isEmpty() ) ) { - text.replace( "&", "&" ); - text.replace( "<", "<" ); - text.replace( "\"", """ ); - text.replace( ">", ">" ); + text.tqreplace( "&", "&" ); + text.tqreplace( "<", "<" ); + text.tqreplace( "\"", """ ); + text.tqreplace( ">", ">" ); //TODO: Replace only the chars not present in the current encoding. TQString encoding = defaultEncoding(); @@ -4860,16 +4860,16 @@ void QuantaApp::slotPasteHTMLQuoted() for ( TQStringList::Iterator it = charList.begin(); it != charList.end(); ++it ) { TQString s = *it; - int begin = s.find("(&#") + 3; + int begin = s.tqfind("(&#") + 3; if (begin == 1) continue; - int length = s.find(";)") - begin + 1; + int length = s.tqfind(";)") - begin + 1; s = s.mid(begin, length - 1); bool ok; int code = s.toInt(&ok); if (!ok || code < 191) continue; - text.replace(TQChar(code), TQString("&#%1;").arg(s)); + text.tqreplace(TQChar(code), TQString("&#%1;").tqarg(s)); } } unsigned int line, col; @@ -4885,7 +4885,7 @@ void QuantaApp::slotPasteURLEncoded() Document *w = ViewManager::ref()->activeDocument(); if (w) { - QClipboard *cb = qApp->clipboard(); + TQClipboard *cb = tqApp->tqclipboard(); TQString text = cb->text(); if ( ( !text.isNull() ) && (!text.isEmpty() ) ) @@ -4907,7 +4907,7 @@ void QuantaApp::slotUndo () if(ViewManager::ref()->activeView()->hadLastFocus() == QuantaView::VPLFocus && w) { /**MessageBox::information(this, i18n("VPL does not support this functionality yet."), - TQString::null, "show undo unavailable");*/ + TQString(), "show undo unavailable");*/ w->docUndoRedo->undo(); return; } @@ -4932,7 +4932,7 @@ void QuantaApp::slotRedo () if(ViewManager::ref()->activeView()->hadLastFocus() == QuantaView::VPLFocus) { /**KMessageBox::information(this, i18n("VPL does not support this functionality yet."), - TQString::null, "show redo unavailable");*/ + TQString(), "show redo unavailable");*/ w->docUndoRedo->redo(); return; } @@ -4971,7 +4971,7 @@ void QuantaApp::slotCut() { /* KMessageBox::information(this, i18n("Sorry, VPL does not support this functionality yet."), - TQString::null, "show cut unavailable"); + TQString(), "show cut unavailable"); */ KafkaDocument::ref()->slotCut(); return; @@ -4991,7 +4991,7 @@ void QuantaApp::slotCopy() if(view && view->hadLastFocus() == QuantaView::VPLFocus) { //KMessageBox::information(this, i18n("Sorry, VPL does not support this functionality yet."), - //TQString::null, "show copy unavailable"); + //TQString(), "show copy unavailable"); KafkaDocument::ref()->slotCopy(); return; } @@ -5004,15 +5004,15 @@ void QuantaApp::slotCopy() if (m_htmlPart->view()->hasFocus()) { TQString selection = m_htmlPart->selectedText(); - QClipboard *cb = TQApplication::clipboard(); - cb->setText(selection, QClipboard::Clipboard); + TQClipboard *cb = TQApplication::tqclipboard(); + cb->setText(selection, TQClipboard::Clipboard); } else if (m_htmlPartDoc->view()->hasFocus()) { TQString selection = m_htmlPartDoc->selectedText(); - QClipboard *cb = TQApplication::clipboard(); - cb->setText(selection, QClipboard::Clipboard); + TQClipboard *cb = TQApplication::tqclipboard(); + cb->setText(selection, TQClipboard::Clipboard); } } @@ -5024,7 +5024,7 @@ void QuantaApp::slotPaste() if(view && view->hadLastFocus() == QuantaView::VPLFocus) { //KMessageBox::information(this, i18n("Sorry, VPL does not support this functionality yet."), - //TQString::null, "show paste unavailable"); + //TQString(), "show paste unavailable"); KafkaDocument::ref()->slotPaste(); return; } @@ -5120,9 +5120,9 @@ void QuantaApp::slotFileClosed(Document *w) if (w) { KURL url = w->url(); - if (Project::ref()->hasProject() && Project::ref()->contains(url)) + if (Project::ref()->hasProject() && Project::ref()->tqcontains(url)) { - KURL u = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()); + KURL u = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()); m_annotationOutput->writeAnnotations(QuantaCommon::qUrl(u), w->annotations()); } } @@ -5134,9 +5134,9 @@ void QuantaApp::slotCVSCommandExecuted(const TQString& command, const TQStringLi for (uint i = 0; i < files.count(); i++) { file = files[i]; - if (Project::ref()->contains(KURL::fromPathOrURL(file))) + if (Project::ref()->tqcontains(KURL::fromPathOrURL(file))) { - emit eventHappened("after_" + command, file, TQString::null); + emit eventHappened("after_" + command, file, TQString()); } } } diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index e55c8814..b10d6480 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -30,7 +30,7 @@ #define IDS_DEFAULT "Ready." -// include files for Qt +// include files for TQt #include <tqmap.h> #include <tqdict.h> #include <tqvaluelist.h> @@ -56,11 +56,11 @@ class QuantaPluginInterface; class QuantaDoc; class QuantaView; -class QNewDTEPStuff; -class QNewToolbarStuff; -class QNewTemplateStuff; -class QNewScriptStuff; -class QNewDocStuff; +class TQNewDTEPStuff; +class TQNewToolbarStuff; +class TQNewTemplateStuff; +class TQNewScriptStuff; +class TQNewDocStuff; class TQTabWidget; class TQWidgetStack; @@ -112,6 +112,7 @@ struct ToolbarEntry; class QuantaApp : public KMdiMainFrm, public DCOPWindowManagerIf { Q_OBJECT + TQ_OBJECT friend class QuantaInit; @@ -131,8 +132,8 @@ public: DebuggerManager *debugger() const {return m_debugger;} KParts::PartManager *partManager() {return m_partManager;} - TQWidget* createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id ); - void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id ); + TQWidget* createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id ); + void removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id ); /** Returns the project's base URL if it exists, the HOME dir if there is no project and no opened document (or the current opened document was not saved yet), and the base URL of the opened document, if it is saved somewhere. maps to the same function in Project*/ @@ -193,7 +194,7 @@ public: * @param attr The string containing the attrs of the new Node to create. * @return Returns a new Node created according to the contents of the TagDialog. */ - Node *showTagDialogAndReturnNode(const TQString &tag, const TQString &attr = TQString::null); + Node *showTagDialogAndReturnNode(const TQString &tag, const TQString &attr = TQString()); /** Returns the baseURL of the document. */ KURL baseURL(); @@ -281,15 +282,15 @@ public slots: unexpected things may happen. */ void slotStatusMsg(const TQString &text); - void slotNewStatus(); + void slotNewtqStatus(); void slotNewLineColumn(); -// void slotUpdateStatus(TQWidget*);FIXME: +// void slotUpdatetqStatus(TQWidget*);FIXME: - /** repaint preview */ + /** tqrepaint preview */ void slotRepaintPreview(); /** toggles showing the preview */ void slotToggleShowPreview(); - /** Shows the preview widget and repaints the preview or + /** Shows the preview widget and tqrepaints the preview or hides the preview widget and restores the original document */ void slotShowPreviewWidget(bool show); @@ -297,7 +298,7 @@ public slots: - hide if the preview was in the editor area - update if the preview is in a toolview */ - void slotChangePreviewStatus(); + void slotChangePreviewtqStatus(); /** Called when the preview widget got or lost the focus */ void slotPreviewHasFocus(bool focus); @@ -315,7 +316,7 @@ public slots: void slotOptionsConfigureToolbars(); void slotNewToolbarConfig(); /** Configure toolbars, show defaultToolbar by default */ - void slotConfigureToolbars(const TQString& defaultToolbar = TQString::null); + void slotConfigureToolbars(const TQString& defaultToolbar = TQString()); void slotOptionsConfigureActions(); void setCursorPosition(int row, int col ); @@ -523,12 +524,12 @@ protected slots: protected: /** Create a DTEP tarball which can be uploaded or sent in email. Returns - * the name of the created file or TQString::null if creation has failed. + * the name of the created file or TQString() if creation has failed. */ TQString createDTEPTarball(); /** Create a toolbar tarball which can be uploaded or sent in email. Returns - * the name of the created file or TQString::null if creation has failed. + * the name of the created file or TQString() if creation has failed. */ TQString createToolbarTarball(); @@ -543,7 +544,7 @@ protected: virtual bool queryClose(); void saveAsTemplate (bool projectTemplate, bool selectionOnly = false); /** Saves a toolbar as local or project specific. */ - bool saveToolbar(bool localToolbar = true, const TQString& toolbarToSave = TQString::null, const KURL& destURL = KURL()); + bool saveToolbar(bool localToolbar = true, const TQString& toolbarToSave = TQString(), const KURL& destURL = KURL()); /** Saves the toolbar and the actions. Returns the name of the actions file*/ KURL saveToolbarToFile(const TQString& toolbarName,const KURL& destFile); /** Makes the tabwidget look and behave like we want. If closeButtonsOnly is true, @@ -643,11 +644,11 @@ protected: // Protected attributes DCOPQuanta *dcopQuanta; KParts::PartManager *m_partManager; ///< the pointer to the part manager TQGuardedPtr<KTextEditor::View> m_oldKTextEditor; ///< remembers the last activated GUI - QNewDTEPStuff *m_newDTEPStuff; - QNewToolbarStuff *m_newToolbarStuff; - QNewTemplateStuff *m_newTemplateStuff; - QNewScriptStuff *m_newScriptStuff; - QNewDocStuff *m_newDocStuff; + TQNewDTEPStuff *m_newDTEPStuff; + TQNewToolbarStuff *m_newToolbarStuff; + TQNewTemplateStuff *m_newTemplateStuff; + TQNewScriptStuff *m_newScriptStuff; + TQNewDocStuff *m_newDocStuff; TQDict<ToolbarEntry> m_toolbarList; public: //TODO: check if it's worth to make a read method for them diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index e7a5fa75..2fcdda6b 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -119,7 +119,7 @@ QuantaInit::QuantaInit(QuantaApp * quantaApp) : TQObject() { m_quanta = quantaApp; - connect(this, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); + connect(this, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); } QuantaInit::~QuantaInit() @@ -138,7 +138,7 @@ void QuantaInit::initQuanta() tmpDir = tmpDirs[0]; for (uint i = 0; i < tmpDirs.count(); i++) { - if (tmpDirs[i].contains("kde-")) + if (tmpDirs[i].tqcontains("kde-")) tmpDir = tmpDirs[i]; } dir.mkdir(tmpDir + "quanta"); @@ -154,9 +154,9 @@ void QuantaInit::initQuanta() //defaultDocType must be read before the Project object is created!! m_config->setGroup("General Options"); qConfig.defaultDocType = m_config->readEntry("Default DTD",DEFAULT_DTD); - if (! DTDs::ref()->find(qConfig.defaultDocType)) + if (! DTDs::ref()->tqfind(qConfig.defaultDocType)) qConfig.defaultDocType = DEFAULT_DTD; - DTDs::ref()->find("dtd"); //load on startup + DTDs::ref()->tqfind("dtd"); //load on startup initView(); initDocument(); // after initView because of init of treeViews @@ -170,14 +170,14 @@ void QuantaInit::initQuanta() readAbbreviations(); // Initialize debugger - m_quanta->m_debugger = new DebuggerManager(m_quanta); + m_quanta->m_debugger = new DebuggerManager(TQT_TQOBJECT(m_quanta)); connect(Project::ref(), TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), m_quanta->m_debugger, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); connect(Project::ref(), TQT_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), m_quanta->m_debugger, TQT_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); - connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); + connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); - //m_quanta->KDockMainWindow::createGUI( TQString::null, false /* conserveMemory */ ); + //m_quanta->KDockMainWindow::createGUI( TQString(), false /* conserveMemory */ ); m_quanta->createShellGUI(true); addToolTreeView(m_quanta->fTab, i18n("Files"), UserIcon("ftab"), KDockWidget::DockLeft); @@ -191,13 +191,13 @@ void QuantaInit::initQuanta() m_quanta->m_problemsOutputView = addToolTreeView(m_quanta->m_problemOutput, i18n("Problems"), SmallIcon("info"), KDockWidget::DockBottom); m_quanta->m_annotationOutputView = addToolTreeView(m_quanta->m_annotationOutput, i18n("Annotations"), SmallIcon("stamp"), KDockWidget::DockBottom); - // Restore the dock layout + // Restore the dock tqlayout m_config->setGroup ("General Options"); - TQString layout = m_config->readEntry("Window layout", "Default"); + TQString tqlayout = m_config->readEntry("Window tqlayout", "Default"); int mdiMode = m_config->readNumEntry("MDI mode", -1); - if (mdiMode != -1 && layout != "Default") + if (mdiMode != -1 && tqlayout != "Default") { - m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window layout... + m_quanta->readDockConfig(m_config); //FIXME: This causes the visible widget construction on startup, but is needed to restore the window tqlayout... if (mdiMode != KMdi::IDEAlMode) m_quanta->setToolviewStyle(qConfig.toolviewTabs); } @@ -209,7 +209,7 @@ void QuantaInit::initQuanta() if (mdiMode == KMdi::ToplevelMode) { m_quanta->switchToChildframeMode(); - TQTimer::singleShot(0, m_quanta, TQT_SLOT(switchToToplevelMode())); + TQTimer::singleShot(0, TQT_TQOBJECT(m_quanta), TQT_SLOT(switchToToplevelMode())); } // Always hide debugger toolbar at this point @@ -229,7 +229,7 @@ void QuantaInit::initQuanta() TQDomElement el = node.toElement(); m_quanta->oldShortcuts.insert(el.attribute("name"), el.attribute("shortcut")); node = node.nextSibling(); - el.parentNode().removeChild(el); + el.tqparentNode().removeChild(el); } else { node = node.nextSibling(); @@ -253,22 +253,22 @@ void QuantaInit::initQuanta() toolviewMenu->plug(m_quanta->windowMenu()); TQPopupMenu *toolbarsMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("toolbars_load", m_quanta); - connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotBuildPrjToolbarsMenu())); + connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotBuildPrjToolbarsMenu())); TQPopupMenu *contextMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("popup_editor", m_quanta); - connect(contextMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotContextMenuAboutToShow())); + connect(contextMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotContextMenuAboutToShow())); connect(m_quanta->m_messageOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); connect(m_quanta->m_problemOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); connect(m_quanta->m_annotationOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); m_quanta->slotFileNew(); - m_quanta->slotNewStatus(); + m_quanta->slotNewtqStatus(); initToolBars(); Project::ref()->setProjectToolbarVisible(m_quanta->factory()->container("project_toolbar", m_quanta)->isShown()); Project::ref()->slotShowProjectToolbar(Project::ref()->hasProject()); @@ -279,12 +279,12 @@ void QuantaInit::initQuanta() qConfig.backupDirPath = KGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); m_quanta->autosaveTimer = new TQTimer(m_quanta); - connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotAutosaveTimer())); + connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAutosaveTimer())); m_quanta->autosaveTimer->start(qConfig.autosaveInterval * 60000, false); - connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); + connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); connect(parser, TQT_SIGNAL(rebuildStructureTree(bool)), - m_quanta, TQT_SLOT(slotReloadStructTreeView(bool))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReloadStructTreeView(bool))); // Read list of characters TQFile file(locate("appdata","chars")); @@ -296,26 +296,26 @@ void QuantaInit::initQuanta() { s = t.readLine(); charList << i18n(s.utf8()); // line excluding '\n' - int begin = s.find("(&") + 1; + int begin = s.tqfind("(&") + 1; if (begin == 1) continue; - int length = s.find(";)") - begin + 1; + int length = s.tqfind(";)") - begin + 1; TQString s2 = s.mid(begin, length - 1); - replacementMap[s[0].unicode()] = s2; + replacementMap[s[0].tqunicode()] = s2; } file.close(); } TQString infoCss = tmpDir; - infoCss.replace(TQRegExp("/quanta$"),""); + infoCss.tqreplace(TQRegExp("/quanta$"),""); infoCss += "/info.css"; - QExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss)); + TQExtFileInfo::copy(KURL().fromPathOrURL(qConfig.globalDataDir + resourceDir + "scripts/info.css"), KURL().fromPathOrURL(infoCss)); checkRuntimeDependencies(); ViewManager::ref()->activeDocument()->view()->setFocus(); m_quanta->refreshTimer = new TQTimer(m_quanta); - connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotReparse())); + connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReparse())); m_quanta->refreshTimer->start( qConfig.refreshFrequency*1000, false ); //update the structure tree every 5 seconds if (qConfig.instantUpdate || qConfig.refreshFrequency == 0) { @@ -334,7 +334,7 @@ void QuantaInit::initStatusBar() { m_quanta->statusbarTimer = new TQTimer(m_quanta); connect(m_quanta->statusbarTimer,TQT_SIGNAL(timeout()), - m_quanta, TQT_SLOT(statusBarTimeout())); + TQT_TQOBJECT(m_quanta), TQT_SLOT(statusBarTimeout())); progressBar = new KProgress(m_quanta->statusBar()); progressBar->setTextEnabled(false); @@ -356,30 +356,30 @@ void QuantaInit::initStatusBar() void QuantaInit::initDocument() { m_quanta->m_doc = new QuantaDoc(0L); - connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()), - m_quanta, TQT_SLOT(slotNewStatus())); + connect(m_quanta->m_doc, TQT_SIGNAL(newtqStatus()), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus())); } void QuantaInit::initProject() { Project *m_project = Project::ref(m_quanta); - connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)), - pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *))); + connect(m_project, TQT_SIGNAL(getTreetqStatus(TQStringList *)), + pTab, TQT_SLOT(slotGetTreetqStatus(TQStringList *))); connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)), - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL &))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &))); connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)), - m_quanta, TQT_SLOT(slotGetUserToolbarFiles(KURL::List *))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetUserToolbarFiles(KURL::List *))); connect(m_project, TQT_SIGNAL(openFiles(const KURL::List &, const TQString&)), - m_quanta, TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&))); connect(m_project, TQT_SIGNAL(openFile(const KURL &, const TQString&)), - m_quanta, TQT_SLOT(slotFileOpen(const KURL &, const TQString&))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL &, const TQString&))); connect(m_project, TQT_SIGNAL(closeFile(const KURL &)), - m_quanta, TQT_SLOT(slotFileClose(const KURL &))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileClose(const KURL &))); connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll())); - connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)), m_project, TQT_SLOT(slotAddDirectory(const KURL&))); @@ -393,8 +393,8 @@ void QuantaInit::initProject() connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertFileInProject(const KURL&)), m_project, TQT_SLOT(slotInsertFile(const KURL&))); connect(TemplatesTreeView::ref(), TQT_SIGNAL(downloadTemplate()), - m_quanta, TQT_SLOT(slotDownloadTemplate())); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQT_SLOT(slotUploadTemplate(const TQString&))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadTemplate())); + connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadTemplate(const TQString&))); // inform project if something was renamed connect(pTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), @@ -419,13 +419,13 @@ void QuantaInit::initProject() connect(m_project, TQT_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQT_SLOT(slotAddProjectDoc(const KURL&))); connect(m_project, TQT_SIGNAL(enableMessageWidget()), - m_quanta, TQT_SLOT(slotShowMessagesView())); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMessagesView())); connect(m_project, TQT_SIGNAL(messages(const TQString&)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&))); - connect(m_project, TQT_SIGNAL(newStatus()), - m_quanta, TQT_SLOT(slotNewStatus())); + connect(m_project, TQT_SIGNAL(newtqStatus()), + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewtqStatus())); connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); @@ -438,20 +438,20 @@ void QuantaInit::initProject() connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)), m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&))); - connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)), + connect(pTab, TQT_SIGNAL(changeUploadtqStatus(const KURL&, int)), m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int))); - connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), - m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); + connect(pTab, TQT_SIGNAL(changeDocumentFoldertqStatus(const KURL&, bool)), + m_project, TQT_SLOT(slotChangeDocumentFoldertqStatus(const KURL&, bool))); - connect(m_project, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); + connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); connect(m_project, TQT_SIGNAL(statusMsg(const TQString &)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); } void QuantaInit::initView() { - ViewManager *m_viewManager = ViewManager::ref(m_quanta); + ViewManager *m_viewManager = ViewManager::ref(TQT_TQOBJECT(m_quanta)); connect(m_quanta, TQT_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewActivated(KMdiChildView*))); connect(m_quanta, TQT_SIGNAL(lastChildViewClosed()), m_viewManager, TQT_SLOT(slotLastViewClosed())); // connect(m_quanta, TQT_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewDeactivated(KMdiChildView*))); @@ -472,7 +472,7 @@ void QuantaInit::initView() m_quanta->setStandardMDIMenuEnabled(false); m_quanta->setManagedDockPositionModeEnabled(true); - m_quanta->fTab = new FilesTreeView(m_config, m_quanta, "filestree"); + m_quanta->fTab = new FilesTreeView(m_config, m_quanta, "filestree"); m_quanta->aTab = new EnhancedTagAttributeTree(m_quanta, "TagAttributes"); pTab = ProjectTreeView::ref(m_quanta, "Project"); tTab = TemplatesTreeView::ref(m_quanta, "Templates"); // creates the treeview @@ -481,15 +481,15 @@ void QuantaInit::initView() m_quanta->scriptTab = new ScriptTreeView(m_quanta, "Scripts"); m_quanta->m_messageOutput = new MessageOutput(m_quanta, "Messages"); - m_quanta->m_messageOutput->setFocusPolicy(TQWidget::NoFocus); + m_quanta->m_messageOutput->setFocusPolicy(TQ_NoFocus); m_quanta->m_messageOutput->showMessage(i18n("Message Window...")); connect(m_quanta, TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); connect(m_quanta, TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); m_quanta->m_problemOutput = new MessageOutput(m_quanta, "Problems"); - m_quanta->m_problemOutput->setFocusPolicy(TQWidget::NoFocus); + m_quanta->m_problemOutput->setFocusPolicy(TQ_NoFocus); m_quanta->m_annotationOutput = new AnnotationOutput(m_quanta, "Annotations"); - m_quanta->m_annotationOutput->setFocusPolicy(TQWidget::NoFocus); + m_quanta->m_annotationOutput->setFocusPolicy(TQ_NoFocus); m_quanta->createPreviewPart(); m_quanta->createDocPart(); @@ -498,7 +498,7 @@ void QuantaInit::initView() m_quanta->fTab, TQT_SLOT(slotReloadAllTrees())); connect(pTab, TQT_SIGNAL(loadToolbarFile (const KURL&)), - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&))); connect(m_viewManager, TQT_SIGNAL(viewActivated(const KURL&)), pTab, TQT_SLOT(slotViewActivated(const KURL&))); @@ -512,39 +512,39 @@ void QuantaInit::initView() m_quanta->fTab, TQT_SLOT(slotDocumentClosed(const KURL&))); connect(tTab, TQT_SIGNAL(insertFile (const KURL &)), - m_quanta, TQT_SLOT(slotInsertFile(const KURL &))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertFile(const KURL &))); connect(m_quanta->scriptTab, TQT_SIGNAL(openFileInPreview(const KURL &)), - m_quanta, TQT_SLOT(slotOpenFileInPreview(const KURL &))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileInPreview(const KURL &))); connect(m_quanta->scriptTab, TQT_SIGNAL(showPreviewWidget(bool)), - m_quanta, TQT_SLOT(slotShowPreviewWidget(bool))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowPreviewWidget(bool))); connect(m_quanta->scriptTab, TQT_SIGNAL(assignActionToScript(const KURL &, const TQString&)), - m_quanta, TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); - connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), m_quanta, TQT_SLOT(slotDownloadScript())); - connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), m_quanta, TQT_SLOT(slotUploadScript(const TQString&))); - connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), m_quanta, TQT_SLOT(slotDownloadDoc())); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); + connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadScript())); + connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadScript(const TQString&))); + connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadDoc())); connect(m_quanta->m_htmlPart, TQT_SIGNAL(onURL(const TQString&)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString&))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&))); connect(m_quanta->m_htmlPartDoc, TQT_SIGNAL(onURL(const TQString&)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString&))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&))); - connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), m_quanta, TQT_SLOT(setCursorPosition(int,int))); - connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQT_SLOT( selectArea(int,int,int,int))); - connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), m_quanta, TQT_SLOT(slotSelectTagArea(Node*))); - connect(sTab, TQT_SIGNAL(needReparse()), m_quanta, TQT_SLOT(slotForceReparse())); - connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); + connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(setCursorPosition(int,int))); + connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT( selectArea(int,int,int,int))); + connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSelectTagArea(Node*))); + connect(sTab, TQT_SIGNAL(needReparse()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotForceReparse())); + connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); connect(sTab, TQT_SIGNAL(openFile(const KURL &)), - m_quanta, TQT_SLOT (slotFileOpen(const KURL &))); + TQT_TQOBJECT(m_quanta), TQT_SLOT (slotFileOpen(const KURL &))); connect(sTab, TQT_SIGNAL(openImage (const KURL&)), - m_quanta, TQT_SLOT(slotImageOpen(const KURL&))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotImageOpen(const KURL&))); connect(sTab, TQT_SIGNAL(showProblemMessage(const TQString&)), m_quanta->m_problemOutput, TQT_SLOT(showMessage(const TQString&))); connect(sTab, TQT_SIGNAL(clearProblemOutput()), m_quanta->m_problemOutput, TQT_SLOT(clear())); connect(parser, TQT_SIGNAL(nodeTreeChanged()), sTab, TQT_SLOT(slotNodeTreeChanged())); - connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), m_quanta, TQT_SLOT(openDoc(const TQString&))); + connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(openDoc(const TQString&))); connect(m_viewManager, TQT_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQT_SLOT(slotDragInsert(TQDropEvent *))); @@ -679,7 +679,7 @@ void QuantaInit::openLastFiles() if (w) //w==0 might happen on quick close on startup { m_quanta->setTitle(w->url().prettyURL(0, KURL::StripFileProtocol) ); -// m_quanta->slotUpdateStatus(w);//FIXME: +// m_quanta->slotUpdatetqStatus(w);//FIXME: } } @@ -706,75 +706,75 @@ void QuantaInit::loadInitialProject(const TQString& url) void QuantaInit::initActions() { KActionCollection *ac = m_quanta->actionCollection(); - new KAction(i18n("Annotate..."), 0, m_quanta, TQT_SLOT(slotAnnotate()),ac, "annotate"); + new KAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate"); m_quanta->editTagAction = new KAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E, - m_quanta, TQT_SLOT( slotEditCurrentTag() ), - ac, "edit_current_tag" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditCurrentTag() ), + TQT_TQOBJECT(ac), "edit_current_tag" ); m_quanta->selectTagAreaAction = new KAction( i18n( "&Select Current Tag Area" ), 0, - m_quanta, TQT_SLOT( slotSelectTagArea() ), - ac, "select_tag_area" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotSelectTagArea() ), + TQT_TQOBJECT(ac), "select_tag_area" ); new KAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J, - m_quanta, TQT_SLOT( slotExpandAbbreviation() ), - ac, "expand_abbreviation" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotExpandAbbreviation() ), + TQT_TQOBJECT(ac), "expand_abbreviation" ); - new KAction(i18n("&Report Bug..."), 0, m_quanta, TQT_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta + new KAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta //Kate actions //Edit menu - KStdAction::undo(m_quanta, TQT_SLOT(slotUndo()), ac); - KStdAction::redo(m_quanta, TQT_SLOT(slotRedo()), ac); - KStdAction::cut(m_quanta, TQT_SLOT(slotCut()), ac); - KStdAction::copy(m_quanta, TQT_SLOT(slotCopy()), ac) ; - KStdAction::pasteText(m_quanta, TQT_SLOT(slotPaste()), ac); + KStdAction::undo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUndo()), ac); + KStdAction::redo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRedo()), ac); + KStdAction::cut(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCut()), ac); + KStdAction::copy(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCopy()), ac) ; + KStdAction::pasteText(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPaste()), ac); //help - (void) new KAction(i18n("Ti&p of the Day"), "idea", "", m_quanta, - TQT_SLOT(slotHelpTip()), ac, "help_tip"); + (void) new KAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta), + TQT_SLOT(slotHelpTip()), TQT_TQOBJECT(ac), "help_tip"); // File actions // - KStdAction::openNew( m_quanta, TQT_SLOT( slotFileNew() ), ac); - KStdAction::open ( m_quanta, TQT_SLOT( slotFileOpen() ), ac, "file_open"); - (void) new KAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs"); + KStdAction::openNew( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileNew() ), ac); + KStdAction::open ( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileOpen() ), ac, "file_open"); + (void) new KAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs"); - m_quanta->fileRecent = KStdAction::openRecent(m_quanta, TQT_SLOT(slotFileOpenRecent(const KURL&)), + m_quanta->fileRecent = KStdAction::openRecent(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpenRecent(const KURL&)), ac, "file_open_recent"); m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent")); - connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), m_quanta, TQT_SLOT(slotFileOpen())); + connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen())); - (void) new KAction( i18n( "Close All" ), 0, m_quanta, + (void) new KAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileCloseAll() ), - ac, "file_close_all" ); + TQT_TQOBJECT(ac), "file_close_all" ); - m_quanta->saveAction = KStdAction::save(m_quanta, TQT_SLOT( slotFileSave() ), ac); + m_quanta->saveAction = KStdAction::save(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSave() ), ac); - KStdAction::saveAs( m_quanta, TQT_SLOT( slotFileSaveAs() ), ac ); + KStdAction::saveAs( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAs() ), ac ); m_quanta->saveAllAction = new KAction( i18n( "Save All..." ), "save_all", SHIFT+KStdAccel::shortcut(KStdAccel::Save).keyCodeQt(), - m_quanta, TQT_SLOT( slotFileSaveAll() ), - ac, "file_save_all" ); - (void) new KAction(i18n("Reloa&d"), "revert", SHIFT+Key_F5, m_quanta, - TQT_SLOT(slotFileReload()), ac, "file_reload"); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAll() ), + TQT_TQOBJECT(ac), "file_save_all" ); + (void) new KAction(i18n("Reloa&d"), "revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta), + TQT_SLOT(slotFileReload()), TQT_TQOBJECT(ac), "file_reload"); // (void) new KAction(i18n("Reload All "), 0, 0, m_quanta, -// TQT_SLOT(slotFileReloadAll()), ac, "file_reload_all"); +// TQT_SLOT(slotFileReloadAll()), TQT_TQOBJECT(ac), "file_reload_all"); (void) new KAction( i18n( "Save as Local Template..." ), 0, - m_quanta, TQT_SLOT( slotFileSaveAsLocalTemplate() ), - ac, "save_local_template" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAsLocalTemplate() ), + TQT_TQOBJECT(ac), "save_local_template" ); (void) new KAction( i18n( "Save Selection to Local Template File..." ), 0, - m_quanta, TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ), - ac, "save_selection_local_template" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ), + TQT_TQOBJECT(ac), "save_selection_local_template" ); - KStdAction::quit( m_quanta, TQT_SLOT( slotFileQuit() ), ac ); + KStdAction::quit( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileQuit() ), ac ); // Edit actions (void) new KAction( i18n( "Find in Files..." ), - SmallIcon("filefind"), CTRL+ALT+Key_F, - m_quanta, TQT_SLOT( slotEditFindInFiles() ), - ac, "find_in_files" ); + SmallIcon("filetqfind"), CTRL+ALT+Key_F, + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditFindInFiles() ), + TQT_TQOBJECT(ac), "find_in_files" ); KAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation"); aux->setEnabled(false); @@ -783,90 +783,90 @@ void QuantaInit::initActions() // Tool actions (void) new KAction( i18n( "&Context Help..." ), CTRL+Key_H, - m_quanta, TQT_SLOT( slotContextHelp() ), - ac, "context_help" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotContextHelp() ), + TQT_TQOBJECT(ac), "context_help" ); (void) new KAction( i18n( "&Quanta Homepage" ), 0, - m_quanta, TQT_SLOT( slotHelpHomepage() ), - ac, "help_homepage" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotHelpHomepage() ), + TQT_TQOBJECT(ac), "help_homepage" ); (void) new KAction( i18n( "&User Mailing List" ), 0, - m_quanta, TQT_SLOT( slotHelpUserList() ), - ac, "help_userlist" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotHelpUserList() ), + TQT_TQOBJECT(ac), "help_userlist" ); (void) new KAction( i18n( "Make &Donation" ), 0, - m_quanta, TQT_SLOT( slotMakeDonation() ), - ac, "help_donation" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotMakeDonation() ), + TQT_TQOBJECT(ac), "help_donation" ); (void) new KAction( i18n( "Tag &Attributes..." ), ALT+Key_Down, m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ), - ac, "tag_attributes" ); + TQT_TQOBJECT(ac), "tag_attributes" ); (void) new KAction( i18n( "&Change the DTD..." ), 0, - m_quanta, TQT_SLOT( slotChangeDTD() ), - ac, "change_dtd" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotChangeDTD() ), + TQT_TQOBJECT(ac), "change_dtd" ); (void) new KAction( i18n( "&Edit DTD Settings..." ), 0, - m_quanta, TQT_SLOT( slotEditDTD() ), - ac, "edit_dtd" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditDTD() ), + TQT_TQOBJECT(ac), "edit_dtd" ); (void) new KAction( i18n( "&Load && Convert DTD..." ), 0, DTDs::ref(), TQT_SLOT( slotLoadDTD() ), - ac, "load_dtd" ); + TQT_TQOBJECT(ac), "load_dtd" ); (void) new KAction( i18n( "Load DTD E&ntities..." ), 0, DTDs::ref(), TQT_SLOT( slotLoadEntities() ), - ac, "load_entities" ); + TQT_TQOBJECT(ac), "load_entities" ); (void) new KAction( i18n( "Load DTD &Package (DTEP)..." ), 0, - m_quanta, TQT_SLOT( slotLoadDTEP() ), - ac, "load_dtep" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotLoadDTEP() ), + TQT_TQOBJECT(ac), "load_dtep" ); (void) new KAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail_send", 0, - m_quanta, TQT_SLOT( slotEmailDTEP() ), - ac, "send_dtep" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEmailDTEP() ), + TQT_TQOBJECT(ac), "send_dtep" ); (void) new KAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0, - m_quanta, TQT_SLOT( slotDownloadDTEP() ), - ac, "download_dtep" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDownloadDTEP() ), + TQT_TQOBJECT(ac), "download_dtep" ); (void) new KAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0, - m_quanta, TQT_SLOT( slotUploadDTEP() ), - ac, "upload_dtep" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ), + TQT_TQOBJECT(ac), "upload_dtep" ); /* (void) new KAction( i18n( "&Upload DTD Package (DTEP)..." ), 0, - m_quanta, TQT_SLOT( slotUploadDTEP() ), - ac, "send_dtep" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ), + TQT_TQOBJECT(ac), "send_dtep" ); */ (void) new KAction( i18n( "&Document Properties" ), 0, - m_quanta, TQT_SLOT( slotDocumentProperties() ), - ac, "tools_document_properties" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDocumentProperties() ), + TQT_TQOBJECT(ac), "tools_document_properties" ); (void) new KAction ( i18n ("F&ormat XML Code"), 0, - m_quanta, TQT_SLOT( slotCodeFormatting() ), - ac, "tools_code_formatting"); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotCodeFormatting() ), + TQT_TQOBJECT(ac), "tools_code_formatting"); (void) new KAction( i18n( "&Convert Tag && Attribute Case..."), 0, - m_quanta, TQT_SLOT(slotConvertCase()), - ac, "tools_change_case"); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotConvertCase()), + TQT_TQOBJECT(ac), "tools_change_case"); // View actions m_quanta->showSourceAction = new KToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9, - m_quanta, TQT_SLOT( slotShowSourceEditor()), - ac, "show_quanta_editor"); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowSourceEditor()), + TQT_TQOBJECT(ac), "show_quanta_editor"); m_quanta->showSourceAction->setExclusiveGroup("view"); m_quanta->showVPLAction = new KToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9, - m_quanta, TQT_SLOT( slotShowVPLOnly() ), - ac, "show_kafka_view"); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLOnly() ), + TQT_TQOBJECT(ac), "show_kafka_view"); m_quanta->showVPLAction->setExclusiveGroup("view"); m_quanta->showVPLSourceAction = new KToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9, - m_quanta, TQT_SLOT( slotShowVPLAndSourceEditor() ), - ac, "show_kafka_and_quanta"); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLAndSourceEditor() ), + TQT_TQOBJECT(ac), "show_kafka_and_quanta"); m_quanta->showVPLSourceAction->setExclusiveGroup("view"); /**kafkaSelectAction = new KSelectAction(i18n("Main &View"), 0, ac,"show_kafka"); TQStringList list2; @@ -874,73 +874,73 @@ void QuantaInit::initActions() list2.append(i18n("&VPL Editor (experimental)")); list2.append(i18n("&Both Editors")); kafkaSelectAction->setItems(list2); - connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), m_quanta, TQT_SLOT(slotShowKafkaPartl(int)));*/ + connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowKafkaPartl(int)));*/ (void) new KAction( i18n( "&Reload Preview" ), "reload", KStdAccel::shortcut(KStdAccel::Reload).keyCodeQt(), - m_quanta, TQT_SLOT(slotRepaintPreview()), - ac, "reload" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRepaintPreview()), + TQT_TQOBJECT(ac), "reload" ); (void) new KAction( i18n( "&Previous File" ), "1leftarrow", KStdAccel::back(), - m_quanta, TQT_SLOT( slotBack() ), - ac, "previous_file" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), + TQT_TQOBJECT(ac), "previous_file" ); (void) new KAction( i18n( "&Next File" ), "1rightarrow", KStdAccel::forward(), - m_quanta, TQT_SLOT( slotForward() ), - ac, "next_file" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), + TQT_TQOBJECT(ac), "next_file" ); // Options actions // (void) new KAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0, - m_quanta, TQT_SLOT( slotOptionsConfigureActions() ), - ac, "configure_actions" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureActions() ), + TQT_TQOBJECT(ac), "configure_actions" ); - KStdAction::showMenubar(m_quanta, TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); - KStdAction::keyBindings(m_quanta, TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); - KStdAction::configureToolbars( m_quanta, TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); - KStdAction::preferences(m_quanta, TQT_SLOT( slotOptions() ), ac, "general_options"); - new KAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQT_SLOT(slotPreviewOptions()), ac, "preview_options"); + KStdAction::showMenubar(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); + KStdAction::keyBindings(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); + KStdAction::configureToolbars(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); + KStdAction::preferences(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptions() ), ac, "general_options"); + new KAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options"); // Toolbars actions m_quanta->projectToolbarFiles = new KRecentFilesAction(i18n("Load &Project Toolbar"),0, - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&)), - ac, "toolbars_load_project"); - - new KAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global"); - new KAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadToolbar()), ac, "toolbars_load_user"); - new KAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local"); - new KAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project"); - new KAction(i18n("&New User Toolbar..."), 0, m_quanta, TQT_SLOT(slotAddToolbar()), ac, "toolbars_add"); - new KAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRemoveToolbar()), ac, "toolbars_remove"); - new KAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRenameToolbar()), ac, "toolbars_rename"); - new KAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, m_quanta, TQT_SLOT(slotSendToolbar()), ac, "toolbars_send"); - new KAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotUploadToolbar()), ac, "toolbars_upload" ); - new KAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotDownloadToolbar()), ac, "toolbars_download" ); - - KToggleAction *toggle = new KToggleAction( i18n("Smart Tag Insertion"), 0, ac, "smart_tag_insertion"); - connect(toggle, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotSmartTagInsertion())); - - m_quanta->showDTDToolbar=new KToggleAction(i18n("Show DTD Toolbar"), 0, ac, "view_dtd_toolbar"); - - connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotToggleDTDToolbar(bool))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)), + TQT_TQOBJECT(ac), "toolbars_load_project"); + + new KAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global"); + new KAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user"); + new KAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local"); + new KAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project"); + new KAction(i18n("&New User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add"); + new KAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove"); + new KAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename"); + new KAction(i18n("Send Toolbar in E&mail..."), "mail_send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send"); + new KAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" ); + new KAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" ); + + KToggleAction *toggle = new KToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion"); + connect(toggle, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSmartTagInsertion())); + + m_quanta->showDTDToolbar=new KToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar"); + + connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotToggleDTDToolbar(bool))); m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar")); new KAction(i18n("Complete Text"), CTRL+Key_Space, - m_quanta, TQT_SLOT(slotShowCompletion()), ac,"show_completion"); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletion()), ac,"show_completion"); new KAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space, - m_quanta, TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); - KStdAction::back(m_quanta, TQT_SLOT( slotBack() ), ac, "w_back"); - KStdAction::forward(m_quanta, TQT_SLOT( slotForward() ), ac, "w_forward"); + KStdAction::back(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), ac, "w_back"); + KStdAction::forward(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), ac, "w_forward"); - new KAction(i18n("Open File: none"), 0, m_quanta, TQT_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor"); - new KAction(i18n("Upload..."), 0, m_quanta, TQT_SLOT(slotUploadFile()), ac, "upload_file"); - new KAction(i18n("Delete File"), 0, m_quanta, TQT_SLOT(slotDeleteFile()), ac, "delete_file"); + new KAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor"); + new KAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file"); + new KAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file"); TQString ss = i18n("Upload Opened Project Files..."); -/* new KAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQT_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */ +/* new KAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */ TQString error; int el, ec; @@ -963,7 +963,7 @@ void QuantaInit::initActions() n = n.nextSibling(); } } else - kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl; + kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl; f.close(); } m_quanta->m_actions->clear(); @@ -990,7 +990,7 @@ void QuantaInit::initActions() n = n.nextSibling(); } } else - kdError(24000) << TQString("Error %1 at (%2, %3) in %4").arg(error).arg(el).arg(ec).arg(f.name()) << endl; + kdError(24000) << TQString("Error %1 at (%2, %3) in %4").tqarg(error).tqarg(el).tqarg(ec).tqarg(f.name()) << endl; f.close(); } } else @@ -1001,17 +1001,17 @@ void QuantaInit::initActions() // create the preview action m_quanta->showPreviewAction = new KToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6, - m_quanta, TQT_SLOT( slotToggleShowPreview() ), - ac, "show_preview" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotToggleShowPreview() ), + TQT_TQOBJECT(ac), "show_preview" ); KAction *act = new KAction( i18n( "Preview Without Frames" ), "", 0, - m_quanta, TQT_SLOT(slotShowNoFramesPreview()), - ac, "show_preview_no_frames" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowNoFramesPreview()), + TQT_TQOBJECT(ac), "show_preview_no_frames" ); act->plug(m_quanta->showPreviewAction->popupMenu()); act = new KAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12, - m_quanta, TQT_SLOT( slotViewInKFM() ), - ac, "view_with_konqueror" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInKFM() ), + TQT_TQOBJECT(ac), "view_with_konqueror" ); act->plug(m_quanta->showPreviewAction->popupMenu()); @@ -1032,62 +1032,62 @@ void QuantaInit::initActions() act->plug(m_quanta->showPreviewAction->popupMenu()); act = new KAction( i18n( "View with L&ynx" ), "terminal", 0, - m_quanta, TQT_SLOT( slotViewInLynx() ), - ac, "view_with_lynx" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInLynx() ), + TQT_TQOBJECT(ac), "view_with_lynx" ); act->plug(m_quanta->showPreviewAction->popupMenu()); (void) new KAction( i18n( "Table Editor..." ), "quick_table", 0, - m_quanta, TQT_SLOT( slotTagEditTable() ), - ac, "tag_edit_table" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagEditTable() ), + TQT_TQOBJECT(ac), "tag_edit_table" ); (void) new KAction( i18n( "Quick List..." ), "quick_list", 0, - m_quanta, TQT_SLOT( slotTagQuickList() ), - ac, "tag_quick_list" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagQuickList() ), + TQT_TQOBJECT(ac), "tag_quick_list" ); (void) new KAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C, - m_quanta, TQT_SLOT( slotTagColor() ), - ac, "tag_color" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagColor() ), + TQT_TQOBJECT(ac), "tag_color" ); (void) new KAction( i18n( "Email..." ), "tag_mail", 0, - m_quanta, TQT_SLOT( slotTagMail() ), - ac, "tag_mail" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMail() ), + TQT_TQOBJECT(ac), "tag_mail" ); (void) new KAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T, - m_quanta, TQT_SLOT( slotTagMisc() ), - ac, "tag_misc" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMisc() ), + TQT_TQOBJECT(ac), "tag_misc" ); (void) new KAction( i18n( "Frame Wizard..." ), "frame", 0, - m_quanta, TQT_SLOT( slotFrameWizard() ), - ac, "tag_frame_wizard" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ), + TQT_TQOBJECT(ac), "tag_frame_wizard" ); (void) new KAction( i18n( "Paste &HTML Quoted" ), "editpaste", 0, - m_quanta, TQT_SLOT( slotPasteHTMLQuoted() ), - ac, "edit_paste_html_quoted" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ), + TQT_TQOBJECT(ac), "edit_paste_html_quoted" ); (void) new KAction( i18n( "Paste &URL Encoded" ), "editpaste", 0, - m_quanta, TQT_SLOT( slotPasteURLEncoded() ), - ac, "edit_paste_url_encoded" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ), + TQT_TQOBJECT(ac), "edit_paste_url_encoded" ); (void) new KAction( i18n( "Insert CSS..." ),"css", 0, - m_quanta, TQT_SLOT( slotInsertCSS() ), - ac, "insert_css" ); + TQT_TQOBJECT(m_quanta), TQT_SLOT( slotInsertCSS() ), + TQT_TQOBJECT(ac), "insert_css" ); // special-character combo KAction* char_action = new KAction( i18n( "Insert Special Character" ), "charset", 0, - ac, "insert_char" ); + TQT_TQOBJECT(ac), "insert_char" ); connect( char_action, TQT_SIGNAL(activated()), - m_quanta, TQT_SLOT(slotInsertChar()) ); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertChar()) ); - connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(m_quanta)); + QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(TQT_TQOBJECT(m_quanta))); m_bookmarks->createActions(ac); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); } /** Initialize the plugin architecture. */ @@ -1098,9 +1098,9 @@ void QuantaInit::initPlugins() m_quanta->m_pluginInterface = QuantaPluginInterface::ref(m_quanta); connect(m_quanta->m_pluginInterface, TQT_SIGNAL(hideSplash()), - m_quanta, TQT_SLOT(slotHideSplash())); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); connect(m_quanta->m_pluginInterface, TQT_SIGNAL(statusMsg(const TQString &)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); m_quanta->m_pluginInterface->readConfig(); if (!m_quanta->m_pluginInterface->pluginAvailable("KFileReplace")) @@ -1140,7 +1140,7 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) { // when quanta crashes and file autoreloading option is on // then if user restarts quanta, the backup copies will reload - TQString backedUpFileName = (*backedUpUrlsIt).left((*backedUpUrlsIt).findRev(".")); //the filename without the PID + TQString backedUpFileName = (*backedUpUrlsIt).left((*backedUpUrlsIt).tqfindRev(".")); //the filename without the PID bool notFound; TQString autosavedPath = searchPathListEntry(backedUpFileName, autosavedUrlsList, notFound); if (!autosavedPath.isEmpty()) //the current item was autosaved and is not in use by another Quanta @@ -1180,9 +1180,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) "Backup file size: <b>%4</b><br>" "Backup created on: <b>%5</b><br><br>" "</qt>") - .arg(originalVersion.prettyURL(0, KURL::StripFileProtocol )) - .arg(KIO::convertSize(origSize)).arg(origTime) - .arg(KIO::convertSize(backupSize)).arg(backupTime)); + .tqarg(originalVersion.prettyURL(0, KURL::StripFileProtocol )) + .tqarg(KIO::convertSize(origSize)).tqarg(origTime) + .tqarg(KIO::convertSize(backupSize)).tqarg(backupTime)); w->buttonLoad->setText(i18n("&Restore the file from backup")); w->buttonIgnore->setText(i18n("Do ¬ restore the file from backup")); delete w->warningLabel; @@ -1199,9 +1199,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) //backup the current version and restore it from the autosaved backup KURL backupURL = originalVersion; backupURL.setPath(backupURL.path() + "." + TQString::number(getpid(),10) + ".backup"); - QExtFileInfo::copy(originalVersion, backupURL, -1, true, false, m_quanta); - QExtFileInfo::copy(autosavedVersion, originalVersion, -1, true, false, m_quanta); - //we save a list of autosaved file names so "KQApplicationPrivate::init()" + TQExtFileInfo::copy(originalVersion, backupURL, -1, true, false, m_quanta); + TQExtFileInfo::copy(autosavedVersion, originalVersion, -1, true, false, m_quanta); + //we save a list of autosaved file names so "KTQApplicationPrivate::init()" //can open them. If autosavedVersion.path().right(1) == "U" then we are recovering //an untitled document if(isUntitledDocument) @@ -1285,11 +1285,11 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) *(execCommand) << TQStringList::split(" ",cmd); connect(execCommand, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), - m_quanta, TQT_SLOT(slotGetScriptOutput(KProcess*,char*,int))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(KProcess*,char*,int))); connect(execCommand, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), - m_quanta, TQT_SLOT(slotGetScriptError(KProcess*,char*,int))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(KProcess*,char*,int))); connect(execCommand, TQT_SIGNAL(processExited(KProcess*)), - m_quanta, TQT_SLOT(slotProcessExited(KProcess*))); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(KProcess*))); if (!execCommand->start(KProcess::NotifyOnExit,KProcess::All)) { @@ -1300,9 +1300,9 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) //To avoid lock-ups, start a timer. TQTimer *timer = new TQTimer(m_quanta); connect(timer, TQT_SIGNAL(timeout()), - m_quanta, TQT_SLOT(slotProcessTimeout())); + TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessTimeout())); timer->start(180*1000, true); - QExtFileInfo internalFileInfo; + TQExtFileInfo internalFileInfo; m_quanta->m_loopStarted = true; internalFileInfo.enter_loop(); delete timer; @@ -1341,14 +1341,14 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) } } - return TQString::null; + return TQString(); } /** Retrieves hashed path from the name of a backup file */ TQString QuantaInit::retrieveHashedPath(const TQString& filename) { - int lastPoint = filename.findRev("."); - int Ppos = filename.find("P", lastPoint); + int lastPoint = filename.tqfindRev("."); + int Ppos = filename.tqfind("P", lastPoint); return filename.mid(lastPoint + 1, Ppos - lastPoint); } @@ -1357,11 +1357,11 @@ TQString QuantaInit::retrieveHashedPath(const TQString& filename) /** Retrieves PID from the name of a backup file */ TQString QuantaInit::retrievePID(const TQString& filename) { - TQString strPID = TQString::null; - strPID = filename.mid(filename.findRev("P") + 1); + TQString strPID = TQString(); + strPID = filename.mid(filename.tqfindRev("P") + 1); if (strPID.isEmpty()) - strPID = filename.mid(filename.findRev("N") + 1); + strPID = filename.mid(filename.tqfindRev("N") + 1); if (strPID.endsWith("U")) strPID = strPID.left(strPID.length() - 1); @@ -1460,7 +1460,7 @@ void QuantaInit::checkRuntimeDependencies() dependencies.append(dependency); - dependency.name = "KLinkStatus"; + dependency.name = "KLinktqStatus"; dependency.execName = "Link Checker"; dependency.url = "http://kde-apps.org/content/show.php?content=12318"; dependency.description = i18n("link validity checking"); @@ -1482,13 +1482,13 @@ void QuantaInit::checkRuntimeDependencies() if (dependency.type == Dependency::Executable) { if (KStandardDirs::findExe(dependency.execName).isNull()) - errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description); + errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description); } else if (dependency.type == Dependency::Plugin) { if (!QuantaPlugin::validatePlugin(m_quanta->m_pluginInterface->plugin(dependency.execName))) - errorStr += TQString(stdErrorMsg).arg(dependency.name).arg(dependency.url).arg(dependency.description); + errorStr += TQString(stdErrorMsg).tqarg(dependency.name).tqarg(dependency.url).tqarg(dependency.description); } } @@ -1500,14 +1500,14 @@ void QuantaInit::checkRuntimeDependencies() &appId); if (appId.isEmpty()) { - errorStr += TQString(stdErrorMsg).arg("Cervisia (cvsservice)").arg("http://www.kde.org/apps/cervisia").arg(i18n("integrated CVS management")); + errorStr += TQString(stdErrorMsg).tqarg("Cervisia (cvsservice)").tqarg("http://www.kde.org/apps/cervisia").tqarg(i18n("integrated CVS management")); } else { CVSService::ref(m_quanta->actionCollection())->setAppId(appId); connect(CVSService::ref(), TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); connect(CVSService::ref(), TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); - //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)), m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); + //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); m_quanta->fTab->plugCVSMenu(); pTab->plugCVSMenu(); } @@ -1569,7 +1569,7 @@ void QuantaInit::readAbbreviations() TQStringList::Iterator it; for (it = filenameList.begin(); it != filenameList.end(); ++it) { - int pos =(*it).find('|'); + int pos =(*it).tqfind('|'); TQString dirName = (*it).mid(pos + 1); TQString dtepName = (*it).left(pos); KURL dirURL(dirName); @@ -1622,7 +1622,7 @@ int QuantaInit::runningQuantas() int i = 0; for (QCStringList::iterator it = list.begin(); it != list.end(); ++it) { - if (TQString(*it).startsWith("quanta", false)) + if (TQString(*it).tqstartsWith("quanta", false)) ++i; } return i; diff --git a/quanta/src/quanta_init.h b/quanta/src/quanta_init.h index 0b1f6ae9..17bbb09a 100644 --- a/quanta/src/quanta_init.h +++ b/quanta/src/quanta_init.h @@ -19,7 +19,7 @@ #define QUANTAINIT_H -// include files for Qt +// include files for TQt #include <tqobject.h> // include files for KDE @@ -39,9 +39,10 @@ class KConfig; /** * The base class for Quanta application windows. */ -class QuantaInit : public QObject +class QuantaInit : public TQObject { Q_OBJECT + TQ_OBJECT public: QuantaInit(QuantaApp * quantaApp); diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 31fb795b..51729fb6 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// include files for Qt +// include files for TQt #include <tqdir.h> #include <tqfileinfo.h> #include <tqwidget.h> @@ -76,7 +76,7 @@ #include "tagactionmanager.h" #include "tagactionset.h" -QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name) +QuantaDoc::QuantaDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) { fileWatcher = new KDirWatch(this); @@ -132,7 +132,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting ) else // select opened if (switchToExisting) { - view->document()->checkDirtyStatus(); + view->document()->checkDirtytqStatus(); if (view != ViewManager::ref()->activeView()) { view->activate(); @@ -147,7 +147,7 @@ bool QuantaDoc::newDocument( const KURL& url, bool switchToExisting ) void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, bool switchToExisting, bool readOnly) { - bool idleTimerStatus = quantaApp->slotEnableIdleTimer(false); + bool idleTimertqStatus = quantaApp->slotEnableIdleTimer(false); KURL url = urlToOpen; if (url.isLocalFile()) { @@ -158,7 +158,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, TQString encoding = a_encoding; if (!newDocument(url, switchToExisting)) { - quantaApp->slotEnableIdleTimer(idleTimerStatus); + quantaApp->slotEnableIdleTimer(idleTimertqStatus); return; } Document *w = ViewManager::ref()->activeDocument(); @@ -171,7 +171,7 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, } if (!url.isEmpty()) { - if (QExtFileInfo::exists(url, true, quantaApp)) + if (TQExtFileInfo::exists(url, true, quantaApp)) { if (encoding.isEmpty()) encoding = quantaApp->defaultEncoding(); @@ -211,23 +211,23 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, highlightIf->setHlMode(htmlIdx); } } - emit newStatus(); + emit newtqStatus(); } - quantaApp->slotEnableIdleTimer(idleTimerStatus); + quantaApp->slotEnableIdleTimer(idleTimertqStatus); } void QuantaDoc::slotOpeningFailed(const KURL &url) { Q_UNUSED(url); - bool signalStatus = signalsBlocked(); + bool signaltqStatus = signalsBlocked(); blockSignals(false); emit hideSplash(); //Seems to be not needed anymore since KDE 3.2, but keep until it's completely verified /* - KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(quantaApp, i18n("<qt>Cannot open document <b>%1</b>.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); */ ViewManager::ref()->removeActiveView(); - blockSignals(signalStatus); + blockSignals(signaltqStatus); } void QuantaDoc::slotOpeningCompleted(const KURL &url) @@ -240,10 +240,10 @@ void QuantaDoc::slotOpeningCompleted(const KURL &url) quantaApp->reparse(true); if (url.isLocalFile()) quantaApp->debugger()->fileOpened(url.prettyURL(0, KURL::StripFileProtocol)); - quantaApp->slotNewStatus(); + quantaApp->slotNewtqStatus(); quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol)); Project::ref()->loadCursorPosition(w->url(), dynamic_cast<KTextEditor::ViewCursorInterface*>(w->view())); - emit eventHappened("after_open", url.url(), TQString::null); + emit eventHappened("after_open", url.url(), TQString()); bool flag = TagActionManager::canIndentDTD(w->defaultDTD()->name); quantaApp->actionCollection()->action("apply_source_indentation")->setEnabled(flag); @@ -272,7 +272,7 @@ void QuantaDoc::slotAttribPopup() if ( QuantaCommon::isKnownTag(w->getDTDIdentifier(),tagName) ) { - TQString caption = i18n("Attributes of <%1>").arg(tagName); + TQString caption = i18n("Attributes of <%1>").tqarg(tagName); attribMenu->insertTitle( caption ); AttributeList *list = QuantaCommon::tagAttributes(w->getDTDIdentifier(),tagName ); @@ -281,23 +281,23 @@ void QuantaDoc::slotAttribPopup() { name = list->at(i)->name; attribMenu->insertItem( name , i);//list->findIndex(*item) ); - if (attrList.contains(name.ascii())) + if (attrList.tqcontains(name.ascii())) { attribMenu->setItemEnabled( i , false ); } menuId++; } - QTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName); + TQTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName); for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it) { TQPopupMenu* popUpMenu = new TQPopupMenu(attribMenu, (*it).latin1()); - AttributeList *attrs = qtag->parentDTD->commonAttrs->find(*it); + AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it); for (uint j = 0; j < attrs->count(); j++) { name = attrs->at(j)->name; popUpMenu->insertItem(name, ++menuId); - if (attrList.contains(name.ascii())) + if (attrList.tqcontains(name.ascii())) { popUpMenu->setItemEnabled( menuId , false ); } @@ -317,7 +317,7 @@ void QuantaDoc::slotAttribPopup() } } else { - TQString message = i18n("Unknown tag: %1").arg(tagName); + TQString message = i18n("Unknown tag: %1").tqarg(tagName); quantaApp->slotStatusMsg( message ); } } @@ -345,10 +345,10 @@ void QuantaDoc::slotInsertAttrib( int id ) attrStr = list->at(id)->name; } else { - QTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName); + TQTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName); for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it) { - AttributeList *attrs = qtag->parentDTD->commonAttrs->find(*it); + AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it); menuId += attrs->count(); if (id <= menuId) { diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h index 37891d69..48c3b631 100644 --- a/quanta/src/quantadoc.h +++ b/quanta/src/quantadoc.h @@ -25,17 +25,18 @@ class Document; class KConfig; class KURL; -class QuantaDoc : public QObject +class QuantaDoc : public TQObject { Q_OBJECT + TQ_OBJECT public: - QuantaDoc(TQWidget *parent, const char *name=0); + QuantaDoc(TQWidget *tqparent, const char *name=0); ~QuantaDoc(); bool newDocument(const KURL&, bool switchToExisting = true); - void openDocument(const KURL&, const TQString& a_encoding = TQString::null, bool switchToExisting = true, bool readOnly = false); + void openDocument(const KURL&, const TQString& a_encoding = TQString(), bool switchToExisting = true, bool readOnly = false); public slots: /** close documents. */ @@ -47,7 +48,7 @@ public slots: void slotOpeningFailed(const KURL &url); signals: - void newStatus(); + void newtqStatus(); void hideSplash(); void eventHappened(const TQString&, const TQString&, const TQString& ); diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 51f93294..e0c761e9 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// include files for Qt +// include files for TQt #include <tqprinter.h> #include <tqpainter.h> #include <tqtabbar.h> @@ -76,8 +76,8 @@ extern int NN; extern TQValueList<Node*> nodes; -QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &caption ) - : KMdiChildView(parent, name) +QuantaView::QuantaView(TQWidget *tqparent, const char *name, const TQString &caption ) + : KMdiChildView(tqparent, name) , m_document(0L) , m_plugin(0L) , m_customWidget(0L) @@ -95,7 +95,7 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti //get the reference to the user toolbar holding widget ToolbarTabWidget *m_toolbarTab = ToolbarTabWidget::ref(); m_toolbarTab->reparent(this, 0, TQPoint(), true); - m_toolbarTab ->setFocusPolicy( TQWidget::NoFocus ); + m_toolbarTab ->setFocusPolicy( TQ_NoFocus ); //create a splitter to separate the VPL and document area m_splitter = new TQSplitter(Qt::Vertical, this); @@ -159,7 +159,7 @@ bool QuantaView::mayRemove() KURL url = m_document->url(); Project::ref()->saveBookmarks(url, dynamic_cast<KTextEditor::MarkInterface*>(m_document->doc())); if (!unmodifiedUntitled) - emit eventHappened("before_close", url.url(), TQString::null); + emit eventHappened("before_close", url.url(), TQString()); m_currentViewsLayout = -1; // m_document->closeTempFile(); if (!m_document->isUntitled() && url.isLocalFile()) @@ -172,7 +172,7 @@ bool QuantaView::mayRemove() quantaApp->menuBar()->activateItemAt(-1); quantaApp->guiFactory()->removeClient(m_document->view()); if (!unmodifiedUntitled) - emit eventHappened("after_close", url.url(), TQString::null); + emit eventHappened("after_close", url.url(), TQString()); } /* kdDebug(24000) << "Calling reparse from close " << endl; parser->setSAParserEnabled(true); @@ -208,7 +208,7 @@ void QuantaView::addDocument(Document *document) reloadUpdateTimers(); - m_currentViewsLayout = -1; //force loading of this layout + m_currentViewsLayout = -1; //force loading of this tqlayout slotSetSourceLayout(); } @@ -263,7 +263,7 @@ void QuantaView::addCustomWidget(TQWidget *widget, const TQString &label) void QuantaView::reloadLayout() { int currentViewsLayout = m_currentViewsLayout; - m_currentViewsLayout = -1; //force loading of this layout + m_currentViewsLayout = -1; //force loading of this tqlayout switch (currentViewsLayout) { case SourceOnly: @@ -290,7 +290,7 @@ void QuantaView::updateTab() TQIconSet mimeIcon (KMimeType::pixmapForURL(m_document->url(), 0, KIcon::Small)); if (mimeIcon.isNull()) mimeIcon = TQIconSet(SmallIcon("document")); - TQString urlStr = QExtFileInfo::shortName(m_document->url().path()); + TQString urlStr = TQExtFileInfo::shortName(m_document->url().path()); if (m_document->isModified()) { if (qConfig.showCloseButtons == "ShowAlways") @@ -393,9 +393,9 @@ void QuantaView::slotSetSourceAndVPLLayout() KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_and_quanta" ); - if (m_document->defaultDTD()->name.contains("HTML", false) == 0) + if (m_document->defaultDTD()->name.tqcontains("HTML", false) == 0) { - KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName)); + KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName)); KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta2) ta2->setChecked(true); @@ -442,9 +442,9 @@ void QuantaView::slotSetVPLOnlyLayout() KToggleAction *ta = (KToggleAction *) quantaApp->actionCollection()->action( "show_kafka_view" ); - if (m_document->defaultDTD()->name.contains("HTML", false) == 0) + if (m_document->defaultDTD()->name.tqcontains("HTML", false) == 0) { - KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").arg(m_document->defaultDTD()->nickName)); + KMessageBox::information(this, i18n("The VPL Mode does not support the current DTD, at the moment: %1").tqarg(m_document->defaultDTD()->nickName)); KToggleAction *ta2 = (KToggleAction *) quantaApp->actionCollection()->action( "show_quanta_editor" ); if (ta2) ta2->setChecked(true); @@ -786,9 +786,9 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString NodeModifsSet *modifs; DOM::Node domNode, domStartContainer, domEndContainer; TQString tagName; - QTag *nodeQTag, *qTag, *nodeParentQTag; + TQTag *nodeTQTag, *qTag, *nodeParentTQTag; Node *nodeCursor, *startContainer, *endContainer, *nodeParent, *dummy; - TQPtrList<QTag> qTagList; + TQPtrList<TQTag> qTagList; int startCol, startLine, endCol, endLine; bool specialTagInsertion = false; long nodeOffset, startOffset, endOffset, domNodeOffset; @@ -833,24 +833,24 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString nodeParent = nodeCursor; if (nodeParent->tag->type == Tag::Text) - nodeParent = nodeParent->parent; + nodeParent = nodeParent->tqparent; - //Checking if at least one parent of node can have a Text Node as child, otherwise + //Checking if at least one tqparent of node can have a Text Node as child, otherwise //it is impossible for the - //user to add this node. In that case, try to insert the Node in the closest parent accepting it. + //user to add this node. In that case, try to insert the Node in the closest tqparent accepting it. //e.g. TR : a normal insertion would require to have the caret in the TABLE Node, but it is //impossible - nodeQTag = QuantaCommon::tagFromDTD(m_document->defaultDTD(), + nodeTQTag = QuantaCommon::tagFromDTD(m_document->defaultDTD(), node->tag->name); - if (!nodeQTag) + if (!nodeTQTag) return; - qTagList = nodeQTag->parents(); + qTagList = nodeTQTag->tqparents(); #ifdef HEAVY_DEBUG - kdDebug(25001)<< "nodeQTag name : " << nodeQTag->name() << endl; - /**kdDebug(25001)<< nodeQTag->isChild("#text", false) << endl; - kdDebug(25001)<< nodeQTag->isChild("#text", true) << endl;*/ + kdDebug(25001)<< "nodeTQTag name : " << nodeTQTag->name() << endl; + /**kdDebug(25001)<< nodeTQTag->isChild("#text", false) << endl; + kdDebug(25001)<< nodeTQTag->isChild("#text", true) << endl;*/ #endif for (qTag = qTagList.first(); qTag; qTag = qTagList.next()) { @@ -904,13 +904,13 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString nodeTreeModified = false; if (specialTagInsertion) { - //let's try to insert this node in the closest parent accepting it. + //let's try to insert this node in the closest tqparent accepting it. while (nodeParent) { - nodeParentQTag = + nodeParentTQTag = QuantaCommon::tagFromDTD(m_document->defaultDTD(), nodeParent->tag->name); - if (nodeParentQTag && nodeParentQTag->isChild(node)) + if (nodeParentTQTag && nodeParentTQTag->isChild(node)) { nodeCursor = kafkaCommon::createMandatoryNodeSubtree(node, m_document); @@ -919,10 +919,10 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString nodeTreeModified = true; break; } - nodeParent = nodeParent->parent; + nodeParent = nodeParent->tqparent; } } - else if (hasSelection && !nodeQTag->isSingle()) + else if (hasSelection && !nodeTQTag->isSingle()) { //If some text is selected in kafka, surround the selection with the new Node. if(!startContainer || !endContainer) @@ -934,7 +934,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString else { //Nothing is selected, simply inserting the Node if it is not an inline. -/* if(!kafkaCommon::isInline(node->tag->name) || nodeQTag->isSingle()) +/* if(!kafkaCommon::isInline(node->tag->name) || nodeTQTag->isSingle()) {*/ nodeTreeModified = kafkaCommon::DTDinsertRemoveNode(node, nodeCursor, (int)nodeOffset, nodeCursor, (int)nodeOffset, m_document, &nodeCursor, nodeOffset, modifs); @@ -1021,14 +1021,14 @@ void QuantaView::activated() ToolbarTabWidget::ref()->reparent(this, 0, TQPoint(), qConfig.enableDTDToolbar); m_viewLayout->addWidget(ToolbarTabWidget::ref(), 0 , 0); quantaApp->partManager()->setActivePart(m_document->doc(), m_document->view()); - m_document->checkDirtyStatus(); + m_document->checkDirtytqStatus(); StructTreeView::ref()->useOpenLevelSetting = true; quantaApp->slotLoadToolbarForDTD(m_document->getDTDIdentifier()); //TEMP : If the activated document is not a (X)HTML document, disable smartTagInsertion //Will be removed when VPL will support every DTD KAction *action = quantaApp->actionCollection()->action("smart_tag_insertion"); - if(action && m_document->defaultDTD()->name.contains("HTML", false) == 0) + if(action && m_document->defaultDTD()->name.tqcontains("HTML", false) == 0) { qConfig.smartTagInsertion = false; (static_cast<KToggleAction* >(action))->setChecked(false); @@ -1064,7 +1064,7 @@ bool QuantaView::saveModified(bool ask) int want_save; if (ask) want_save = KMessageBox::warningYesNoCancel(this, - i18n("The file \"%1\" has been modified.\nDo you want to save it?").arg(fileName), + i18n("The file \"%1\" has been modified.\nDo you want to save it?").tqarg(fileName), i18n("Warning"), KStdGuiItem::save(), KStdGuiItem::discard()); else want_save = KMessageBox::Yes; @@ -1108,7 +1108,7 @@ bool QuantaView::saveDocument(const KURL& url) if (url.isEmpty()) return false; - emit eventHappened("before_save", url.url(), TQString::null); + emit eventHappened("before_save", url.url(), TQString()); m_saveResult = true; KURL oldURL = m_document->url(); if (!m_document->isUntitled() && oldURL.isLocalFile()) @@ -1125,7 +1125,7 @@ bool QuantaView::saveDocument(const KURL& url) return false; //saving to a local file failed } else //successful saving to a local file { - m_document->setDirtyStatus(false); + m_document->setDirtytqStatus(false); m_document->removeBackup(quantaApp->config()); fileWatcher->addFile(m_document->url().path()); // kdDebug(24000) << "addFile[saveDocument, 2]: " << m_document->url().path() << endl; @@ -1140,7 +1140,7 @@ bool QuantaView::saveDocument(const KURL& url) if (m_saveResult) { //start an event loop and wait until the saving finished - QExtFileInfo internalFileInfo; + TQExtFileInfo internalFileInfo; m_eventLoopStarted = true; internalFileInfo.enter_loop(); } @@ -1161,7 +1161,7 @@ bool QuantaView::saveDocument(const KURL& url) { setCaption(m_document->url().fileName()); } - emit eventHappened("after_save", m_document->url().url(), TQString::null); + emit eventHappened("after_save", m_document->url().url(), TQString()); return true; } @@ -1170,16 +1170,16 @@ void QuantaView::slotSavingFailed(const TQString &error) Q_UNUSED(error); m_saveResult = false; if (m_eventLoopStarted) - qApp->exit_loop(); + tqApp->exit_loop(); } void QuantaView::slotSavingCompleted() { m_saveResult = true; - m_document->setDirtyStatus(false); + m_document->setDirtytqStatus(false); m_document->removeBackup(quantaApp->config()); if (m_eventLoopStarted) - qApp->exit_loop(); + tqApp->exit_loop(); } #include "quantaview.moc" diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h index e3688d93..dc6d7414 100644 --- a/quanta/src/quantaview.h +++ b/quanta/src/quantaview.h @@ -18,7 +18,7 @@ #ifndef QUANTAVIEW_H #define QUANTAVIEW_H -// include files for Qt +// include files for TQt #include <tqguardedptr.h> #include <tqwidget.h> #include <tqptrlist.h> @@ -64,10 +64,11 @@ class Node; class QuantaView : public KMdiChildView { Q_OBJECT + TQ_OBJECT public: - QuantaView(TQWidget *parent = 0, const char *name=0, const TQString &caption = TQString::null); + QuantaView(TQWidget *tqparent = 0, const char *name=0, const TQString &caption = TQString()); ~QuantaView(); /** returns true if the view can be removed, false otherwise */ @@ -104,7 +105,7 @@ public: void reloadVPLView(bool force = false); /** reload the Quanta view from the Node Tree. Set force to true if you want to reload even if not necessary. */ void reloadSourceView(bool force = false); - /** Return the curren views layout*/ + /** Return the curren views tqlayout*/ int currentViewsLayout() {return m_currentViewsLayout;} void reloadLayout(); @@ -129,12 +130,12 @@ public: void insertTag( const char *tag); /** Insert a new tag by bringing up the TagDialog. */ - void insertNewTag(const TQString &tag, const TQString &attr = TQString::null, bool insertInLine = true); + void insertNewTag(const TQString &tag, const TQString &attr = TQString(), bool insertInLine = true); /** * This function take the output of the TagAction, parse it into Nodes and insert it * in the Node tree. Then kafka will take care of updating itself from the Node Tree. */ - void insertOutputInTheNodeTree(const TQString &str1, const TQString &str2 = TQString::null, Node *node = 0L); + void insertOutputInTheNodeTree(const TQString &str1, const TQString &str2 = TQString(), Node *node = 0L); enum ViewFocus { SourceFocus = 0, @@ -220,7 +221,7 @@ private: TQGuardedPtr<KafkaDocument> m_kafkaDocument; TQSplitter *m_splitter; TQGridLayout *m_viewLayout; - int m_currentViewsLayout; ///< holds the current layout, which can be SourceOnly, VPLOnly or SourceAndVPL + int m_currentViewsLayout; ///< holds the current tqlayout, which can be SourceOnly, VPLOnly or SourceAndVPL int m_currentFocus; bool m_saveResult; bool m_eventLoopStarted; diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 5d9ea103..152063c8 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -61,7 +61,7 @@ #define UPLOAD_ID 12 #define DELETE_ID 13 -ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, name) +ViewManager::ViewManager(TQObject *tqparent, const char *name) : TQObject(tqparent, name) { m_lastActiveView = 0L; m_lastActiveEditorView = 0L; @@ -95,11 +95,11 @@ QuantaView* ViewManager::createView(const TQString &caption) connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn())); connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn())); connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); - connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus())); + connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewtqStatus())); disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*))); connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), TQPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); return view; } @@ -107,8 +107,8 @@ QuantaView* ViewManager::createView(const TQString &caption) void ViewManager::createNewDocument() { int i = 1; - while (isOpened(KURL("file:"+i18n("Untitled%1").arg(i)))) i++; - TQString fname = i18n("Untitled%1").arg(i); + while (isOpened(KURL("file:"+i18n("Untitled%1").tqarg(i)))) i++; + TQString fname = i18n("Untitled%1").tqarg(i); QuantaView *view = createView(fname); #ifdef ENABLE_EDITORS @@ -118,10 +118,10 @@ void ViewManager::createNewDocument() "KTextEditor::Document" ); #else - KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", view, "KTextEditor::Document"); + KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(view), "KTextEditor::Document"); #endif Document *w = new Document(doc, 0L); - connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const QPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const QPair<TQString, TQString>&))); + connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); TQString encoding = quantaApp->defaultEncoding(); KTextEditor::EncodingInterface* encodingIf = dynamic_cast<KTextEditor::EncodingInterface*>(doc); if (encodingIf) @@ -138,8 +138,8 @@ void ViewManager::createNewDocument() popupIf->installPopup((TQPopupMenu *)quantaApp->factory()->container("popup_editor", quantaApp)); quantaApp->setFocusProxy(w->view()); - w->view()->setFocusPolicy(TQWidget::WheelFocus); - connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus())); + w->view()->setFocusPolicy(TQ_WheelFocus); + connect( v, TQT_SIGNAL(newtqStatus()), quantaApp, TQT_SLOT(slotNewtqStatus())); quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active view->addDocument(w); @@ -226,7 +226,7 @@ void ViewManager::slotViewActivated(KMdiChildView *view) parser->clearGroups(); parser->setSAParserEnabled(true); quantaApp->reparse(true); //FIXME - quantaApp->slotNewStatus(); + quantaApp->slotNewtqStatus(); quantaApp->slotNewLineColumn(); typingInProgress = false; //need to reset, as it's set to true in the above slots m_lastActiveView = qView; @@ -257,16 +257,16 @@ void ViewManager::slotCloseOtherTabs() if (dynamic_cast<QuantaView*>(currentView) && !static_cast<QuantaView*>(currentView)->document()) ToolbarTabWidget::ref()->reparent(0, 0, TQPoint(), false); KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator(); - //save the children first to a list, as removing invalidates our iterator - TQValueList<KMdiChildView *> children; + //save the tqchildren first to a list, as removing tqinvalidates our iterator + TQValueList<KMdiChildView *> tqchildren; for (it->first(); !it->isDone(); it->next()) { - children.append(it->currentItem()); + tqchildren.append(it->currentItem()); } delete it; KURL::List modifiedList; TQValueListIterator<KMdiChildView *> childIt; - for (childIt = children.begin(); childIt != children.end(); ++childIt) + for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) { view = *childIt; qView = dynamic_cast<QuantaView*>(view); @@ -286,7 +286,7 @@ void ViewManager::slotCloseOtherTabs() if (dlg.exec() == TQDialog::Accepted) { filesToSave = dlg.filesToSave(); - for (childIt = children.begin(); childIt != children.end(); ++childIt) + for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) { view = *childIt; qView = dynamic_cast<QuantaView*>(view); @@ -295,7 +295,7 @@ void ViewManager::slotCloseOtherTabs() Document *w = qView->document(); if (w) { - if (filesToSave.contains(w->url())) + if (filesToSave.tqcontains(w->url())) if (!qView->saveModified(false)) { return; //save aborted @@ -311,7 +311,7 @@ void ViewManager::slotCloseOtherTabs() } } - for (childIt = children.begin(); childIt != children.end(); ++childIt) + for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) { view = *childIt; if (view != currentView) @@ -400,13 +400,13 @@ bool ViewManager::saveAll() { if (!w->isUntitled()) { - emit eventHappened("before_save", w->url().url(), TQString::null); + emit eventHappened("before_save", w->url().url(), TQString()); w->docUndoRedo->fileSaved(); w->save(); w->removeBackup(quantaApp->config()); if (w->isModified()) flagsave = false; - emit eventHappened("after_save", w->url().url(), TQString::null); + emit eventHappened("after_save", w->url().url(), TQString()); } else { if (!view->saveModified()) @@ -427,16 +427,16 @@ bool ViewManager::closeAll(bool createNew) parser->setSAParserEnabled(false); KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator(); QuantaView *view; - //save the children first to a list, as removing invalidates our iterator - TQValueList<KMdiChildView *> children; + //save the tqchildren first to a list, as removing tqinvalidates our iterator + TQValueList<KMdiChildView *> tqchildren; for (it->first(); !it->isDone(); it->next()) { - children.append(it->currentItem()); + tqchildren.append(it->currentItem()); } delete it; KURL::List modifiedList; TQValueListIterator<KMdiChildView *> childIt; - for (childIt = children.begin(); childIt != children.end(); ++childIt) + for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) { view = dynamic_cast<QuantaView*>(*childIt); if (view) @@ -455,7 +455,7 @@ bool ViewManager::closeAll(bool createNew) if (dlg.exec() == TQDialog::Accepted) { filesToSave = dlg.filesToSave(); - for (childIt = children.begin(); childIt != children.end(); ++childIt) + for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) { view = dynamic_cast<QuantaView*>(*childIt); if (view) @@ -463,7 +463,7 @@ bool ViewManager::closeAll(bool createNew) Document *w = view->document(); if (w) { - if (filesToSave.contains(w->url())) + if (filesToSave.tqcontains(w->url())) if (!view->saveModified(false)) { emit filesClosed(false); @@ -484,7 +484,7 @@ bool ViewManager::closeAll(bool createNew) disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); - for (childIt = children.begin(); childIt != children.end(); ++childIt) + for (childIt = tqchildren.begin(); childIt != tqchildren.end(); ++childIt) { view = dynamic_cast<QuantaView*>(*childIt); if (view) @@ -528,7 +528,7 @@ bool ViewManager::closeAll(bool createNew) if (createNew) { createNewDocument(); - quantaApp->slotNewStatus(); + quantaApp->slotNewtqStatus(); } emit filesClosed(true); return true; @@ -604,7 +604,7 @@ void ViewManager::slotTabContextMenu(TQWidget *widget, const TQPoint& point) m_separatorVisible = true; m_tabPopup->insertSeparator(SEPARATOR_INDEX); } - if (Project::ref()->hasProject() && Project::ref()->contains(w->url())) + if (Project::ref()->hasProject() && Project::ref()->tqcontains(w->url())) m_tabPopup->setItemVisible(UPLOAD_ID, true); else m_tabPopup->setItemVisible(UPLOAD_ID, false); @@ -647,7 +647,7 @@ void ViewManager::slotTabContextMenu(TQWidget *widget, const TQPoint& point) m_tabPopup->insertSeparator(); m_cvsMenuId = m_tabPopup->insertItem(SmallIcon("cervisia"), i18n("CVS"), CVSService::ref()->menu()); } - if (Project::ref()->contains(w->url())) + if (Project::ref()->tqcontains(w->url())) CVSService::ref()->setRepository(Project::ref()->projectBaseURL().path()); else CVSService::ref()->setRepository(w->url().directory()); diff --git a/quanta/src/viewmanager.h b/quanta/src/viewmanager.h index 05278901..9b600d00 100644 --- a/quanta/src/viewmanager.h +++ b/quanta/src/viewmanager.h @@ -29,22 +29,23 @@ class KMdiChildView; /** This singleton class takes care of creating new views for documents, help, plugins, preview and so. * As the name says, it also manages the views. */ -class ViewManager : public QObject +class ViewManager : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Returns a reference to the viewmanager object */ - static ViewManager* const ref(TQObject *parent = 0L, const char *name = 0L) + static ViewManager* const ref(TQObject *tqparent = 0L, const char *name = 0L) { static ViewManager *m_ref; - if (!m_ref) m_ref = new ViewManager(parent, name); + if (!m_ref) m_ref = new ViewManager(tqparent, name); return m_ref; } /** The destructor. */ virtual ~ViewManager(){}; /** Creates a QuantaView object */ - QuantaView *createView(const TQString &caption = TQString::null); + QuantaView *createView(const TQString &caption = TQString()); /** Removes a QuantaView object. Returns false on failure (eg. the view was not saved and it refused the delete itself.) If force is true, the view is removed without asking for save. */ @@ -123,7 +124,7 @@ private slots: private: /** Private constructor for the singleton object. */ - ViewManager(TQObject * parent = 0, const char * name = 0); + ViewManager(TQObject * tqparent = 0, const char * name = 0); /** Returns true if there isn't any opened view holding an editor */ bool allEditorsClosed(); diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 952badbe..efe8bb69 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -67,10 +67,10 @@ #include <X11/Xlib.h> -class BaseTreeViewToolTip : public QToolTip +class BaseTreeViewToolTip : public TQToolTip { public: - BaseTreeViewToolTip( TQWidget *parent, BaseTreeView *lv ); + BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv ); void maybeTip( const TQPoint &pos ); @@ -79,14 +79,14 @@ private: }; -BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *parent, BaseTreeView *lv ) - : TQToolTip( parent ), m_view( lv ) +BaseTreeViewToolTip::BaseTreeViewToolTip( TQWidget *tqparent, BaseTreeView *lv ) + : TQToolTip( tqparent ), m_view( lv ) { } void BaseTreeViewToolTip::maybeTip( const TQPoint &pos ) { - if ( !parentWidget() || !m_view || !m_view->showToolTips() ) + if ( !tqparentWidget() || !m_view || !m_view->showToolTips() ) return; TQListViewItem *item = m_view->itemAt(pos); @@ -106,13 +106,13 @@ void BaseTreeViewToolTip::maybeTip( const TQPoint &pos ) text.append( "<br>" + item->text(1)); } if ( !text.isEmpty() ) - tip(m_view->itemRect(item), text); + tip(m_view->tqitemRect(item), text); } //BaseTreeViewItem implementation -BaseTreeViewItem::BaseTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) -: KFileTreeViewItem( parent, item, brnch) +BaseTreeViewItem::BaseTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) +: KFileTreeViewItem( tqparent, item, brnch) { } @@ -163,11 +163,11 @@ void BaseTreeViewItem::refreshIcon() //BaseTreeBranch implementation -BaseTreeBranch::BaseTreeBranch(KFileTreeView *parent, const KURL& url, +BaseTreeBranch::BaseTreeBranch(KFileTreeView *tqparent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden , KFileTreeViewItem *branchRoot) - : KFileTreeBranch(parent, url, name, pix, showHidden, branchRoot) + : KFileTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) { bool localFile = url.isLocalFile(); setAutoUpdate(localFile); @@ -184,13 +184,13 @@ bool BaseTreeBranch::matchesFilter(const KFileItem *item) const return KFileTreeBranch::matchesFilter(item); } -KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, +KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem) { BaseTreeViewItem *tvi = 0; - if( parent && fileItem) + if( tqparent && fileItem) { - tvi = new BaseTreeViewItem(parent, fileItem, this); + tvi = new BaseTreeViewItem(tqparent, fileItem, this); // we assume there are childs if (tvi) { @@ -198,7 +198,7 @@ KFileTreeViewItem* BaseTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, } } else - kdDebug(24000) << "createTreeViewItem: Have no parent" << endl; + kdDebug(24000) << "createTreeViewItem: Have no tqparent" << endl; return tvi; } @@ -230,7 +230,7 @@ void BaseTreeBranch::addOpenFolder(TQStringList* openFolder) } else { - item = dynamic_cast<KFileTreeViewItem *>(item->parent()); + item = dynamic_cast<KFileTreeViewItem *>(item->tqparent()); } } if (item == root()) @@ -265,7 +265,7 @@ void BaseTreeBranch::updateOpenFolder() while (item) { if (item->isDir() && item->isOpen()) { updateDirectory( item->url() ); - kapp->processEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); + kapp->tqprocessEvents(TQEventLoop::ExcludeUserInput | TQEventLoop::ExcludeSocketNotifiers); // dive into the tree first newItem = dynamic_cast<KFileTreeViewItem *>(item->firstChild()); if (newItem) { @@ -276,7 +276,7 @@ void BaseTreeBranch::updateOpenFolder() }; // go up if no sibling available if (! item->nextSibling()) - item = dynamic_cast<KFileTreeViewItem *>(item->parent()); + item = dynamic_cast<KFileTreeViewItem *>(item->tqparent()); if (item == root()) break; if (item) @@ -291,11 +291,11 @@ void BaseTreeBranch::updateOpenFolder() // //////////////////////////////////////////////////////////////////////////////////// -BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) -: KFileTreeView(parent, name), fileInfoDlg(0), m_saveOpenFolder(false), m_openWithMenu(0L), m_openWithMenuId(-1) +BaseTreeView::BaseTreeView(TQWidget *tqparent, const char *name) +: KFileTreeView(tqparent, name), fileInfoDlg(0), m_saveOpenFolder(false), m_openWithMenu(0L), m_openWithMenuId(-1) { - m_parent = parent; - TQToolTip::remove(viewport()); // remove the tooltip from QListView + m_parent = tqparent; + TQToolTip::remove(viewport()); // remove the tooltip from TQListView m_tooltip = new BaseTreeViewToolTip(viewport(), this); setFrameStyle( Panel | Sunken ); setRootIsDecorated(true); @@ -303,7 +303,7 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) setLineWidth(2); setFullWidth(true); setShowSortIndicator(true); - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); setShowFolderOpenPixmap(false); connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), @@ -371,7 +371,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item) if ( QuantaCommon::checkMimeGroup(urlToOpen,"text") ) { emit openFile(urlToOpen); - item->repaint(); + item->tqrepaint(); } else if ( QuantaCommon::checkMimeGroup(urlToOpen, "image") ) //it may be an image { @@ -385,7 +385,7 @@ void BaseTreeView::slotSelectFile(TQListViewItem *item) if (QuantaCommon::denyBinaryInsert(this) == KMessageBox::Yes) { emit openFile(urlToOpen); - item->repaint(); + item->tqrepaint(); } } } @@ -452,7 +452,7 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) fsize=qfile.size(); //html file size TQString mimetype = KMimeType::findByFileContent(nameForInfo)->name(); - if (mimetype.contains("text")) + if (mimetype.tqcontains("text")) { qfile.open(IO_ReadOnly); TQString imgname,imgpath; @@ -462,23 +462,23 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) { imgname = stream.readLine(); ct++; - position=imgname.find("<img",0,false); //check for images + position=imgname.tqfind("<img",0,false); //check for images if (position!=-1) { imgname.remove(0,position+4); - position=imgname.find("src=",0,false); //extract images names + position=imgname.tqfind("src=",0,false); //extract images names imgname.remove(0,position+4); if (imgname.startsWith("\"")) imgname.remove(0,1); if (imgname.startsWith("'")) imgname.remove(0,1); - position=imgname.find(" ",0,false); + position=imgname.tqfind(" ",0,false); if (position!=-1) imgname=imgname.left(position); - position=imgname.find(">",0,false); + position=imgname.tqfind(">",0,false); if (position!=-1) imgname=imgname.left(position); - position=imgname.find("\"",0,false); + position=imgname.tqfind("\"",0,false); if (position!=-1) imgname=imgname.left(position); - position=imgname.find("'",0,false); + position=imgname.tqfind("'",0,false); if (position!=-1) imgname=imgname.left(position); - if (!quantaFileProperties->imageList->findItem(imgname,Qt::ExactMatch)) //check if image was already counted + if (!quantaFileProperties->imageList->tqfindItem(imgname,TQt::ExactMatch)) //check if image was already counted { KURL v(KURL::fromPathOrURL( path ),imgname); imgpath=v.path(); @@ -494,15 +494,15 @@ FileInfoDlg* BaseTreeView::addFileInfoPage(KPropertiesDialog* propDlg) } qfile.close(); - quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").arg(ct)); - quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").arg(imgct)); - quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").arg(fimgsize)); - quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").arg(fsize+fimgsize)); + quantaFileProperties->lineNum->setText(i18n("Number of lines: %1").tqarg(ct)); + quantaFileProperties->imageNum->setText(i18n("Number of images included: %1").tqarg(imgct)); + quantaFileProperties->imageSize->setText(i18n("Size of the included images: %1 bytes").tqarg(fimgsize)); + quantaFileProperties->totalSize->setText(i18n("Total size with images: %1 bytes").tqarg(fsize+fimgsize)); } - else if (mimetype.contains("image")) + else if (mimetype.tqcontains("image")) { // assume it's an image file TQImage imagefile=TQImage(nameForInfo); - quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").arg(imagefile.width()).arg(imagefile.height())); + quantaFileProperties->lineNum->setText(i18n("Image size: %1 x %2").tqarg(imagefile.width()).tqarg(imagefile.height())); quantaFileProperties->imageNum->hide(); quantaFileProperties->imageSize->hide(); quantaFileProperties->totalSize->hide(); @@ -536,7 +536,7 @@ void BaseTreeView::slotOpen() if (item) { emit open(item); - item->repaint(); + item->tqrepaint(); } } @@ -554,7 +554,7 @@ void BaseTreeView::slotOpenWith() void BaseTreeView::slotOpenWithApplication() { - KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name()); + KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); if (ptr) { KURL::List list; @@ -565,7 +565,7 @@ void BaseTreeView::slotOpenWithApplication() void BaseTreeView::slotOpenWithActivated(int id) { - if (m_pluginIds.contains(id)) + if (m_pluginIds.tqcontains(id)) { QuantaPlugin *plugin = m_pluginIds[id]; plugin->unload(true); @@ -648,7 +648,7 @@ void BaseTreeView::slotCopy() { if (currentItem()) { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setText( currentURL().prettyURL() ); } } @@ -658,7 +658,7 @@ void BaseTreeView::slotPaste() { if (currentItem()) { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL url = currentURL(); @@ -923,16 +923,16 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil } -void BaseTreeView::findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after) +void BaseTreeView::findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after) { TQPoint p (contentsToViewport(pos)); TQListViewItem *atpos = itemAt(p); -// if (atpos && atpos->parent()) { +// if (atpos && atpos->tqparent()) { // after = atpos; -// parent = atpos->parent(); +// tqparent = atpos->tqparent(); // } else { after = atpos; - parent = atpos; + tqparent = atpos; // } } @@ -952,7 +952,7 @@ bool BaseTreeView::isFileOpen(const KURL &url) bool BaseTreeView::isPathInClipboard() { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); for ( KURL::List::Iterator it = list.begin(); it != list.end(); ++it ) { @@ -972,13 +972,13 @@ void BaseTreeView::slotDocumentClosed(const KURL& url) item = (*it)->findTVIByURL(url); if (item) { - item->repaint(); + item->tqrepaint(); } } /* TQListViewItemIterator iter(this); for ( ; iter.current(); ++iter ) { - iter.current()->repaint(); + iter.current()->tqrepaint(); }*/ } @@ -1036,9 +1036,9 @@ void BaseTreeView::doRename(KFileTreeViewItem* kftvi, const TQString & newName) if ( oldURL != newURL ) { bool proceed = true; - if (QExtFileInfo::exists(newURL, false, this)) + if (TQExtFileInfo::exists(newURL, false, this)) { - proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; + proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; } if (proceed) { @@ -1159,7 +1159,7 @@ void BaseTreeView::slotCreateSiteTemplate() bool error = false; if (tar.open(IO_WriteOnly)) { - KURL::List fileList = QExtFileInfo::allFiles(url, "*", this); + KURL::List fileList = TQExtFileInfo::allFiles(url, "*", this); for (KURL::List::Iterator it = fileList.begin(); it != fileList.end(); ++it) { if (!(*it).path().endsWith("/")) @@ -1184,7 +1184,7 @@ void BaseTreeView::slotCreateSiteTemplate() error = true; if (error) - KMessageBox::error(this, i18n("<qt>There was an error while creating the site template tarball.<br>Check that you can read the files from <i>%1</i>, you have write access to <i>%2</i> and that you have enough free space in your temporary folder.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); + KMessageBox::error(this, i18n("<qt>There was an error while creating the site template tarball.<br>Check that you can read the files from <i>%1</i>, you have write access to <i>%2</i> and that you have enough free space in your temporary folder.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol)), i18n("Template Creation Error")); delete tempFile; } @@ -1214,9 +1214,9 @@ void BaseTreeView::slotCreateFile() url.setPath(url.path() + "/" + fileName); else url.setPath(url.directory() + "/" + fileName); - if (QExtFileInfo::exists(url, false, this)) + if (TQExtFileInfo::exists(url, false, this)) { - KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File")); + KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File")); return; } KTempFile *tempFile = new KTempFile(tmpDir); diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index 75dbaf9d..36c2d7fe 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -54,7 +54,7 @@ class QuantaPlugin; class BaseTreeViewItem : public KFileTreeViewItem { public: - BaseTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); + BaseTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); /** sorts folders separate from files @@ -84,15 +84,16 @@ public: */ class BaseTreeBranch : public KFileTreeBranch { Q_OBJECT + TQ_OBJECT public: - BaseTreeBranch(KFileTreeView *parent, const KURL& url, + BaseTreeBranch(KFileTreeView *tqparent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0); /** get the BaseTreeViewItem */ - virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem *parent, + virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem *tqparent, KFileItem *fileItem ); /** does custom filtering @@ -133,13 +134,14 @@ public: */ class BaseTreeView : public KFileTreeView { Q_OBJECT + TQ_OBJECT public: - BaseTreeView(TQWidget *parent = 0L, const char *name = 0L); + BaseTreeView(TQWidget *tqparent = 0L, const char *name = 0L); virtual ~BaseTreeView(); /** - * Saves the list view's layout (column widtsh, column order, sort column) + * Saves the list view's tqlayout (column widtsh, column order, sort column) * to a KConfig group. Reimplemented to save the open folders. * * @param config the KConfig object to write to @@ -148,7 +150,7 @@ public: void saveLayout(KConfig *config, const TQString &group); /** - * Reads the list view's layout from a KConfig group as stored with + * Reads the list view's tqlayout from a KConfig group as stored with * saveLayout. Reimplemented to load the open folders. * * @param config the KConfig object to read from @@ -171,7 +173,7 @@ public slots: */ void slotNewProjectLoaded(const TQString &, const KURL &, const KURL &); /** - repaints all treeview items + tqrepaints all treeview items */ void slotDocumentClosed(const KURL& url); @@ -305,7 +307,7 @@ protected: */ bool expandArchiv (KFileTreeViewItem *item); bool acceptDrag(TQDropEvent* e ) const; - void findDrop(const TQPoint &pos, TQListViewItem *&parent, TQListViewItem *&after); + void findDrop(const TQPoint &pos, TQListViewItem *&tqparent, TQListViewItem *&after); /** this is for project and template tree to reduce includes there @@ -324,7 +326,7 @@ protected: TQString m_projectName; KURL m_projectBaseURL; FileInfoDlg* fileInfoDlg; - /** the parent of the treeview + /** the tqparent of the treeview the passwords are cached there */ TQWidget * m_parent; diff --git a/quanta/treeviews/docfolder.cpp b/quanta/treeviews/docfolder.cpp index 0a1d941d..8ecf9c0f 100644 --- a/quanta/treeviews/docfolder.cpp +++ b/quanta/treeviews/docfolder.cpp @@ -28,8 +28,8 @@ #include "docfolder.h" #include "docitem.h" -DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath) - : KListViewItem(parent) +DocFolder::DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *config, const TQString &basePath) + : KListViewItem(tqparent) { name = _name; topLevel = false; @@ -59,8 +59,8 @@ DocFolder::DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *con } } -DocFolder::DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath) - : KListViewItem(parent) +DocFolder::DocFolder(TQListView *tqparent, const TQString &_name, KConfig *config, const TQString &basePath) + : KListViewItem(tqparent) { name = _name; topLevel = false; diff --git a/quanta/treeviews/docfolder.h b/quanta/treeviews/docfolder.h index f3c8db87..945fa786 100644 --- a/quanta/treeviews/docfolder.h +++ b/quanta/treeviews/docfolder.h @@ -33,8 +33,8 @@ class KConfig; class DocFolder : public KListViewItem { public: - DocFolder(TQListViewItem *parent, const TQString &_name, KConfig *config, const TQString &basePath); - DocFolder(TQListView *parent, const TQString &_name, KConfig *config, const TQString &basePath); + DocFolder(TQListViewItem *tqparent, const TQString &_name, KConfig *config, const TQString &basePath); + DocFolder(TQListView *tqparent, const TQString &_name, KConfig *config, const TQString &basePath); ~DocFolder(); TQString text( int column ) const; void setup(); diff --git a/quanta/treeviews/docitem.cpp b/quanta/treeviews/docitem.cpp index f24c3bb9..782d6140 100644 --- a/quanta/treeviews/docitem.cpp +++ b/quanta/treeviews/docitem.cpp @@ -21,15 +21,15 @@ #include "docitem.h" -DocItem::DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url) - : KListViewItem(parent) +DocItem::DocItem(TQListViewItem *tqparent, const TQString &_name, const TQString &_url) + : KListViewItem(tqparent) { url = _url; name = _name; } -DocItem::DocItem(TQListView *parent, const TQString &_name, const TQString &_url) - : KListViewItem(parent) +DocItem::DocItem(TQListView *tqparent, const TQString &_name, const TQString &_url) + : KListViewItem(tqparent) { url = _url; name = _name; diff --git a/quanta/treeviews/docitem.h b/quanta/treeviews/docitem.h index 59b126a1..7c261012 100644 --- a/quanta/treeviews/docitem.h +++ b/quanta/treeviews/docitem.h @@ -31,8 +31,8 @@ class KConfig; class DocItem : public KListViewItem { public: - DocItem(TQListViewItem *parent, const TQString &_name, const TQString &_url); - DocItem(TQListView *parent, const TQString &_name, const TQString &_url); + DocItem(TQListViewItem *tqparent, const TQString &_name, const TQString &_url); + DocItem(TQListView *tqparent, const TQString &_name, const TQString &_url); ~DocItem(); TQString text( int column ) const; diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index d0234faf..0541b25b 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -35,8 +35,8 @@ #include "docfolder.h" #include "docitem.h" -DocTreeView::DocTreeView(TQWidget *parent, const char *name ) - : KListView(parent,name) +DocTreeView::DocTreeView(TQWidget *tqparent, const char *name ) + : KListView(tqparent,name) { contextHelpDict = new TQDict<TQString>( 101, false ); @@ -54,7 +54,7 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name ) projectDocFolder = new KListViewItem(this, i18n("Project Documentation")); projectDocFolder->setOpen(true); slotRefreshTree(); - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); connect(this, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)) ); connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *))); @@ -138,11 +138,11 @@ void DocTreeView::clickItem( TQListViewItem *) TQString * DocTreeView::contextHelp(const TQString &keyword) { - TQString word = keyword.mid(keyword.find("|")); - if (contextHelpDict->find(keyword)) - return contextHelpDict->find(keyword); + TQString word = keyword.mid(keyword.tqfind("|")); + if (contextHelpDict->tqfind(keyword)) + return contextHelpDict->tqfind(keyword); else - return contextHelpDict->find(word); //to support old documentation packages + return contextHelpDict->tqfind(word); //to support old documentation packages } void DocTreeView::slotDoubleClicked(TQListViewItem *item ) @@ -156,7 +156,7 @@ void DocTreeView::slotDoubleClicked(TQListViewItem *item ) void DocTreeView::slotAddProjectDoc(const KURL& url) { TQString path = url.path(); - int pos = path.find("/doc/"); + int pos = path.tqfind("/doc/"); path = path.mid(pos + 5); new DocItem(projectDocFolder, path, url.url()); } diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h index ef60d468..bba36a04 100644 --- a/quanta/treeviews/doctreeview.h +++ b/quanta/treeviews/doctreeview.h @@ -35,8 +35,9 @@ class KPopupMenu; class DocTreeView : public KListView { Q_OBJECT + TQ_OBJECT public: - DocTreeView(TQWidget *parent=0, const char *name=0); + DocTreeView(TQWidget *tqparent=0, const char *name=0); ~DocTreeView(); TQString *contextHelp(const TQString &keyword); diff --git a/quanta/treeviews/fileinfodlg.ui b/quanta/treeviews/fileinfodlg.ui index f2fbd5fa..145b4f4e 100644 --- a/quanta/treeviews/fileinfodlg.ui +++ b/quanta/treeviews/fileinfodlg.ui @@ -8,7 +8,7 @@ * * ***************************************************************************/ </comment> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FileInfoDlg</cstring> </property> @@ -24,7 +24,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>lineNum</cstring> </property> @@ -32,7 +32,7 @@ <string>Number of lines:</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>imageNum</cstring> </property> @@ -40,7 +40,7 @@ <string>Number of images included:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>imageSize</cstring> </property> @@ -48,7 +48,7 @@ <string>Size of the included images:</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>totalSize</cstring> </property> @@ -56,7 +56,7 @@ <string>Total file size:</string> </property> </widget> - <widget class="QListBox" row="5" column="0"> + <widget class="TQListBox" row="5" column="0"> <property name="name"> <cstring>imageList</cstring> </property> @@ -64,7 +64,7 @@ <enum>NoSelection</enum> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>includedLabel</cstring> </property> @@ -72,7 +72,7 @@ <string>Included images:</string> </property> </widget> - <widget class="QLabel" row="6" column="0"> + <widget class="TQLabel" row="6" column="0"> <property name="name"> <cstring>fileDescLbl</cstring> </property> @@ -83,12 +83,12 @@ <cstring>fileDesc</cstring> </property> </widget> - <widget class="QLineEdit" row="7" column="0"> + <widget class="TQLineEdit" row="7" column="0"> <property name="name"> <cstring>fileDesc</cstring> </property> </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index fd943139..7d7146e2 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -40,8 +40,8 @@ //FilesTreeView implementation -FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name) - : BaseTreeView(parent, name) +FilesTreeView::FilesTreeView(KConfig *config, TQWidget *tqparent, const char *name) + : BaseTreeView(tqparent, name) { setAcceptDrops(true); setDragEnabled(true); @@ -59,7 +59,7 @@ FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name { url = KURL(); QuantaCommon::setUrl(url, topStrList[i]); - if (!topURLList.contains(url)) + if (!topURLList.tqcontains(url)) { topURLList.append(url); if (i < topStrAliasList.count()) @@ -74,11 +74,11 @@ FilesTreeView::FilesTreeView(KConfig *config, TQWidget *parent, const char *name { url = KURL(); url.setPath("/"); - if (!topURLList.contains(url)) + if (!topURLList.tqcontains(url)) topURLList.append(url); url = KURL(); - url.setPath(QExtFileInfo::homeDirPath() + "/"); - if (!topURLList.contains(url)) + url.setPath(TQExtFileInfo::homeDirPath() + "/"); + if (!topURLList.tqcontains(url)) topURLList.append(url); } @@ -153,7 +153,7 @@ KFileTreeBranch* FilesTreeView::newBranch(const KURL& url) newBrnch = new BaseTreeBranch(this, url, i18n("Root Folder"), SmallIcon(fileItem.iconName()), true); } else { - if (url.isLocalFile() && url.equals(KURL(QExtFileInfo::homeDirPath() + "/"), true)) + if (url.isLocalFile() && url.equals(KURL(TQExtFileInfo::homeDirPath() + "/"), true)) { newBrnch = new BaseTreeBranch(this, url, i18n("Home Folder"), SmallIcon(fileItem.iconName()), true); } else @@ -161,7 +161,7 @@ KFileTreeBranch* FilesTreeView::newBranch(const KURL& url) TQString s = url.fileName(); if (s.isEmpty()) s = "/"; - if (topURLAliases.contains(url.url())) + if (topURLAliases.tqcontains(url.url())) s = topURLAliases[url.url()]; s += " [" + url.prettyURL() + "]"; newBrnch = new BaseTreeBranch(this, url, s, SmallIcon(fileItem.iconName()), true); @@ -180,7 +180,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ Q_UNUSED(listView); #ifdef ENABLE_CVSSERVICE KURL url = currentURL(); - if (Project::ref()->contains(url)) + if (Project::ref()->tqcontains(url)) CVSService::ref()->setRepository(Project::ref()->projectBaseURL().path()); else CVSService::ref()->setRepository(url.directory()); @@ -218,7 +218,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ m_folderMenu->setItemVisible(m_menuFolderRename, false); m_config->setGroup("General Options"); - if ((url == KURL("file:/") || url == KURL("file:" + QExtFileInfo::homeDirPath() + "/")) && + if ((url == KURL("file:/") || url == KURL("file:" + TQExtFileInfo::homeDirPath() + "/")) && m_config->readBoolEntry("Home-Root Folder On", true) ) m_folderMenu ->setItemVisible(m_menuTop, false); m_folderMenu ->setItemVisible(m_reloadMenuId, true); @@ -227,7 +227,7 @@ void FilesTreeView::slotMenu(KListView* listView, TQListViewItem *item, const TQ { m_folderMenu->changeItem( m_menuTop, i18n("&Add Folder to Top")); url.adjustPath(+1); - m_folderMenu->setItemVisible(m_menuTop, (topURLList.findIndex(url) == -1)); + m_folderMenu->setItemVisible(m_menuTop, (topURLList.tqfindIndex(url) == -1)); m_folderMenu->setItemVisible(m_reloadMenuId, false); } m_folderMenu->popup( point); @@ -251,7 +251,7 @@ void FilesTreeView::slotAddToTop() url.adjustPath(+1); if ( curItem != curItem->branch()->root() ) //it is not a top folder { // add - if (topURLList.findIndex(url) == -1) + if (topURLList.tqfindIndex(url) == -1) { topURLList.append(url); bool ok; @@ -261,7 +261,7 @@ void FilesTreeView::slotAddToTop() topURLAliases.insert(url.url(), aliasName); newBranch(url); } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); } } else { // remove @@ -274,10 +274,10 @@ void FilesTreeView::slotAddToTop() void FilesTreeView::slotNewTopFolder() { - KURL url = KFileDialog::getExistingURL(TQString::null, this, i18n("Choose Local or Remote Folder")); + KURL url = KFileDialog::getExistingURL(TQString(), this, i18n("Choose Local or Remote Folder")); if (url.isEmpty()) return; url.adjustPath(+1); - if (topURLList.findIndex(url) == -1) + if (topURLList.tqfindIndex(url) == -1) { bool ok; TQString aliasName = KInputDialog::getText(i18n("Set Alias"), i18n("Alternative folder name:"), url.fileName(), &ok, this); @@ -287,7 +287,7 @@ void FilesTreeView::slotNewTopFolder() newBranch(url); topURLList.append(url); } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); } } @@ -313,18 +313,18 @@ void FilesTreeView::slotChangeAlias() url.adjustPath(+1); if ( curItem == curItem->branch()->root() ) //it is not a top folder { - if (topURLList.findIndex(url) != -1) + if (topURLList.tqfindIndex(url) != -1) { bool ok; TQString aliasName = KInputDialog::getText(i18n("Change Alias"), i18n("Alternative folder name:"), topURLAliases[url.url()], &ok, this); if (ok) { - topURLAliases.replace(url.url(), aliasName); + topURLAliases.tqreplace(url.url(), aliasName); removeBranch(curItem->branch()); newBranch(url); } } else { - KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").arg(url.url())); + KMessageBox::information(this, i18n("<qt><b>%1</b> is already a toplevel entry.</qt>").tqarg(url.url())); } } } diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h index 1b9e6068..dfef213c 100644 --- a/quanta/treeviews/filestreeview.h +++ b/quanta/treeviews/filestreeview.h @@ -33,9 +33,10 @@ class KURL; class FilesTreeView : public BaseTreeView { Q_OBJECT + TQ_OBJECT public: - FilesTreeView(KConfig *config, TQWidget *parent, const char *name = 0L); + FilesTreeView(KConfig *config, TQWidget *tqparent, const char *name = 0L); virtual ~FilesTreeView(); KURL::List topURLList; TQMap<TQString, TQString> topURLAliases; diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp index 48fd6b5e..cf960923 100644 --- a/quanta/treeviews/newtemplatedirdlg.cpp +++ b/quanta/treeviews/newtemplatedirdlg.cpp @@ -17,7 +17,7 @@ #include "newtemplatedirdlg.h" #include "newtemplatedirdlg.moc" -NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name) +NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *tqparent, const char *name ) : TemplateDirForm(tqparent,name) { setCaption(name); connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); diff --git a/quanta/treeviews/newtemplatedirdlg.h b/quanta/treeviews/newtemplatedirdlg.h index 730246e7..56dbba5c 100644 --- a/quanta/treeviews/newtemplatedirdlg.h +++ b/quanta/treeviews/newtemplatedirdlg.h @@ -25,8 +25,9 @@ class NewTemplateDirDlg : public TemplateDirForm { Q_OBJECT + TQ_OBJECT public: - NewTemplateDirDlg(TQWidget *parent=0, const char *name=0); + NewTemplateDirDlg(TQWidget *tqparent=0, const char *name=0); ~NewTemplateDirDlg(); }; diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 205e5bf0..3068fb55 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -46,8 +46,8 @@ #endif //ProjectTreeViewItem implementation -ProjectTreeViewItem::ProjectTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) -: BaseTreeViewItem( parent, item, brnch) +ProjectTreeViewItem::ProjectTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) +: BaseTreeViewItem( tqparent, item, brnch) { } @@ -70,38 +70,38 @@ void ProjectTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, } //ProjectTreeBranch implementation -ProjectTreeBranch::ProjectTreeBranch(KFileTreeView *parent, const KURL& url, +ProjectTreeBranch::ProjectTreeBranch(KFileTreeView *tqparent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, +KFileTreeViewItem* ProjectTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( parent && fileItem ) + if( tqparent && fileItem ) { - tvi = new ProjectTreeViewItem( parent, fileItem, this ); + tvi = new ProjectTreeViewItem( tqparent, fileItem, this ); if (tvi) { // we assume there are childs tvi->setExpandable(tvi->isDir()); if (urlList) { - tvi->setVisible(urlList->contains(fileItem->url())); // only listelements + tvi->setVisible(urlList->tqcontains(fileItem->url())); // only listelements } } } else - kdDebug(24000) << "ProjectTreeBranch::createTreeViewItem: Have no parent" << endl; + kdDebug(24000) << "ProjectTreeBranch::createTreeViewItem: Have no tqparent" << endl; return tvi; } //ProjectTreeView implementation -ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) - : BaseTreeView(parent,name), m_projectFiles(0) +ProjectTreeView::ProjectTreeView(TQWidget *tqparent, const char *name ) + : BaseTreeView(tqparent,name), m_projectFiles(0) { //setSelectionModeExt(KListView::Extended); setRootIsDecorated(false); @@ -136,7 +136,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); m_fileMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); + m_fileMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu); m_fileMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); KPopupMenu *createNewMenu = new KPopupMenu(this); @@ -154,8 +154,8 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); m_folderMenu->insertItem(SmallIcon("editdelete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus())); - m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); + m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFoldertqStatus())); + m_folderMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu); m_folderMenu->insertItem(SmallIcon("info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); m_projectMenu = new KPopupMenu(this); @@ -166,7 +166,7 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions())); m_projectMenu->insertItem(SmallIcon("revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); m_projectMenu->insertSeparator(); - m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); + m_projectMenu->insertItem(i18n("Upload &tqStatus"), m_uploadStatusMenu); connect(this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), @@ -261,7 +261,7 @@ void ProjectTreeView::slotMenu(KListView *listView, TQListViewItem *item, const m_fileMenu->popup(point); } else { - if (m_documentFolderList.contains(url)) + if (m_documentFolderList.tqcontains(url)) m_folderMenu->setItemChecked(m_setDocumentRootId, true); else m_folderMenu->setItemChecked(m_setDocumentRootId, false); @@ -345,7 +345,7 @@ void ProjectTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree, for ( ; iter.current(); ++iter ) { item = dynamic_cast <KFileTreeViewItem*> (iter.current()); - item->setVisible(m_projectFiles->contains(item->url()) || item == rootItem); + item->setVisible(m_projectFiles->tqcontains(item->url()) || item == rootItem); } rootItem->setEnabled(true); } @@ -380,7 +380,7 @@ void ProjectTreeView::slotCreateFolder() url.setPath(url.path() + "/" + folderName + "/"); else url.setPath(url.directory() + "/" + folderName +"/"); - if (QExtFileInfo::createDir(url, this)) + if (TQExtFileInfo::createDir(url, this)) { emit insertToProject(url); } @@ -398,15 +398,15 @@ void ProjectTreeView::slotCreateFile() url.setPath(url.path() + "/" + fileName); else url.setPath(url.directory() + "/" + fileName); - if (QExtFileInfo::exists(url, false, this)) + if (TQExtFileInfo::exists(url, false, this)) { - KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File")); + KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").tqarg(fileName), i18n("Error Creating File")); return; } KTempFile *tempFile = new KTempFile(tmpDir); tempFile->setAutoDelete(true); tempFile->close(); - if (QExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url)) + if (TQExtFileInfo::copy(KURL::fromPathOrURL(tempFile->name()), url)) { emit insertToProject(url); emit openFile(url); @@ -422,10 +422,10 @@ void ProjectTreeView::slotRemoveFromProject(int askForRemove) if (item) { KURL url = currentURL(); - TQString nice = QExtFileInfo::toRelative(url, m_projectBaseURL).path(); + TQString nice = TQExtFileInfo::toRelative(url, m_projectBaseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); if ( !askForRemove || - KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue ) + KMessageBox::warningContinueCancel(this,i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") == KMessageBox::Continue ) { if ( currentKFileTreeViewItem()->isDir() ) url.adjustPath(+1); emit removeFromProject(url); @@ -525,9 +525,9 @@ void ProjectTreeView::slotAlwaysUpload() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - if (m_projectFiles->contains(url) || url == m_projectBaseURL) + if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL) { - emit changeUploadStatus(url, ProjectURL::AlwaysUpload); + emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload); } } @@ -539,9 +539,9 @@ void ProjectTreeView::slotNeverUpload() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - if (m_projectFiles->contains(url) || url == m_projectBaseURL) + if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL) { - emit changeUploadStatus(url, ProjectURL::NeverUpload); + emit changeUploadtqStatus(url, ProjectURL::NeverUpload); } } @@ -553,9 +553,9 @@ void ProjectTreeView::slotConfirmUpload() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - if (m_projectFiles->contains(url) || url == m_projectBaseURL) + if (m_projectFiles->tqcontains(url) || url == m_projectBaseURL) { - emit changeUploadStatus(url, ProjectURL::ConfirmUpload); + emit changeUploadtqStatus(url, ProjectURL::ConfirmUpload); } } @@ -570,10 +570,10 @@ void ProjectTreeView::slotUploadMenuAboutToShow() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - ProjectURL *proUrl = m_projectFiles->find( url ); + ProjectURL *proUrl = m_projectFiles->tqfind( url ); if (proUrl) { - switch (proUrl->uploadStatus) + switch (proUrl->uploadtqStatus) { case ProjectURL::NeverUpload: { @@ -595,7 +595,7 @@ void ProjectTreeView::slotUploadMenuAboutToShow() } } -void ProjectTreeView::slotChangeDocumentFolderStatus() +void ProjectTreeView::slotChangeDocumentFoldertqStatus() { KFileTreeViewItem *kftvi = currentKFileTreeViewItem(); if (! kftvi) @@ -603,22 +603,22 @@ void ProjectTreeView::slotChangeDocumentFolderStatus() KURL url = currentURL(); if (kftvi->isDir()) url.adjustPath(+1); - if (!m_documentFolderList.contains(currentURL())) + if (!m_documentFolderList.tqcontains(currentURL())) { m_documentFolderList.append(currentURL()); - emit changeUploadStatus(url, ProjectURL::AlwaysUpload); - emit changeDocumentFolderStatus(url, true); + emit changeUploadtqStatus(url, ProjectURL::AlwaysUpload); + emit changeDocumentFoldertqStatus(url, true); } else { m_documentFolderList.remove(currentURL()); - emit changeUploadStatus(url, false); + emit changeUploadtqStatus(url, false); } - currentItem()->repaint(); + currentItem()->tqrepaint(); } bool ProjectTreeView::isDocumentFolder(const KURL &url) { - return (m_documentFolderList.contains(url) > 0); + return (m_documentFolderList.tqcontains(url) > 0); } diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h index 463f660c..dafa3a2f 100644 --- a/quanta/treeviews/projecttreeview.h +++ b/quanta/treeviews/projecttreeview.h @@ -28,7 +28,7 @@ class ProjectList; class ProjectTreeViewItem : public BaseTreeViewItem { public: - ProjectTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); + ProjectTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); /** makes document root italics */ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); }; @@ -36,12 +36,12 @@ public: class ProjectTreeBranch : public BaseTreeBranch { public: - ProjectTreeBranch(KFileTreeView *parent, const KURL& url, + ProjectTreeBranch(KFileTreeView *tqparent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** check for CVS and visible*/ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem ); /** only files in list will be shown */ @@ -52,6 +52,7 @@ public: class ProjectTreeView : public BaseTreeView { Q_OBJECT + TQ_OBJECT public: /** @@ -60,10 +61,10 @@ public: * the parameters are only used at the first call to create the class * */ - static ProjectTreeView* const ref(TQWidget *parent = 0L, const char *name = 0L) + static ProjectTreeView* const ref(TQWidget *tqparent = 0L, const char *name = 0L) { static ProjectTreeView *m_ref; - if (!m_ref) m_ref = new ProjectTreeView(parent, name); + if (!m_ref) m_ref = new ProjectTreeView(tqparent, name); return m_ref; } @@ -82,7 +83,7 @@ public slots: // Public slots /** makes the url visible in the tree */ void slotViewActivated(const KURL&); /** fills the list with the url's of the open folder */ - void slotGetTreeStatus(TQStringList *folderToOpen) + void slotGetTreetqStatus(TQStringList *folderToOpen) { m_projectDir->addOpenFolder(folderToOpen); } @@ -106,8 +107,8 @@ signals: // Signals void loadToolbarFile(const KURL&); void uploadProject(); void changeFileDescription(const KURL& url, const TQString& desc); - void changeUploadStatus(const KURL& url, int status); - void changeDocumentFolderStatus(const KURL& url, bool status); + void changeUploadtqStatus(const KURL& url, int status); + void changeDocumentFoldertqStatus(const KURL& url, bool status); void reloadProject(); private: @@ -115,7 +116,7 @@ private: * If you need the class use ProjectTreeView::ref() for * construction and reference */ - ProjectTreeView(TQWidget *parent, const char *name); + ProjectTreeView(TQWidget *tqparent, const char *name); ProjectTreeBranch *m_projectDir; KPopupMenu *m_fileMenu; @@ -169,7 +170,7 @@ private slots: // Private slots void slotNeverUpload(); void slotConfirmUpload(); void slotUploadMenuAboutToShow(); - void slotChangeDocumentFolderStatus(); + void slotChangeDocumentFoldertqStatus(); }; #endif diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui index 5c7a9096..6498445a 100644 --- a/quanta/treeviews/quantapropertiespage.ui +++ b/quanta/treeviews/quantapropertiespage.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2002 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>QuantaPropertiesPage</cstring> </property> @@ -29,7 +29,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>300</width> <height>400</height> @@ -42,11 +42,11 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QWidgetStack" row="0" column="0"> + <widget class="TQWidgetStack" row="0" column="0"> <property name="name"> <cstring>typeStack</cstring> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -57,15 +57,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>parentAttr</cstring> + <cstring>tqparentAttr</cstring> </property> <property name="text"> - <string>&Inherit type from parent (nothing)</string> + <string>&Inherit type from tqparent (nothing)</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>92</width> <height>20</height> @@ -98,7 +98,7 @@ <cstring>typesCombo</cstring> </property> </widget> - <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="4"> + <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>prePostGroup</cstring> </property> @@ -109,7 +109,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>usePrePostText</cstring> </property> @@ -117,7 +117,7 @@ <string>Use &pre/post text</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel1_2</cstring> </property> @@ -125,7 +125,7 @@ <string>Pre-text:</string> </property> </widget> - <widget class="QTextEdit" row="2" column="0"> + <widget class="TQTextEdit" row="2" column="0"> <property name="name"> <cstring>preTextEdit</cstring> </property> @@ -133,7 +133,7 @@ <bool>false</bool> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -141,7 +141,7 @@ <string>Post-text:</string> </property> </widget> - <widget class="QTextEdit" row="4" column="0"> + <widget class="TQTextEdit" row="4" column="0"> <property name="name"> <cstring>postTextEdit</cstring> </property> @@ -161,7 +161,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>93</width> <height>20</height> @@ -170,7 +170,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>WStackPage</cstring> </property> @@ -181,7 +181,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>filteringLabel</cstring> </property> @@ -207,7 +207,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -221,7 +221,7 @@ </widget> <connections> <connection> - <sender>parentAttr</sender> + <sender>tqparentAttr</sender> <signal>toggled(bool)</signal> <receiver>typesCombo</receiver> <slot>setDisabled(bool)</slot> @@ -241,7 +241,7 @@ </connections> <tabstops> <tabstop>typesCombo</tabstop> - <tabstop>parentAttr</tabstop> + <tabstop>tqparentAttr</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 2e7959bf..1652cf18 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -58,8 +58,8 @@ extern int xmlLoadExtDtdDefaultValue; -ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) - : BaseTreeView(parent,name) +ScriptTreeView::ScriptTreeView(TQWidget *tqparent, const char *name ) + : BaseTreeView(tqparent,name) { setSaveOpenFolder(true); addColumn(i18n("Scripts"), -1); @@ -224,8 +224,8 @@ void ScriptTreeView::slotAssignAction() TQString execApp = infoOptionValue(infoURL, "interpreter"); if (execApp.isEmpty()) execApp = "sh"; - url.setPath(url.path().replace(locateLocal("data", resourceDir + "scripts/"), "%scriptdir/")); - url.setPath(url.path().replace(qConfig.globalDataDir + resourceDir + "scripts/", "%scriptdir/")); + url.setPath(url.path().tqreplace(locateLocal("data", resourceDir + "scripts/"), "%scriptdir/")); + url.setPath(url.path().tqreplace(qConfig.globalDataDir + resourceDir + "scripts/", "%scriptdir/")); emit assignActionToScript(url, execApp); } } @@ -293,7 +293,7 @@ void ScriptTreeView::slotSendScriptInMail() delete mailDlg; return; } - kapp->invokeMailer(toStr, TQString::null, TQString::null, subjectStr, message, TQString::null, attachmentFile); + kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), attachmentFile); } delete mailDlg; diff --git a/quanta/treeviews/scripttreeview.h b/quanta/treeviews/scripttreeview.h index 1bfa934d..d5d69ea9 100644 --- a/quanta/treeviews/scripttreeview.h +++ b/quanta/treeviews/scripttreeview.h @@ -41,10 +41,11 @@ */ class ScriptTreeView : public BaseTreeView { Q_OBJECT + TQ_OBJECT public: - ScriptTreeView(TQWidget *parent, const char *name = 0L); + ScriptTreeView(TQWidget *tqparent, const char *name = 0L); ~ScriptTreeView(); protected slots: @@ -63,11 +64,11 @@ protected slots: virtual void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point); /** - * slot of QListView + * slot of TQListView * * shows the .info file for the script * - * @param item the selected QListViewItem + * @param item the selected TQListViewItem */ virtual void slotSelectFile(TQListViewItem *item); @@ -204,7 +205,7 @@ private: TQString infoOptionValue(const KURL& infoURL, const TQString& optionName); /** Create a script tarball which can be uploaded or sent in email. Returns - * the name of the created file or TQString::null if creation has failed. + * the name of the created file or TQString() if creation has failed. */ TQString createScriptTarball(); diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 16d42b45..3d410c03 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt includes +// TQt includes #include <tqpainter.h> // KDE includes @@ -36,8 +36,8 @@ #include "qextfileinfo.h" -ServerTreeViewItem::ServerTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ) -: BaseTreeViewItem( parent, item, brnch) +ServerTreeViewItem::ServerTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ) +: BaseTreeViewItem( tqparent, item, brnch) { } @@ -47,9 +47,9 @@ void ServerTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, TQColorGroup _cg( cg ); KURL baseURL = Project::ref()->projectBaseURL(); KURL relURL = baseURL; - relURL.setPath(QExtFileInfo::toRelative(url(), branch()->url()).path()); - KURL url = QExtFileInfo::toAbsolute(relURL, baseURL); - if ( !Project::ref()->contains(url) ) + relURL.setPath(TQExtFileInfo::toRelative(url(), branch()->url()).path()); + KURL url = TQExtFileInfo::toAbsolute(relURL, baseURL); + if ( !Project::ref()->tqcontains(url) ) { TQFont f = p->font(); f.setItalic(true); @@ -63,22 +63,22 @@ void ServerTreeViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, } //ServerTreeBranch implementation -ServerTreeBranch::ServerTreeBranch(KFileTreeView *parent, const KURL& url, +ServerTreeBranch::ServerTreeBranch(KFileTreeView *tqparent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem ) +KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( parent && fileItem ) + if( tqparent && fileItem ) { - tvi = new ServerTreeViewItem( parent, fileItem, this ); + tvi = new ServerTreeViewItem( tqparent, fileItem, this ); } else - kdDebug(24000) << "ServerTreeBranch::createTreeViewItem: Have no parent" << endl; + kdDebug(24000) << "ServerTreeBranch::createTreeViewItem: Have no tqparent" << endl; return tvi; } @@ -87,8 +87,8 @@ KFileTreeViewItem* ServerTreeBranch::createTreeViewItem(KFileTreeViewItem *paren // ServerTreeView implementation // // -ServerTreeView::ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name) - : BaseTreeView(parent, name) +ServerTreeView::ServerTreeView(KConfig *config, TQWidget *tqparent, const KURL &url, const char *name) + : BaseTreeView(tqparent, name) { setAcceptDrops(true); setDragEnabled(true); @@ -188,7 +188,7 @@ void ServerTreeView::slotReloadTree( ProjectList *fileList, bool buildNewTree, c TQListViewItemIterator iter(this); for ( ; iter.current(); ++iter ) { - iter.current()->repaint(); + iter.current()->tqrepaint(); } } diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h index 162540e0..294bb23a 100644 --- a/quanta/treeviews/servertreeview.h +++ b/quanta/treeviews/servertreeview.h @@ -35,7 +35,7 @@ class ProjectList; class ServerTreeViewItem : public BaseTreeViewItem { public: - ServerTreeViewItem( KFileTreeViewItem *parent, KFileItem* item, KFileTreeBranch *brnch ); + ServerTreeViewItem( KFileTreeViewItem *tqparent, KFileItem* item, KFileTreeBranch *brnch ); /** makes document not in project lighter */ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align); }; @@ -47,28 +47,29 @@ public: class ServerTreeBranch : public BaseTreeBranch { public: - ServerTreeBranch(KFileTreeView *parent, const KURL& url, + ServerTreeBranch(KFileTreeView *tqparent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** check for CVS and visible*/ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem ); }; class ServerTreeView : public BaseTreeView { Q_OBJECT + TQ_OBJECT public: - ServerTreeView(KConfig *config, TQWidget *parent, const KURL &url, const char *name = 0L); + ServerTreeView(KConfig *config, TQWidget *tqparent, const KURL &url, const char *name = 0L); virtual ~ServerTreeView(); protected slots: void slotMenu(KListView *listView, TQListViewItem *item, const TQPoint &point); - /** repaints the treeview items, because they might be added to or removed from the project*/ + /** tqrepaints the treeview items, because they might be added to or removed from the project*/ void slotReloadTree( ProjectList *fileList, bool buildNewTree, const TQStringList &folderToOpen); protected: diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp index 596143d7..a0ac8baa 100644 --- a/quanta/treeviews/structtreetag.cpp +++ b/quanta/treeviews/structtreetag.cpp @@ -31,20 +31,20 @@ #include "document.h" #include "resource.h" -StructTreeTag::StructTreeTag(TQListView *parent, TQString a_title) - : KListViewItem(parent, a_title) +StructTreeTag::StructTreeTag(TQListView *tqparent, TQString a_title) + : KListViewItem(tqparent, a_title) { node = 0L; hasOpenFileMenu = false; groupTag = 0L; - parentTree = static_cast<StructTreeView*>(parent); + tqparentTree = static_cast<StructTreeView*>(tqparent); } -StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title, +StructTreeTag::StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title, TQListViewItem *after ) -: KListViewItem(parent, after, a_title) +: KListViewItem(tqparent, after, a_title) { - parentTree = parent->parentTree; + tqparentTree = tqparent->tqparentTree; hasOpenFileMenu = false; groupTag = 0L; static const TQString space = " "; @@ -105,36 +105,36 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString if (!typingInProgress) { - QTag *parentQTag = 0L; - if (node->parent) - parentQTag = QuantaCommon::tagFromDTD(node->parent); + TQTag *tqparentTQTag = 0L; + if (node->tqparent) + tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent); TQString qTagName = node->tag->dtd()->caseSensitive ? node->tag->name : node->tag->name.upper(); int line, col; node->tag->beginPos(line, col); - if (parentQTag && !parentQTag->childTags.contains(qTagName) && - !parentQTag->childTags.isEmpty()) + if (tqparentTQTag && !tqparentTQTag->childTags.tqcontains(qTagName) && + !tqparentTQTag->childTags.isEmpty()) { node->tag->write()->setErrorMark(line); - TQString parentTagName = node->tag->dtd()->caseSensitive ? node->parent->tag->name : node->parent->tag->name.upper(); - parentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").arg(line + 1).arg(qTagName).arg(parentTagName)); + TQString tqparentTagName = node->tag->dtd()->caseSensitive ? node->tqparent->tag->name : node->tqparent->tag->name.upper(); + tqparentTree->showMessage(i18n("Line %1: %2 is not a possible child of %3.\n").tqarg(line + 1).tqarg(qTagName).tqarg(tqparentTagName)); } TQString nextTagName; if (node->next) { nextTagName = node->tag->dtd()->caseSensitive ? node->next->tag->name : node->next->tag->name.upper(); } - parentQTag = QuantaCommon::tagFromDTD(node); - if (parentQTag && !parentQTag->isSingle() && - !parentQTag->isOptional() && + tqparentTQTag = QuantaCommon::tagFromDTD(node); + if (tqparentTQTag && !tqparentTQTag->isSingle() && + !tqparentTQTag->isOptional() && (!node->next || ( !node->getClosingNode())) ) { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName)); + tqparentTree->showMessage(i18n("Line %1, column %2: Closing tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); } else - if (!parentQTag && node->tag->name.upper() != "!DOCTYPE") + if (!tqparentTQTag && node->tag->name.upper() != "!DOCTYPE") { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").arg(line + 1).arg(col + 1).arg(qTagName).arg(node->tag->dtd()->nickName)); + tqparentTree->showMessage(i18n("Line %1, column %2: %3 is not part of %4.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName).tqarg(node->tag->dtd()->nickName)); } } break; @@ -143,7 +143,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString { title = tag->tagStr(); title = title.left(70).stripWhiteSpace(); - title.replace( nbspRx," "); + title.tqreplace( nbspRx," "); break; } case Tag::Comment: @@ -151,7 +151,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString setPixmap( 0, UserIcon("tag_comm") ); title = tag->tagStr(); title = title.left(70).stripWhiteSpace(); - title.replace( nbspRx," "); + title.tqreplace( nbspRx," "); break; } case Tag::ScriptTag: @@ -182,7 +182,7 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString if (!node->prev || qTagName != "/" + qPrevTagName) { node->tag->write()->setErrorMark(line); - parentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").arg(line + 1).arg(col + 1).arg(qTagName)); + tqparentTree->showMessage(i18n("Line %1, column %2: Opening tag for %3 is missing.").tqarg(line + 1).tqarg(col + 1).tqarg(qTagName)); } } title = tag->tagStr().left(70).stripWhiteSpace(); @@ -195,23 +195,23 @@ StructTreeTag::StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString title = a_title; } - title.replace(newLineRx," "); + title.tqreplace(newLineRx," "); setText(0, title); node->listItems.append(this); } } -StructTreeTag::StructTreeTag(StructTreeTag *parent, TQString a_title ) -: KListViewItem(parent, a_title) +StructTreeTag::StructTreeTag(StructTreeTag *tqparent, TQString a_title ) +: KListViewItem(tqparent, a_title) { node = 0L; hasOpenFileMenu = false; groupTag = 0L; - parentTree = parent->parentTree; + tqparentTree = tqparent->tqparentTree; } StructTreeTag::~StructTreeTag(){ if (node) - node->listItems.remove(node->listItems.find(this)); + node->listItems.remove(node->listItems.tqfind(this)); } diff --git a/quanta/treeviews/structtreetag.h b/quanta/treeviews/structtreetag.h index c49f07e8..cd0e35b8 100644 --- a/quanta/treeviews/structtreetag.h +++ b/quanta/treeviews/structtreetag.h @@ -30,16 +30,16 @@ class StructTreeView; class StructTreeTag : public KListViewItem { public: - StructTreeTag(TQListView *parent, const TQString a_title = TQString::null ); - StructTreeTag(StructTreeTag *parent, Node *a_node, const TQString a_title = TQString::null, TQListViewItem *after = 0L); - StructTreeTag(StructTreeTag *parent, const TQString a_title = TQString::null ); + StructTreeTag(TQListView *tqparent, const TQString a_title = TQString() ); + StructTreeTag(StructTreeTag *tqparent, Node *a_node, const TQString a_title = TQString(), TQListViewItem *after = 0L); + StructTreeTag(StructTreeTag *tqparent, const TQString a_title = TQString() ); ~StructTreeTag(); Node *node; bool hasOpenFileMenu; Tag* groupTag; TQRegExp fileNameRx; - StructTreeView *parentTree; + StructTreeView *tqparentTree; }; #endif diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index 1f22e594..00c78845 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -57,8 +57,8 @@ #include "structtreeview.moc" extern GroupElementMapList globalGroupMap; -StructTreeView::StructTreeView(TQWidget *parent, const char *name ) - : KListView(parent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/ +StructTreeView::StructTreeView(TQWidget *tqparent, const char *name ) + : KListView(tqparent,name), m_marker(0), m_draggedItem(0)/*, m_thisWidget(0)*/ { for (int i = 0; i < 15; i++) groupOpened.append(false); @@ -83,7 +83,7 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) setLineWidth( 2 ); addColumn( i18n("Name"), -1 ); - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); dtdMenu = new KPopupMenu(this); @@ -159,7 +159,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) Node *currentNode = baseNode; StructTreeTag *currentItem = top; //after this StructTreeTag *item = 0L; - StructTreeTag *parentItem = top; //under this + StructTreeTag *tqparentItem = top; //under this int level = 0; TQString title; TQString tagStr; @@ -219,7 +219,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) if (!groupOnly) { title = ""; - item = new StructTreeTag(parentItem, currentNode, title, currentItem); + item = new StructTreeTag(tqparentItem, currentNode, title, currentItem); item->setOpen(level < openLevel); currentNode->mainListItem = item; @@ -236,14 +236,14 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) for (TQValueList<GroupElement*>::ConstIterator it = currentNode->m_groupElements.constBegin(); it != currentNode->m_groupElements.constEnd(); ++it) { GroupElement *groupElement = (*it); - if (!groupIds.contains(groupElement->group->name + dtd->name)) + if (!groupIds.tqcontains(groupElement->group->name + dtd->name)) continue; StructTreeTag *groupItem = groups[groupIds[groupElement->group->name + dtd->name]]; TQListViewItem* insertAfter = 0L; TQListViewItem* insertUnder = groupItem; - if (groupItems.contains(groupElement->group->name + groupElement->tag->name)) + if (groupItems.tqcontains(groupElement->group->name + groupElement->tag->name)) insertUnder = groupItems[groupElement->group->name + groupElement->tag->name]; - if (lastItemInGroup.contains(groupElement->group->name)) + if (lastItemInGroup.tqcontains(groupElement->group->name)) insertAfter = lastItemInGroup[groupElement->group->name]; StructTreeTag *item = new StructTreeTag(static_cast<StructTreeTag*>(insertUnder), currentNode, groupElement->tag->name, insertAfter); @@ -264,7 +264,7 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) if (currentNode->child) { currentNode = currentNode->child; - parentItem = item; + tqparentItem = item; currentItem = 0L; level++; } else @@ -276,35 +276,35 @@ void StructTreeView::buildTree(Node *baseNode, int openLevel, bool groupOnly) currentItem = item; } else { - //go up some levels, to the parent, if the node has no child or next + //go up some levels, to the tqparent, if the node has no child or next while (currentNode) { level--; - //parentItem = dynamic_cast<StructTreeTag*>(parentItem->parent()); - if (currentNode->parent && currentNode->parent->next) + //tqparentItem = dynamic_cast<StructTreeTag*>(tqparentItem->tqparent()); + if (currentNode->tqparent && currentNode->tqparent->next) { - currentNode = currentNode->parent->next; + currentNode = currentNode->tqparent->next; break; } else { - currentNode = currentNode->parent; + currentNode = currentNode->tqparent; } } if (!groupOnly && currentNode) { if (currentNode->prev) currentItem = static_cast<StructTreeTag*>(currentNode->prev->mainListItem); - if (currentNode->parent) + if (currentNode->tqparent) { - parentItem = static_cast<StructTreeTag*>(currentNode->parent->mainListItem); - if (!parentItem) + tqparentItem = static_cast<StructTreeTag*>(currentNode->tqparent->mainListItem); + if (!tqparentItem) { - parentItem = top; + tqparentItem = top; } } else { - parentItem = top; + tqparentItem = top; } } @@ -376,7 +376,7 @@ void StructTreeView::deleteList(bool groupOnly) groupsCount = 0; } -/** repaint document structure */ +/** tqrepaint document structure */ void StructTreeView::slotReparse(Document *w, Node* node, int openLevel, bool groupOnly) { timer->restart(); @@ -505,7 +505,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ setOpen(item, !isOpen(item)); setSelected(item, true); - bool const ctrlPressed = KApplication::keyboardMouseState() & Qt::ControlButton; + bool const ctrlPressed = KApplication::keyboardMouseState() & TQt::ControlButton; if(ctrlPressed) setContiguousSelectedItems(); @@ -764,9 +764,9 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const { e->accept(last_accept); /* if(last_accept) - m_thisWidget->setCursor(Qt::ForbiddenCursor); + m_thisWidget->setCursor(TQt::ForbiddenCursor); else - m_thisWidget->setCursor(Qt::ForbiddenCursor);*/ + m_thisWidget->setCursor(TQt::ForbiddenCursor);*/ kdDebug(25001) << "Princ�io: " << last_accept << endl; return last_accept; @@ -780,9 +780,9 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const e->accept(false); last_accept = false; /* if(last_accept) - m_thisWidget->setCursor(Qt::ForbiddenCursor); + m_thisWidget->setCursor(TQt::ForbiddenCursor); else - m_thisWidget->setCursor(Qt::ForbiddenCursor);*/ + m_thisWidget->setCursor(TQt::ForbiddenCursor);*/ kdDebug(25001) << "PROIBIDO! #1" << endl; return false; } @@ -794,14 +794,14 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const e->accept(false); last_accept = false; /* if(last_accept) - m_thisWidget->setCursor(Qt::ForbiddenCursor); + m_thisWidget->setCursor(TQt::ForbiddenCursor); else - m_thisWidget->setCursor(Qt::ForbiddenCursor);*/ + m_thisWidget->setCursor(TQt::ForbiddenCursor);*/ kdDebug(25001) << "PROIBIDO! #2" << endl; return false; } - QTag* nodeQTag = QuantaCommon::tagFromDTD(after_node->parent); - bool is_child = (nodeQTag && nodeQTag->isChild(dragged_node)); + TQTag* nodeTQTag = QuantaCommon::tagFromDTD(after_node->tqparent); + bool is_child = (nodeTQTag && nodeTQTag->isChild(dragged_node)); if(!is_child) kdDebug(25001) << "PROIBIDO! #3" << endl; @@ -811,14 +811,14 @@ bool StructTreeView::acceptDrag(TQDropEvent* e) const e->accept(is_child); last_accept = is_child; // if(last_accept) -// m_thisWidget->setCursor(Qt::ForbiddenCursor); +// m_thisWidget->setCursor(TQt::ForbiddenCursor); // else -// m_thisWidget->setCursor(Qt::ForbiddenCursor); +// m_thisWidget->setCursor(TQt::ForbiddenCursor); return is_child; } -void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after) +void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after) { if(!e) return; @@ -837,10 +837,10 @@ void StructTreeView::slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListV switch(id) { case DRAG_COPY: - copySelectedItems(parent, after); + copySelectedItems(tqparent, after); break; case DRAG_MOVE: - moveSelectedItems(parent, after); + moveSelectedItems(tqparent, after); break; case DRAG_CANCEL: // cancelled by menuitem break; @@ -866,7 +866,7 @@ void StructTreeView::startDrag() void StructTreeView::contentsMousePressEvent(TQMouseEvent* e) { - if(e->button() == LeftButton) + if(e->button() == Qt::LeftButton) { TQPoint p = contentsToViewport(e->pos()); m_draggedItem = itemAt(p); @@ -875,11 +875,11 @@ void StructTreeView::contentsMousePressEvent(TQMouseEvent* e) KListView::contentsMousePressEvent(e); } -void StructTreeView::copySelectedItems(TQListViewItem* parent, TQListViewItem* after) +void StructTreeView::copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after) { - StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (parent); + StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent); StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after); - if(!parent_item/* || !after_item*/) // can happen if the element is inserted as the first child + if(!tqparent_item/* || !after_item*/) // can happen if the element is inserted as the first child return; TQPtrList<TQListViewItem> selected_items = selectedItems(false); @@ -896,28 +896,28 @@ void StructTreeView::copySelectedItems(TQListViewItem* parent, TQListViewItem* a else start_node_subtree = kafkaCommon::getNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length()); - Node* parent_node = parent_item->node; - if(!parent_node) + Node* tqparent_node = tqparent_item->node; + if(!tqparent_node) return; Node* next_node = 0; if(after_item) next_node = after_item->node->SNext(); else - next_node = parent_node->firstChild(); + next_node = tqparent_node->firstChild(); NodeSelection cursor_holder; NodeModifsSet *modifs = new NodeModifsSet(); - kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs); + kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs); write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, 0, false); } -void StructTreeView::moveSelectedItems(TQListViewItem* parent, TQListViewItem* after) +void StructTreeView::moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after) { - StructTreeTag* parent_item = dynamic_cast<StructTreeTag*> (parent); + StructTreeTag* tqparent_item = dynamic_cast<StructTreeTag*> (tqparent); StructTreeTag* after_item = dynamic_cast<StructTreeTag*> (after); - if(!parent_item || !after_item) + if(!tqparent_item || !after_item) return; TQPtrList<TQListViewItem> selected_items = selectedItems(false); @@ -939,14 +939,14 @@ void StructTreeView::moveSelectedItems(TQListViewItem* parent, TQListViewItem* a start_node_subtree = kafkaCommon::DTDExtractNodeSubtree(start_node, 0, end_node, end_node->tag->tagStr().length(), &cursor_node, cursor_offset, modifs); - Node* parent_node = parent_item->node; - if(!parent_node) + Node* tqparent_node = tqparent_item->node; + if(!tqparent_node) return; Node* next_node = after_item->node->SNext(); NodeSelection cursor_holder(cursor_node, cursor_offset); - kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, parent_node, next_node, cursor_holder, modifs); + kafkaCommon::DTDInsertNodeSubtree(start_node_subtree, tqparent_node, next_node, cursor_holder, modifs); write->docUndoRedo->addNewModifsSet(modifs, undoRedo::NodeTreeModif, &cursor_holder, false); } @@ -979,7 +979,7 @@ void StructTreeView::setParsingDTDs(const TQStringList &parsingDTDList) if (dtdList[i] == dtdNickName) dtdMenu->setItemChecked(i, true); } - m_parsingDTDList.append(DTDs::ref()->find(*it)); + m_parsingDTDList.append(DTDs::ref()->tqfind(*it)); } } @@ -990,11 +990,11 @@ void StructTreeView::slotOpenFile() { TQString text = item->groupTag->name; text.remove(item->fileNameRx); - KURL baseUrl = QExtFileInfo::path(write->url()); + KURL baseUrl = TQExtFileInfo::path(write->url()); KURL url = baseUrl; QuantaCommon::setUrl(url, text.stripWhiteSpace()); - url = QExtFileInfo::toAbsolute(url, baseUrl); - if (QExtFileInfo::exists(url, true, this)) + url = TQExtFileInfo::toAbsolute(url, baseUrl); + if (TQExtFileInfo::exists(url, true, this)) { if (QuantaCommon::checkMimeGroup(url, "text" )) { @@ -1005,7 +1005,7 @@ void StructTreeView::slotOpenFile() emit openImage(url); } } else - KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>The file <b>%1</b> does not exist or is not a recognized mime type.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); } } diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index 45150579..09a95a07 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -40,6 +40,7 @@ struct DTDStruct; class StructTreeView : public KListView { Q_OBJECT + TQ_OBJECT public: /** @@ -48,10 +49,10 @@ public: * the parameters are only used at the first call to create the class * */ - static StructTreeView* const ref(TQWidget *parent = 0L, const char *name = 0L) + static StructTreeView* const ref(TQWidget *tqparent = 0L, const char *name = 0L) { static StructTreeView *m_ref; - if (!m_ref) m_ref = new StructTreeView (parent, name); + if (!m_ref) m_ref = new StructTreeView (tqparent, name); return m_ref; } @@ -71,7 +72,7 @@ public: bool useOpenLevelSetting; public slots: // Public slots - /** repaint document structure */ + /** tqrepaint document structure */ void slotReparse(Document *w, Node* node, int openLevel = 3,bool groupOnly=false); void slotMouseClicked(int button, TQListViewItem*, const TQPoint&, int); void slotDoubleClicked( TQListViewItem * ); @@ -112,7 +113,7 @@ private: * If you need the class use StructTreeView::ref() for * construction and reference */ - StructTreeView(TQWidget *parent=0, const char *name=0); + StructTreeView(TQWidget *tqparent=0, const char *name=0); /** builds the structure tree */ void buildTree(Node *baseNode, int openLevel, bool groupOnly); /** Do the recursive opening or closing of the trees */ @@ -121,8 +122,8 @@ private: /** Make ctrl have the same behavior has shift */ void setContiguousSelectedItems(); - void copySelectedItems(TQListViewItem* parent, TQListViewItem* after); - void moveSelectedItems(TQListViewItem* parent, TQListViewItem* after); + void copySelectedItems(TQListViewItem* tqparent, TQListViewItem* after); + void moveSelectedItems(TQListViewItem* tqparent, TQListViewItem* after); private: @@ -166,7 +167,7 @@ protected slots: // Protected slots void slotDTDChanged(int id); void slotMouseClickedVPL(int button, TQListViewItem*, const TQPoint&, int); - virtual void slotDropped(TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after); + virtual void slotDropped(TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after); protected: // Protected attributes Document *write; diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 176928c0..aa6c5215 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -40,13 +40,13 @@ #include "qextfileinfo.h" #include "styleeditor.h" -TopLevelItem::TopLevelItem(KListView* parent, const TQString &title) -: KListViewItem(parent, title) +TopLevelItem::TopLevelItem(KListView* tqparent, const TQString &title) +: KListViewItem(tqparent, title) { } -TopLevelItem::TopLevelItem(KListView* parent, TQListViewItem* after, const TQString &title) -: KListViewItem(parent, after, title) +TopLevelItem::TopLevelItem(KListView* tqparent, TQListViewItem* after, const TQString &title) +: KListViewItem(tqparent, after, title) { } @@ -62,7 +62,7 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg, return; // make toplevel item names bold - if (column == 0 && !parent()) + if (column == 0 && !tqparent()) { TQFont f = p->font(); f.setBold(true); @@ -76,16 +76,16 @@ void TopLevelItem::paintCell(TQPainter *p, const TQColorGroup &cg, } } -ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* parent) -: KListViewItem(parent) +ParentItem::ParentItem(TagAttributeTree *listView, TQListViewItem* tqparent) +: KListViewItem(tqparent) { m_listView = listView; comboBox = new TQComboBox(false, m_listView->viewport() ); - TQRect r = m_listView->itemRect( this ); + TQRect r = m_listView->tqitemRect( this ); if ( !r.size().isValid() ) { m_listView->ensureItemVisible( this ); - r = m_listView->itemRect( this ); + r = m_listView->tqitemRect( this ); } r.setX( m_listView->header()->sectionPos( 0 ) + 20); r.setWidth( m_listView->header()->sectionSize( 0 ) - 20); @@ -143,15 +143,15 @@ void ParentItem::showList(bool show) } //Generic attribute item -AttributeItem::AttributeItem(TQListViewItem* parent, const TQString &title, const TQString& title2) -: KListViewItem(parent, title, title2) +AttributeItem::AttributeItem(TQListViewItem* tqparent, const TQString &title, const TQString& title2) +: KListViewItem(tqparent, title, title2) { lin = 0L; lin2 = 0L; } -AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) -: KListViewItem(parent, title, title2) +AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) +: KListViewItem(tqparent, title, title2) { m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); @@ -262,11 +262,11 @@ void AttributeItem::hideEditor(int column) void AttributeItem::placeEditor( TQWidget *w, int column) { - TQRect r = m_listView->itemRect( this ); + TQRect r = m_listView->tqitemRect( this ); if ( !r.size().isValid() ) { m_listView->ensureItemVisible( this ); - r = m_listView->itemRect( this ); + r = m_listView->tqitemRect( this ); } if(column == 1) { @@ -284,8 +284,8 @@ void AttributeItem::placeEditor( TQWidget *w, int column) } //Boolean attribute item -AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) -: AttributeItem(parent, title, title2) +AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) +: AttributeItem(tqparent, title, title2) { m_listView = listView; combo = new TQComboBox( m_listView->viewport() ); @@ -324,8 +324,8 @@ void AttributeBoolItem::hideEditor(int) } //Boolean attribute item -AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) -: AttributeItem(parent, title, title2) +AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) +: AttributeItem(tqparent, title, title2) { m_listView = listView; urlRequester = new KURLRequester( m_listView->viewport() ); @@ -345,7 +345,7 @@ TQString AttributeUrlItem::editorText(int) QuantaCommon::setUrl(url, urlRequester->url()); baseURL = (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url(); baseURL.setPath(baseURL.directory()); - url = QExtFileInfo::toRelative(url, baseURL); + url = TQExtFileInfo::toRelative(url, baseURL); TQString s = url.url(); if (url.protocol() == (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url().protocol()) s.remove(0, url.protocol().length() + 3); @@ -360,7 +360,7 @@ void AttributeUrlItem::showEditor(int) baseURL = (static_cast<TagAttributeTree *>(m_listView))->node()->tag->write()->url(); baseURL.setPath(baseURL.directory()); QuantaCommon::setUrl(url, text(1)); - url= QExtFileInfo::toAbsolute(url, baseURL); + url= TQExtFileInfo::toAbsolute(url, baseURL); urlRequester->setURL(url.url()); urlRequester->setFocus(); } @@ -375,13 +375,13 @@ void AttributeUrlItem::hideEditor(int) //editable listbox //Boolean attribute item -AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2, Attribute *attr) -: AttributeItem(parent, title, title2) +AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2, Attribute *attr) +: AttributeItem(tqparent, title, title2) { m_listView = listView; combo = new TQComboBox( m_listView->viewport() ); Node *node = (static_cast<TagAttributeTree *>(m_listView))->node(); - QTag *qTag = QuantaCommon::tagFromDTD(node); + TQTag *qTag = QuantaCommon::tagFromDTD(node); if (qTag) { if (!attr) @@ -395,7 +395,7 @@ AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* par if (!attr->interface.isEmpty()) interface = attr->interface; TQString arguments = attr->arguments; - arguments.replace("%tagname%", node->tag->name); + arguments.tqreplace("%tagname%", node->tag->name); DCOPReply reply = QuantaCommon::callDCOPMethod(interface, attr->method, arguments); if (reply.isValid()) { @@ -428,13 +428,13 @@ void AttributeListItem::showEditor(int) combo->show(); int index = -1; Node *node = (static_cast<TagAttributeTree *>(m_listView))->node(); - QTag *qTag = QuantaCommon::tagFromDTD(node); + TQTag *qTag = QuantaCommon::tagFromDTD(node); if (qTag) { Attribute *attr = qTag->attribute(text(0)); if (attr) { - index = attr->values.findIndex(text(1)); + index = attr->values.tqfindIndex(text(1)); } } if (index != -1) @@ -455,8 +455,8 @@ void AttributeListItem::hideEditor(int) } //editable color combobox -AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) -: AttributeItem(parent, title, title2) +AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) +: AttributeItem(tqparent, title, title2) { m_listView = listView; combo = new KColorCombo( m_listView->viewport() ); @@ -499,8 +499,8 @@ void AttributeColorItem::hideEditor(int) } //editable style combobox -AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* parent, const TQString &title, const TQString& title2) -: AttributeItem(parent, title, title2) +AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* tqparent, const TQString &title, const TQString& title2) +: AttributeItem(tqparent, title, title2) { m_listView = listView; m_se = new StyleEditor( m_listView->viewport() ); diff --git a/quanta/treeviews/tagattributeitems.h b/quanta/treeviews/tagattributeitems.h index 81f5cb43..6992e14e 100644 --- a/quanta/treeviews/tagattributeitems.h +++ b/quanta/treeviews/tagattributeitems.h @@ -35,8 +35,8 @@ class TopLevelItem : public KListViewItem { public: - TopLevelItem(KListView *parent, const TQString& title); - TopLevelItem(KListView *parent, TQListViewItem* after, const TQString& title); + TopLevelItem(KListView *tqparent, const TQString& title); + TopLevelItem(KListView *tqparent, TQListViewItem* after, const TQString& title); virtual ~TopLevelItem(); @@ -50,7 +50,7 @@ class ParentItem : public KListViewItem { public: - ParentItem(TagAttributeTree *listView, TQListViewItem *parent); + ParentItem(TagAttributeTree *listView, TQListViewItem *tqparent); virtual ~ParentItem(); Node *node(int index); @@ -71,8 +71,8 @@ private: class AttributeItem : public KListViewItem { public: - AttributeItem(TQListViewItem* parent, const TQString& title, const TQString& title2); - AttributeItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); + AttributeItem(TQListViewItem* tqparent, const TQString& title, const TQString& title2); + AttributeItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2); AttributeItem(EditableTree *listView, const TQString& title, const TQString& title2, TQListViewItem* after); @@ -97,8 +97,8 @@ protected: class AttributeNameSpaceItem:public AttributeItem { public: - AttributeNameSpaceItem(TQListViewItem* parent, const TQString& title, const TQString& title2): AttributeItem(parent, title, title2){}; - AttributeNameSpaceItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2):AttributeItem(listView, parent, title, title2){}; + AttributeNameSpaceItem(TQListViewItem* tqparent, const TQString& title, const TQString& title2): AttributeItem(tqparent, title, title2){}; + AttributeNameSpaceItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2):AttributeItem(listView, tqparent, title, title2){}; virtual ~AttributeNameSpaceItem(){}; }; @@ -106,7 +106,7 @@ public: class AttributeBoolItem : public AttributeItem { public: - AttributeBoolItem(TagAttributeTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); + AttributeBoolItem(TagAttributeTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); virtual ~AttributeBoolItem(); virtual void showEditor(int column = 1); @@ -120,7 +120,7 @@ private: class AttributeUrlItem : public AttributeItem { public: - AttributeUrlItem(TagAttributeTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); + AttributeUrlItem(TagAttributeTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); virtual ~AttributeUrlItem(); virtual void showEditor(int column = 1); @@ -134,7 +134,7 @@ private: class AttributeListItem : public AttributeItem { public: - AttributeListItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2, Attribute *attr = 0L); + AttributeListItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2, Attribute *attr = 0L); virtual ~AttributeListItem(); virtual void showEditor(int column = 1); @@ -148,7 +148,7 @@ private: class AttributeColorItem : public AttributeItem { public: - AttributeColorItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); + AttributeColorItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); virtual ~AttributeColorItem(); virtual void showEditor(int column = 1); @@ -162,7 +162,7 @@ private: class AttributeStyleItem : public AttributeItem { public: - AttributeStyleItem(EditableTree *listView, TQListViewItem* parent, const TQString& title, const TQString& title2); + AttributeStyleItem(EditableTree *listView, TQListViewItem* tqparent, const TQString& title, const TQString& title2); virtual ~AttributeStyleItem(); virtual void showEditor(int column = 1); diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 9ea6fc40..46de89b3 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -50,8 +50,8 @@ #include "viewmanager.h" -EditableTree::EditableTree(TQWidget *parent, const char *name) -: KListView(parent, name) +EditableTree::EditableTree(TQWidget *tqparent, const char *name) +: KListView(tqparent, name) { m_editable = true; } @@ -100,11 +100,11 @@ void EditableTree::focusOutEvent(TQFocusEvent *) }*/ } -DualEditableTree::DualEditableTree(TQWidget *parent, const char *name) -: EditableTree(parent, name) +DualEditableTree::DualEditableTree(TQWidget *tqparent, const char *name) +: EditableTree(tqparent, name) { curCol = 0; - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); this->installEventFilter(this); connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); @@ -128,7 +128,7 @@ bool DualEditableTree::eventFilter(TQObject *object, TQEvent *event) if(event->type() == TQEvent::KeyPress && m_editable) { - TQKeyEvent *keyevent = static_cast<TQKeyEvent *>(event); + TQKeyEvent *keyevent = TQT_TQKEYEVENT(event); switch(keyevent->key()) { case Key_Left: @@ -216,14 +216,14 @@ void DualEditableTree::itemClicked(TQListViewItem *item, const TQPoint &, int co } } -TagAttributeTree::TagAttributeTree(TQWidget *parent, const char *name) -: EditableTree(parent, name) +TagAttributeTree::TagAttributeTree(TQWidget *tqparent, const char *name) +: EditableTree(tqparent, name) { setRootIsDecorated( true ); setSorting(-1); setFrameStyle( Panel | Sunken ); setLineWidth( 2 ); - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); addColumn(i18n("Attribute Name")); addColumn(i18n("Value")); setResizeMode(TQListView::LastColumn); @@ -247,9 +247,9 @@ void TagAttributeTree::setCurrentNode(Node *node) return; clear(); m_parentItem = 0L; - //We don't want to be able to edit the text node but it's parent. + //We don't want to be able to edit the text node but it's tqparent. if (node && node->tag->type == Tag::Text) - m_node = node = node->parent; + m_node = node = node->tqparent; if (!node) return; #ifdef HEAVY_DEBUG @@ -259,8 +259,8 @@ void TagAttributeTree::setCurrentNode(Node *node) AttributeItem *item = 0L; TopLevelItem *group = 0L; TQString attrName; - QTag *qTag = QuantaCommon::tagFromDTD(node); - Node *n = node->parent; + TQTag *qTag = QuantaCommon::tagFromDTD(node); + Node *n = node->tqparent; while (n) { if (n->tag->type == Tag::XmlTag) @@ -272,7 +272,7 @@ void TagAttributeTree::setCurrentNode(Node *node) } m_parentItem->addNode(n); } - n = n->parent; + n = n->tqparent; } if (m_parentItem) @@ -333,7 +333,7 @@ void TagAttributeTree::setCurrentNode(Node *node) for (uint i = 0; i < qTag->commonGroups.count(); i++) { group = new TopLevelItem(this, group, i18n(qTag->commonGroups[i].utf8())); - AttributeList *groupAttrs = qTag->parentDTD->commonAttrs->find(qTag->commonGroups[i]); + AttributeList *groupAttrs = qTag->tqparentDTD->commonAttrs->tqfind(qTag->commonGroups[i]); for (uint j = 0; j < groupAttrs->count(); j++) { Attribute *attr = groupAttrs->at(j); @@ -429,13 +429,13 @@ void TagAttributeTree::slotParentSelected(int index) void TagAttributeTree::slotCollapsed(TQListViewItem *item) { - if (m_parentItem && item == m_parentItem->parent()) + if (m_parentItem && item == m_parentItem->tqparent()) m_parentItem->showList(false); } void TagAttributeTree::slotExpanded(TQListViewItem *item) { - if (m_parentItem && item == m_parentItem->parent()) + if (m_parentItem && item == m_parentItem->tqparent()) m_parentItem->showList(true); } @@ -451,18 +451,18 @@ void TagAttributeTree::slotDelayedSetCurrentNode() } } -EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char *name) -: TQWidget(parent, name) +EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *tqparent, const char *name) +: TQWidget(tqparent, name) { widgetLayout = new TQGridLayout( this, 1, 1, 11, 6, "MainLayout"); attrTree = new TagAttributeTree(this, "TagAttributeTree"); - attrTree->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); + attrTree->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); widgetLayout->addMultiCellWidget( attrTree, 1, 1, 0, 3 ); nodeName = new TQLabel(this, i18n( "Node Name" ).ascii()); - nodeName->setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) ); + nodeName->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed, 0, 0, nodeName->sizePolicy().hasHeightForWidth() ) ); widgetLayout->addWidget( nodeName, 0, 0 ); deleteTag = new KPushButton(this, i18n( "Delete Tag" ).ascii()); @@ -475,7 +475,7 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char deleteAll->setPixmap(SmallIcon("editdelete")); deleteAll->setMaximumHeight(32); deleteAll->setMaximumWidth(32); - TQToolTip::add(deleteAll, i18n("Delete the current tag and all its children.")); + TQToolTip::add(deleteAll, i18n("Delete the current tag and all its tqchildren.")); widgetLayout->addWidget( deleteTag, 0, 2 ); widgetLayout->addWidget( deleteAll, 0, 3 ); @@ -501,9 +501,9 @@ void EnhancedTagAttributeTree::setCurrentNode(Node *node) void EnhancedTagAttributeTree::NodeSelected(Node *node) { curNode = node; - //We don't want to be able to edit the text node but it's parent. + //We don't want to be able to edit the text node but it's tqparent. if (node && node->tag->type == Tag::Text) - curNode = node = node->parent; + curNode = node = node->tqparent; showCaption(); emit newNodeSelected(node); } @@ -515,7 +515,7 @@ void EnhancedTagAttributeTree::showCaption() if(curNode->tag->type == Tag::XmlTag || curNode->tag->type == Tag::XmlTagEnd || curNode->tag->type == Tag::ScriptTag) { - TQString s = i18n("Current tag: <b>%1</b>").arg(curNode->tag->name); + TQString s = i18n("Current tag: <b>%1</b>").tqarg(curNode->tag->name); nodeName->setText(KStringHandler::rPixelSqueeze(s, nodeName->fontMetrics(), attrTree->width()- 50)); } else if(curNode->tag->type == Tag::Text) @@ -586,7 +586,7 @@ void EnhancedTagAttributeTree::deleteNode() return; Node *oldCurNode, *oldCurNodeParent, *child; - QTag *oldCurNodeParentQTag; + TQTag *oldCurNodeParentTQTag; int curLine, curCol; long offset; DOM::Node domNode; @@ -614,23 +614,23 @@ void EnhancedTagAttributeTree::deleteNode() //remove the Nodes oldCurNode = curNode; - oldCurNodeParent = curNode->parent; + oldCurNodeParent = curNode->tqparent; curNode = 0L; attrTree->setCurrentNode(curNode); modifs = new NodeModifsSet(); kafkaCommon::extractAndDeleteNode(oldCurNode, modifs, false); - //Then we see if the new parent - child relationships are valid, and if not, delete the child and restart + //Then we see if the new tqparent - child relationships are valid, and if not, delete the child and restart if(oldCurNodeParent) { - oldCurNodeParentQTag = QuantaCommon::tagFromDTD(oldCurNodeParent); - if(oldCurNodeParentQTag) + oldCurNodeParentTQTag = QuantaCommon::tagFromDTD(oldCurNodeParent); + if(oldCurNodeParentTQTag) { child = oldCurNodeParent->child; while(child) { - if(!oldCurNodeParentQTag->isChild(child)) + if(!oldCurNodeParentTQTag->isChild(child)) { kafkaCommon::extractAndDeleteNode(child, modifs, false); //too lazy to get the real next node ;-) diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h index f396589f..32dea87a 100644 --- a/quanta/treeviews/tagattributetree.h +++ b/quanta/treeviews/tagattributetree.h @@ -33,9 +33,10 @@ class TQGridLayout; class EditableTree : public KListView { Q_OBJECT + TQ_OBJECT public: - EditableTree(TQWidget *parent = 0, const char *name = 0); + EditableTree(TQWidget *tqparent = 0, const char *name = 0); virtual ~EditableTree(); virtual void setCurrentItem( TQListViewItem *i); @@ -55,8 +56,9 @@ protected: class DualEditableTree : public EditableTree { Q_OBJECT + TQ_OBJECT public: - DualEditableTree(TQWidget *parent = 0, const char *name = 0); + DualEditableTree(TQWidget *tqparent = 0, const char *name = 0); virtual ~DualEditableTree(); virtual void setCurrentItem ( TQListViewItem *i); @@ -81,9 +83,10 @@ private: class TagAttributeTree : public EditableTree { Q_OBJECT + TQ_OBJECT public: - TagAttributeTree(TQWidget *parent=0, const char *name=0); + TagAttributeTree(TQWidget *tqparent=0, const char *name=0); virtual ~TagAttributeTree(); void setCurrentNode(Node *node); @@ -110,11 +113,12 @@ private: }; //An enhanced TagAttributeTree with the tag name and buttons to delete the tag. -class EnhancedTagAttributeTree : public QWidget +class EnhancedTagAttributeTree : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EnhancedTagAttributeTree(TQWidget *parent = 0, const char *name = 0); + EnhancedTagAttributeTree(TQWidget *tqparent = 0, const char *name = 0); virtual ~EnhancedTagAttributeTree(); void setCurrentNode(Node *node); diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index 4ab6d6c1..6e2f41bb 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -10,7 +10,7 @@ </comment> <author>(C) 2002 by Andras Mantia <amantia@kde.org></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>TemplateDirForm</cstring> </property> @@ -29,7 +29,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>TextLabel2</cstring> </property> @@ -37,7 +37,7 @@ <string>Type:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -50,22 +50,22 @@ <cstring>typesCombo</cstring> </property> </widget> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>dirName</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>parentAttr</cstring> + <cstring>tqparentAttr</cstring> </property> <property name="text"> - <string>&Inherit parent attribute</string> + <string>&Inherit tqparent attribute</string> </property> </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> @@ -81,14 +81,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>38</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonOk</cstring> </property> @@ -109,14 +109,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>buttonCancel</cstring> </property> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>38</width> <height>20</height> @@ -147,7 +147,7 @@ </widget> <connections> <connection> - <sender>parentAttr</sender> + <sender>tqparentAttr</sender> <signal>toggled(bool)</signal> <receiver>typesCombo</receiver> <slot>setDisabled(bool)</slot> @@ -156,14 +156,14 @@ <tabstops> <tabstop>dirName</tabstop> <tabstop>typesCombo</tabstop> - <tabstop>parentAttr</tabstop> + <tabstop>tqparentAttr</tabstop> <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>okBtn_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> </includehints> diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index f1eaca73..75218842 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -79,22 +79,22 @@ TQMap<TQString, TQString> i18nToType; //TemplatesTreeBranch implementation -TemplatesTreeBranch::TemplatesTreeBranch(KFileTreeView *parent, const KURL& url, +TemplatesTreeBranch::TemplatesTreeBranch(KFileTreeView *tqparent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden, KFileTreeViewItem *branchRoot) - : BaseTreeBranch(parent, url, name, pix, showHidden, branchRoot) + : BaseTreeBranch(tqparent, url, name, pix, showHidden, branchRoot) { } -KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *parent, +KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem ) { BaseTreeViewItem *tvi = 0; - if( parent && fileItem ) + if( tqparent && fileItem ) { KURL url = fileItem->url(); - tvi = new BaseTreeViewItem( parent, fileItem, this ); + tvi = new BaseTreeViewItem( tqparent, fileItem, this ); if (tvi && fileItem->isDir()) { if (url.isLocalFile()) @@ -106,7 +106,7 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *pa } } else { - url = static_cast<BaseTreeViewItem*>(parent)->url(); + url = static_cast<BaseTreeViewItem*>(tqparent)->url(); } TQFileInfo dotFileInfo(url.path() + "/.dirinfo"); while ((!dotFileInfo.exists()) && (dotFileInfo.dirPath() != "/")) @@ -123,14 +123,14 @@ KFileTreeViewItem* TemplatesTreeBranch::createTreeViewItem(KFileTreeViewItem *pa } else - kdDebug(24000) << "TemplatesTreeBranch::createTreeViewItem: Have no parent" << endl; + kdDebug(24000) << "TemplatesTreeBranch::createTreeViewItem: Have no tqparent" << endl; return tvi; } -TemplatesTreeView::TemplatesTreeView(KMainWindow *parent, const char *name ) - : BaseTreeView(parent,name), m_projectDir(0), m_mainWindow(parent) +TemplatesTreeView::TemplatesTreeView(KMainWindow *tqparent, const char *name ) + : BaseTreeView(tqparent,name), m_projectDir(0), m_mainWindow(tqparent) { typeToi18n["text/all"] = i18n("Text Snippet"); typeToi18n["file/all"] = i18n("Binary File"); @@ -285,13 +285,13 @@ void TemplatesTreeView::slotMenu(KListView*, TQListViewItem *item, const TQPoint TQString menuText = ""; - if (m_dirInfo.mimeType.upper().contains("TEXT")) + if (m_dirInfo.mimeType.upper().tqcontains("TEXT")) menuText = i18n(textMenu.utf8()); - else if (m_dirInfo.mimeType.upper().contains("FILE")) + else if (m_dirInfo.mimeType.upper().tqcontains("FILE")) menuText = i18n(binaryMenu.utf8()); - else if (m_dirInfo.mimeType.upper().contains("TEMPLATE")) + else if (m_dirInfo.mimeType.upper().tqcontains("TEMPLATE")) menuText = i18n(docMenu.utf8()); - else if (m_dirInfo.mimeType.upper().contains("SITE")) + else if (m_dirInfo.mimeType.upper().tqcontains("SITE")) menuText = i18n(siteMenu.utf8()); if (menuText.isEmpty()) @@ -350,17 +350,17 @@ void TemplatesTreeView::slotSelectFile(TQListViewItem *item) if ( !kftvItem->isDir() ) { m_dirInfo = readDirInfo(); -/* if (m_dirInfo.mimeType.upper().contains("SITE")) +/* if (m_dirInfo.mimeType.upper().tqcontains("SITE")) { slotExtractSiteTemplate(); return; }*/ if (expandArchiv(kftvItem)) return; - if (m_dirInfo.mimeType.upper().contains("TEXT")) + if (m_dirInfo.mimeType.upper().tqcontains("TEXT")) slotInsertInDocument(); - else if (m_dirInfo.mimeType.upper().contains("FILE")) + else if (m_dirInfo.mimeType.upper().tqcontains("FILE")) slotInsertTag(); - else if (m_dirInfo.mimeType.upper().contains("TEMPLATE")) + else if (m_dirInfo.mimeType.upper().tqcontains("TEMPLATE")) slotNewDocument(); } } @@ -383,10 +383,10 @@ void TemplatesTreeView::slotNewDir() if (m_dirInfo.mimeType.isEmpty()) { - createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); + createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); } else { - createDirDlg->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_dirInfo.mimeType])); + createDirDlg->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_dirInfo.mimeType])); } if (createDirDlg->exec()) { @@ -404,10 +404,10 @@ void TemplatesTreeView::slotNewDir() if (!dir.mkdir(startDir+"/"+createDirDlg->dirName->text())) { KMessageBox::error(this,i18n("Error while creating the new folder.\n \ - Maybe you do not have permission to write in the %1 folder.").arg(startDir)); + Maybe you do not have permission to write in the %1 folder.").tqarg(startDir)); return; } - if (! createDirDlg->parentAttr->isChecked()) + if (! createDirDlg->tqparentAttr->isChecked()) { m_dirInfo.mimeType = i18nToType[createDirDlg->typesCombo->currentText()]; m_dirInfo.preText = ""; @@ -465,15 +465,15 @@ void TemplatesTreeView::contentsDropEvent(TQDropEvent *e) *(tempFile->textStream()) << content; tempFile->close(); bool proceed = true; - if (QExtFileInfo::exists(url, false, this)) + if (TQExtFileInfo::exists(url, false, this)) { - proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; + proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue; } if (proceed) { if (!QuantaNetAccess::upload(tempFile->name(), url, m_parent, false)) { - KMessageBox::error(this,i18n("<qt>Could not write to file <b>%1</b>.<br>Check if you have rights to write there or that your connection is working.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this,i18n("<qt>Could not write to file <b>%1</b>.<br>Check if you have rights to write there or that your connection is working.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol))); } } delete tempFile; @@ -612,14 +612,14 @@ void TemplatesTreeView::slotProperties() m_parentDirInfo = readDirInfo(dotFileInfo.dirPath()); if (!dotFileInfo.exists() || m_dirInfo.mimeType == m_parentDirInfo.mimeType) { - m_quantaProperties->parentAttr->setChecked(true); + m_quantaProperties->tqparentAttr->setChecked(true); } if (m_parentDirInfo.mimeType.isEmpty()) { - m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (nothing)")); + m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (nothing)")); } else { - m_quantaProperties->parentAttr->setText(i18n("&Inherit parent attribute (%1)").arg(typeToi18n[m_parentDirInfo.mimeType])); + m_quantaProperties->tqparentAttr->setText(i18n("&Inherit tqparent attribute (%1)").tqarg(typeToi18n[m_parentDirInfo.mimeType])); } m_quantaProperties->preTextEdit->setText(m_dirInfo.preText); m_quantaProperties->postTextEdit->setText(m_dirInfo.postText); @@ -652,7 +652,7 @@ void TemplatesTreeView::slotProperties() TQString type = el.attribute("type", "tag"); if (type == "script") { - tmpStr = action->text().replace(TQRegExp("\\&(?!\\&)"),""); + tmpStr = action->text().tqreplace(TQRegExp("\\&(?!\\&)"),""); m_quantaProperties->actionCombo->insertItem(tmpStr); if (tmpStr == name) pos = j; @@ -681,7 +681,7 @@ void TemplatesTreeView::slotPropertiesApplied() DirInfo m_localDirInfo; TQString typeString = ""; - if (!m_quantaProperties->parentAttr->isChecked()) + if (!m_quantaProperties->tqparentAttr->isChecked()) { m_localDirInfo.mimeType = m_quantaProperties->typesCombo->currentText(); typeString = m_localDirInfo.mimeType; @@ -709,10 +709,10 @@ void TemplatesTreeView::slotPropertiesApplied() bool result = writeDirInfo(); KFileTreeViewItem *item = currentKFileTreeViewItem(); if (item && !item->isDir()) - item = static_cast<KFileTreeViewItem *>(item->parent()); + item = static_cast<KFileTreeViewItem *>(item->tqparent()); if (result && item && !typeString.isEmpty()) { - if (item->parent() && item->isDir()) + if (item->tqparent() && item->isDir()) item->setText(1, typeString); updateTypeDescription(item, typeString); } @@ -723,7 +723,7 @@ void TemplatesTreeView::slotPropertiesApplied() void TemplatesTreeView::updateTypeDescription(KFileTreeViewItem *item, const TQString &typeString) { - if (item->parent() && item->isDir()) + if (item->tqparent() && item->isDir()) item->setText(1, typeString); KFileTreeViewItem *curItem = static_cast<KFileTreeViewItem *>(item->firstChild()); while (curItem && curItem != static_cast<KFileTreeViewItem *>(item->nextSibling())) @@ -783,7 +783,7 @@ void TemplatesTreeView::slotDragInsert(TQDropEvent *e) { if(m_dirInfo.mimeType == "text/all") // default to inserting in document { - if(!mimeType.contains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes) + if(!mimeType.tqcontains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes) { return; } @@ -798,7 +798,7 @@ void TemplatesTreeView::slotDragInsert(TQDropEvent *e) else if(m_dirInfo.mimeType == "template/all") { - if(!mimeType.contains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes) + if(!mimeType.tqcontains("text", false) && QuantaCommon::denyBinaryInsert(this) != KMessageBox::Yes) { return; } @@ -846,7 +846,7 @@ void TemplatesTreeView::slotPaste() { if (currentItem()) { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); KURL::List list( TQStringList::split( TQChar('\n'), cb->text() ) ); KURL url; @@ -873,11 +873,11 @@ void TemplatesTreeView::slotDelete() KURL url = currentURL(); TQString msg; if ( currentKFileTreeViewItem()->isDir() ) - msg = i18n("Do you really want to delete folder \n%1 ?\n").arg(url.path()); + msg = i18n("Do you really want to delete folder \n%1 ?\n").tqarg(url.path()); else - msg = i18n("Do you really want to delete file \n%1 ?\n").arg(url.path()); + msg = i18n("Do you really want to delete file \n%1 ?\n").tqarg(url.path()); - if ( KMessageBox::warningContinueCancel(this, msg, TQString::null, KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { KIO::Job *job = KIO::del(url); connect( job, TQT_SIGNAL( result( KIO::Job *) ), this , TQT_SLOT( slotJobFinished( KIO::Job *) ) ); @@ -911,7 +911,7 @@ KURL TemplatesTreeView::filterTemplate() TQDomElement el = action->data(); TQString type = el.attribute("type", "tag"); tmpStr = action->text(); - tmpStr.replace(TQRegExp("\\&(?!\\&)"),""); + tmpStr.tqreplace(TQRegExp("\\&(?!\\&)"),""); if (type == "script" && tmpStr == name) { filterAction = action; @@ -925,7 +925,7 @@ KURL TemplatesTreeView::filterTemplate() filterAction->setInputFileName(url.path()); filterAction->execute(true); filterAction->setOutputFile(0L); - filterAction->setInputFileName(TQString::null); + filterAction->setInputFileName(TQString()); tempFile->close(); tempFileList.append(tempFile); url.setPath(tempFile->name()); @@ -953,14 +953,14 @@ TQString TemplatesTreeView::createTemplateTarball() if ( ! currentKFileTreeViewItem()->isDir() ) files.append(url); else { - files = QExtFileInfo::allFiles(dirURL, "*", this) ; + files = TQExtFileInfo::allFiles(dirURL, "*", this) ; dirURL = dirURL.upURL(); } for ( KURL::List::Iterator it_f = files.begin(); it_f != files.end(); ++it_f ) { if (!(*it_f).fileName(false).isEmpty()) { - url = QExtFileInfo::toRelative( (*it_f), dirURL) ; + url = TQExtFileInfo::toRelative( (*it_f), dirURL) ; TQFile file((*it_f).path()); file.open(IO_ReadOnly); @@ -1006,7 +1006,7 @@ void TemplatesTreeView::slotSendInMail() delete mailDlg; return; } - kapp->invokeMailer(toStr, TQString::null, TQString::null, subjectStr, message, TQString::null, attachmentFile); + kapp->invokeMailer(toStr, TQString(), TQString(), subjectStr, message, TQString(), attachmentFile); } delete mailDlg; } @@ -1062,9 +1062,9 @@ void TemplatesTreeView::slotExtractSiteTemplate() } else error = true; KIO::NetAccess::removeTempFile(tempFile); - if (!m_projectBaseURL.isEmpty() && !QExtFileInfo::toRelative(targetURL, m_projectBaseURL).url().startsWith(".")) + if (!m_projectBaseURL.isEmpty() && !TQExtFileInfo::toRelative(targetURL, m_projectBaseURL).url().startsWith(".")) { - if (KMessageBox::questionYesNo(this, i18n("You have extracted the site template to a folder which is not under your main project folder.\nDo you want to copy the folder into the main project folder?"), TQString::null, i18n("Copy Folder"), i18n("Do Not Copy")) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(this, i18n("You have extracted the site template to a folder which is not under your main project folder.\nDo you want to copy the folder into the main project folder?"), TQString(), i18n("Copy Folder"), i18n("Do Not Copy")) == KMessageBox::Yes) { emit insertDirInProject(targetURL); } @@ -1072,7 +1072,7 @@ void TemplatesTreeView::slotExtractSiteTemplate() } else error = true; if (error) - KMessageBox::error(this, i18n("<qt>Some error happened while extracting the <i>%1</i> site template file.<br>Check that you have write permission for <i>%2</i> and that there is enough free space in your temporary folder.</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)).arg(targetURL.prettyURL(0, KURL::StripFileProtocol))); + KMessageBox::error(this, i18n("<qt>Some error happened while extracting the <i>%1</i> site template file.<br>Check that you have write permission for <i>%2</i> and that there is enough free space in your temporary folder.</qt>").tqarg(url.prettyURL(0, KURL::StripFileProtocol)).tqarg(targetURL.prettyURL(0, KURL::StripFileProtocol))); } } diff --git a/quanta/treeviews/templatestreeview.h b/quanta/treeviews/templatestreeview.h index 7816cffd..efccc56a 100644 --- a/quanta/treeviews/templatestreeview.h +++ b/quanta/treeviews/templatestreeview.h @@ -27,18 +27,19 @@ class KMainWindow; class TemplatesTreeBranch : public BaseTreeBranch { public: - TemplatesTreeBranch(KFileTreeView *parent, const KURL& url, + TemplatesTreeBranch(KFileTreeView *tqparent, const KURL& url, const TQString& name, const TQPixmap& pix, bool showHidden = false, KFileTreeViewItem *branchRoot = 0L); /** read the mimetype */ - virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *parent, + virtual KFileTreeViewItem* createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem ); }; class TemplatesTreeView : public BaseTreeView { Q_OBJECT + TQ_OBJECT public: @@ -48,18 +49,18 @@ public: * the parameter are only used at the first call to create the class * */ - static TemplatesTreeView* const ref(KMainWindow *parent = 0L, const char *name = 0L) + static TemplatesTreeView* const ref(KMainWindow *tqparent = 0L, const char *name = 0L) { static TemplatesTreeView *m_ref; - if (!m_ref) m_ref = new TemplatesTreeView (parent, name); + if (!m_ref) m_ref = new TemplatesTreeView (tqparent, name); return m_ref; } ~TemplatesTreeView(); /** Writes a .dirinfo file from the selected item's path */ - bool writeDirInfo(const TQString& dirInfoFile = TQString::null); + bool writeDirInfo(const TQString& dirInfoFile = TQString()); /** Reads a .dirinfo file from the selected item's path */ - DirInfo readDirInfo(const TQString& dir = TQString::null); + DirInfo readDirInfo(const TQString& dir = TQString()); public slots: @@ -118,7 +119,7 @@ private: * If you need the class use TemplatesTreeView::ref() for * construction and reference */ - TemplatesTreeView(KMainWindow *parent, const char *name = 0L); + TemplatesTreeView(KMainWindow *tqparent, const char *name = 0L); /** Filters the template through and action, and returns the modified/filtered template file */ KURL filterTemplate(); diff --git a/quanta/treeviews/uploadtreefile.cpp b/quanta/treeviews/uploadtreefile.cpp index 9c055424..f43b8f99 100644 --- a/quanta/treeviews/uploadtreefile.cpp +++ b/quanta/treeviews/uploadtreefile.cpp @@ -27,12 +27,12 @@ #include "uploadtreefile.h" #include "resource.h" -UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) +UploadTreeFile::UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, const KFileItem &a_fileItem) + : KListViewItem( tqparent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; - parentFolder = parent; + tqparentFolder = tqparent; m_fileItem = new KFileItem(a_fileItem); m_confirm = false; @@ -40,12 +40,12 @@ UploadTreeFile::UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, con setText(0, m_url.fileName()); } -UploadTreeFile::UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem) - : KListViewItem( parent, a_url.fileName(), "", TQString("%1").arg( (long int)a_fileItem.size() ), a_fileItem.timeString()) +UploadTreeFile::UploadTreeFile( TQListView *tqparent, const KURL &a_url, const KFileItem &a_fileItem) + : KListViewItem( tqparent, a_url.fileName(), "", TQString("%1").tqarg( (long int)a_fileItem.size() ), a_fileItem.timeString()) { m_url = a_url; isDir = false; - parentFolder = 0L; + tqparentFolder = 0L; m_fileItem = new KFileItem(a_fileItem); m_confirm = false; diff --git a/quanta/treeviews/uploadtreefile.h b/quanta/treeviews/uploadtreefile.h index 736a3a88..c2a118fc 100644 --- a/quanta/treeviews/uploadtreefile.h +++ b/quanta/treeviews/uploadtreefile.h @@ -28,8 +28,8 @@ class KFileItem; class UploadTreeFile : public KListViewItem { public: - UploadTreeFile( UploadTreeFolder *parent, const KURL &a_url, const KFileItem &a_fileItem); - UploadTreeFile( TQListView *parent, const KURL &a_url, const KFileItem &a_fileItem); + UploadTreeFile( UploadTreeFolder *tqparent, const KURL &a_url, const KFileItem &a_fileItem); + UploadTreeFile( TQListView *tqparent, const KURL &a_url, const KFileItem &a_fileItem); ~UploadTreeFile(); void setWhichPixmap(const TQString& pixmap); @@ -43,7 +43,7 @@ public: bool confirmUpload() {return m_confirm;} public: - UploadTreeFolder * parentFolder; + UploadTreeFolder * tqparentFolder; KURL m_url; bool isDir; bool m_confirm; diff --git a/quanta/treeviews/uploadtreefolder.cpp b/quanta/treeviews/uploadtreefolder.cpp index 123eaf35..dc43419c 100644 --- a/quanta/treeviews/uploadtreefolder.cpp +++ b/quanta/treeviews/uploadtreefolder.cpp @@ -27,10 +27,10 @@ #include "uploadtreefile.h" #include "resource.h" -UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent, const char * name ) - : KListViewItem( parent, name, "", "", "" ) +UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * tqparent, const char * name ) + : KListViewItem( tqparent, name, "", "", "" ) { - parentFolder = parent; + tqparentFolder = tqparent; m_url = a_url; m_url.adjustPath(1); @@ -40,10 +40,10 @@ UploadTreeFolder::UploadTreeFolder(const KURL &a_url, UploadTreeFolder * parent, } -UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * parent, const char * name ) - : KListViewItem( parent, name, "", "", "" ) +UploadTreeFolder::UploadTreeFolder(const KURL &a_url, TQListView * tqparent, const char * name ) + : KListViewItem( tqparent, name, "", "", "" ) { - parentFolder = 0L; + tqparentFolder = 0L; m_url = a_url; m_url.adjustPath(1); @@ -64,9 +64,9 @@ TQString UploadTreeFolder::fullName() { TQString s=""; - if ( parentFolder ) + if ( tqparentFolder ) { - s = parentFolder->fullName(); + s = tqparentFolder->fullName(); s += m_url.fileName()+"/"; } else { diff --git a/quanta/treeviews/uploadtreefolder.h b/quanta/treeviews/uploadtreefolder.h index d6959ab3..000c14bf 100644 --- a/quanta/treeviews/uploadtreefolder.h +++ b/quanta/treeviews/uploadtreefolder.h @@ -32,8 +32,8 @@ class KURL; class UploadTreeFolder : public KListViewItem { public: - UploadTreeFolder( const KURL &a_url, TQListView * parent, const char * name); - UploadTreeFolder( const KURL &a_url, UploadTreeFolder * parent, const char * name ); + UploadTreeFolder( const KURL &a_url, TQListView * tqparent, const char * name); + UploadTreeFolder( const KURL &a_url, UploadTreeFolder * tqparent, const char * name ); virtual ~UploadTreeFolder(); /** used for sorting */ @@ -46,7 +46,7 @@ public: void setWhichPixmap(const TQString& pixmap ); public: - UploadTreeFolder * parentFolder; + UploadTreeFolder * tqparentFolder; KURL m_url; public slots: // Public slots diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 486a6156..250cc3a2 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -23,8 +23,8 @@ #include "uploadtreeview.h" #include "quantacommon.h" -UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : - KListView(parent, name) +UploadTreeView::UploadTreeView( TQWidget *tqparent, const char *name ) : + KListView(tqparent, name) { setRootIsDecorated( true ); setSorting( 0 ); @@ -37,7 +37,7 @@ UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : addColumn( i18n("Size") ); addColumn( i18n("Date") ); - setFocusPolicy(TQWidget::ClickFocus); + setFocusPolicy(TQ_ClickFocus); connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectFile())); connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), @@ -52,12 +52,12 @@ UploadTreeView::~UploadTreeView() int UploadTreeView::checkboxTree( TQListViewItem *it ) { - parentWidget()->setCursor(KCursor::workingCursor()); + tqparentWidget()->setCursor(KCursor::workingCursor()); TQListViewItem *itIter = it ? it->firstChild() : firstChild(); - // bitFlag structure: (0/1)all children exist (0/1)no children exist. - // We don't need some children as a bit flag, because that's implied if the bits are "00". + // bitFlag structure: (0/1)all tqchildren exist (0/1)no tqchildren exist. + // We don't need some tqchildren as a bit flag, because that's implied if the bits are "00". int bitFlags = 3; int retVal = 1; @@ -73,17 +73,17 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) UploadTreeFolder *itF = static_cast<UploadTreeFolder *>(itIter); if (hadCheckFlags == 2) { - // All children exist. + // All tqchildren exist. itF->setWhichPixmap( "check" ); itF->setSelected( true ); } else if (hadCheckFlags == 1) { - // No children exist. + // No tqchildren exist. itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } else { - // Some children exist. + // Some tqchildren exist. itF->setWhichPixmap( "check_grey" ); itF->setSelected( true ); } @@ -95,13 +95,13 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) if ( itF->isSelected() ) { itF->setWhichPixmap("check"); - // Turn off "no children" + // Turn off "no tqchildren" if ( bitFlags % 2 == 1 ) bitFlags -= 1; } else { itF->setWhichPixmap("check_clear"); - // Turn off "all children". + // Turn off "all tqchildren". if (bitFlags >> 1 == 1) bitFlags -= 2; } @@ -127,7 +127,7 @@ int UploadTreeView::checkboxTree( TQListViewItem *it ) } } - parentWidget()->setCursor(KCursor::arrowCursor()); + tqparentWidget()->setCursor(KCursor::arrowCursor()); return retVal; } @@ -162,22 +162,22 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) if ( itF ) { if (hadCheckFlags == 2) { - // All children exist. + // All tqchildren exist. itF->setWhichPixmap( "check" ); itF->setSelected( true ); } else if (hadCheckFlags == 1) { - // No children exist. + // No tqchildren exist. itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } else { - // Some children exist. + // Some tqchildren exist. itF->setWhichPixmap( "check_grey" ); itF->setSelected( true ); } - itF = itF->parentFolder; + itF = itF->tqparentFolder; } else { @@ -191,15 +191,15 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) itFile->setWhichPixmap("check_clear"); itFile->setSelected(false); } - itF = itFile->parentFolder; + itF = itFile->tqparentFolder; } - //iterate through the item's parents and set the correct checkboxes for them + //iterate through the item's tqparents and set the correct checkboxes for them while (itF) { bool hasSelected = false; bool allSelected = true; - //check if the item has any children's selected + //check if the item has any tqchildren's selected TQListViewItemIterator iter(itF->firstChild()); while ( iter.current() && iter.current() != itF->nextSibling()) { @@ -227,7 +227,7 @@ void UploadTreeView::slotSelectFile( TQListViewItem *it ) itF->setWhichPixmap( "check_clear" ); itF->setSelected( false ); } - itF = itF->parentFolder; + itF = itF->tqparentFolder; } } @@ -253,7 +253,7 @@ UploadTreeFolder* UploadTreeView::findFolder( UploadTreeFolder *it, const TQStri return 0; } -UploadTreeFolder* UploadTreeView::printTree( UploadTreeFolder *it = 0,const TQString& indent = TQString::null ) +UploadTreeFolder* UploadTreeView::printTree( UploadTreeFolder *it = 0,const TQString& indent = TQString() ) { TQListViewItem *itIter = 0; if (it == 0) itIter = firstChild(); @@ -276,7 +276,7 @@ TQListViewItem* UploadTreeView::findItem(const TQString& path ) TQString item = path; UploadTreeFolder *it = 0; int i; - while ( ( i = item.find('/') ) >= 0 ) + while ( ( i = item.tqfind('/') ) >= 0 ) { it = findFolder( it, item.left(i) ); if ( it == 0 ) @@ -306,7 +306,7 @@ UploadTreeFile* UploadTreeView::addItem(const KURL &a_url, const KFileItem& a_fi uint col = 0; UploadTreeFolder *it = 0; KURL u; - while ( ( i = item.find('/', col) ) >= 0 ) + while ( ( i = item.tqfind('/', col) ) >= 0 ) { if ( i!=0 ) { diff --git a/quanta/treeviews/uploadtreeview.h b/quanta/treeviews/uploadtreeview.h index 629f728d..19d487db 100644 --- a/quanta/treeviews/uploadtreeview.h +++ b/quanta/treeviews/uploadtreeview.h @@ -31,8 +31,9 @@ class KFileItem; class UploadTreeView : public KListView { Q_OBJECT + TQ_OBJECT public: - UploadTreeView( TQWidget *parent, const char *name=0L ); + UploadTreeView( TQWidget *tqparent, const char *name=0L ); ~UploadTreeView(); UploadTreeFile* addItem( const KURL &a_url, const KFileItem &a_fileItem); TQListViewItem* findItem( const TQString& ); diff --git a/quanta/utility/myprocess.h b/quanta/utility/myprocess.h index a495cdf9..13820fb5 100644 --- a/quanta/utility/myprocess.h +++ b/quanta/utility/myprocess.h @@ -21,6 +21,7 @@ class MyProcess:public KProcess { Q_OBJECT + TQ_OBJECT public: MyProcess(); diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp index bc3a052f..12eb12c9 100644 --- a/quanta/utility/newstuff.cpp +++ b/quanta/utility/newstuff.cpp @@ -29,7 +29,7 @@ #include "quantacommon.h" #include "qextfileinfo.h" -void QNewDTEPStuff::installResource() +void TQNewDTEPStuff::installResource() { bool ok = true; KTar tar(m_tarName, "application/x-gzip"); @@ -50,64 +50,64 @@ void QNewDTEPStuff::installResource() } else ok = false; if (!ok) - KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error")); + KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded DTEP tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("DTEP Installation Error")); } -QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget) - :KNewStuffSecure(type, parentWidget) +TQNewToolbarStuff::TQNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget) + :KNewStuffSecure(type, tqparentWidget) { - connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); + connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), tqparentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); } -void QNewToolbarStuff::installResource() +void TQNewToolbarStuff::installResource() { KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "toolbars/" + TQFileInfo(m_tarName).fileName()); bool ok = true; - if (QuantaCommon::checkOverwrite(destURL, parentWidget())) + if (QuantaCommon::checkOverwrite(destURL, tqparentWidget())) { - if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget())) + if (!TQExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget())) ok = false; else { - if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to load the newly downloaded toolbar?"), i18n("Load Toolbar"), i18n("Load"), KStdGuiItem::cancel()) == KMessageBox::Yes) { emit loadToolbarFile(destURL); } } if (!ok) - KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error")); + KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded toolbar tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Toolbar Installation Error")); } } -QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget) - :KNewStuffSecure(type, parentWidget) +TQNewTemplateStuff::TQNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget) + :KNewStuffSecure(type, tqparentWidget) { - connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&))); + connect(this, TQT_SIGNAL(openFile(const KURL&)), tqparentWidget, TQT_SLOT(slotFileOpen(const KURL&))); } -void QNewTemplateStuff::installResource() +void TQNewTemplateStuff::installResource() { KURL destURL = KURL::fromPathOrURL(KGlobal::dirs()->saveLocation("data") + resourceDir + "templates/" + TQFileInfo(m_tarName).fileName()); bool ok = true; - if (QuantaCommon::checkOverwrite(destURL, parentWidget())) + if (QuantaCommon::checkOverwrite(destURL, tqparentWidget())) { - if (!QExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, parentWidget())) + if (!TQExtFileInfo::copy(KURL::fromPathOrURL(m_tarName), destURL, -1, true, false, tqparentWidget())) ok = false; else { - if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes) + if (KMessageBox::questionYesNo(tqparentWidget(), i18n("Do you want to open the newly downloaded template?"), i18n("Open Template"), KStdGuiItem::open(), KStdGuiItem::cancel()) == KMessageBox::Yes) { emit openFile(destURL); } } if (!ok) - KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error")); + KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded template file."), i18n("Template Installation Error")); } } -void QNewScriptStuff::installResource() +void TQNewScriptStuff::installResource() { bool ok = true; KTar tar(m_tarName, "application/x-gzip"); @@ -121,10 +121,10 @@ void QNewScriptStuff::installResource() ok = false; if (!ok) - KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error")); + KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Script Installation Error")); } -void QNewDocStuff::installResource() +void TQNewDocStuff::installResource() { bool ok = true; KTar tar(m_tarName, "application/x-gzip"); @@ -138,7 +138,7 @@ void QNewDocStuff::installResource() ok = false; if (!ok) - KMessageBox::error(parentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error")); + KMessageBox::error(tqparentWidget(), i18n("There was an error with the downloaded script tarball file. Possible causes are damaged archive or invalid directory structure in the archive."), i18n("Documentation Installation Error")); } #include "newstuff.moc" diff --git a/quanta/utility/newstuff.h b/quanta/utility/newstuff.h index bdd49a50..e25639a0 100644 --- a/quanta/utility/newstuff.h +++ b/quanta/utility/newstuff.h @@ -29,14 +29,15 @@ Makes possible downloading and installing a DTEP resource files from a server. class KURL; -class QNewDTEPStuff: public KNewStuffSecure +class TQNewDTEPStuff: public KNewStuffSecure { Q_OBJECT + TQ_OBJECT public: - QNewDTEPStuff(const TQString &type, TQWidget *parentWidget=0) - :KNewStuffSecure(type, parentWidget){}; - ~QNewDTEPStuff() {}; + TQNewDTEPStuff(const TQString &type, TQWidget *tqparentWidget=0) + :KNewStuffSecure(type, tqparentWidget){}; + ~TQNewDTEPStuff() {}; private: virtual void installResource(); @@ -47,13 +48,14 @@ Makes possible downloading and installing a Toolbar resource files from a server @author Andras Mantia */ -class QNewToolbarStuff: public KNewStuffSecure +class TQNewToolbarStuff: public KNewStuffSecure { Q_OBJECT + TQ_OBJECT public: - QNewToolbarStuff(const TQString &type, TQWidget *parentWidget=0); - ~QNewToolbarStuff() {}; + TQNewToolbarStuff(const TQString &type, TQWidget *tqparentWidget=0); + ~TQNewToolbarStuff() {}; signals: void loadToolbarFile(const KURL&); @@ -67,13 +69,14 @@ Makes possible downloading and installing a template resource files from a serve @author Andras Mantia */ -class QNewTemplateStuff: public KNewStuffSecure +class TQNewTemplateStuff: public KNewStuffSecure { Q_OBJECT + TQ_OBJECT public: - QNewTemplateStuff(const TQString &type, TQWidget *parentWidget=0); - ~QNewTemplateStuff() {}; + TQNewTemplateStuff(const TQString &type, TQWidget *tqparentWidget=0); + ~TQNewTemplateStuff() {}; signals: void openFile(const KURL&); @@ -87,14 +90,15 @@ Makes possible downloading and installing a script resource files from a server. @author Andras Mantia */ -class QNewScriptStuff: public KNewStuffSecure +class TQNewScriptStuff: public KNewStuffSecure { Q_OBJECT + TQ_OBJECT public: - QNewScriptStuff(const TQString &type, TQWidget *parentWidget=0) - :KNewStuffSecure(type, parentWidget){}; - ~QNewScriptStuff() {}; + TQNewScriptStuff(const TQString &type, TQWidget *tqparentWidget=0) + :KNewStuffSecure(type, tqparentWidget){}; + ~TQNewScriptStuff() {}; private: virtual void installResource(); @@ -105,14 +109,15 @@ Makes possible downloading and installing a documentation resource files from a @author Andras Mantia */ -class QNewDocStuff: public KNewStuffSecure +class TQNewDocStuff: public KNewStuffSecure { Q_OBJECT + TQ_OBJECT public: - QNewDocStuff(const TQString &type, TQWidget *parentWidget=0) - :KNewStuffSecure(type, parentWidget){}; - ~QNewDocStuff() {}; + TQNewDocStuff(const TQString &type, TQWidget *tqparentWidget=0) + :KNewStuffSecure(type, tqparentWidget){}; + ~TQNewDocStuff() {}; private: virtual void installResource(); diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index 3426b83f..7be8fc66 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -36,8 +36,8 @@ #include "tagaction.h" //TODO: Better create a class for each internal event action -QPEvents::QPEvents(TQObject *parent, const char *name) - : TQObject(parent, name) +TQPEvents::TQPEvents(TQObject *tqparent, const char *name) + : TQObject(tqparent, name) { m_eventNames["before_save"] = i18n("Before Document Save"); m_eventNames["after_save"] = i18n("After Document Save"); @@ -66,17 +66,17 @@ QPEvents::QPEvents(TQObject *parent, const char *name) } -QPEvents::~QPEvents() +TQPEvents::~TQPEvents() { } -void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2) +void TQPEvents::slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2) { if (!quantaApp || !Project::ref()->eventsEnabled()) return; EventActions *events = Project::ref()->events(); if (!events) return; - if (events->contains(name)) + if (events->tqcontains(name)) { m_eventName = name; TQValueList<EventAction> evList = (*events)[name]; @@ -85,18 +85,18 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 EventAction ev = *it; if (ev.type == EventAction::Internal) { - if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed. Do you want to allow the execution of this action?</qt>").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about internal actions") == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed. Do you want to allow the execution of this action?</qt>").tqarg(ev.action).tqarg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about internal actions") == KMessageBox::Cancel) return; } else { - if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed. Do you want to allow the execution of this action?</qt>").arg(ev.action).arg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0L, i18n("<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>) will be executed. Do you want to allow the execution of this action?</qt>").tqarg(ev.action).tqarg(name), i18n("Event Triggered"), i18n("Execute"), "Warn about external actions") == KMessageBox::Cancel) return; } KURL url = KURL::fromPathOrURL(argument1); KURL url2 = KURL::fromPathOrURL(argument2); if (url.isValid()) { - bool inProject = Project::ref()->contains(url); + bool inProject = Project::ref()->tqcontains(url); if (inProject) { if (name == "upload_requested") @@ -131,7 +131,7 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 } } else { - TQString relativePath = QExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()).path(); + TQString relativePath = TQExtFileInfo::toRelative(url, Project::ref()->projectBaseURL()).path(); if (inProject && name == "after_save") { ev.arguments << i18n("Document saved"); @@ -220,11 +220,11 @@ void QPEvents::slotEventHappened(const TQString& name, const TQString& argument1 } } } - if (!m_eventNames.contains(name)) - KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").arg(name), i18n("Event Handling Error")); + if (!m_eventNames.tqcontains(name)) + KMessageBox::sorry(0L, i18n("<qt>Unsupported event <b>%1</b>.</qt>").tqarg(name), i18n("Event Handling Error")); } -bool QPEvents::handleEvent(const EventAction& ev) +bool TQPEvents::handleEvent(const EventAction& ev) { if (ev.type == EventAction::Internal) { @@ -294,7 +294,7 @@ bool QPEvents::handleEvent(const EventAction& ev) TQTextStream stream(&file); stream.setEncoding(TQTextStream::UnicodeUTF8); //Note: the log text should not be translated. - TQString s = TQDateTime::currentDateTime().toString(Qt::ISODate) + ": "; + TQString s = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) + ": "; s.append( "Event : " + m_eventName + " : "); s.append( "Action: " + ev.action + " : "); if (ev.arguments[1] == "full") @@ -309,11 +309,11 @@ bool QPEvents::handleEvent(const EventAction& ev) } if (!result) { - KMessageBox::sorry(0L, i18n("<qt>Logging failed. Check that you have write access to <i>%1</i>.").arg(url.path())); + KMessageBox::sorry(0L, i18n("<qt>Logging failed. Check that you have write access to <i>%1</i>.").tqarg(url.path())); return false; } } else - KMessageBox::sorry(0L, i18n("<qt>Unsupported internal event action : <b>%1</b>.</qt>").arg(ev.action)); + KMessageBox::sorry(0L, i18n("<qt>Unsupported internal event action : <b>%1</b>.</qt>").tqarg(ev.action)); } else if (ev.type == EventAction::External) { @@ -336,7 +336,7 @@ bool QPEvents::handleEvent(const EventAction& ev) { action->activate(); } else - KMessageBox::sorry(0L, i18n("<qt>The <b>%1</b> script action was not found on your system.</qt>").arg(name), i18n("Action Execution Error")); + KMessageBox::sorry(0L, i18n("<qt>The <b>%1</b> script action was not found on your system.</qt>").tqarg(name), i18n("Action Execution Error")); } else KMessageBox::sorry(0L, i18n("Unsupported external event action.")); } else @@ -344,23 +344,23 @@ bool QPEvents::handleEvent(const EventAction& ev) return false; } -TQString QPEvents::fullEventName(const TQString &name) +TQString TQPEvents::fullEventName(const TQString &name) { - if (m_eventNames.contains(name)) + if (m_eventNames.tqcontains(name)) return m_eventNames[name]; else return name; } -TQString QPEvents::fullActionName(const TQString& name) +TQString TQPEvents::fullActionName(const TQString& name) { - if (m_actionNames.contains(name)) + if (m_actionNames.tqcontains(name)) return m_actionNames[name]; else return name; } -TQString QPEvents::eventName(const TQString &fullName) +TQString TQPEvents::eventName(const TQString &fullName) { for (TQMap<TQString, TQString>::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it) { @@ -370,7 +370,7 @@ TQString QPEvents::eventName(const TQString &fullName) return fullName; } -TQString QPEvents::actionName(const TQString &fullName) +TQString TQPEvents::actionName(const TQString &fullName) { for (TQMap<TQString, TQString>::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it) { @@ -380,7 +380,7 @@ TQString QPEvents::actionName(const TQString &fullName) return fullName; } -TQStringList QPEvents::eventNames() +TQStringList TQPEvents::eventNames() { TQStringList names; for (TQMap<TQString, TQString>::ConstIterator it = m_eventNames.constBegin(); it != m_eventNames.constEnd(); ++it) @@ -390,7 +390,7 @@ TQStringList QPEvents::eventNames() return names; } -TQStringList QPEvents::actionNames() +TQStringList TQPEvents::actionNames() { TQStringList names; for (TQMap<TQString, TQString>::ConstIterator it = m_actionNames.constBegin(); it != m_actionNames.constEnd(); ++it) diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h index 373ae089..31c05235 100644 --- a/quanta/utility/qpevents.h +++ b/quanta/utility/qpevents.h @@ -14,8 +14,8 @@ * * ***************************************************************************/ -#ifndef QPEVENTS_H -#define QPEVENTS_H +#ifndef TQPEVENTS_H +#define TQPEVENTS_H #include <tqobject.h> @@ -50,17 +50,18 @@ after_project_remove, after_commit */ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; -class QPEvents : public QObject +class TQPEvents : public TQObject { Q_OBJECT + TQ_OBJECT public: - static QPEvents* const ref(TQObject *parent = 0L) + static TQPEvents* const ref(TQObject *tqparent = 0L) { - static QPEvents *m_ref; - if (!m_ref) m_ref = new QPEvents(parent); + static TQPEvents *m_ref; + if (!m_ref) m_ref = new TQPEvents(tqparent); return m_ref; } - ~QPEvents(); + ~TQPEvents(); TQString fullEventName(const TQString &name); TQString fullActionName(const TQString &name); TQString eventName(const TQString &fullName); @@ -73,7 +74,7 @@ public slots: void slotEventHappened(const TQString& name, const TQString& argument1, const TQString& argument2); private: - QPEvents(TQObject *parent = 0, const char *name = 0); + TQPEvents(TQObject *tqparent = 0, const char *name = 0); /** Calls the action associated with an event. Returns true if the call succeeded, false otherwise. The call might fail if: - the action type is unknown diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 12ba69c5..9b91220d 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -61,12 +61,12 @@ static void ssort( TQMemArray<uint> &a, int max ) // TODO add a insort() or bubble_sort - more efficient for aboutToShow() ? -QuantaBookmarks::QuantaBookmarks(ViewManager *parent,Sorting sort, bool onlyFromActualDocument ) - : TQObject( parent, "bookmarks" ) +QuantaBookmarks::QuantaBookmarks(ViewManager *tqparent,Sorting sort, bool onlyFromActualDocument ) + : TQObject( tqparent, "bookmarks" ) , m_sorting(sort) , m_onlyFromActualDocument(onlyFromActualDocument) { - m_viewManager = parent; + m_viewManager = tqparent; _tries=0; m_bookmarksMenu = 0L; m_doc = 0L; @@ -182,21 +182,21 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse TQString bText = KStringHandler::rEmSqueeze ( doc->editIf->textLine( (*it)->line ), menu.fontMetrics(), 32 ); - bText.replace(re, "&&"); // kill undesired accellerators! - bText.replace('\t', ' '); // kill tabs, as they are interpreted as shortcuts + bText.tqreplace(re, "&&"); // kill undesired accellerators! + bText.tqreplace('\t', ' '); // kill tabs, as they are interpreted as shortcuts if ( m_sorting == Position ) { sortArray[i] = (*it)->line; ssort( sortArray, i ); - idx = sortArray.find( (*it)->line ); + idx = sortArray.tqfind( (*it)->line ); if (insertNavigationItems) idx += 3; i++; } menu.insertItem( - TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ), + TQString("%1 - \"%2\"").tqarg( (*it)->line+1 ).tqarg( bText ), 0, (*it)->line, idx ); insertedItems++; @@ -219,15 +219,15 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse idx = ++old_menu_count; if ( next ) { - m_goNext->setText( i18n("&Next: %1 - \"%2\"").arg( next->line + 1 ) - .arg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) ); + m_goNext->setText( i18n("&Next: %1 - \"%2\"").tqarg( next->line + 1 ) + .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( next->line ), 24 ) ) ); m_goNext->plug( &menu, idx ); idx++; } if ( prev ) { - m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").arg(prev->line + 1 ) - .arg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) ); + m_goPrevious->setText( i18n("&Previous: %1 - \"%2\"").tqarg(prev->line + 1 ) + .tqarg( KStringHandler::rsqueeze( doc->editIf->textLine( prev->line ), 24 ) ) ); m_goPrevious->plug( &menu, idx ); idx++; } @@ -361,10 +361,10 @@ void QuantaBookmarks::gotoLineNumber(int line) Document *doc = m_doc; if (!doc) doc = m_viewManager->activeDocument(); - const TQObject *s = sender(); + TQObject *s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); for (uint i = 0; i < m_othersMenuList.count(); i++) { - if (s == m_othersMenuList[i]) + if (TQT_BASE_OBJECT(s) == TQT_BASE_OBJECT(m_othersMenuList[i])) { doc = m_others[i]; break; @@ -396,4 +396,4 @@ void QuantaBookmarks::marksChanged () #include "quantabookmarks.moc" -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h index 440f4fea..7dac33d5 100644 --- a/quanta/utility/quantabookmarks.h +++ b/quanta/utility/quantabookmarks.h @@ -40,13 +40,14 @@ class TQMenuData; -class QuantaBookmarks : public QObject +class QuantaBookmarks : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Sorting { Position, Creation }; - QuantaBookmarks(ViewManager *parent, Sorting sort=Position, bool onlyFromActualDocument = false ); + QuantaBookmarks(ViewManager *tqparent, Sorting sort=Position, bool onlyFromActualDocument = false ); virtual ~QuantaBookmarks(); void createActions( KActionCollection* ); @@ -95,5 +96,5 @@ class QuantaBookmarks : public QObject #endif -// kate: space-indent on; indent-width 2; replace-tabs on; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; // vim: noet ts=2 diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp index 93421764..6b709ca3 100644 --- a/quanta/utility/quantacommon.cpp +++ b/quanta/utility/quantacommon.cpp @@ -41,7 +41,7 @@ #include <ktempdir.h> #include <ktempfile.h> -//remove the below ones when KQPasteAction is removed +//remove the below ones when KTQPasteAction is removed #include <dcopclient.h> #include <kdebug.h> #include <kpopupmenu.h> @@ -60,7 +60,7 @@ //#include "resource.h" -QConfig qConfig; //holds the main configuration settings +TQConfig qConfig; //holds the main configuration settings TQString tmpDir; TQRegExp scriptBeginRx; @@ -144,11 +144,11 @@ bool QuantaCommon::isSingleTag(const TQString& dtdName, const TQString& tag) if(tag.lower() == "!doctype" || tag.lower() == "?xml") return true; - const DTDStruct* dtd = DTDs::ref()->find(dtdName); + const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - QTag* qtag = dtd->tagsList->find(searchForTag); + TQTag* qtag = dtd->tagsList->tqfind(searchForTag); if (qtag) single = qtag->isSingle(); } @@ -161,11 +161,11 @@ bool QuantaCommon::isOptionalTag(const TQString& dtdName, const TQString& tag) { bool optional = false; - const DTDStruct* dtd = DTDs::ref()->find(dtdName); + const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - QTag* qtag = dtd->tagsList->find(searchForTag); + TQTag* qtag = dtd->tagsList->tqfind(searchForTag); if (qtag) optional = qtag->isOptional(); } @@ -177,11 +177,11 @@ bool QuantaCommon::isKnownTag(const TQString& dtdName, const TQString& tag) { bool known = false; - const DTDStruct* dtd = DTDs::ref()->find(dtdName); + const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - if (dtd->tagsList->find(searchForTag)) + if (dtd->tagsList->tqfind(searchForTag)) known = true; } @@ -192,11 +192,11 @@ AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQStri { AttributeList* attrs = 0L; - const DTDStruct* dtd = DTDs::ref()->find(dtdName); + const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - QTag* qtag = dtd->tagsList->find(searchForTag); + TQTag* qtag = dtd->tagsList->tqfind(searchForTag); if (qtag) attrs = qtag->attributes(); } @@ -204,28 +204,28 @@ AttributeList* QuantaCommon::tagAttributes(const TQString& dtdName, const TQStri return attrs; } -/** Returns the QTag object for the tag "tag" from the DTD named "dtdname". */ -QTag* QuantaCommon::tagFromDTD(const TQString& dtdName, const TQString& tag) +/** Returns the TQTag object for the tag "tag" from the DTD named "dtdname". */ +TQTag* QuantaCommon::tagFromDTD(const TQString& dtdName, const TQString& tag) { - const DTDStruct* dtd = DTDs::ref()->find(dtdName); + const DTDStruct* dtd = DTDs::ref()->tqfind(dtdName); return tagFromDTD(dtd, tag); } -/** Returns the QTag object for the tag "tag" from the DTD. */ -QTag* QuantaCommon::tagFromDTD(const DTDStruct *dtd, const TQString& tag) +/** Returns the TQTag object for the tag "tag" from the DTD. */ +TQTag* QuantaCommon::tagFromDTD(const DTDStruct *dtd, const TQString& tag) { - QTag *qtag = 0; + TQTag *qtag = 0; if (dtd && !tag.isEmpty()) { TQString searchForTag = (dtd->caseSensitive) ? tag : tag.upper(); - qtag = dtd->tagsList->find(searchForTag); + qtag = dtd->tagsList->tqfind(searchForTag); } return qtag; } -/** Returns the QTag object for the node "node" from node's DTD. */ -QTag* QuantaCommon::tagFromDTD(Node *node) +/** Returns the TQTag object for the node "node" from node's DTD. */ +TQTag* QuantaCommon::tagFromDTD(Node *node) { if(!node || !node->tag) return 0L; @@ -311,7 +311,7 @@ bool QuantaCommon::checkMimeGroup(const KURL& url, const TQString& group) mimetype = mimetype.section('/',-1); for ( it = list.begin(); it != list.end(); ++it ) { - if ( ((*it)->name().contains(group)) && ((*it)->name().find(mimetype) != -1) + if ( ((*it)->name().tqcontains(group)) && ((*it)->name().tqfind(mimetype) != -1) ) { status = true; break; @@ -381,9 +381,9 @@ TQString QuantaCommon::qUrl(const KURL &url) /** No descriptions */ void QuantaCommon::dirCreationError(TQWidget *widget, const KURL& url) { - KMessageBox::error(widget, i18n("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the parent folder or that the connection to<br><b>%2</b><br> is valid.</qt>") - .arg(url.prettyURL(0, KURL::StripFileProtocol)) - .arg(url.protocol()+"://"+url.user()+"@"+url.host()));} + KMessageBox::error(widget, i18n("<qt>Cannot create folder<br><b>%1</b>.<br>Check that you have write permission in the tqparent folder or that the connection to<br><b>%2</b><br> is valid.</qt>") + .tqarg(url.prettyURL(0, KURL::StripFileProtocol)) + .tqarg(url.protocol()+"://"+url.user()+"@"+url.host()));} /** Adds the backslash before the special chars (like ?, *, . ) so the returned @@ -410,7 +410,7 @@ TQString QuantaCommon::makeRxCompatible(const TQString& s) TQString str = s; for (uint i = 0; i < max - 1; i++) { - str.replace(rxs[i], strs[i]); + str.tqreplace(rxs[i], strs[i]); } return str; @@ -488,7 +488,7 @@ void QuantaCommon::removeCommentsAndQuotes(TQString &str, const DTDStruct *dtd) } else { s = dtd->comments[s]; - l = str.find(s, pos); + l = str.tqfind(s, pos); l = (l == -1) ? str.length() : l; for (int i = pos; i < l ; i++) { @@ -554,7 +554,7 @@ bool QuantaCommon::insideCommentsOrQuotes(int position, const TQString &string, } else { s = dtd->comments[s]; - l = str.find(s, pos); + l = str.tqfind(s, pos); l = (l == -1) ? str.length() : l; for (int i = pos; i < l ; i++) { @@ -596,7 +596,7 @@ DCOPReply QuantaCommon::callDCOPMethod(const TQString& interface, const TQString if (!kapp->inherits("KUniqueApplication")) { pid_t pid = ::getpid(); - app += TQString("-%1").arg(pid); + app += TQString("-%1").tqarg(pid); } DCOPRef quantaRef(app.utf8(), interface.utf8()); DCOPReply reply; @@ -633,12 +633,12 @@ void QuantaCommon::normalizeStructure(TQString f,TQStringList& l) f.remove("\n"); f.remove("\r"); - while(f.contains("<")) + while(f.tqcontains("<")) { TQString z(f); - z.truncate(z.find(">")+1); - z.remove(0,z.find("<")); - f.remove(0,f.find(">")+1); + z.truncate(z.tqfind(">")+1); + z.remove(0,z.tqfind("<")); + f.remove(0,f.tqfind(">")+1); l.append(z); } } @@ -704,10 +704,10 @@ bool QuantaCommon::checkOverwrite(const KURL& url, TQWidget *window) { bool result = true; - if (QExtFileInfo::exists(url, false, window)) + if (TQExtFileInfo::exists(url, false, window)) { if (KMessageBox::warningContinueCancel(window, - i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).arg(url.prettyURL(0, KURL::StripFileProtocol)), TQString::null, i18n("Overwrite")) == KMessageBox::Cancel) + i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).tqarg(url.prettyURL(0, KURL::StripFileProtocol)), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) result = false; } @@ -723,7 +723,7 @@ TQStringList QuantaCommon::readPathListEntry(KConfig *config, const TQString &pK KURL u = KURL::fromPathOrURL(*it); if (u.isValid() && u.isLocalFile()) { - u.setPath(QExtFileInfo::canonicalPath(u.path())); + u.setPath(TQExtFileInfo::canonicalPath(u.path())); *it = u.url(); } } @@ -736,7 +736,7 @@ TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey) KURL u = KURL::fromPathOrURL(path); if (u.isValid() && u.isLocalFile()) { - u.setPath(QExtFileInfo::canonicalPath(u.path())); + u.setPath(TQExtFileInfo::canonicalPath(u.path())); path = u.url(); } return path; @@ -745,9 +745,9 @@ TQString QuantaCommon::readPathEntry(KConfig *config, const TQString &pKey) TQString QuantaCommon::encodedChar(uint code) { - if (replacementMap.contains(code)) - return TQString("%1;").arg(replacementMap[code]); + if (replacementMap.tqcontains(code)) + return TQString("%1;").tqarg(replacementMap[code]); else - return TQString("&#%1;").arg(code); + return TQString("&#%1;").tqarg(code); } diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h index 915de6fb..61c86f9e 100644 --- a/quanta/utility/quantacommon.h +++ b/quanta/utility/quantacommon.h @@ -48,7 +48,7 @@ public: //Quanta main configuration structure -class QConfig{ +class TQConfig{ public: //Tag style options uint tagCase; @@ -137,12 +137,12 @@ quotation setting*/ static bool isKnownTag(const TQString& dtdName, const TQString& tag); /** No descriptions */ static AttributeList* tagAttributes(const TQString& dtdName, const TQString& tag); - /** Returns the QTag object for the tag "tag" from the DTD named "dtdname". */ - static QTag* tagFromDTD(const TQString& dtdName, const TQString& tag); - /** Returns the QTag object for the tag "tag" from the DTD. */ - static QTag* tagFromDTD(const DTDStruct* dtd, const TQString& tag); - /** Returns the QTag object for the node "node" from node's DTD. */ - static QTag* tagFromDTD(Node *node); + /** Returns the TQTag object for the tag "tag" from the DTD named "dtdname". */ + static TQTag* tagFromDTD(const TQString& dtdName, const TQString& tag); + /** Returns the TQTag object for the tag "tag" from the DTD. */ + static TQTag* tagFromDTD(const DTDStruct* dtd, const TQString& tag); + /** Returns the TQTag object for the node "node" from node's DTD. */ + static TQTag* tagFromDTD(Node *node); /** Returns an XML style string containing the GUI for attributes. */ static TQString xmlFromAttributes(AttributeList* attributes); /** Returns 0 if the (line,col) is inside the area specified by the other arguments, diff --git a/quanta/utility/quantanetaccess.cpp b/quanta/utility/quantanetaccess.cpp index dbaf1ce3..93c664e3 100644 --- a/quanta/utility/quantanetaccess.cpp +++ b/quanta/utility/quantanetaccess.cpp @@ -176,13 +176,13 @@ void QuantaNetAccess::checkProjectInsert(const KURL& target, TQWidget* window, b if ( !Project::ref()->hasProject()) return; KURL saveUrl = adjustURL(target); KURL baseURL = Project::ref()->projectBaseURL(); - if ( baseURL.isParentOf(saveUrl) && !Project::ref()->contains(saveUrl) ) + if ( baseURL.isParentOf(saveUrl) && !Project::ref()->tqcontains(saveUrl) ) { if (confirm) { - TQString nice = QExtFileInfo::toRelative(saveUrl, baseURL).path(); + TQString nice = TQExtFileInfo::toRelative(saveUrl, baseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); - if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>").arg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") ) + if ( KMessageBox::Yes != KMessageBox::questionYesNo(window, i18n("<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>").tqarg(nice), i18n("Add to Project"), KStdGuiItem::add(), i18n("Do Not Add"), "AddToProject") ) { return; } @@ -201,13 +201,13 @@ bool QuantaNetAccess::checkProjectRemove(const KURL& src, TQWidget* window, bool if ( !Project::ref()->hasProject() ) return true; KURL url = adjustURL(src); KURL baseURL = Project::ref()->projectBaseURL(); - if ( baseURL.isParentOf(url) && Project::ref()->contains(url) ) + if ( baseURL.isParentOf(url) && Project::ref()->tqcontains(url) ) { if (confirm) { - TQString nice = QExtFileInfo::toRelative(url, baseURL).path(); + TQString nice = TQExtFileInfo::toRelative(url, baseURL).path(); nice = KStringHandler::lsqueeze(nice, 60); - if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").arg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") ) + if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to remove <br><b>%1</b><br> from the project?</qt>").tqarg(nice), i18n("Remove From Project"), KStdGuiItem::remove(), "RemoveFromProject") ) { return false; } @@ -224,13 +224,13 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co KURL url = adjustURL(src); if ( Project::ref()->hasProject() ) { - if ( Project::ref()->projectBaseURL().isParentOf(url) && Project::ref()->contains(url) ) + if ( Project::ref()->projectBaseURL().isParentOf(url) && Project::ref()->tqcontains(url) ) { if (confirm) { TQString nice = url.prettyURL(0, KURL::StripFileProtocol); nice = KStringHandler::csqueeze(nice, 60); - if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b><br> and remove it from the project?</qt>").arg(nice), i18n("Delete & Remove From Project"), KStdGuiItem::del(), "DeleteAndRemoveFromProject") ) + if ( KMessageBox::Continue != KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b><br> and remove it from the project?</qt>").tqarg(nice), i18n("Delete & Remove From Project"), KStdGuiItem::del(), "DeleteAndRemoveFromProject") ) { return false; } @@ -243,7 +243,7 @@ bool QuantaNetAccess::checkProjectDel(const KURL& src, TQWidget* window, bool co if (confirm) { TQString nice = url.prettyURL(0, KURL::StripFileProtocol); nice = KStringHandler::csqueeze(nice, 60); - return (KMessageBox::Continue == KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b>?</qt>").arg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") ); + return (KMessageBox::Continue == KMessageBox::warningContinueCancel(window, i18n("<qt>Do you really want to delete <br><b>%1</b>?</qt>").tqarg(nice), i18n("Delete File or Folder"), KStdGuiItem::del(), "DeleteFileOrFolder") ); } return true; } diff --git a/quanta/utility/resource.h b/quanta/utility/resource.h index 6e7bf950..8bb344d3 100644 --- a/quanta/utility/resource.h +++ b/quanta/utility/resource.h @@ -28,11 +28,11 @@ class KTempDir; class Node; class Parser; -struct QConfig; +struct TQConfig; struct DTDStruct; -extern QConfig qConfig; +extern TQConfig qConfig; extern TQString tmpDir; extern TQRegExp scriptBeginRx; diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 9787d047..33bf5313 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -72,14 +72,14 @@ int MyProcess::commSetupDoneC() return KProcess::commSetupDoneC(); } -TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle) +TagAction::TagAction( TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle) : KToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()), - KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()), + KShortcut(element->attribute("shortcut")), 0, 0, tqparentMainWindow->actionCollection(), element->attribute("name").ascii()), //disable toggle now m_toggle(toggle) m_toggle(false) { setToolTip(element->attribute("tooltip")); - m_parentMainWindow = parentMainWindow; + m_parentMainWindow = tqparentMainWindow; m_modified = false; m_useInputFile = false; m_useOutputFile = false; @@ -93,8 +93,8 @@ TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool m_file = 0L; loopStarted = false; #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) - connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, Qt::ButtonState)), - TQT_SLOT(slotActionActivated(KAction::ActivationReason, Qt::ButtonState))); + connect(this, TQT_SIGNAL(activated(KAction::ActivationReason, TQt::ButtonState)), + TQT_SLOT(slotActionActivated(KAction::ActivationReason, TQt::ButtonState))); #else connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated())); #endif @@ -114,7 +114,7 @@ TQString TagAction::type() } #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0) -bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::ButtonState /*state*/) +bool TagAction::slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState /*state*/) { QuantaView *view = ViewManager::ref()->activeView(); if ( !view || !view->document()) @@ -162,7 +162,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button start_node = end_node = current_node; start_offset = end_offset = current_offset; - QTag* tag_description = QuantaCommon::tagFromDTD(KafkaDocument::ref()->getCurrentDoc()->defaultDTD(), XMLTagName()); + TQTag* tag_description = QuantaCommon::tagFromDTD(KafkaDocument::ref()->getCurrentDoc()->defaultDTD(), XMLTagName()); scope = tag_description->scope(); // Q_ASSERT(!scope.isNull()); if(scope.isNull()) @@ -281,7 +281,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button s1 += " "+QuantaCommon::attrCase(attr); if (otag.text().right(1) == ">") { - QTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name); + TQTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name); if ( w->defaultDTD()->singleTagStyle == "xml" && dtdTag && (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional())) ) @@ -332,16 +332,16 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button TQString fname = w->url().url(); if ( w->url().protocol() == "file") fname = w->url().path(); - command.replace("%f", fname ); + command.tqreplace("%f", fname ); } pid_t pid = ::getpid(); if (kapp->inherits("KUniqueApplication")) { - command.replace("%pid", TQString("unique %1").arg(pid)); + command.tqreplace("%pid", TQString("unique %1").tqarg(pid)); } else { - command.replace("%pid", TQString("%1").arg(pid)); + command.tqreplace("%pid", TQString("%1").tqarg(pid)); } TQString buffer; TQString inputType = script.attribute("input","none"); @@ -352,9 +352,9 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button if ( inputType == "selected" && w->selectionIf) { buffer = w->selectionIf->selection(); } - command.replace("%input", buffer); + command.tqreplace("%input", buffer); command = command.stripWhiteSpace(); - int pos = command.find(' '); + int pos = command.tqfind(' '); TQString args; if (pos != -1) { @@ -374,46 +374,46 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button pos = 0; while (pos != -1 ) { - pos = args.find("%scriptdir"); + pos = args.tqfind("%scriptdir"); TQString scriptname; if (pos != -1) { - int begin = args.findRev('"', pos); + int begin = args.tqfindRev('"', pos); int end = -1; if (begin == -1) { - begin = args.findRev('\'', pos); + begin = args.tqfindRev('\'', pos); if (begin != -1) - end = args.find('\'', pos); + end = args.tqfind('\'', pos); } else { - end = args.find('"', pos); + end = args.tqfind('"', pos); } if (begin == -1 || end != -1) { - begin = args.findRev(' ', pos); + begin = args.tqfindRev(' ', pos); if (begin == -1) begin = 0; - end = args.find(' ', pos); + end = args.tqfind(' ', pos); if (end == -1) end = args.length(); } scriptname = args.mid(begin, end - begin).stripWhiteSpace(); - scriptname.replace("%scriptdir","scripts"); + scriptname.tqreplace("%scriptdir","scripts"); // kdDebug(24000) << "Script name is: |" << scriptname << "|" << endl; scriptname = " " + locate("appdata", scriptname); // kdDebug(24000) << "Script found at: " << scriptname << endl; - args.replace(begin, end - begin, scriptname); + args.tqreplace(begin, end - begin, scriptname); // kdDebug(24000) << "Modified argument list: " << args << endl; } } - int pos = args.find("%projectbase"); + int pos = args.tqfind("%projectbase"); if (pos != -1) { TQString s; if (Project::ref()->hasProject()) s = Project::ref()->projectBaseURL().url(); - args.replace("%projectbase", s); + args.tqreplace("%projectbase", s); } TQStringList argsList1 = TQStringList::split(' ', args); TQStringList argsList; @@ -461,7 +461,7 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button if (proc->start(KProcess::NotifyOnExit, KProcess::All)) { emit clearMessages(); - emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false); + emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false); if (!m_useInputFile) { if ( inputType == "current" || inputType == "selected" ) @@ -472,11 +472,11 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button proc->closeStdin(); } else { - KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").arg(command + " " + args).arg(command), i18n("Script Not Found")); + KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").tqarg(command + " " + args).tqarg(command), i18n("Script Not Found")); ViewManager::ref()->activeView()->setFocus(); if (loopStarted) { - qApp->exit_loop(); + tqApp->exit_loop(); loopStarted = false; } return false; @@ -486,9 +486,9 @@ bool TagAction::slotActionActivated(KAction::ActivationReason reason, Qt::Button return true; } #else - // hack to compile. moc doesn't check the "#ifdef" at the declaration and the compiler complains + // hack to compile. tqmoc doesn't check the "#ifdef" at the declaration and the compiler complains // of no matching function. -bool TagAction::slotActionActivated(KAction::ActivationReason /*reason*/, Qt::ButtonState /*state*/) +bool TagAction::slotActionActivated(KAction::ActivationReason /*reason*/, TQt::ButtonState /*state*/) {return true;} #endif @@ -535,7 +535,7 @@ bool TagAction::slotActionActivated() s1 += " "+QuantaCommon::attrCase(attr); if (otag.text().right(1) == ">") { - QTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name); + TQTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name); if ( w->defaultDTD()->singleTagStyle == "xml" && dtdTag && (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional())) ) @@ -586,16 +586,16 @@ bool TagAction::slotActionActivated() TQString fname = w->url().url(); if ( w->url().protocol() == "file") fname = w->url().path(); - command.replace("%f", fname ); + command.tqreplace("%f", fname ); } pid_t pid = ::getpid(); if (kapp->inherits("KUniqueApplication")) { - command.replace("%pid", TQString("unique %1").arg(pid)); + command.tqreplace("%pid", TQString("unique %1").tqarg(pid)); } else { - command.replace("%pid", TQString("%1").arg(pid)); + command.tqreplace("%pid", TQString("%1").tqarg(pid)); } TQString buffer; TQString inputType = script.attribute("input","none"); @@ -606,9 +606,9 @@ bool TagAction::slotActionActivated() if ( inputType == "selected" && w->selectionIf) { buffer = w->selectionIf->selection(); } - command.replace("%input", buffer); + command.tqreplace("%input", buffer); command = command.stripWhiteSpace(); - int pos = command.find(' '); + int pos = command.tqfind(' '); TQString args; if (pos != -1) { @@ -628,46 +628,46 @@ bool TagAction::slotActionActivated() pos = 0; while (pos != -1 ) { - pos = args.find("%scriptdir"); + pos = args.tqfind("%scriptdir"); TQString scriptname; if (pos != -1) { - int begin = args.findRev('"', pos); + int begin = args.tqfindRev('"', pos); int end = -1; if (begin == -1) { - begin = args.findRev('\'', pos); + begin = args.tqfindRev('\'', pos); if (begin != -1) - end = args.find('\'', pos); + end = args.tqfind('\'', pos); } else { - end = args.find('"', pos); + end = args.tqfind('"', pos); } if (begin == -1 || end != -1) { - begin = args.findRev(' ', pos); + begin = args.tqfindRev(' ', pos); if (begin == -1) begin = 0; - end = args.find(' ', pos); + end = args.tqfind(' ', pos); if (end == -1) end = args.length(); } scriptname = args.mid(begin, end - begin).stripWhiteSpace(); - scriptname.replace("%scriptdir","scripts"); + scriptname.tqreplace("%scriptdir","scripts"); // kdDebug(24000) << "Script name is: |" << scriptname << "|" << endl; scriptname = " " + locate("appdata", scriptname); // kdDebug(24000) << "Script found at: " << scriptname << endl; - args.replace(begin, end - begin, scriptname); + args.tqreplace(begin, end - begin, scriptname); // kdDebug(24000) << "Modified argument list: " << args << endl; } } - int pos = args.find("%projectbase"); + int pos = args.tqfind("%projectbase"); if (pos != -1) { TQString s; if (Project::ref()->hasProject()) s = Project::ref()->projectBaseURL().url(); - args.replace("%projectbase", s); + args.tqreplace("%projectbase", s); } TQStringList argsList1 = TQStringList::split(' ', args); TQStringList argsList; @@ -715,7 +715,7 @@ bool TagAction::slotActionActivated() if (proc->start(KProcess::NotifyOnExit, KProcess::All)) { emit clearMessages(); - emit showMessage(i18n("The \"%1\" script started.\n").arg(actionText()), false); + emit showMessage(i18n("The \"%1\" script started.\n").tqarg(actionText()), false); if (!m_useInputFile) { if ( inputType == "current" || inputType == "selected" ) @@ -726,11 +726,11 @@ bool TagAction::slotActionActivated() proc->closeStdin(); } else { - KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").arg(command + " " + args).arg(command), i18n("Script Not Found")); + KMessageBox::error(m_parentMainWindow, i18n("<qt>There was an error running <b>%1</b>.<br>Check that you have the <i>%2</i> executable installed and it is accessible.</qt>").tqarg(command + " " + args).tqarg(command), i18n("Script Not Found")); ViewManager::ref()->activeView()->setFocus(); if (loopStarted) { - qApp->exit_loop(); + tqApp->exit_loop(); loopStarted = false; } return false; @@ -767,7 +767,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen ) } w->insertTag( text ); } else - if ( scriptOutputDest == "replace" ) + if ( scriptOutputDest == "tqreplace" ) { if ( firstOutput ) w->editIf->clear(); @@ -787,7 +787,7 @@ void TagAction::slotGetScriptOutput( KProcess *, char *buffer, int buflen ) if ( firstOutput ) { emit showMessagesView(); - emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false); + emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false); } emit showMessage(text, true); } else @@ -827,7 +827,7 @@ void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen ) } w->insertTag( text ); } else - if ( scriptErrorDest == "replace" ) + if ( scriptErrorDest == "tqreplace" ) { if ( firstError ) w->editIf->clear(); @@ -847,7 +847,7 @@ void TagAction::slotGetScriptError( KProcess *, char *buffer, int buflen ) if ( firstError ) { emit showMessagesView(); - emit showMessage(i18n("The \"%1\" script output:\n").arg(actionText()), false); + emit showMessage(i18n("The \"%1\" script output:\n").tqarg(actionText()), false); } emit showMessage(text, true); } @@ -874,7 +874,7 @@ void TagAction::setInputFileName(const TQString& fileName) TQString TagAction::actionText() { TQString t = tag.attribute("text"); - int pos = t.find('&'); + int pos = t.tqfind('&'); if (pos < (int)t.length()-1 && t[pos+1] != '&') return t.remove(pos, 1); else @@ -925,7 +925,7 @@ TQString TagAction::openXMLTagString() const if (otag.text().right(1) == ">") { Document* w = ViewManager::ref()->activeView()->document(); - QTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name); + TQTag *dtdTag = QuantaCommon::tagFromDTD(w->defaultDTD(), name); if ( w->defaultDTD()->singleTagStyle == "xml" && dtdTag && (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional())) ) @@ -967,10 +967,10 @@ void TagAction::slotProcessExited(KProcess *process) { if (loopStarted) { - qApp->exit_loop(); + tqApp->exit_loop(); loopStarted = false; } - emit showMessage(i18n("The \"%1\" script has exited.").arg(actionText()), false); + emit showMessage(i18n("The \"%1\" script has exited.").tqarg(actionText()), false); delete process; } @@ -993,7 +993,7 @@ void TagAction::execute(bool blocking) timer = new TQTimer(this); connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); timer->start(180*1000, true); - QExtFileInfo internalFileInfo; + TQExtFileInfo internalFileInfo; loopStarted = true; m_killCount = 0; internalFileInfo.enter_loop(); @@ -1008,7 +1008,7 @@ void TagAction::execute(bool blocking) /** Timeout occurred while waiting for some network function to return. */ void TagAction::slotTimeout() { - if ((m_killCount == 0) && (KMessageBox::questionYesNo(m_parentMainWindow, i18n("<qt>The filtering action <b>%1</b> seems to be locked.<br>Do you want to terminate it?</qt>").arg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes)) + if ((m_killCount == 0) && (KMessageBox::questionYesNo(m_parentMainWindow, i18n("<qt>The filtering action <b>%1</b> seems to be locked.<br>Do you want to terminate it?</qt>").tqarg(actionText()), i18n("Action Not Responding"), i18n("Terminate"), i18n("Keep Running")) == KMessageBox::Yes)) { if (::kill(-proc->pid(), SIGTERM)) { @@ -1021,7 +1021,7 @@ void TagAction::slotTimeout() ::kill(-proc->pid(), SIGKILL); if (loopStarted) { - qApp->exit_loop(); + tqApp->exit_loop(); loopStarted = false; } return; @@ -1055,19 +1055,19 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en Node* nodeCursor = start_node; Node* nodeParent = start_node; if (nodeParent->tag->type == Tag::Text) - nodeParent = nodeParent->parent; + nodeParent = nodeParent->tqparent; - //Checking if at least one parent of node can have a Text Node as child, otherwise + //Checking if at least one tqparent of node can have a Text Node as child, otherwise //it is impossible for the - //user to add this node. In that case, try to insert the Node in the closest parent accepting it. + //user to add this node. In that case, try to insert the Node in the closest tqparent accepting it. //e.g. TR : a normal insertion would require to have the caret in the TABLE Node, but it is //impossible - QTag* nodeQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), node->tag->name); - if (!nodeQTag) return; + TQTag* nodeTQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), node->tag->name); + if (!nodeTQTag) return; bool specialTagInsertion = false; - TQPtrList<QTag> qTagList = nodeQTag->parents(); - QTag* qTag = 0; + TQPtrList<TQTag> qTagList = nodeTQTag->tqparents(); + TQTag* qTag = 0; for (qTag = qTagList.first(); qTag; qTag = qTagList.next()) { if (qTag->isChild("#text", false)) @@ -1080,11 +1080,11 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en if (specialTagInsertion) // Attention: not smartTagInsertion { - //let's try to insert this node in the closest parent accepting it. + //let's try to insert this node in the closest tqparent accepting it. while (nodeParent) { - QTag* nodeParentQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), nodeParent->tag->name); - if (nodeParentQTag && nodeParentQTag->isChild(node)) + TQTag* nodeParentTQTag = QuantaCommon::tagFromDTD(w->defaultDTD(), nodeParent->tag->name); + if (nodeParentTQTag && nodeParentTQTag->isChild(node)) { nodeCursor = kafkaCommon::createMandatoryNodeSubtree(node, w); start_offset = 0; @@ -1092,10 +1092,10 @@ void TagAction::applyTagInSelection(Node* start_node, int start_offset, Node* en nodeTreeModified = true; break; } - nodeParent = nodeParent->parent; + nodeParent = nodeParent->tqparent; } } - else if(!nodeQTag->isSingle()) + else if(!nodeTQTag->isSingle()) { //If some text is selected in kafka, surround the selection with the new Node. if(!start_node|| !end_node) @@ -1248,15 +1248,15 @@ void TagAction::deapplyTagInSelection(Node* start_node, int start_offset, Node* Node* common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, tag_parent); Node* common_parent_end_child = kafkaCommon::getCommonParentChild(end_node, tag_parent); - Node* parent_of_tag_parent = tag_parent->parent; + Node* tqparent_of_tag_parent = tag_parent->tqparent; if(common_parent_end_child == common_parent_start_child) common_parent_end_child = 0; if(!common_parent_start_child) common_parent_start_child = kafkaCommon::getCommonParentChild(start_node, commonParent); - kafkaCommon::moveNode(common_parent_start_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true); + kafkaCommon::moveNode(common_parent_start_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true); if(common_parent_end_child) - kafkaCommon::moveNode(common_parent_end_child, parent_of_tag_parent, tag_parent, selection, modifs, true, true); + kafkaCommon::moveNode(common_parent_end_child, tqparent_of_tag_parent, tag_parent, selection, modifs, true, true); // Remove tag_parent node subtree if empty if(!tag_parent->hasChildNodes()) diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h index b24addac..d940faf7 100644 --- a/quanta/utility/tagaction.h +++ b/quanta/utility/tagaction.h @@ -47,6 +47,7 @@ class NodeSelection; class TagAction : public KToggleAction { Q_OBJECT + TQ_OBJECT public: /** @@ -54,7 +55,7 @@ public: * @param toggle If set to true, the class behaves like a KToggleAction; * Else it behaves like a KAction. This avoids the multi-inheritance problem. */ - TagAction(TQDomElement *element, KMainWindow *parentMainWindow, bool toggle = false); + TagAction(TQDomElement *element, KMainWindow *tqparentMainWindow, bool toggle = false); virtual ~TagAction(); TQDomElement data() const { return tag; } @@ -93,7 +94,7 @@ public slots: * We need this information in order to know if queued actions should be applied. * It's public because it can be activated by other classes if there are any queued actions. */ - virtual bool slotActionActivated(KAction::ActivationReason reason, Qt::ButtonState state); + virtual bool slotActionActivated(KAction::ActivationReason reason, TQt::ButtonState state); protected slots: virtual void slotGetScriptOutput( KProcess *, char *buffer, int buflen ); diff --git a/quanta/utility/tagactionmanager.cpp b/quanta/utility/tagactionmanager.cpp index 3733aaaf..b11525ec 100644 --- a/quanta/utility/tagactionmanager.cpp +++ b/quanta/utility/tagactionmanager.cpp @@ -54,18 +54,18 @@ TagActionManager* TagActionManager::self() return s_mSelf; } -void TagActionManager::initActions(TQWidget* parent) +void TagActionManager::initActions(TQWidget* tqparent) { - Q_ASSERT(parent); + Q_ASSERT(tqparent); - m_actionCollection = new KActionCollection(parent); + m_actionCollection = new KActionCollection(tqparent); TagActionSet* general(new TagActionSet()); - general->initActions(parent); + general->initActions(tqparent); m_tagActionSets.append(general); TableTagActionSet* table(new TableTagActionSet()); - table->initActions(parent); + table->initActions(tqparent); m_tagActionSets.append(table); } @@ -78,6 +78,6 @@ void TagActionManager::fillWithTagActions(TQWidget* widget, DOM::Node const& nod bool TagActionManager::canIndentDTD(TQString const& dtd) { - return (dtd.contains("HTML", false) || - dtd.contains("XML", false)); + return (dtd.tqcontains("HTML", false) || + dtd.tqcontains("XML", false)); } diff --git a/quanta/utility/tagactionmanager.h b/quanta/utility/tagactionmanager.h index 0977d32c..77f7ad23 100644 --- a/quanta/utility/tagactionmanager.h +++ b/quanta/utility/tagactionmanager.h @@ -62,7 +62,7 @@ private: TagActionManager(TagActionManager const&) {} - void initActions(TQWidget* parent); + void initActions(TQWidget* tqparent); private: static TagActionManager* s_mSelf; diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 28f01ef8..dc994716 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -40,20 +40,20 @@ #include "resource.h" -TagActionSetAbstract::TagActionSetAbstract(TQObject *parent, const char *name) - : TQObject(parent, name), m_currentNode(0) +TagActionSetAbstract::TagActionSetAbstract(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), m_currentNode(0) {} TagActionSetAbstract::~TagActionSetAbstract() {} -Node* TagActionSetAbstract::parentTag(Node* node, TQString const& tagName) +Node* TagActionSetAbstract::tqparentTag(Node* node, TQString const& tagName) { Q_ASSERT(node); Node* aux = node; while(aux && aux->nodeName().lower() != tagName) - aux = aux->parent; + aux = aux->tqparent; return aux; } @@ -81,8 +81,8 @@ bool TagActionSetAbstract::fillWithTagActions(TQWidget* /*widget*/, DOM::Node co //_____________________________________________________________________________ -TagActionSet::TagActionSet(TQObject *parent, const char *name) - : TagActionSetAbstract(parent, name), m_separator(0) +TagActionSet::TagActionSet(TQObject *tqparent, const char *name) + : TagActionSetAbstract(tqparent, name), m_separator(0) { m_separator = new KActionSeparator(); } @@ -96,7 +96,7 @@ void TagActionSet::initActionMenus(TQWidget* /*widget*/) { } -void TagActionSet::initActions(TQWidget* /*parent*/) +void TagActionSet::initActions(TQWidget* /*tqparent*/) { KActionCollection* ac(TagActionManager::self()->actionCollection()); @@ -221,14 +221,14 @@ bool TagActionSet::isInDivArea() const { Q_ASSERT(m_currentNode); - return parentTag(m_currentNode, "div"); + return tqparentTag(m_currentNode, "div"); } void TagActionSet::slotCopyDivElement() { Q_ASSERT(m_currentNode); - Node* divNode = parentTag(m_currentNode, "div"); + Node* divNode = tqparentTag(m_currentNode, "div"); Q_ASSERT(divNode); Node* divClosingNode = divNode->getClosingNode(); @@ -245,7 +245,7 @@ void TagActionSet::slotCutDivElement() { Q_ASSERT(m_currentNode); - Node* divNode = parentTag(m_currentNode, "div"); + Node* divNode = tqparentTag(m_currentNode, "div"); Q_ASSERT(divNode); Node* divClosingNode = divNode->getClosingNode(); @@ -266,31 +266,31 @@ void TagActionSet::slotCutDivElement() //_____________________________________________________________________________ -TableTagActionSet::TableTagActionSet(TQObject *parent, const char *name) - : TagActionSetAbstract(parent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0) +TableTagActionSet::TableTagActionSet(TQObject *tqparent, const char *name) + : TagActionSetAbstract(tqparent, name), m_separator(0), m_tableActionMenu_0(0), m_insertActionMenu_1(0) { m_separator = new KActionSeparator(); } bool TableTagActionSet::isInTagContext() const { - return parentTag(m_currentNode, "table"); + return tqparentTag(m_currentNode, "table"); } void TableTagActionSet::initActionMenus(TQWidget* widget) { Q_ASSERT(!m_tableActionMenu_0); - m_tableActionMenu_0 = new KActionMenu(i18n("Table..."), widget); + m_tableActionMenu_0 = new KActionMenu(i18n("Table..."), TQT_TQOBJECT(widget)); m_insertActionMenu_1 = new KActionMenu(i18n("Insert..."), m_tableActionMenu_0); m_removeActionMenu_1 = new KActionMenu(i18n("Remove..."), m_tableActionMenu_0); } -void TableTagActionSet::initActions(TQWidget* parent) +void TableTagActionSet::initActions(TQWidget* tqparent) { if(!m_tableActionMenu_0) - initActionMenus(parent); + initActionMenus(tqparent); KActionCollection* ac(TagActionManager::self()->actionCollection()); @@ -575,19 +575,19 @@ void TableTagActionSet::slotInsertTable() bool TableTagActionSet::canInsertRowAbove() const { - return isInTagContext() && parentTag(m_currentNode, "tbody"); + return isInTagContext() && tqparentTag(m_currentNode, "tbody"); } void TableTagActionSet::slotInsertRowAbove() { Q_ASSERT(m_currentNode); - Node* nearRow = parentTag(m_currentNode, "tr"); + Node* nearRow = tqparentTag(m_currentNode, "tr"); if(!nearRow) return; - Node* nodeParent= nearRow->parent; + Node* nodeParent= nearRow->tqparent; QuantaView* view = ViewManager::ref()->activeView(); NodeModifsSet *modifs = new NodeModifsSet(); @@ -610,16 +610,16 @@ void TableTagActionSet::slotInsertRowBelow() Q_ASSERT(m_currentNode); Node* nearRow = 0; - Node* aux = parentTag(m_currentNode, "thead"); + Node* aux = tqparentTag(m_currentNode, "thead"); if(aux) nearRow= firstChildTag(tableStart(), "tr"); else - nearRow = parentTag(m_currentNode, "tr"); + nearRow = tqparentTag(m_currentNode, "tr"); if(!nearRow) return; - Node* nodeParent= nearRow->parent; + Node* nodeParent= nearRow->tqparent; Node* nextSibling = nearRow->SNext(); QuantaView* view = ViewManager::ref()->activeView(); @@ -781,7 +781,7 @@ void TableTagActionSet::slotRemoveRows() if(!selection.hasSelection()) { - Node* nearTr = parentTag(m_currentNode, "tr"); + Node* nearTr = tqparentTag(m_currentNode, "tr"); kafkaCommon::extractAndDeleteNode(nearTr, modifs, true, true); } else @@ -789,8 +789,8 @@ void TableTagActionSet::slotRemoveRows() Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode()); Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel()); - Node* startTr = parentTag(startSelection, "tr"); - Node* endTr = parentTag(endSelection, "tr"); + Node* startTr = tqparentTag(startSelection, "tr"); + Node* endTr = tqparentTag(endSelection, "tr"); Node* iteratorNode = startTr; bool loop(true); @@ -844,7 +844,7 @@ void TableTagActionSet::slotRemoveColumns() if(startColumnIndex == -1 || endColumnIndex == -1) return; - m_currentNode = parentTag(m_currentNode, "tbody"); // m_currentNode will become invalid + m_currentNode = tqparentTag(m_currentNode, "tbody"); // m_currentNode will become invalid for(int i = 0; i != numberOfColumnsSelected; ++i) removeColumn(startColumnIndex, modifs); } @@ -880,9 +880,9 @@ void TableTagActionSet::slotRemoveCellsContent() if(!selection.hasSelection()) { Node* aux = m_currentNode; - m_currentNode = parentTag(m_currentNode, "tbody"); + m_currentNode = tqparentTag(m_currentNode, "tbody"); - Node* nearTd = parentTag(aux, "td"); + Node* nearTd = tqparentTag(aux, "td"); clearCellContents(nearTd, modifs); } else @@ -890,8 +890,8 @@ void TableTagActionSet::slotRemoveCellsContent() Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode()); Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel()); - Node* startTd = parentTag(startSelection, "td"); - Node* endTd = parentTag(endSelection, "td"); + Node* startTd = tqparentTag(startSelection, "td"); + Node* endTd = tqparentTag(endSelection, "td"); if(!startTd || !endTd) return; @@ -933,8 +933,8 @@ void TableTagActionSet::slotMergeSelectedCells() Node* startSelection = kafkaCommon::getNodeFromLocation(selection.cursorNode()); Node* endSelection = kafkaCommon::getNodeFromLocation(selection.cursorNodeEndSel()); - Node* startTd = parentTag(startSelection, "td"); - Node* endTd = parentTag(endSelection, "td"); + Node* startTd = tqparentTag(startSelection, "td"); + Node* endTd = tqparentTag(endSelection, "td"); Node* nodeIterator = startTd->SNext(); Node* stopNode = endTd->SNext(); @@ -975,7 +975,7 @@ Node* TableTagActionSet::tableStart() const Q_ASSERT(isInTagContext()); Q_ASSERT(m_currentNode); - return parentTag(m_currentNode, "table"); + return tqparentTag(m_currentNode, "table"); } int TableTagActionSet::numberOfColumns() const @@ -1004,7 +1004,7 @@ int TableTagActionSet::numberOfColumns() const int TableTagActionSet::currentColumnIndex() const { return columnIndex(m_currentNode); -/* Node* nearTd = parentTag(m_currentNode, "td"); +/* Node* nearTd = tqparentTag(m_currentNode, "td"); if(!nearTd) return -1; @@ -1012,7 +1012,7 @@ int TableTagActionSet::currentColumnIndex() const if(!_tableStart) return -1; - Node* firstTd = firstChildTag(parentTag(m_currentNode, "tr"), "td"); + Node* firstTd = firstChildTag(tqparentTag(m_currentNode, "tr"), "td"); //Node* firstTd = firstChildTag(_tableStart, "td"); if(!firstTd) return -1; @@ -1032,7 +1032,7 @@ int TableTagActionSet::currentColumnIndex() const int TableTagActionSet::columnIndex(Node* node) const { - Node* nearTd = parentTag(node, "td"); + Node* nearTd = tqparentTag(node, "td"); if(!nearTd) return -1; @@ -1040,7 +1040,7 @@ int TableTagActionSet::columnIndex(Node* node) const if(!_tableStart) return -1; - Node* firstTd = firstChildTag(parentTag(node, "tr"), "td"); + Node* firstTd = firstChildTag(tqparentTag(node, "tr"), "td"); if(!firstTd) return -1; diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h index 00d3341f..5b813acb 100644 --- a/quanta/utility/tagactionset.h +++ b/quanta/utility/tagactionset.h @@ -35,20 +35,21 @@ class NodeModifsSet; /** @author Paulo Moura Guedes */ -class TagActionSetAbstract : public QObject +class TagActionSetAbstract : public TQObject { Q_OBJECT + TQ_OBJECT public: - TagActionSetAbstract(TQObject *parent = 0, const char *name = 0); + TagActionSetAbstract(TQObject *tqparent = 0, const char *name = 0); virtual ~TagActionSetAbstract(); DOM::Node const& currentDomNode() const {return m_currentDomNode;} - static Node* parentTag(Node* node, TQString const& tagName); + static Node* tqparentTag(Node* node, TQString const& tagName); static Node* firstChildTag(Node* node, TQString const& tagName); virtual bool isInTagContext(/*DOM::Node const& node*/) const = 0; - virtual void initActions(TQWidget* parent) = 0; + virtual void initActions(TQWidget* tqparent) = 0; virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node); virtual void unplugAllActions(TQWidget* widget) const = 0; @@ -66,12 +67,13 @@ private: class TagActionSet : public TagActionSetAbstract { Q_OBJECT + TQ_OBJECT public: - TagActionSet(TQObject *parent = 0, const char *name = 0); + TagActionSet(TQObject *tqparent = 0, const char *name = 0); virtual ~TagActionSet() {} virtual bool isInTagContext() const; - virtual void initActions(TQWidget* parent); + virtual void initActions(TQWidget* tqparent); virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node); virtual void unplugAllActions(TQWidget* widget) const; @@ -94,13 +96,14 @@ private: class TableTagActionSet : public TagActionSetAbstract { Q_OBJECT + TQ_OBJECT public: - TableTagActionSet(TQObject *parent = 0, const char *name = 0); + TableTagActionSet(TQObject *tqparent = 0, const char *name = 0); virtual ~TableTagActionSet() {} virtual bool isInTagContext(/*DOM::Node const& node*/) const; - virtual void initActions(TQWidget* parent); + virtual void initActions(TQWidget* tqparent); virtual bool fillWithTagActions(TQWidget* widget, DOM::Node const& node); virtual void unplugAllActions(TQWidget* widget) const; diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 29c7cfa9..cd3ac37e 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -38,36 +38,36 @@ //app includes #include "toolbartabwidget.h" -ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags f) -:TQTabWidget(parent, name, f) +ToolbarTabWidget::ToolbarTabWidget(TQWidget * tqparent, const char * name, WFlags f) +:TQTabWidget(tqparent, name, f) { m_popupMenu = new KPopupMenu(this); m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1); - m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction())); + m_popupMenu->insertItem(i18n("New Action..."), tqparent, TQT_SLOT(slotNewAction())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), tqparent, TQT_SLOT(slotAddToolbar())); m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar())); m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar())); connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), - parent, TQT_SLOT(slotRemoveToolbar(const TQString&))); + tqparent, TQT_SLOT(slotRemoveToolbar(const TQString&))); connect(this, TQT_SIGNAL(renameToolbar(const TQString&)), - parent, TQT_SLOT(slotRenameToolbar(const TQString&))); + tqparent, TQT_SLOT(slotRenameToolbar(const TQString&))); connect(this, TQT_SIGNAL(editToolbar(const TQString&)), - parent, TQT_SLOT(slotConfigureToolbars(const TQString&))); + tqparent, TQT_SLOT(slotConfigureToolbars(const TQString&))); connect(this, TQT_SIGNAL(newAction()), - parent, TQT_SLOT(slotNewAction())); + tqparent, TQT_SLOT(slotNewAction())); connect(this, TQT_SIGNAL(addToolbar()), - parent, TQT_SLOT(slotAddToolbar())); + tqparent, TQT_SLOT(slotAddToolbar())); KAcceleratorManager::setNoAccel(this); } void ToolbarTabWidget::insertTab(TQWidget *child, const TQString &label, const TQString &id) { - if (child->inherits("KToolBar") && child->parentWidget()) + if (child->inherits("KToolBar") && child->tqparentWidget()) { - TQTabWidget::insertTab(child->parentWidget(), label); + TQTabWidget::insertTab(child->tqparentWidget(), label); toolbarList.insert(id, child); } } @@ -78,7 +78,7 @@ TQWidget* ToolbarTabWidget::page(int index) for (TQMap<TQString, TQWidget*>::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it) { - if (it.data()->parentWidget() == w) + if (it.data()->tqparentWidget() == w) { w = *it; break; @@ -92,7 +92,7 @@ TQString ToolbarTabWidget::id(TQWidget *w) const TQString idStr; for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it) { - if (it.data()->parentWidget() == w) + if (it.data()->tqparentWidget() == w) { idStr = it.key(); break; @@ -107,7 +107,7 @@ TQString ToolbarTabWidget::id(int index) const TQString idStr; for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it) { - if (it.data()->parentWidget() == w) + if (it.data()->tqparentWidget() == w) { idStr = it.key(); break; @@ -118,16 +118,16 @@ TQString ToolbarTabWidget::id(int index) const TQWidget* ToolbarTabWidget::page(const TQString& id) { - TQWidget *w = toolbarList.find(id).data(); + TQWidget *w = toolbarList.tqfind(id).data(); return w; } void ToolbarTabWidget::removePage(TQWidget * w) { - TQWidget *parent = w->parentWidget(); - if (w->inherits("KToolBar") && parent) + TQWidget *tqparent = w->tqparentWidget(); + if (w->inherits("KToolBar") && tqparent) { - TQTabWidget::removePage(parent); + TQTabWidget::removePage(tqparent); for (TQMap<TQString, TQWidget*>::ConstIterator it = toolbarList.constBegin(); it != toolbarList.constEnd(); ++it) { if (it.data() == w) @@ -136,7 +136,7 @@ void ToolbarTabWidget::removePage(TQWidget * w) break; } } - delete parent; + delete tqparent; } } @@ -169,7 +169,7 @@ void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e ) TQRect r = tab->rect(); TQPoint p1 = mapToGlobal(r.topLeft()); TQPoint p2 = mapToGlobal(r.bottomRight()); - if (TQRect(p1, p2).contains(p)) + if (TQRect(p1, p2).tqcontains(p)) break; else tab = 0L; @@ -179,7 +179,7 @@ void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e ) pageW = currentPage(); for (TQMap<TQString, TQWidget*>::Iterator it = toolbarList.begin(); it != toolbarList.end(); ++it) { - if (it.data()->parentWidget() == pageW) + if (it.data()->tqparentWidget() == pageW) { tabUnderMouse = it.key(); break; @@ -223,11 +223,11 @@ int ToolbarTabWidget::tabHeight() const } -QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_style, bool readConfig) -:KToolBar (parent, name=0, honor_style, readConfig) +QuantaToolBar::QuantaToolBar(TQWidget *tqparent, const char *name, bool honor_style, bool readConfig) +:KToolBar (tqparent, name=0, honor_style, readConfig) { m_popupMenu = new KPopupMenu(this); - m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(parent->parentWidget()); + m_toolbarTab = dynamic_cast<ToolbarTabWidget*>(tqparent->tqparentWidget()); currentActionName = ""; m_iconTextMenu = new KPopupMenu(this); m_iconTextMenu->setCheckable(true); @@ -307,18 +307,18 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - " + i18n(m_toolbarTab->tabUnderMouseLabel.utf8())); m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction())); - TQObjectList* childrenList = queryList("KToolBarButton"); - for (uint i = 0; i < childrenList->count(); i++) + TQObjectList* tqchildrenList = queryList("KToolBarButton"); + for (uint i = 0; i < tqchildrenList->count(); i++) { - KToolBarButton *w = static_cast<KToolBarButton*>(childrenList->at(i)); - TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos()); + KToolBarButton *w = static_cast<KToolBarButton*>(TQT_TQWIDGET(tqchildrenList->at(i))); + TQPoint p1 = w->tqparentWidget()->mapToGlobal(w->pos()); TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height()); - if (TQRect(p1, p2).contains(p)) + if (TQRect(p1, p2).tqcontains(p)) { currentActionName = w->textLabel(); TQString actionName = currentActionName; - m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); - m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction())); + m_popupMenu->insertItem(i18n("Remove Action - %1").tqarg(actionName.tqreplace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); + m_popupMenu->insertItem(i18n("Edit Action - %1").tqarg(actionName), this, TQT_SLOT(slotEditAction())); break; } } @@ -341,7 +341,7 @@ void QuantaToolBar::slotEditAction() void QuantaToolBar::slotRemoveAction() { - if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <b>%1</b> action?</qt>").arg(currentActionName),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue ) + if ( KMessageBox::warningContinueCancel(this, i18n("<qt>Are you sure you want to remove the <b>%1</b> action?</qt>").tqarg(currentActionName),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { emit removeAction(m_toolbarTab->tabUnderMouse, currentActionName); } diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h index 6be17eda..11318394 100644 --- a/quanta/utility/toolbartabwidget.h +++ b/quanta/utility/toolbartabwidget.h @@ -24,16 +24,17 @@ class TQWidgetStack; class TQTabBar; class KToolBar; -class ToolbarTabWidget: public QTabWidget +class ToolbarTabWidget: public TQTabWidget { Q_OBJECT + TQ_OBJECT public: TQWidgetStack *m_widgetStack; - static ToolbarTabWidget* const ref(TQWidget *parent = 0L, const char *name = 0L) + static ToolbarTabWidget* const ref(TQWidget *tqparent = 0L, const char *name = 0L) { static ToolbarTabWidget *m_ref; - if (!m_ref) m_ref = new ToolbarTabWidget (parent, name); + if (!m_ref) m_ref = new ToolbarTabWidget (tqparent, name); return m_ref; } virtual ~ToolbarTabWidget(){}; @@ -76,7 +77,7 @@ protected: TQMap<TQString, TQWidget*> toolbarList; private: - ToolbarTabWidget(TQWidget * parent = 0, const char * name = 0, WFlags f = 0); + ToolbarTabWidget(TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0); KToolBar::IconText m_iconText; }; @@ -84,9 +85,10 @@ private: class QuantaToolBar: public KToolBar { Q_OBJECT + TQ_OBJECT public: - QuantaToolBar (TQWidget *parent, const char *name=0, bool honor_style=FALSE, bool readConfig=TRUE); + QuantaToolBar (TQWidget *tqparent, const char *name=0, bool honor_style=FALSE, bool readConfig=TRUE); virtual ~QuantaToolBar() {}; private slots: |