summaryrefslogtreecommitdiffstats
path: root/quanta/components/csseditor
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-16 19:02:47 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-16 19:02:47 +0000
commite985f7e545f4739493965aad69bbecb136dc9346 (patch)
tree54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /quanta/components/csseditor
parentf7670c198945adc3b95ad69a959fe5f8ae55b493 (diff)
downloadtdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz
tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip
TQt4 port kdewebdev
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta/components/csseditor')
-rw-r--r--quanta/components/csseditor/colorrequester.cpp12
-rw-r--r--quanta/components/csseditor/colorrequester.h3
-rw-r--r--quanta/components/csseditor/colorslider.cpp18
-rw-r--r--quanta/components/csseditor/colorslider.h9
-rw-r--r--quanta/components/csseditor/csseditor.cpp96
-rw-r--r--quanta/components/csseditor/csseditor.h15
-rw-r--r--quanta/components/csseditor/csseditor_globals.cpp8
-rw-r--r--quanta/components/csseditor/csseditor_globals.h9
-rw-r--r--quanta/components/csseditor/csseditors.ui56
-rw-r--r--quanta/components/csseditor/cssselector.cpp26
-rw-r--r--quanta/components/csseditor/cssselector.h5
-rw-r--r--quanta/components/csseditor/cssselectors.ui144
-rw-r--r--quanta/components/csseditor/cssshpropertyparser.cpp12
-rw-r--r--quanta/components/csseditor/data/config.xml8
-rw-r--r--quanta/components/csseditor/doubleeditors.cpp8
-rw-r--r--quanta/components/csseditor/doubleeditors.h12
-rw-r--r--quanta/components/csseditor/encodingselector.cpp2
-rw-r--r--quanta/components/csseditor/encodingselector.h3
-rw-r--r--quanta/components/csseditor/encodingselectors.ui26
-rw-r--r--quanta/components/csseditor/fontfamilychooser.cpp22
-rw-r--r--quanta/components/csseditor/fontfamilychooser.h3
-rw-r--r--quanta/components/csseditor/fontfamilychoosers.ui84
-rw-r--r--quanta/components/csseditor/minieditor.h4
-rw-r--r--quanta/components/csseditor/percentageeditor.cpp2
-rw-r--r--quanta/components/csseditor/percentageeditor.h3
-rw-r--r--quanta/components/csseditor/propertysetter.cpp4
-rw-r--r--quanta/components/csseditor/propertysetter.h5
-rw-r--r--quanta/components/csseditor/qmyhighlighter.cpp6
-rw-r--r--quanta/components/csseditor/qmyhighlighter.h10
-rw-r--r--quanta/components/csseditor/shorthandformer.cpp132
-rw-r--r--quanta/components/csseditor/specialsb.cpp10
-rw-r--r--quanta/components/csseditor/specialsb.h15
-rw-r--r--quanta/components/csseditor/styleeditor.cpp6
-rw-r--r--quanta/components/csseditor/styleeditor.h3
-rw-r--r--quanta/components/csseditor/stylesheetparser.cpp38
-rw-r--r--quanta/components/csseditor/stylesheetparser.h11
-rw-r--r--quanta/components/csseditor/tlpeditors.cpp14
-rw-r--r--quanta/components/csseditor/tlpeditors.h9
38 files changed, 439 insertions, 414 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>&amp;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>&amp;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*/){}