diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
commit | e985f7e545f4739493965aad69bbecb136dc9346 (patch) | |
tree | 54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /quanta/dialogs/tagdialogs | |
parent | f7670c198945adc3b95ad69a959fe5f8ae55b493 (diff) | |
download | tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip |
TQt4 port kdewebdev
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'quanta/dialogs/tagdialogs')
27 files changed, 205 insertions, 196 deletions
diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 878216e3..10ea4273 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -21,10 +21,10 @@ // // 1999-09-27 Espen Sand <espensa@online.no> // KColorDialog is now subclassed from KDialogBase. I have also extended -// KColorDialog::getColor() so that in contains a parent argument. This +// KColorDialog::getColor() so that in contains a tqparent argument. This // improves centering capability. // -// layout management added Oct 1997 by Mario Weilguni +// tqlayout management added Oct 1997 by Mario Weilguni // <mweilguni@sime.com> // @@ -66,8 +66,8 @@ #define STANDARD_PAL_SIZE 17 -ColorCombo::ColorCombo( TQWidget *parent, const char *name ) - : TQComboBox( parent, name ) +ColorCombo::ColorCombo( TQWidget *tqparent, const char *name ) + : TQComboBox( tqparent, name ) { customColor.setRgb( 255, 255, 255 ); internalcolor.setRgb( 255, 255, 255 ); @@ -165,7 +165,7 @@ void ColorCombo::slotActivated( int index ) TQPainter painter; TQPen pen; - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -219,7 +219,7 @@ void ColorCombo::addColors() insertItem( i18n("None") ); - if ( qGray( customColor.rgb() ) < 128 ) + if ( tqGray( customColor.rgb() ) < 128 ) pen.setColor( white ); else pen.setColor( black ); @@ -270,23 +270,23 @@ void ColorCombo::createStandardPalette() int i = 0; - standardPalette[i++] = Qt::red; - standardPalette[i++] = Qt::green; - standardPalette[i++] = Qt::blue; - standardPalette[i++] = Qt::cyan; - standardPalette[i++] = Qt::magenta; - standardPalette[i++] = Qt::yellow; - standardPalette[i++] = Qt::darkRed; - standardPalette[i++] = Qt::darkGreen; - standardPalette[i++] = Qt::darkBlue; - standardPalette[i++] = Qt::darkCyan; - standardPalette[i++] = Qt::darkMagenta; - standardPalette[i++] = Qt::darkYellow; - standardPalette[i++] = Qt::white; - standardPalette[i++] = Qt::lightGray; - standardPalette[i++] = Qt::gray; - standardPalette[i++] = Qt::darkGray; - standardPalette[i++] = Qt::black; + standardPalette[i++] = TQt::red; + standardPalette[i++] = TQt::green; + standardPalette[i++] = TQt::blue; + standardPalette[i++] = TQt::cyan; + standardPalette[i++] = TQt::magenta; + standardPalette[i++] = TQt::yellow; + standardPalette[i++] = TQt::darkRed; + standardPalette[i++] = TQt::darkGreen; + standardPalette[i++] = TQt::darkBlue; + standardPalette[i++] = TQt::darkCyan; + standardPalette[i++] = TQt::darkMagenta; + standardPalette[i++] = TQt::darkYellow; + standardPalette[i++] = TQt::white; + standardPalette[i++] = TQt::lightGray; + standardPalette[i++] = TQt::gray; + standardPalette[i++] = TQt::darkGray; + standardPalette[i++] = TQt::black; standardPaletteNames = new TQString [STANDARD_PAL_SIZE]; diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index b6f851e0..a1f92a31 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -19,7 +19,7 @@ //----------------------------------------------------------------------------- // KDE color selection combo box -// layout management added Oct 1997 by Mario Weilguni +// tqlayout management added Oct 1997 by Mario Weilguni // <mweilguni@sime.com> @@ -37,11 +37,12 @@ /** * Combobox for colours. */ -class ColorCombo : public QComboBox +class ColorCombo : public TQComboBox { Q_OBJECT + TQ_OBJECT public: - ColorCombo( TQWidget *parent = 0L, const char *name = 0L ); + ColorCombo( TQWidget *tqparent = 0L, const char *name = 0L ); ~ColorCombo(); void setColor( const TQColor &col ); diff --git a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp index 8e52ae01..f45eea8f 100644 --- a/quanta/dialogs/tagdialogs/corewidgetdlg.cpp +++ b/quanta/dialogs/tagdialogs/corewidgetdlg.cpp @@ -21,8 +21,8 @@ #include <tqdict.h> #include <tqlineedit.h> -CoreWidgetDlg::CoreWidgetDlg(TQWidget *parent, const char *name) - :CoreWidgetDlgS(parent,name), TagWidget(parent,name) +CoreWidgetDlg::CoreWidgetDlg(TQWidget *tqparent, const char *name) + :CoreWidgetDlgS(tqparent,name), TagWidget(tqparent,name) { } @@ -48,13 +48,13 @@ void CoreWidgetDlg::writeAttributes( TQDict<TQString> *d ) dict = d; TQString *t; // value of attr. - if (( t=d->find("id") )) setValue(*t, lineId); - if (( t=d->find("class") )) setValue(*t, lineClass); - if (( t=d->find("style") )) setValue(*t, lineStyle); - if (( t=d->find("title") )) setValue(*t, lineTitle); + if (( t=d->tqfind("id") )) setValue(*t, lineId); + if (( t=d->tqfind("class") )) setValue(*t, lineClass); + if (( t=d->tqfind("style") )) setValue(*t, lineStyle); + if (( t=d->tqfind("title") )) setValue(*t, lineTitle); - if (( t=d->find("lang") )) setValue(*t, lineLang); - if (( t=d->find("dir") )) setValue(*t, lineDir); + if (( t=d->tqfind("lang") )) setValue(*t, lineLang); + if (( t=d->tqfind("dir") )) setValue(*t, lineDir); } diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index 713ccf2c..a7954793 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -24,8 +24,8 @@ #include <tqstring.h> #include <tqstringlist.h> -ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) - :KDialogBase(parent,name), listbox(new KListBox(this)) +ListDlg::ListDlg(TQStringList &entryList,TQWidget* tqparent, const char *name ) + :KDialogBase(tqparent,name), listbox(new KListBox(this)) { Q_CHECK_PTR(listbox); setMainWidget(listbox); @@ -40,7 +40,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) } listbox->setMinimumSize(350,150); adjustSize(); - resize(sizeHint()); + resize(tqsizeHint()); connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); } diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h index ea455d70..4615e495 100644 --- a/quanta/dialogs/tagdialogs/listdlg.h +++ b/quanta/dialogs/tagdialogs/listdlg.h @@ -32,8 +32,9 @@ selected item with the getEntry() method. class ListDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ListDlg(TQStringList &entryList,TQWidget* parent=0, const char *name =0); + ListDlg(TQStringList &entryList,TQWidget* tqparent=0, const char *name =0); ~ListDlg(); TQString getEntry(); int getEntryNum(); diff --git a/quanta/dialogs/tagdialogs/pictureview.cpp b/quanta/dialogs/tagdialogs/pictureview.cpp index 65102ba8..7579c47a 100644 --- a/quanta/dialogs/tagdialogs/pictureview.cpp +++ b/quanta/dialogs/tagdialogs/pictureview.cpp @@ -20,7 +20,7 @@ #include "tqpainter.h" #include <tqimage.h> -PictureView::PictureView(TQWidget *parent, char *file, const char *name ) : TQFrame(parent,name) +PictureView::PictureView(TQWidget *tqparent, char *file, const char *name ) : TQFrame(tqparent,name) { if ( file ) { pix = new TQImage(file); @@ -69,7 +69,7 @@ void PictureView::slotSetImage(const TQString& file) picheight = pix->height(); scale(); - repaint(); + tqrepaint(); } /** try scale image */ diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h index 59a71609..e8fadc31 100644 --- a/quanta/dialogs/tagdialogs/pictureview.h +++ b/quanta/dialogs/tagdialogs/pictureview.h @@ -29,8 +29,9 @@ used by TagImgDlg class PictureView : public TQFrame { Q_OBJECT + TQ_OBJECT public: - PictureView(TQWidget *parent=0, char *file=0, const char *name=0); + PictureView(TQWidget *tqparent=0, char *file=0, const char *name=0); /** try scale image */ void scale(); public slots: // Public slots diff --git a/quanta/dialogs/tagdialogs/tagattr.cpp b/quanta/dialogs/tagdialogs/tagattr.cpp index 251c4b8b..1ab0bdde 100644 --- a/quanta/dialogs/tagdialogs/tagattr.cpp +++ b/quanta/dialogs/tagdialogs/tagattr.cpp @@ -39,7 +39,7 @@ TQString Attr::attrName() const } -Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) +Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { combo = (TQComboBox *)w; @@ -50,7 +50,7 @@ Attr_list::Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) TQString method = el.attribute("method"); TQString interface = el.attribute("interface", "QuantaIf"); TQString arguments = el.attribute("arguments"); - arguments.replace("%tagname%", m_dtdTag->name()); + arguments.tqreplace("%tagname%", m_dtdTag->name()); DCOPReply reply = QuantaCommon::callDCOPMethod(interface, method, arguments); if (reply.isValid()) { @@ -87,9 +87,9 @@ void Attr_list::setValue(const TQString &value) } -TQDomNode findChild( TQDomNode &parent, const TQString &name ) +TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name ) { - for ( TQDomNode n = parent.firstChild(); !n.isNull(); n = n.nextSibling() ) + for ( TQDomNode n = tqparent.firstChild(); !n.isNull(); n = n.nextSibling() ) if ( n.nodeName() == name ) return n; return TQDomNode(); diff --git a/quanta/dialogs/tagdialogs/tagattr.h b/quanta/dialogs/tagdialogs/tagattr.h index bbd562c6..c9567eda 100644 --- a/quanta/dialogs/tagdialogs/tagattr.h +++ b/quanta/dialogs/tagdialogs/tagattr.h @@ -34,16 +34,16 @@ class TQDomElement; class TQWidget; -class QTag; +class TQTag; -TQDomNode findChild( TQDomNode &parent, const TQString &name ); +TQDomNode tqfindChild( TQDomNode &tqparent, const TQString &name ); class Attr { public: - Attr( TQDomElement const& el, TQWidget *, QTag *dtdTag ) + Attr( TQDomElement const& el, TQWidget *, TQTag *dtdTag ) : domEl(el), name(domEl.attribute("name","")), m_dtdTag(dtdTag) {} //{ domEl = el; name = domEl->attribute("name",""); m_dtdTag = dtdTag;} virtual ~Attr(){} @@ -57,7 +57,7 @@ class Attr protected: TQDomElement domEl; TQString name; - QTag *m_dtdTag; + TQTag *m_dtdTag; }; @@ -67,7 +67,7 @@ class Attr_line : public Attr TQLineEdit *line; public: - Attr_line( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_line( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { line = (TQLineEdit *)w; } virtual ~Attr_line(){}; @@ -82,7 +82,7 @@ class Attr_color : public Attr ColorCombo *color; public: - Attr_color( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_color( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { color = (ColorCombo *)w; } virtual ~Attr_color(){}; @@ -96,7 +96,7 @@ class Attr_file : public Attr FileCombo *file; public: - Attr_file( TQDomElement const& el, TQWidget *w , QTag * dtdTag ) : Attr(el, w, dtdTag) + Attr_file( TQDomElement const& el, TQWidget *w , TQTag * dtdTag ) : Attr(el, w, dtdTag) { file = (FileCombo *)w; } virtual ~Attr_file(){}; @@ -110,7 +110,7 @@ class Attr_list : public Attr TQComboBox *combo; public: - Attr_list( TQDomElement const& el, TQWidget *w, QTag *dtdTag ); + Attr_list( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ); virtual ~Attr_list(){}; virtual TQString value() { return combo->currentText(); } @@ -124,7 +124,7 @@ class Attr_check : public Attr TQCheckBox *check; public: - Attr_check( TQDomElement const& el, TQWidget *w, QTag *dtdTag ) : Attr(el, w, dtdTag) + Attr_check( TQDomElement const& el, TQWidget *w, TQTag *dtdTag ) : Attr(el, w, dtdTag) { check = (TQCheckBox *)w; } virtual ~Attr_check(){}; diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index bc5800ae..12ecec0d 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -42,7 +42,7 @@ #include "qtag.h" #include "kafkacommon.h" -TagDialog::TagDialog(QTag* dtdTag, Tag *tag, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, Tag *tag, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true) { init(dtdTag, a_baseURL); @@ -60,7 +60,7 @@ TagDialog::TagDialog(QTag* dtdTag, Tag *tag, KURL a_baseURL) } -TagDialog::TagDialog(QTag* dtdTag, Tag *tag, const TQString& selection, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, Tag *tag, const TQString& selection, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true), m_selection(selection) { init(dtdTag, a_baseURL); @@ -77,7 +77,7 @@ TagDialog::TagDialog(QTag* dtdTag, Tag *tag, const TQString& selection, KURL a_b parseTag(); } -TagDialog::TagDialog(QTag* dtdTag, TQString attrs, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, TQString attrs, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true) { init(dtdTag, a_baseURL); @@ -90,7 +90,7 @@ TagDialog::TagDialog(QTag* dtdTag, TQString attrs, KURL a_baseURL) parseTag(); } -TagDialog::TagDialog(QTag* dtdTag, const TQString& selection, TQString attrs, KURL a_baseURL) +TagDialog::TagDialog(TQTag* dtdTag, const TQString& selection, TQString attrs, KURL a_baseURL) : TQTabDialog( 0L, "tagdialog", true), m_selection(selection) { init(dtdTag, a_baseURL); @@ -113,7 +113,7 @@ TagDialog::~TagDialog() } -void TagDialog::init(QTag *a_dtdTag, KURL a_baseURL) +void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL) { setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); @@ -123,7 +123,7 @@ void TagDialog::init(QTag *a_dtdTag, KURL a_baseURL) if (!a_dtdTag) //the tag is invalid, let's create a default one { - dtdTag = new QTag(); + dtdTag = new TQTag(); dtdTag->setName(i18n("Unknown tag")); deleteTag = true; } else @@ -148,7 +148,7 @@ void TagDialog::parseTag() TQDomDocument doc; if (dtdTag->name().lower() == "img") //NOTE: HTML specific code! { - mainDlg = new TagImgDlg(dtdTag->parentDTD, this); + mainDlg = new TagImgDlg(dtdTag->tqparentDTD, this); ((TagImgDlg *)mainDlg)->writeAttributes( dict ); } //read the tag file it is available @@ -164,7 +164,7 @@ void TagDialog::parseTag() { TQDomNode n = nodeList.item(i); TQString nodeTagName = n.toElement().attribute("name"); - if (!dtdTag->parentDTD->caseSensitive) + if (!dtdTag->tqparentDTD->caseSensitive) nodeTagName = nodeTagName.upper(); if (nodeTagName == tagName && n.toElement().elementsByTagName("attr").count() > 0) //read a tag { @@ -179,7 +179,7 @@ void TagDialog::parseTag() else { TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n"; - docString += TQString("<tag name=\"%1\">\n").arg(dtdTag->name()); + docString += TQString("<tag name=\"%1\">\n").tqarg(dtdTag->name()); docString += QuantaCommon::xmlFromAttributes(dtdTag->attributes()); docString += "</tag>\n</TAGS>\n"; doc.setContent(docString); @@ -192,7 +192,7 @@ void TagDialog::parseTag() addTab( mainDlg, i18n("Main") ); } - KConfig *dtdConfig = new KConfig(dtdTag->parentDTD->fileName); + KConfig *dtdConfig = new KConfig(dtdTag->tqparentDTD->fileName); dtdConfig->setGroup("General"); int numOfPages = dtdConfig->readNumEntry("NumOfPages"); extraPageList = new TQPtrList<Tagxml>(); @@ -200,14 +200,14 @@ void TagDialog::parseTag() for (int i = 1; i <= numOfPages; i++) { Tagxml *extraPage = 0L; - dtdConfig->setGroup(TQString("Page%1").arg(i)); + dtdConfig->setGroup(TQString("Page%1").tqarg(i)); TQString title = dtdConfig->readEntry("Title"); TQStringList groupList; groupList = dtdConfig->readListEntry("Groups"); TQDomDocument extraDoc; //build an internal tag XML for the groups bool addPage = false; TQString docString = "<!DOCTYPE TAGS>\n<TAGS>\n"; - docString += TQString("<tag name=\"Page%1\">\n").arg(i); + docString += TQString("<tag name=\"Page%1\">\n").tqarg(i); for (uint j = 0; j < groupList.count(); j++) { groupList[j] = groupList[j].stripWhiteSpace(); @@ -226,7 +226,7 @@ void TagDialog::parseTag() { TQDomNode node = nodeList.item(j); TQString nodeTagName = node.toElement().attribute("name"); - if (groupList.contains(nodeTagName) && dtdTag->commonGroups.contains(nodeTagName)) //add the attributes of this common tag to a new tab + if (groupList.tqcontains(nodeTagName) && dtdTag->commonGroups.tqcontains(nodeTagName)) //add the attributes of this common tag to a new tab { TQString s; TQTextStream str(&s, IO_ReadWrite); @@ -325,15 +325,15 @@ TQString TagDialog::getAttributeString() TQString TagDialog::getAttribute(const TQString& attr) { TQString attrStr = getAttributeString()+" "; - int pos = attrStr.upper().find(attr.upper()); + int pos = attrStr.upper().tqfind(attr.upper()); if (pos != -1) { - pos = attrStr.find("=",pos+1) + 1; - return attrStr.mid(pos, attrStr.find(" ",pos) - pos); + pos = attrStr.tqfind("=",pos+1) + 1; + return attrStr.mid(pos, attrStr.tqfind(" ",pos) - pos); } else { - return TQString::null; + return TQString(); } } @@ -429,7 +429,7 @@ void TagDialog::insertTag(Document *w, bool insertInLine) TQString newTag = getAttributeString(); newTag = TQString("<")+QuantaCommon::tagCase(dtdTag->name())+newTag; - if ( dtdTag->parentDTD->singleTagStyle == "xml" && + if ( dtdTag->tqparentDTD->singleTagStyle == "xml" && (dtdTag->isSingle() || (!qConfig.closeOptionalTags && dtdTag->isOptional())) ) { diff --git a/quanta/dialogs/tagdialogs/tagdialog.h b/quanta/dialogs/tagdialogs/tagdialog.h index c715085f..c3e6c2d4 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.h +++ b/quanta/dialogs/tagdialogs/tagdialog.h @@ -32,13 +32,14 @@ class Document; class TagWidget; class Tagxml; -class QTag; +class TQTag; class Tag; class KURL; class TQShowEvent; class TagDialog : public TQTabDialog { Q_OBJECT + TQ_OBJECT public: /** @@ -50,10 +51,10 @@ public: </a> */ - TagDialog(QTag* dtdTag, Tag* tag, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, Tag* tag, const TQString& selection, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, TQString attrs=TQString::null, KURL a_baseURL = KURL()); - TagDialog(QTag* dtdTag, const TQString& selection, TQString attrs=TQString::null, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, Tag* tag, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, Tag* tag, const TQString& selection, KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, TQString attrs=TQString(), KURL a_baseURL = KURL()); + TagDialog(TQTag* dtdTag, const TQString& selection, TQString attrs=TQString(), KURL a_baseURL = KURL()); ~TagDialog(); /** Insert an attribute to dict*/ void insertAttribute(TQString *attr, TQString *value); @@ -90,12 +91,12 @@ protected slots: private: bool deleteTag; Tag *m_tag; - QTag* dtdTag; + TQTag* dtdTag; TQString m_selection; TQPtrList<Tagxml> *extraPageList; - void init(QTag* dtdTag, KURL a_baseURL); + void init(TQTag* dtdTag, KURL a_baseURL); void parseAttributes(const TQString &attrs); }; diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 9448f48d..b8f08324 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -35,8 +35,8 @@ #include "tagimgdlg.moc" -TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(parent,name) +TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name) { m_dtd = dtd; img = 0L; @@ -108,7 +108,7 @@ void TagImgDlg::slotFileSelect() if ( !url.isEmpty() ) { slotImageSet( url ); - url = QExtFileInfo::toRelative(url, baseURL); + url = TQExtFileInfo::toRelative(url, baseURL); lineImgSource->setText( url.path() ); } } @@ -145,26 +145,26 @@ void TagImgDlg::writeAttributes( TQDict<TQString> *d ) dict = d; TQString *t; // value of attr. - if (( t=d->find("src") )) + if (( t=d->tqfind("src") )) { lineImgSource->setText(*t); KURL url = baseURL; QuantaCommon::setUrl(url, *t); - url = QExtFileInfo::toAbsolute(url, baseURL); + url = TQExtFileInfo::toAbsolute(url, baseURL); slotImageSet( url ); } - if ( (t=d->find("alt")) ) + if ( (t=d->tqfind("alt")) ) setValue(*t, lineAltText); - if ( (t=d->find("width")) && lineWidth ) + if ( (t=d->tqfind("width")) && lineWidth ) setValue(*t, lineWidth); - if ( (t=d->find("height")) && lineHeight ) + if ( (t=d->tqfind("height")) && lineHeight ) setValue(*t, lineHeight); - if ( (t=d->find("hspace")) && lineHSpace) + if ( (t=d->tqfind("hspace")) && lineHSpace) setValue(*t, lineHSpace); - if ( (t=d->find("vspace")) && lineVSpace ) + if ( (t=d->tqfind("vspace")) && lineVSpace ) setValue(*t, lineVSpace); - if ( (t=d->find("align")) && comboAlign ) + if ( (t=d->tqfind("align")) && comboAlign ) setValue(*t, comboAlign); - if ( (t=d->find("border")) && spinBorder ) + if ( (t=d->tqfind("border")) && spinBorder ) setValue(*t, spinBorder); } diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h index 9f67d0f9..488d2377 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.h +++ b/quanta/dialogs/tagdialogs/tagimgdlg.h @@ -40,8 +40,9 @@ class TQImage; class TagImgDlg : public TQWidget, TagWidget { Q_OBJECT + TQ_OBJECT public: - TagImgDlg(const DTDStruct *dtd, TQWidget *parent=0, const char *name=0); + TagImgDlg(const DTDStruct *dtd, TQWidget *tqparent=0, const char *name=0); ~TagImgDlg(); public: @@ -51,19 +52,19 @@ public: KLineEdit *lineImgSource; TQPushButton *buttonImgSource; TQPushButton *buttonRecalcImgSize; - TQLabel *QLabel_4; + TQLabel *TQLabel_4; KLineEdit *lineWidth; - TQLabel *QLabel_5; + TQLabel *TQLabel_5; KLineEdit *lineHeight; - TQLabel *QLabel_6; + TQLabel *TQLabel_6; KLineEdit *lineHSpace; - TQLabel *QLabel_7; + TQLabel *TQLabel_7; KLineEdit *lineVSpace; - TQLabel *QLabel_8; + TQLabel *TQLabel_8; KLineEdit *lineAltText; - TQLabel *QLabel_9; + TQLabel *TQLabel_9; TQSpinBox *spinBorder; - TQLabel *QLabel_10; + TQLabel *TQLabel_10; TQComboBox *comboAlign; PictureView *widgetImg; TQPushButton *buttonOk; diff --git a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp index 69d6a72e..07a44394 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlgdata.cpp @@ -34,7 +34,7 @@ void TagImgDlg::initDialog(){ buttonImgSource->setText(i18n("...")); grid->addMultiCellWidget(buttonImgSource, 0, 0, 4, 4); - QTag *imgTag = m_dtd->tagsList->find("img"); + TQTag *imgTag = m_dtd->tagsList->tqfind("img"); if (!imgTag) return; @@ -42,9 +42,9 @@ void TagImgDlg::initDialog(){ lineWidth = 0L; if (imgTag->attribute("width")) { - QLabel_4= new TQLabel(this,"NoName"); - QLabel_4->setText(i18n("Width:")); - grid->addMultiCellWidget(QLabel_4, 1, 1, 0, 0); + TQLabel_4= new TQLabel(this,"NoName"); + TQLabel_4->setText(i18n("Width:")); + grid->addMultiCellWidget(TQLabel_4, 1, 1, 0, 0); lineWidth= new KLineEdit(this,"NoName"); lineWidth->setValidator( new KFloatValidator( lineWidth ) ); @@ -54,9 +54,9 @@ void TagImgDlg::initDialog(){ lineHeight = 0L; if (imgTag->attribute("height")) { - QLabel_5= new TQLabel(this,"NoName"); - QLabel_5->setText(i18n("Height:")); - grid->addMultiCellWidget(QLabel_5, 1, 1, 2, 2); + TQLabel_5= new TQLabel(this,"NoName"); + TQLabel_5->setText(i18n("Height:")); + grid->addMultiCellWidget(TQLabel_5, 1, 1, 2, 2); lineHeight= new KLineEdit(this,"NoName"); lineHeight->setValidator( new KFloatValidator( lineHeight ) ); @@ -70,9 +70,9 @@ void TagImgDlg::initDialog(){ lineHSpace = 0L; if (imgTag->attribute("hspace")) { - QLabel_6= new TQLabel(this,"NoName"); - QLabel_6->setText(i18n("HSpace:")); - grid->addMultiCellWidget(QLabel_6, 2, 2, 0, 0); + TQLabel_6= new TQLabel(this,"NoName"); + TQLabel_6->setText(i18n("HSpace:")); + grid->addMultiCellWidget(TQLabel_6, 2, 2, 0, 0); lineHSpace= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineHSpace, 2, 2, 1, 1); @@ -81,17 +81,17 @@ void TagImgDlg::initDialog(){ lineVSpace = 0L; if (imgTag->attribute("vspace")) { - QLabel_7= new TQLabel(this,"NoName"); - QLabel_7->setText(i18n("VSpace:")); - grid->addMultiCellWidget(QLabel_7, 2, 2, 2, 2); + TQLabel_7= new TQLabel(this,"NoName"); + TQLabel_7->setText(i18n("VSpace:")); + grid->addMultiCellWidget(TQLabel_7, 2, 2, 2, 2); lineVSpace= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineVSpace, 2, 2, 3, 3); } - QLabel_8= new TQLabel(this,"NoName"); - QLabel_8->setText(i18n("Alternate text:")); - grid->addMultiCellWidget(QLabel_8, 3, 3, 0, 0); + TQLabel_8= new TQLabel(this,"NoName"); + TQLabel_8->setText(i18n("Alternate text:")); + grid->addMultiCellWidget(TQLabel_8, 3, 3, 0, 0); lineAltText= new KLineEdit(this,"NoName"); grid->addMultiCellWidget(lineAltText, 3, 3, 1, 4); @@ -99,9 +99,9 @@ void TagImgDlg::initDialog(){ spinBorder = 0L; if (imgTag->attribute("border")) { - QLabel_9= new TQLabel(this,"NoName"); - QLabel_9->setText(i18n("Border:")); - grid->addMultiCellWidget(QLabel_9, 4, 4, 0, 0); + TQLabel_9= new TQLabel(this,"NoName"); + TQLabel_9->setText(i18n("Border:")); + grid->addMultiCellWidget(TQLabel_9, 4, 4, 0, 0); spinBorder= new TQSpinBox(this,"NoName"); spinBorder->setRange(0,20); @@ -111,9 +111,9 @@ void TagImgDlg::initDialog(){ comboAlign = 0L; if (imgTag->attribute("align")) { - QLabel_10= new TQLabel(this,"NoName"); - QLabel_10->setText(i18n("Align:")); - grid->addMultiCellWidget(QLabel_10, 4, 4, 2, 2); + TQLabel_10= new TQLabel(this,"NoName"); + TQLabel_10->setText(i18n("Align:")); + grid->addMultiCellWidget(TQLabel_10, 4, 4, 2, 2); comboAlign= new TQComboBox(this,"NoName"); grid->addMultiCellWidget(comboAlign, 4, 4, 3, 4); diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui index 1ec00314..d3e03fd5 100644 --- a/quanta/dialogs/tagdialogs/tagmail.ui +++ b/quanta/dialogs/tagdialogs/tagmail.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>TagMail</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>TagMail</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>AddressLabel</cstring> </property> @@ -27,7 +27,7 @@ <string>Email address:</string> </property> </widget> - <widget class="QPushButton" row="0" column="4"> + <widget class="TQPushButton" row="0" column="4"> <property name="name"> <cstring>buttonAddressSelect</cstring> </property> @@ -39,7 +39,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>32</width> <height>32767</height> @@ -49,17 +49,17 @@ <string>...</string> </property> </widget> - <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lineEmail</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1" rowspan="1" colspan="3"> + <widget class="TQLineEdit" row="1" column="1" rowspan="1" colspan="3"> <property name="name"> <cstring>lineSubject</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>SubjectLabel</cstring> </property> @@ -67,7 +67,7 @@ <string>Subject:</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>TitleLabel</cstring> </property> @@ -83,7 +83,7 @@ <string>Title:</string> </property> </widget> - <widget class="QTextEdit" row="2" column="1" rowspan="1" colspan="4"> + <widget class="TQTextEdit" row="2" column="1" rowspan="1" colspan="4"> <property name="name"> <cstring>titleEdit</cstring> </property> @@ -117,7 +117,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -126,5 +126,5 @@ </spacer> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index 3ed62c57..0aa689d2 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -34,8 +34,8 @@ #include <tqregexp.h> -TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) - :TagMail(parent, name) +TagMailDlg::TagMailDlg(TQWidget *tqparent, const char *name) + :TagMail(tqparent, name) { setCaption(name); setModal(true); @@ -68,18 +68,18 @@ void TagMailDlg::slotSelectAddress() n = n.simplifyWhiteSpace(); for( unsigned int i = 0; i < emails.count(); ++i ) { if (!emails[i].isEmpty()) { - if (n.isEmpty() || (emails[i].find( "<" ) != -1)) + if (n.isEmpty() || (emails[i].tqfind( "<" ) != -1)) addr = ""; else { /* do we really need quotes around this name ? */ - if (n.find(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1) + if (n.tqfind(TQRegExp("[^ 0-9A-Za-z\\x0080-\\xFFFF]")) != -1) addr = qConfig.attrValueQuotation + n + qConfig.attrValueQuotation + " "; else addr = n + " "; } email = emails[i]; - if (!addr.isEmpty() && (email.find( "<" ) == -1) - && (email.find( ">" ) == -1) - && (email.find( "," ) == -1)) + if (!addr.isEmpty() && (email.tqfind( "<" ) == -1) + && (email.tqfind( ">" ) == -1) + && (email.tqfind( "," ) == -1)) addr += "<" + email + ">"; else addr += email; diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.h b/quanta/dialogs/tagdialogs/tagmaildlg.h index 32dffaa5..1b739954 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.h +++ b/quanta/dialogs/tagdialogs/tagmaildlg.h @@ -24,8 +24,9 @@ class TagMailDlg : public TagMail { Q_OBJECT + TQ_OBJECT public: - TagMailDlg(TQWidget *parent=0, const char *name=0); + TagMailDlg(TQWidget *tqparent=0, const char *name=0); ~TagMailDlg(); private slots: // Private slots /** Select a mail address, using the KABC */ diff --git a/quanta/dialogs/tagdialogs/tagmisc.ui b/quanta/dialogs/tagdialogs/tagmisc.ui index 39f044c9..4d39033d 100644 --- a/quanta/dialogs/tagdialogs/tagmisc.ui +++ b/quanta/dialogs/tagdialogs/tagmisc.ui @@ -9,7 +9,7 @@ ***************************************************************************/ </comment> <author>(C) 2001, 2003 Andras Mantia <amantia@kde.org></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TagMisc</cstring> </property> @@ -21,7 +21,7 @@ <height>61</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>350</width> <height>60</height> @@ -34,12 +34,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>elementName</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> @@ -47,7 +47,7 @@ <string>Element name:</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>addClosingTag</cstring> </property> @@ -64,5 +64,5 @@ <tabstop>elementName</tabstop> <tabstop>addClosingTag</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index 9313bb08..70c5600c 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -19,8 +19,8 @@ #include <tqlineedit.h> #include <tqcheckbox.h> -TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, const TQString &element ) - :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) +TagMiscDlg::TagMiscDlg( TQWidget* tqparent, const char* name, bool addClosingTag, const TQString &element ) + :KDialogBase( tqparent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) { miscWidget = new TagMisc(this); connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) ); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.h b/quanta/dialogs/tagdialogs/tagmiscdlg.h index e8d68c3d..4ac7c2a8 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.h +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.h @@ -24,9 +24,10 @@ class TagMisc; class TagMiscDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TagMiscDlg( TQWidget* parent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString::null ); + TagMiscDlg( TQWidget* tqparent = 0, const char* name = 0, bool addClosingTag=true, const TQString &element=TQString() ); ~TagMiscDlg(); TQString elementTagName() const; diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 7a9edbdb..2b116855 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -23,8 +23,8 @@ #include <tqradiobutton.h> #include <tqgroupbox.h> -TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) - : TQDialog(parent,name,true) +TagQuickListDlg::TagQuickListDlg(TQWidget *tqparent, const char *name) + : TQDialog(tqparent,name,true) { setCaption(name); diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h index 15f0f21d..e9c13189 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef TAGQUICKLISTDLG_H -#define TAGQUICKLISTDLG_H +#ifndef TAGTQUICKLISTDLG_H +#define TAGTQUICKLISTDLG_H #include <tqwidget.h> @@ -33,16 +33,17 @@ class TQButtonGroup; class TagQuickListDlg : public TQDialog { Q_OBJECT + TQ_OBJECT public: - TagQuickListDlg(TQWidget *parent=0, const char *name=0); + TagQuickListDlg(TQWidget *tqparent=0, const char *name=0); ~TagQuickListDlg(); public: void initDialog(); - TQLabel *QLabel_1; + TQLabel *TQLabel_1; TQSpinBox *spinBoxRows; TQPushButton *buttonOk; - TQLabel *QLabel_2; + TQLabel *TQLabel_2; TQRadioButton *radioOrdered; TQRadioButton *radioUnordered; TQPushButton *buttonCancel; diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp index f7e7b713..7f499c14 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlgdata.cpp @@ -21,10 +21,10 @@ void TagQuickListDlg::initDialog() { resize(230,150); - QLabel_1= new TQLabel(this,"NoName"); - QLabel_1->setGeometry(10,10,100,30); - QLabel_1->setMinimumSize(0,0); - QLabel_1->setText(i18n("Rows:")); + TQLabel_1= new TQLabel(this,"NoName"); + TQLabel_1->setGeometry(10,10,100,30); + TQLabel_1->setMinimumSize(0,0); + TQLabel_1->setText(i18n("Rows:")); spinBoxRows= new TQSpinBox(this,"NoName"); spinBoxRows->setGeometry(120,10,100,25); @@ -35,10 +35,10 @@ void TagQuickListDlg::initDialog() buttonOk->setGeometry(10,110,100,30); buttonOk->setMinimumSize(0,0); - QLabel_2= new TQLabel(this,"NoName"); - QLabel_2->setGeometry(10,40,100,30); - QLabel_2->setMinimumSize(0,0); - QLabel_2->setText(i18n("Style:")); + TQLabel_2= new TQLabel(this,"NoName"); + TQLabel_2->setGeometry(10,40,100,30); + TQLabel_2->setMinimumSize(0,0); + TQLabel_2->setText(i18n("Style:")); buttonCancel= new TQPushButton(this,"NoName"); buttonCancel->setGeometry(120,110,100,30); diff --git a/quanta/dialogs/tagdialogs/tagwidget.cpp b/quanta/dialogs/tagdialogs/tagwidget.cpp index 014549bc..4eb79f24 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.cpp +++ b/quanta/dialogs/tagdialogs/tagwidget.cpp @@ -30,9 +30,9 @@ #include "tagdialog.h" #include "resource.h" -TagWidget::TagWidget(TQObject *parent, const char *) +TagWidget::TagWidget(TQObject *tqparent, const char *) { - baseURL = ((TagDialog *)parent)->baseURL(); + baseURL = ((TagDialog *)tqparent)->baseURL(); } TagWidget::~TagWidget(){ @@ -47,7 +47,7 @@ void TagWidget::updateDict(const TQString &attr, TQComboBox *combo ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::setValue(const TQString &val, TQComboBox *combo) @@ -92,7 +92,7 @@ void TagWidget::updateDict(const TQString &attr, TQLineEdit *line ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin ) @@ -104,7 +104,7 @@ void TagWidget::updateDict(const TQString &attr, TQSpinBox *spin ) delete s; } else - dict->replace(attr, s); + dict->tqreplace(attr, s); } void TagWidget::updateDict(const TQString &attr, TQCheckBox *check ) @@ -113,7 +113,7 @@ void TagWidget::updateDict(const TQString &attr, TQCheckBox *check ) dict->remove(attr); else { - if (!dict->find(attr)) + if (!dict->tqfind(attr)) dict->insert(attr, new TQString("")); } } diff --git a/quanta/dialogs/tagdialogs/tagwidget.h b/quanta/dialogs/tagdialogs/tagwidget.h index b73c6782..38f67877 100644 --- a/quanta/dialogs/tagdialogs/tagwidget.h +++ b/quanta/dialogs/tagdialogs/tagwidget.h @@ -33,7 +33,7 @@ class KURL; class TagWidget { public: - TagWidget(TQObject *parent=0, const char *name=0); + TagWidget(TQObject *tqparent=0, const char *name=0); virtual ~TagWidget(); virtual void readAttributes(TQDict<TQString> *) {}; diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 5c07b341..41388efc 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -29,14 +29,14 @@ #include "styleeditor.h" -Tagxml::Tagxml( TQDomNode &d, QTag *dtdTag, TQWidget *parent, const char *name) - :TQWidget(parent,name), TagWidget(parent,name), doc(d) +Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *tqparent, const char *name) + :TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d) { initialize(d, dtdTag); } -Tagxml::Tagxml( TQDomNode &d, QTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(parent,name), doc(d), m_selection(selection) +Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *tqparent, const char *name) + : TQWidget(tqparent,name), TagWidget(TQT_TQOBJECT(tqparent),name), doc(d), m_selection(selection) { initialize(d, dtdTag); } @@ -45,9 +45,9 @@ Tagxml::~Tagxml() { } -void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) +void Tagxml::initialize(TQDomNode &d, TQTag *dtdTag) { - m_dtd = dtdTag->parentDTD; + m_dtd = dtdTag->tqparentDTD; m_dtdTag = dtdTag; TQGridLayout *grid = new TQGridLayout( this ); grid->setSpacing( 13 ); @@ -56,7 +56,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) //parse the tag XML file, in order to build up the dialog for ( TQDomNode n = d.firstChild(); !n.isNull(); n = n.nextSibling() ) { - TQDomNode location = findChild(n,"location"); + TQDomNode location = tqfindChild(n,"location"); if ( location.isNull() ) continue; @@ -69,7 +69,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) int colspan = el.attribute("colspan","1").toInt()-1; int rowspan = el.attribute("rowspan","1").toInt()-1; - location = findChild(n,"textlocation"); + location = tqfindChild(n,"textlocation"); el = location.toElement(); int textrow = el.attribute("row","0").toInt(); int textcol = el.attribute("col","0").toInt(); @@ -79,7 +79,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) // qDebug("%s col:%d row:%d cs:%d, rs:%d", n.nodeName().data(), col,row,colspan,rowspan ); TQString tip; - TQDomNode tooltip = findChild( n ,"tooltip" ); + TQDomNode tooltip = tqfindChild( n ,"tooltip" ); if ( !tooltip.isNull() ) { if ( tooltip.firstChild().isText() ) { TQDomText text = tooltip.firstChild().toText(); @@ -87,7 +87,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) } } TQString whatsThis; - TQDomNode what = findChild( n ,"whatsthis" ); + TQDomNode what = tqfindChild( n ,"whatsthis" ); if ( !what.isNull() ) { if ( what.firstChild().isText() ) { TQDomText text = what.firstChild().toText(); @@ -98,7 +98,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) if ( n.nodeName() == "label" ) //a static label { TQLabel *label = new TQLabel(this); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() ) label->setText( ltext.text().isEmpty() ? TQString("") : (ltext.text()+":") ); @@ -116,7 +116,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) TQDomElement el(n.toElement()); TQString type = el.attribute("type","input"); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() && (type != "check") ) //if there is a text label for the attribute { TQLabel *label = new TQLabel(this); @@ -152,7 +152,7 @@ void Tagxml::initialize(TQDomNode &d, QTag *dtdTag) TQCheckBox *w = new TQCheckBox(this); grid->addMultiCellWidget( w, row, row+rowspan, col, col+colspan ); - TQDomElement ltext = findChild(n,"text").toElement(); + TQDomElement ltext = tqfindChild(n,"text").toElement(); if ( !ltext.isNull() ) w->setText( ltext.text() ); if ( !tip.isNull() ) @@ -270,10 +270,10 @@ void Tagxml::readAttributes( TQDict<TQString> *d ) { if (m_dtd->booleanAttributes == "simple") { - d->replace(name, new TQString("") ); + d->tqreplace(name, new TQString("") ); } else { - d->replace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all + d->tqreplace(name, new TQString(m_dtd->booleanTrue)); //it seems that browsers don't like <input disabled="false">, so if a checkbox is false, don't put in the tag at all } } else @@ -283,16 +283,16 @@ void Tagxml::readAttributes( TQDict<TQString> *d ) /* } else { value = (value == "checked")?m_dtd->booleanTrue:m_dtd->booleanFalse; - d->replace(name, new TQString(value)); + d->tqreplace(name, new TQString(value)); } */ } else if (dynamic_cast<Attr_file *>(attr)) { // value = KURL::encode_string(value); - d->replace(name, new TQString(value)); + d->tqreplace(name, new TQString(value)); } else { - value.replace(TQRegExp("&(?!amp;)"), "&"); - d->replace(name, new TQString(value) ); + value.tqreplace(TQRegExp("&(?!amp;)"), "&"); + d->tqreplace(name, new TQString(value) ); } } @@ -313,9 +313,9 @@ void Tagxml::writeAttributes( TQDict<TQString> *d ) name = attr->attrName(); - TQString *v = d->find(name); + TQString *v = d->tqfind(name); if ( v ) { - v->replace("&","&"); + v->tqreplace("&","&"); if ( dynamic_cast<Attr_check *>(attr) ) // checkbox value = "checked"; else diff --git a/quanta/dialogs/tagdialogs/tagxml.h b/quanta/dialogs/tagdialogs/tagxml.h index 780b6b91..c08853a0 100644 --- a/quanta/dialogs/tagdialogs/tagxml.h +++ b/quanta/dialogs/tagdialogs/tagxml.h @@ -28,10 +28,11 @@ class Tagxml : public TQWidget, TagWidget { Q_OBJECT + TQ_OBJECT public: /** construtor */ - Tagxml(TQDomNode &d, QTag *dtdTag, TQWidget* parent=0, const char *name=0); - Tagxml(TQDomNode &d, QTag *dtdTag, const TQString& selection, TQWidget* parent=0, const char *name=0); + Tagxml(TQDomNode &d, TQTag *dtdTag, TQWidget* tqparent=0, const char *name=0); + Tagxml(TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget* tqparent=0, const char *name=0); /** destructor */ ~Tagxml(); @@ -42,12 +43,12 @@ class Tagxml : public TQWidget, TagWidget { void focusToFirstItem(); private: - void initialize(TQDomNode &d, QTag *dtdTag); + void initialize(TQDomNode &d, TQTag *dtdTag); TQDomNode doc; const DTDStruct *m_dtd; TQWidget *m_firstItem; - QTag *m_dtdTag; + TQTag *m_dtdTag; TQString m_selection; }; |