diff options
Diffstat (limited to 'quanta/components')
104 files changed, 1227 insertions, 1176 deletions
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;} |