diff options
Diffstat (limited to 'quanta')
517 files changed, 9877 insertions, 2204 deletions
diff --git a/quanta/CMakeL10n.txt b/quanta/CMakeL10n.txt index 295a764d..9ba75ab1 100644 --- a/quanta/CMakeL10n.txt +++ b/quanta/CMakeL10n.txt @@ -43,3 +43,9 @@ tde_l10n_create_template( "data/config/actions.rc:action,text" "*.tag:tag,comment" ) + +tde_l10n_create_template( + CATALOG "desktop_files/quanta-desktops/" + SOURCES *.desktop + DESTINATION "${CMAKE_SOURCE_DIR}/translations" +) diff --git a/quanta/components/CMakeLists.txt b/quanta/components/CMakeLists.txt index 7e0cad97..34642e38 100644 --- a/quanta/components/CMakeLists.txt +++ b/quanta/components/CMakeLists.txt @@ -11,8 +11,11 @@ # FIXME cvsservice is not ported -add_subdirectory( csseditor ) +add_subdirectory( csseditor ) add_subdirectory( framewizard ) add_subdirectory( tableeditor ) -add_subdirectory( debugger ) -# add_subdirectory( cvsservice ) +add_subdirectory( debugger ) + +if( WITH_QUANTA_CVSSERVICE ) +add_subdirectory( cvsservice ) +endif() diff --git a/quanta/components/csseditor/CMakeLists.txt b/quanta/components/csseditor/CMakeLists.txt index 83e9068c..82113e59 100644 --- a/quanta/components/csseditor/CMakeLists.txt +++ b/quanta/components/csseditor/CMakeLists.txt @@ -18,6 +18,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/project ${CMAKE_SOURCE_DIR}/quanta/parsers ${CMAKE_SOURCE_DIR}/quanta/utility +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index 2548917b..395889dd 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -31,7 +31,7 @@ class colorRequester::colorRequesterPrivate{ KLineEdit *edit; colorRequesterPrivate() { edit = 0L; } void setText( const TQString& text ) { edit->setText( text ); } - void connectSignals( TQObject *receiver ) { connect( edit, TQT_SIGNAL( textChanged( const TQString& )),receiver, TQT_SIGNAL( textChanged( const TQString& ))); } + void connectSignals( TQObject *receiver ) { connect( edit, TQ_SIGNAL( textChanged( const TQString& )),receiver, TQ_SIGNAL( textChanged( const TQString& ))); } }; colorRequester::colorRequester(TQWidget *parent, const char* name) : miniEditor(parent,name){ @@ -45,7 +45,7 @@ colorRequester::~colorRequester(){ } void colorRequester::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(textChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(textChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void colorRequester::init() @@ -67,12 +67,12 @@ void colorRequester::init() TQWidget *widget = (TQWidget*) d->edit; setFocusProxy( widget ); - 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&*/ ) )); + d->connectSignals( this ); + connect( myButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openColorDialog() )); + connect( d->edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( setInitialValue(/*const TQString&*/ ) )); TDEAccel *accel = new TDEAccel( this ); - accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() )); + accel->insert( TDEStdAccel::Open, this, TQ_SLOT( openColorDialog() )); accel->readSettings(); } diff --git a/quanta/components/csseditor/colorrequester.h b/quanta/components/csseditor/colorrequester.h index 75d74d98..1f7b5bd0 100644 --- a/quanta/components/csseditor/colorrequester.h +++ b/quanta/components/csseditor/colorrequester.h @@ -24,7 +24,7 @@ class KLineEdit; class KColorDialog; class colorRequester : public miniEditor{ - Q_OBJECT + TQ_OBJECT public: colorRequester(TQWidget *parent, const char* name=0); diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index d8d2b0f6..8191d8c6 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -43,13 +43,13 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c, 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); + m_leftValue = new TQSlider ( 0, 255, 1, 0, TQt::Horizontal , leftBox); + m_centerValue = new TQSlider ( 0, 255, 1, 0, TQt::Horizontal , centerBox); + m_rightValue = new TQSlider ( 0, 255, 1, 0, TQt::Horizontal , rightBox); setSpacing(10); - connect(m_leftValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertLeftValue(int))); - connect(m_centerValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertCenterValue(int))); - connect(m_rightValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertRightValue(int))); + connect(m_leftValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertLeftValue(int))); + connect(m_centerValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertCenterValue(int))); + connect(m_rightValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertRightValue(int))); } colorSlider::~colorSlider(){ @@ -59,7 +59,7 @@ colorSlider::~colorSlider(){ } void colorSlider::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void colorSlider::convertLeftValue(int i){ diff --git a/quanta/components/csseditor/colorslider.h b/quanta/components/csseditor/colorslider.h index 33c75c30..b1c350bb 100644 --- a/quanta/components/csseditor/colorslider.h +++ b/quanta/components/csseditor/colorslider.h @@ -29,7 +29,7 @@ */ class colorSlider : public miniEditor { - Q_OBJECT + TQ_OBJECT private : TQString m_functionName; @@ -52,7 +52,7 @@ class colorSlider : public miniEditor { }; class RGBcolorSlider : public colorSlider { - Q_OBJECT + TQ_OBJECT public: RGBcolorSlider(TQWidget *parent=0, const char *name=0); @@ -61,7 +61,7 @@ class RGBcolorSlider : public colorSlider { //FOR CSS3 /*class HSLcolorSlider : public colorSlider { - Q_OBJECT + TQ_OBJECT public: HSLcolorSlider(TQWidget *parent=0, const char *name=0); diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index c449b184..34ea4a23 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -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(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(this,TQ_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(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(this,TQ_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") { TQDomNodeList listSub = l.item(i).childNodes(); appendSub(listSub,item); @@ -184,7 +184,7 @@ void CSSEditor::hidePreviewer(){ void CSSEditor::initialize(){ m_config = kapp->config(); - connect(pbOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShortendForm())); + connect(pbOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShortendForm())); m_config->setGroup("CSSEditor Options"); SHckb->setChecked(m_config->readBoolEntry("Shorthand form enabled",false)); @@ -243,7 +243,7 @@ void CSSEditor::initialize(){ m_ps = new propertySetter(fEditing); fEditingLayout->addWidget(m_ps); - connect(m_ps, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(checkProperty(const TQString&))); + connect(m_ps, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(checkProperty(const TQString&))); TQStringList props; TQString temp; @@ -592,12 +592,12 @@ void CSSEditor::checkProperty(const TQString& v){ } void CSSEditor::Connect(){ - connect(this, TQT_SIGNAL(signalUpdatePreview()), this, TQT_SLOT(updatePreview())); - connect(lvVisual,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvAll,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvAural,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvInteractive,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvPaged,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(this, TQ_SIGNAL(signalUpdatePreview()), this, TQ_SLOT(updatePreview())); + connect(lvVisual,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvAll,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvAural,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvInteractive,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvPaged,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); } void CSSEditor::removeProperty(const TQVariant& v){ diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h index 0df95553..dd72a2fc 100644 --- a/quanta/components/csseditor/csseditor.h +++ b/quanta/components/csseditor/csseditor.h @@ -55,7 +55,7 @@ class myCheckListItem : public TQCheckListItem /** CSSEditor is the base class of the project */ class CSSEditor : public CSSEditorS { - Q_OBJECT + TQ_OBJECT private: TQMyHighlighter *m_myhi; diff --git a/quanta/components/csseditor/csseditor_globals.cpp b/quanta/components/csseditor/csseditor_globals.cpp index c2be79c0..ef2227cf 100644 --- a/quanta/components/csseditor/csseditor_globals.cpp +++ b/quanta/components/csseditor/csseditor_globals.cpp @@ -19,13 +19,13 @@ #include "csseditor_globals.h" mySpinBox::mySpinBox(TQWidget * parent , const char * name ) : TQSpinBox (parent, 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 & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(checkSuffix( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged( const TQString & ))); } mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * parent, const char * name ) : TQSpinBox( minValue, maxValue, step, parent,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 & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(checkSuffix( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged( const TQString & ))); } mySpinBox::~mySpinBox(){} diff --git a/quanta/components/csseditor/csseditor_globals.h b/quanta/components/csseditor/csseditor_globals.h index e63a9f20..88223c9c 100644 --- a/quanta/components/csseditor/csseditor_globals.h +++ b/quanta/components/csseditor/csseditor_globals.h @@ -50,7 +50,7 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu class mySpinBox : public TQSpinBox{ - Q_OBJECT + TQ_OBJECT public: mySpinBox(TQWidget * parent = 0, const char * name = 0 ); diff --git a/quanta/components/csseditor/csseditors.ui b/quanta/components/csseditor/csseditors.ui index 2661d75d..fe769a0e 100644 --- a/quanta/components/csseditor/csseditors.ui +++ b/quanta/components/csseditor/csseditors.ui @@ -405,7 +405,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 389b5402..c624a696 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -110,34 +110,34 @@ CSSSelector::~CSSSelector(){ void CSSSelector::Connect(){ - connect(cbDTD,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(setDTDTags(const TQString&))); - - connect(pbAddTag,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addTag())); - connect(pbAddClass,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addClass())); - connect(pbAddID,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addID())); - connect(pbAddPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addPseudo())); - - connect(lvTags, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvClasses, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvIDs, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvPseudo, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - - connect(lvTags, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvClasses, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvIDs, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvPseudo, TQT_SIGNAL( selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - - connect(pbRemoveSelectedTag,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedClass,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedID,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - - connect(twSelectors,TQT_SIGNAL(currentChanged ( TQWidget * )), this ,TQT_SLOT(setCurrentListView( TQWidget * ))); - - connect(pbRemoveAllTags,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllClasses,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllIDs,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); + connect(cbDTD,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(setDTDTags(const TQString&))); + + connect(pbAddTag,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addTag())); + connect(pbAddClass,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addClass())); + connect(pbAddID,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addID())); + connect(pbAddPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addPseudo())); + + connect(lvTags, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvClasses, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvIDs, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvPseudo, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + + connect(lvTags, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvClasses, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvIDs, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvPseudo, TQ_SIGNAL( selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + + connect(pbRemoveSelectedTag,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedClass,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedID,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + + connect(twSelectors,TQ_SIGNAL(currentChanged ( TQWidget * )), this ,TQ_SLOT(setCurrentListView( TQWidget * ))); + + connect(pbRemoveAllTags,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllClasses,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllIDs,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); } void CSSSelector::setDTDTags(const TQString& s){ @@ -292,7 +292,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ void CSSSelector::setCurrentListView(TQWidget* w){ TQObjectList *l = w->queryList( "TQListView" ); - m_currentListView = static_cast<TQListView*>(TQT_TQWIDGET(l->first())); + m_currentListView = static_cast<TQListView*>(l->first()); } void CSSSelector::removeAll(){ @@ -315,7 +315,7 @@ void CSSSelector::removeSelected(){ void CSSSelector::loadCSSContent(const TQString& s){ stylesheetParser p(s); - connect(&p,TQT_SIGNAL(errorOccurred(const TQString&)), this, TQT_SLOT(setStylesheetProcessing(const TQString&))); + connect(&p,TQ_SIGNAL(errorOccurred(const TQString&)), this, TQ_SLOT(setStylesheetProcessing(const TQString&))); p.parse(); m_orderNumber = p.orderNumber(); diff --git a/quanta/components/csseditor/cssselector.h b/quanta/components/csseditor/cssselector.h index a71f587b..5bee0f48 100644 --- a/quanta/components/csseditor/cssselector.h +++ b/quanta/components/csseditor/cssselector.h @@ -29,7 +29,7 @@ class TQStringList; */ class CSSSelector : public CSSSelectorS { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/csseditor/cssselectors.ui b/quanta/components/csseditor/cssselectors.ui index cb4ed81b..b4062318 100644 --- a/quanta/components/csseditor/cssselectors.ui +++ b/quanta/components/csseditor/cssselectors.ui @@ -976,10 +976,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/quanta/components/csseditor/doubleeditors.cpp b/quanta/components/csseditor/doubleeditors.cpp index e877e2ac..18e18ce4 100644 --- a/quanta/components/csseditor/doubleeditors.cpp +++ b/quanta/components/csseditor/doubleeditors.cpp @@ -58,8 +58,8 @@ void doubleEditorBase::dxValueSlot(const TQString& v){ m_ssbDx->insertItem("pt"); m_ssbDx->insertItem("px"); - connect(m_ssbSx, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(sxValueSlot(const TQString&))); - connect(m_ssbDx, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_ssbSx, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_ssbDx, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(dxValueSlot(const TQString&))); } doubleLengthEditor::~doubleLengthEditor(){ @@ -68,7 +68,7 @@ doubleLengthEditor::~doubleLengthEditor(){ } void doubleLengthEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx){ @@ -79,8 +79,8 @@ void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx) doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,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&))); - connect(m_cbDx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_cbSx, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_cbDx, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(dxValueSlot(const TQString&))); } doubleComboBoxEditor::~doubleComboBoxEditor(){ @@ -89,7 +89,7 @@ doubleComboBoxEditor::~doubleComboBoxEditor(){ } void doubleComboBoxEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ @@ -97,8 +97,8 @@ doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *nam m_sbDx = new mySpinBox(this); m_sbSx->setSuffix("%"); m_sbDx->setSuffix("%"); - connect(m_sbSx,TQT_SIGNAL(valueChanged(const TQString&)),this,TQT_SLOT(sxValueSlot(const TQString&))); - connect(m_sbDx,TQT_SIGNAL(valueChanged(const TQString&)),this,TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_sbSx,TQ_SIGNAL(valueChanged(const TQString&)),this,TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_sbDx,TQ_SIGNAL(valueChanged(const TQString&)),this,TQ_SLOT(dxValueSlot(const TQString&))); } doublePercentageEditor::~doublePercentageEditor(){ @@ -107,7 +107,7 @@ doublePercentageEditor::~doublePercentageEditor(){ } void doublePercentageEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void doublePercentageEditor::setInitialValue(const TQString& a_sx, const TQString& a_dx){ diff --git a/quanta/components/csseditor/doubleeditors.h b/quanta/components/csseditor/doubleeditors.h index 94cbf164..396a13c5 100644 --- a/quanta/components/csseditor/doubleeditors.h +++ b/quanta/components/csseditor/doubleeditors.h @@ -24,7 +24,7 @@ class TQComboBox; class doubleEditorBase : public miniEditor { - Q_OBJECT + TQ_OBJECT protected: TQString m_sxValue, @@ -45,7 +45,7 @@ class doubleEditorBase : public miniEditor { }; class doublePercentageEditor : public doubleEditorBase { - Q_OBJECT + TQ_OBJECT private: mySpinBox *m_sbSx, @@ -59,7 +59,7 @@ class doublePercentageEditor : public doubleEditorBase { }; class doubleComboBoxEditor : public doubleEditorBase { - Q_OBJECT + TQ_OBJECT private: TQComboBox *m_cbSx, @@ -74,7 +74,7 @@ class doubleComboBoxEditor : public doubleEditorBase { }; class doubleLengthEditor : public doubleEditorBase { - Q_OBJECT + TQ_OBJECT private: specialSB *m_ssbSx, diff --git a/quanta/components/csseditor/encodingselector.h b/quanta/components/csseditor/encodingselector.h index 6ee05ccd..eddcdc1d 100644 --- a/quanta/components/csseditor/encodingselector.h +++ b/quanta/components/csseditor/encodingselector.h @@ -27,7 +27,7 @@ */ class encodingSelector : public encodingSelectorS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index 8a64d589..cab7efbb 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -69,17 +69,17 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF pbMoveDown->setIconSet(iconSet); pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect(pbAdd, TQT_SIGNAL(clicked()), this ,TQT_SLOT( addFont() )); - connect( lbAvailable, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbAvailable, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedAvailableFamilyFont( const TQString&) ) ); - connect( lbGeneric, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbGeneric, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedGenericFamilyFont( const TQString&) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( setCurrentSelectedFont( int ) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedFont( const TQString&) ) ); - connect( pbRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeFont() ) ); - connect( pbMoveUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveFontUp() ) ); - connect( pbMoveDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveFontDown() ) ); + connect(pbAdd, TQ_SIGNAL(clicked()), this ,TQ_SLOT( addFont() )); + connect( lbAvailable, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbAvailable, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedAvailableFamilyFont( const TQString&) ) ); + connect( lbGeneric, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbGeneric, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedGenericFamilyFont( const TQString&) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( setCurrentSelectedFont( int ) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedFont( const TQString&) ) ); + connect( pbRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeFont() ) ); + connect( pbMoveUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveFontUp() ) ); + connect( pbMoveDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveFontDown() ) ); TQWhatsThis::add(lbAvailable,i18n("These are the names of the available fonts on your system")); TQWhatsThis::add(lbGeneric,i18n("These are the names of the generic fonts ")); diff --git a/quanta/components/csseditor/fontfamilychooser.h b/quanta/components/csseditor/fontfamilychooser.h index 70d359eb..58d52299 100644 --- a/quanta/components/csseditor/fontfamilychooser.h +++ b/quanta/components/csseditor/fontfamilychooser.h @@ -23,7 +23,7 @@ class TQStringList; class fontFamilyChooser : public fontFamilyChooserS { - Q_OBJECT + TQ_OBJECT private: enum FontOrigin { available, generic }; diff --git a/quanta/components/csseditor/fontfamilychoosers.ui b/quanta/components/csseditor/fontfamilychoosers.ui index 7675741a..77a0f915 100644 --- a/quanta/components/csseditor/fontfamilychoosers.ui +++ b/quanta/components/csseditor/fontfamilychoosers.ui @@ -430,12 +430,7 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/quanta/components/csseditor/percentageeditor.cpp b/quanta/components/csseditor/percentageeditor.cpp index b02a1615..f6363563 100644 --- a/quanta/components/csseditor/percentageeditor.cpp +++ b/quanta/components/csseditor/percentageeditor.cpp @@ -23,7 +23,7 @@ percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *paren m_sb = new mySpinBox(0,9999,1,this); m_sb->setValue(temp.remove("%").toInt()); m_sb->setSuffix("%"); - connect(m_sb, TQT_SIGNAL(valueChanged ( const TQString & )), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_sb, TQ_SIGNAL(valueChanged ( const TQString & )), this, TQ_SIGNAL(valueChanged(const TQString&))); } percentageEditor::~percentageEditor() @@ -32,7 +32,7 @@ percentageEditor::~percentageEditor() } void percentageEditor::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } #include "percentageeditor.moc" diff --git a/quanta/components/csseditor/percentageeditor.h b/quanta/components/csseditor/percentageeditor.h index 34cf3903..eae4261d 100644 --- a/quanta/components/csseditor/percentageeditor.h +++ b/quanta/components/csseditor/percentageeditor.h @@ -37,7 +37,7 @@ class KPushButton; class propertySetter; class percentageEditor : public miniEditor { - Q_OBJECT + TQ_OBJECT private: mySpinBox *m_sb; diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp index cbaabe5c..c4a46ca7 100644 --- a/quanta/components/csseditor/propertysetter.cpp +++ b/quanta/components/csseditor/propertysetter.cpp @@ -60,8 +60,8 @@ void propertySetter::reset(){ void propertySetter::setComboBox() { m_cb = new TQComboBox(this); - connect(m_cb, TQT_SIGNAL(activated(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); - connect(m_cb, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_cb, TQ_SIGNAL(activated(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); + connect(m_cb, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(m_cb); } @@ -70,14 +70,14 @@ void propertySetter::setSpinBox(const TQString& initialValue, const TQString& mi mySpinBox *editor = new mySpinBox(min.toInt(), max.toInt(), 1, this); editor->setSuffix(s); editor->setValue(initialValue.toInt()); - connect(editor, TQT_SIGNAL(valueChanged(const TQString&)), this ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(editor, TQ_SIGNAL(valueChanged(const TQString&)), this ,TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(editor); } void propertySetter::setLineEdit() { TQLineEdit *editor = new TQLineEdit(this); - connect(editor,TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SIGNAL(valueChanged ( const TQString & ))); + connect(editor,TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SIGNAL(valueChanged ( const TQString & ))); m_list.append(editor); } @@ -85,7 +85,7 @@ void propertySetter::setPredefinedColorListEditor() { TQComboBox *editor = new TQComboBox(this); editor->insertStringList(CSSEditorGlobals::HTMLColors); - connect(editor, TQT_SIGNAL(activated(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(editor, TQ_SIGNAL(activated(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(editor); } @@ -118,7 +118,7 @@ void propertySetter::addButton(){ m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); m_pb->hide(); - connect(m_pb, TQT_SIGNAL(clicked()), this ,TQT_SLOT(Show())); + connect(m_pb, TQ_SIGNAL(clicked()), this ,TQ_SLOT(Show())); } void propertySetter::installMiniEditor(miniEditor *m){ diff --git a/quanta/components/csseditor/propertysetter.h b/quanta/components/csseditor/propertysetter.h index a49f585c..2095d6d5 100644 --- a/quanta/components/csseditor/propertysetter.h +++ b/quanta/components/csseditor/propertysetter.h @@ -32,7 +32,7 @@ class KPushButton; */ class propertySetter : public TQHBox { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/csseditor/specialsb.cpp b/quanta/components/csseditor/specialsb.cpp index 6edf110c..2c725e03 100644 --- a/quanta/components/csseditor/specialsb.cpp +++ b/quanta/components/csseditor/specialsb.cpp @@ -26,16 +26,16 @@ specialSB::specialSB(TQWidget *parent, const char *name, bool useLineEdit ) : mi { m_lineEdit = new KLineEdit(this); m_sb = 0L; - connect(m_lineEdit, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(lineEditValueSlot ( const TQString & ))); + connect(m_lineEdit, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(lineEditValueSlot ( const TQString & ))); } else { m_sb=new mySpinBox(this); - connect(m_sb, TQT_SIGNAL(valueChanged ( const TQString & )), this, TQT_SLOT(sbValueSlot(const TQString&))); + connect(m_sb, TQ_SIGNAL(valueChanged ( const TQString & )), this, TQ_SLOT(sbValueSlot(const TQString&))); m_lineEdit = 0L; } m_cb = new TQComboBox(this); - connect(m_cb, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(cbValueSlot(const TQString&))); + connect(m_cb, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(cbValueSlot(const TQString&))); } specialSB::~specialSB(){ @@ -45,7 +45,7 @@ specialSB::~specialSB(){ } void specialSB::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p,TQ_SIGNAL(valueChanged(const TQString&))); } diff --git a/quanta/components/csseditor/specialsb.h b/quanta/components/csseditor/specialsb.h index ef74213f..cda9b040 100644 --- a/quanta/components/csseditor/specialsb.h +++ b/quanta/components/csseditor/specialsb.h @@ -28,7 +28,7 @@ class KLineEdit; */ class specialSB : public miniEditor { - Q_OBJECT + TQ_OBJECT protected: TQComboBox *m_cb; @@ -54,28 +54,28 @@ class specialSB : public miniEditor { }; class angleEditor : public specialSB { - Q_OBJECT + TQ_OBJECT public: angleEditor(TQWidget *parent=0, const char *name=0); }; class frequencyEditor : public specialSB { - Q_OBJECT + TQ_OBJECT public: frequencyEditor(TQWidget *parent=0, const char *name=0); }; class timeEditor : public specialSB { - Q_OBJECT + TQ_OBJECT public: timeEditor(TQWidget *parent=0, const char *name=0); }; class lengthEditor : public specialSB { - Q_OBJECT + TQ_OBJECT public: lengthEditor(TQWidget *parent=0, const char *name=0); diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index d40812ed..c523115a 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -40,7 +40,7 @@ #include "csseditor.h" StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor())); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openCSSEditor())); setToolTip(i18n("Open css dialog")); TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("stylesheet")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); diff --git a/quanta/components/csseditor/styleeditor.h b/quanta/components/csseditor/styleeditor.h index 83b54349..206033a6 100644 --- a/quanta/components/csseditor/styleeditor.h +++ b/quanta/components/csseditor/styleeditor.h @@ -24,7 +24,7 @@ //forward declarations class propertySetter; class StyleEditor : public TLPEditor{ - Q_OBJECT + TQ_OBJECT private: int m_iconWidth, diff --git a/quanta/components/csseditor/stylesheetparser.h b/quanta/components/csseditor/stylesheetparser.h index c5183dfe..4d1b1233 100644 --- a/quanta/components/csseditor/stylesheetparser.h +++ b/quanta/components/csseditor/stylesheetparser.h @@ -27,7 +27,7 @@ */ class stylesheetParser : public TQObject{ - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index 678ba827..4aa738d7 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -73,19 +73,19 @@ URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name setButtonIcon("document-open"); setToolTip(i18n("Open the URI selector")); - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFileDialog())); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFileDialog())); } void URIEditor::connectToPropertySetter(propertySetter* p){ - connect(this,TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this,TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void URIEditor::setMode(const mode& m) { m_Mode = m ; if( m_Mode == Single ) - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(selectedURI(const TQString&))); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(selectedURI(const TQString&))); else{ - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(selectedURIs(const TQStringList&))); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(selectedURIs(const TQStringList&))); } } @@ -156,12 +156,12 @@ fontEditor::fontEditor(TQWidget *parent, const char* name) : TLPEditor(parent,na setLabelText(i18n("Font family:")); setButtonIcon("fonts"); setToolTip(i18n("Open font family chooser")); - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFontChooser())); - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SIGNAL( valueChanged( const TQString& ) ) ); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFontChooser())); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SIGNAL( valueChanged( const TQString& ) ) ); } void fontEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void fontEditor::openFontChooser(){ diff --git a/quanta/components/csseditor/tlpeditors.h b/quanta/components/csseditor/tlpeditors.h index 09c2e1f8..5a341b81 100644 --- a/quanta/components/csseditor/tlpeditors.h +++ b/quanta/components/csseditor/tlpeditors.h @@ -30,7 +30,7 @@ class TQLabel; class TLPEditor : public miniEditor { //editor with a line text and a button calling a dialog - Q_OBJECT + TQ_OBJECT protected: @@ -55,7 +55,7 @@ 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; @@ -70,7 +70,7 @@ class fontEditor : public TLPEditor{ }; class URIEditor : public TLPEditor { - Q_OBJECT + TQ_OBJECT public: enum mode{ Multi, Single }; diff --git a/quanta/components/cvsservice/CMakeLists.txt b/quanta/components/cvsservice/CMakeLists.txt new file mode 100644 index 00000000..7f0a83c8 --- /dev/null +++ b/quanta/components/cvsservice/CMakeLists.txt @@ -0,0 +1,24 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/lib + ${CMAKE_SOURCE_DIR}/quanta/src + ${CMAKE_SOURCE_DIR}/quanta/project + ${CMAKE_SOURCE_DIR}/quanta/parsers + ${CMAKE_SOURCE_DIR}/quanta/utility +) + +include_directories( SYSTEM + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} +) + +##### cvsservice (static) + +tde_add_library( cvsservice STATIC_PIC AUTOMOC + + SOURCES + cvsservicedcopif.skel + cvscommitdlgs.ui + cvsupdatetodlgs.ui + cvsservice.cpp +) diff --git a/quanta/components/cvsservice/cvscommitdlgs.ui b/quanta/components/cvsservice/cvscommitdlgs.ui index f63b910e..9ff2c938 100644 --- a/quanta/components/cvsservice/cvscommitdlgs.ui +++ b/quanta/components/cvsservice/cvscommitdlgs.ui @@ -144,7 +144,9 @@ <tabstop>cancelButton</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index 735eb2c8..4035ed2f 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -47,30 +47,30 @@ CVSService::CVSService(TDEActionCollection *ac) { m_menu = new TDEPopupMenu(); - TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit"); + TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQ_SLOT(slotCommit()), ac, "vcs_commit"); action->plug(m_menu); - action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update"); + action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQ_SLOT(slotUpdate()), ac, "vcs_update"); action->plug(m_menu); TDEPopupMenu *updateToMenu = new TDEPopupMenu(m_menu); m_menu->insertItem(SmallIconSet("vcs_update"), i18n("Update &To"), updateToMenu); - action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date"); + action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQ_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date"); action->plug(updateToMenu); - action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head"); + action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQ_SLOT(slotUpdateToHead()), ac, "vcs_update_head"); action->plug(updateToMenu); - action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert"); + action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQ_SLOT(slotRevert()), ac, "vcs_revert"); action->plug(m_menu); m_menu->insertSeparator(); - action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add"); + action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQ_SLOT(slotAdd()), ac, "vcs_add"); action->plug(m_menu); - action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove"); + action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQ_SLOT(slotRemove()), ac, "vcs_remove"); action->plug(m_menu); - action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac); + action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQ_SLOT(slotAddToCVSIgnore()), ac); action->plug(m_menu); - action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac); + action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQ_SLOT(slotRemoveFromCVSIgnore()), ac); action->plug(m_menu); m_menu->insertSeparator(); - action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac); + action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQ_SLOT(slotBrowseLog()), ac); action->plug(m_menu); m_cvsJob = 0L; @@ -79,7 +79,7 @@ CVSService::CVSService(TDEActionCollection *ac) m_commitDlg = new CVSCommitDlgS(); m_updateToDlg = new CVSUpdateToDlgS(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } CVSService::~CVSService() @@ -180,7 +180,7 @@ void CVSService::slotUpdateToTag(const TQStringList &files) } else { extraOpts = "-D " + m_updateToDlg->dateLineEdit->text(); - commandStr = i18n("Updating to the version from %1 ...").arg(+ m_updateToDlg->dateLineEdit->text()); + commandStr = i18n("Updating to the version from %1 ...").arg(m_updateToDlg->dateLineEdit->text()); } emit clearMessages(); emit showMessage(commandStr + "\n", false); diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h index 5c12d91a..0f0fd4f1 100644 --- a/quanta/components/cvsservice/cvsservice.h +++ b/quanta/components/cvsservice/cvsservice.h @@ -40,7 +40,7 @@ class CVSUpdateToDlgS; */ class CVSService : public TQObject, public CVSServiceDCOPIf { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/cvsservice/cvsupdatetodlgs.ui b/quanta/components/cvsservice/cvsupdatetodlgs.ui index d4d2dc7b..bdec051a 100644 --- a/quanta/components/cvsservice/cvsupdatetodlgs.ui +++ b/quanta/components/cvsservice/cvsupdatetodlgs.ui @@ -195,4 +195,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/components/debugger/CMakeLists.txt b/quanta/components/debugger/CMakeLists.txt index 6a9e7609..58d8c1f2 100644 --- a/quanta/components/debugger/CMakeLists.txt +++ b/quanta/components/debugger/CMakeLists.txt @@ -24,6 +24,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/utility ${CMAKE_SOURCE_DIR}/quanta/messages ${CMAKE_SOURCE_DIR}/quanta/parts/preview +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index 637f76a4..1e02305f 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -64,7 +64,7 @@ BacktraceListview::BacktraceListview(TQWidget *parent, const char *name) setAllColumnsShowFocus(true); // Jump to bt - connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBacktraceDoubleClick( TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(slotBacktraceDoubleClick( TQListViewItem *, const TQPoint &, int))); } diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h index 01c34c45..d821ad5a 100644 --- a/quanta/components/debugger/backtracelistview.h +++ b/quanta/components/debugger/backtracelistview.h @@ -70,7 +70,7 @@ class BacktraceListviewItem : public TDEListViewItem class BacktraceListview : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp index 055512da..630fbf8b 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.cpp +++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp @@ -40,11 +40,11 @@ ConditionalBreakpointDialog::ConditionalBreakpointDialog(const TQString& express buttonClearClass->setPixmap(SmallIcon("clear_left")); buttonClearFunction->setPixmap(SmallIcon("clear_left")); - connect(comboExpression, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotExpressionChanged())); + connect(comboExpression, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotExpressionChanged())); - connect(buttonClearFile, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearFile())); - connect(buttonClearClass, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearClass())); - connect(buttonClearFunction, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearFunction())); + connect(buttonClearFile, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearFile())); + connect(buttonClearClass, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearClass())); + connect(buttonClearFunction, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearFunction())); slotExpressionChanged(); } diff --git a/quanta/components/debugger/conditionalbreakpointdialog.h b/quanta/components/debugger/conditionalbreakpointdialog.h index 5fb8a1bd..8dd15371 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.h +++ b/quanta/components/debugger/conditionalbreakpointdialog.h @@ -22,7 +22,7 @@ class ConditionalBreakpointDialog : public ConditionalBreakpointDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui index fcd4b1db..109abfbd 100644 --- a/quanta/components/debugger/conditionalbreakpointdialogs.ui +++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui @@ -76,9 +76,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -93,9 +90,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -321,9 +315,9 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kled.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kled.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/quanta/components/debugger/dbgp/CMakeLists.txt b/quanta/components/debugger/dbgp/CMakeLists.txt index 0652c64d..2d4550eb 100644 --- a/quanta/components/debugger/dbgp/CMakeLists.txt +++ b/quanta/components/debugger/dbgp/CMakeLists.txt @@ -13,6 +13,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/quanta/components/debugger ${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -24,7 +27,11 @@ link_directories( ##### other data ################################ -install( FILES quantadebuggerdbgp.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE quantadebuggerdbgp.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR quanta-desktops +) ##### quantadebuggerdbgp (module) ############### diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index 7730960d..03fb82aa 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -48,11 +48,11 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_socket) { // m_socket->setBufferSize(-1); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KNetwork::KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); - connect(m_socket, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSocketDestroyed())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KNetwork::KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSocketDestroyed())); m_socket->connect(); emit active(false); kdDebug(24002) << k_funcinfo << ", proxy:" << server << ", " << service << endl; @@ -65,8 +65,8 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt m_server = new KNetwork::TDEServerSocket(service); m_server->setAddressReuseable(true); - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - connect(m_server, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); if(m_server->listen()) { @@ -91,7 +91,7 @@ void DBGpNetwork::sessionEnd() if(m_socket) { m_socket->flush(); - disconnect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); + disconnect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); if (m_socket) m_socket->close(); delete m_socket; @@ -146,7 +146,7 @@ void DBGpNetwork::slotReadyAccept() kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(!m_socket) { - disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + disconnect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) @@ -156,10 +156,10 @@ void DBGpNetwork::slotReadyAccept() m_socket->setAddressReuseable(true); // m_socket->setSocketFlags(KExtendedSocket::inetSocket | KExtendedSocket::inputBufferedSocket); // m_socket->setBufferSize(-1); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); connected(); } else @@ -215,7 +215,7 @@ void DBGpNetwork::slotConnectionClosed() } if(m_server) - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); // Disable all session related actions and enable connection action emit connected(false); diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.h b/quanta/components/debugger/dbgp/dbgpnetwork.h index 1ac8e2f4..8c8f7ca9 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.h +++ b/quanta/components/debugger/dbgp/dbgpnetwork.h @@ -30,7 +30,7 @@ class KResolverEntry; class DBGpNetwork : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp index e9bbc249..13b1f46c 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.cpp +++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp @@ -24,7 +24,7 @@ DBGpSettings::DBGpSettings(const TQString &protocolversion) : DBGpSettingsS(0, "DBGpSettings", false, 0) { textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); - connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool))); + connect(checkLocalProject, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotLocalProjectToggle(bool))); } DBGpSettings::~DBGpSettings() diff --git a/quanta/components/debugger/dbgp/dbgpsettings.h b/quanta/components/debugger/dbgp/dbgpsettings.h index 96a25f25..c5e96afe 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.h +++ b/quanta/components/debugger/dbgp/dbgpsettings.h @@ -21,7 +21,7 @@ class DBGpSettings : public DBGpSettingsS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index 10888885..b8dba8de 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -285,9 +282,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="1" column="0"> <property name="name"> @@ -402,9 +396,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>If this checkbox is checked, the profiler output filename will be mapped using the basedirs just like the remote script files.</string> </property> @@ -440,9 +431,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>If this checkbox is checked, the profiler output will be opened automatically once the session ends.</string> </property> @@ -716,13 +704,13 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotLocalProjectToggled(bool)</slot> <slot>checkLocalProject_toggled(bool)</slot> <slot>slotLocalProjectToggle(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>ktextbrowser.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> +</includes> </UI> diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 6e2ec6ce..f4204ec2 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -59,10 +59,10 @@ QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQS setExecutionState(m_defaultExecutionState); emit updateStatus(DebuggerUI::NoSession); - connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&))); - connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool))); - connect(&m_network, TQT_SIGNAL(connected(bool)), this, TQT_SLOT(slotNetworkConnected(bool))); - connect(&m_network, TQT_SIGNAL(networkError(const TQString &, bool)), this, TQT_SLOT(slotNetworkError(const TQString &, bool))); + connect(&m_network, TQ_SIGNAL(command(const TQString&)), this, TQ_SLOT(processCommand(const TQString&))); + connect(&m_network, TQ_SIGNAL(active(bool)), this, TQ_SLOT(slotNetworkActive(bool))); + connect(&m_network, TQ_SIGNAL(connected(bool)), this, TQ_SLOT(slotNetworkConnected(bool))); + connect(&m_network, TQ_SIGNAL(networkError(const TQString &, bool)), this, TQ_SLOT(slotNetworkError(const TQString &, bool))); } diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop b/quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop index 462c4919..4873243a 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop @@ -1,44 +1,9 @@ [Desktop Entry] -Type=Service Name=DBGp + Comment=DBGp debugger plugin, see http://xdebug.org -Comment[bg]=Приставка на дебъгер DBGp, http://xdebug.org -Comment[ca]=Connector de depuració DBGp, consulteu http://xdebug.org -Comment[cs]=DBGp debugger plugin, viz http://xdebug.org -Comment[da]=DBGp fejlretter-plugin, se http://xdebug.org -Comment[de]=DBGp Debugger Plugin, siehe http://xdebug.org -Comment[el]=Πρόσθετο αποσφαλματωτή DBGp, δείτε το http://xdebug.org -Comment[es]=Extensión para el depurador DBGp, vea http://xdebug.org -Comment[et]=DBGp siluri plugin, vaata http://xdebug.org -Comment[eu]=DBGp araztailearen plugina, ikusi http://xdebug.org -Comment[fa]=وصلۀ اشکالزدای DBGp، http://xdebug.org را ببینید -Comment[fi]=DBGp-debugliitännäinen, katso http://xdebug.org -Comment[fr]=Module de débogage DBGp, consultez http://xdebug.org -Comment[ga]=Breiseán dífhabhtóra DBGp, féach ar http://xdebug.org -Comment[gl]=Extensión DBGp para o depurador, vexa tamén http://xdebug.org -Comment[hu]=DBGp nyomkövető modul, lásd: http://xdebug.org -Comment[is]=DBGp aflúsunaríforrit. Sjá http://xdebug.org -Comment[it]=Plugin di degub DBGp, vedi http://xdebug.org -Comment[ja]=DBGp デバッガ プラグイン。http://xdebug.org をご覧ください。 -Comment[ka]=DBGp განბზიკვის მოდული, იხილეთ http://xdebug.org -Comment[lt]=DBGp derintuvės priedas, žr. http://xdebug.org -Comment[ms]=Plugin nyahpepijat DBGp, lihat http://xdebug.org -Comment[nds]=Fehlersöök-Moduul för't DBGp, kiek bi http://xdebug.org -Comment[ne]=DBGp त्रुटिमोचक प्लगइन, http://xdebug.org हेर्नुहोस् -Comment[nl]=DBGp-debugger-plugin, zie http://xdebug.org -Comment[pl]=Wtyczka debugera DBGp, patrz http://xdebug.org -Comment[pt]='Plugin' de depuração DBGp, veja http://xdebug.org -Comment[pt_BR]=Plugin de depuração DBGp, veja http://xdebug.org -Comment[ru]=Модуль для отладчика DBGp, http://xdebug.org -Comment[sk]=DBGp debuger modul, pozri http://xdebug.org -Comment[sl]=Vstavek za razhoroščevanje DBGp, glej http://xdebug.org -Comment[sr]=DBGp прикључак, види http://xdebug.org -Comment[sr@Latn]=DBGp priključak, vidi http://xdebug.org -Comment[sv]=DBGp-insticksprogram för felsökning, se http://xdebug.org -Comment[uk]=Втулок зневаджувача DBGp, див. http://xdebug.org -Comment[zh_CN]=DBGp 调试器插件，参看 http://xdebug.org -Comment[zh_HK]=DBGp 除錯器外掛程式，請參閱 http://xdebug.org -Comment[zh_TW]=DBGp 除錯器外掛程式，請參閱 http://xdebug.org + +Type=Service Icon=kdbg X-TDE-ServiceTypes=Quanta/Debugger X-TDE-Library=quantadebuggerdbgp diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h index 5d7d551b..37d776db 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h @@ -31,7 +31,7 @@ typedef TQMap<TQString, TQString> StringMap; class QuantaDebuggerDBGp : public DebuggerClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index 7cb4c097..140ee4b7 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -67,12 +67,12 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam setAllColumnsShowFocus(true); m_breakpointPopup = new TDEPopupMenu(this); - m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected())); + m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQ_SLOT(slotRemoveSelected())); - connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); // Jump to bp - connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int))); } diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h index 074de811..0686a4ac 100644 --- a/quanta/components/debugger/debuggerbreakpointview.h +++ b/quanta/components/debugger/debuggerbreakpointview.h @@ -43,7 +43,7 @@ class DebuggerBreakpointViewItem : public TDEListViewItem class DebuggerBreakpointView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index ff41b764..b672617c 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); delete m_client; m_client = NULL; @@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU // recreate UI m_debuggerui = new DebuggerUI(this, "debuggerui"); - connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + connect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); // Load saved breakpoints if(Project::ref()->debuggerPersistentBreakpoints()) @@ -212,65 +212,65 @@ void DebuggerManager::initActions() return; //Debugger, breakpoint - newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); + newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQ_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location")); - newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); + newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQ_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); newaction->setToolTip(i18n("Clears all breakpoints")); - newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break"); + newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQ_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break"); newaction->setToolTip(i18n("Adds a new conditional breakpoint")); - newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog"); + newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQ_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog"); newaction->setToolTip(i18n("Adds a new conditional breakpoint")); // Execution - newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request"); + newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQ_SLOT(slotDebugRequest()), ac, "debug_request"); newaction->setToolTip(i18n("Initiate HTTP Request to the server with debugging activated")); - newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace"); + newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQ_SLOT(slotDebugTrace()), ac, "debug_trace"); newaction->setToolTip(i18n("Traces through the script. If a script is currently not being debugged, it will start in trace mode when started")); - newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run"); + newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQ_SLOT(slotDebugRun()), ac, "debug_run"); newaction->setToolTip(i18n("Runs the script. If a script is currently not being debugged, it will start in run mode when started")); - newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover"); + newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQ_SLOT(slotDebugStepOver()), ac, "debug_stepover"); newaction->setToolTip(i18n("Executes the next line of execution, but does not step into functions or includes")); - newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto"); + newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQ_SLOT(slotDebugStepInto()), ac, "debug_stepinto"); newaction->setToolTip(i18n("Executes the next line of execution and steps into it if it is a function call or inclusion of a file")); - newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip"); + newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQ_SLOT(slotDebugSkip()), ac, "debug_skip"); newaction->setToolTip(i18n("Skips the next command of execution and makes the next command the current one")); - newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout"); + newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQ_SLOT(slotDebugStepOut()), ac, "debug_stepout"); newaction->setToolTip(i18n("Executes the rest of the commands in the current function/file and pauses when it is done (when it reaches a higher level in the backtrace)")); - newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause"); + newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQ_SLOT(slotDebugPause()), ac, "debug_pause"); newaction->setToolTip(i18n("Pauses the scripts if it is running or tracing. If a script is currently not being debugged, it will start in paused mode when started")); - newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill"); + newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQ_SLOT(slotDebugKill()), ac, "debug_kill"); newaction->setToolTip(i18n("Kills the currently running script")); - newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect"); + newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQ_SLOT(slotDebugStartSession()), ac, "debug_connect"); newaction->setToolTip(i18n("Starts the debugger internally (Makes debugging possible)")); - newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect"); + newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQ_SLOT(slotDebugEndSession()), ac, "debug_disconnect"); newaction->setToolTip(i18n("Stops the debugger internally (debugging not longer possible)")); // Variables - newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch"); + newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQ_SLOT(slotAddWatch()), ac, "debug_addwatch"); newaction->setToolTip(i18n("Adds a variable to the watch list")); - newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog"); + newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQ_SLOT(slotAddWatch()), ac, "debug_addwatchdialog"); newaction->setToolTip(i18n("Adds a variable to the watch list")); - newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set"); + newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQ_SLOT(slotVariableSet()), ac, "debug_variable_set"); newaction->setToolTip(i18n("Changes the value of a variable")); - newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog"); + newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQ_SLOT(slotVariableSet()), ac, "debug_variable_setdialog"); newaction->setToolTip(i18n("Changes the value of a variable")); - newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open"); + newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQ_SLOT(slotProfilerOpen()), ac, "debug_profiler_open"); newaction->setToolTip(i18n("Opens the profiler output file")); enableAction("*", false); @@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager() if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); delete m_client; m_client = 0L; @@ -642,20 +642,20 @@ void DebuggerManager::setMark(const TQString& filename, long line, bool set, int void DebuggerManager::connectBreakpointSignals(Document* qdoc) { - connect(qdoc, TQT_SIGNAL(breakpointMarked(Document*, int)), - this, TQT_SLOT(slotBreakpointMarked(Document*, int))); + connect(qdoc, TQ_SIGNAL(breakpointMarked(Document*, int)), + this, TQ_SLOT(slotBreakpointMarked(Document*, int))); - connect(qdoc, TQT_SIGNAL(breakpointUnmarked(Document*, int)), - this, TQT_SLOT(slotBreakpointUnmarked(Document*, int))); + connect(qdoc, TQ_SIGNAL(breakpointUnmarked(Document*, int)), + this, TQ_SLOT(slotBreakpointUnmarked(Document*, int))); } void DebuggerManager::disconnectBreakpointSignals(Document* qdoc) { - disconnect(qdoc, TQT_SIGNAL(breakpointMarked(Document*, int)), - this, TQT_SLOT(slotBreakpointMarked(Document*, int))); + disconnect(qdoc, TQ_SIGNAL(breakpointMarked(Document*, int)), + this, TQ_SLOT(slotBreakpointMarked(Document*, int))); - disconnect(qdoc, TQT_SIGNAL(breakpointUnmarked(Document*, int)), - this, TQT_SLOT(slotBreakpointUnmarked(Document*, int))); + disconnect(qdoc, TQ_SIGNAL(breakpointUnmarked(Document*, int)), + this, TQ_SLOT(slotBreakpointUnmarked(Document*, int))); } // Show a status message and optionally put it on the log diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h index 1a4bec52..ef91551a 100644 --- a/quanta/components/debugger/debuggermanager.h +++ b/quanta/components/debugger/debuggermanager.h @@ -32,7 +32,7 @@ class Document; class DebuggerManager : public TQObject { - Q_OBJECT + TQ_OBJECT private: // client diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index 9f512460..1fcdc7da 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -64,14 +64,14 @@ DebuggerUI::DebuggerUI(TQObject *parent, const char *name) m_preview->view()->setIcon(UserIcon("debug_run")); m_preview->view()->setCaption(i18n("Debug Output")); m_previewTVA = quantaApp->addToolWindow(m_preview->view(), quantaApp->prevDockPosition(m_preview->view(), KDockWidget::DockBottom), quantaApp->getMainDockWidget()); - connect(m_preview, TQT_SIGNAL(openFile(const KURL&, const TQString&, bool)), quantaApp, TQT_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); + connect(m_preview, TQ_SIGNAL(openFile(const KURL&, const TQString&, bool)), quantaApp, TQ_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); // Show debugger toolbar quantaApp->toolBar("debugger_toolbar")->show(); - connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); + connect(m_variablesListView, TQ_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQ_SLOT(slotRemoveVariable(DebuggerVariable* ))); - connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); + connect(m_debuggerBreakpointView, TQ_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQ_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); showMenu(); } diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index 04db4e94..4d972d08 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -34,7 +34,7 @@ class KURL; class DebuggerUI : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui index f8d674d5..2616edab 100644 --- a/quanta/components/debugger/debuggervariablesets.ui +++ b/quanta/components/debugger/debuggervariablesets.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/components/debugger/gubed/CMakeLists.txt b/quanta/components/debugger/gubed/CMakeLists.txt index b528b30a..b25bb6f3 100644 --- a/quanta/components/debugger/gubed/CMakeLists.txt +++ b/quanta/components/debugger/gubed/CMakeLists.txt @@ -13,6 +13,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/quanta/components/debugger ${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -24,7 +27,11 @@ link_directories( ##### other data ################################ -install( FILES quantadebuggergubed.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE quantadebuggergubed.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR quanta-desktops +) ##### quantadebuggergubed (module) ############## diff --git a/quanta/components/debugger/gubed/gubedsettings.h b/quanta/components/debugger/gubed/gubedsettings.h index ab07a6c6..300287bd 100644 --- a/quanta/components/debugger/gubed/gubedsettings.h +++ b/quanta/components/debugger/gubed/gubedsettings.h @@ -21,7 +21,7 @@ class GubedSettings : public GubedSettingsS { - Q_OBJECT + TQ_OBJECT public slots: diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui index c9caa54c..a9e80bc2 100644 --- a/quanta/components/debugger/gubed/gubedsettingss.ui +++ b/quanta/components/debugger/gubed/gubedsettingss.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -752,11 +749,11 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">slotUseProxyToggle( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>ktextbrowser.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> +</includes> </UI> diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 14d46941..086ff878 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -98,10 +98,10 @@ void QuantaDebuggerGubed::startSession() { m_socket = new KNetwork::KStreamSocket(m_serverHost, m_serverPort); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); m_socket->connect(); debuggerInterface()->enableAction("debug_connect", true); @@ -119,7 +119,7 @@ void QuantaDebuggerGubed::startSession() m_server = new KNetwork::TDEServerSocket(m_listenPort); m_server->setAddressReuseable(true); - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); if(m_server->listen()) { @@ -280,7 +280,7 @@ void QuantaDebuggerGubed::slotReadyAccept() { // Perhaps this shouldnt be disconnected - instead check if connections are available at disconnect? - disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + disconnect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) @@ -288,10 +288,10 @@ void QuantaDebuggerGubed::slotReadyAccept() kdDebug(24002) << k_funcinfo << ", ready" << endl; m_socket->enableRead(true); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); connected(); emit updateStatus(DebuggerUI::Connected); @@ -339,7 +339,7 @@ void QuantaDebuggerGubed::slotConnectionClosed() } if(m_server) - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); // Disable all session related actions and enable connection action debuggerInterface()->enableAction("*", false); diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.desktop b/quanta/components/debugger/gubed/quantadebuggergubed.desktop index f86c706a..587225ad 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.desktop +++ b/quanta/components/debugger/gubed/quantadebuggergubed.desktop @@ -1,48 +1,9 @@ [Desktop Entry] -Type=Service Name=Gubed -Name[ne]=ग्युब्ड -Name[ta]=குபெட் + Comment=Quanta debugger plugin to interact with the Gubed PHP debugger, see http://gubed.sf.net -Comment[bg]=Приставка на Quanta за връзка с дебъгера Gubed PHP, http://gubed.sf.net -Comment[ca]=Connector de depuració pel Quanta que interactua amb el depurador Gubed PHP, consulteu http://gubed.sf.net -Comment[cs]=Ladicí modul Quanty s Gubed PHP debuggerem, viz http://gubed.sf.net -Comment[da]=Quanta fejlretter-plugin til at virke sammen med Gubed PHP fejlretter, se http://gubed.sf.net -Comment[de]=Debug-Komponente von Quanta für die Unterstützung des Gubed PHP-Debuggers. Näheres siehe http://gubed.sf.net -Comment[el]=Αποσφαλματωτής Quanta σε συνεργασία με το αποσφαλματωτή Gubed PHP, δείτε http://gubed.sf.net -Comment[es]=Accesorio de depuración de Quanta, para interactuar con el depurador de PHP Gubed. Vea http://gubed.sf.net -Comment[et]=Quanta siluriplugin koostööks PHP siluriga Gubed (vaata http://gubed.sf.net) -Comment[eu]=Gubed PHP araztailearekin lan egiteko Quanta araztailearen plugina, ikusi http://gubed.sf.net -Comment[fa]=وصلۀ اشکالزدای Quanta برای تعامل با اشکالزدای Gubed PHP، http://gubed.sf.net را ببینید -Comment[fi]=Gubed PHP debuggerin plugin Quantan debuggeriin (katso http://gubed.sf.net) -Comment[fr]=Module de débogage de Quanta pour interagir avec le débogueur PHP Gubed ; consulter http://gubed.sf.net. -Comment[gl]=Plugin de depuración de Quanta para interactuar co depurador de PHP Gubed, vexa tamén http://gubed.sf.net -Comment[hu]=Quanta-nyomkövető (bővítőmodulként) a Gubed PHP-nyomkövetőhöz, lásd: http://gubed.sf.net -Comment[is]=Quanta aflúsunaríforrit til samskipta við Gubed PHP aflúsarann. Sjá http://gubed.sf.net -Comment[it]=Plugin debugger di Quanta per interagire con il debugger PHP Gubed, vedi http://gubed.sf.net -Comment[ja]=Gubed PHP デバッガと対話する Quanta デバッガ。詳細は http://gubed.sf.net -Comment[ka]=Quanta-ს განბზიკვის მოდული Gubed PHP განბზიკავთან დასაკავშირებლად, იხილეთ http://gubed.sf.net -Comment[lt]=Quanta derintuvės priedas skirtas dirbti su Gubed PHP derintuve, žr.http://gubed.sf.net -Comment[ms]=Plug masuk penyah-ralat Quanta untuk berinteraksi dengan penyah-ralat Gubed PHP, lihat http://gubed.sf.net -Comment[nds]=Fehlersöök-Moduul för Quanta för't Tosamenwarken mit den PHP-Fehlersöker "Gubed", kiek op http://gubed.sf.net -Comment[ne]=ग्युब्ड पीएचपी त्रुटिमोचकसँग अन्तर्क्रिया गर्नका लागि क्वान्टा त्रुटिमोचक प्लगइन, http://gubed.sf.net हेर्नुहोस् -Comment[nl]=Quanta debugger plugin om te communiceren met de Gubed PHP debugger, zie http://gubed.sf.net -Comment[pl]=Wtyczka debuggera Quanty współpracująca z debuggerem PHP Gubed , patrz http://gubed.sf.net -Comment[pt]='Plugin' de Depuração do Quanta para interagir com o depurador de PHP Gubed, veja http://gubed.sf.net -Comment[pt_BR]=Plugin do debugger do Quanta para interagir com o debugger PHP Gubed, olhe http://gubed.sf.net -Comment[ru]=Модуль отладчика Quanta для связи с Gubed, отладчиком PHP, см. http://gubed.sf.net -Comment[sk]=Quanta debuger modul pre interakciu s Gubed PHP debugerom, pozrihttp://gubed.sf.net -Comment[sl]=Vstavek razhroščevanja v Quanti, ki sodeluje z razhroščevalnikom Gubed PHP, glejte http://gubed.sf.net -Comment[sr]=Исправљачки прикључак Quanta-е за интеракцију са исправљачем PHP-а Gubed, погледајте http://gubed.sf.net -Comment[sr@Latn]=Ispravljački priključak Quanta-e za interakciju sa ispravljačem PHP-a Gubed, pogledajte http://gubed.sf.net -Comment[sv]=Quanta-insticksprogram för felsökning som fungerar med PHP-felsökaren Gubed, se http://gubed.sf.net -Comment[ta]=குவாண்டா வழுநீக்கி உள்ளீடு குபெட்PHP வழுநீக்கியோடு தொடர்புக் கொண்டிருக்கிறது, பார்க்கவும் http://gubed.sf.net -Comment[tg]=Модули ғалатёби Quanta барои алоқаи аз Gubed, ғалатёби PHP, нишон кунед http://gubed.sf.net -Comment[tr]=Gubed PHP hata ayıklayıcısıyla iletişim kurmayı sağlayan Quanta hata ayıklama eklentisi, http://gubed.sf.net adresini ziyaret edin -Comment[uk]=Втулок зневадження Quanta для зв'язку зі зневаджувачем PHP -- Gubed, див. http://gubed.sf.net -Comment[zh_CN]=与 Gubed PHP 调试器交互 Quanta 调试器插件，见 http://gubed.sf.net -Comment[zh_HK]=Quanta 對於 Gubed PHP 除錯器的通訊外掛程式, 請參閱 http://gubed.sf.net -Comment[zh_TW]=Quanta 對於 Gubed PHP 除錯器的通訊外掛程式, 請參閱 http://gubed.sf.net + +Type=Service Icon=kdbg X-TDE-ServiceTypes=Quanta/Debugger X-TDE-Library=quantadebuggergubed diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index ead8ffd5..e6d33fd7 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -30,7 +30,7 @@ typedef TQMap<TQString, TQString> StringMap; class QuantaDebuggerGubed : public DebuggerClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/interfaces/CMakeLists.txt b/quanta/components/debugger/interfaces/CMakeLists.txt index 9778dbe0..8307ab2c 100644 --- a/quanta/components/debugger/interfaces/CMakeLists.txt +++ b/quanta/components/debugger/interfaces/CMakeLists.txt @@ -12,11 +12,18 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/quanta/components/debugger +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) -install( FILES quantadebugger.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE quantadebugger.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} + PO_DIR quanta-desktops +) ##### debuggerinterface (static) ################ diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h index adc914f8..ca51566e 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.h +++ b/quanta/components/debugger/interfaces/debuggerclient.h @@ -62,7 +62,7 @@ namespace DebuggerClientCapabilities class DebuggerClient : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h index fc8f0f2f..e62cd8c4 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.h +++ b/quanta/components/debugger/interfaces/debuggerinterface.h @@ -30,7 +30,7 @@ class PathMapper; class DebuggerInterface : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/debugger/interfaces/quantadebugger.desktop b/quanta/components/debugger/interfaces/quantadebugger.desktop index 0c5d5bbf..c46e3c35 100644 --- a/quanta/components/debugger/interfaces/quantadebugger.desktop +++ b/quanta/components/debugger/interfaces/quantadebugger.desktop @@ -1,45 +1,5 @@ [Desktop Entry] +Comment=A Quanta Debugger plugin + Type=ServiceType X-TDE-ServiceType=TQuanta/Debugger -Comment=A Quanta Debugger plugin -Comment[bg]=Приставка на Quanta за дебъгване -Comment[br]=Ul lugent dizraener Quanta -Comment[ca]=Un connector de depuració pel Quanta -Comment[cs]=Ladicí modul Quanty -Comment[da]=Et Quanta fejlretter-plugin -Comment[de]=Eine Quanta Debugger-Komponente -Comment[el]=Πρόσθετο αποσφαλματωτή Quanta -Comment[es]=Un accesorio para un depurador de Quanta -Comment[et]=Quanta siluriplugin -Comment[eu]=Quanta araztailearen plugina -Comment[fa]=وصلۀ اشکالزدای Quanta -Comment[fi]=Quantan debuggerin plugin -Comment[fr]=Un module de débogage pour Quanta -Comment[ga]=Breiseán dífhabhtóra Quanta -Comment[gl]=Un plugin para o depurador de Quanta -Comment[hu]=Quanta nyomkövető-modul -Comment[is]=Quanta aflúsunaríforrit -Comment[it]=Un plugin debugger di Quanta -Comment[ja]=Quanta デバッガプラグイン -Comment[ka]=Quanta-ს განბზიკვის მოდული -Comment[lt]=Quanta derintuvės priedas -Comment[ms]=Plug masuk penyah-ralat Quanta -Comment[nds]=En Fehlersöök-Komponent för Quanta -Comment[ne]=एउटा क्वान्टा त्रुटिमोचक प्लगइन -Comment[nl]=Een Quanta debugger-plugin -Comment[pl]=Wtyczka debuggera Quanty -Comment[pt]=Um 'plugin' de depuração para o Quanta -Comment[pt_BR]=Um plugin do Debugger do Quanta -Comment[ru]=Модуль отладки Quanta -Comment[sk]=Quanta debuger modul -Comment[sl]=Vstavek razhroščevanja v Quanti -Comment[sr]=Исправљачки прикључак Quanta-е -Comment[sr@Latn]=Ispravljački priključak Quanta-e -Comment[sv]=Ett Quanta-insticksprogram för felsökning -Comment[ta]=குவாண்டா வழுநீக்கி சொருகு -Comment[tg]=Модули ғалатёби Quanta -Comment[tr]=Bir Quanta Hata Ayıklayıcı eklentisi -Comment[uk]=Втулок зневадження Quanta -Comment[zh_CN]=Quanta 调试器插件 -Comment[zh_HK]=一個 Quanta 除錯器的外掛程式 -Comment[zh_TW]=一個 Quanta 除錯器的外掛程式 diff --git a/quanta/components/debugger/pathmapper.h b/quanta/components/debugger/pathmapper.h index f7d2c44a..d012189c 100644 --- a/quanta/components/debugger/pathmapper.h +++ b/quanta/components/debugger/pathmapper.h @@ -27,7 +27,7 @@ class KURL; class PathMapper : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp index 7f6f4027..343b55f3 100644 --- a/quanta/components/debugger/pathmapperdialog.cpp +++ b/quanta/components/debugger/pathmapperdialog.cpp @@ -32,9 +32,9 @@ PathMapperDialog::PathMapperDialog(const TQString& path, const PathMapperDialog: if(m_direction == LocalToServer) ledTranslationExists->hide(); - connect(listHistory, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(lineLocalPath, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPathsChanged())); - connect(lineServerPath, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPathsChanged())); + connect(listHistory, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect(lineLocalPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPathsChanged())); + connect(lineServerPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPathsChanged())); } PathMapperDialog::~PathMapperDialog() diff --git a/quanta/components/debugger/pathmapperdialog.h b/quanta/components/debugger/pathmapperdialog.h index 8c198416..922c9512 100644 --- a/quanta/components/debugger/pathmapperdialog.h +++ b/quanta/components/debugger/pathmapperdialog.h @@ -21,7 +21,7 @@ class PathMapperDialog : public PathMapperDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui index 58a79167..22bedbf4 100644 --- a/quanta/components/debugger/pathmapperdialogs.ui +++ b/quanta/components/debugger/pathmapperdialogs.ui @@ -123,9 +123,6 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -140,9 +137,6 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -335,11 +329,11 @@ The quanta will know that files starting with "/home/user/project/" on the local <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotHistoryclicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kled.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kled.h</include> +</includes> </UI> diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h index 736bf517..4bdf6e1c 100644 --- a/quanta/components/debugger/quantadebuggerinterface.h +++ b/quanta/components/debugger/quantadebuggerinterface.h @@ -27,7 +27,7 @@ class DebuggerManager; class QuantaDebuggerInterface : public DebuggerInterface { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 9624416f..8fc97aaf 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -60,16 +60,16 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name) setSorting(-1); // No sorting m_variablePopup = new TDEPopupMenu(this); - m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch); + m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQ_SLOT(slotRemoveSelected()), 0, removeWatch); if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue)) - m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQT_SLOT(slotVariableSetValue()), 0, setValue); + m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQ_SLOT(slotVariableSetValue()), 0, setValue); - m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQT_SLOT(slotVariableDump()), 0, dumpValue); + m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQ_SLOT(slotVariableDump()), 0, dumpValue); - m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue); + m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQ_SLOT(slotVariableCopyToClipboard()), 0, copyValue); - connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); } diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h index 69b27852..296fa7d9 100644 --- a/quanta/components/debugger/variableslistview.h +++ b/quanta/components/debugger/variableslistview.h @@ -27,7 +27,7 @@ class DebuggerVariable; class VariablesListView : public TDEListView { - Q_OBJECT + TQ_OBJECT enum menuitems diff --git a/quanta/components/framewizard/CMakeLists.txt b/quanta/components/framewizard/CMakeLists.txt index 0a1f83a1..c745467b 100644 --- a/quanta/components/framewizard/CMakeLists.txt +++ b/quanta/components/framewizard/CMakeLists.txt @@ -14,6 +14,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/quanta/project ${CMAKE_SOURCE_DIR}/quanta/components/framewizard +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h index a4e3a837..2d986a3b 100644 --- a/quanta/components/framewizard/areaattributedb.h +++ b/quanta/components/framewizard/areaattributedb.h @@ -25,7 +25,7 @@ */ class areaAttribute : public TQObject{ - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/framewizard/fmfpeditor.h b/quanta/components/framewizard/fmfpeditor.h index 9080cc4d..d74ffa2e 100644 --- a/quanta/components/framewizard/fmfpeditor.h +++ b/quanta/components/framewizard/fmfpeditor.h @@ -25,7 +25,7 @@ */ class fmFPeditor : public fmFPeditorS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/framewizard/fmfpeditors.ui b/quanta/components/framewizard/fmfpeditors.ui index 3e024de5..fbd189b5 100644 --- a/quanta/components/framewizard/fmfpeditors.ui +++ b/quanta/components/framewizard/fmfpeditors.ui @@ -538,4 +538,7 @@ </connections> <pixmapinproject/> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> +</includes> </UI> diff --git a/quanta/components/framewizard/fmrceditor.h b/quanta/components/framewizard/fmrceditor.h index abebe4ee..aff4e960 100644 --- a/quanta/components/framewizard/fmrceditor.h +++ b/quanta/components/framewizard/fmrceditor.h @@ -25,7 +25,7 @@ */ class fmRCeditor : public fmRCeditorS { - Q_OBJECT + TQ_OBJECT public: fmRCeditor(); diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp index 97cfadf0..6992d78e 100644 --- a/quanta/components/framewizard/framewizard.cpp +++ b/quanta/components/framewizard/framewizard.cpp @@ -33,14 +33,14 @@ m_hasSelected(false),m_saved(false) { m_hasSelected = false; m_currSA=vfe->internalTree()->root()->label(); - connect(this, TQT_SIGNAL(launchDraw()), this, TQT_SLOT(draw())); - connect(vfe, TQT_SIGNAL(areaSelected(const TQString &)), this, TQT_SLOT(catchSelectedArea(const TQString &))); + connect(this, TQ_SIGNAL(launchDraw()), this, TQ_SLOT(draw())); + connect(vfe, TQ_SIGNAL(areaSelected(const TQString &)), this, TQ_SLOT(catchSelectedArea(const TQString &))); - connect(pbHorizontal, TQT_SIGNAL(clicked()), this, TQT_SLOT(split())); - connect(pbVertical, TQT_SIGNAL(clicked()), this, TQT_SLOT(split())); - connect(pbEditFrame, TQT_SIGNAL(clicked()), this, TQT_SLOT(showFrameEditorDlg())); - connect(pbReset, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset())); - connect(pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect(pbHorizontal, TQ_SIGNAL(clicked()), this, TQ_SLOT(split())); + connect(pbVertical, TQ_SIGNAL(clicked()), this, TQ_SLOT(split())); + connect(pbEditFrame, TQ_SIGNAL(clicked()), this, TQ_SLOT(showFrameEditorDlg())); + connect(pbReset, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset())); + connect(pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove())); } FrameWizard::~FrameWizard(){ @@ -57,7 +57,7 @@ void FrameWizard::split(){ if(m_hasSelected) { int split = 0; TQString currNodeLabel = m_currSA; - TQString senderName=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + TQString senderName=sender()->name(); if(senderName=="pbHorizontal"){ split = showRCeditorDlg(i18n("Enter the desired number of rows:")); if(split>=2) vfe->split(currNodeLabel,split,HORIZONTAL); diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h index c71a4e5a..fb40b029 100644 --- a/quanta/components/framewizard/framewizard.h +++ b/quanta/components/framewizard/framewizard.h @@ -25,7 +25,7 @@ class TQStringList; /** FrameWizard is the base class of the project */ class FrameWizard : public FrameWizardS { - Q_OBJECT + TQ_OBJECT private: bool m_hasSelected, diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui index 3a3a1efd..22a702c0 100644 --- a/quanta/components/framewizard/framewizards.ui +++ b/quanta/components/framewizard/framewizards.ui @@ -363,7 +363,7 @@ </connections> <pixmapinproject/> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>visualframeeditor.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">visualframeeditor.h</include> +</includes> </UI> diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h index 0efccc72..b31f3ab4 100644 --- a/quanta/components/framewizard/selectablearea.h +++ b/quanta/components/framewizard/selectablearea.h @@ -28,7 +28,7 @@ class SelectableArea : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public : diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index 36974d0d..3f74574f 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -289,8 +289,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii()); if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] ); switch( n->splitType() ){ - case VERTICAL : splitter->setOrientation(Qt::Horizontal);break; - case HORIZONTAL : splitter->setOrientation(Qt::Vertical);break; + case VERTICAL : splitter->setOrientation(TQt::Horizontal);break; + case HORIZONTAL : splitter->setOrientation(TQt::Vertical);break; default:break; } n->firstChild(); @@ -307,8 +307,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ sa->view()->setGeometry(n->atts()->geometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); - connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); - connect(sa, TQT_SIGNAL(selected(const TQString &)),this, TQT_SIGNAL(areaSelected(const TQString &))); + connect(sa, TQ_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQ_SLOT(setGeometry(TQRect))); + connect(sa, TQ_SIGNAL(selected(const TQString &)),this, TQ_SIGNAL(areaSelected(const TQString &))); } } diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h index 57ac82fe..69c51702 100644 --- a/quanta/components/framewizard/visualframeeditor.h +++ b/quanta/components/framewizard/visualframeeditor.h @@ -28,7 +28,7 @@ class VisualFrameEditor : public TQHBox { - Q_OBJECT + TQ_OBJECT private: enum MarkupLanguage{XHTML,HTML}; diff --git a/quanta/components/tableeditor/CMakeLists.txt b/quanta/components/tableeditor/CMakeLists.txt index e6a7d8a9..699d1aa6 100644 --- a/quanta/components/tableeditor/CMakeLists.txt +++ b/quanta/components/tableeditor/CMakeLists.txt @@ -15,6 +15,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/parsers ${CMAKE_SOURCE_DIR}/quanta/utility ${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index 258f7783..96c5ccf8 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -52,21 +52,21 @@ TableEditor::TableEditor(TQWidget* parent, const char* name) : TableEditorS(parent, name) { m_popup = new TDEPopupMenu(); - m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell())); - m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQT_SLOT(slotEditRow())); - // m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQT_SLOT(slotEditCol())); + m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQ_SLOT(slotEditCell())); + m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQ_SLOT(slotEditRow())); + // m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQ_SLOT(slotEditCol())); m_mergeSeparatorId = m_popup->insertSeparator(); - m_mergeCellsId = m_popup->insertItem(i18n("Merge Cells"), this, TQT_SLOT(slotMergeCells())); - m_unmergeCellsId = m_popup->insertItem(i18n("Break Merging"), this, TQT_SLOT(slotUnmergeCells())); + m_mergeCellsId = m_popup->insertItem(i18n("Merge Cells"), this, TQ_SLOT(slotMergeCells())); + m_unmergeCellsId = m_popup->insertItem(i18n("Break Merging"), this, TQ_SLOT(slotUnmergeCells())); m_popup->insertSeparator(); - m_popup->insertItem(i18n("&Insert Row"), this, TQT_SLOT(slotInsertRow())); - m_popup->insertItem(i18n("Insert Co&lumn"), this, TQT_SLOT(slotInsertCol())); - m_popup->insertItem(i18n("Remove Row"), this, TQT_SLOT(slotRemoveRow())); - m_popup->insertItem(i18n("Remove Column"), this, TQT_SLOT(slotRemoveCol())); + m_popup->insertItem(i18n("&Insert Row"), this, TQ_SLOT(slotInsertRow())); + m_popup->insertItem(i18n("Insert Co&lumn"), this, TQ_SLOT(slotInsertCol())); + m_popup->insertItem(i18n("Remove Row"), this, TQ_SLOT(slotRemoveRow())); + m_popup->insertItem(i18n("Remove Column"), this, TQ_SLOT(slotRemoveCol())); m_popup->insertSeparator(); - m_popup->insertItem(i18n("Edit &Table Properties"), this, TQT_SLOT(slotEditTable())); - m_editChildId = m_popup->insertItem(i18n("Edit Child Table"), this, TQT_SLOT(slotEditChildTable())); + m_popup->insertItem(i18n("Edit &Table Properties"), this, TQ_SLOT(slotEditTable())); + m_editChildId = m_popup->insertItem(i18n("Edit Child Table"), this, TQ_SLOT(slotEditChildTable())); buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); @@ -90,27 +90,27 @@ TableEditor::TableEditor(TQWidget* parent, const char* name) m_createNodes = true; newNum += 7; - connect(headerColSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(headerRowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(rowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(colSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(footerRowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(footerColSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(tableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(pushButton7, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTable())); - connect(pushButton7_2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableBody())); - connect(pushButton7_3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableHeader())); - connect(pushButton7_4, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableFooter())); - connect(headerTableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(footerTableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(slotTabChanged(TQWidget*))); - connect(buttonHelp, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelpInvoked())); - connect(tableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); - connect(headerTableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); - connect(footerTableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); + connect(headerColSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(headerRowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(rowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(colSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(footerRowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(footerColSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(tableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(pushButton7, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTable())); + connect(pushButton7_2, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableBody())); + connect(pushButton7_3, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableHeader())); + connect(pushButton7_4, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableFooter())); + connect(headerTableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(footerTableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(slotTabChanged(TQWidget*))); + connect(buttonHelp, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelpInvoked())); + connect(tableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); + connect(headerTableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); + connect(footerTableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); } TableEditor::~TableEditor() diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h index 171cb9c1..445d1590 100644 --- a/quanta/components/tableeditor/tableeditor.h +++ b/quanta/components/tableeditor/tableeditor.h @@ -46,7 +46,7 @@ class Parser; class TableEditor : public TableEditorS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui index 29511351..24a05ed4 100644 --- a/quanta/components/tableeditor/tableeditors.ui +++ b/quanta/components/tableeditor/tableeditors.ui @@ -54,9 +54,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -639,4 +636,7 @@ <tabstop>footerTableData</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp index 0b704529..ba10c9bb 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -48,7 +48,7 @@ TQWidget* TableItem::createEditor() const Editor->setVScrollBarMode(TQScrollView::AlwaysOff); Editor->setBold(m_header); Editor->setText(text()); - TQObject::connect(Editor, TQT_SIGNAL(textChanged()), table(), TQT_SLOT(doValueChanged())); + TQObject::connect(Editor, TQ_SIGNAL(textChanged()), table(), TQ_SLOT(doValueChanged())); return Editor; } diff --git a/quanta/data/config/CMakeLists.txt b/quanta/data/config/CMakeLists.txt index fa091c93..2a839156 100644 --- a/quanta/data/config/CMakeLists.txt +++ b/quanta/data/config/CMakeLists.txt @@ -13,6 +13,8 @@ install( FILES plugins.rc actions.rc quantaui.rc DESTINATION ${DATA_INSTALL_DIR}/quanta ) -install( FILES - quanta_preview_config.desktop - DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE quanta_preview_config.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR quanta-desktops +) diff --git a/quanta/data/config/quanta_preview_config.desktop b/quanta/data/config/quanta_preview_config.desktop index 70125b00..6917f55e 100644 --- a/quanta/data/config/quanta_preview_config.desktop +++ b/quanta/data/config/quanta_preview_config.desktop @@ -1,44 +1,7 @@ [Desktop Entry] +Name=Configure TDEHTML Browser Part + Type=Service Exec=tdecmshell --caption %c %i tdehtml_behavior tdehtml_java_js tdehtml_fonts cookies cache proxy kcmcss crypto useragent tdehtml_plugins Icon=konqueror X-DocPath=konqueror/index.html -Name=Configure TDEHTML Browser Part -Name[ca]=Configura la part del fullejador TDEHTML -Name[cs]=Nastavení TDEHTML Part -Name[da]=Indstil TDEHTML browser-part -Name[de]=Einrichten der TDEHTML-Browserkomponente -Name[el]=Ρύθμιση του TDEHTML περιηγητή -Name[es]=Configurara la parte del navegador TDEHTML -Name[et]=TDEHTML brauseri komponendi seadistamine -Name[eu]=Konfiguratu TDEHTML arakatzailearen partea -Name[fa]=پیکربندی جزء مرورگر TDEHTML -Name[fi]=TDEHTML selaimen komponentti -Name[fr]=Configurer le composant de navigation TDEHTML -Name[gl]=Configurar a parte do navegador TDEHTML -Name[hu]=A TDEHTML böngészőobjektum beállításai -Name[is]=Stilla TDEHTML vafrahluti -Name[it]=Parte browser configura TDEHTML -Name[ja]=TDEHTML ブラウザ部を設定 -Name[ka]=TDEHTML ბროუზერის ნაწილის კონფიგურაცია -Name[lt]=Konfigūruoti TDEHTML naršyklės dalį -Name[ms]=Selaraskan Bahagian Pelayar TDEHTML -Name[nds]=TDEHTML-Browserkomponent inrichten -Name[ne]=केडीई एचटीएमएल ब्राउजर भाग कन्फिगर गर्नुहोस् -Name[nl]=TDEHTML Browser Part configuratie -Name[pl]=Konfiguracja osadzalnej części przeglądarki TDEHTML -Name[pt]=Configurar a Parte de Navegação HTML -Name[pt_BR]=Configurar o Componente TDEHTML do Navegador -Name[ru]=Настроить компонент просмтра TDEHTML -Name[sk]=Nastaviť TDEHTML prehliadač Part -Name[sl]=Nastavite del brskalnika TDEHTML -Name[sr]=Део за подешавање TDEHTML прегледача -Name[sr@Latn]=Deo za podešavanje TDEHTML pregledača -Name[sv]=Anpassa delprogrammet för webbläsning TDEHTML -Name[ta]=TDEHTML உலாவி பகுதி உள்ளமை -Name[tg]=Танзими қисми браузери TDEHTML -Name[tr]=TDEHTML Tarayıcısı Parçasını Yapılandır -Name[uk]=Налаштувати компонент перегляду TDEHTML -Name[zh_CN]=配置 TDEHTML 浏览器部件 -Name[zh_HK]=設定 TDEHTML 瀏覽器元件 -Name[zh_TW]=設定 TDEHTML 瀏覽器 Part diff --git a/quanta/data/dtep/CMakeLists.txt b/quanta/data/dtep/CMakeLists.txt index 235aa073..ae310636 100644 --- a/quanta/data/dtep/CMakeLists.txt +++ b/quanta/data/dtep/CMakeLists.txt @@ -10,6 +10,7 @@ ################################################# add_subdirectory( html ) +add_subdirectory( html5 ) add_subdirectory( html-frameset ) add_subdirectory( html-strict ) add_subdirectory( tagxml ) diff --git a/quanta/data/dtep/Makefile.am b/quanta/data/dtep/Makefile.am index 8adf55fa..51ddb8e5 100644 --- a/quanta/data/dtep/Makefile.am +++ b/quanta/data/dtep/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = html html-frameset html-strict tagxml php xhtml xhtml-basic xhtml-frameset xhtml-strict xhtml11 xslt wml-1-2 css docbook-4.2 schema cfml cffunct kde-docbook-4.1.2 kde-docbook-4.2 relaxng empty dtd +SUBDIRS = html html5 html-frameset html-strict tagxml php xhtml xhtml-basic xhtml-frameset xhtml-strict xhtml11 xslt wml-1-2 css docbook-4.2 schema cfml cffunct kde-docbook-4.1.2 kde-docbook-4.2 relaxng empty dtd install-data-local: # rm -f `find ${quanta_datadir}/tags -type f -name "*"` # rmdir `find ${quanta_datadir}/tags -type d -name "*"` diff --git a/quanta/data/dtep/html-frameset/common.tag b/quanta/data/dtep/html-frameset/common.tag index e5adf8f7..47adb16b 100644 --- a/quanta/data/dtep/html-frameset/common.tag +++ b/quanta/data/dtep/html-frameset/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/html-strict/common.tag b/quanta/data/dtep/html-strict/common.tag index e5adf8f7..47adb16b 100644 --- a/quanta/data/dtep/html-strict/common.tag +++ b/quanta/data/dtep/html-strict/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/html/common.tag b/quanta/data/dtep/html/common.tag index e5adf8f7..47adb16b 100644 --- a/quanta/data/dtep/html/common.tag +++ b/quanta/data/dtep/html/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/html5/CMakeLists.txt b/quanta/data/dtep/html5/CMakeLists.txt new file mode 100644 index 00000000..f5f1acb3 --- /dev/null +++ b/quanta/data/dtep/html5/CMakeLists.txt @@ -0,0 +1,31 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + abbr.tag acronym.tag address.tag applet.tag area.tag article.tag + aside.tag a.tag audio.tag base.tag bdi.tag bdo.tag + big.tag blockquote.tag body.tag br.tag b.tag button.tag + caption.tag center.tag cite.tag code.tag colgroup.tag col.tag + common.tag data.tag dd.tag del.tag description.rc details.tag + dfn.tag dir.tag div.tag dl.tag dt.tag embed.tag + empty.tag em.tag fieldset.tag figcaption.tag figure.tag footer.tag + form.tag header.tag headings.tag head.tag hr.tag html.tag + img.tag input.tag ins.tag i.tag kbd.tag label.tag + legend.tag link.tag li.tag main.tag map.tag mark.tag + meta.tag nav.tag noscript.tag object.tag ol.tag optgroup.tag + option.tag param.tag picture.tag pre.tag p.tag q.tag + rbc.tag rb.tag rp.tag rtc.tag rt.tag ruby.tag + samp.tag script.tag section.tag select.tag small.tag source.tag + span.tag strong.tag style.tag sub.tag sup.tag svg.tag + table.tag tbody.tag td.tag textarea.tag tfoot.tag thead.tag + th.tag time.tag title.tag track.tag tr.tag tt.tag + ul.tag u.tag var.tag video.tag wbr.tag + DESTINATION ${DATA_INSTALL_DIR}/quanta/dtep/html5 ) diff --git a/quanta/data/dtep/html5/Makefile.am b/quanta/data/dtep/html5/Makefile.am new file mode 100644 index 00000000..e2190890 --- /dev/null +++ b/quanta/data/dtep/html5/Makefile.am @@ -0,0 +1,20 @@ +quanta_DATA = abbr.tag acronym.tag address.tag applet.tag area.tag article.tag \ + aside.tag a.tag audio.tag base.tag bdi.tag bdo.tag \ + big.tag blockquote.tag body.tag br.tag b.tag button.tag \ + caption.tag center.tag cite.tag code.tag colgroup.tag col.tag \ + common.tag data.tag dd.tag del.tag description.rc details.tag \ + dfn.tag dir.tag div.tag dl.tag dt.tag embed.tag \ + empty.tag em.tag fieldset.tag figcaption.tag figure.tag footer.tag \ + form.tag header.tag headings.tag head.tag hr.tag html.tag \ + img.tag input.tag ins.tag i.tag kbd.tag label.tag \ + legend.tag link.tag li.tag main.tag map.tag mark.tag \ + meta.tag nav.tag noscript.tag object.tag ol.tag optgroup.tag \ + option.tag param.tag picture.tag pre.tag p.tag q.tag \ + rbc.tag rb.tag rp.tag rtc.tag rt.tag ruby.tag \ + samp.tag script.tag section.tag select.tag small.tag source.tag \ + span.tag strong.tag style.tag sub.tag sup.tag svg.tag \ + table.tag tbody.tag td.tag textarea.tag tfoot.tag thead.tag \ + th.tag time.tag title.tag track.tag tr.tag tt.tag \ + ul.tag u.tag var.tag video.tag wbr.tag +quantadir = ${quanta_datadir}/dtep/html5 + diff --git a/quanta/data/dtep/html5/a.tag b/quanta/data/dtep/html5/a.tag new file mode 100644 index 00000000..50a40f53 --- /dev/null +++ b/quanta/data/dtep/html5/a.tag @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="a" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="href" type="input" source="selection"> + <text>href</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="3"/> + </attr> + + <attr name="rel" type="input"> + <text>rel</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" /> + </attr> + + <attr name="rev" type="input"> + <text>rev</text> + <textlocation col="2" row="2" /> + <location col="3" row="2" /> + </attr> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" /> + <items> + <item>text/html</item> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>application/mathml+xml</item> + <item>application/rss+xml</item> + <item>application/xhtml+xml</item> + <item>application/xml</item> + <item>text/css</item> + <item>text/javascript</item> + <item>text/xml</item> + </items> + </attr> + + <attr name="onfocus" type="input"> + <text>onfocus</text> + <textlocation col="0" row="8" /> + <location col="1" row="8" colspan="3" /> + </attr> + + <attr name="onblur" type="input"> + <text>onblur</text> + <textlocation col="0" row="9" /> + <location col="1" row="9" colspan="3" /> + </attr> + + <attr name="hreflang" type="input" /> + <attr name="charset" type="input" /> + <attr name="accesskey" type="input" /> + <attr name="tabindex" type="input" /> + <attr name="shape" type="list"> + <items> + <item>rect</item> + <item>circle</item> + <item>poly</item> + <item>default</item> + </items> + </attr> + <attr name="coords" type="input" /> + +<children> +<child name="#text" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/abbr.tag b/quanta/data/dtep/html5/abbr.tag new file mode 100644 index 00000000..e2c74acd --- /dev/null +++ b/quanta/data/dtep/html5/abbr.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="abbr" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/acronym.tag b/quanta/data/dtep/html5/acronym.tag new file mode 100644 index 00000000..407b5ecd --- /dev/null +++ b/quanta/data/dtep/html5/acronym.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="acronym" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/address.tag b/quanta/data/dtep/html5/address.tag new file mode 100644 index 00000000..512364ce --- /dev/null +++ b/quanta/data/dtep/html5/address.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="address" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/applet.tag b/quanta/data/dtep/html5/applet.tag new file mode 100644 index 00000000..df3c0c4f --- /dev/null +++ b/quanta/data/dtep/html5/applet.tag @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="applet" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="archive" type="input"> + <text>archive</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="classid" type="input"> + <text>classid</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="codebase" type="input"> + <text>codebase</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="code" type="input"> + <text>code</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="object" type="input"> + <text>object</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2" /> + </attr> + + <attr name="align" type="input"> + <text>align</text> + <textlocation col="2" row="7" /> + <location col="3" row="7" colspan="1" /> + </attr> + + <attr name="hspace" type="input"> + <text>hspace</text> + <textlocation col="2" row="8" /> + <location col="3" row="8" colspan="1" /> + </attr> + + <attr name="vspace" type="input"> + <text>vspace</text> + <textlocation col="2" row="9" /> + <location col="3" row="9" colspan="1" /> + </attr> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="di" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="param" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/area.tag b/quanta/data/dtep/html5/area.tag new file mode 100644 index 00000000..dac881d1 --- /dev/null +++ b/quanta/data/dtep/html5/area.tag @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="area" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1" single="1"> + + <attr name="shape" type="list"> + <text>shape</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2"/> + <items> + <item>rect</item> + <item>circle</item> + <item>poly</item> + <item>default</item> + </items> + </attr> + + <attr name="coords" type="text"> + <text>coords</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2"/> + </attr> + + <attr name="href" type="url"> + <text>href</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2"/> + </attr> + + <attr name="accesskey" type="input"> + <text>accesskey</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="1" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2"/> + </attr> + + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/article.tag b/quanta/data/dtep/html5/article.tag new file mode 100644 index 00000000..1765735e --- /dev/null +++ b/quanta/data/dtep/html5/article.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="article" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/aside.tag b/quanta/data/dtep/html5/aside.tag new file mode 100644 index 00000000..381fb796 --- /dev/null +++ b/quanta/data/dtep/html5/aside.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="aside" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/audio.tag b/quanta/data/dtep/html5/audio.tag new file mode 100644 index 00000000..69476078 --- /dev/null +++ b/quanta/data/dtep/html5/audio.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="audio" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/b.tag b/quanta/data/dtep/html5/b.tag new file mode 100644 index 00000000..033d36b5 --- /dev/null +++ b/quanta/data/dtep/html5/b.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="b" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/base.tag b/quanta/data/dtep/html5/base.tag new file mode 100644 index 00000000..200f1c1d --- /dev/null +++ b/quanta/data/dtep/html5/base.tag @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="base" single="1"> + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > <text>Id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" /> + </attr> + + <attr name="href" type="input"> + <text>Href</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/bdi.tag b/quanta/data/dtep/html5/bdi.tag new file mode 100644 index 00000000..c1f20363 --- /dev/null +++ b/quanta/data/dtep/html5/bdi.tag @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="bdi" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="dir" type="list"> + <text>dir</text> + <textlocation col="0" row="1" /> + <tooltip>This is not widely supported</tooltip> + <location col="1" row="1" colspan="2" /> + <items> + <item>ltr</item> + <item>rtl</item> + </items> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/bdo.tag b/quanta/data/dtep/html5/bdo.tag new file mode 100644 index 00000000..1c5ba5a6 --- /dev/null +++ b/quanta/data/dtep/html5/bdo.tag @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="bdo" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="dir" type="list"> + <text>dir</text> + <textlocation col="0" row="1" /> + <tooltip>This is not widely supported</tooltip> + <location col="1" row="1" colspan="2" /> + <items> + <item>ltr</item> + <item>rtl</item> + </items> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/big.tag b/quanta/data/dtep/html5/big.tag new file mode 100644 index 00000000..17b8b52c --- /dev/null +++ b/quanta/data/dtep/html5/big.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="big" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/blockquote.tag b/quanta/data/dtep/html5/blockquote.tag new file mode 100644 index 00000000..25a9c4c3 --- /dev/null +++ b/quanta/data/dtep/html5/blockquote.tag @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="blockquote" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cite" type="input"> + <text>cite</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="blockquote" /> +<child name="del" /> +<child name="di" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/body.tag b/quanta/data/dtep/html5/body.tag new file mode 100644 index 00000000..29c38226 --- /dev/null +++ b/quanta/data/dtep/html5/body.tag @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="body" hasCore="1" hasI18n="1" hasScript="1"> + <attr name="onload" type="input"> + <text>onload</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="onunload" type="input"> + <text>onunload</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="blockquote" /> +<child name="del" /> +<child name="div" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/br.tag b/quanta/data/dtep/html5/br.tag new file mode 100644 index 00000000..d4d2bb06 --- /dev/null +++ b/quanta/data/dtep/html5/br.tag @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="br" hasCore="1" single="1" /> +</TAGS> diff --git a/quanta/data/dtep/html5/button.tag b/quanta/data/dtep/html5/button.tag new file mode 100644 index 00000000..039443b1 --- /dev/null +++ b/quanta/data/dtep/html5/button.tag @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="button" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + +<attr name="value" type="input" /> + +<attr name="type" type="list"> +<items> +<item>submit</item> +<item>button</item> +<item>reset</item> +</items> +</attr> + +<attr name="disabled" type="check" /> + +<children> +<child name="#text" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="ins" /> +<child name="kbd" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/caption.tag b/quanta/data/dtep/html5/caption.tag new file mode 100644 index 00000000..10d69177 --- /dev/null +++ b/quanta/data/dtep/html5/caption.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="caption" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/center.tag b/quanta/data/dtep/html5/center.tag new file mode 100644 index 00000000..7ed9dcac --- /dev/null +++ b/quanta/data/dtep/html5/center.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="center" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/cite.tag b/quanta/data/dtep/html5/cite.tag new file mode 100644 index 00000000..6dc55aef --- /dev/null +++ b/quanta/data/dtep/html5/cite.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="cite" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/code.tag b/quanta/data/dtep/html5/code.tag new file mode 100644 index 00000000..df071b02 --- /dev/null +++ b/quanta/data/dtep/html5/code.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="code" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/col.tag b/quanta/data/dtep/html5/col.tag new file mode 100644 index 00000000..54f5b93c --- /dev/null +++ b/quanta/data/dtep/html5/col.tag @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="col" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>Use % for percent or it will set pixels +You can add multiple values with commas</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="span" type="input"> + <text>span</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" /> + </attr> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="2" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="2" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="3" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="3" colspan="1" /> + </attr> + + <attr name="char" type="input"> + <text>char</text> + <textlocation col="0" row="4" /> + <tooltip>alignment character for cells</tooltip> + <location col="1" row="4" /> + </attr> + + <attr name="charoff" type="input"> + <text>charoff</text> + <textlocation col="0" row="5" /> + <tooltip>alignment character offset</tooltip> + <location col="1" row="5" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/colgroup.tag b/quanta/data/dtep/html5/colgroup.tag new file mode 100644 index 00000000..53ef59ee --- /dev/null +++ b/quanta/data/dtep/html5/colgroup.tag @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="colgroup" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>Use % for percent or it will set pixels +You can add multiple values with commas</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="span" type="input"> + <text>span</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" /> + </attr> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="2" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="2" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="3" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="3" colspan="1" /> + </attr> + + <attr name="char" type="input"> + <text>char</text> + <textlocation col="0" row="4" /> + <tooltip>alignment character for cells</tooltip> + <location col="1" row="4" /> + </attr> + + <attr name="charoff" type="input"> + <text>charoff</text> + <textlocation col="0" row="5" /> + <tooltip>alignment character offset</tooltip> + <location col="1" row="5" /> + </attr> +<children> +<child name="col" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/common.tag b/quanta/data/dtep/html5/common.tag new file mode 100644 index 00000000..a380f05b --- /dev/null +++ b/quanta/data/dtep/html5/common.tag @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="Core" common="yes"> + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + </attr> + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > + </attr> + <attr name="style" type="css-style"> + </attr> + <attr name="title" type="input"> + </attr> +</tag> + +<tag name="I18n" common="yes"> + <attr name="xml:lang" type="input"> + </attr> + <attr name="dir" type="input"> + </attr> +</tag> + +<tag name="Script" common="yes"> + <attr name="onclick" type="input"> + </attr> + <attr name="ondblclick" type="input"> + </attr> + <attr name="onmousedown" type="input"> + </attr> + <attr name="onmouseup" type="input"> + </attr> + <attr name="onmouseover" type="input"> + </attr> + <attr name="onmousemove" type="input"> + </attr> + <attr name="onmouseout" type="input"> + </attr> + <attr name="onkeypress" type="input"> + </attr> + <attr name="onkeydown" type="input"> + </attr> + <attr name="onkeyup" type="input"> + </attr> +</tag> + +<tag name="Focus" common="yes"> + <attr name="accesskey" type="input"> + </attr> + <attr name="tabindex" type="input"> + </attr> + <attr name="onfocus" type="input"> + </attr> + <attr name="onblur" type="input"> + </attr> +</tag> + +</TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/html5/data.tag b/quanta/data/dtep/html5/data.tag new file mode 100644 index 00000000..098bf906 --- /dev/null +++ b/quanta/data/dtep/html5/data.tag @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="del" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="value" type="input"> + <text>value</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dd.tag b/quanta/data/dtep/html5/dd.tag new file mode 100644 index 00000000..0e377f4e --- /dev/null +++ b/quanta/data/dtep/html5/dd.tag @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dd" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/del.tag b/quanta/data/dtep/html5/del.tag new file mode 100644 index 00000000..b6515eb5 --- /dev/null +++ b/quanta/data/dtep/html5/del.tag @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="del" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cite" type="input"> + <text>cite</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="datetime" type="input"> + <text>datetime</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/description.rc b/quanta/data/dtep/html5/description.rc new file mode 100644 index 00000000..02e1f8cd --- /dev/null +++ b/quanta/data/dtep/html5/description.rc @@ -0,0 +1,58 @@ +[General] +Name = HTML 5 +NickName = HTML 5 +URL = https://www.w3.org/TR/html5/syntax.html#the-doctype +DoctypeString = html +MimeTypes = text/html +DefaultExtension = html +Groups = Core, I18n, Script,Focus +NumOfPages = 3 +CaseSensitive = true +Documentation = HTML + +[Toolbars] +Location = html5 +Names = base, style, meta, tools + +[Page1] +Title = Core and i18n +Groups = Core, I18n + +[Page2] +Title = Events +Groups = Script + +[Page3] +Title = Focus +Groups = Focus + +[Extra rules] +BooleanAttributes = simple +Single Tag Style = XML +StructGroupsCount = 3 + +[Parsing rules] +SpecialTags = script(language) +MayContain = php, css + +[StructGroup_1] +Name = Images (anchor) +No_Name = No Images (anchor) +Icon = image +Tag = img(src) +HasFileName = true + +[StructGroup_2] +Name = Links +No_Name = No Links +Icon = www +Tag = a(name,href) +HasFileName = true +FileNameRx = .*\||#.* + +[StructGroup_3] +Name = Resources (link) +No_Name = No Links (link) +Icon = www +Tag = link(href) +HasFileName = true diff --git a/quanta/data/dtep/html5/details.tag b/quanta/data/dtep/html5/details.tag new file mode 100644 index 00000000..13522d41 --- /dev/null +++ b/quanta/data/dtep/html5/details.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="details" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dfn.tag b/quanta/data/dtep/html5/dfn.tag new file mode 100644 index 00000000..30f9107f --- /dev/null +++ b/quanta/data/dtep/html5/dfn.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dfn" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dir.tag b/quanta/data/dtep/html5/dir.tag new file mode 100644 index 00000000..ac27af08 --- /dev/null +++ b/quanta/data/dtep/html5/dir.tag @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dir" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="li" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/div.tag b/quanta/data/dtep/html5/div.tag new file mode 100644 index 00000000..24537952 --- /dev/null +++ b/quanta/data/dtep/html5/div.tag @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="div" hasCore="1" hasI18n="1" hasScript="1" scope="paragraph"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dl.tag b/quanta/data/dtep/html5/dl.tag new file mode 100644 index 00000000..430067b8 --- /dev/null +++ b/quanta/data/dtep/html5/dl.tag @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dl" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="dt" /> +<child name="dd" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dt.tag b/quanta/data/dtep/html5/dt.tag new file mode 100644 index 00000000..59f005d5 --- /dev/null +++ b/quanta/data/dtep/html5/dt.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dt" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/em.tag b/quanta/data/dtep/html5/em.tag new file mode 100644 index 00000000..7022b925 --- /dev/null +++ b/quanta/data/dtep/html5/em.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="em" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/embed.tag b/quanta/data/dtep/html5/embed.tag new file mode 100644 index 00000000..c8faddae --- /dev/null +++ b/quanta/data/dtep/html5/embed.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="embed" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/empty.tag b/quanta/data/dtep/html5/empty.tag new file mode 100644 index 00000000..06fe883c --- /dev/null +++ b/quanta/data/dtep/html5/empty.tag @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name=""> + + <attr name="rows" type="input"> + <text>Rows</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/fieldset.tag b/quanta/data/dtep/html5/fieldset.tag new file mode 100644 index 00000000..3af076cd --- /dev/null +++ b/quanta/data/dtep/html5/fieldset.tag @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="fieldset" hasScript="1" hasCore="1"> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="attr" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="legend" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/figcaption.tag b/quanta/data/dtep/html5/figcaption.tag new file mode 100644 index 00000000..187a181c --- /dev/null +++ b/quanta/data/dtep/html5/figcaption.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="figcaption" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/figure.tag b/quanta/data/dtep/html5/figure.tag new file mode 100644 index 00000000..5b4a3428 --- /dev/null +++ b/quanta/data/dtep/html5/figure.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="figure" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/footer.tag b/quanta/data/dtep/html5/footer.tag new file mode 100644 index 00000000..628f7aca --- /dev/null +++ b/quanta/data/dtep/html5/footer.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="footer" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/form.tag b/quanta/data/dtep/html5/form.tag new file mode 100644 index 00000000..af33b0e1 --- /dev/null +++ b/quanta/data/dtep/html5/form.tag @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="form" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="action" type="url"> + <text>action</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="3" /> + </attr> + + <attr name="method" type="list"> + <text>method</text> + <textlocation col="0" row="1" /> + <location col="1" row="1"/> + <items> + <item>GET</item> + <item>POST</item> + </items> + </attr> + + <attr name="enctype" type="list"> + <text>enctype</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="3"/> + <items> + <item>application/x-www-form-urlencoded</item> + <item>multipart/form-data</item> + </items> + </attr> + + <attr name="accept-charset" type="input"> + <text>acceptcharset</text> + <textlocation col="2" row="3" /> + <location col="3" row="3"/> + </attr> + + <attr name="accept" type="list"> + <text>accept</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3"/> + <items> + <item>application/x-www-form-urlencoded</item> + <item>multipart/form-data</item> + </items> + </attr> + + <attr name="onsubmit" type="input"> + <text>onsubmit</text> + <textlocation col="2" row="5" /> + <location col="3" row="5"/> + </attr> + + <attr name="onreset" type="input"> + <text>onreset</text> + <textlocation col="2" row="6" /> + <location col="3" row="6"/> + </attr> + +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="blockquote" /> +<child name="del" /> +<child name="div" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/head.tag b/quanta/data/dtep/html5/head.tag new file mode 100644 index 00000000..b53932b3 --- /dev/null +++ b/quanta/data/dtep/html5/head.tag @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="head" hasI18n="1"> + + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="profile" type="url"> + <text>profile</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + +<children> +<child name="base" /> +<child name="link" /> +<child name="meta" usage="required" /> +<child name="object" /> +<child name="title" usage="required" /> +<child name="script" /> +<child name="style" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/header.tag b/quanta/data/dtep/html5/header.tag new file mode 100644 index 00000000..9ddd3550 --- /dev/null +++ b/quanta/data/dtep/html5/header.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="header" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/headings.tag b/quanta/data/dtep/html5/headings.tag new file mode 100644 index 00000000..3951989c --- /dev/null +++ b/quanta/data/dtep/html5/headings.tag @@ -0,0 +1,311 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> + +<tag name="h1" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h2" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h3" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h4" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h5" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h6" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +</TAGS> diff --git a/quanta/data/dtep/html5/hr.tag b/quanta/data/dtep/html5/hr.tag new file mode 100644 index 00000000..2bc7e29c --- /dev/null +++ b/quanta/data/dtep/html5/hr.tag @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="hr" hasScript="1" single="1" hasCore="1" single="1" /> +</TAGS> diff --git a/quanta/data/dtep/html5/html.tag b/quanta/data/dtep/html5/html.tag new file mode 100644 index 00000000..22894f8d --- /dev/null +++ b/quanta/data/dtep/html5/html.tag @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="html" hasI18n="1"> + + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="xmlns" type="list"> + <text>xmlns</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + <items><item>http://www.w3.org/1999/xhtml</item></items> + </attr> + +<children> +<child name="body" /> +<child name="head" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/i.tag b/quanta/data/dtep/html5/i.tag new file mode 100644 index 00000000..2bf4dae2 --- /dev/null +++ b/quanta/data/dtep/html5/i.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/img.tag b/quanta/data/dtep/html5/img.tag new file mode 100644 index 00000000..edeb3729 --- /dev/null +++ b/quanta/data/dtep/html5/img.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="img" hasCore="1" hasI18n="1" hasScript="1" single="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/input.tag b/quanta/data/dtep/html5/input.tag new file mode 100644 index 00000000..d9e54de6 --- /dev/null +++ b/quanta/data/dtep/html5/input.tag @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="input" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="0" colspan="1" /> + <items> + <item>text</item> + <item>password</item> + <item>checkbox</item> + <item>radio</item> + <item>submit</item> + <item>reset</item> + <item>file</item> + <item>hidden</item> + <item>image</item> + <item>button</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="disabled" type="check"> + <text>disabled</text> + <location col="2" row="0" colspan="1" /> + <tooltip>Disable the element</tooltip> + </attr> + + <attr name="checked" type="check"> + <text>checked</text> + <location col="3" row="0" colspan="1" /> + <tooltip>For radio button or check box</tooltip> + </attr> + + <attr name="value" type="input"> + <text>value</text> + <textlocation col="2" row="1" colspan="1" /> + <location col="3" row="1" colspan="1" /> + </attr> + + <attr name="size" type="input"> + <text>size</text> + <textlocation col="0" row="2" colspan="1" /> + <location col="1" row="2" colspan="1" /> + <tooltip>No of characters for text input</tooltip> + </attr> + + <attr name="maxlength" type="input"> + <text>maxlength</text> + <textlocation col="2" row="2" colspan="1" /> + <location col="3" row="2" colspan="1" /> + <tooltip>Max characters allowed</tooltip> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="3" colspan="1" /> + <location col="1" row="3" colspan="3" /> + <tooltip>Alternate text for image</tooltip> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="4" colspan="1" /> + <location col="1" row="4" colspan="3" /> + <tooltip>URL for image to use</tooltip> + </attr> + + <attr name="accept" type="list"> + <text>accept</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3"/> + <items> + <item>application/x-www-form-urlencoded</item> + <item>multipart/form-data</item> + </items> + </attr> + + <attr name="readonly" type="check"> + <text>readonly</text> + <location col="3" row="5" colspan="1" /> + </attr> + + <attr name="usemap" type="input"> + <text>use</text> + <textlocation col="0" row="3" colspan="1" /> + <location col="1" row="3" colspan="3" /> + </attr> + + <attr name="onselect" type="input"> + <text>onselect</text> + <textlocation col="0" row="3" colspan="1" /> + <location col="1" row="3" colspan="3" /> + </attr> + + <attr name="onchange" type="input"> + <text>onchange</text> + <textlocation col="0" row="3" colspan="1" /> + <location col="1" row="3" colspan="3" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/ins.tag b/quanta/data/dtep/html5/ins.tag new file mode 100644 index 00000000..486d4169 --- /dev/null +++ b/quanta/data/dtep/html5/ins.tag @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="ins" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cite" type="url"> + <text>cite</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="datetime" type="input"> + <text>datetime</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/kbd.tag b/quanta/data/dtep/html5/kbd.tag new file mode 100644 index 00000000..92075861 --- /dev/null +++ b/quanta/data/dtep/html5/kbd.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="kbd" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/label.tag b/quanta/data/dtep/html5/label.tag new file mode 100644 index 00000000..7e7f0bf1 --- /dev/null +++ b/quanta/data/dtep/html5/label.tag @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="label" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="accesskey" type="input"> + <text>accesskey</text> + <textlocation col="2" row="0" colspan="1" /> + <location col="3" row="0" colspan="1" /> + <tooltip>Shortcut</tooltip> + </attr> + + <attr name="for" type="input"> + <text>for</text> + <textlocation col="2" row="1" colspan="1" /> + <location col="3" row="1" colspan="1" /> + </attr> + <attr name="onfocus" type="input"> + <text>onfocus</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" /> + </attr> + + <attr name="onblur" type="input"> + <text>onblur</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/legend.tag b/quanta/data/dtep/html5/legend.tag new file mode 100644 index 00000000..aaa7ab25 --- /dev/null +++ b/quanta/data/dtep/html5/legend.tag @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="legend" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="accesskey" type="input"> + <text>accesskey</text> + <textlocation col="2" row="0" colspan="1" /> + <location col="3" row="0" colspan="1" /> + <tooltip>Shortcut</tooltip> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/li.tag b/quanta/data/dtep/html5/li.tag new file mode 100644 index 00000000..3b8149aa --- /dev/null +++ b/quanta/data/dtep/html5/li.tag @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="li" hasCore="1" hasI18n="1" hasScript="1"> + + <stoppingtags> + <stoppingtag name="li" /> + </stoppingtags> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/link.tag b/quanta/data/dtep/html5/link.tag new file mode 100644 index 00000000..367ee800 --- /dev/null +++ b/quanta/data/dtep/html5/link.tag @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="link" hasCore="1" hasI18n="1" hasScript="1" single="1"> + <attr name="rel" type="input"> + <text>rel</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="rev" type="input"> + <text>rev</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="href" type="url"> + <text>href</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + <items> + <item>text/html</item> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>text/css</item> + <item>text/javascript</item> + </items> + </attr> + + <attr name="media" type="list"> + <text>media</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + <items> + <item>screen</item> + <item>tty</item> + <item>tv</item> + <item>projection</item> + <item>handheld</item> + <item>print</item> + <item>braille</item> + <item>aural</item> + <item>all</item> + </items> + </attr> + + <attr name="hreflang" type="input"> + <text>hreflang</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2" /> + </attr> + + <attr name="charset" type="input"> + <text>charset</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/main.tag b/quanta/data/dtep/html5/main.tag new file mode 100644 index 00000000..f5105db0 --- /dev/null +++ b/quanta/data/dtep/html5/main.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="main" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/map.tag b/quanta/data/dtep/html5/map.tag new file mode 100644 index 00000000..e13496b4 --- /dev/null +++ b/quanta/data/dtep/html5/map.tag @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="map" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="area" /> +<child name="blockquote" /> +<child name="del" /> +<child name="div" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/mark.tag b/quanta/data/dtep/html5/mark.tag new file mode 100644 index 00000000..50e592eb --- /dev/null +++ b/quanta/data/dtep/html5/mark.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="mark" hasCore="1" hasI18n="1" hasScript="1" scope="word"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/meta.tag b/quanta/data/dtep/html5/meta.tag new file mode 100644 index 00000000..794eb693 --- /dev/null +++ b/quanta/data/dtep/html5/meta.tag @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="meta" hasI18n="1" single="1"> + + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="http-equiv" type="input"> + <text>http-equiv</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="content" type="input"> + <text>content</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="scheme" type="input"> + <text>scheme</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/nav.tag b/quanta/data/dtep/html5/nav.tag new file mode 100644 index 00000000..151e0bf8 --- /dev/null +++ b/quanta/data/dtep/html5/nav.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="nav" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/noscript.tag b/quanta/data/dtep/html5/noscript.tag new file mode 100644 index 00000000..32533805 --- /dev/null +++ b/quanta/data/dtep/html5/noscript.tag @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="noscript" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="blockquote" /> +<child name="del" /> +<child name="di" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/object.tag b/quanta/data/dtep/html5/object.tag new file mode 100644 index 00000000..2550a7d3 --- /dev/null +++ b/quanta/data/dtep/html5/object.tag @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="object" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="archive" type="input"> + <text>archive</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="classid" type="input"> + <text>classid</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="codebase" type="input"> + <text>codebase</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="codetype" type="list"> + <text>codetype</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + <items> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>audio/basic</item> + <item>text/html</item> + <item>text/css</item> + </items> + </attr> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + <items> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>audio/basic</item> + <item>text/html</item> + <item>text/css</item> + </items> + </attr> + + <attr name="data" type="url"> + <text>data</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="7" /> + <location col="1" row="7" colspan="2" /> + </attr> + + <attr name="tabindex" type="input"> + <text>tabindex</text> + <textlocation col="0" row="8" /> + <location col="1" row="8" colspan="1" /> + </attr> + + <attr name="standby" type="input"> + <text>standby</text> + <textlocation col="2" row="9" /> + <location col="3" row="9" colspan="1" /> + </attr> + + <attr name="declare" type="check"> + <text>declare</text> + <textlocation col="2" row="10" /> + <location col="3" row="10" colspan="1" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="2" row="11" /> + <location col="3" row="11" colspan="1" /> + </attr> + + <attr name="align" type="input"> + <text>align</text> + <textlocation col="2" row="12" /> + <location col="3" row="12" colspan="1" /> + </attr> + + <attr name="border" type="input"> + <text>border</text> + <textlocation col="2" row="13" /> + <location col="3" row="13" colspan="1" /> + </attr> + + <attr name="hspace" type="input"> + <text>hspace</text> + <textlocation col="2" row="14" /> + <location col="3" row="14" colspan="1" /> + </attr> + + <attr name="vspace" type="input"> + <text>vspace</text> + <textlocation col="2" row="15" /> + <location col="3" row="15" colspan="1" /> + </attr> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="di" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="param" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/ol.tag b/quanta/data/dtep/html5/ol.tag new file mode 100644 index 00000000..afd6bcc2 --- /dev/null +++ b/quanta/data/dtep/html5/ol.tag @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="ol" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="li" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/optgroup.tag b/quanta/data/dtep/html5/optgroup.tag new file mode 100644 index 00000000..82452057 --- /dev/null +++ b/quanta/data/dtep/html5/optgroup.tag @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="optgroup" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="disabled" type="check"> + <text>disabled</text> + <location col="2" row="0" colspan="1" /> + <tooltip>Disable the element</tooltip> + </attr> + + <attr name="label" type="input"> + <text>label</text> + <textlocation col="0" row="1" colspan="1" /> + <location col="1" row="1" colspan="1" /> + </attr> + +<children> +<child name="option" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/option.tag b/quanta/data/dtep/html5/option.tag new file mode 100644 index 00000000..ea08093f --- /dev/null +++ b/quanta/data/dtep/html5/option.tag @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="option" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="value" type="input"> + <text>value</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" /> + </attr> + + <attr name="selected" type="list"> + <text>Selected</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" /> + <items> + <item>selected</item> + </items> + </attr> + + <attr name="disabled" type="list"> + <text>Disabled</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" /> + <items> + <item>disabled</item> + </items> + </attr> + + <attr name="label" type="input"> + <text>label</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" /> + </attr> + + <stoppingtags> + <stoppingtag name="option" /> + </stoppingtags> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/p.tag b/quanta/data/dtep/html5/p.tag new file mode 100644 index 00000000..21bcfe71 --- /dev/null +++ b/quanta/data/dtep/html5/p.tag @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="p" hasCore="1" hasI18n="1" hasScript="1"> + + <stoppingtags> + <stoppingtag name="p" /> + <stoppingtag name="li" /> + <stoppingtag name="td" /> + <stoppingtag name="tr" /> + <stoppingtag name="th" /> + <stoppingtag name="dt" /> + <stoppingtag name="dd" /> + </stoppingtags> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/param.tag b/quanta/data/dtep/html5/param.tag new file mode 100644 index 00000000..4211b9c2 --- /dev/null +++ b/quanta/data/dtep/html5/param.tag @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="param" single="1"> + + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + <items> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>audio/basic</item> + <item>text/html</item> + <item>text/css</item> + </items> + </attr> + + <attr name="value" type="input"> + <text>value</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="1" /> + </attr> + + <attr name="valuetype" type="list"> + <text>valuetype</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + <items> + <item>data</item> + <item>ref</item> + <item>object</item> + </items> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/picture.tag b/quanta/data/dtep/html5/picture.tag new file mode 100644 index 00000000..86591f24 --- /dev/null +++ b/quanta/data/dtep/html5/picture.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="picture" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/pre.tag b/quanta/data/dtep/html5/pre.tag new file mode 100644 index 00000000..89855428 --- /dev/null +++ b/quanta/data/dtep/html5/pre.tag @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="pre" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="xml:space" type="list"> + <text>xml:space</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + <items> + <item>preserve</item> + </items> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="span" /> +<child name="strong" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/q.tag b/quanta/data/dtep/html5/q.tag new file mode 100644 index 00000000..99f030a1 --- /dev/null +++ b/quanta/data/dtep/html5/q.tag @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="q" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cite" type="input"> + <text>cite</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rb.tag b/quanta/data/dtep/html5/rb.tag new file mode 100644 index 00000000..6c465cd9 --- /dev/null +++ b/quanta/data/dtep/html5/rb.tag @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rb" hasCore="1" hasI18n="1" hasScript="1"> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rbc.tag b/quanta/data/dtep/html5/rbc.tag new file mode 100644 index 00000000..fbd5b7ec --- /dev/null +++ b/quanta/data/dtep/html5/rbc.tag @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rbc" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="rb" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rp.tag b/quanta/data/dtep/html5/rp.tag new file mode 100644 index 00000000..36df8a3a --- /dev/null +++ b/quanta/data/dtep/html5/rp.tag @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rp" hasCore="1" hasI18n="1" hasScript="1"> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rt.tag b/quanta/data/dtep/html5/rt.tag new file mode 100644 index 00000000..da0098ed --- /dev/null +++ b/quanta/data/dtep/html5/rt.tag @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rt" hasCore="1" hasI18n="1" hasScript="1"> + +<attr name="rbspan" type="input" /> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rtc.tag b/quanta/data/dtep/html5/rtc.tag new file mode 100644 index 00000000..97c21176 --- /dev/null +++ b/quanta/data/dtep/html5/rtc.tag @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rtc" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="rt" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/ruby.tag b/quanta/data/dtep/html5/ruby.tag new file mode 100644 index 00000000..d133114f --- /dev/null +++ b/quanta/data/dtep/html5/ruby.tag @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="ruby" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="rb" /> +<child name="rt" /> +<child name="rp" /> +<child name="rtc" /> +<child name="rbc" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/samp.tag b/quanta/data/dtep/html5/samp.tag new file mode 100644 index 00000000..6e5b3662 --- /dev/null +++ b/quanta/data/dtep/html5/samp.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="samp" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/script.tag b/quanta/data/dtep/html5/script.tag new file mode 100644 index 00000000..2dccc895 --- /dev/null +++ b/quanta/data/dtep/html5/script.tag @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="script"> + + <attr name="type" type="list"> + <text>Type</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + <items> + <item>text/html</item> + <item>text/css</item> + <item>text/php</item> + <item>text/javascript</item> + <item>application/x-javascript</item> + </items> + </attr> + + <attr name="src" type="url"> + <text>Source</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="charset" type="input"> + <text>Charset</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="defer" type="check"> + <text>Defer (script execution may wait)</text> + <location col="0" row="3" colspan="2" /> + </attr> + + <attr name="xml:space" type="list"> + <text>xml:space</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + <items> + <item>preserve</item> + </items> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/section.tag b/quanta/data/dtep/html5/section.tag new file mode 100644 index 00000000..1d13fcc6 --- /dev/null +++ b/quanta/data/dtep/html5/section.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="section" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/select.tag b/quanta/data/dtep/html5/select.tag new file mode 100644 index 00000000..c3143fc2 --- /dev/null +++ b/quanta/data/dtep/html5/select.tag @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="select" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="multiple" type="check"> + <text>multiple</text> + <location col="1" row="0" /> + </attr> + + <attr name="disabled" type="check"> + <text>disabled</text> + <location col="1" row="1" /> + </attr> + + <attr name="tabindex" type="input"> + <text>tabindex</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" /> + </attr> + + <attr name="size" type="input"> + <text>size</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" /> + </attr> + + <attr name="onfocus" type="input"> + <text>onfocus</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" /> + </attr> + + <attr name="onblur" type="input"> + <text>onblur</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" /> + </attr> + + <attr name="onchange" type="input"> + <text>onchange</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" /> + </attr> + + <stoppingtags> + <stoppingtag name="select" /> + </stoppingtags> + +<children> +<child name="optgroup" /> +<child name="option" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/small.tag b/quanta/data/dtep/html5/small.tag new file mode 100644 index 00000000..92871b73 --- /dev/null +++ b/quanta/data/dtep/html5/small.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="small" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/source.tag b/quanta/data/dtep/html5/source.tag new file mode 100644 index 00000000..306db28b --- /dev/null +++ b/quanta/data/dtep/html5/source.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="source" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/span.tag b/quanta/data/dtep/html5/span.tag new file mode 100644 index 00000000..73b4e932 --- /dev/null +++ b/quanta/data/dtep/html5/span.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="span" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/strong.tag b/quanta/data/dtep/html5/strong.tag new file mode 100644 index 00000000..33ecd419 --- /dev/null +++ b/quanta/data/dtep/html5/strong.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/style.tag b/quanta/data/dtep/html5/style.tag new file mode 100644 index 00000000..d3c16a0e --- /dev/null +++ b/quanta/data/dtep/html5/style.tag @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="style" hasI18n="1"> + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + <items> + <item>text/css</item> + </items> + </attr> + + <attr name="media" type="list"> + <text>media</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + <items> + <item>screen</item> + <item>tty</item> + <item>tv</item> + <item>projection</item> + <item>handheld</item> + <item>print</item> + <item>braille</item> + <item>aural</item> + <item>all</item> + </items> + </attr> + + <attr name="title" type="input"> + <text>title</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="xml:space" type="list"> + <text>xml:space</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + <items> + <item>preserve</item> + </items> + </attr> + + <attr name="defer" type="check"> + <text>defer</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2" /> + </attr> + <children> + <child name="#text" /> + </children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/sub.tag b/quanta/data/dtep/html5/sub.tag new file mode 100644 index 00000000..33e41e0c --- /dev/null +++ b/quanta/data/dtep/html5/sub.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="sub" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/sup.tag b/quanta/data/dtep/html5/sup.tag new file mode 100644 index 00000000..441688dd --- /dev/null +++ b/quanta/data/dtep/html5/sup.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="sup" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/svg.tag b/quanta/data/dtep/html5/svg.tag new file mode 100644 index 00000000..b08e5913 --- /dev/null +++ b/quanta/data/dtep/html5/svg.tag @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="svg" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="shape" type="list"> + <text>shape</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2"/> + <items> + <item>rect</item> + <item>circle</item> + <item>poly</item> + <item>default</item> + </items> + </attr> + + <attr name="coords" type="text"> + <text>coords</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2"/> + </attr> + + <attr name="href" type="url"> + <text>href</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2"/> + </attr> + + <attr name="accesskey" type="input"> + <text>accesskey</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="1" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2"/> + </attr> + + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/table.tag b/quanta/data/dtep/html5/table.tag new file mode 100644 index 00000000..97d9b2be --- /dev/null +++ b/quanta/data/dtep/html5/table.tag @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="table" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>Use % for percent or it will set pixels</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="cellspacing" type="input"> + <text>cellspacing</text> + <textlocation col="2" row="0" /> + <location col="3" row="0" /> + </attr> + + <attr name="border" type="input"> + <text>border</text> + <textlocation col="0" row="1" /> + <tooltip>Set in pixels</tooltip> + <location col="1" row="1" /> + </attr> + + <attr name="cellpadding" type="input"> + <text>cellpadding</text> + <textlocation col="2" row="1" /> + <location col="3" row="1" /> + </attr> + + <attr name="frame" type="list"> + <text>frame</text> + <textlocation col="0" row="2" /> + <items> + <item>above</item> + <item>below</item> + <item>border</item> + <item>box</item> + <item>hsides</item> + <item>lhs</item> + <item>rhs</item> + <item>void</item> + <item>vsides</item> + </items> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="rules" type="list"> + <text>rules</text> + <textlocation col="0" row="3" /> + <items> + <item>none</item> + <item>groups</item> + <item>rows</item> + <item>cols</item> + <item>all</item> + </items> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="summary" type="input"> + <text>summary</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2"/> + </attr> + +<children> +<child name="caption" /> +<child name="col" /> +<child name="colgroup" /> +<child name="thead" /> +<child name="tfoot" /> +<child name="tbody" /> +<child name="tr" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/tbody.tag b/quanta/data/dtep/html5/tbody.tag new file mode 100644 index 00000000..a59a4a5b --- /dev/null +++ b/quanta/data/dtep/html5/tbody.tag @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="tbody" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="0" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="1" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="1" colspan="1" /> + </attr> + + <attr name="char" type="input" /> + <attr name="charoff" type="input" /> + +<children> +<child name="tr" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/td.tag b/quanta/data/dtep/html5/td.tag new file mode 100644 index 00000000..67a3efd6 --- /dev/null +++ b/quanta/data/dtep/html5/td.tag @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="td" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>use % for percent or it will set pixels</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="colspan" type="input"> + <text>colspan</text> + <textlocation col="2" row="0" /> + <location col="3" row="0" /> + </attr> + + <attr name="rowspan" type="input"> + <text>rowspan</text> + <textlocation col="2" row="1" /> + <location col="3" row="1" /> + </attr> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="2" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="2" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="2" row="2" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="3" row="2" colspan="1" /> + </attr> + + <attr name="headers" type="input" /> + + <attr name="abbr" type="input" /> + + <attr name="scope" type="list"> + <items> + <item>row</item> + <item>col</item> + <item>rowgroup</item> + <item>colgroup</item> + </items> + </attr> + + <attr name="axis" type="input" /> + + <attr name="char" type="input" /> + + <attr name="charoff" type="input" /> + + <stoppingtags> + <stoppingtag name="td" /> + <stoppingtag name="tr" /> + <stoppingtag name="th" /> + </stoppingtags> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/textarea.tag b/quanta/data/dtep/html5/textarea.tag new file mode 100644 index 00000000..5ede1af6 --- /dev/null +++ b/quanta/data/dtep/html5/textarea.tag @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="textarea" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cols" type="input"> + <text>cols</text> + <textlocation col="0" row="0" colspan="1" /> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="rows" type="input"> + <text>rows</text> + <textlocation col="2" row="1" colspan="1" /> + <location col="3" row="1" colspan="1" /> + </attr> + + <attr name="disabled" type="check"> + <text>disabled</text> + <location col="0" row="2" colspan="2" /> + </attr> + + <attr name="readonly" type="check"> + <text>readonly</text> + <location col="0" row="3" colspan="2" /> + </attr> + + <attr name="onselect" type="input"> + <text>onselect</text> + <textlocation col="2" row="4" colspan="1" /> + <location col="3" row="4" colspan="1" /> + </attr> + + <attr name="onchange" type="input"> + <text>onchange</text> + <textlocation col="2" row="5" colspan="1" /> + <location col="3" row="5" colspan="1" /> + </attr> + <children> + <child name="#text" /> + </children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/tfoot.tag b/quanta/data/dtep/html5/tfoot.tag new file mode 100644 index 00000000..7ddd2033 --- /dev/null +++ b/quanta/data/dtep/html5/tfoot.tag @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="tfoot" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="0" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="1" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="1" colspan="1" /> + </attr> + + <attr name="char" type="input" /> + <attr name="charoff" type="input" /> + +<children> +<child name="tr" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/th.tag b/quanta/data/dtep/html5/th.tag new file mode 100644 index 00000000..a0e8acac --- /dev/null +++ b/quanta/data/dtep/html5/th.tag @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="th" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>use % for percent or it will set pixels</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="colspan" type="input"> + <text>colspan</text> + <textlocation col="2" row="0" /> + <location col="3" row="0" /> + </attr> + + <attr name="rowspan" type="input"> + <text>rowspan</text> + <textlocation col="2" row="1" /> + <location col="3" row="1" /> + </attr> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="2" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="2" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="2" row="2" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="3" row="2" colspan="1" /> + </attr> + + <attr name="headers" type="input" /> + + <attr name="abbr" type="input" /> + + <attr name="scope" type="list"> + <items> + <item>row</item> + <item>col</item> + <item>rowgroup</item> + <item>colgroup</item> + </items> + </attr> + + <attr name="axis" type="input" /> + + <attr name="char" type="input" /> + + <attr name="charoff" type="input" /> + + <stoppingtags> + <stoppingtag name="td" /> + <stoppingtag name="tr" /> + <stoppingtag name="th" /> + </stoppingtags> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/thead.tag b/quanta/data/dtep/html5/thead.tag new file mode 100644 index 00000000..b77c577a --- /dev/null +++ b/quanta/data/dtep/html5/thead.tag @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="thead" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="0" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="1" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="1" colspan="1" /> + </attr> + + <attr name="char" type="input" /> + <attr name="charoff" type="input" /> + +<children> +<child name="tr" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/time.tag b/quanta/data/dtep/html5/time.tag new file mode 100644 index 00000000..aa214373 --- /dev/null +++ b/quanta/data/dtep/html5/time.tag @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="del" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="datetime" type="input"> + <text>datetime</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/title.tag b/quanta/data/dtep/html5/title.tag new file mode 100644 index 00000000..4c9f61b7 --- /dev/null +++ b/quanta/data/dtep/html5/title.tag @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="title" hasI18n="1"> + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> +</attr> +<children> + <child name="#text" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/tr.tag b/quanta/data/dtep/html5/tr.tag new file mode 100644 index 00000000..990b7415 --- /dev/null +++ b/quanta/data/dtep/html5/tr.tag @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="tr" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="0" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="1" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="1" colspan="1" /> + </attr> + + <attr name="char" type="input" /> + <attr name="charoff" type="input" /> + + <stoppingtags> + <stoppingtag name="tr" /> + <stoppingtag name="tfoot" /> + </stoppingtags> + +<children> +<child name="th" /> +<child name="td" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/track.tag b/quanta/data/dtep/html5/track.tag new file mode 100644 index 00000000..6cd3561a --- /dev/null +++ b/quanta/data/dtep/html5/track.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="track" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/tt.tag b/quanta/data/dtep/html5/tt.tag new file mode 100644 index 00000000..78bba25d --- /dev/null +++ b/quanta/data/dtep/html5/tt.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="tt" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/u.tag b/quanta/data/dtep/html5/u.tag new file mode 100644 index 00000000..56f60724 --- /dev/null +++ b/quanta/data/dtep/html5/u.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="u" hasCore="1" hasI18n="1" hasScript="1" scope="word"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/ul.tag b/quanta/data/dtep/html5/ul.tag new file mode 100644 index 00000000..2f9fd1be --- /dev/null +++ b/quanta/data/dtep/html5/ul.tag @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="ul" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="li" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/var.tag b/quanta/data/dtep/html5/var.tag new file mode 100644 index 00000000..10503a11 --- /dev/null +++ b/quanta/data/dtep/html5/var.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="var" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/video.tag b/quanta/data/dtep/html5/video.tag new file mode 100644 index 00000000..fc212862 --- /dev/null +++ b/quanta/data/dtep/html5/video.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="video" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/wbr.tag b/quanta/data/dtep/html5/wbr.tag new file mode 100644 index 00000000..529cf947 --- /dev/null +++ b/quanta/data/dtep/html5/wbr.tag @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="wbr" hasCore="1" single="1" /> +</TAGS> diff --git a/quanta/data/dtep/wml-1-2/common.tag b/quanta/data/dtep/wml-1-2/common.tag index 7be9453e..c59bda3c 100644 --- a/quanta/data/dtep/wml-1-2/common.tag +++ b/quanta/data/dtep/wml-1-2/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> </tag> diff --git a/quanta/data/dtep/xhtml-basic/common.tag b/quanta/data/dtep/xhtml-basic/common.tag index 25baba50..b8418b20 100644 --- a/quanta/data/dtep/xhtml-basic/common.tag +++ b/quanta/data/dtep/xhtml-basic/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="title" type="input"> </attr> diff --git a/quanta/data/dtep/xhtml-frameset/common.tag b/quanta/data/dtep/xhtml-frameset/common.tag index 72c0d679..e0148338 100644 --- a/quanta/data/dtep/xhtml-frameset/common.tag +++ b/quanta/data/dtep/xhtml-frameset/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/xhtml-strict/common.tag b/quanta/data/dtep/xhtml-strict/common.tag index e52f08ea..cb7e6e30 100644 --- a/quanta/data/dtep/xhtml-strict/common.tag +++ b/quanta/data/dtep/xhtml-strict/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/xhtml/common.tag b/quanta/data/dtep/xhtml/common.tag index 1fd94db2..c8f53e0b 100644 --- a/quanta/data/dtep/xhtml/common.tag +++ b/quanta/data/dtep/xhtml/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/xhtml11/common.tag b/quanta/data/dtep/xhtml11/common.tag index 0ff1796a..a380f05b 100644 --- a/quanta/data/dtep/xhtml11/common.tag +++ b/quanta/data/dtep/xhtml11/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/icons/22x22/CMakeLists.txt b/quanta/data/icons/22x22/CMakeLists.txt index 896d99a1..18584447 100644 --- a/quanta/data/icons/22x22/CMakeLists.txt +++ b/quanta/data/icons/22x22/CMakeLists.txt @@ -10,61 +10,92 @@ ################################################# install( FILES - ball.png check_clear.png check_grey.png - check.png css.png date.png debug_leap.png - debug_run.png debug_skip.png debug_stepinto.png - debug_stepout.png debug_stepover.png - div_center.png div_justify.png div_left.png - div_right.png font_dec.png font_inc.png form.png - frame.png ftab.png ftpclient.png lineedit.png + ball.png button.png check_clear.png + check_grey.png check.png css.png + date.png debug_leap.png debug_run.png + debug_skip.png debug_stepinto.png debug_stepout.png + debug_stepover.png div_center.png div_justify.png + div_left.png div_right.png font_dec.png + font_inc.png form.png frame.png + ftab.png ftpclient.png html5_abbr.png + html5_address.png html5_a.png html5_area.png + html5_article.png html5_aside.png html5_audio.png + html5_base.png html5_bdi.png html5_bdo.png + html5_big.png html5_blockquote.png html5_body.png + html5_b.png html5_br.png html5_caption.png + html5_center.png html5_cite.png html5_code.png + html5_colgroup.png html5_col.png html5_com.png + html5_data.png html5_dd.png html5_del.png + html5_details.png html5_dir.png html5_div.png + html5_dl.png html5_dt.png html5_DT.png + html5_embed.png html5_figcaption.png html5_figure.png + html5_font.png html5_footer.png html5_h1.png + html5_h2.png html5_h3.png html5_h4.png + html5_h5.png html5_h6.png html5_header.png + html5_head.png html5_hr.png html5_html.png + html5_img.png html5_ins.png html5_i.png + html5_kbd.png html5_link.png html5_li.png + html5_main.png html5_map.png html5_mark.png + html5_meta.png html5_nav.png html5_noscript.png + html5_object.png html5_ol.png html5_picture.png + html5_p.png html5_pre.png html5_q.png + html5_rp.png html5_rt.png html5_ruby.png + html5_samp.png html5_script.png html5_section.png + html5_small.png html5_source.png html5_span.png + html5_strong.png html5_style.png html5_sub.png + html5_sup.png html5_svg.png html5_table.png + html5_tbody.png html5_td.png html5_tfoot.png + html5_thead.png html5_th.png html5_time.png + html5_title.png html5_track.png html5_tr.png + html5_ul.png html5_u.png html5_var.png + html5_video.png html5_wbr.png lineedit.png linepas.png output_win.png preview.png ptab.png quick_list.png quick-screenshot.png quick_start.png quick_table.png radio.png - replace.png reset.png select.png submit.png - button.png table_data.png table_head.png - tag_access.png tag_all.png tag_anyAttribute.png - tag_any.png tag_a.png tag_appInfo.png - tag_attributeGroup.png tag_attribute.png + replace.png reset.png select.png + submit.png table_data.png table_head.png + tag_access.png tag_all.png tag_amp.png + tag_anyAttribute.png tag_any.png tag_a.png + tag_appInfo.png tag_attributeGroup.png tag_attribute.png tag_attr.png tag_a_url.png tag_bold.png tag_br.png tag_caption.png tag_card.png - tag_chapter.png tag_choice.png tag_comm.png - tag_complexContent.png tag_complexType.png + tag_cdata.png tag_chapter.png tag_choice.png + tag_comm.png tag_complexContent.png tag_complexType.png tag_dd.png tag_dl.png tag_documenation.png - tag_do.png tag_dt.png tag_element.png tag_em.png - tag_example.png tag_extension.png tag_field.png - tag_font_base.png tag_font.png tag_footnote.png - tag_footnoteref.png tag_fractionDigits.png + tag_do.png tag_dt.png tag_element.png + tag_em.png tag_example.png tag_extension.png + tag_field.png tag_font_base.png tag_font.png + tag_footnote.png tag_footnoteref.png tag_fractionDigits.png tag_go.png tag_group.png tag_guimenuitem.png tag_guimenu.png tag_guisubmenu.png tag_h1.png - tag_h2.png tag_h3.png tag_h4.png tag_h5.png - tag_head.png tag_hr.png tag_imagedata.png - tag_image.png tag_import.png tag_include.png - tag_informalexample.png tag_inlinemediaobject.png + tag_h2.png tag_h3.png tag_h4.png + tag_h5.png tag_head.png tag_hr.png + tag_imagedata.png tag_image.png tag_import.png + tag_include.png tag_informalexample.png tag_inlinemediaobject.png tag_i.png tag_keycap.png tag_keycombo.png tag_key.png tag_keyref.png tag_label.png tag_link.png tag_li.png tag_listitem.png tag_list.png tag_loc.png tag_mail.png - tag_member.png tag_menuchoice.png - tag_menu.png tag_meta.png tag_misc.png - tag_nbsp.png tag_noop.png tag_notation.png - tag_ol.png tag_onevent.png tag_para.png - tag_postfield.png tag_p.png tag_pre.png - tag_procedure.png tag_redefine.png - tag_restriction.png tag_schema.png - tag_screenshotinfo.png tag_screenshot.png - tag_sect1.png tag_sect2.png tag_sect3.png - tag_sect4.png tag_sect5.png tag_selector.png - tag_sequence.png tag_setvar.png tag_shortcut.png - tag_simpleContent.png tag_simpleType.png - tag_step.png tag_sub.png tag_substeps.png - tag_sup.png tag_table_body.png tag_table.png - tag_table_row.png tag_tag.png tag_tbody.png - tag_td.png tag_term.png tag_tgroup.png tag_th.png - tag_title.png tag_tr.png tag_ulink.png tag_ul.png + tag_member.png tag_menuchoice.png tag_menu.png + tag_meta.png tag_misc.png tag_nbsp.png + tag_noop.png tag_notation.png tag_ol.png + tag_onevent.png tag_para.png tag_postfield.png + tag_p.png tag_pre.png tag_procedure.png + tag_redefine.png tag_restriction.png tag_schema.png + tag_screenshotinfo.png tag_screenshot.png tag_sect1.png + tag_sect2.png tag_sect3.png tag_sect4.png + tag_sect5.png tag_selector.png tag_sequence.png + tag_setvar.png tag_shortcut.png tag_simpleContent.png + tag_simpleType.png tag_step.png tag_sub.png + tag_substeps.png tag_sup.png tag_table_body.png + tag_table.png tag_table_row.png tag_tag.png + tag_tbody.png tag_td.png tag_term.png + tag_tgroup.png tag_th.png tag_title.png + tag_tr.png tag_ulink.png tag_ul.png tag_union.png tag_unique.png tag_u.png - tag_variablelist.png tag_varlistentry.png - tag_varlistitem.png tag_what.png tag_wml.png - tag_xref.png textarea.png tree_win.png ttab.png - view_text.png vpl.png vpl_text.png xmlval.png - xsltproc.png tag_amp.png tag_cdata.png + tag_variablelist.png tag_varlistentry.png tag_varlistitem.png + tag_what.png tag_wml.png tag_xref.png + textarea.png tree_win.png ttab.png + view_text.png vpl.png vpl_text.png + xmlval.png xsltproc.png DESTINATION ${DATA_INSTALL_DIR}/quanta/toolbar ) diff --git a/quanta/data/icons/22x22/Makefile.am b/quanta/data/icons/22x22/Makefile.am index 7eb10c7d..4cd1e390 100644 --- a/quanta/data/icons/22x22/Makefile.am +++ b/quanta/data/icons/22x22/Makefile.am @@ -1,5 +1,6 @@ quantadir = ${quanta_datadir}/toolbar quanta_DATA = ball.png \ +button.png \ check_clear.png \ check_grey.png \ check.png \ @@ -21,6 +22,99 @@ form.png \ frame.png \ ftab.png \ ftpclient.png \ +html5_abbr.png \ +html5_address.png \ +html5_a.png \ +html5_area.png \ +html5_article.png \ +html5_aside.png \ +html5_audio.png \ +html5_base.png \ +html5_bdi.png \ +html5_bdo.png \ +html5_big.png \ +html5_blockquote.png \ +html5_body.png \ +html5_b.png \ +html5_br.png \ +html5_caption.png \ +html5_center.png \ +html5_cite.png \ +html5_code.png \ +html5_colgroup.png \ +html5_col.png \ +html5_com.png \ +html5_data.png \ +html5_dd.png \ +html5_del.png \ +html5_details.png \ +html5_dir.png \ +html5_div.png \ +html5_dl.png \ +html5_dt.png \ +html5_DT.png \ +html5_embed.png \ +html5_figcaption.png \ +html5_figure.png \ +html5_font.png \ +html5_footer.png \ +html5_h1.png \ +html5_h2.png \ +html5_h3.png \ +html5_h4.png \ +html5_h5.png \ +html5_h6.png \ +html5_header.png \ +html5_head.png \ +html5_hr.png \ +html5_html.png \ +html5_img.png \ +html5_ins.png \ +html5_i.png \ +html5_kbd.png \ +html5_link.png \ +html5_li.png \ +html5_main.png \ +html5_map.png \ +html5_mark.png \ +html5_meta.png \ +html5_nav.png \ +html5_noscript.png \ +html5_object.png \ +html5_ol.png \ +html5_picture.png \ +html5_p.png \ +html5_pre.png \ +html5_q.png \ +html5_rp.png \ +html5_rt.png \ +html5_ruby.png \ +html5_samp.png \ +html5_script.png \ +html5_section.png \ +html5_small.png \ +html5_source.png \ +html5_span.png \ +html5_strong.png \ +html5_style.png \ +html5_sub.png \ +html5_sup.png \ +html5_svg.png \ +html5_table.png \ +html5_tbody.png \ +html5_td.png \ +html5_tfoot.png \ +html5_thead.png \ +html5_th.png \ +html5_time.png \ +html5_title.png \ +html5_track.png \ +html5_tr.png \ +html5_ul.png \ +html5_u.png \ +html5_var.png \ +html5_video.png \ +html5_wbr.png \ lineedit.png \ linepas.png \ output_win.png \ @@ -35,11 +129,11 @@ replace.png \ reset.png \ select.png \ submit.png \ -button.png \ table_data.png \ table_head.png \ tag_access.png \ tag_all.png \ +tag_amp.png \ tag_anyAttribute.png \ tag_any.png \ tag_a.png \ @@ -52,6 +146,7 @@ tag_bold.png \ tag_br.png \ tag_caption.png \ tag_card.png \ +tag_cdata.png \ tag_chapter.png \ tag_choice.png \ tag_comm.png \ @@ -166,7 +261,4 @@ view_text.png \ vpl.png \ vpl_text.png \ xmlval.png \ -xsltproc.png \ -tag_amp.png \ -tag_cdata.png - +xsltproc.png diff --git a/quanta/data/icons/22x22/html5_DT.png b/quanta/data/icons/22x22/html5_DT.png Binary files differnew file mode 100644 index 00000000..a1453930 --- /dev/null +++ b/quanta/data/icons/22x22/html5_DT.png diff --git a/quanta/data/icons/22x22/html5_a.png b/quanta/data/icons/22x22/html5_a.png Binary files differnew file mode 100644 index 00000000..e9ff6a72 --- /dev/null +++ b/quanta/data/icons/22x22/html5_a.png diff --git a/quanta/data/icons/22x22/html5_abbr.png b/quanta/data/icons/22x22/html5_abbr.png Binary files differnew file mode 100644 index 00000000..42af2587 --- /dev/null +++ b/quanta/data/icons/22x22/html5_abbr.png diff --git a/quanta/data/icons/22x22/html5_address.png b/quanta/data/icons/22x22/html5_address.png Binary files differnew file mode 100644 index 00000000..75fc33a9 --- /dev/null +++ b/quanta/data/icons/22x22/html5_address.png diff --git a/quanta/data/icons/22x22/html5_area.png b/quanta/data/icons/22x22/html5_area.png Binary files differnew file mode 100644 index 00000000..caad509c --- /dev/null +++ b/quanta/data/icons/22x22/html5_area.png diff --git a/quanta/data/icons/22x22/html5_article.png b/quanta/data/icons/22x22/html5_article.png Binary files differnew file mode 100644 index 00000000..c2aa738f --- /dev/null +++ b/quanta/data/icons/22x22/html5_article.png diff --git a/quanta/data/icons/22x22/html5_aside.png b/quanta/data/icons/22x22/html5_aside.png Binary files differnew file mode 100644 index 00000000..da321bee --- /dev/null +++ b/quanta/data/icons/22x22/html5_aside.png diff --git a/quanta/data/icons/22x22/html5_audio.png b/quanta/data/icons/22x22/html5_audio.png Binary files differnew file mode 100644 index 00000000..e2fd30dc --- /dev/null +++ b/quanta/data/icons/22x22/html5_audio.png diff --git a/quanta/data/icons/22x22/html5_b.png b/quanta/data/icons/22x22/html5_b.png Binary files differnew file mode 100644 index 00000000..29c3c4cc --- /dev/null +++ b/quanta/data/icons/22x22/html5_b.png diff --git a/quanta/data/icons/22x22/html5_base.png b/quanta/data/icons/22x22/html5_base.png Binary files differnew file mode 100644 index 00000000..abc2013b --- /dev/null +++ b/quanta/data/icons/22x22/html5_base.png diff --git a/quanta/data/icons/22x22/html5_bdi.png b/quanta/data/icons/22x22/html5_bdi.png Binary files differnew file mode 100644 index 00000000..78cdbcad --- /dev/null +++ b/quanta/data/icons/22x22/html5_bdi.png diff --git a/quanta/data/icons/22x22/html5_bdo.png b/quanta/data/icons/22x22/html5_bdo.png Binary files differnew file mode 100644 index 00000000..ab8a5b10 --- /dev/null +++ b/quanta/data/icons/22x22/html5_bdo.png diff --git a/quanta/data/icons/22x22/html5_big.png b/quanta/data/icons/22x22/html5_big.png Binary files differnew file mode 100644 index 00000000..79ad4075 --- /dev/null +++ b/quanta/data/icons/22x22/html5_big.png diff --git a/quanta/data/icons/22x22/html5_blockquote.png b/quanta/data/icons/22x22/html5_blockquote.png Binary files differnew file mode 100644 index 00000000..9e50c2e1 --- /dev/null +++ b/quanta/data/icons/22x22/html5_blockquote.png diff --git a/quanta/data/icons/22x22/html5_body.png b/quanta/data/icons/22x22/html5_body.png Binary files differnew file mode 100644 index 00000000..f48cbf42 --- /dev/null +++ b/quanta/data/icons/22x22/html5_body.png diff --git a/quanta/data/icons/22x22/html5_br.png b/quanta/data/icons/22x22/html5_br.png Binary files differnew file mode 100644 index 00000000..cd047a22 --- /dev/null +++ b/quanta/data/icons/22x22/html5_br.png diff --git a/quanta/data/icons/22x22/html5_caption.png b/quanta/data/icons/22x22/html5_caption.png Binary files differnew file mode 100644 index 00000000..b5d2d71a --- /dev/null +++ b/quanta/data/icons/22x22/html5_caption.png diff --git a/quanta/data/icons/22x22/html5_center.png b/quanta/data/icons/22x22/html5_center.png Binary files differnew file mode 100644 index 00000000..a830104a --- /dev/null +++ b/quanta/data/icons/22x22/html5_center.png diff --git a/quanta/data/icons/22x22/html5_cite.png b/quanta/data/icons/22x22/html5_cite.png Binary files differnew file mode 100644 index 00000000..ae7cabac --- /dev/null +++ b/quanta/data/icons/22x22/html5_cite.png diff --git a/quanta/data/icons/22x22/html5_code.png b/quanta/data/icons/22x22/html5_code.png Binary files differnew file mode 100644 index 00000000..880e08fd --- /dev/null +++ b/quanta/data/icons/22x22/html5_code.png diff --git a/quanta/data/icons/22x22/html5_col.png b/quanta/data/icons/22x22/html5_col.png Binary files differnew file mode 100644 index 00000000..e7d926d8 --- /dev/null +++ b/quanta/data/icons/22x22/html5_col.png diff --git a/quanta/data/icons/22x22/html5_colgroup.png b/quanta/data/icons/22x22/html5_colgroup.png Binary files differnew file mode 100644 index 00000000..ea7d23d0 --- /dev/null +++ b/quanta/data/icons/22x22/html5_colgroup.png diff --git a/quanta/data/icons/22x22/html5_com.png b/quanta/data/icons/22x22/html5_com.png Binary files differnew file mode 100644 index 00000000..244fd8f2 --- /dev/null +++ b/quanta/data/icons/22x22/html5_com.png diff --git a/quanta/data/icons/22x22/html5_data.png b/quanta/data/icons/22x22/html5_data.png Binary files differnew file mode 100644 index 00000000..eae99c74 --- /dev/null +++ b/quanta/data/icons/22x22/html5_data.png diff --git a/quanta/data/icons/22x22/html5_dd.png b/quanta/data/icons/22x22/html5_dd.png Binary files differnew file mode 100644 index 00000000..958ada02 --- /dev/null +++ b/quanta/data/icons/22x22/html5_dd.png diff --git a/quanta/data/icons/22x22/html5_del.png b/quanta/data/icons/22x22/html5_del.png Binary files differnew file mode 100644 index 00000000..228bbdaa --- /dev/null +++ b/quanta/data/icons/22x22/html5_del.png diff --git a/quanta/data/icons/22x22/html5_details.png b/quanta/data/icons/22x22/html5_details.png Binary files differnew file mode 100644 index 00000000..81c02d37 --- /dev/null +++ b/quanta/data/icons/22x22/html5_details.png diff --git a/quanta/data/icons/22x22/html5_dir.png b/quanta/data/icons/22x22/html5_dir.png Binary files differnew file mode 100644 index 00000000..1c21f7e9 --- /dev/null +++ b/quanta/data/icons/22x22/html5_dir.png diff --git a/quanta/data/icons/22x22/html5_div.png b/quanta/data/icons/22x22/html5_div.png Binary files differnew file mode 100644 index 00000000..03d700e3 --- /dev/null +++ b/quanta/data/icons/22x22/html5_div.png diff --git a/quanta/data/icons/22x22/html5_dl.png b/quanta/data/icons/22x22/html5_dl.png Binary files differnew file mode 100644 index 00000000..51e9cc6a --- /dev/null +++ b/quanta/data/icons/22x22/html5_dl.png diff --git a/quanta/data/icons/22x22/html5_dt.png b/quanta/data/icons/22x22/html5_dt.png Binary files differnew file mode 100644 index 00000000..87da2ffe --- /dev/null +++ b/quanta/data/icons/22x22/html5_dt.png diff --git a/quanta/data/icons/22x22/html5_embed.png b/quanta/data/icons/22x22/html5_embed.png Binary files differnew file mode 100644 index 00000000..6a684cba --- /dev/null +++ b/quanta/data/icons/22x22/html5_embed.png diff --git a/quanta/data/icons/22x22/html5_figcaption.png b/quanta/data/icons/22x22/html5_figcaption.png Binary files differnew file mode 100644 index 00000000..19204936 --- /dev/null +++ b/quanta/data/icons/22x22/html5_figcaption.png diff --git a/quanta/data/icons/22x22/html5_figure.png b/quanta/data/icons/22x22/html5_figure.png Binary files differnew file mode 100644 index 00000000..3d38ea0e --- /dev/null +++ b/quanta/data/icons/22x22/html5_figure.png diff --git a/quanta/data/icons/22x22/html5_font.png b/quanta/data/icons/22x22/html5_font.png Binary files differnew file mode 100644 index 00000000..4483a7e2 --- /dev/null +++ b/quanta/data/icons/22x22/html5_font.png diff --git a/quanta/data/icons/22x22/html5_footer.png b/quanta/data/icons/22x22/html5_footer.png Binary files differnew file mode 100644 index 00000000..73e6aefe --- /dev/null +++ b/quanta/data/icons/22x22/html5_footer.png diff --git a/quanta/data/icons/22x22/html5_h1.png b/quanta/data/icons/22x22/html5_h1.png Binary files differnew file mode 100644 index 00000000..7274abc7 --- /dev/null +++ b/quanta/data/icons/22x22/html5_h1.png diff --git a/quanta/data/icons/22x22/html5_h2.png b/quanta/data/icons/22x22/html5_h2.png Binary files differnew file mode 100644 index 00000000..f54219a4 --- /dev/null +++ b/quanta/data/icons/22x22/html5_h2.png diff --git a/quanta/data/icons/22x22/html5_h3.png b/quanta/data/icons/22x22/html5_h3.png Binary files differnew file mode 100644 index 00000000..08ee9d14 --- /dev/null +++ b/quanta/data/icons/22x22/html5_h3.png diff --git a/quanta/data/icons/22x22/html5_h4.png b/quanta/data/icons/22x22/html5_h4.png Binary files differnew file mode 100644 index 00000000..6a7880fb --- /dev/null +++ b/quanta/data/icons/22x22/html5_h4.png diff --git a/quanta/data/icons/22x22/html5_h5.png b/quanta/data/icons/22x22/html5_h5.png Binary files differnew file mode 100644 index 00000000..73f153d9 --- /dev/null +++ b/quanta/data/icons/22x22/html5_h5.png diff --git a/quanta/data/icons/22x22/html5_h6.png b/quanta/data/icons/22x22/html5_h6.png Binary files differnew file mode 100644 index 00000000..bcc80a1e --- /dev/null +++ b/quanta/data/icons/22x22/html5_h6.png diff --git a/quanta/data/icons/22x22/html5_head.png b/quanta/data/icons/22x22/html5_head.png Binary files differnew file mode 100644 index 00000000..d9aa4777 --- /dev/null +++ b/quanta/data/icons/22x22/html5_head.png diff --git a/quanta/data/icons/22x22/html5_header.png b/quanta/data/icons/22x22/html5_header.png Binary files differnew file mode 100644 index 00000000..62a99473 --- /dev/null +++ b/quanta/data/icons/22x22/html5_header.png diff --git a/quanta/data/icons/22x22/html5_hr.png b/quanta/data/icons/22x22/html5_hr.png Binary files differnew file mode 100644 index 00000000..a73694e7 --- /dev/null +++ b/quanta/data/icons/22x22/html5_hr.png diff --git a/quanta/data/icons/22x22/html5_html.png b/quanta/data/icons/22x22/html5_html.png Binary files differnew file mode 100644 index 00000000..c7c11c8c --- /dev/null +++ b/quanta/data/icons/22x22/html5_html.png diff --git a/quanta/data/icons/22x22/html5_i.png b/quanta/data/icons/22x22/html5_i.png Binary files differnew file mode 100644 index 00000000..860abe10 --- /dev/null +++ b/quanta/data/icons/22x22/html5_i.png diff --git a/quanta/data/icons/22x22/html5_img.png b/quanta/data/icons/22x22/html5_img.png Binary files differnew file mode 100644 index 00000000..271a9989 --- /dev/null +++ b/quanta/data/icons/22x22/html5_img.png diff --git a/quanta/data/icons/22x22/html5_ins.png b/quanta/data/icons/22x22/html5_ins.png Binary files differnew file mode 100644 index 00000000..849661ae --- /dev/null +++ b/quanta/data/icons/22x22/html5_ins.png diff --git a/quanta/data/icons/22x22/html5_kbd.png b/quanta/data/icons/22x22/html5_kbd.png Binary files differnew file mode 100644 index 00000000..06c8c9f0 --- /dev/null +++ b/quanta/data/icons/22x22/html5_kbd.png diff --git a/quanta/data/icons/22x22/html5_li.png b/quanta/data/icons/22x22/html5_li.png Binary files differnew file mode 100644 index 00000000..ec8bcf45 --- /dev/null +++ b/quanta/data/icons/22x22/html5_li.png diff --git a/quanta/data/icons/22x22/html5_link.png b/quanta/data/icons/22x22/html5_link.png Binary files differnew file mode 100644 index 00000000..88d956c3 --- /dev/null +++ b/quanta/data/icons/22x22/html5_link.png diff --git a/quanta/data/icons/22x22/html5_main.png b/quanta/data/icons/22x22/html5_main.png Binary files differnew file mode 100644 index 00000000..2dc24c6f --- /dev/null +++ b/quanta/data/icons/22x22/html5_main.png diff --git a/quanta/data/icons/22x22/html5_map.png b/quanta/data/icons/22x22/html5_map.png Binary files differnew file mode 100644 index 00000000..e7adaa5a --- /dev/null +++ b/quanta/data/icons/22x22/html5_map.png diff --git a/quanta/data/icons/22x22/html5_mark.png b/quanta/data/icons/22x22/html5_mark.png Binary files differnew file mode 100644 index 00000000..2e869a6c --- /dev/null +++ b/quanta/data/icons/22x22/html5_mark.png diff --git a/quanta/data/icons/22x22/html5_meta.png b/quanta/data/icons/22x22/html5_meta.png Binary files differnew file mode 100644 index 00000000..6a169691 --- /dev/null +++ b/quanta/data/icons/22x22/html5_meta.png diff --git a/quanta/data/icons/22x22/html5_nav.png b/quanta/data/icons/22x22/html5_nav.png Binary files differnew file mode 100644 index 00000000..af3aa6ac --- /dev/null +++ b/quanta/data/icons/22x22/html5_nav.png diff --git a/quanta/data/icons/22x22/html5_noscript.png b/quanta/data/icons/22x22/html5_noscript.png Binary files differnew file mode 100644 index 00000000..52180391 --- /dev/null +++ b/quanta/data/icons/22x22/html5_noscript.png diff --git a/quanta/data/icons/22x22/html5_object.png b/quanta/data/icons/22x22/html5_object.png Binary files differnew file mode 100644 index 00000000..0bdcd70c --- /dev/null +++ b/quanta/data/icons/22x22/html5_object.png diff --git a/quanta/data/icons/22x22/html5_ol.png b/quanta/data/icons/22x22/html5_ol.png Binary files differnew file mode 100644 index 00000000..27ab357f --- /dev/null +++ b/quanta/data/icons/22x22/html5_ol.png diff --git a/quanta/data/icons/22x22/html5_p.png b/quanta/data/icons/22x22/html5_p.png Binary files differnew file mode 100644 index 00000000..ae8dc38c --- /dev/null +++ b/quanta/data/icons/22x22/html5_p.png diff --git a/quanta/data/icons/22x22/html5_picture.png b/quanta/data/icons/22x22/html5_picture.png Binary files differnew file mode 100644 index 00000000..89524cb1 --- /dev/null +++ b/quanta/data/icons/22x22/html5_picture.png diff --git a/quanta/data/icons/22x22/html5_pre.png b/quanta/data/icons/22x22/html5_pre.png Binary files differnew file mode 100644 index 00000000..b5b8fd74 --- /dev/null +++ b/quanta/data/icons/22x22/html5_pre.png diff --git a/quanta/data/icons/22x22/html5_q.png b/quanta/data/icons/22x22/html5_q.png Binary files differnew file mode 100644 index 00000000..a78c998e --- /dev/null +++ b/quanta/data/icons/22x22/html5_q.png diff --git a/quanta/data/icons/22x22/html5_rp.png b/quanta/data/icons/22x22/html5_rp.png Binary files differnew file mode 100644 index 00000000..83195c19 --- /dev/null +++ b/quanta/data/icons/22x22/html5_rp.png diff --git a/quanta/data/icons/22x22/html5_rt.png b/quanta/data/icons/22x22/html5_rt.png Binary files differnew file mode 100644 index 00000000..002dbbf2 --- /dev/null +++ b/quanta/data/icons/22x22/html5_rt.png diff --git a/quanta/data/icons/22x22/html5_ruby.png b/quanta/data/icons/22x22/html5_ruby.png Binary files differnew file mode 100644 index 00000000..5eb2e561 --- /dev/null +++ b/quanta/data/icons/22x22/html5_ruby.png diff --git a/quanta/data/icons/22x22/html5_samp.png b/quanta/data/icons/22x22/html5_samp.png Binary files differnew file mode 100644 index 00000000..05ca7536 --- /dev/null +++ b/quanta/data/icons/22x22/html5_samp.png diff --git a/quanta/data/icons/22x22/html5_script.png b/quanta/data/icons/22x22/html5_script.png Binary files differnew file mode 100644 index 00000000..766c2ff7 --- /dev/null +++ b/quanta/data/icons/22x22/html5_script.png diff --git a/quanta/data/icons/22x22/html5_section.png b/quanta/data/icons/22x22/html5_section.png Binary files differnew file mode 100644 index 00000000..3a428273 --- /dev/null +++ b/quanta/data/icons/22x22/html5_section.png diff --git a/quanta/data/icons/22x22/html5_small.png b/quanta/data/icons/22x22/html5_small.png Binary files differnew file mode 100644 index 00000000..c941d93d --- /dev/null +++ b/quanta/data/icons/22x22/html5_small.png diff --git a/quanta/data/icons/22x22/html5_source.png b/quanta/data/icons/22x22/html5_source.png Binary files differnew file mode 100644 index 00000000..c1a91e70 --- /dev/null +++ b/quanta/data/icons/22x22/html5_source.png diff --git a/quanta/data/icons/22x22/html5_span.png b/quanta/data/icons/22x22/html5_span.png Binary files differnew file mode 100644 index 00000000..06223aaf --- /dev/null +++ b/quanta/data/icons/22x22/html5_span.png diff --git a/quanta/data/icons/22x22/html5_strong.png b/quanta/data/icons/22x22/html5_strong.png Binary files differnew file mode 100644 index 00000000..8145590e --- /dev/null +++ b/quanta/data/icons/22x22/html5_strong.png diff --git a/quanta/data/icons/22x22/html5_style.png b/quanta/data/icons/22x22/html5_style.png Binary files differnew file mode 100644 index 00000000..ec6e0861 --- /dev/null +++ b/quanta/data/icons/22x22/html5_style.png diff --git a/quanta/data/icons/22x22/html5_sub.png b/quanta/data/icons/22x22/html5_sub.png Binary files differnew file mode 100644 index 00000000..ae053aeb --- /dev/null +++ b/quanta/data/icons/22x22/html5_sub.png diff --git a/quanta/data/icons/22x22/html5_sup.png b/quanta/data/icons/22x22/html5_sup.png Binary files differnew file mode 100644 index 00000000..0ea37e0e --- /dev/null +++ b/quanta/data/icons/22x22/html5_sup.png diff --git a/quanta/data/icons/22x22/html5_svg.png b/quanta/data/icons/22x22/html5_svg.png Binary files differnew file mode 100644 index 00000000..1e6050c2 --- /dev/null +++ b/quanta/data/icons/22x22/html5_svg.png diff --git a/quanta/data/icons/22x22/html5_table.png b/quanta/data/icons/22x22/html5_table.png Binary files differnew file mode 100644 index 00000000..e8dd8e03 --- /dev/null +++ b/quanta/data/icons/22x22/html5_table.png diff --git a/quanta/data/icons/22x22/html5_tbody.png b/quanta/data/icons/22x22/html5_tbody.png Binary files differnew file mode 100644 index 00000000..c84522c8 --- /dev/null +++ b/quanta/data/icons/22x22/html5_tbody.png diff --git a/quanta/data/icons/22x22/html5_td.png b/quanta/data/icons/22x22/html5_td.png Binary files differnew file mode 100644 index 00000000..38d3ea97 --- /dev/null +++ b/quanta/data/icons/22x22/html5_td.png diff --git a/quanta/data/icons/22x22/html5_tfoot.png b/quanta/data/icons/22x22/html5_tfoot.png Binary files differnew file mode 100644 index 00000000..dc633655 --- /dev/null +++ b/quanta/data/icons/22x22/html5_tfoot.png diff --git a/quanta/data/icons/22x22/html5_th.png b/quanta/data/icons/22x22/html5_th.png Binary files differnew file mode 100644 index 00000000..28f5fc82 --- /dev/null +++ b/quanta/data/icons/22x22/html5_th.png diff --git a/quanta/data/icons/22x22/html5_thead.png b/quanta/data/icons/22x22/html5_thead.png Binary files differnew file mode 100644 index 00000000..bcabca1a --- /dev/null +++ b/quanta/data/icons/22x22/html5_thead.png diff --git a/quanta/data/icons/22x22/html5_time.png b/quanta/data/icons/22x22/html5_time.png Binary files differnew file mode 100644 index 00000000..7b53c65c --- /dev/null +++ b/quanta/data/icons/22x22/html5_time.png diff --git a/quanta/data/icons/22x22/html5_title.png b/quanta/data/icons/22x22/html5_title.png Binary files differnew file mode 100644 index 00000000..157e4109 --- /dev/null +++ b/quanta/data/icons/22x22/html5_title.png diff --git a/quanta/data/icons/22x22/html5_tr.png b/quanta/data/icons/22x22/html5_tr.png Binary files differnew file mode 100644 index 00000000..f4eb080a --- /dev/null +++ b/quanta/data/icons/22x22/html5_tr.png diff --git a/quanta/data/icons/22x22/html5_track.png b/quanta/data/icons/22x22/html5_track.png Binary files differnew file mode 100644 index 00000000..8df75171 --- /dev/null +++ b/quanta/data/icons/22x22/html5_track.png diff --git a/quanta/data/icons/22x22/html5_u.png b/quanta/data/icons/22x22/html5_u.png Binary files differnew file mode 100644 index 00000000..5ba3034c --- /dev/null +++ b/quanta/data/icons/22x22/html5_u.png diff --git a/quanta/data/icons/22x22/html5_ul.png b/quanta/data/icons/22x22/html5_ul.png Binary files differnew file mode 100644 index 00000000..8c4e1f6d --- /dev/null +++ b/quanta/data/icons/22x22/html5_ul.png diff --git a/quanta/data/icons/22x22/html5_var.png b/quanta/data/icons/22x22/html5_var.png Binary files differnew file mode 100644 index 00000000..467eba4c --- /dev/null +++ b/quanta/data/icons/22x22/html5_var.png diff --git a/quanta/data/icons/22x22/html5_video.png b/quanta/data/icons/22x22/html5_video.png Binary files differnew file mode 100644 index 00000000..68baec39 --- /dev/null +++ b/quanta/data/icons/22x22/html5_video.png diff --git a/quanta/data/icons/22x22/html5_wbr.png b/quanta/data/icons/22x22/html5_wbr.png Binary files differnew file mode 100644 index 00000000..6ea9f6b8 --- /dev/null +++ b/quanta/data/icons/22x22/html5_wbr.png diff --git a/quanta/data/templates/documents/CMakeLists.txt b/quanta/data/templates/documents/CMakeLists.txt index e114aeb6..e37e5927 100644 --- a/quanta/data/templates/documents/CMakeLists.txt +++ b/quanta/data/templates/documents/CMakeLists.txt @@ -10,6 +10,7 @@ ################################################# add_subdirectory( html ) +add_subdirectory( html5 ) add_subdirectory( others ) add_subdirectory( scripts ) diff --git a/quanta/data/templates/documents/Makefile.am b/quanta/data/templates/documents/Makefile.am index eb6533cd..f35b06b6 100644 --- a/quanta/data/templates/documents/Makefile.am +++ b/quanta/data/templates/documents/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = html others scripts +SUBDIRS = html html5 others scripts templatesdocumentsdir = ${quanta_datadir}/templates/documents templatesdocuments_DATA = dirinfo diff --git a/quanta/data/templates/documents/html5/CMakeLists.txt b/quanta/data/templates/documents/html5/CMakeLists.txt new file mode 100644 index 00000000..352ba774 --- /dev/null +++ b/quanta/data/templates/documents/html5/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + demo.html + DESTINATION ${DATA_INSTALL_DIR}/quanta/templates/documents/html5 ) diff --git a/quanta/data/templates/documents/html5/Makefile.am b/quanta/data/templates/documents/html5/Makefile.am new file mode 100644 index 00000000..a4b04fe0 --- /dev/null +++ b/quanta/data/templates/documents/html5/Makefile.am @@ -0,0 +1,2 @@ +templatesdocumentshtmldir = ${quanta_datadir}/templates/documents/html5 +templatesdocumentshtml_DATA = demo.html diff --git a/quanta/data/templates/documents/html5/demo.html b/quanta/data/templates/documents/html5/demo.html new file mode 100644 index 00000000..d2974677 --- /dev/null +++ b/quanta/data/templates/documents/html5/demo.html @@ -0,0 +1,9 @@ +<!DOCTYPE html> +<html> +<head> + <meta charset="utf-8"> + <title></title> +</head> +<body> +</body> +</html> diff --git a/quanta/data/templates/pages/CMakeLists.txt b/quanta/data/templates/pages/CMakeLists.txt index 965a9475..9aca96f7 100644 --- a/quanta/data/templates/pages/CMakeLists.txt +++ b/quanta/data/templates/pages/CMakeLists.txt @@ -11,6 +11,7 @@ add_subdirectory( php ) add_subdirectory( html ) +add_subdirectory( html5 ) add_subdirectory( docbook ) install( FILES dirinfo diff --git a/quanta/data/templates/pages/Makefile.am b/quanta/data/templates/pages/Makefile.am index 6eaaa6a8..f7b47129 100644 --- a/quanta/data/templates/pages/Makefile.am +++ b/quanta/data/templates/pages/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = php html docbook +SUBDIRS = php html html5 docbook templatespagesdir = ${quanta_datadir}/templates/pages templatespages_DATA = dirinfo diff --git a/quanta/data/templates/pages/docbook/tde-doc-template.docbook b/quanta/data/templates/pages/docbook/tde-doc-template.docbook index 18870bd7..1a45a424 100644 --- a/quanta/data/templates/pages/docbook/tde-doc-template.docbook +++ b/quanta/data/templates/pages/docbook/tde-doc-template.docbook @@ -554,15 +554,3 @@ dicer-toaster daemon first, or &tdemyapplication; won't work !</para> &documentation.index; </book> - -<!-- -Local Variables: -mode: xml -sgml-minimize-attributes:nil -sgml-general-insert-case:lower -sgml-indent-step:0 -sgml-indent-data:nil -End: - -vim:tabstop=2:shiftwidth=2:expandtab ---> diff --git a/quanta/data/templates/pages/html5/CMakeLists.txt b/quanta/data/templates/pages/html5/CMakeLists.txt new file mode 100644 index 00000000..0bddf292 --- /dev/null +++ b/quanta/data/templates/pages/html5/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + base.html + DESTINATION ${DATA_INSTALL_DIR}/quanta/templates/pages/html5 ) diff --git a/quanta/data/templates/pages/html5/Makefile.am b/quanta/data/templates/pages/html5/Makefile.am new file mode 100644 index 00000000..21dded22 --- /dev/null +++ b/quanta/data/templates/pages/html5/Makefile.am @@ -0,0 +1,2 @@ +templatespageshtml401dir = ${quanta_datadir}/templates/pages/html5 +templatespageshtml401_DATA = base.html diff --git a/quanta/data/templates/pages/html5/base.html b/quanta/data/templates/pages/html5/base.html new file mode 100644 index 00000000..d2974677 --- /dev/null +++ b/quanta/data/templates/pages/html5/base.html @@ -0,0 +1,9 @@ +<!DOCTYPE html> +<html> +<head> + <meta charset="utf-8"> + <title></title> +</head> +<body> +</body> +</html> diff --git a/quanta/data/toolbars/Makefile.am b/quanta/data/toolbars/Makefile.am index bc03a375..4a279373 100644 --- a/quanta/data/toolbars/Makefile.am +++ b/quanta/data/toolbars/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = html xml wml-1-2 tagxml schema cfml kde-docbook docbook css +SUBDIRS = html html5 xml wml-1-2 tagxml schema cfml kde-docbook docbook css toolbarsdir = ${quanta_datadir}/toolbars toolbars_DATA = debug.toolbar.tgz diff --git a/quanta/data/toolbars/html5/CMakeLists.txt b/quanta/data/toolbars/html5/CMakeLists.txt new file mode 100644 index 00000000..2ebdff25 --- /dev/null +++ b/quanta/data/toolbars/html5/CMakeLists.txt @@ -0,0 +1,26 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# (C) 2019 Slávek Banko +# slavek.banko (AT) axis.cz +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + + +##### style data ################################ + +foreach( _toolbar base meta style tools ) + + tde_create_tarball( + TARGET ${_toolbar}.toolbar.tgz + FILES ${_toolbar}.actions ${_toolbar}.toolbar + DESTINATION ${DATA_INSTALL_DIR}/quanta/toolbars/html5 + ) + +endforeach( ) diff --git a/quanta/data/toolbars/html5/Makefile.am b/quanta/data/toolbars/html5/Makefile.am new file mode 100644 index 00000000..353c7dad --- /dev/null +++ b/quanta/data/toolbars/html5/Makefile.am @@ -0,0 +1,14 @@ +htmltemplatedir = ${quanta_datadir}/toolbars/html5 +htmltemplate_DATA = base.toolbar.tgz meta.toolbar.tgz style.toolbar.tgz tools.toolbar.tgz + +base.toolbar.tgz: base.actions base.toolbar + tar cfz $@ -C $(<D) $(^F) + +meta.toolbar.tgz: meta.actions meta.toolbar + tar cfz $@ -C $(<D) $(^F) + +style.toolbar.tgz: style.actions style.toolbar + tar cfz $@ -C $(<D) $(^F) + +tools.toolbar.tgz: tools.actions tools.toolbar + tar cfz $@ -C $(<D) $(^F) diff --git a/quanta/data/toolbars/html5/base.actions b/quanta/data/toolbars/html5/base.actions new file mode 100644 index 00000000..2fa3cebb --- /dev/null +++ b/quanta/data/toolbars/html5/base.actions @@ -0,0 +1,126 @@ +<!DOCTYPE actionsconfig> +<actions> + <action shortcut="" icon="html5_h1" type="tag" tooltip="" name="h1" text="h1" > + <tag useDialog="false" ><h1></tag> + <xtag use="true" ></h1></xtag> + </action> + <action shortcut="" icon="html5_h2" type="tag" tooltip="" name="h2" text="h2" > + <tag useDialog="false" ><h2></tag> + <xtag use="true" ></h2></xtag> + </action> + <action shortcut="" icon="html5_h3" type="tag" tooltip="" name="h3" text="h3" > + <tag useDialog="false" ><h3></tag> + <xtag use="true" ></h3></xtag> + </action> + <action shortcut="" icon="html5_h4" type="tag" tooltip="" name="h4" text="h4" > + <tag useDialog="false" ><h4></tag> + <xtag use="true" ></h4></xtag> + </action> + <action shortcut="" icon="html5_h5" type="tag" tooltip="" name="h5" text="h5" > + <tag useDialog="false" ><h5></tag> + <xtag use="true" ></h5></xtag> + </action> + <action shortcut="" icon="html5_h6" type="tag" tooltip="" name="h6" text="h6" > + <tag useDialog="false" ><h6></tag> + <xtag use="true" ></h6></xtag> + </action> + <action shortcut="" icon="html5_p" type="tag" tooltip="" name="p" text="p" > + <tag useDialog="false" ><p></tag> + <xtag use="true" ></p></xtag> + </action> + <action shortcut="" icon="html5_pre" type="tag" tooltip="" name="pre" text="pre" > + <tag useDialog="false" ><pre></tag> + <xtag use="true" ></pre></xtag> + </action> + <action shortcut="" icon="html5_div" type="tag" tooltip="" name="div" text="div" > + <tag useDialog="false" ><div></tag> + <xtag use="true" ></div></xtag> + </action> + <action shortcut="" icon="html5_blockquote" type="tag" tooltip="" name="blockquote" text="blockquote" > + <tag useDialog="false" ><blockquote></tag> + <xtag use="true" ></blockquote></xtag> + </action> + <action shortcut="" icon="html5_details" type="tag" tooltip="" name="details" text="details" > + <tag useDialog="false" ><details></tag> + <xtag use="true" ></details></xtag> + </action> + <action shortcut="" icon="html5_center" type="tag" tooltip="" name="center" text="center" > + <tag useDialog="false" ><center></tag> + <xtag use="true" ></center></xtag> + </action> + <action shortcut="" icon="html5_hr" type="tag" tooltip="" name="hr" text="hr" > + <tag useDialog="false" ><hr></tag> + </action> + <action shortcut="" icon="html5_com" type="tag" tooltip="" name="com" text="com" > + <tag useDialog="false" ><!-- </tag> + <xtag use="true" > --></xtag> + </action> + <action shortcut="" icon="html5_ul" type="tag" tooltip="" name="ul" text="ul" > + <tag useDialog="false" ><ul></tag> + <xtag use="true" ></ul></xtag> + </action> + <action shortcut="" icon="html5_ol" type="tag" tooltip="" name="ol" text="ol" > + <tag useDialog="false" ><ol></tag> + <xtag use="true" ></ol></xtag> + </action> + <action shortcut="" icon="html5_li" type="tag" tooltip="" name="li" text="li" > + <tag useDialog="false" ><li></tag> + <xtag use="true" ></li></xtag> + </action> + <action shortcut="" icon="html5_dir" type="tag" tooltip="" name="dir" text="dir" > + <tag useDialog="false" ><dir></tag> + <xtag use="true" ></dir></xtag> + </action> + <action shortcut="" icon="html5_dl" type="tag" tooltip="" name="dl" text="dl" > + <tag useDialog="false" ><dl></tag> + <xtag use="true" ></dl></xtag> + </action> + <action shortcut="" icon="html5_dt" type="tag" tooltip="" name="dt" text="dt" > + <tag useDialog="false" ><dt></tag> + <xtag use="true" ></dt></xtag> + </action> + <action shortcut="" icon="html5_dd" type="tag" tooltip="" name="dd" text="dd" > + <tag useDialog="false" ><dd></tag> + <xtag use="true" ></dd></xtag> + </action> + <action shortcut="" icon="html5_table" type="tag" tooltip="" name="table" text="table" > + <tag useDialog="false" ><table></tag> + <xtag use="true" ></table></xtag> + </action> + <action shortcut="" icon="html5_tbody" type="tag" tooltip="" name="tbody" text="tbody" > + <tag useDialog="false" ><tbody></tag> + <xtag use="true" ></tbody></xtag> + </action> + <action shortcut="" icon="html5_thead" type="tag" tooltip="" name="thead" text="thead" > + <tag useDialog="false" ><thead></tag> + <xtag use="true" ></thead></xtag> + </action> + <action shortcut="" icon="html5_tfoot" type="tag" tooltip="" name="tfoot" text="tfoot" > + <tag useDialog="false" ><tfoot></tag> + <xtag use="true" ></tfoot></xtag> + </action> + <action shortcut="" icon="html5_tr" type="tag" tooltip="" name="tr" text="tr" > + <tag useDialog="false" ><tr></tag> + <xtag use="true" ></tr></xtag> + </action> + <action shortcut="" icon="html5_colgroup" type="tag" tooltip="" name="colgroup" text="colgroup" > + <tag useDialog="false" ><colgroup></tag> + <xtag use="true" ></colgroup></xtag> + </action> + <action shortcut="" icon="html5_col" type="tag" tooltip="" name="col" text="col" > + <tag useDialog="false" ><col></tag> + <xtag use="true" ></col></xtag> + </action> + <action shortcut="" icon="html5_td" type="tag" tooltip="" name="td" text="td" > + <tag useDialog="false" ><td></tag> + <xtag use="true" ></td></xtag> + </action> + <action shortcut="" icon="html5_th" type="tag" tooltip="" name="th" text="th" > + <tag useDialog="false" ><th></tag> + <xtag use="true" ></th></xtag> + </action> + <action shortcut="" icon="html5_caption" type="tag" tooltip="" name="caption" text="caption" > + <tag useDialog="false" ><caption></tag> + <xtag use="true" ></caption></xtag> + </action> +</actions> diff --git a/quanta/data/toolbars/html5/base.toolbar b/quanta/data/toolbars/html5/base.toolbar new file mode 100644 index 00000000..e4e786cf --- /dev/null +++ b/quanta/data/toolbars/html5/base.toolbar @@ -0,0 +1,37 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="quanta" version="2"> + <ToolBar tabname="Base" noMerge="1" name="base" > + <text>Base</text> + <Action name="h1" /> + <Action name="h2" /> + <Action name="h3" /> + <Action name="h4" /> + <Action name="h5" /> + <Action name="h6" /> + <Action name="p" /> + <Action name="pre" /> + <Action name="div" /> + <Action name="blockquote" /> + <Action name="details" /> + <Action name="center" /> + <Action name="hr" /> + <Action name="com" /> + <Action name="ul" /> + <Action name="ol" /> + <Action name="li" /> + <Action name="dir" /> + <Action name="dl" /> + <Action name="dt" /> + <Action name="dd" /> + <Action name="table" /> + <Action name="tbody" /> + <Action name="thead" /> + <Action name="tfoot" /> + <Action name="tr" /> + <Action name="colgroup" /> + <Action name="col" /> + <Action name="td" /> + <Action name="th" /> + <Action name="caption" /> + </ToolBar> +</kpartgui> diff --git a/quanta/data/toolbars/html5/meta.actions b/quanta/data/toolbars/html5/meta.actions new file mode 100644 index 00000000..0ea1ee5a --- /dev/null +++ b/quanta/data/toolbars/html5/meta.actions @@ -0,0 +1,125 @@ +<!DOCTYPE actionsconfig> +<actions> + <action shortcut="" icon="html5_img" type="tag" tooltip="" name="img" text="img" > + <tag useDialog="false" ><img src=""></tag> + </action> + <action shortcut="" icon="html5_map" type="tag" tooltip="" name="map" text="map" > + <tag useDialog="false" ><map name=""></tag> + <xtag use="true" ></map></xtag> + </action> + <action shortcut="" icon="html5_area" type="tag" tooltip="" name="area" text="area" > + <tag useDialog="false" ><area shape="" coords=",,," alt="" href=""></tag> + </action> + <action shortcut="" icon="html5_picture" type="tag" tooltip="" name="picture" text="picture" > + <tag useDialog="false" ><picture></tag> + <xtag use="true" ></picture></xtag> + </action> + <action shortcut="" icon="html5_figure" type="tag" tooltip="" name="figure" text="figure" > + <tag useDialog="false" ><figure></tag> + <xtag use="true" ></figure></xtag> + </action> + <action shortcut="" icon="html5_figcaption" type="tag" tooltip="" name="figcaption" text="figcaption" > + <tag useDialog="false" ><figcaption></tag> + <xtag use="true" ></figcaption></xtag> + </action> + <action shortcut="" icon="html5_svg" type="tag" tooltip="" name="svg" text="svg" > + <tag useDialog="false" ><svg></tag> + <xtag use="true" ></svg></xtag> + </action> + <action shortcut="" icon="html5_audio" type="tag" tooltip="" name="audio" text="audio" > + <tag useDialog="false" ><audio src=""></tag> + <xtag use="true" ></audio></xtag> + </action> + <action shortcut="" icon="html5_video" type="tag" tooltip="" name="video" text="video" > + <tag useDialog="false" ><video src=""></tag> + <xtag use="true" ></video></xtag> + </action> + <action shortcut="" icon="html5_track" type="tag" tooltip="" name="track" text="track" > + <tag useDialog="false" ><track src=""></tag> + <xtag use="true" ></track></xtag> + </action> + <action shortcut="" icon="html5_embed" type="tag" tooltip="" name="embed" text="embed" > + <tag useDialog="false" ><embed src=""></tag> + <xtag use="true" ></embed></xtag> + </action> + <action shortcut="" icon="html5_object" type="tag" tooltip="" name="object" text="object" > + <tag useDialog="false" ><object data=""></tag> + <xtag use="true" ></object></xtag> + </action> + <action shortcut="" icon="html5_source" type="tag" tooltip="" name="source" text="source" > + <tag useDialog="false" ><source src=""></tag> + <xtag use="true" ></source></xtag> + </action> + <action shortcut="" icon="html5_header" type="tag" tooltip="" name="header" text="header" > + <tag useDialog="false" ><header></tag> + <xtag use="true" ></header></xtag> + </action> + <action shortcut="" icon="html5_nav" type="tag" tooltip="" name="nav" text="nav" > + <tag useDialog="false" ><nav></tag> + <xtag use="true" ></nav></xtag> + </action> + <action shortcut="" icon="html5_main" type="tag" tooltip="" name="main" text="main" > + <tag useDialog="false" ><main></tag> + <xtag use="true" ></main></xtag> + </action> + <action shortcut="" icon="html5_aside" type="tag" tooltip="" name="aside" text="aside" > + <tag useDialog="false" ><aside></tag> + <xtag use="true" ></aside></xtag> + </action> + <action shortcut="" icon="html5_footer" type="tag" tooltip="" name="footer" text="footer" > + <tag useDialog="false" ><footer></tag> + <xtag use="true" ></footer></xtag> + </action> + <action shortcut="" icon="html5_article" type="tag" tooltip="" name="article" text="article" > + <tag useDialog="false" ><article></tag> + <xtag use="true" ></article></xtag> + </action> + <action shortcut="" icon="html5_address" type="tag" tooltip="" name="address" text="address" > + <tag useDialog="false" ><address></tag> + <xtag use="true" ></address></xtag> + </action> + <action shortcut="" icon="html5_section" type="tag" tooltip="" name="section" text="section" > + <tag useDialog="false" ><section></tag> + <xtag use="true" ></section></xtag> + </action> + <action shortcut="" icon="html5_DT" type="tag" tooltip="" name="DT" text="DT" > + <tag useDialog="false" ><!DOCTYPE html></tag> + </action> + <action shortcut="" icon="html5_html" type="tag" tooltip="" name="html" text="html" > + <tag useDialog="false" ><html></tag> + <xtag use="true" ></html></xtag> + </action> + <action shortcut="" icon="html5_head" type="tag" tooltip="" name="head" text="head" > + <tag useDialog="false" ><head></tag> + <xtag use="true" ></head></xtag> + </action> + <action shortcut="" icon="html5_body" type="tag" tooltip="" name="body" text="body" > + <tag useDialog="false" ><body></tag> + <xtag use="true" ></body></xtag> + </action> + <action shortcut="" icon="html5_title" type="tag" tooltip="" name="title" text="title" > + <tag useDialog="false" ><title></tag> + <xtag use="true" ></title></xtag> + </action> + <action shortcut="" icon="html5_meta" type="tag" tooltip="" name="meta" text="meta" > + <tag useDialog="false" ><meta charset="utf-8"></tag> + </action> + <action shortcut="" icon="html5_base" type="tag" tooltip="" name="base" text="base" > + <tag useDialog="false" ><base href=""></tag> + </action> + <action shortcut="" icon="html5_link" type="tag" tooltip="" name="link" text="link" > + <tag useDialog="false" ><link rel="" type="" href=""></tag> + </action> + <action shortcut="" icon="html5_style" type="tag" tooltip="" name="style" text="style" > + <tag useDialog="false" ><style></tag> + <xtag use="true" ></style></xtag> + </action> + <action shortcut="" icon="html5_script" type="tag" tooltip="" name="script" text="script" > + <tag useDialog="false" ><script></tag> + <xtag use="true" ></script></xtag> + </action> + <action shortcut="" icon="html5_noscript" type="tag" tooltip="" name="noscript" text="noscript" > + <tag useDialog="false" ><noscript></tag> + <xtag use="true" ></noscript></xtag> + </action> +</actions> diff --git a/quanta/data/toolbars/html5/meta.toolbar b/quanta/data/toolbars/html5/meta.toolbar new file mode 100644 index 00000000..2c3c8446 --- /dev/null +++ b/quanta/data/toolbars/html5/meta.toolbar @@ -0,0 +1,38 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="quanta" version="2"> + <ToolBar tabname="Meta" noMerge="1" name="meta" > + <text>Meta</text> + <Action name="img" /> + <Action name="map" /> + <Action name="area" /> + <Action name="picture" /> + <Action name="figure" /> + <Action name="figcaption" /> + <Action name="svg" /> + <Action name="audio" /> + <Action name="video" /> + <Action name="track" /> + <Action name="embed" /> + <Action name="object" /> + <Action name="source" /> + <Action name="header" /> + <Action name="nav" /> + <Action name="main" /> + <Action name="aside" /> + <Action name="footer" /> + <Action name="article" /> + <Action name="address" /> + <Action name="section" /> + <Action name="DT" /> + <Action name="html" /> + <Action name="head" /> + <Action name="body" /> + <Action name="title" /> + <Action name="meta" /> + <Action name="base" /> + <Action name="link" /> + <Action name="style" /> + <Action name="script" /> + <Action name="noscript" /> + </ToolBar> +</kpartgui> diff --git a/quanta/data/toolbars/html5/style.actions b/quanta/data/toolbars/html5/style.actions new file mode 100644 index 00000000..39b8e124 --- /dev/null +++ b/quanta/data/toolbars/html5/style.actions @@ -0,0 +1,121 @@ +<!DOCTYPE actionsconfig> +<actions> + <action shortcut="" icon="html5_a" type="tag" tooltip="" name="a" text="a" > + <tag useDialog="false" ><a href=""></tag> + <xtag use="true" ></a></xtag> + </action> + <action shortcut="" icon="html5_strong" type="tag" tooltip="" name="strong" text="strong" > + <tag useDialog="false" ><strong></tag> + <xtag use="true" ></strong></xtag> + </action> + <action shortcut="" icon="html5_i" type="tag" tooltip="" name="i" text="i" > + <tag useDialog="false" ><i></tag> + <xtag use="true" ></i></xtag> + </action> + <action shortcut="" icon="html5_b" type="tag" tooltip="" name="b" text="b" > + <tag useDialog="false" ><b></tag> + <xtag use="true" ></b></xtag> + </action> + <action shortcut="" icon="html5_del" type="tag" tooltip="" name="del" text="del" > + <tag useDialog="false" ><del></tag> + <xtag use="true" ></del></xtag> + </action> + <action shortcut="" icon="html5_small" type="tag" tooltip="" name="small" text="small" > + <tag useDialog="false" ><small></tag> + <xtag use="true" ></small></xtag> + </action> + <action shortcut="" icon="html5_big" type="tag" tooltip="" name="big" text="big" > + <tag useDialog="false" ><big></tag> + <xtag use="true" ></big></xtag> + </action> + <action shortcut="" icon="html5_font" type="tag" tooltip="" name="font" text="font" > + <tag useDialog="false" ><font></tag> + <xtag use="true" ></font></xtag> + </action> + <action shortcut="" icon="html5_code" type="tag" tooltip="" name="code" text="code" > + <tag useDialog="false" ><code></tag> + <xtag use="true" ></code></xtag> + </action> + <action shortcut="" icon="html5_var" type="tag" tooltip="" name="var" text="var" > + <tag useDialog="false" ><var></tag> + <xtag use="true" ></var></xtag> + </action> + <action shortcut="" icon="html5_kbd" type="tag" tooltip="" name="kbd" text="kbd" > + <tag useDialog="false" ><kbd></tag> + <xtag use="true" ></kbd></xtag> + </action> + <action shortcut="" icon="html5_samp" type="tag" tooltip="" name="samp" text="samp" > + <tag useDialog="false" ><samp></tag> + <xtag use="true" ></samp></xtag> + </action> + <action shortcut="" icon="html5_sup" type="tag" tooltip="" name="sup" text="sup" > + <tag useDialog="false" ><sup></tag> + <xtag use="true" ></sup></xtag> + </action> + <action shortcut="" icon="html5_sub" type="tag" tooltip="" name="sub" text="sub" > + <tag useDialog="false" ><sub></tag> + <xtag use="true" ></sub></xtag> + </action> + <action shortcut="" icon="html5_q" type="tag" tooltip="" name="q" text="q" > + <tag useDialog="false" ><q></tag> + <xtag use="true" ></q></xtag> + </action> + <action shortcut="" icon="html5_ins" type="tag" tooltip="" name="ins" text="ins" > + <tag useDialog="false" ><ins></tag> + <xtag use="true" ></ins></xtag> + </action> + <action shortcut="" icon="html5_cite" type="tag" tooltip="" name="cite" text="cite" > + <tag useDialog="false" ><cite></tag> + <xtag use="true" ></cite></xtag> + </action> + <action shortcut="" icon="html5_time" type="tag" tooltip="" name="time" text="time" > + <tag useDialog="false" ><time></tag> + <xtag use="true" ></time></xtag> + </action> + <action shortcut="" icon="html5_abbr" type="tag" tooltip="" name="abbr" text="abbr" > + <tag useDialog="false" ><abbr title=""></tag> + <xtag use="true" ></abbr></xtag> + </action> + <action shortcut="" icon="html5_data" type="tag" tooltip="" name="data" text="data" > + <tag useDialog="false" ><data value=""></tag> + <xtag use="true" ></data></xtag> + </action> + <action shortcut="" icon="html5_mark" type="tag" tooltip="" name="mark" text="mark" > + <tag useDialog="false" ><mark></tag> + <xtag use="true" ></mark></xtag> + </action> + <action shortcut="" icon="html5_u" type="tag" tooltip="" name="u" text="u" > + <tag useDialog="false" ><u></tag> + <xtag use="true" ></u></xtag> + </action> + <action shortcut="" icon="html5_bdi" type="tag" tooltip="" name="bdi" text="bdi" > + <tag useDialog="false" ><bdi></tag> + <xtag use="true" ></bdi></xtag> + </action> + <action shortcut="" icon="html5_bdo" type="tag" tooltip="" name="bdo" text="bdo" > + <tag useDialog="false" ><bdo dir=""></tag> + <xtag use="true" ></bdo></xtag> + </action> + <action shortcut="" icon="html5_ruby" type="tag" tooltip="" name="ruby" text="ruby" > + <tag useDialog="false" ><ruby></tag> + <xtag use="true" ></ruby></xtag> + </action> + <action shortcut="" icon="html5_rt" type="tag" tooltip="" name="rt" text="rt" > + <tag useDialog="false" ><rt></tag> + <xtag use="true" ></rt></xtag> + </action> + <action shortcut="" icon="html5_rp" type="tag" tooltip="" name="rp" text="rp" > + <tag useDialog="false" ><rp></tag> + <xtag use="true" ></rp></xtag> + </action> + <action shortcut="" icon="html5_br" type="tag" tooltip="" name="br" text="br" > + <tag useDialog="false" ><br></tag> + </action> + <action shortcut="" icon="html5_wbr" type="tag" tooltip="" name="wbr" text="wbr" > + <tag useDialog="false" ><wbr></tag> + </action> + <action shortcut="" icon="html5_span" type="tag" tooltip="" name="span" text="span" > + <tag useDialog="false" ><span></tag> + <xtag use="true" ></span></xtag> + </action> +</actions> diff --git a/quanta/data/toolbars/html5/style.toolbar b/quanta/data/toolbars/html5/style.toolbar new file mode 100644 index 00000000..99f215cd --- /dev/null +++ b/quanta/data/toolbars/html5/style.toolbar @@ -0,0 +1,36 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="quanta" version="2"> + <ToolBar tabname="Style" noMerge="1" name="style" > + <text>Style</text> + <Action name="a" /> + <Action name="strong" /> + <Action name="i" /> + <Action name="b" /> + <Action name="del" /> + <Action name="small" /> + <Action name="big" /> + <Action name="font" /> + <Action name="code" /> + <Action name="var" /> + <Action name="kbd" /> + <Action name="samp" /> + <Action name="sup" /> + <Action name="sub" /> + <Action name="q" /> + <Action name="ins" /> + <Action name="cite" /> + <Action name="time" /> + <Action name="abbr" /> + <Action name="data" /> + <Action name="mark" /> + <Action name="u" /> + <Action name="bdi" /> + <Action name="bdo" /> + <Action name="ruby" /> + <Action name="rt" /> + <Action name="rp" /> + <Action name="br" /> + <Action name="wbr" /> + <Action name="span" /> + </ToolBar> +</kpartgui> diff --git a/quanta/data/toolbars/html5/tools.actions b/quanta/data/toolbars/html5/tools.actions new file mode 100644 index 00000000..bbae9334 --- /dev/null +++ b/quanta/data/toolbars/html5/tools.actions @@ -0,0 +1,6 @@ +<!DOCTYPE actionsconfig> +<actions> + <action shortcut="" icon="quick_start.png" type="script" tooltip="Kommander Quick Start Dialog" name="tag_quick_start_html5" text="Quick Start Dialog" > + <script output="new" error="message" input="none" >kmdr-executor -c quanta %scriptdir/htmlquickstart5.kmdr</script> + </action> +</actions> diff --git a/quanta/data/toolbars/html5/tools.toolbar b/quanta/data/toolbars/html5/tools.toolbar new file mode 100644 index 00000000..348dbc03 --- /dev/null +++ b/quanta/data/toolbars/html5/tools.toolbar @@ -0,0 +1,13 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="quanta" version="2"> + <ToolBar tabname="Tools" noMerge="1" name="tools" > + <text>Tools</text> + <Action name="tag_quick_start_html5" /> + <Action name="insert_css" /> + <Action name="tag_color" /> + <Action name="tag_edit_table" /> + <Action name="tag_quick_list" /> + <Action name="tag_nbsp" /> + <Action name="insert_char" /> + </ToolBar> +</kpartgui> diff --git a/quanta/dialogs/CMakeLists.txt b/quanta/dialogs/CMakeLists.txt index 22debbf3..69d43876 100644 --- a/quanta/dialogs/CMakeLists.txt +++ b/quanta/dialogs/CMakeLists.txt @@ -19,6 +19,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/dialogs ${CMAKE_SOURCE_DIR}/quanta/src ${CMAKE_SOURCE_DIR}/quanta/parsers +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index a1a53eab..b93e9bcd 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -63,18 +63,18 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, currentAction = 0L; m_toolbarItem = 0L; - connect(actionTreeView, TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), - TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); - connect(actionTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut &)), - TQT_SLOT(slotShortcutCaptured(const TDEShortcut &))); - connect(scriptPath, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&))); - connect(this, TQT_SIGNAL(addToolbar()), m_mainWindow, TQT_SLOT(slotAddToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(TDEAction*))); - connect(this, TQT_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQT_SLOT(slotConfigureToolbars(const TQString&))); + connect(actionTreeView, TQ_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), + TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); + connect(actionTreeView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(shortcutKeyButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut &)), + TQ_SLOT(slotShortcutCaptured(const TDEShortcut &))); + connect(scriptPath, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&))); + connect(this, TQ_SIGNAL(addToolbar()), m_mainWindow, TQ_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQ_SLOT(slotDeleteAction(TDEAction*))); + connect(this, TQ_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQ_SLOT(slotConfigureToolbars(const TQString&))); //fill up the tree view with the toolbars and actions actionTreeView->setSorting(-1); allActionsItem = new TDEListViewItem(actionTreeView, i18n("All")); @@ -148,9 +148,9 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, allActionsItem->sortChildItems(0, true); treeMenu = new TDEPopupMenu(actionTreeView); - treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQT_SLOT(slotAddToolbar())); - treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar())); + treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQ_SLOT(slotAddToolbar())); + treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQ_SLOT(slotEditToolbar())); globalShortcuts = TDEGlobal::config()->entryMap( "Global Shortcuts" ); } @@ -193,7 +193,7 @@ void ActionConfigDialog::slotRemoveToolbar() if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; - connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); + connect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), TQ_SLOT(slotToolbarRemoved(const TQString&))); emit removeToolbar(s.lower()); } } @@ -204,7 +204,7 @@ void ActionConfigDialog::slotToolbarRemoved(const TQString &/*name*/) actionTreeView->setCurrentItem(allActionsItem); delete m_toolbarItem; m_toolbarItem = 0L; - disconnect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), this, TQT_SLOT(slotToolbarRemoved(const TQString&))); + disconnect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), this, TQ_SLOT(slotToolbarRemoved(const TQString&))); } void ActionConfigDialog::slotEditToolbar() diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h index 853d839a..bd13c11b 100644 --- a/quanta/dialogs/actionconfigdialog.h +++ b/quanta/dialogs/actionconfigdialog.h @@ -41,7 +41,7 @@ struct ToolbarEntry { class ActionConfigDialog: public ActionConfigDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index fae092c2..1a56c42b 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -972,11 +972,7 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<includes> - <include location="global" impldecl="in implementation">kkeybutton.h</include> - <include location="global" impldecl="in implementation">kpushbutton.h</include> -</includes> -<Q_SLOTS> +<slots> <slot>buttonOk_clicked()</slot> <slot>slotNewAction()</slot> <slot>slotDeleteAction()</slot> @@ -989,13 +985,14 @@ <slot>shortcutKeyButton_toggled(bool)</slot> <slot>slotToggled(bool)</slot> <slot>slotTextChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>kicondialog.h</includehint> - <includehint>kkeybutton.h</includehint> - <includehint>tdelistbox.h</includehint> - <includehint>filecombo.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kkeybutton.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">filecombo.h</include> +</includes> </UI> diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index b5c53356..a7d5a55b 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -63,8 +63,8 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) destURL.adjustPath(1); TDEIO::CopyJob *job = TDEIO::copy(urlToCopy, destURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); TQString path = destURL.path(); if (path != "." && path != "..") @@ -117,8 +117,8 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) } TDEIO::CopyJob *job = TDEIO::copy(sourceList, targetDirURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } return m_destList; diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h index 3e021e0a..212bd014 100644 --- a/quanta/dialogs/copyto.h +++ b/quanta/dialogs/copyto.h @@ -29,7 +29,7 @@ class KURL; class CopyTo : public TQObject{ -Q_OBJECT +TQ_OBJECT public: CopyTo(const KURL& dirURL); diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 720c3d8a..6f8f2b6c 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -56,7 +56,7 @@ void DirtyDlg::slotOk() TDEProcess *proc = new TDEProcess(); *proc << "kompare" << m_src.path() << m_dest.path(); proc->start(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotCompareDone(TDEProcess*))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotCompareDone(TDEProcess*))); enableButton(KDialogBase::Ok, false); enableButton(KDialogBase::Cancel, false); } else @@ -88,8 +88,8 @@ void DirtyDlg::slotCompareDone(TDEProcess* proc) //TODO: Replace with TDEIO::NetAccess::file_move, when KDE 3.1 support //is dropped TDEIO::FileCopyJob *job = TDEIO::file_move(m_dest, m_src, m_permissions, true, false,false ); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index 5fd14e36..f8264a1c 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -27,7 +27,7 @@ class TDEProcess; class TQCloseEvent; class DirtyDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui index 2914bef2..0d632baf 100644 --- a/quanta/dialogs/donationdialog.ui +++ b/quanta/dialogs/donationdialog.ui @@ -143,13 +143,12 @@ is the future of software, but it is no guarantee of success. How many open sour <tabstop>KTextBrowser2</tabstop> <tabstop>closeButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kpushbutton.h</includehint> - <includehint>ktextbrowser.h</includehint> - <includehint>ktextbrowser.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">ktextbrowser.h</include> +</includes> </UI> diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui index cd6a079b..21b08abf 100644 --- a/quanta/dialogs/dtdselectdialog.ui +++ b/quanta/dialogs/dtdselectdialog.ui @@ -105,8 +105,8 @@ Dialog message2:</string> <includes> <include location="local" impldecl="in implementation">dtdselectdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h index a570881d..e53a2988 100644 --- a/quanta/dialogs/dtepeditdlg.h +++ b/quanta/dialogs/dtepeditdlg.h @@ -55,7 +55,7 @@ struct StructGroup { class DTEPEditDlg : public DTEPEditDlgS { - Q_OBJECT + TQ_OBJECT public: DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 32e6c8f7..ca68fcff 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -1957,11 +1957,16 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <tabstop>editStructButton</tabstop> <tabstop>deleteStructButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotEditStructGroup()</slot> <slot>slotAddStructGroup()</slot> <slot>slotDeleteStructGroup()</slot> <slot>slotFamilyChanged(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/dtepstructureeditdlgs.ui b/quanta/dialogs/dtepstructureeditdlgs.ui index ce90582b..0a8de386 100644 --- a/quanta/dialogs/dtepstructureeditdlgs.ui +++ b/quanta/dialogs/dtepstructureeditdlgs.ui @@ -640,7 +640,9 @@ The first captured area (between "<b>(</b>" and "<b>)</b> <tabstop>classGroup</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kicondialog.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kicondialog.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 1293d8b4..2f5938f1 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -47,9 +47,9 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } @@ -69,9 +69,9 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } diff --git a/quanta/dialogs/filecombo.h b/quanta/dialogs/filecombo.h index 3288cd85..ebeef6fe 100644 --- a/quanta/dialogs/filecombo.h +++ b/quanta/dialogs/filecombo.h @@ -30,7 +30,7 @@ class TQPushButton; class KURL; class FileCombo : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FileCombo(const KURL& a_baseURL, TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui index ec85fa91..924eb83e 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -147,16 +147,17 @@ </connections> <includes> <include location="local" impldecl="in implementation">fourbuttonmessagebox.ui.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> </includes> <variables> <variable>int m_status;</variable> </variables> -<Q_SLOTS> +<slots> <slot>cancelButton_clicked()</slot> <slot>user1Button_clicked()</slot> <slot>user2Button_clicked()</slot> <slot>user3Button_clicked()</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual" returnType="int">status()</function> </functions> diff --git a/quanta/dialogs/loadentitydlgs.ui b/quanta/dialogs/loadentitydlgs.ui index 10950ae7..d6adcd29 100644 --- a/quanta/dialogs/loadentitydlgs.ui +++ b/quanta/dialogs/loadentitydlgs.ui @@ -69,4 +69,8 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/settings/CMakeLists.txt b/quanta/dialogs/settings/CMakeLists.txt index c5d96b02..74396c31 100644 --- a/quanta/dialogs/settings/CMakeLists.txt +++ b/quanta/dialogs/settings/CMakeLists.txt @@ -14,6 +14,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/utility ${CMAKE_SOURCE_DIR}/quanta/parsers ${CMAKE_SOURCE_DIR}/quanta/src +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 85d3065b..8d3aa45c 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -98,7 +98,7 @@ void AbbreviationDlg::slotNewGroup() if (qConfig.abbreviations.contains(groupName)) { KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists")); - TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); + TQTimer::singleShot(0, this, TQ_SLOT(slotNewGroup())); } else { groupCombo->insertItem(groupName); diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h index 39f49ff3..35120764 100644 --- a/quanta/dialogs/settings/abbreviation.h +++ b/quanta/dialogs/settings/abbreviation.h @@ -26,7 +26,7 @@ struct DTDStruct; class AbbreviationDlg : public AbbreviationDlgS { - Q_OBJECT + TQ_OBJECT public: AbbreviationDlg(TQWidget *parent, const char *name = 0); diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index fc53fe16..7782617d 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -337,7 +337,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>slotTemplateSelectionChanged(TQListViewItem*)</slot> <slot>dtdCombo_activated(const TQString&)</slot> <slot>slotGroupChanged(const TQString&)</slot> @@ -348,10 +348,12 @@ <slot>slotAddDTEP()</slot> <slot>slotRemoveDTEP()</slot> <slot>slotNewGroup()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 7a1367b9..d7e28e55 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -72,10 +72,10 @@ <tabstop>templateEdit</tabstop> <tabstop>descriptionEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>accept()</slot> <slot>reject()</slot> <slot>pushButton4_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index fee135f8..5688b920 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -26,7 +26,7 @@ FileMasks::FileMasks(TQWidget *parent, const char *name) :FileMasksS(parent,name) { - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(setToDefault())); } FileMasks::~FileMasks(){ diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h index 1a76334e..08f49cb1 100644 --- a/quanta/dialogs/settings/filemasks.h +++ b/quanta/dialogs/settings/filemasks.h @@ -23,7 +23,7 @@ class FileMasks : public FileMasksS { - Q_OBJECT + TQ_OBJECT public: FileMasks(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h index 89058786..bd37836b 100644 --- a/quanta/dialogs/settings/parseroptions.h +++ b/quanta/dialogs/settings/parseroptions.h @@ -22,7 +22,7 @@ class TDEConfig; class ParserOptions : public ParserOptionsUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index f688d02d..d92315ed 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -23,7 +23,7 @@ class TDEConfig; class PreviewOptions : public PreviewOptionsS { - Q_OBJECT + TQ_OBJECT public: PreviewOptions(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index b9f90264..378c0c22 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -31,13 +31,13 @@ SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl) :SpecialCharDialogS( parent, name, modal, fl ) { - connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(filterChars(const TQString&)) ); - connect ( CharsListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - TQT_SLOT(insertCode()) ); - connect (buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(insertCode())); - connect (buttonChar, TQT_SIGNAL(clicked()), TQT_SLOT(insertChar())); - connect (buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancel())); + connect ( FilterLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(filterChars(const TQString&)) ); + connect ( CharsListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + TQ_SLOT(insertCode()) ); + connect (buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(insertCode())); + connect (buttonChar, TQ_SIGNAL(clicked()), TQ_SLOT(insertChar())); + connect (buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancel())); filterChars(""); } diff --git a/quanta/dialogs/specialchardialog.h b/quanta/dialogs/specialchardialog.h index 807ece8f..75cc935b 100644 --- a/quanta/dialogs/specialchardialog.h +++ b/quanta/dialogs/specialchardialog.h @@ -23,7 +23,7 @@ class SpecialCharDialog : public SpecialCharDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index c10bc62e..136e181b 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -94,9 +94,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -146,8 +143,8 @@ <tabstop>buttonCancel</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>tdelistbox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistbox.h</include> +</includes> </UI> diff --git a/quanta/dialogs/tagdialogs/CMakeLists.txt b/quanta/dialogs/tagdialogs/CMakeLists.txt index 7d478f6d..7a53c140 100644 --- a/quanta/dialogs/tagdialogs/CMakeLists.txt +++ b/quanta/dialogs/tagdialogs/CMakeLists.txt @@ -18,6 +18,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/src ${CMAKE_SOURCE_DIR}/quanta/parts/kafka ${CMAKE_SOURCE_DIR}/quanta/components/csseditor +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -33,4 +36,6 @@ tde_add_library( tagdialogs STATIC_PIC AUTOMOC tagimgdlg.cpp tagxml.cpp tagwidget.cpp colorcombo.cpp tagimgdlgdata.cpp tagmiscdlg.cpp tagmail.ui + LINK + tdeabc-shared ) diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 5b735fcf..c12f2136 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -78,8 +78,8 @@ ColorCombo::ColorCombo( TQWidget *parent, const char *name ) addColors(); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); - connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) ); } ColorCombo::~ColorCombo() diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index 0c05dc5a..ad6209d1 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -39,7 +39,7 @@ */ class ColorCombo : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: ColorCombo( TQWidget *parent = 0L, const char *name = 0L ); diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index eeb6bfc2..413add61 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -42,7 +42,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) adjustSize(); resize(sizeHint()); - connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); + connect(listbox,TQ_SIGNAL(doubleClicked( TQListBoxItem * )), TQ_SLOT(slotOk())); } ListDlg::~ListDlg(){ diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h index 3d190ae7..74663c1f 100644 --- a/quanta/dialogs/tagdialogs/listdlg.h +++ b/quanta/dialogs/tagdialogs/listdlg.h @@ -31,7 +31,7 @@ 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); diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h index 2ee4cfd0..759ee335 100644 --- a/quanta/dialogs/tagdialogs/pictureview.h +++ b/quanta/dialogs/tagdialogs/pictureview.h @@ -28,7 +28,7 @@ used by TagImgDlg */ class PictureView : public TQFrame { - Q_OBJECT + TQ_OBJECT public: PictureView(TQWidget *parent=0, char *file=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 7db3c307..b788bb3a 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -118,8 +118,8 @@ void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect( this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(slotAccept()) ); - connect( this, TQT_SIGNAL(cancelButtonPressed()), TQT_SLOT(reject()) ); + connect( this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(slotAccept()) ); + connect( this, TQ_SIGNAL(cancelButtonPressed()), TQ_SLOT(reject()) ); if (!a_dtdTag) //the tag is invalid, let's create a default one { diff --git a/quanta/dialogs/tagdialogs/tagdialog.h b/quanta/dialogs/tagdialogs/tagdialog.h index 21ad7b0f..4d9c3fb5 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.h +++ b/quanta/dialogs/tagdialogs/tagdialog.h @@ -38,7 +38,7 @@ class KURL; class TQShowEvent; class TagDialog : public TQTabDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 4c9531ee..02e61726 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -36,7 +36,7 @@ TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name) + : TQWidget(parent,name), TagWidget(parent,name) { m_dtd = dtd; img = 0L; @@ -45,9 +45,9 @@ TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) initDialog(); - connect( buttonImgSource, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( buttonRecalcImgSize, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecalcImgSize()) ); - connect( lineImgSource, TQT_SIGNAL( returnPressed()), this, TQT_SLOT(slotLineFileSelect()) ); + connect( buttonImgSource, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( buttonRecalcImgSize, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecalcImgSize()) ); + connect( lineImgSource, TQ_SIGNAL( returnPressed()), this, TQ_SLOT(slotLineFileSelect()) ); } TagImgDlg::~TagImgDlg() diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h index 09d3a3ee..e09634ff 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.h +++ b/quanta/dialogs/tagdialogs/tagimgdlg.h @@ -39,7 +39,7 @@ class TQImage; */ class TagImgDlg : public TQWidget, TagWidget { - Q_OBJECT + TQ_OBJECT public: TagImgDlg(const DTDStruct *dtd, TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagmail.ui b/quanta/dialogs/tagdialogs/tagmail.ui index e7a71fa1..4072c177 100644 --- a/quanta/dialogs/tagdialogs/tagmail.ui +++ b/quanta/dialogs/tagdialogs/tagmail.ui @@ -127,4 +127,7 @@ </grid> </widget> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index ff91277d..925d79c0 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -40,9 +40,9 @@ TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) setCaption(name); setModal(true); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); - connect( buttonAddressSelect, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAddress()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); + connect( buttonAddressSelect, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAddress()) ); buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); lineEmail->setFocus(); diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.h b/quanta/dialogs/tagdialogs/tagmaildlg.h index 9cb82e5d..8a1a6e21 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.h +++ b/quanta/dialogs/tagdialogs/tagmaildlg.h @@ -23,7 +23,7 @@ */ class TagMailDlg : public TagMail { -Q_OBJECT +TQ_OBJECT public: TagMailDlg(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index bea9a81f..b95fe0e9 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -23,7 +23,7 @@ TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, :KDialogBase( parent, 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 & ) ) ); + connect( miscWidget->elementName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotMiscTagChanged(const TQString & ) ) ); setMainWidget(miscWidget); miscWidget->addClosingTag->setChecked(addClosingTag); miscWidget->elementName->setText(element); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.h b/quanta/dialogs/tagdialogs/tagmiscdlg.h index 222d6bab..3c56ec07 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.h +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.h @@ -23,7 +23,7 @@ class TagMisc; class TagMiscDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 7a9edbdb..f070eeaf 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -33,8 +33,8 @@ TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) groupBox->insert(radioOrdered); groupBox->insert(radioUnordered); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } TagQuickListDlg::~TagQuickListDlg(){ diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h index 946efb67..c0f0f310 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h @@ -32,7 +32,7 @@ class TQButtonGroup; */ class TagQuickListDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: TagQuickListDlg(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 2db18a3e..c94146bb 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -30,13 +30,13 @@ #include "styleeditor.h" Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *parent, const char *name) - :TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d) + :TQWidget(parent,name), TagWidget(parent,name), doc(d) { initialize(d, dtdTag); } Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d), m_selection(selection) + : TQWidget(parent,name), TagWidget(parent,name), doc(d), m_selection(selection) { initialize(d, dtdTag); } diff --git a/quanta/dialogs/tagdialogs/tagxml.h b/quanta/dialogs/tagdialogs/tagxml.h index ec25e7ed..13013056 100644 --- a/quanta/dialogs/tagdialogs/tagxml.h +++ b/quanta/dialogs/tagdialogs/tagxml.h @@ -27,7 +27,7 @@ #include "qtag.h" class Tagxml : public TQWidget, TagWidget { - Q_OBJECT + TQ_OBJECT public: /** construtor */ diff --git a/quanta/messages/CMakeLists.txt b/quanta/messages/CMakeLists.txt index 8e2d1d40..9552040a 100644 --- a/quanta/messages/CMakeLists.txt +++ b/quanta/messages/CMakeLists.txt @@ -16,6 +16,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/project ${CMAKE_SOURCE_DIR}/quanta/parsers ${CMAKE_SOURCE_DIR}/quanta/utility +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 418f7f17..892f6dc9 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -50,7 +50,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_yourAnnotations->setLineWidth(2); addTab(m_yourAnnotations, i18n("For You")); - connect(m_yourAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); + connect(m_yourAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); m_allAnnotations = new TDEListView(this); m_allAnnotations->addColumn("1", -1); @@ -59,14 +59,14 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_allAnnotations->header()->hide(); m_allAnnotations->setSorting(1); m_allAnnotations->setLineWidth(2); - connect(m_allAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); + connect(m_allAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); addTab(m_allAnnotations, i18n("All Files")); - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(tabChanged(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(tabChanged(TQWidget*))); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateNextFile())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateNextFile())); m_yourAnnotationsNum = 0; } @@ -324,7 +324,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) } else pos++; int pos2 = line.find(rx); - annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); + annotations.insert(i, qMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); } ++i; } diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h index 850b3e7c..d2060142 100644 --- a/quanta/messages/annotationoutput.h +++ b/quanta/messages/annotationoutput.h @@ -36,7 +36,7 @@ enum AnnotationScope class AnnotationOutput : public KTabWidget { -Q_OBJECT +TQ_OBJECT public: AnnotationOutput(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 06625c74..1abab263 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -38,20 +38,20 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) m_maxItems = 2000; TQPalette pal = palette(); - pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Normal, TQColorGroup::Text)); - pal.setColor(TQColorGroup::Highlight, pal.color(TQPalette::Normal, TQColorGroup::Mid)); + pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Active, TQColorGroup::Text)); + pal.setColor(TQColorGroup::Highlight, pal.color(TQPalette::Active, TQColorGroup::Mid)); setPalette(pal); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); m_popupMenu = new TDEPopupMenu(this); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); - m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ; - m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ; + connect(this, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQ_SLOT(copyContent()) ) ; + m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveContent()) ) ; m_popupMenu->insertSeparator(); - m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ; + m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clear()) ) ; - connect( this, TQT_SIGNAL(clicked(TQListBoxItem*)), TQT_SLOT(clickItem(TQListBoxItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListBoxItem*)), TQ_SLOT(clickItem(TQListBoxItem*)) ); } MessageOutput::~MessageOutput() diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h index f958ac00..8a67922b 100644 --- a/quanta/messages/messageoutput.h +++ b/quanta/messages/messageoutput.h @@ -31,7 +31,7 @@ weblint output */ class MessageOutput : public TQListBox { - Q_OBJECT + TQ_OBJECT public: MessageOutput(TQWidget *parent=0, const char *name=0); diff --git a/quanta/parsers/CMakeLists.txt b/quanta/parsers/CMakeLists.txt index 53536e0b..a7c6adc4 100644 --- a/quanta/parsers/CMakeLists.txt +++ b/quanta/parsers/CMakeLists.txt @@ -19,6 +19,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/utility ${CMAKE_SOURCE_DIR}/quanta/treeviews ${CMAKE_SOURCE_DIR}/quanta/parts/kafka +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/parsers/dtd/CMakeLists.txt b/quanta/parsers/dtd/CMakeLists.txt index 7997cc5a..5d767f5e 100644 --- a/quanta/parsers/dtd/CMakeLists.txt +++ b/quanta/parsers/dtd/CMakeLists.txt @@ -9,13 +9,20 @@ # ################################################# +add_compile_options( ${ICU_CXXFLAGS} ) + + include_directories( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/quanta/dialogs ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/quanta/parsers ${CMAKE_SOURCE_DIR}/quanta/utility ${CMAKE_SOURCE_DIR}/quanta/dialogs +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ${LIBXML_INCLUDE_DIRS} diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 502551fd..9de0f39a 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -13,6 +13,10 @@ * * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + //qt includes #include <tqcheckbox.h> #include <tqfile.h> @@ -32,10 +36,6 @@ #include <tdeio/netaccess.h> //other includes -#ifdef LIBXML_2_5 -#include <libxml/hash.h> -#endif - #include <libxml/parser.h> #include <libxml/valid.h> @@ -82,8 +82,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) if( DTD::dtd_ptr == NULL ) { TQString errorStr = i18n("Unknown"); -#ifndef LIBXML_2_5 - xmlErrorPtr errorPtr = xmlGetLastError(); + // The type used is either xmlErrorPtr or const xmlError* + auto errorPtr = xmlGetLastError(); if (errorPtr != NULL) { TQString s = TQString::fromLatin1(errorPtr->message); @@ -99,9 +99,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) if (!s.isEmpty()) errorStr += "<br>" + s; errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); - xmlResetError(errorPtr); + xmlResetLastError(); } -#endif KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr)); return false; } @@ -144,7 +143,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) TQFile file( DTD::dirName + "entities.tag" ); if ( file.open( IO_WriteOnly ) ) { - DTD::entityStream.setDevice(TQT_TQIODEVICE(&file)); + DTD::entityStream.setDevice(&file); DTD::entityStream.setEncoding(TQTextStream::UnicodeUTF8); DTD::entityStream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl; DTD::entityStream << "<!DOCTYPE TAGS>" << endl diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index cfca7279..f789f911 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -79,10 +79,10 @@ Parser::Parser() m_parsingNeeded = true; m_parseIncludedFiles = true; m_saParser = new SAParser(); - connect(m_saParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(m_saParser, TQT_SIGNAL(cleanGroups()), TQT_SLOT(cleanGroups())); + connect(m_saParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(m_saParser, TQ_SIGNAL(cleanGroups()), TQ_SLOT(cleanGroups())); ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); } Parser::~Parser() @@ -567,7 +567,7 @@ Node *Parser::parse(Document *w, bool force) emit nodeTreeChanged(); if (saParserEnabled) - TQTimer::singleShot(0, this, TQT_SLOT(slotParseInDetail())); + TQTimer::singleShot(0, this, TQ_SLOT(slotParseInDetail())); return m_node; } @@ -1244,7 +1244,7 @@ Node *Parser::rebuild(Document *w) m_saParser->init(m_node, w); if (saParserEnabled) - TQTimer::singleShot(0, this, TQT_SLOT(slotParseInDetail())); + TQTimer::singleShot(0, this, TQ_SLOT(slotParseInDetail())); emit nodeTreeChanged(); m_parsingNeeded = false; return m_node; @@ -1297,7 +1297,7 @@ void Parser::clearGroups() ParserCommon::includedFilesDTD.clear(); delete ParserCommon::includeWatch; ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); m_parseIncludedFiles = true; } @@ -1345,7 +1345,7 @@ void Parser::cleanGroups() { delete ParserCommon::includeWatch; ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); parseIncludedFiles(); } } diff --git a/quanta/parsers/parser.h b/quanta/parsers/parser.h index d717f6f2..e3869b6b 100644 --- a/quanta/parsers/parser.h +++ b/quanta/parsers/parser.h @@ -44,7 +44,7 @@ typedef TQMap<TQString, IncludedGroupElements> IncludedGroupElementsMap; class Parser: public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp index 000ba002..1b665ebf 100644 --- a/quanta/parsers/sagroupparser.cpp +++ b/quanta/parsers/sagroupparser.cpp @@ -46,7 +46,7 @@ SAGroupParser::SAGroupParser(SAParser *parent, Document *write, Node *startNode, m_write = write; m_count = 0; m_parseForGroupTimer = new TQTimer(this); - connect(m_parseForGroupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseForScriptGroup())); + connect(m_parseForGroupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseForScriptGroup())); } void SAGroupParser::slotParseForScriptGroup() diff --git a/quanta/parsers/sagroupparser.h b/quanta/parsers/sagroupparser.h index ca4add8f..83ec62ef 100644 --- a/quanta/parsers/sagroupparser.h +++ b/quanta/parsers/sagroupparser.h @@ -31,7 +31,7 @@ class SAParser; */ class SAGroupParser : public TQObject { -Q_OBJECT +TQ_OBJECT public: public: diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index 691c2d2e..fcf9b17d 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -44,9 +44,9 @@ SAParser::SAParser() m_parsingEnabled = true; m_synchronous = true; m_parseOneLineTimer = new TQTimer(this); - connect(m_parseOneLineTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseOneLine())); + connect(m_parseOneLineTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseOneLine())); m_parseInDetailTimer = new TQTimer(this); - connect(m_parseInDetailTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseNodeInDetail())); + connect(m_parseInDetailTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseNodeInDetail())); } SAParser::~SAParser() @@ -396,9 +396,9 @@ bool SAParser::slotParseOneLine() } } SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, g_endNode, m_synchronous, parsingLastNode, true); - connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups())); - connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*))); + connect(groupParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(groupParser, TQ_SIGNAL(cleanGroups()), TQ_SIGNAL(cleanGroups())); + connect(groupParser, TQ_SIGNAL(parsingDone(SAGroupParser*)), TQ_SLOT(slotGroupParsingDone(SAGroupParser*))); groupParser->slotParseForScriptGroup(); m_groupParsers.append(groupParser); } @@ -818,9 +818,9 @@ Node *SAParser::parsingDone() if (!m_synchronous) { SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, 0L, m_synchronous, true /*last node*/, true); - connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups())); - connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*))); + connect(groupParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(groupParser, TQ_SIGNAL(cleanGroups()), TQ_SIGNAL(cleanGroups())); + connect(groupParser, TQ_SIGNAL(parsingDone(SAGroupParser*)), TQ_SLOT(slotGroupParsingDone(SAGroupParser*))); groupParser->slotParseForScriptGroup(); m_groupParsers.append(groupParser); } diff --git a/quanta/parsers/saparser.h b/quanta/parsers/saparser.h index 463cf1b9..8360985d 100644 --- a/quanta/parsers/saparser.h +++ b/quanta/parsers/saparser.h @@ -40,7 +40,7 @@ class SAGroupParser; */ class SAParser: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/parts/kafka/CMakeLists.txt b/quanta/parts/kafka/CMakeLists.txt index 19519b44..eebfe2f1 100644 --- a/quanta/parts/kafka/CMakeLists.txt +++ b/quanta/parts/kafka/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -# FIXME KDE_CXXFLAGS = $(USE_EXCEPTIONS) +# FIXME KDE_CXXFLAGS = $(USE_EXCEPTIONS) # add_compile_options( -fexceptions ) add_subdirectory( pics ) @@ -21,6 +21,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/parsers ${CMAKE_SOURCE_DIR}/quanta/utility ${CMAKE_SOURCE_DIR}/quanta/treeviews +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index 1c5c572d..6c74b132 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -38,8 +38,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char addColumn(""); setSorting(-1); part = currentpart; - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *))); m_nodedict.setAutoDelete(true); title = ""; titleItem = new TQListViewItem(static_cast<TQListView *>(this), title, ""); diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h index bd67d9fd..45e00176 100644 --- a/quanta/parts/kafka/domtreeview.h +++ b/quanta/parts/kafka/domtreeview.h @@ -37,7 +37,7 @@ class TQGridLayout; class DOMTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0); @@ -66,7 +66,7 @@ class DOMTreeView : public TDEListView class KafkaDOMTreeDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: KafkaDOMTreeDialog(TQWidget *parent = 0, TDEHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index c997ffee..ce078a8c 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -69,7 +69,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse ok->setAutoDefault(true); //set the taborder and disable focus for some widgets. - currentDTD->setFocusPolicy(TQ_NoFocus); + currentDTD->setFocusPolicy(TQWidget::NoFocus); TQWidget::setTabOrder(title, metaItems); TQWidget::setTabOrder(metaItems, metaItemsAdd); TQWidget::setTabOrder(metaItemsAdd, metaItemsDelete); @@ -98,7 +98,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cssRules->addColumn(i18n("Rule")); cssRules->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); cssRules->setLineWidth( 2 ); - //cssRules->setFocusPolicy(TQ_ClickFocus); + //cssRules->setFocusPolicy(TQWidget::ClickFocus); cssRules->setSorting(-1); //search for the head, html, title Node @@ -230,20 +230,20 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cancel->setIconSet(SmallIconSet("button_cancel")); //connect buttons - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - connect(cssRulesAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newCSSRule())); - connect(cssRulesEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editCSSRule())); - connect (cssRulesDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentCSSRule())); - connect(metaItemsAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newMetaItem())); - connect(metaItemsDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentMetaItem())); - connect(title, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(titleChanged(const TQString &))); - connect(metaItems, TQT_SIGNAL(itemModified( TQListViewItem * )), - this, TQT_SLOT(metaChanged(TQListViewItem * ))); - connect(cssRules, TQT_SIGNAL(itemModified( TQListViewItem * )), - this, TQT_SLOT(CSSChanged(TQListViewItem * ))); - connect(cssStylesheet, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(linkChanged( const TQString& ))); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); + connect(cssRulesAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newCSSRule())); + connect(cssRulesEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(editCSSRule())); + connect (cssRulesDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentCSSRule())); + connect(metaItemsAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newMetaItem())); + connect(metaItemsDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentMetaItem())); + connect(title, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(titleChanged(const TQString &))); + connect(metaItems, TQ_SIGNAL(itemModified( TQListViewItem * )), + this, TQ_SLOT(metaChanged(TQListViewItem * ))); + connect(cssRules, TQ_SIGNAL(itemModified( TQListViewItem * )), + this, TQ_SLOT(CSSChanged(TQListViewItem * ))); + connect(cssStylesheet, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(linkChanged( const TQString& ))); } htmlDocumentProperties::~htmlDocumentProperties() diff --git a/quanta/parts/kafka/htmldocumentproperties.h b/quanta/parts/kafka/htmldocumentproperties.h index 2d264366..2d4e2706 100644 --- a/quanta/parts/kafka/htmldocumentproperties.h +++ b/quanta/parts/kafka/htmldocumentproperties.h @@ -44,7 +44,7 @@ public: */ class htmlDocumentProperties : public htmlDocumentPropertiesui { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui index c826dd73..b5e18f2c 100644 --- a/quanta/parts/kafka/htmldocumentpropertiesui.ui +++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui @@ -441,7 +441,7 @@ <tabstop>ok</tabstop> <tabstop>cancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">newMetaItem()</slot> <slot access="protected" specifier="pure virtual">deleteCurrentMetaItem()</slot> <slot access="protected" specifier="pure virtual">newCSSRule()</slot> @@ -451,6 +451,11 @@ <slot access="protected" specifier="pure virtual">metaChanged(TQListViewItem * )</slot> <slot access="protected" specifier="pure virtual">CSSChanged(TQListViewItem * )</slot> <slot access="protected" specifier="pure virtual">linkChanged( const TQString& )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kurlrequester.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/quanta/parts/kafka/kafkadragobject.h b/quanta/parts/kafka/kafkadragobject.h index 00946ce7..aa73a630 100644 --- a/quanta/parts/kafka/kafkadragobject.h +++ b/quanta/parts/kafka/kafkadragobject.h @@ -28,7 +28,7 @@ class Node; */ class KafkaDragObject: public TQStoredDrag { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index a1e78aa5..fc0460ad 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -85,7 +85,7 @@ public: KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part, const char *name) - : TDEHTMLPart(widgetParent, name, TQT_TQOBJECT(parent), name), + : TDEHTMLPart(widgetParent, name, parent, name), w(part) { m_contextPopupMenu = new TQPopupMenu(); @@ -99,15 +99,17 @@ KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument m_modifs = 0L; + view()->setInputMethodEnabled(true); + // With the mix of Leo Savernik's caret Mode and the current editing // functions, it will be kind of VERY messy setCaretMode(true); - connect(this, TQT_SIGNAL(caretPositionChanged(const DOM::Node &, long)), - this, TQT_SLOT(slotNewCursorPos(const DOM::Node &, long))); + connect(this, TQ_SIGNAL(caretPositionChanged(const DOM::Node &, long)), + this, TQ_SLOT(slotNewCursorPos(const DOM::Node &, long))); setCaretDisplayPolicyNonFocused(TDEHTMLPart::CaretVisible); - connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), - this, TQT_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&))); + connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), + this, TQ_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&))); view()->setMouseTracking(true); view()->installEventFilter(this); @@ -184,7 +186,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) kdDebug(25001) << "KafkaWidget::insertText() - added text - 1" << endl; #endif - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); return; } } @@ -261,7 +263,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) } //document().updateRendering(); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } void KafkaWidget::slotDelayedSetCaretPosition() @@ -465,7 +467,7 @@ void KafkaWidget::keyReturn(bool specialPressed) kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":" << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":" << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; //emit domNodeNewCursorPos(m_currentNode, d->m_cursorOffset); @@ -476,7 +478,7 @@ void KafkaWidget::keyReturn(bool specialPressed) << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; #endif - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) @@ -504,9 +506,9 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) emit hasFocus(false); } - if(event->type() == TQEvent::KeyPress) + if(event->type() == TQEvent::KeyPress || event->type() == TQEvent::IMEnd) { - TQKeyEvent *keyevent = TQT_TQKEYEVENT(event); + TQKeyEvent *keyevent = static_cast<TQKeyEvent*>(event); //Create a new NodeModifsSet where the changes will be logged. m_modifs = new NodeModifsSet(); @@ -655,13 +657,13 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) kdDebug(25001) << "KafkaWidget::eventFilter() Text - " << keyevent->text() << endl; #endif - //if(( keyevent->state() & TQt::ShiftButton) || ( keyevent->state() == Qt::NoButton)) + //if(( keyevent->state() & TQt::ShiftButton) || ( keyevent->state() == TQt::NoButton)) if( keyevent->text().length() && ( !( keyevent->state() & ControlButton ) && !( keyevent->state() & AltButton ) && !( keyevent->state() & MetaButton ) || ( ( (keyevent->state()&ControlButton) | AltButton ) == (ControlButton|AltButton) ) ) && - ( !keyevent->ascii() || keyevent->ascii() >= 32 || keyevent->text() == "\t" ) ) + ( !keyevent->ascii() || keyevent->ascii() >= 32 || keyevent->text() == "\t" ) || event->type() == TQEvent::IMEnd ) { if(hasSelection()) removeSelection(); @@ -1531,7 +1533,7 @@ void KafkaWidget::keyBackspace() emit domNodeModified(temp, m_modifs); if(boolTmp) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } } @@ -1597,7 +1599,7 @@ void KafkaWidget::keyBackspace() { m_currentNode = _nodePrev; d->m_cursorOffset += (static_cast<DOM::CharacterData>(_nodePrev)).length(); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } _nodePrev.setNodeValue(_nodePrev.nodeValue() + _node.nodeValue()); emit domNodeModified(_nodePrev, m_modifs); @@ -1618,7 +1620,7 @@ void KafkaWidget::keyBackspace() m_currentNode = m_currentNode.previousSibling(); d->m_cursorOffset = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } else if(!m_currentNode.nextSibling().isNull()) { @@ -2088,7 +2090,7 @@ void KafkaWidget::setCurrentNode(DOM::Node node, int offset) d->m_cursorOffset = offset; makeCursorVisible(); if(!m_currentNode.isNull() && m_currentNode.nodeName().string() != "#document") - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); //setCaretPosition(m_currentNode, (long)d->m_cursorOffset); } @@ -2139,7 +2141,7 @@ void KafkaWidget::putCursorAtFirstAvailableLocation() } m_currentNode = node; d->m_cursorOffset = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); #ifdef LIGHT_DEBUG @@ -2236,7 +2238,7 @@ void KafkaWidget::removeSelection() setCurrentNode(m_currentNode, domNodeCursorOffset); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); NodeSelection* cursorPos = new NodeSelection(); cursorPos->setCursorNode(cursorNode); @@ -2261,7 +2263,7 @@ void KafkaWidget::applyQueuedToggableTagActions() { if(tag_action->name() == *it) { - tag_action->slotActionActivated(TDEAction::EmulatedActivation, Qt::NoButton); + tag_action->slotActionActivated(TDEAction::EmulatedActivation, TQt::NoButton); break; } } diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h index e8416be2..dd3f2b0d 100644 --- a/quanta/parts/kafka/kafkahtmlpart.h +++ b/quanta/parts/kafka/kafkahtmlpart.h @@ -45,7 +45,7 @@ class TQPopupMenu; class KafkaWidget : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part, diff --git a/quanta/parts/kafka/kafkasyncoptions.h b/quanta/parts/kafka/kafkasyncoptions.h index 75c8c4f5..3bf6ef6b 100644 --- a/quanta/parts/kafka/kafkasyncoptions.h +++ b/quanta/parts/kafka/kafkasyncoptions.h @@ -24,7 +24,7 @@ class TDEConfig; class KafkaSyncOptions : public KafkaSyncOptionsUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 8cb3c05c..483454ee 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -116,17 +116,17 @@ TQString ab = i18n("Ident all"); file.close(); } - connect(m_kafkaPart, TQT_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*))); - - connect(m_kafkaPart, TQT_SIGNAL(domNodeNewCursorPos(DOM::Node, int)), - this, TQT_SLOT(slotdomNodeNewCursorPos(DOM::Node, int))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*))); + + connect(m_kafkaPart, TQ_SIGNAL(domNodeNewCursorPos(DOM::Node, int)), + this, TQ_SLOT(slotdomNodeNewCursorPos(DOM::Node, int))); } diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h index 5aea1c0e..b17b39b3 100644 --- a/quanta/parts/kafka/wkafkapart.h +++ b/quanta/parts/kafka/wkafkapart.h @@ -49,7 +49,7 @@ class NodeModifsSet; */ class KafkaDocument : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** Returns a reference to the KafkaDocument object */ diff --git a/quanta/parts/preview/CMakeLists.txt b/quanta/parts/preview/CMakeLists.txt index 8a0493c5..39fde475 100644 --- a/quanta/parts/preview/CMakeLists.txt +++ b/quanta/parts/preview/CMakeLists.txt @@ -12,6 +12,9 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/quanta/utility +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 86de0b2d..2de57fbf 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -53,11 +53,11 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable if (m_enableViewSource) { m_contextMenu = new TDEPopupMenu(parentWidget); - m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource())); + m_contextMenu->insertItem(i18n("View &Document Source"), this, TQ_SLOT(slotViewSource())); - connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&))); + connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQ_SLOT(popupMenu(const TQString&, const TQPoint&))); } - connect(browserExtension(), TQT_SIGNAL(openURLRequest (const KURL &, const KParts::URLArgs &)), this, TQT_SLOT(openURL(const KURL&))); + connect(browserExtension(), TQ_SIGNAL(openURLRequest (const KURL &, const KParts::URLArgs &)), this, TQ_SLOT(openURL(const KURL&))); // setCharset( konqConfig.readEntry("DefaultEncoding") ); // setEncoding( konqConfig.readEntry("DefaultEncoding") ); @@ -160,10 +160,10 @@ KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * parentWidget, const char bool WHTMLPart::eventFilter(TQObject *watched, TQEvent *e) { - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(view()) && e->type() == TQEvent::FocusOut && (!m_contextMenu || !m_contextMenu->hasFocus())) + if (watched == view() && e->type() == TQEvent::FocusOut && (!m_contextMenu || !m_contextMenu->hasFocus())) emit previewHasFocus(false); else - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(view()) && e->type() == TQEvent::FocusIn) + if (watched == view() && e->type() == TQEvent::FocusIn) emit previewHasFocus(true); return false; } diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h index 73bd23e5..1b8e2b87 100644 --- a/quanta/parts/preview/whtmlpart.h +++ b/quanta/parts/preview/whtmlpart.h @@ -28,7 +28,7 @@ class TDEPopupMenu; */ class WHTMLPart : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: WHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0, bool enableViewSource = false, diff --git a/quanta/plugins/CMakeLists.txt b/quanta/plugins/CMakeLists.txt index 21be0e70..f4e84be9 100644 --- a/quanta/plugins/CMakeLists.txt +++ b/quanta/plugins/CMakeLists.txt @@ -16,6 +16,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/parsers ${CMAKE_SOURCE_DIR}/quanta/utility ${CMAKE_SOURCE_DIR}/quanta/messages +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui index 05766e6b..aa692c44 100644 --- a/quanta/plugins/pluginconfig.ui +++ b/quanta/plugins/pluginconfig.ui @@ -259,12 +259,9 @@ <includes> <include location="global" impldecl="in implementation">kicondialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>pluginType_highlighted(const TQString&)</slot> <slot>slotPluginTypeHighlighted(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kicondialog.h</includehint> -</includehints> </UI> diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index 19cc5981..71b6fe1d 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -73,7 +73,7 @@ void QuantaPlugin::setPluginName(const TQString &a_name) m_name = a_name; if (!m_action) { - m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQT_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); + m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQ_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); } m_action->setText(a_name); } @@ -114,9 +114,9 @@ bool QuantaPlugin::load() TQString ow = outputWindow(); m_targetWidget = new TQWidget(quantaApp); if (m_readOnlyPart) - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 ); else - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 ); if(!m_part) { KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br> - <b>%2</b> is not installed;<br> - the file <i>%3</i> is not installed or it is not reachable.").arg(m_name).arg(m_name).arg(m_fileName)); @@ -126,7 +126,7 @@ bool QuantaPlugin::load() } m_part->setName(m_name.ascii()); // for better debug output m_part->widget()->setName(m_name.ascii()); //needed to be able to dock the same plugin twice in separate toolviews - m_part->widget()->setFocusPolicy(TQ_ClickFocus); + m_part->widget()->setFocusPolicy(TQWidget::ClickFocus); quantaApp->slotNewPart(m_part, false); // register the part in the partmanager return true; } @@ -184,8 +184,8 @@ bool QuantaPlugin::run() } addWidget(); setRunning(true); - connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - quantaApp, TQT_SLOT(slotStatusMsg( const TQString & ))); + connect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + quantaApp, TQ_SLOT(slotStatusMsg( const TQString & ))); emit pluginStarted(); @@ -287,8 +287,8 @@ bool QuantaPlugin::unload(bool remove) if(!isLoaded()) return false; - disconnect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - quantaApp, TQT_SLOT(slotStatusMsg( const TQString & ))); + disconnect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + quantaApp, TQ_SLOT(slotStatusMsg( const TQString & ))); delete (KParts::ReadOnlyPart*) m_part; m_part = 0; diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h index 5f022797..a222909a 100644 --- a/quanta/plugins/quantaplugin.h +++ b/quanta/plugins/quantaplugin.h @@ -38,7 +38,7 @@ class QuantaView; class QuantaPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: QuantaPlugin(); diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp index 57488d2f..f4f509d7 100644 --- a/quanta/plugins/quantapluginconfig.cpp +++ b/quanta/plugins/quantapluginconfig.cpp @@ -47,8 +47,8 @@ QuantaPluginConfig::QuantaPluginConfig(TQWidget *a_parent, const char *a_name) m_pluginConfigWidget->outputWindow->insertStringList(windows); m_pluginConfigWidget->iconButton->setStrictIconSize(false); - connect(m_pluginConfigWidget->pluginName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); - connect(m_pluginConfigWidget->locationButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectLocation())); + connect(m_pluginConfigWidget->pluginName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(nameChanged(const TQString &))); + connect(m_pluginConfigWidget->locationButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectLocation())); setMainWidget(m_pluginConfigWidget); } diff --git a/quanta/plugins/quantapluginconfig.h b/quanta/plugins/quantapluginconfig.h index 6b5dc328..113a252d 100644 --- a/quanta/plugins/quantapluginconfig.h +++ b/quanta/plugins/quantapluginconfig.h @@ -29,7 +29,7 @@ class TQString; class QuantaPluginConfig : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: QuantaPluginConfig(TQWidget *, const char *); diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp index ba5294f2..a3ec85bb 100644 --- a/quanta/plugins/quantaplugineditor.cpp +++ b/quanta/plugins/quantaplugineditor.cpp @@ -52,14 +52,14 @@ QuantaPluginEditor::QuantaPluginEditor(TQWidget *a_parent, const char *a_name) m_pluginEditorWidget->pluginList->setAllColumnsShowFocus(true); m_pluginEditorWidget->pluginList->setColumnAlignment(2, TQt::AlignHCenter); - connect(this, TQT_SIGNAL(pluginsChanged()), TQT_SLOT(refreshPlugins())); - connect(m_pluginEditorWidget->refreshButton, TQT_SIGNAL(clicked()), TQT_SLOT(refreshPlugins())); - connect(m_pluginEditorWidget->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addPlugin())); - connect(m_pluginEditorWidget->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removePlugin())); - connect(m_pluginEditorWidget->addSearchPathButton, TQT_SIGNAL(clicked()), TQT_SLOT(addSearchPath())); - connect(m_pluginEditorWidget->configureButton, TQT_SIGNAL(clicked()), TQT_SLOT(configurePlugin())); - connect(m_pluginEditorWidget->pluginList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(configurePlugin(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(pluginsChanged()), TQ_SLOT(refreshPlugins())); + connect(m_pluginEditorWidget->refreshButton, TQ_SIGNAL(clicked()), TQ_SLOT(refreshPlugins())); + connect(m_pluginEditorWidget->addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addPlugin())); + connect(m_pluginEditorWidget->removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removePlugin())); + connect(m_pluginEditorWidget->addSearchPathButton, TQ_SIGNAL(clicked()), TQ_SLOT(addSearchPath())); + connect(m_pluginEditorWidget->configureButton, TQ_SIGNAL(clicked()), TQ_SLOT(configurePlugin())); + connect(m_pluginEditorWidget->pluginList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(configurePlugin(TQListViewItem*, const TQPoint&, int))); } QuantaPluginEditor::~QuantaPluginEditor() diff --git a/quanta/plugins/quantaplugineditor.h b/quanta/plugins/quantaplugineditor.h index 3149f008..750ae12c 100644 --- a/quanta/plugins/quantaplugineditor.h +++ b/quanta/plugins/quantaplugineditor.h @@ -41,7 +41,7 @@ class PluginEditor; class QuantaPluginEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index ce838550..d963f3a1 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -42,7 +42,7 @@ QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent) { m_parent = parent; (void) new TDEAction( i18n( "Configure &Plugins..." ), 0, 0, - this, TQT_SLOT( slotPluginsEdit() ), + this, TQ_SLOT( slotPluginsEdit() ), ((TDEMainWindow*)parent)->actionCollection(), "configure_plugins" ); m_pluginMenu = 0L; // m_plugins.setAutoDelete(true); diff --git a/quanta/plugins/quantaplugininterface.h b/quanta/plugins/quantaplugininterface.h index 28458fad..d045a41d 100644 --- a/quanta/plugins/quantaplugininterface.h +++ b/quanta/plugins/quantaplugininterface.h @@ -37,7 +37,7 @@ class QuantaPlugin; */ class QuantaPluginInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/quanta/project/CMakeLists.txt b/quanta/project/CMakeLists.txt index 6f3c6f8f..ba5015ad 100644 --- a/quanta/project/CMakeLists.txt +++ b/quanta/project/CMakeLists.txt @@ -22,6 +22,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs ${CMAKE_SOURCE_DIR}/quanta/components/debugger ${CMAKE_SOURCE_DIR}/quanta/components/debugger/interfaces +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h index b7c64779..9f44580e 100644 --- a/quanta/project/eventconfigurationdlg.h +++ b/quanta/project/eventconfigurationdlg.h @@ -26,7 +26,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class EventConfigurationDlg : public EventConfigurationDlgS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 73bb8666..06247c75 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -211,13 +211,14 @@ <tabstop>editButton</tabstop> <tabstop>deleteButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotEditEvent()</slot> <slot>slotAddEvent()</slot> <slot>slotDeleteEvent()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>tdelistview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">tdelistview.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h index 45b94a95..7dbcea90 100644 --- a/quanta/project/eventeditordlg.h +++ b/quanta/project/eventeditordlg.h @@ -26,7 +26,7 @@ class KComboBox; class EventEditorDlg : public EventEditorDlgS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui index 995aa1d4..0cc9a0cd 100644 --- a/quanta/project/eventeditordlgs.ui +++ b/quanta/project/eventeditordlgs.ui @@ -229,8 +229,11 @@ <slot>slotActionChanged(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotActionChanged(const TQString &name)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/project/membereditdlg.h b/quanta/project/membereditdlg.h index 32d26633..2e1b5a51 100644 --- a/quanta/project/membereditdlg.h +++ b/quanta/project/membereditdlg.h @@ -24,7 +24,7 @@ */ class MemberEditDlg : public MemberEditDlgS { -Q_OBJECT +TQ_OBJECT public: MemberEditDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui index 1d972b7b..ab625a5e 100644 --- a/quanta/project/membereditdlgs.ui +++ b/quanta/project/membereditdlgs.ui @@ -175,22 +175,16 @@ <tabstop>subprojectCombo</tabstop> <tabstop>editSubprojectsButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotRoleSelected(const TQString& roleName)</slot> <slot>slotEditSubprojects()</slot> <slot>slotMemberSelected()</slot> <slot>slotSelectFromAddrBook()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kcombobox.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 107ba14a..48e13beb 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -72,7 +72,7 @@ Project::Project(TDEMainWindow *parent) : TQObject() { d = new ProjectPrivate(this); - connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_mainWindow = parent; d->m_uploadDialog = 0L; keepPasswd = true; @@ -131,8 +131,8 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) if ( !destination.isEmpty() ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), d, - TQT_SLOT(slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), d, + TQ_SLOT(slotDeleteCopytoDlg(CopyTo*))); url = dlg->copy( nameURL, destination ); } else // Copy canceled, addition aborted @@ -307,10 +307,10 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) (!destination.isEmpty()) ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), d, - TQT_SLOT (slotDeleteCopytoDlg(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), d, + TQ_SLOT (slotDeleteCopytoDlg(CopyTo *))); //if ( rdir.right(1) == "/" ) rdir.remove( rdir.length()-1,1); dirURL = dlg->copy(dirURL, destination); return; @@ -477,10 +477,10 @@ void Project::slotOptions() optionsPage.lineEmail->setText( d->email ); // Signals to handle debugger settings - connect(optionsPage.buttonDebuggerOptions, TQT_SIGNAL(clicked()), - d, TQT_SLOT(slotDebuggerOptions())); - connect(optionsPage.comboDebuggerClient, TQT_SIGNAL(activated(const TQString &)), - d, TQT_SLOT(slotDebuggerChanged(const TQString &))); + connect(optionsPage.buttonDebuggerOptions, TQ_SIGNAL(clicked()), + d, TQ_SLOT(slotDebuggerOptions())); + connect(optionsPage.comboDebuggerClient, TQ_SIGNAL(activated(const TQString &)), + d, TQ_SLOT(slotDebuggerChanged(const TQString &))); // Debuggers Combo @@ -863,7 +863,7 @@ void Project::slotUpload() if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(KURL(), "", false, false, false, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -878,7 +878,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -1052,8 +1052,8 @@ void Project::slotReloadProjectDocs() { delete d->m_dirWatch; d->m_dirWatch = new KDirWatch(this); - connect(d->m_dirWatch, TQT_SIGNAL(dirty(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); - connect(d->m_dirWatch, TQT_SIGNAL(deleted(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(dirty(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(deleted(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); if (d->baseURL.isLocalFile()) d->m_dirWatch->addDir(d->baseURL.path() + "/doc"); KURL url; diff --git a/quanta/project/project.h b/quanta/project/project.h index e1487ad7..7c55cfef 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -52,7 +52,7 @@ struct SubProject { }; class Project : public TQObject { - Q_OBJECT + TQ_OBJECT friend class ProjectPrivate; // need this because I use the signals diff --git a/quanta/project/projectnewfinal.h b/quanta/project/projectnewfinal.h index 654af85a..2b3304ce 100644 --- a/quanta/project/projectnewfinal.h +++ b/quanta/project/projectnewfinal.h @@ -25,7 +25,7 @@ */ class ProjectNewFinal : public ProjectNewFinalS { - Q_OBJECT + TQ_OBJECT public: ProjectNewFinal(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index ce9faf08..1503b951 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -67,21 +67,21 @@ ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name ) linePrjTmpl->setText("templates"); linePrjToolbar->setText("toolbars"); - connect(comboProtocol, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotProtocolChanged(const TQString &))); - connect( linePrjFile, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonDir, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotButtonDir())); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeNames(const TQString &))); - connect( linePrjTmpl, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonTmpl, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonTmpl())); - connect( linePrjToolbar, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonToolbar, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonToolbar())); + connect(comboProtocol, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotProtocolChanged(const TQString &))); + connect( linePrjFile, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonDir, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotButtonDir())); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeNames(const TQString &))); + connect( linePrjTmpl, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonTmpl, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonTmpl())); + connect( linePrjToolbar, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonToolbar, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonToolbar())); linePrjTmpl->installEventFilter(this); linePrjToolbar->installEventFilter(this); @@ -218,7 +218,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) { if (e->type() == TQEvent::FocusOut) { - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjTmpl)) + if (watched == linePrjTmpl) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjTmpl->text()); @@ -231,7 +231,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) } else emit enableNextButton(this, true); } else - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjToolbar)) + if (watched == linePrjToolbar) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjToolbar->text()); diff --git a/quanta/project/projectnewgeneral.h b/quanta/project/projectnewgeneral.h index 6a1839b7..ea475989 100644 --- a/quanta/project/projectnewgeneral.h +++ b/quanta/project/projectnewgeneral.h @@ -27,7 +27,7 @@ class KURL; class ProjectNewGeneral : public ProjectNewGeneralS { - Q_OBJECT + TQ_OBJECT public: ProjectNewGeneral(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 1f4750b1..6964b030 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -59,13 +59,13 @@ ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name ) checkInsertWeb->setChecked( true ); - connect( checkInsert, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWeb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWithMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); + connect( checkInsert, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWeb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWithMask, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); - connect(addFiles, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFiles())); - connect(addFolder, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFolder())); - connect(clearList, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClearList())); + connect(addFiles, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFiles())); + connect(addFolder, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFolder())); + connect(clearList, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClearList())); } ProjectNewLocal::~ProjectNewLocal(){ @@ -202,10 +202,10 @@ void ProjectNewLocal::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); list = dlg->copy( list, destination ); return; } else @@ -263,10 +263,10 @@ void ProjectNewLocal::slotAddFolder() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); dirURL = dlg->copy(dirURL, destination); return; } else diff --git a/quanta/project/projectnewlocal.h b/quanta/project/projectnewlocal.h index 84952553..2663eaeb 100644 --- a/quanta/project/projectnewlocal.h +++ b/quanta/project/projectnewlocal.h @@ -29,7 +29,7 @@ class CopyTo; class ProjectNewLocal : public ProjectNewLocalS { - Q_OBJECT + TQ_OBJECT public: ProjectNewLocal(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index a23e8de7..4da60b9d 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -338,7 +338,7 @@ <tabstop>clearList</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>uploadtreeview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> +</includes> </UI> diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index d1692ab6..7e904fe8 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -49,14 +49,14 @@ ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name ) listView->removeColumn(1); listView->removeColumn(1); - connect( commandLine, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (enableStart(const TQString&))); - connect( siteUrl, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (setCommandL(const TQString&))); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT (slotStart())); - connect( protocolCombo,TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT (setProtocol(const TQString&))); + connect( commandLine, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (enableStart(const TQString&))); + connect( siteUrl, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (setCommandL(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT (slotStart())); + connect( protocolCombo,TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT (setProtocol(const TQString&))); start = false; KLed1->setState(KLed::Off); @@ -115,12 +115,12 @@ void ProjectNewWeb::slotStart() *proc << *it; } - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess *)), this, - TQT_SLOT( slotGetWgetExited(TDEProcess *))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess *)), this, + TQ_SLOT( slotGetWgetExited(TDEProcess *))); if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h index 5c6e2b5e..50681b09 100644 --- a/quanta/project/projectnewweb.h +++ b/quanta/project/projectnewweb.h @@ -33,7 +33,7 @@ class TDEProcess; class KURL; class ProjectNewWeb : public ProjectNewWebS { - Q_OBJECT + TQ_OBJECT public: ProjectNewWeb(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewwebs.ui b/quanta/project/projectnewwebs.ui index df0d8539..c499d194 100644 --- a/quanta/project/projectnewwebs.ui +++ b/quanta/project/projectnewwebs.ui @@ -284,9 +284,8 @@ <tabstop>button</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kled.h</includehint> - <includehint>uploadtreeview.h</includehint> - <includehint>kled.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> + <include location="global" impldecl="in implementation">kled.h</include> +</includes> </UI> diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui index 5d2e8cc8..ba95e7e2 100644 --- a/quanta/project/projectoptions.ui +++ b/quanta/project/projectoptions.ui @@ -435,9 +435,6 @@ <property name="text"> <string>Remember watches across sessions</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> @@ -531,10 +528,10 @@ <includes> <include location="local" impldecl="in implementation">projectoptions.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>buttonTemplate_clicked()</slot> <slot>buttonToolbar_clicked()</slot> <slot>comboDebuggerClient_activated( int idx )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 21040079..f1e13c5d 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -83,73 +83,73 @@ ProjectPrivate::~ProjectPrivate() void ProjectPrivate::initActions(TDEActionCollection *ac) { (void) new TDEAction( i18n( "&New Project..." ), "window-new", 0, - this, TQT_SLOT( slotNewProject() ), + this, TQ_SLOT( slotNewProject() ), ac, "project_new" ); (void) new TDEAction( i18n( "&Open Project..." ), "project_open", 0, - this, TQT_SLOT( slotOpenProject() ), + this, TQ_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = - KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)), + KStdAction::openRecent(parent, TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent"); m_projectRecent->setText(i18n("Open Recent Project")); m_projectRecent->setIcon("project_open"); m_projectRecent->setToolTip(i18n("Open/Open recent project")); - connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject())); + connect(m_projectRecent, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenProject())); closeprjAction = new TDEAction( i18n( "&Close Project" ), "window-close", 0, - this, TQT_SLOT( slotCloseProject() ), + this, TQ_SLOT( slotCloseProject() ), ac, "project_close" ); openPrjViewAction = new TDESelectAction( i18n( "Open Project &View..." ), 0, ac, "project_view_open" ); - connect(openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotOpenProjectView(const TQString &))); + connect(openPrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotOpenProjectView(const TQString &))); openPrjViewAction->setToolTip(i18n("Open project view")); savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "document-save", 0, - this, TQT_SLOT( slotSaveProjectView() ), + this, TQ_SLOT( slotSaveProjectView() ), ac, "project_view_save" ); saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "document-save-as", 0, - this, TQT_SLOT( slotSaveAsProjectView() ), + this, TQ_SLOT( slotSaveAsProjectView() ), ac, "project_view_save_as" ); deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "edit-delete", 0, ac, "project_view_delete" ); - connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotDeleteProjectView(const TQString &))); + connect(deletePrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotDeleteProjectView(const TQString &))); deletePrjViewAction->setToolTip(i18n("Close project view")); insertFileAction = new TDEAction( i18n( "&Insert Files..." ), 0, - this, TQT_SLOT( slotAddFiles() ), + this, TQ_SLOT( slotAddFiles() ), ac, "project_insert_file" ); insertDirAction = new TDEAction( i18n( "Inser&t Folder..." ), 0, - this, TQT_SLOT( slotAddDirectory() ), + this, TQ_SLOT( slotAddDirectory() ), ac, "project_insert_directory" ); rescanPrjDirAction = new TDEAction( i18n( "&Rescan Project Folder..." ), "reload", 0, - parent, TQT_SLOT( slotRescanPrjDir() ), + parent, TQ_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "go-up", Key_F8, - parent, TQT_SLOT( slotUpload() ), + parent, TQ_SLOT( slotUpload() ), ac, "project_upload" ); projectOptionAction = new TDEAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, - parent, TQT_SLOT( slotOptions() ), + parent, TQ_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = new TDEAction( i18n( "Save as Project Template..." ), 0, - TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = new TDEAction( i18n( "Save Selection to Project Template File..." ), 0, - TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); } @@ -1145,27 +1145,27 @@ void ProjectPrivate::slotNewProject() wiz->setNextEnabled ( pnf, false ); wiz->setFinishEnabled( pnf, true ); - connect( png, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnl, TQT_SLOT( setBaseURL(const KURL&))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnw, TQT_SLOT( setBaseURL(const KURL&))); - connect( this,TQT_SIGNAL(setLocalFiles(bool)), - pnl, TQT_SLOT(slotSetFiles(bool))); + connect( png, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnl, TQ_SLOT( setBaseURL(const KURL&))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnw, TQ_SLOT( setBaseURL(const KURL&))); + connect( this,TQ_SIGNAL(setLocalFiles(bool)), + pnl, TQ_SLOT(slotSetFiles(bool))); - connect(wiz, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT (slotSelectProjectType(const TQString &))); - connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked())); - - connect( pnw, TQT_SIGNAL(enableMessagesWidget()), - parent, TQT_SIGNAL(enableMessageWidget())); - connect( pnw, TQT_SIGNAL(messages(const TQString&)), - parent, TQT_SLOT (slotGetMessages(const TQString&))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setBackEnabled(TQWidget*,bool))); + connect(wiz, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT (slotSelectProjectType(const TQString &))); + connect(wiz, TQ_SIGNAL(helpClicked()), TQ_SLOT(slotNewProjectHelpClicked())); + + connect( pnw, TQ_SIGNAL(enableMessagesWidget()), + parent, TQ_SIGNAL(enableMessageWidget())); + connect( pnw, TQ_SIGNAL(messages(const TQString&)), + parent, TQ_SLOT (slotGetMessages(const TQString&))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setBackEnabled(TQWidget*,bool))); TQStringList lst = DTDs::ref()->nickNameList(true); pnf->dtdCombo->insertStringList(lst); @@ -1204,13 +1204,13 @@ void ProjectPrivate::slotNewProject() void ProjectPrivate::slotCloseProject() { if (!parent->hasProject()) return; - connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + connect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); parent->closeFiles(); } void ProjectPrivate::slotProceedWithCloseProject(bool success) { - disconnect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + disconnect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); if (!success) return; emit eventHappened("before_project_close", baseURL.url(), TQString()); if (!uploadProjectFile()) @@ -1446,10 +1446,10 @@ void ProjectPrivate::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), - TQT_SLOT (slotDeleteCopytoDlg(CopyTo*))); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent, - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), + TQ_SLOT (slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), parent, + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); list = dlg->copy( list, destination ); return; } diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index d67d27d3..f7421e8e 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -50,7 +50,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class ProjectPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: ProjectPrivate(Project *p); diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index 481ea134..8c949951 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -83,7 +83,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool { if (markOnly) markAsUploaded->setChecked(true); - TQTimer::singleShot(10, this, TQT_SLOT(slotBuildTree())); + TQTimer::singleShot(10, this, TQ_SLOT(slotBuildTree())); currentItem = 0L; } } @@ -149,7 +149,7 @@ void ProjectUpload::initProjectInfo(const TQString& defaultProfile) buttonRemoveProfile->setEnabled(comboProfile->count() > 1); keepPasswords->setChecked(m_project->keepPasswd); uploadInProgress = false; - connect( this, TQT_SIGNAL( uploadNext() ), TQT_SLOT( slotUploadNext() ) ); + connect( this, TQ_SIGNAL( uploadNext() ), TQ_SLOT( slotUploadNext() ) ); setProfileTooltip(); } @@ -456,12 +456,12 @@ void ProjectUpload::upload() emit eventHappened("before_upload", from.url(), to.url()); TDEIO::FileCopyJob *job = TDEIO::file_copy( from, to, fileItem->permissions(), true, false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),this, - TQT_SLOT( uploadFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), - this, TQT_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), - this, TQT_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),this, + TQ_SLOT( uploadFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), + this, TQ_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), + this, TQ_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); currentProgress->setProgress( 0 ); diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h index c3071899..2e99c615 100644 --- a/quanta/project/projectupload.h +++ b/quanta/project/projectupload.h @@ -37,7 +37,7 @@ class UploadProfileDlgS; class ProjectUpload : public ProjectUploadS { - Q_OBJECT + TQ_OBJECT public: /** Initializes the dialog. If showOnlyProfiles is true, the dialog diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index 5c91636f..2c8cf68c 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -476,7 +476,7 @@ <includes> <include location="global" impldecl="in declaration">../treeviews/uploadtreeview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>clearSelection()</slot> <slot>startUpload()</slot> <slot>selectAll()</slot> @@ -489,9 +489,12 @@ <slot>slotEditProfile()</slot> <slot>slotRemoveProfile()</slot> <slot>slotNewProfileSelected(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>uploadtreeview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">kcombobox.h</include> + <include location="global" impldecl="in implementation">kprogress.h</include> +</includes> </UI> diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index e78eb438..89c65e86 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -56,22 +56,22 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, co TDEIO::ListJob *job = TDEIO::listRecursive( baseURL, false ); m_listJobCount = 1; - connect( job, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); - - - connect( buttonSelect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelect())); - connect( buttonDeselect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeselect())); - connect( buttonInvert, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInvert())); - connect( buttonExpand, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotExpand())); - connect( buttonCollapse, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCollapse())); + connect( job, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); + + + connect( buttonSelect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelect())); + connect( buttonDeselect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeselect())); + connect( buttonInvert, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInvert())); + connect( buttonExpand, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotExpand())); + connect( buttonCollapse, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCollapse())); } RescanPrj::~RescanPrj() @@ -151,10 +151,10 @@ void RescanPrj::addEntries(TDEIO::Job *job,const TDEIO::UDSEntryList &list) TDEIO::ListJob *ljob = TDEIO::listRecursive( (*it)->url(), false ); m_listJobCount++; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); } } diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h index 5c36efb9..d985ecfd 100644 --- a/quanta/project/rescanprj.h +++ b/quanta/project/rescanprj.h @@ -33,7 +33,7 @@ struct URLListEntry{ }; class RescanPrj : public RescanPrjDir { - Q_OBJECT + TQ_OBJECT public: RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, diff --git a/quanta/project/rescanprjdir.ui b/quanta/project/rescanprjdir.ui index 8fb4b774..f35469e1 100644 --- a/quanta/project/rescanprjdir.ui +++ b/quanta/project/rescanprjdir.ui @@ -248,8 +248,8 @@ <tabstop>buttonHelp</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kprogress.h</includehint> - <includehint>uploadtreeview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kprogress.h</include> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> +</includes> </UI> diff --git a/quanta/project/subprojecteditdlgs.ui b/quanta/project/subprojecteditdlgs.ui index d1a0a168..dd60b002 100644 --- a/quanta/project/subprojecteditdlgs.ui +++ b/quanta/project/subprojecteditdlgs.ui @@ -70,4 +70,7 @@ <tabstop>createNew</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">klineedit.h</include> +</includes> </UI> diff --git a/quanta/project/teammembersdlg.h b/quanta/project/teammembersdlg.h index 2e7d900e..f01ed28b 100644 --- a/quanta/project/teammembersdlg.h +++ b/quanta/project/teammembersdlg.h @@ -24,7 +24,7 @@ */ class TeamMembersDlg : public TeamMembersDlgS { -Q_OBJECT +TQ_OBJECT public: TeamMembersDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index 512c02ca..4a72e738 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -231,19 +231,16 @@ <tabstop>deleteMemberButton</tabstop> <tabstop>setToYourselfButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotAddMember()</slot> <slot>slotEditMember()</slot> <slot>slotDeleteMember()</slot> <slot>slotSetToYourself()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>tdelistview.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kpushbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">tdelistview.h</include> +</includes> </UI> diff --git a/quanta/project/uploadprofiledlgs.ui b/quanta/project/uploadprofiledlgs.ui index de6521e6..9830013f 100644 --- a/quanta/project/uploadprofiledlgs.ui +++ b/quanta/project/uploadprofiledlgs.ui @@ -307,4 +307,9 @@ is obscured, saving the password in any file is a security risk. Use this option <tabstop>cancelButton</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> + <include location="global" impldecl="in implementation">klineedit.h</include> + <include location="global" impldecl="in implementation">kpassdlg.h</include> +</includes> </UI> diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui index a5a87110..6806dfab 100644 --- a/quanta/project/uploadprofilespage.ui +++ b/quanta/project/uploadprofilespage.ui @@ -118,8 +118,11 @@ <includes> <include location="local" impldecl="in implementation">uploadprofilespage.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>buttonEditProfiles_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kpushbutton.h</include> +</includes> </UI> diff --git a/quanta/quanta.tdevelop b/quanta/quanta.tdevelop index 3d76a479..924e93b2 100644 --- a/quanta/quanta.tdevelop +++ b/quanta/quanta.tdevelop @@ -81,8 +81,8 @@ <ccompilerbinary/> <cxxcompilerbinary/> <f77compilerbinary/> - <cflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT</cflags> - <cxxflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT -DDEBUG_PARSER</cxxflags> + <cflags>-DKDE_NO_COMPAT</cflags> + <cxxflags>-DKDE_NO_COMPAT -DDEBUG_PARSER</cxxflags> <f77flags/> <topsourcedir>/data/development/sources/kde-3.5/tdewebdev</topsourcedir> <cppflags/> @@ -136,7 +136,7 @@ <cxxcompilerbinary/> <f77compilerbinary/> <cflags/> - <cxxflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT</cxxflags> + <cxxflags>-DKDE_NO_COMPAT</cxxflags> <f77flags/> </withoutkafka> <final> @@ -151,8 +151,8 @@ <ccompilerbinary/> <cxxcompilerbinary/> <f77compilerbinary/> - <cflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT</cflags> - <cxxflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT</cxxflags> + <cflags>-DKDE_NO_COMPAT</cflags> + <cxxflags>-DKDE_NO_COMPAT</cxxflags> <f77flags/> </final> </configurations> diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index a381b6fb..d266e9fa 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -13,7 +13,7 @@ <umlobjects> <UML:Class stereotype="" package="" xmi.id="74" abstract="0" documentation="This should contain a "view" of the document. This is not clearly implemented. The class contains a set of tabs, and each tab can hold one Document object. I think the tab (and such the MDI) handling should go to the QuantaApp class and here only the document view related things should be. Just as the Document/View model requests." name="QuantaView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="86" type="" abstract="0" documentation="" name="QuantaView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="88" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="89" type="void" abstract="0" documentation="" name="addWrite" static="0" scope="200" > @@ -61,8 +61,8 @@ <UML:Operation stereotype="" package="" xmi.id="205" type="" abstract="0" documentation="Some initializations goes here." name="QuantaApp" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="206" type="QDomDocument *" abstract="0" documentation="" name="actions" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="207" type="bool" abstract="0" documentation="Returns true if the current DTD does not have any toolbars, or if all of the toolbars are removed or if the "Shov DTD Toolbar" is unchecked." name="allToolbarsHidden" static="0" scope="202" /> - <UML:Operation stereotype="" package="" xmi.id="208" type="QWidget *" abstract="0" documentation="" name="createContainer" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="208" type="TQWidget *" abstract="0" documentation="" name="createContainer" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="210" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="211" value="" type="const QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="212" value="" type="int &" abstract="0" documentation="" name="id" static="0" scope="200" /> @@ -88,7 +88,7 @@ <UML:Parameter stereotype="" package="" xmi.id="230" value="" type="TQString" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="231" type="void" abstract="0" documentation="" name="loadToolbarForDTD" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="232" value="" type="const QString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="232" value="" type="const TQString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="233" type="TQString" abstract="0" documentation="" name="newFileType" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="234" type="KDockWidget *" abstract="0" documentation="" name="outputDockWidget" static="0" scope="200" /> @@ -100,7 +100,7 @@ <UML:Operation stereotype="" package="" xmi.id="239" type="virtual bool" abstract="0" documentation="" name="queryClose" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="240" type="void" abstract="0" documentation="" name="readOptions" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="241" type="void" abstract="0" documentation="" name="readTagDir" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="242" value="" type="QString &" abstract="0" documentation="" name="dirName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="242" value="" type="TQString &" abstract="0" documentation="" name="dirName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="243" type="uint" abstract="0" documentation="" name="readTagFile" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="244" value="" type="TQString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> @@ -108,13 +108,13 @@ <UML:Parameter stereotype="" package="" xmi.id="246" value="" type="QTagList *" abstract="0" documentation="" name="tagList" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="247" type="void" abstract="0" documentation="" name="removeContainer" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="248" value="" type="QWidget *" abstract="0" documentation="" name="container" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="248" value="" type="TQWidget *" abstract="0" documentation="" name="container" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="250" value="" type="QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="251" value="" type="int" abstract="0" documentation="" name="id" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="252" type="void" abstract="0" documentation="" name="removeToolbar" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="253" value="" type="const QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="253" value="" type="const TQString &" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="254" type="void" abstract="0" documentation="" name="saveAsTemplate" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="255" value="" type="bool" abstract="0" documentation="" name="projectTemplate" static="0" scope="200" /> @@ -123,7 +123,7 @@ <UML:Operation stereotype="" package="" xmi.id="257" type="void" abstract="0" documentation="" name="saveModifiedToolbars" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="258" type="void" abstract="0" documentation="" name="saveOptions" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="259" type="KURL" abstract="0" documentation="" name="saveToolBar" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="260" value="" type="const QString &" abstract="0" documentation="" name="toolbarName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="260" value="" type="const TQString &" abstract="0" documentation="" name="toolbarName" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="261" value="" type="const KURL &" abstract="0" documentation="" name="destFile" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="262" type="void" abstract="0" documentation="" name="setAttributes" static="0" scope="202" > @@ -138,7 +138,7 @@ <UML:Parameter stereotype="" package="" xmi.id="269" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="270" type="QPopupMenu *" abstract="0" documentation="" name="toolbarMenu" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="271" value="" type="const QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="271" value="" type="const TQString &" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="272" type="QWidgetStack *" abstract="0" documentation="" name="widgetStackOfHtmlPart" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="273" type="" abstract="0" documentation="" name="~QuantaApp" static="0" scope="200" /> @@ -238,7 +238,7 @@ <UML:Class stereotype="" package="" xmi.id="274" abstract="0" documentation="The document handling class. This is somewhat weird, as the Document class should handle all the document related things. The job is distrivute now between this the QuantaView and the QuantaApp class. This must be clearly seperated... See the operations in order to get a picture what's here." name="QuantaDoc" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="276" type="" abstract="0" documentation="" name="QuantaDoc" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="278" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="279" type="void" abstract="0" documentation="" name="changeFileTabName" static="0" scope="200" > @@ -283,25 +283,25 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="307" abstract="0" documentation="Common static functions used everywhere in the code. " name="QuantaCommon" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="308" type="" abstract="0" documentation="" name="QuantaCommon" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="309" type="TQString" abstract="0" documentation="" name="attrCase" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="310" value="" type="const QString" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="310" value="" type="const TQString" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="311" type="bool" abstract="0" documentation="" name="checkExactMimeType" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="312" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="313" value="" type="const QString &" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="313" value="" type="const TQString &" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="314" type="bool" abstract="0" documentation="" name="checkMimeGroup" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="315" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="316" value="" type="const QString &" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="316" value="" type="const TQString &" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="317" type="bool" abstract="0" documentation="" name="checkMimeType" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="318" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="319" value="" type="const QString &" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="319" value="" type="const TQString &" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="320" type="KURL" abstract="0" documentation="" name="convertToPath" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="321" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="322" type="void" abstract="0" documentation="" name="dirCreationError" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="323" value="" type="QWidget *" abstract="0" documentation="" name="widget" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="323" value="" type="TQWidget *" abstract="0" documentation="" name="widget" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="324" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="325" type="TQString" abstract="0" documentation="" name="getDTDNameFromNickName" static="0" scope="200" > @@ -311,7 +311,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="328" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="329" type="TQString" abstract="0" documentation="" name="i18n2normal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="330" value="" type="const QString &" abstract="0" documentation="" name="a_str" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="330" value="" type="const TQString &" abstract="0" documentation="" name="a_str" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="331" type="int" abstract="0" documentation="" name="isBetween" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="332" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> @@ -334,7 +334,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="346" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="347" type="TQString" abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="348" value="" type="const QString" abstract="0" documentation="" name="s" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="348" value="" type="const TQString" abstract="0" documentation="" name="s" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="349" type="TDEStandardDirs *" abstract="0" documentation="" name="pluginDirs" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="350" value="" type="const char *" abstract="0" documentation="" name="type" static="0" scope="200" /> @@ -356,7 +356,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="362" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="363" type="TQString" abstract="0" documentation="" name="tagCase" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="364" value="" type="const QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="364" value="" type="const TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="365" type="QTag *" abstract="0" documentation="" name="tagFromDTD" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="366" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> @@ -391,7 +391,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="391" value="" type="const KURL &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="392" type="TQString" abstract="0" documentation="" name="shortName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="393" value="" type="const QString &" abstract="0" documentation="" name="fname" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="393" value="" type="const TQString &" abstract="0" documentation="" name="fname" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="394" type="KURL" abstract="0" documentation="" name="toAbsolute" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="395" value="" type="const KURL &" abstract="0" documentation="" name="urlToConvert" static="0" scope="200" /> @@ -420,13 +420,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="428" value="" type="KTextEditor :: Document *" abstract="0" documentation="" name="doc" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="429" value="" type="Project *" abstract="0" documentation="" name="project" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="430" value="" type="QuantaPluginInterface *" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="432" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="433" value="" type="WFlags" abstract="0" documentation="" name="f" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="434" type="void" abstract="0" documentation="" name="changeTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="435" value="" type="Tag *" abstract="0" documentation="" name="tag" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="436" value="" type="QDict < QString > *" abstract="0" documentation="" name="dict" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="436" value="" type="QDict < TQString > *" abstract="0" documentation="" name="dict" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="437" type="void" abstract="0" documentation="" name="checkDirtyStatus" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="438" type="int" abstract="0" documentation="" name="checkOverwrite" static="0" scope="200" > @@ -443,7 +443,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="447" type="DTDStruct *" abstract="0" documentation="" name="defaultDTD" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="448" type="bool" abstract="0" documentation="" name="dirty" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="449" type="bool" abstract="0" documentation="" name="evenQuotes" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="450" value="" type="const QString &" abstract="0" documentation="" name="text" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="450" value="" type="const TQString &" abstract="0" documentation="" name="text" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="451" type="TQString" abstract="0" documentation="" name="find" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="452" value="" type="const QRegExp &" abstract="0" documentation="" name="rx" static="0" scope="200" /> @@ -467,7 +467,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="468" value="" type="int &" abstract="0" documentation="" name="feCol" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="469" type="TQString" abstract="0" documentation="" name="findWordRev" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="470" value="" type="const QString &" abstract="0" documentation="" name="textToSearch" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="470" value="" type="const TQString &" abstract="0" documentation="" name="textToSearch" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="471" type="Tag *" abstract="0" documentation="" name="findXMLTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="472" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> @@ -533,7 +533,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="520" value="" type="DTDStruct *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="521" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="522" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="523" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="523" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="524" type="bool" abstract="0" documentation="" name="scriptCodeCompletion" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="525" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> @@ -556,7 +556,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="538" value="" type="bool" abstract="0" documentation="" name="flag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="539" type="void" abstract="0" documentation="" name="setParsingDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="540" value="" type="const QString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="540" value="" type="const TQString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="541" type="void" abstract="0" documentation="" name="setUntitledUrl" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="542" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -579,7 +579,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="555" value="" type="DTDStruct *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="556" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="557" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="558" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="558" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="559" type="bool" abstract="0" documentation="" name="xmlCodeCompletion" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="560" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> @@ -676,13 +676,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="631" value="" type="int &" abstract="0" documentation="" name="eCol" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="632" type="bool" abstract="0" documentation="" name="hasAttribute" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="633" value="" type="const QString &" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="633" value="" type="const TQString &" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="634" type="bool" abstract="0" documentation="" name="isQuotedAttribute" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="635" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="636" type="void" abstract="0" documentation="" name="parse" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="637" value="" type="const QString &" abstract="0" documentation="" name="p_tagStr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="637" value="" type="const TQString &" abstract="0" documentation="" name="p_tagStr" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="638" value="" type="Document *" abstract="0" documentation="" name="p_write" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="639" type="void" abstract="0" documentation="" name="parseAttr" static="0" scope="202" > @@ -691,7 +691,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="642" value="" type="int &" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="643" type="void" abstract="0" documentation="" name="setStr" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="644" value="" type="const QString &" abstract="0" documentation="" name="p_tagStr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="644" value="" type="const TQString &" abstract="0" documentation="" name="p_tagStr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="645" type="void" abstract="0" documentation="" name="setTagPosition" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="646" value="" type="int" abstract="0" documentation="" name="bLine" static="0" scope="200" /> @@ -737,7 +737,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="675" value="" type="Attribute *" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="676" type="Attribute *" abstract="0" documentation="" name="attribute" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="677" value="" type="QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="677" value="" type="TQString &" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="678" type="Attribute *" abstract="0" documentation="" name="attributeAt" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="679" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> @@ -749,10 +749,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="684" type="bool" abstract="0" documentation="" name="isSingle" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="685" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="686" type="void" abstract="0" documentation="" name="setFileName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="687" value="" type="QString &" abstract="0" documentation="" name="fileName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="687" value="" type="TQString &" abstract="0" documentation="" name="fileName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="688" type="void" abstract="0" documentation="" name="setName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="689" value="" type="const QString &" abstract="0" documentation="" name="theName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="689" value="" type="const TQString &" abstract="0" documentation="" name="theName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="690" type="void" abstract="0" documentation="" name="setOptional" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="691" value="" type="bool" abstract="0" documentation="" name="isOptional" static="0" scope="200" /> @@ -839,7 +839,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="747" abstract="0" documentation="Editor for the plugins that manages configuration" name="QuantaPluginEditor" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="749" type="" abstract="0" documentation="" name="QuantaPluginEditor" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="750" value="" type="QWidget *" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="750" value="" type="TQWidget *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="751" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="752" type="QDict" abstract="0" documentation="" name="plugins" static="0" scope="200" /> @@ -858,7 +858,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="762" abstract="0" documentation="Dialog to configure a plugin's options" name="QuantaPluginConfig" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="763" type="" abstract="0" documentation="" name="QuantaPluginConfig" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="764" value="" type="QWidget *" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="764" value="" type="TQWidget *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="765" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="766" type="" abstract="0" documentation="" name="~QuantaPluginConfig" static="0" scope="200" /> @@ -866,7 +866,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="767" abstract="0" documentation="This class handles the spellchecking. It should work with all KTextEditor's, not only Kate. This is not a real plugin. The code is based on SpellPlugin for Kate." name="SpellChecker" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="771" type="" abstract="0" documentation="" name="SpellChecker" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="QObject *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="TQObject *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="773" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="774" type="void" abstract="0" documentation="" name="locatePosition" static="0" scope="202" > @@ -900,38 +900,38 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="793" abstract="0" documentation="" name="QuantaPlugin" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="805" type="" abstract="0" documentation="" name="QuantaPlugin" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="806" type="" abstract="0" documentation="" name="QuantaPlugin" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="807" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="808" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="809" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="810" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="811" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="812" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="813" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="814" type="virtual QString" abstract="0" documentation="" name="arguments" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="815" type="virtual QString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="807" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="808" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="809" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="810" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="811" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="812" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="813" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + </UML:Operation> + <UML:Operation stereotype="" package="" xmi.id="814" type="virtual TQString" abstract="0" documentation="" name="arguments" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="815" type="virtual TQString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="816" type="virtual bool" abstract="0" documentation="" name="isLoaded" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="817" type="virtual bool" abstract="0" documentation="" name="isRunning" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="818" type="virtual bool" abstract="0" documentation="" name="isStandard" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="819" type="virtual bool" abstract="0" documentation="" name="load" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="820" type="virtual QString" abstract="0" documentation="" name="location" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="821" type="virtual QString" abstract="0" documentation="" name="outputWindow" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="822" type="virtual QString" abstract="0" documentation="" name="pluginName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="820" type="virtual TQString" abstract="0" documentation="" name="location" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="821" type="virtual TQString" abstract="0" documentation="" name="outputWindow" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="822" type="virtual TQString" abstract="0" documentation="" name="pluginName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="823" type="virtual bool" abstract="0" documentation="" name="run" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="824" type="virtual void" abstract="0" documentation="" name="setArguments" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="825" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="825" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="826" type="virtual void" abstract="0" documentation="" name="setFileName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="827" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="827" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="828" type="virtual void" abstract="0" documentation="" name="setLocation" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="829" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="829" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="830" type="virtual void" abstract="0" documentation="" name="setOutputWindow" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="831" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="831" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="832" type="virtual void" abstract="0" documentation="" name="setPluginName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="833" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="833" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="834" type="virtual void" abstract="0" documentation="" name="setRunning" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="835" value="" type="bool" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -940,21 +940,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="837" value="" type="bool" abstract="0" documentation="" name="isStandard" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="838" type="virtual void" abstract="0" documentation="" name="setType" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="839" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="839" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="840" type="virtual bool" abstract="0" documentation="" name="toggle" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="841" type="virtual QString" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="841" type="virtual TQString" abstract="0" documentation="" name="type" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="842" type="virtual bool" abstract="0" documentation="" name="unload" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="843" type="bool" abstract="0" documentation="" name="validatePlugin" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="844" value="" type="QuantaPlugin *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="845" type="bool" abstract="0" documentation="" name="validatePluginInfo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="846" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="847" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="848" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="849" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="850" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="851" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="846" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="847" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="848" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="849" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="850" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="851" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="852" type="" abstract="0" documentation="" name="~QuantaPlugin" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="794" value="" type="TDEToggleAction *" abstract="0" documentation="" name="m_action" static="0" scope="200" /> @@ -972,13 +972,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="853" abstract="0" documentation="Provides an interface to the installed plugins. " name="QuantaPluginInterface" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="856" type="" abstract="0" documentation="" name="QuantaPluginInterface" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="857" type="TQStringList" abstract="0" documentation="" name="outputWindows" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="858" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="858" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="859" type="virtual QuantaPlugin *" abstract="0" documentation="" name="plugin" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="860" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="860" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="861" type="bool" abstract="0" documentation="" name="pluginAvailable" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="862" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="862" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="863" type="virtual QStringList" abstract="0" documentation="" name="pluginNames" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="864" type="TQStringList" abstract="0" documentation="" name="pluginTypes" static="0" scope="200" /> @@ -1001,12 +1001,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="876" abstract="0" documentation="" name="Project" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="907" type="" abstract="0" documentation="" name="Project" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="909" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="910" type="bool" abstract="0" documentation="" name="createEmptyDom" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="911" type="virtual const QString &" abstract="0" documentation="" name="defaultDTD" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="912" type="virtual const QString &" abstract="0" documentation="" name="defaultEncoding" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="911" type="virtual const TQString &" abstract="0" documentation="" name="defaultDTD" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="912" type="virtual const TQString &" abstract="0" documentation="" name="defaultEncoding" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="913" type="bool" abstract="0" documentation="" name="hasProject" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="914" type="void" abstract="0" documentation="" name="insertFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="915" value="" type="const KURL &" abstract="0" documentation="" name="nameURL" static="0" scope="200" /> @@ -1017,11 +1017,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="919" type="void" abstract="0" documentation="" name="insertFiles" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="920" value="" type="const KURL &" abstract="0" documentation="" name="pathURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const QString &" abstract="0" documentation="" name="mask" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const TQString &" abstract="0" documentation="" name="mask" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="922" type="bool" abstract="0" documentation="" name="isModified" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="923" type="void" abstract="0" documentation="" name="loadProjectXML" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="924" type="virtual const QString &" abstract="0" documentation="" name="newFileType" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="924" type="virtual const TQString &" abstract="0" documentation="" name="newFileType" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="925" type="void" abstract="0" documentation="" name="openCurrentView" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="926" type="void" abstract="0" documentation="" name="readConfig" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="927" value="" type="TDEConfig *" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1030,7 +1030,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="929" value="" type="TDEConfig *" abstract="0" documentation="" name="c" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="930" type="virtual void" abstract="0" documentation="" name="setDefaultDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="931" value="" type="const QString &" abstract="0" documentation="" name="p_defaultDTD" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="931" value="" type="const TQString &" abstract="0" documentation="" name="p_defaultDTD" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="932" type="KURL" abstract="0" documentation="" name="urlWithPrefix" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="933" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> @@ -1074,10 +1074,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="940" type="" abstract="0" documentation="" name="FilesListView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="941" value="" type="TQString" abstract="0" documentation="" name="dir" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="942" value="" type="TQStringList" abstract="0" documentation="" name="topList" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="944" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="945" type="virtual QString" abstract="0" documentation="" name="currentFileName" static="0" scope="202" /> + <UML:Operation stereotype="" package="" xmi.id="945" type="virtual TQString" abstract="0" documentation="" name="currentFileName" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="946" type="void" abstract="0" documentation="" name="loadDir" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="947" value="" type="TQString" abstract="0" documentation="" name="path" static="0" scope="200" /> </UML:Operation> @@ -1094,7 +1094,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="959" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="961" value="" type="const QString &" abstract="0" documentation="" name="p_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="961" value="" type="const TQString &" abstract="0" documentation="" name="p_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="962" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="963" type="virtual bool" abstract="0" documentation="" name="acceptDrop" static="0" scope="200" > @@ -1103,9 +1103,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="965" type="virtual void" abstract="0" documentation="" name="dropped" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="966" value="" type="QDropEvent *" abstract="0" documentation="" name="e" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="967" type="virtual QString" abstract="0" documentation="" name="fullName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="967" type="virtual TQString" abstract="0" documentation="" name="fullName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="968" type="void" abstract="0" documentation="" name="init" static="0" scope="202" /> - <UML:Operation stereotype="" package="" xmi.id="969" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="969" type="virtual TQString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="970" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="971" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> @@ -1204,7 +1204,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1043" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1044" type="TQString" abstract="0" documentation="" name="fullName" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="1045" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1045" type="virtual TQString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1046" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1047" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> @@ -1228,7 +1228,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1063" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const TQString &" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1066" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1067" type="bool" abstract="0" documentation="" name="contains" static="0" scope="200" > @@ -1265,10 +1265,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1089" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1091" type="" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1093" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1094" type="QString *" abstract="0" documentation="" name="contextHelp" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1094" type="TQString *" abstract="0" documentation="" name="contextHelp" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1095" value="" type="TQString" abstract="0" documentation="" name="keyword" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1096" type="" abstract="0" documentation="" name="~DocTreeView" static="0" scope="200" /> @@ -1276,7 +1276,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1097" abstract="0" documentation="A tree view used to display a set of files/directories explicitly added to it. It is used in several dialogs, e.g in Project Upload dialog, Rescan Project dialog, add files/folders to project dialogs." name="UploadTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1098" type="" abstract="0" documentation="" name="UploadTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1100" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1101" type="UploadTreeFile *" abstract="0" documentation="" name="addItem" static="0" scope="200" > @@ -1295,10 +1295,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1111" type="UploadTreeFolder *" abstract="0" documentation="" name="findFolder" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1112" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1113" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1113" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1114" type="QListViewItem *" abstract="0" documentation="" name="findItem" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1115" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1115" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1116" type="void" abstract="0" documentation="" name="invertAll" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1117" value="" type="QListViewItem *" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1319,7 +1319,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1144" type="" abstract="0" documentation="" name="StructTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1145" value="" type="Parser *" abstract="0" documentation="" name="parser" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1146" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1148" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1149" type="void" abstract="0" documentation="" name="buildTree" static="0" scope="202" > @@ -1336,7 +1336,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1158" value="" type="bool" abstract="0" documentation="" name="open" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1159" type="void" abstract="0" documentation="" name="setParsingDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1160" value="" type="const QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1160" value="" type="const TQString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1161" type="virtual void" abstract="0" documentation="" name="showEvent" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1162" value="" type="QShowEvent *" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1377,7 +1377,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1180" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1180" type="virtual TQString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1181" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1182" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> @@ -1392,7 +1392,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1187" abstract="0" documentation="TreeView for templates. As the templates are standard directories, it inherits from FilesTreeView." name="TemplatesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1195" type="" abstract="0" documentation="" name="TemplatesTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1196" value="" type="const KURL &" abstract="0" documentation="" name="projectBaseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1198" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1199" type="void" abstract="0" documentation="" name="contentsDropEvent" static="0" scope="202" > @@ -1421,24 +1421,24 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1211" abstract="0" documentation="TDEListViewItem specific for the structure tree." name="StructTreeTag" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1213" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1215" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1215" value="" type="const TQString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1216" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1217" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1218" value="" type="Node *" abstract="0" documentation="" name="a_node" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1219" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1219" value="" type="const TQString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1220" value="" type="QListViewItem *" abstract="0" documentation="" name="after" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1221" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1222" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1223" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1223" value="" type="const TQString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1224" type="" abstract="0" documentation="" name="~StructTreeTag" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1212" value="" type="Node *" abstract="0" documentation="" name="node" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1225" abstract="0" documentation="A project specific TDEListView." name="ProjectTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1231" type="" abstract="0" documentation="" name="ProjectTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1233" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1234" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" /> @@ -1459,11 +1459,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1241" abstract="0" documentation="Extended FileManage to handle remote and local directory structures in a tree." name="FilesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1242" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1243" value="" type="KURL :: List" abstract="0" documentation="" name="topList" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1245" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1246" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1248" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1249" type="void" abstract="0" documentation="" name="addFileInfoPage" static="0" scope="202" > @@ -1494,7 +1494,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1267" abstract="0" documentation="A treeview which has some common file managing methods. It inherits from TDEListView." name="FileManage" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1272" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1273" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1275" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1276" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" /> @@ -1537,7 +1537,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1326" type="" abstract="0" documentation="" name="ProjectUpload" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1327" value="" type="Project *" abstract="0" documentation="" name="p" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1328" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1330" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1331" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1332" value="" type="WFlags" abstract="0" documentation="" name="fl" static="0" scope="200" /> @@ -1561,7 +1561,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1340" abstract="0" documentation="Create a new project from tdeio accessible files and folders." name="ProjectNewLocal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1342" type="" abstract="0" documentation="" name="ProjectNewLocal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1344" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1345" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > @@ -1574,7 +1574,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1351" type="" abstract="0" documentation="" name="RescanPrj" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1352" value="" type="KURL :: List" abstract="0" documentation="" name="p_prjFileList" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1353" value="" type="const KURL &" abstract="0" documentation="" name="p_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1355" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1356" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" /> </UML:Operation> @@ -1587,7 +1587,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1360" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1361" type="" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1363" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1364" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > @@ -1597,7 +1597,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1367" abstract="0" documentation="Create a new project with the help of wget." name="ProjectNewWeb" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1372" type="" abstract="0" documentation="" name="ProjectNewWeb" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1374" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1375" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > @@ -1611,7 +1611,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1378" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1379" type="" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1381" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1382" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > @@ -1628,16 +1628,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1391" type="" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type="TQString" abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1393" value="" type="bool" abstract="0" documentation="" name="editSelector" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1395" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1396" type="TQString" abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1397" type="void" abstract="0" documentation="" name="splitValueTRBL" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1398" value="" type="TQString" abstract="0" documentation="" name="value" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1399" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1400" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1401" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1402" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1399" value="" type="TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1400" value="" type="TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1401" value="" type="TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1402" value="" type="TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1403" type="void" abstract="0" documentation="" name="widgetFromCode" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1404" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1667,8 +1667,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1430" value="" type="KURL" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1431" type="void" abstract="0" documentation="" name="insertAttribute" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1432" value="" type="QString *" abstract="0" documentation="" name="attr" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1433" value="" type="QString *" abstract="0" documentation="" name="value" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1432" value="" type="TQString *" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1433" value="" type="TQString *" abstract="0" documentation="" name="value" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1434" type="void" abstract="0" documentation="" name="insertTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1435" value="" type="Document *" abstract="0" documentation="" name="w" static="0" scope="200" /> @@ -1685,12 +1685,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1411" value="" type="QPtrList *" abstract="0" documentation="" name="extraPageList" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1412" value="" type="KURL" abstract="0" documentation="" name="m_baseURL" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1413" value="" type="Tag *" abstract="0" documentation="" name="m_tag" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1414" value="" type="QWidget *" abstract="0" documentation="" name="mainDlg" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1414" value="" type="TQWidget *" abstract="0" documentation="" name="mainDlg" static="0" scope="200" /> </UML:Class> <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1407" roleb="307" multia="" multib="" package="" xmi.id="1441" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> <UML:Class stereotype="" package="" xmi.id="1442" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1465" type="" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1467" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1468" type="void" abstract="0" documentation="" name="initDialog" static="0" scope="200" /> @@ -1707,7 +1707,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1452" value="" type="QPushButton *" abstract="0" documentation="" name="buttonOk" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1453" value="" type="QPushButton *" abstract="0" documentation="" name="buttonRecalcImgSize" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1454" value="" type="QComboBox *" abstract="0" documentation="" name="comboAlign" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1455" value="" type="QImage *" abstract="0" documentation="" name="img" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1455" value="" type="TQImage *" abstract="0" documentation="" name="img" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1456" value="" type="QLabel *" abstract="0" documentation="" name="labelImgSource" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1457" value="" type="KLineEdit *" abstract="0" documentation="" name="lineAltText" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1458" value="" type="KLineEdit *" abstract="0" documentation="" name="lineHSpace" static="0" scope="200" /> @@ -1721,7 +1721,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1470" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1472" type="" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1473" value="" type="Document *" abstract="0" documentation="" name="write" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1475" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1476" type="" abstract="0" documentation="" name="~TagQuickTable" static="0" scope="200" /> @@ -1769,7 +1769,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1512" abstract="0" documentation="" name="CopyTo" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1515" type="" abstract="0" documentation="" name="CopyTo" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1516" value="" type="const KURL &" abstract="0" documentation="" name="dirURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1518" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1519" type="KURL" abstract="0" documentation="" name="copy" static="0" scope="200" > @@ -1790,7 +1790,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1530" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1532" type="" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1533" value="" type="const KURL &" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1535" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1536" type="" abstract="0" documentation="" name="~TagQuickStart" static="0" scope="200" /> @@ -1798,12 +1798,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1537" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1542" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1544" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1545" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1546" value="" type="const KURL &" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1548" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1549" type="void" abstract="0" documentation="" name="setBaseURL" static="0" scope="200" > diff --git a/quanta/scripts/CMakeLists.txt b/quanta/scripts/CMakeLists.txt index 03099cac..2d58a86b 100644 --- a/quanta/scripts/CMakeLists.txt +++ b/quanta/scripts/CMakeLists.txt @@ -13,7 +13,7 @@ install( FILES scriptinfo.kmdr.info dwt.pl dwt.kmdr.info tidy.kmdr.info checkxml.kmdr.info meinproc.kmdr.info xmlval.kmdr.info - xsltproc.kmdr.info htmlquickstart.kmdr.info + xsltproc.kmdr.info htmlquickstart.kmdr.info htmlquickstart5.kmdr.info TemplateMagic.pl TemplateMagic.pl.info info.css externalpreview.sh info.xsl externalpreview.sh.info dwt.pl.info @@ -23,7 +23,7 @@ install( FILES install( PROGRAMS scriptinfo.kmdr dwt.kmdr tidy.kmdr checkxml.kmdr meinproc.kmdr xmlval.kmdr xsltproc.kmdr - htmlquickstart.kmdr gubed_install.kmdr + htmlquickstart.kmdr htmlquickstart5.kmdr gubed_install.kmdr listwizard.kmdr picturewizard.kmdr tablewizard.kmdr docbook_table.kmdr DESTINATION ${DATA_INSTALL_DIR}/quanta/scripts ) diff --git a/quanta/scripts/Makefile.am b/quanta/scripts/Makefile.am index 00a74dea..5353f514 100644 --- a/quanta/scripts/Makefile.am +++ b/quanta/scripts/Makefile.am @@ -2,7 +2,7 @@ quantadir = ${quanta_datadir}/scripts quanta_DATA = scriptinfo.kmdr.info dwt.pl dwt.kmdr.info \ tidy.kmdr.info checkxml.kmdr.info meinproc.kmdr.info \ - xmlval.kmdr.info xsltproc.kmdr.info htmlquickstart.kmdr.info \ + xmlval.kmdr.info xsltproc.kmdr.info htmlquickstart.kmdr.info htmlquickstart5.kmdr.info \ TemplateMagic.pl TemplateMagic.pl.info info.css externalpreview.sh \ info.xsl externalpreview.sh.info dwt.pl.info gubed_install.kmdr.info @@ -12,6 +12,6 @@ execquantadir = ${quanta_datadir}/scripts execquanta_SCRIPTS = scriptinfo.kmdr dwt.kmdr tidy.kmdr \ checkxml.kmdr meinproc.kmdr \ xmlval.kmdr xsltproc.kmdr \ - htmlquickstart.kmdr \ + htmlquickstart.kmdr htmlquickstart5.kmdr \ gubed_install.kmdr \ listwizard.kmdr picturewizard.kmdr tablewizard.kmdr docbook_table.kmdr diff --git a/quanta/scripts/htmlquickstart5.kmdr b/quanta/scripts/htmlquickstart5.kmdr new file mode 100755 index 00000000..cc145dea --- /dev/null +++ b/quanta/scripts/htmlquickstart5.kmdr @@ -0,0 +1,997 @@ +<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> +<class>quickStartForm</class> +<widget class="Dialog"> + <property name="name"> + <cstring>quickStartForm</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>473</width> + <height>577</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="caption"> + <string>Quick Start</string> + </property> + <property name="populationText"> + <string></string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string></string> + <string>@execBegin +quanta=`dcop quanta-@parentPid` +if [ -z "$quanta" ]; then + quanta=`dcop quanta` + if [ ! -z "$quanta" ]; then + quantadcop=quanta + fi +else + quantadcop=quanta-@parentPid +fi + +if [ ! -z "$quantadcop" ]; then + encoding=`dcop $quantadcop SettingsIf encoding` + dcop @dcopid KommanderIf setSelection ComboMetachar $encoding + dcop @dcopid KommanderIf setChecked CBMetaChar true + dtep=`dcop $quantadcop SettingsIf dtep` + dcop @dcopid KommanderIf setCurrentListItem DTEPselect "$dtep" +fi +@execEnd</string> + <string></string> + </stringlist> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> + <property name="name"> + <cstring>TextLabel1</cstring> + </property> + <property name="font"> + <font> + <family>Sans Serif</family> + <pointsize>12</pointsize> + <bold>1</bold> + </font> + </property> + <property name="text"> + <string>Quanta Plus Kommander Quick Start</string> + </property> + <property name="alignment"> + <set>AlignCenter</set> + </property> + </widget> + <spacer row="2" column="0"> + <property name="name"> + <cstring>Spacer6_2</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>33</width> + <height>0</height> + </size> + </property> + </spacer> + <widget class="GroupBox" row="1" column="0" rowspan="1" colspan="4"> + <property name="name"> + <cstring>dialogScript</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="title"> + <string></string> + </property> + <property name="flat"> + <bool>false</bool> + </property> + <property name="populationText"> + <string></string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>############################# +# Globals + +# The indentation level. We have only +# one level of indentation +PADDING=' ' + +# This sets the DTD var +@DTEPselect + +# set parameters that depend on DTD +if echo $DTD | grep -q xhtml +then + XHTML=true + TAGEND=' />' + HTML='<html xmlns="http://www.w3.org/1999/xhtml">' +else + XHTML=FALSE + TAGEND='>' + HTML='<html>' +fi + +############################## +# Finally generate the page + +@CBDTD +echo $HTML +echo '@CBCVS' +@CBHead + +echo '<body>' +echo '@CBPHPHeader' +echo '@CBPHPFooter' +echo '</body>' +echo '</html>' + +quanta=`dcop quanta-@parentPid` +if [ -z "$quanta" ]; then + quanta=`dcop quanta` + if [ ! -z "$quanta" ]; then + quantadcop=quanta + fi +else + quantadcop=quanta-@parentPid +fi + +if [ ! -z "$quantadcop" ]; then + dcop $quantadcop WindowManagerIf setDtep "@DTEPselect.text" false +fi</string> + </stringlist> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>TextLabel1_2</cstring> + </property> + <property name="text"> + <string>DTD / Schema:</string> + </property> + </widget> + <widget class="GroupBox" row="4" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>GroupBox3</cstring> + </property> + <property name="title"> + <string>Body Area</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string><body> +@CBPHPHeader +@CBPHPFooter +</body></string> + </stringlist> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="LineEdit" row="0" column="1"> + <property name="name"> + <cstring>phpHeaderFile</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="1" column="1"> + <property name="name"> + <cstring>phpFooterFile</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="1" column="0"> + <property name="name"> + <cstring>CBPHPFooter</cstring> + </property> + <property name="text"> + <string>&PHP footer include:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string><? include_once("@phpFooterFile") ?></string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="0" column="0"> + <property name="name"> + <cstring>CBPHPHeader</cstring> + </property> + <property name="text"> + <string>PHP header include:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string><? include_once("@phpHeaderFile") ?></string> + </stringlist> + </property> + </widget> + </grid> + </widget> + <widget class="CheckBox" row="1" column="0"> + <property name="name"> + <cstring>CBDTD</cstring> + </property> + <property name="text"> + <string>Show &DTD</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string>@DTEPselect +echo "$DTD"</string> + <string>echo "$DTD"</string> + </stringlist> + </property> + </widget> + <widget class="ComboBox" row="0" column="1"> + <item> + <property name="text"> + <string>HTML 5</string> + </property> + </item> + <item> + <property name="text"> + <string>HTML 4.01 Transitional</string> + </property> + </item> + <item> + <property name="text"> + <string>HTML 4.01 Strict</string> + </property> + </item> + <item> + <property name="text"> + <string>HTML 4.01 Frameset</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.0 Transitional</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.0 Strict</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.0 Frameset</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.0 Basic</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.1</string> + </property> + </item> + <property name="name"> + <cstring>DTEPselect</cstring> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>################################ +# This script sets the DTD var + + +# The various DTD's + +html5='<!DOCTYPE html>' + +htmltrans='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' + +strict='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' + +frameset='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">' + +xhtml1trans='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' + +xhtml1strict='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' + +xhtml1frameset='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">' + +xhtml1basic='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">' + +xhtml11='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">' + +################################ +# Set the DTD based on user selection + +case "@widgetText" in +"HTML 5" ) + DTD="$html5" +;; +"HTML 4.01 Transitional" ) + DTD="$htmltrans" +;; +"HTML 4.01 Strict" ) + DTD="$strict" +;; +"HTML 4.01 Frameset" ) + DTD="$frameset" +;; +"XHTML 1.0 Transitional" ) + DTD="$xhtml1trans" +;; +"XHTML 1.0 Strict" ) + DTD="$xhtml1strict" +;; +"XHTML 1.0 Frameset" ) + DTD="$xhtml1frameset" +;; +"XHTML 1.0 Basic" ) + DTD="$xhtml1basic" +;; +"XHTML 1.1" ) + DTD="$xhtml11" +;; +* ) + echo "No Match" +;; +esac +</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="2" column="0"> + <property name="name"> + <cstring>CBHead</cstring> + </property> + <property name="text"> + <string>Head &area</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo '<head>' +@LETitle +@CBBasedir +@CBMetaQuanta +@CBMetaAuthor +@CBMetaChar +@CBMetaKeywords +@CBStyle +@CBStyleArea +@CBJavascript +echo '</head>'</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="1" column="1"> + <property name="name"> + <cstring>CBCVS</cstring> + </property> + <property name="text"> + <string>CVS tag &in comment</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string><!-- $Id$ --></string> + </stringlist> + </property> + </widget> + <widget class="GroupBox" row="3" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>GroupBox2</cstring> + </property> + <property name="title"> + <string></string> + </property> + <property name="populationText"> + <string></string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string></string> + </stringlist> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="CheckBox" row="2" column="0"> + <property name="name"> + <cstring>CBMetaAuthor</cstring> + </property> + <property name="text"> + <string>&Meta author:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<meta name=\"AUTHOR\" content=\"@LEMetaAuthor\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="3" column="0"> + <property name="name"> + <cstring>CBMetaChar</cstring> + </property> + <property name="text"> + <string>Meta character set:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<meta http-equiv=\"Content-Type\" content=\"text/html; charset=@ComboMetachar\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="7" column="0"> + <property name="name"> + <cstring>CBStyleArea</cstring> + </property> + <property name="text"> + <string>St&yle area</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<style type=\"text/css\">" +if [ $XHTML = true ]; then + echo "$PADDING/* <![CDATA[ */" + echo "$PADDING" + echo "$PADDING/* ]]> */" +fi +echo "$PADDING</style>"</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="1" column="1"> + <property name="name"> + <cstring>LEBasedir</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="2" column="1"> + <property name="name"> + <cstring>LEMetaAuthor</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="ComboBox" row="3" column="1"> + <item> + <property name="text"> + <string>iso-8859-1</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-2</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-3</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-4</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-5</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-6</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-7</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-8</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-8i</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-9</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-10</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-11</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-12</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-13</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-14</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-15</string> + </property> + </item> + <item> + <property name="text"> + <string>utf-8</string> + </property> + </item> + <item> + <property name="text"> + <string>utf-16</string> + </property> + </item> + <item> + <property name="text"> + <string>koi8-r</string> + </property> + </item> + <item> + <property name="text"> + <string>koi8-u</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1250</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1251</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1252</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1253</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1254</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1255</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1256</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1257</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1258</string> + </property> + </item> + <property name="name"> + <cstring>ComboMetachar</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="4" column="1"> + <property name="name"> + <cstring>LEMetaKeywords</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + <property name="toolTip" stdset="0"> + <string>limit to 8, separate with commas</string> + </property> + </widget> + <widget class="CheckBox" row="1" column="0"> + <property name="name"> + <cstring>CBBasedir</cstring> + </property> + <property name="text"> + <string>&Base directory:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<base href=\"@LEBasedir\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="6" column="0"> + <property name="name"> + <cstring>CBMetaQuanta</cstring> + </property> + <property name="text"> + <string>Meta &Quanta</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<meta name=\"GENERATOR\" content=\"Quanta Plus\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="4" column="0"> + <property name="name"> + <cstring>CBMetaKeywords</cstring> + </property> + <property name="text"> + <string>Meta &keywords:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo -n "$PADDING<meta name=\"KEYWORDS\" content=\"" +echo -n '@LEMetaKeywords' +echo "\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="5" column="0"> + <property name="name"> + <cstring>CBStyle</cstring> + </property> + <property name="text"> + <string>Li&nked style sheet:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<link rel=\"stylesheet\" type=\"text/css\" href=\"@cssFile\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="5" column="1"> + <property name="name"> + <cstring>cssFile</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="0" column="1"> + <property name="name"> + <cstring>LETitle</cstring> + </property> + <property name="text"> + <string></string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>echo "$PADDING<title>@widgetText</title>"</string> + </stringlist> + </property> + </widget> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>TextLabel2</cstring> + </property> + <property name="text"> + <string>Title:</string> + </property> + </widget> + <widget class="CheckBox" row="7" column="1"> + <property name="name"> + <cstring>CBJavascript</cstring> + </property> + <property name="text"> + <string>&JavaScript area</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>if echo $DTD | grep -q strict +then + echo "$PADDING<script type=\"text/javascript\">" +else + echo "$PADDING<script language=\"javascript\" type=\"text/javascript\">" +fi + + +if [ $XHTML = true ]; then + echo "$PADDING/* <![CDATA[ */" + echo "$PADDING" + echo "$PADDING/* ]]> */" +else + echo "$PADDING// <!--" + echo "$PADDING" + echo "$PADDING// -->" +fi + +echo "$PADDING</script>"</string> + </stringlist> + </property> + </widget> + </grid> + </widget> + </grid> + </widget> + <widget class="CloseButton" row="2" column="3"> + <property name="name"> + <cstring>CloseButton1_2</cstring> + </property> + <property name="text"> + <string>&Cancel</string> + </property> + <property name="flat"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string></string> + </stringlist> + </property> + <property name="writeStdout"> + <bool>true</bool> + </property> + </widget> + <widget class="CloseButton" row="2" column="1"> + <property name="name"> + <cstring>CloseButton1</cstring> + </property> + <property name="text"> + <string>&OK</string> + </property> + <property name="flat"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@dialogScript +</string> + </stringlist> + </property> + <property name="writeStdout"> + <bool>true</bool> + </property> + </widget> + </grid> +</widget> +<connections> + <connection> + <sender>CBBasedir</sender> + <signal>toggled(bool)</signal> + <receiver>LEBasedir</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBMetaAuthor</sender> + <signal>toggled(bool)</signal> + <receiver>LEMetaAuthor</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBMetaKeywords</sender> + <signal>toggled(bool)</signal> + <receiver>LEMetaKeywords</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBMetaChar</sender> + <signal>toggled(bool)</signal> + <receiver>ComboMetachar</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBStyle</sender> + <signal>toggled(bool)</signal> + <receiver>cssFile</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBHead</sender> + <signal>toggled(bool)</signal> + <receiver>GroupBox2</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBPHPHeader</sender> + <signal>toggled(bool)</signal> + <receiver>phpHeaderFile</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBPHPFooter</sender> + <signal>toggled(bool)</signal> + <receiver>phpFooterFile</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>quickStartForm</sender> + <signal>widgetOpened()</signal> + <receiver>GroupBox2</receiver> + <slot>populate()</slot> + </connection> +</connections> +<tabstops> + <tabstop>DTEPselect</tabstop> + <tabstop>CBDTD</tabstop> + <tabstop>CBCVS</tabstop> + <tabstop>CBHead</tabstop> + <tabstop>LETitle</tabstop> + <tabstop>CBBasedir</tabstop> + <tabstop>LEBasedir</tabstop> + <tabstop>CBMetaAuthor</tabstop> + <tabstop>LEMetaAuthor</tabstop> + <tabstop>CBMetaChar</tabstop> + <tabstop>ComboMetachar</tabstop> + <tabstop>CBMetaKeywords</tabstop> + <tabstop>LEMetaKeywords</tabstop> + <tabstop>CBStyle</tabstop> + <tabstop>cssFile</tabstop> + <tabstop>CBMetaQuanta</tabstop> + <tabstop>CBStyleArea</tabstop> + <tabstop>CBJavascript</tabstop> + <tabstop>CBPHPHeader</tabstop> + <tabstop>phpHeaderFile</tabstop> + <tabstop>CBPHPFooter</tabstop> + <tabstop>phpFooterFile</tabstop> + <tabstop>CloseButton1</tabstop> + <tabstop>CloseButton1_2</tabstop> +</tabstops> +<layoutdefaults spacing="6" margin="11"/> +</UI> diff --git a/quanta/scripts/htmlquickstart5.kmdr.info b/quanta/scripts/htmlquickstart5.kmdr.info new file mode 100644 index 00000000..2602167a --- /dev/null +++ b/quanta/scripts/htmlquickstart5.kmdr.info @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE QuantaScriptInfo> +<INFO> +<options editor="kmdr-editor" interpreter="kmdr-executor -c quanta" /> +<name>htmlquickstart5</name> +<author>Alexis Puente Montiel</author> +<email>miscelaneanatural@yahoo.es</email> +<website>http://quanta.sf.net/</website> +<version>1.1</version> +<license>GPL</license> +<about>Enjoy!</about> +</INFO> diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr index 2ba267f7..e536d82a 100644 --- a/quanta/scripts/tidy.kmdr +++ b/quanta/scripts/tidy.kmdr @@ -1069,9 +1069,9 @@ fi </connection> <connection> <sender>ExecButton2</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>GtidyPath</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> diff --git a/quanta/src/CMakeLists.txt b/quanta/src/CMakeLists.txt index ff7d5d4c..4ca5e552 100644 --- a/quanta/src/CMakeLists.txt +++ b/quanta/src/CMakeLists.txt @@ -19,6 +19,7 @@ include_directories( ${CMAKE_BINARY_DIR}/quanta/components/tableeditor ${CMAKE_BINARY_DIR}/quanta/components/csseditor ${CMAKE_BINARY_DIR}/quanta/components/framewizard + ${CMAKE_BINARY_DIR}/quanta/components/cvsservice ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/quanta/src ${CMAKE_SOURCE_DIR}/quanta/project @@ -31,12 +32,16 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/components/tableeditor ${CMAKE_SOURCE_DIR}/quanta/components/csseditor ${CMAKE_SOURCE_DIR}/quanta/components/framewizard + ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice ${CMAKE_SOURCE_DIR}/quanta/messages ${CMAKE_SOURCE_DIR}/quanta/treeviews ${CMAKE_SOURCE_DIR}/quanta/plugins ${CMAKE_SOURCE_DIR}/quanta/dialogs ${CMAKE_SOURCE_DIR}/quanta/dialogs/settings ${CMAKE_SOURCE_DIR}/quanta/dialogs/tagdialogs +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -48,8 +53,16 @@ link_directories( ##### other data ################################ -install( FILES quanta.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES x-webprj.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) +tde_create_translated_desktop( + SOURCE quanta.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} + PO_DIR quanta-desktops +) +tde_create_translated_desktop( + SOURCE x-webprj.desktop + DESTINATION ${MIME_INSTALL_DIR}/application + PO_DIR quanta-desktops +) ##### quanta (executable) ####################### @@ -57,6 +70,7 @@ install( FILES x-webprj.desktop DESTINATION ${MIME_INSTALL_DIR}/application ) set_property( SOURCE kqapp.cpp APPEND PROPERTY COMPILE_DEFINITIONS PREFIX="${CMAKE_INSTALL_PREFIX}" ) tde_add_executable( quanta AUTOMOC + SOURCES quanta_init.cpp quantaview.cpp quantadoc.cpp main.cpp document.cpp kqapp.cpp quanta.cpp @@ -64,15 +78,19 @@ tde_add_executable( quanta AUTOMOC dcopquantaif.skel dcopsettings.cpp dtds.cpp dcopquanta.cpp viewmanager.cpp LINK - project-static plugins-static parser-static - dtdparser-static treeviews-static dialogs-static - debuggermanager-static tagdialogs-static - settingsdialogs-static messages-static - framewizard-static csseditor-static - tableeditor-static preview-static - utility-static quantamodule-static - kafkalibrary-static tdemdi-shared tdehtml-shared - tdenewstuff-shared tdeabc-shared tdetexteditor-shared - ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} + tdecore-shared tdeui-shared tdeio-shared + katepartinterfaces-shared tdenewstuff-shared + tdeabc-shared tdetexteditor-shared + tdemdi-shared tdehtml-shared tdespell-shared + kafkalibrary-static project-static + plugins-static parser-static + dtdparser-static treeviews-static + dialogs-static debuggermanager-static + tagdialogs-static settingsdialogs-static + messages-static framewizard-static + csseditor-static tableeditor-static + preview-static utility-static quantamodule-static + ${LIBXML_LIBRARIES} ${LIBXSLT_LIBRARIES} ${CVSSERVICE_LIBRARIES} + DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index c5530dae..49b3d195 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -200,25 +200,25 @@ Document::Document(KTextEditor::Document *doc, //path of the backup copy file of the document m_backupPathValue = TQString(); - connect( m_doc, TQT_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), - this, TQT_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); + connect( m_doc, TQ_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), + this, TQ_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); - connect( m_view, TQT_SIGNAL(completionAborted()), - this, TQT_SLOT( slotCompletionAborted()) ); + connect( m_view, TQ_SIGNAL(completionAborted()), + this, TQ_SLOT( slotCompletionAborted()) ); - connect( m_view, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - this, TQT_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); + connect( m_view, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), + this, TQ_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); - connect( m_view, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), - this, TQT_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); - connect( m_doc, TQT_SIGNAL(textChanged()), TQT_SLOT(slotTextChanged())); + connect( m_view, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), + this, TQ_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); + connect( m_doc, TQ_SIGNAL(textChanged()), TQ_SLOT(slotTextChanged())); - connect(m_view, TQT_SIGNAL(gotFocus(Kate::View*)), TQT_SIGNAL(editorGotFocus())); + connect(m_view, TQ_SIGNAL(gotFocus(Kate::View*)), TQ_SIGNAL(editorGotFocus())); - connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotFileDirty(const TQString&))); + connect(fileWatcher, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotFileDirty(const TQString&))); -// connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(slotMarksChanged())); - connect(m_doc, TQT_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQT_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); +// connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(slotMarksChanged())); + connect(m_doc, TQ_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQ_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); } @@ -725,7 +725,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) /* if (completion.type == "charCompletion") { m_lastCompletionList = getCharacterCompletions(completion.userdata); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } else*/ if (completion.type == "attribute") { @@ -736,7 +736,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) if (tag) { m_lastCompletionList = getAttributeValueCompletions(tag->name(), completion.text); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } } } else @@ -755,7 +755,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) { m_lastLine = line; m_lastCol = col - 1; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedScriptAutoCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedScriptAutoCompletion())); } } } @@ -859,7 +859,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(string[0].unicode()); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -872,7 +872,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(c); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -2236,7 +2236,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } @@ -2252,7 +2252,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); md5sum = context.hexDigest(); kdDebug(24000) << "MD5 sum of current doc: " << m_md5sum << endl; kdDebug(24000) << "MD5 sum of doc on disc : " << md5sum << endl; @@ -2323,7 +2323,7 @@ bool Document::saveAs(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } @@ -2367,7 +2367,7 @@ void Document::slotTextChanged() { kdDebug(24000) << "Delayed text changed called." << endl; //delay the handling, otherwise we may get wrong values for (line,column) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedTextChanged())); delayedTextChangedEnabled = false; } } @@ -2378,7 +2378,7 @@ void Document::slotDelayedTextChanged(bool forced) { kdDebug(24000) << "Reparsing delayed!" << endl; parser->setParsingNeeded(true); - TQTimer::singleShot(1000, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDelayedTextChanged())); reparseEnabled = false; delayedTextChangedEnabled = false; return; @@ -2872,8 +2872,8 @@ void Document::open(const KURL &url, const TQString &encoding) m_encoding = encoding; m_codec = TQTextCodec::codecForName(m_encoding.ascii()); } - connect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - connect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + connect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + connect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); if (!openURL(url)) slotOpeningFailed(TQString()); if (!url.isLocalFile()) @@ -2897,8 +2897,8 @@ void Document::slotOpeningCompleted() m_modifTime = TQFileInfo(u.path()).lastModified(); // kdDebug(24000) << "addFile[Document::open]: " << u.path() << endl; } - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); m_dirty = false; m_view->setFocus(); processDTD(); @@ -2911,8 +2911,8 @@ void Document::slotOpeningFailed(const TQString &errorMessage) Q_UNUSED(errorMessage); //TODO: append the error message to our own error message if (!url().isLocalFile()) tqApp->exit_loop(); - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); emit openingFailed(url()); } @@ -3115,7 +3115,7 @@ void Document::setAnnotationText(uint line, const TQString& text) markIf->removeMark(line, KTextEditor::MarkInterface::markType08); } else { - m_annotations.insert(line, tqMakePair(text, TQString(""))); + m_annotations.insert(line, qMakePair(text, TQString(""))); if (markIf) markIf->setMark(line, KTextEditor::MarkInterface::markType08); uint line, column; @@ -3147,7 +3147,7 @@ void Document::setAnnotationText(uint line, const TQString& text) s.prepend(commentBegin + " "); s.append(" " + commentEnd + "\n"); insertText(s, true, true); - emit showAnnotation(line, "", tqMakePair(text, TQString(""))); + emit showAnnotation(line, "", qMakePair(text, TQString(""))); } } @@ -3181,7 +3181,7 @@ bool Document::openURL(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } diff --git a/quanta/src/document.h b/quanta/src/document.h index 9d8de77d..e6f0fff1 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -67,7 +67,7 @@ namespace KTextEditor } class Document : public TQWidget{ - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 737a3a00..bf257a0c 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -59,9 +59,9 @@ const TQString m_rcFilename("description.rc"); DTDs::DTDs(TQObject *parent) :TQObject(parent) { - connect(this, TQT_SIGNAL(hideSplash()), parent, TQT_SLOT(slotHideSplash())); - connect(this, TQT_SIGNAL(enableIdleTimer(bool)), parent, TQT_SLOT(slotEnableIdleTimer(bool))); - connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&))); + connect(this, TQ_SIGNAL(hideSplash()), parent, TQ_SLOT(slotHideSplash())); + connect(this, TQ_SIGNAL(enableIdleTimer(bool)), parent, TQ_SLOT(slotEnableIdleTimer(bool))); + connect(this, TQ_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQ_SLOT(slotLoadToolbarForDTD(const TQString&))); // kdDebug(24000) << "dtds::dtds" << endl; m_dict = new TQDict<DTDStruct>(119, false); //optimized for max 119 DTD. This should be enough. m_dict->setAutoDelete(true); diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h index e1329b24..76c224d6 100644 --- a/quanta/src/dtds.h +++ b/quanta/src/dtds.h @@ -48,7 +48,7 @@ struct DTDStruct; */ class DTDs : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index fc826178..8bd35024 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -93,8 +93,8 @@ KQApplication::KQApplication() { sp = new KSplashScreen(UserIcon(SPLASH_PICTURE)); sp->show(); - connect(quantaApp, TQT_SIGNAL(showSplash(bool)), sp, TQT_SLOT(setShown(bool))); - TQTimer::singleShot(10*1000, this, TQT_SLOT(slotSplashTimeout())); + connect(quantaApp, TQ_SIGNAL(showSplash(bool)), sp, TQ_SLOT(setShown(bool))); + TQTimer::singleShot(10*1000, this, TQ_SLOT(slotSplashTimeout())); } setMainWidget(quantaApp); slotInit(); @@ -164,8 +164,8 @@ int KQUniqueApplication::newInstance() { sp = new KSplashScreen(UserIcon(SPLASH_PICTURE)); sp->show(); - connect(quantaApp, TQT_SIGNAL(showSplash(bool)), sp, TQT_SLOT(setShown(bool))); - TQTimer::singleShot(10*1000, this, TQT_SLOT(slotSplashTimeout())); + connect(quantaApp, TQ_SIGNAL(showSplash(bool)), sp, TQ_SLOT(setShown(bool))); + TQTimer::singleShot(10*1000, this, TQ_SLOT(slotSplashTimeout())); } setMainWidget(quantaApp); slotInit(); diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h index c99c152b..625bdaf6 100644 --- a/quanta/src/kqapp.h +++ b/quanta/src/kqapp.h @@ -27,7 +27,7 @@ class KSplashScreen; class KSplash : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ class KQApplicationPrivate class KQApplication : public TDEApplication, KQApplicationPrivate { - Q_OBJECT + TQ_OBJECT public: @@ -64,7 +64,7 @@ class KQApplication : public TDEApplication, KQApplicationPrivate class KQUniqueApplication : public KUniqueApplication, KQApplicationPrivate { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index d72cce65..46a098df 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -15,6 +15,10 @@ * * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <time.h> // include files for QT @@ -206,7 +210,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_quantaInit = new QuantaInit(this); dcopSettings = new DCOPSettings; dcopQuanta = new DCOPQuanta; - DTDs::ref(TQT_TQOBJECT(this)); + DTDs::ref(this); quantaStarted = true; tempFileList.setAutoDelete(true); m_toolbarList.setAutoDelete(true); @@ -215,7 +219,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( currentToolbarDTD = TQString(); m_config=kapp->config(); idleTimer = new TQTimer(this); - connect(idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimerExpired())); + connect(idleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimerExpired())); m_idleTimerEnabled = true; qConfig.globalDataDir = TDEGlobal::dirs()->findResourceDir("data",resourceDir + "toolbar/quantalogo.png"); @@ -226,7 +230,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( kdWarning() << i18n("Quanta data files were not found.") << endl; kdWarning() << i18n("You may have forgotten to run \"make install\", or your TDEDIR, TDEDIRS or PATH are not set correctly.") << endl; kdWarning() << "***************************************************************************" << endl; - TQTimer::singleShot(20, kapp, TQT_SLOT(quit())); + TQTimer::singleShot(20, kapp, TQ_SLOT(quit())); return; } qConfig.enableDTDToolbar = true; @@ -239,10 +243,10 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_partManager = new KParts::PartManager(this); // When the manager says the active part changes, // the builder updates (recreates) the GUI - connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), - this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); - connect(this, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget *)), this, TQT_SLOT(slotDockWidgetHasUndocked(KDockWidget *))); - connect(tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget *)), this, TQT_SLOT(slotTabDragged(TQWidget*))); + connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )), + this, TQ_SLOT(slotActivePartChanged(KParts::Part * ))); + connect(this, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget *)), this, TQ_SLOT(slotDockWidgetHasUndocked(KDockWidget *))); + connect(tabWidget(), TQ_SIGNAL(initiateDrag(TQWidget *)), this, TQ_SLOT(slotTabDragged(TQWidget*))); m_oldKTextEditor = 0L; m_previewToolView = 0L; @@ -258,7 +262,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_parserEnabled = true; cursorLine = 0; cursorCol = 0; - emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString()); + emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(TQt::ISODate), TQString()); setAcceptDrops(true); tabWidget()->installEventFilter(this); } @@ -276,9 +280,9 @@ QuantaApp::~QuantaApp() m_newScriptStuff = 0L; delete m_newDTEPStuff; m_newDocStuff = 0L; - // disconnect(m_htmlPart, TQT_SIGNAL(destroyed(TQObject *))); - // disconnect(m_htmlPartDoc, TQT_SIGNAL(destroyed(TQObject *))); - disconnect(this, TQT_SIGNAL(lastChildViewClosed()), ViewManager::ref(), TQT_SLOT(slotLastViewClosed())); + // disconnect(m_htmlPart, TQ_SIGNAL(destroyed(TQObject *))); + // disconnect(m_htmlPartDoc, TQ_SIGNAL(destroyed(TQObject *))); + disconnect(this, TQ_SIGNAL(lastChildViewClosed()), ViewManager::ref(), TQ_SLOT(slotLastViewClosed())); //kdDebug(24000) << "QuantaApp::~QuantaApp" << endl; #ifdef ENABLE_CVSSERVICE delete CVSService::ref(); @@ -1077,7 +1081,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar) } } - connect(dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotNewToolbarConfig())); + connect(dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotNewToolbarConfig())); dlg->exec(); delete dlg; TQPopupMenu *menu = 0L; @@ -1385,8 +1389,8 @@ void QuantaApp::slotShowPreviewWidget(bool show) if (!m_previewToolView) { m_previewToolView= addToolWindow(m_htmlPart->view(), prevDockPosition(m_htmlPart->view(), KDockWidget::DockBottom), getMainDockWidget()); - connect(m_previewToolView->wrapperWidget(), TQT_SIGNAL(iMBeingClosed -()), this, TQT_SLOT(slotPreviewBeingClosed())); + connect(m_previewToolView->wrapperWidget(), TQ_SIGNAL(iMBeingClosed +()), this, TQ_SLOT(slotPreviewBeingClosed())); } m_htmlPart->view()->show(); m_previewToolView->show(); @@ -1790,7 +1794,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl if ( element.tagName().lower() == "toolbar" && !tabname.isEmpty()) { //avoid TQToolBar warning in the log - TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); + TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar ); ToolbarTabWidget *toolbarTab = ToolbarTabWidget::ref(); TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii()); QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true); @@ -1813,12 +1817,12 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl kdDebug(24000) << "toolbarTab->tabHeight() " << toolbarTab->tabHeight() << endl; */ toolbarTab->insertTab(tb, tabname, idStr); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); - connect(tb, TQT_SIGNAL(removeAction(const TQString&, const TQString&)), - TQT_SLOT(slotRemoveAction(const TQString&, const TQString&))); - connect(tb, TQT_SIGNAL(editAction(const TQString&)), - TQT_SLOT(slotEditAction(const TQString&))); + connect(tb, TQ_SIGNAL(removeAction(const TQString&, const TQString&)), + TQ_SLOT(slotRemoveAction(const TQString&, const TQString&))); + connect(tb, TQ_SIGNAL(editAction(const TQString&)), + TQ_SLOT(slotEditAction(const TQString&))); return tb; } @@ -3690,7 +3694,7 @@ void QuantaApp::slotDownloadDoc() if (!m_newDocStuff) { m_newDocStuff = new QNewDocStuff("quanta documentation", this); - connect(m_newDocStuff, TQT_SIGNAL(installFinished()), dTab, TQT_SLOT(slotRefreshTree())); + connect(m_newDocStuff, TQ_SIGNAL(installFinished()), dTab, TQ_SLOT(slotRefreshTree())); } m_newDocStuff->downloadResource(); } @@ -4043,7 +4047,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly) n->next->tag->beginPos(l, c); else n->tag->endPos(l, c); - commentTag->write()->addAnnotation(l, tqMakePair(text, receiver)); + commentTag->write()->addAnnotation(l, qMakePair(text, receiver)); } } node = node->nextSibling(); @@ -4141,7 +4145,7 @@ bool QuantaApp::queryClose() { saveOptions(); // kdDebug(24000) << "Quanta will exit" << endl; - emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString()); + emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(TQt::ISODate), TQString()); } else slotFileNew(); return canExit; @@ -4767,7 +4771,7 @@ void QuantaApp::slotViewInKFM() } if ( !w->isUntitled() ) { - TDEProcess *show = new TDEProcess(TQT_TQOBJECT(this)); + TDEProcess *show = new TDEProcess(this); KURL url = Project::ref()->urlWithPrefix(w->url()); *show << "kfmclient" << "newTab" << url.url(); show->start( TDEProcess::DontCare ); @@ -4801,7 +4805,7 @@ void QuantaApp::slotViewInLynx() } if ( !w->isUntitled() ) { - TDEProcess *show = new TDEProcess(TQT_TQOBJECT(this)); + TDEProcess *show = new TDEProcess(this); KURL url = Project::ref()->urlWithPrefix(w->url()); *show << "konsole" << "--nohist" @@ -5088,8 +5092,8 @@ void QuantaApp::initTabWidget(bool closeButtonsOnly) { tab->setTabReorderingEnabled(true); tab->setTabPosition(TQTabWidget::Bottom); - connect(tab, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), ViewManager::ref(), TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & ) ) ); - connect(tab, TQT_SIGNAL(initiateTabMove(int, int)), this, TQT_SLOT(slotTabAboutToMove(int, int))); connect(tab, TQT_SIGNAL(movedTab(int, int)), this, TQT_SLOT(slotTabMoved(int, int))); setTabWidgetVisibility(KMdi::AlwaysShowTabs); + connect(tab, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), ViewManager::ref(), TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & ) ) ); + connect(tab, TQ_SIGNAL(initiateTabMove(int, int)), this, TQ_SLOT(slotTabAboutToMove(int, int))); connect(tab, TQ_SIGNAL(movedTab(int, int)), this, TQ_SLOT(slotTabMoved(int, int))); setTabWidgetVisibility(KMdi::AlwaysShowTabs); } } if (!closeButtonsOnly) @@ -5263,10 +5267,10 @@ void QuantaApp::createPreviewPart() m_htmlPart->view()->setIcon(UserIcon("preview")); m_htmlPart->view()->setCaption(i18n("Preview")); slotNewPart(m_htmlPart, false); - connect(m_htmlPart, TQT_SIGNAL(previewHasFocus(bool)), this, TQT_SLOT(slotPreviewHasFocus(bool))); - connect(m_htmlPart, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotHTMLPartDeleted(TQObject *))); - connect(m_htmlPart, TQT_SIGNAL(openFile(const KURL&, const TQString&, bool)), this, TQT_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); - connect(m_htmlPart, TQT_SIGNAL(showPreview(bool)), this, TQT_SLOT(slotShowPreviewWidget(bool))); + connect(m_htmlPart, TQ_SIGNAL(previewHasFocus(bool)), this, TQ_SLOT(slotPreviewHasFocus(bool))); + connect(m_htmlPart, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotHTMLPartDeleted(TQObject *))); + connect(m_htmlPart, TQ_SIGNAL(openFile(const KURL&, const TQString&, bool)), this, TQ_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); + connect(m_htmlPart, TQ_SIGNAL(showPreview(bool)), this, TQ_SLOT(slotShowPreviewWidget(bool))); } @@ -5277,7 +5281,7 @@ void QuantaApp::createDocPart() m_htmlPartDoc->view()->setIcon(SmallIcon("contents")); m_htmlPartDoc->view()->setCaption(i18n("Documentation")); slotNewPart(m_htmlPartDoc, false); - connect(m_htmlPartDoc, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotHTMLPartDeleted(TQObject *))); + connect(m_htmlPartDoc, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotHTMLPartDeleted(TQObject *))); } void QuantaApp::insertTagActionPoolItem(TQString const& action_item) @@ -5316,14 +5320,14 @@ void QuantaApp::slotTabMoved(int from, int to) KMdiChildView *view = m_pDocumentViews->at(from); m_pDocumentViews->remove(from); m_pDocumentViews->insert(to, view); - connect(this, TQT_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQT_SLOT(slotViewActivated(KMdiChildView*))); + connect(this, TQ_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQ_SLOT(slotViewActivated(KMdiChildView*))); } void QuantaApp::slotTabAboutToMove(int from, int to) { Q_UNUSED(from); Q_UNUSED(to); - disconnect(this, TQT_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQT_SLOT(slotViewActivated(KMdiChildView*))); + disconnect(this, TQ_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQ_SLOT(slotViewActivated(KMdiChildView*))); } TQString QuantaApp::currentURL() const diff --git a/quanta/src/quanta.desktop b/quanta/src/quanta.desktop index 54f4f6dd..c9be0558 100644 --- a/quanta/src/quanta.desktop +++ b/quanta/src/quanta.desktop @@ -1,95 +1,13 @@ [Desktop Entry] Name=Quanta Plus -Name[br]=Quanta+ -Name[hi]=क्वांटा प्लस -Name[ne]=क्वान्टा प्लस -Name[sv]=Quanta plus -Name[ta]=குவாண்டா ப்ளஸ் + +GenericName=Web Development Environment + +Comment=Web Development Environment + +Type=Application Exec=quanta %U Icon=quanta -Type=Application MimeType=text/html;application/x-webprj; X-DocPath=quanta/index.html -GenericName=Web Development Environment -GenericName[bg]=Разработка на уеб приложения -GenericName[ca]=Entorn de desenvolupament web -GenericName[cs]=Vývojové prostředí pro web -GenericName[da]=Internetudviklingsomgivelser -GenericName[de]=Web-Entwicklungsumgebung -GenericName[el]=Περιβάλλον ανάπτυξης ιστοσελίδων -GenericName[es]=Entorno de desarrollo web -GenericName[et]=Veebiarenduskeskkond -GenericName[eu]=Web garapenerako ingurunea -GenericName[fa]=محیط توسعۀ وب -GenericName[fi]=WWW:n kehitysympäristö -GenericName[fr]=Environnement de développement Internet -GenericName[gl]=Entorno de desenvolvemento de páxinas web -GenericName[hi]=वेब डेवलपमेंट वातावरण -GenericName[hu]=Webfejlesztő környezet -GenericName[is]=Vefþróunarumhverfi -GenericName[it]=Ambiente per lo sviluppo Web -GenericName[ja]=ウェブ開発環境 -GenericName[ka]=ვებ დამუშავების გარსი -GenericName[lt]=Žiniatinklio kūrimo aplinka -GenericName[ms]=Persekitaran Pembangunan Web -GenericName[nds]=Ümgeven för Nett-Entwickeln -GenericName[ne]=वेब विकास परिवेश -GenericName[nl]=Omgeving voor webdevelopment -GenericName[pl]=Środowisko do tworzenia stron WWW -GenericName[pt]=Ambiente de Desenvolvimento Web -GenericName[pt_BR]=Ambiente de Desenvolvimento Web -GenericName[ru]=Среда web-разработки -GenericName[sk]=Prostredie na vývoj Web aplikácií -GenericName[sl]=Spletno razvijalno okolje -GenericName[sr]=Окружење за веб развој -GenericName[sr@Latn]=Okruženje za veb razvoj -GenericName[sv]=Webbutvecklingsmiljö -GenericName[ta]=இணைய மேம்பாட்டுச் சூழல் -GenericName[tg]=Фазои тайёр кардани-Web -GenericName[tr]=Web Geliştirme Ortamı -GenericName[uk]=Середовище веб-розробки -GenericName[zh_CN]=Web 开发环境 -GenericName[zh_HK]=網頁開發環境 -GenericName[zh_TW]=網頁開發環境 -Comment=Web Development Environment -Comment[bg]=Среда за разработка на уеб приложения -Comment[ca]=Entorn de desenvolupament web -Comment[cs]=Vývojové prostředí pro web -Comment[da]=Internetudviklingsomgivelser -Comment[de]=Web-Entwicklungsumgebung -Comment[el]=Περιβάλλον ανάπτυξης ιστοσελίδων -Comment[es]=Entorno de desarrollo web -Comment[et]=Veebiarenduskeskkond -Comment[eu]=Web garapenerako ingurunea -Comment[fa]=محیط توسعۀ وب -Comment[fi]=WWW:n kehitysympäristö -Comment[fr]=Environnement de développement Internet -Comment[gl]=Entorno de desenvolvemento de páxinas web -Comment[hi]=वेब डेवलपमेंट वातावरण -Comment[hu]=Webfejlesztő környezet -Comment[is]=Vefþróunarumhverfi -Comment[it]=Ambiente per lo sviluppo Web -Comment[ja]=ウェブ開発環境 -Comment[ka]=ვებ დამუშავების გარსი -Comment[lt]=Žiniatinklio kūrimo aplinka -Comment[ms]=Persekitaran Pembangunan Web -Comment[nds]=Ümgeven för Nett-Entwickeln -Comment[ne]=वेब विकास परिवेश -Comment[nl]=Omgeving voor webdevelopment -Comment[pl]=Środowisko do tworzenia stron WWW -Comment[pt]=Ambiente de desenvolvimento Web -Comment[pt_BR]=Ambiente de Desenvolvimento Web -Comment[ru]=Среда web-разработки -Comment[sk]=Prostredie na vývoj Web aplikácií -Comment[sl]=Spletno razvijalno okolje -Comment[sr]=Окружење за веб развој -Comment[sr@Latn]=Okruženje za veb razvoj -Comment[sv]=Webbutvecklingsmiljö -Comment[ta]=இணைய மேம்பாட்டுச் சூழல் -Comment[tg]=Фазои тайёр кардани-Web -Comment[tr]=Web Geliştirme Ortamı -Comment[uk]=Середовище веб-розробки -Comment[zh_CN]=Web 开发环境 -Comment[zh_HK]=網頁開發環境 -Comment[zh_TW]=網頁開發環境 Categories=Qt;TDE;Development;WebDevelopment; diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index 942195de..0124c9fc 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -111,7 +111,7 @@ struct ToolbarEntry; */ class QuantaApp : public KMdiMainFrm, public DCOPWindowManagerIf { - Q_OBJECT + TQ_OBJECT friend class QuantaInit; diff --git a/quanta/src/quanta_be.desktop b/quanta/src/quanta_be.desktop index 10f03ef3..82847d28 100644 --- a/quanta/src/quanta_be.desktop +++ b/quanta/src/quanta_be.desktop @@ -1,94 +1,13 @@ [Desktop Entry] Name=Quanta Plus BE -Name[br]=Quanta+ BE -Name[ne]=क्वान्टा प्लस बीई -Name[sv]=Quanta plus BE -Name[ta]=குவாண்டா ப்ளஸ் BE + GenericName=Web Development Environment -GenericName[bg]=Разработка на уеб приложения -GenericName[ca]=Entorn de desenvolupament web -GenericName[cs]=Vývojové prostředí pro web -GenericName[da]=Internetudviklingsomgivelser -GenericName[de]=Web-Entwicklungsumgebung -GenericName[el]=Περιβάλλον ανάπτυξης ιστοσελίδων -GenericName[es]=Entorno de desarrollo web -GenericName[et]=Veebiarenduskeskkond -GenericName[eu]=Web garapenerako ingurunea -GenericName[fa]=محیط توسعۀ وب -GenericName[fi]=WWW:n kehitysympäristö -GenericName[fr]=Environnement de développement Internet -GenericName[gl]=Entorno de desenvolvemento de páxinas web -GenericName[hi]=वेब डेवलपमेंट वातावरण -GenericName[hu]=Webfejlesztő környezet -GenericName[is]=Vefþróunarumhverfi -GenericName[it]=Ambiente per lo sviluppo Web -GenericName[ja]=ウェブ開発環境 -GenericName[ka]=ვებ დამუშავების გარსი -GenericName[lt]=Žiniatinklio kūrimo aplinka -GenericName[ms]=Persekitaran Pembangunan Web -GenericName[nds]=Ümgeven för Nett-Entwickeln -GenericName[ne]=वेब विकास परिवेश -GenericName[nl]=Omgeving voor webdevelopment -GenericName[pl]=Środowisko do tworzenia stron WWW -GenericName[pt]=Ambiente de Desenvolvimento Web -GenericName[pt_BR]=Ambiente de Desenvolvimento Web -GenericName[ru]=Среда web-разработки -GenericName[sk]=Prostredie na vývoj Web aplikácií -GenericName[sl]=Spletno razvijalno okolje -GenericName[sr]=Окружење за веб развој -GenericName[sr@Latn]=Okruženje za veb razvoj -GenericName[sv]=Webbutvecklingsmiljö -GenericName[ta]=இணைய மேம்பாட்டுச் சூழல் -GenericName[tg]=Фазои тайёр кардани-Web -GenericName[tr]=Web Geliştirme Ortamı -GenericName[uk]=Середовище веб-розробки -GenericName[zh_CN]=Web 开发环境 -GenericName[zh_HK]=網頁開發環境 -GenericName[zh_TW]=網頁開發環境 + +Comment=Web Development Environment + +Type=Application Exec=quanta_be Icon=quanta_be -Type=Application MimeType=text/html;application/x-webprj X-DocPath=quanta/index.html -Comment=Web Development Environment -Comment[bg]=Среда за разработка на уеб приложения -Comment[ca]=Entorn de desenvolupament web -Comment[cs]=Vývojové prostředí pro web -Comment[da]=Internetudviklingsomgivelser -Comment[de]=Web-Entwicklungsumgebung -Comment[el]=Περιβάλλον ανάπτυξης ιστοσελίδων -Comment[es]=Entorno de desarrollo web -Comment[et]=Veebiarenduskeskkond -Comment[eu]=Web garapenerako ingurunea -Comment[fa]=محیط توسعۀ وب -Comment[fi]=WWW:n kehitysympäristö -Comment[fr]=Environnement de développement Internet -Comment[gl]=Entorno de desenvolvemento de páxinas web -Comment[hi]=वेब डेवलपमेंट वातावरण -Comment[hu]=Webfejlesztő környezet -Comment[is]=Vefþróunarumhverfi -Comment[it]=Ambiente per lo sviluppo Web -Comment[ja]=ウェブ開発環境 -Comment[ka]=ვებ დამუშავების გარსი -Comment[lt]=Žiniatinklio kūrimo aplinka -Comment[ms]=Persekitaran Pembangunan Web -Comment[nds]=Ümgeven för Nett-Entwickeln -Comment[ne]=वेब विकास परिवेश -Comment[nl]=Omgeving voor webdevelopment -Comment[pl]=Środowisko do tworzenia stron WWW -Comment[pt]=Ambiente de desenvolvimento Web -Comment[pt_BR]=Ambiente de Desenvolvimento Web -Comment[ru]=Среда web-разработки -Comment[sk]=Prostredie na vývoj Web aplikácií -Comment[sl]=Spletno razvijalno okolje -Comment[sr]=Окружење за веб развој -Comment[sr@Latn]=Okruženje za veb razvoj -Comment[sv]=Webbutvecklingsmiljö -Comment[ta]=இணைய மேம்பாட்டுச் சூழல் -Comment[tg]=Фазои тайёр кардани-Web -Comment[tr]=Web Geliştirme Ortamı -Comment[uk]=Середовище веб-розробки -Comment[zh_CN]=Web 开发环境 -Comment[zh_HK]=網頁開發環境 -Comment[zh_TW]=網頁開發環境 Categories=Qt;TDE;Development; diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index f01f22d7..42e72e38 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -16,6 +16,10 @@ * * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + // include files for QT #include <tqdir.h> #include <tqprinter.h> @@ -119,7 +123,7 @@ QuantaInit::QuantaInit(QuantaApp * quantaApp) : TQObject() { m_quanta = quantaApp; - connect(this, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); + connect(this, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); } QuantaInit::~QuantaInit() @@ -170,12 +174,12 @@ void QuantaInit::initQuanta() readAbbreviations(); // Initialize debugger - m_quanta->m_debugger = new DebuggerManager(TQT_TQOBJECT(m_quanta)); - connect(Project::ref(), TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->m_debugger, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(Project::ref(), TQT_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), - m_quanta->m_debugger, TQT_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); - connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); + m_quanta->m_debugger = new DebuggerManager(m_quanta); + connect(Project::ref(), TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->m_debugger, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(Project::ref(), TQ_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), + m_quanta->m_debugger, TQ_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); + connect(m_quanta->m_debugger, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); //m_quanta->KDockMainWindow::createGUI( TQString(), false /* conserveMemory */ ); m_quanta->createShellGUI(true); @@ -209,7 +213,7 @@ void QuantaInit::initQuanta() if (mdiMode == KMdi::ToplevelMode) { m_quanta->switchToChildframeMode(); - TQTimer::singleShot(0, TQT_TQOBJECT(m_quanta), TQT_SLOT(switchToToplevelMode())); + TQTimer::singleShot(0, m_quanta, TQ_SLOT(switchToToplevelMode())); } // Always hide debugger toolbar at this point @@ -253,19 +257,19 @@ void QuantaInit::initQuanta() toolviewMenu->plug(m_quanta->windowMenu()); TQPopupMenu *toolbarsMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("toolbars_load", m_quanta); - connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotBuildPrjToolbarsMenu())); + connect(toolbarsMenu, TQ_SIGNAL(aboutToShow()), m_quanta, TQ_SLOT(slotBuildPrjToolbarsMenu())); TQPopupMenu *contextMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("popup_editor", m_quanta); - connect(contextMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotContextMenuAboutToShow())); + connect(contextMenu, TQ_SIGNAL(aboutToShow()), m_quanta, TQ_SLOT(slotContextMenuAboutToShow())); - connect(m_quanta->m_messageOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_problemOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQT_SIGNAL(clicked(const TQString&, int, int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_annotationOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_messageOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_problemOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_annotationOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); m_quanta->slotFileNew(); m_quanta->slotNewStatus(); @@ -279,12 +283,12 @@ void QuantaInit::initQuanta() qConfig.backupDirPath = TDEGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); m_quanta->autosaveTimer = new TQTimer(m_quanta); - connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAutosaveTimer())); + connect(m_quanta->autosaveTimer, TQ_SIGNAL(timeout()), m_quanta, TQ_SLOT(slotAutosaveTimer())); m_quanta->autosaveTimer->start(qConfig.autosaveInterval * 60000, false); - connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); - connect(parser, TQT_SIGNAL(rebuildStructureTree(bool)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReloadStructTreeView(bool))); + connect(m_quanta->m_doc, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); + connect(parser, TQ_SIGNAL(rebuildStructureTree(bool)), + m_quanta, TQ_SLOT(slotReloadStructTreeView(bool))); // Read list of characters TQFile file(locate("appdata","chars")); @@ -315,7 +319,7 @@ void QuantaInit::initQuanta() ViewManager::ref()->activeDocument()->view()->setFocus(); m_quanta->refreshTimer = new TQTimer(m_quanta); - connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReparse())); + connect(m_quanta->refreshTimer, TQ_SIGNAL(timeout()), m_quanta, TQ_SLOT(slotReparse())); m_quanta->refreshTimer->start( qConfig.refreshFrequency*1000, false ); //update the structure tree every 5 seconds if (qConfig.instantUpdate || qConfig.refreshFrequency == 0) { @@ -333,8 +337,8 @@ void QuantaInit::initToolBars() void QuantaInit::initStatusBar() { m_quanta->statusbarTimer = new TQTimer(m_quanta); - connect(m_quanta->statusbarTimer,TQT_SIGNAL(timeout()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(statusBarTimeout())); + connect(m_quanta->statusbarTimer,TQ_SIGNAL(timeout()), + m_quanta, TQ_SLOT(statusBarTimeout())); progressBar = new KProgress(m_quanta->statusBar()); progressBar->setTextEnabled(false); @@ -356,111 +360,111 @@ void QuantaInit::initStatusBar() void QuantaInit::initDocument() { m_quanta->m_doc = new QuantaDoc(0L); - connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus())); + connect(m_quanta->m_doc, TQ_SIGNAL(newStatus()), + m_quanta, TQ_SLOT(slotNewStatus())); } void QuantaInit::initProject() { Project *m_project = Project::ref(m_quanta); - connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)), - pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *))); - connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &))); - connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetUserToolbarFiles(KURL::List *))); - connect(m_project, TQT_SIGNAL(openFiles(const KURL::List &, const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&))); - connect(m_project, TQT_SIGNAL(openFile(const KURL &, const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL &, const TQString&))); - connect(m_project, TQT_SIGNAL(closeFile(const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileClose(const KURL &))); - connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), - pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); - connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll())); - connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - - connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)), - m_project, TQT_SLOT(slotAddDirectory(const KURL&))); - - connect(m_quanta->fTab, TQT_SIGNAL(insertFileInProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - - connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertDirInProject(const KURL&)), - m_project, TQT_SLOT(slotAddDirectory(const KURL&))); - - connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertFileInProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(downloadTemplate()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadTemplate())); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadTemplate(const TQString&))); + connect(m_project, TQ_SIGNAL(getTreeStatus(TQStringList *)), + pTab, TQ_SLOT(slotGetTreeStatus(TQStringList *))); + connect(m_project, TQ_SIGNAL(loadToolbarFile(const KURL &)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL &))); + connect(m_project, TQ_SIGNAL(getUserToolbarFiles(KURL::List *)), + m_quanta, TQ_SLOT(slotGetUserToolbarFiles(KURL::List *))); + connect(m_project, TQ_SIGNAL(openFiles(const KURL::List &, const TQString&)), + m_quanta, TQ_SLOT(slotFileOpen(const KURL::List &, const TQString&))); + connect(m_project, TQ_SIGNAL(openFile(const KURL &, const TQString&)), + m_quanta, TQ_SLOT(slotFileOpen(const KURL &, const TQString&))); + connect(m_project, TQ_SIGNAL(closeFile(const KURL &)), + m_quanta, TQ_SLOT(slotFileClose(const KURL &))); + connect(m_project, TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), + pTab, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); + connect(m_project, TQ_SIGNAL(closeFiles()), ViewManager::ref(), TQ_SLOT(closeAll())); + connect(m_project, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + + connect(m_quanta->fTab, TQ_SIGNAL(insertDirInProject(const KURL&)), + m_project, TQ_SLOT(slotAddDirectory(const KURL&))); + + connect(m_quanta->fTab, TQ_SIGNAL(insertFileInProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + + connect(TemplatesTreeView::ref(), TQ_SIGNAL(insertDirInProject(const KURL&)), + m_project, TQ_SLOT(slotAddDirectory(const KURL&))); + + connect(TemplatesTreeView::ref(), TQ_SIGNAL(insertFileInProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + connect(TemplatesTreeView::ref(), TQ_SIGNAL(downloadTemplate()), + m_quanta, TQ_SLOT(slotDownloadTemplate())); + connect(TemplatesTreeView::ref(), TQ_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQ_SLOT(slotUploadTemplate(const TQString&))); // inform project if something was renamed - connect(pTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - connect(m_quanta->fTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - connect(tTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - - connect(pTab, TQT_SIGNAL(insertToProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - connect(pTab, TQT_SIGNAL(removeFromProject(const KURL&)), - m_project, TQT_SLOT(slotRemove(const KURL&))); - connect(pTab, TQT_SIGNAL(uploadSingleURL(const KURL&, const TQString&, bool, bool)), - m_project, TQT_SLOT(slotUploadURL(const KURL&, const TQString&, bool, bool))); - connect(pTab, TQT_SIGNAL(rescanProjectDir()), m_project, TQT_SLOT(slotRescanPrjDir())); - connect(pTab, TQT_SIGNAL(showProjectOptions()), m_project, TQT_SLOT(slotOptions())); - connect(pTab, TQT_SIGNAL(uploadProject()), m_project, TQT_SLOT(slotUpload())); - - connect(m_quanta->dTab, TQT_SIGNAL(reloadProjectDocs()), m_project, TQT_SLOT(slotReloadProjectDocs())); - connect(m_project, TQT_SIGNAL(reloadProjectDocs()), m_quanta->dTab, TQT_SLOT(slotReloadProjectDocs())); - connect(m_project, TQT_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQT_SLOT(slotAddProjectDoc(const KURL&))); - - connect(m_project, TQT_SIGNAL(enableMessageWidget()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMessagesView())); - - connect(m_project, TQT_SIGNAL(messages(const TQString&)), - m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&))); - - connect(m_project, TQT_SIGNAL(newStatus()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus())); - - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - pTab, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->fTab, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->annotationOutput(), TQT_SLOT(updateAnnotations())); - - connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)), - m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&))); - connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)), - m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int))); - connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), - m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); - - connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); - - connect(m_project, TQT_SIGNAL(statusMsg(const TQString &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(pTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + connect(m_quanta->fTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + connect(tTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + + connect(pTab, TQ_SIGNAL(insertToProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + connect(pTab, TQ_SIGNAL(removeFromProject(const KURL&)), + m_project, TQ_SLOT(slotRemove(const KURL&))); + connect(pTab, TQ_SIGNAL(uploadSingleURL(const KURL&, const TQString&, bool, bool)), + m_project, TQ_SLOT(slotUploadURL(const KURL&, const TQString&, bool, bool))); + connect(pTab, TQ_SIGNAL(rescanProjectDir()), m_project, TQ_SLOT(slotRescanPrjDir())); + connect(pTab, TQ_SIGNAL(showProjectOptions()), m_project, TQ_SLOT(slotOptions())); + connect(pTab, TQ_SIGNAL(uploadProject()), m_project, TQ_SLOT(slotUpload())); + + connect(m_quanta->dTab, TQ_SIGNAL(reloadProjectDocs()), m_project, TQ_SLOT(slotReloadProjectDocs())); + connect(m_project, TQ_SIGNAL(reloadProjectDocs()), m_quanta->dTab, TQ_SLOT(slotReloadProjectDocs())); + connect(m_project, TQ_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQ_SLOT(slotAddProjectDoc(const KURL&))); + + connect(m_project, TQ_SIGNAL(enableMessageWidget()), + m_quanta, TQ_SLOT(slotShowMessagesView())); + + connect(m_project, TQ_SIGNAL(messages(const TQString&)), + m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&))); + + connect(m_project, TQ_SIGNAL(newStatus()), + m_quanta, TQ_SLOT(slotNewStatus())); + + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + TemplatesTreeView::ref(), TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + pTab, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->fTab, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->annotationOutput(), TQ_SLOT(updateAnnotations())); + + connect(pTab, TQ_SIGNAL(changeFileDescription(const KURL&, const TQString&)), + m_project, TQ_SLOT(slotFileDescChanged(const KURL&, const TQString&))); + connect(pTab, TQ_SIGNAL(changeUploadStatus(const KURL&, int)), + m_project, TQ_SLOT(slotUploadStatusChanged(const KURL&, int))); + connect(pTab, TQ_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), + m_project, TQ_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); + + connect(m_project, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); + + connect(m_project, TQ_SIGNAL(statusMsg(const TQString &)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); } void QuantaInit::initView() { - ViewManager *m_viewManager = ViewManager::ref(TQT_TQOBJECT(m_quanta)); - connect(m_quanta, TQT_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(m_quanta, TQT_SIGNAL(lastChildViewClosed()), m_viewManager, TQT_SLOT(slotLastViewClosed())); -// connect(m_quanta, TQT_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewDeactivated(KMdiChildView*))); + ViewManager *m_viewManager = ViewManager::ref(m_quanta); + connect(m_quanta, TQ_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(m_quanta, TQ_SIGNAL(lastChildViewClosed()), m_viewManager, TQ_SLOT(slotLastViewClosed())); +// connect(m_quanta, TQ_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQ_SLOT(slotViewDeactivated(KMdiChildView*))); KafkaDocument *m_kafkaDocument = KafkaDocument::ref(0, 0, "KafkaPart"); m_kafkaDocument->getKafkaWidget()->view()->setMinimumHeight(50); m_kafkaDocument->readConfig(quantaApp->config()); loadVPLConfig(); ToolbarTabWidget *toolBarTab = ToolbarTabWidget::ref(quantaApp); - connect(toolBarTab, TQT_SIGNAL(iconTextModeChanged()), quantaApp, TQT_SLOT(slotRefreshActiveWindow())); + connect(toolBarTab, TQ_SIGNAL(iconTextModeChanged()), quantaApp, TQ_SLOT(slotRefreshActiveWindow())); //set the toolview and close button style before the GUI is created m_config->setGroup("General Options"); @@ -481,72 +485,72 @@ void QuantaInit::initView() m_quanta->scriptTab = new ScriptTreeView(m_quanta, "Scripts"); m_quanta->m_messageOutput = new MessageOutput(m_quanta, "Messages"); - m_quanta->m_messageOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_messageOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->m_messageOutput->showMessage(i18n("Message Window...")); - connect(m_quanta, TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(m_quanta, TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); + connect(m_quanta, TQ_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&, bool))); + connect(m_quanta, TQ_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQ_SLOT(clear())); m_quanta->m_problemOutput = new MessageOutput(m_quanta, "Problems"); - m_quanta->m_problemOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_problemOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->m_annotationOutput = new AnnotationOutput(m_quanta, "Annotations"); - m_quanta->m_annotationOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_annotationOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->createPreviewPart(); m_quanta->createDocPart(); - connect(m_quanta, TQT_SIGNAL(reloadAllTrees()), - m_quanta->fTab, TQT_SLOT(slotReloadAllTrees())); - - connect(pTab, TQT_SIGNAL(loadToolbarFile (const KURL&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(viewActivated(const KURL&)), - pTab, TQT_SLOT(slotViewActivated(const KURL&))); - - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - pTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - tTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - m_quanta->scriptTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - m_quanta->fTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - - connect(tTab, TQT_SIGNAL(insertFile (const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertFile(const KURL &))); - - connect(m_quanta->scriptTab, TQT_SIGNAL(openFileInPreview(const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileInPreview(const KURL &))); - connect(m_quanta->scriptTab, TQT_SIGNAL(showPreviewWidget(bool)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowPreviewWidget(bool))); - connect(m_quanta->scriptTab, TQT_SIGNAL(assignActionToScript(const KURL &, const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); - connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadScript())); - connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadScript(const TQString&))); - connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadDoc())); - - connect(m_quanta->m_htmlPart, TQT_SIGNAL(onURL(const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&))); - connect(m_quanta->m_htmlPartDoc, TQT_SIGNAL(onURL(const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&))); - - connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(setCursorPosition(int,int))); - connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT( selectArea(int,int,int,int))); - connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSelectTagArea(Node*))); - connect(sTab, TQT_SIGNAL(needReparse()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotForceReparse())); - connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); - connect(sTab, TQT_SIGNAL(openFile(const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT (slotFileOpen(const KURL &))); - connect(sTab, TQT_SIGNAL(openImage (const KURL&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotImageOpen(const KURL&))); - connect(sTab, TQT_SIGNAL(showProblemMessage(const TQString&)), - m_quanta->m_problemOutput, TQT_SLOT(showMessage(const TQString&))); - connect(sTab, TQT_SIGNAL(clearProblemOutput()), - m_quanta->m_problemOutput, TQT_SLOT(clear())); - connect(parser, TQT_SIGNAL(nodeTreeChanged()), sTab, TQT_SLOT(slotNodeTreeChanged())); - - connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(openDoc(const TQString&))); - - connect(m_viewManager, TQT_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQT_SLOT(slotDragInsert(TQDropEvent *))); + connect(m_quanta, TQ_SIGNAL(reloadAllTrees()), + m_quanta->fTab, TQ_SLOT(slotReloadAllTrees())); + + connect(pTab, TQ_SIGNAL(loadToolbarFile (const KURL&)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(viewActivated(const KURL&)), + pTab, TQ_SLOT(slotViewActivated(const KURL&))); + + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + pTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + tTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + m_quanta->scriptTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + m_quanta->fTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + + connect(tTab, TQ_SIGNAL(insertFile (const KURL &)), + m_quanta, TQ_SLOT(slotInsertFile(const KURL &))); + + connect(m_quanta->scriptTab, TQ_SIGNAL(openFileInPreview(const KURL &)), + m_quanta, TQ_SLOT(slotOpenFileInPreview(const KURL &))); + connect(m_quanta->scriptTab, TQ_SIGNAL(showPreviewWidget(bool)), + m_quanta, TQ_SLOT(slotShowPreviewWidget(bool))); + connect(m_quanta->scriptTab, TQ_SIGNAL(assignActionToScript(const KURL &, const TQString&)), + m_quanta, TQ_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); + connect(m_quanta->scriptTab, TQ_SIGNAL(downloadScript()), m_quanta, TQ_SLOT(slotDownloadScript())); + connect(m_quanta->scriptTab, TQ_SIGNAL(uploadScript(const TQString&)), m_quanta, TQ_SLOT(slotUploadScript(const TQString&))); + connect(m_quanta->dTab, TQ_SIGNAL(downloadDoc()), m_quanta, TQ_SLOT(slotDownloadDoc())); + + connect(m_quanta->m_htmlPart, TQ_SIGNAL(onURL(const TQString&)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString&))); + connect(m_quanta->m_htmlPartDoc, TQ_SIGNAL(onURL(const TQString&)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString&))); + + connect(sTab, TQ_SIGNAL(newCursorPosition(int,int)), m_quanta, TQ_SLOT(setCursorPosition(int,int))); + connect(sTab, TQ_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQ_SLOT( selectArea(int,int,int,int))); + connect(sTab, TQ_SIGNAL(selectTagArea(Node*)), m_quanta, TQ_SLOT(slotSelectTagArea(Node*))); + connect(sTab, TQ_SIGNAL(needReparse()), m_quanta, TQ_SLOT(slotForceReparse())); + connect(sTab, TQ_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQ_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); + connect(sTab, TQ_SIGNAL(openFile(const KURL &)), + m_quanta, TQ_SLOT (slotFileOpen(const KURL &))); + connect(sTab, TQ_SIGNAL(openImage (const KURL&)), + m_quanta, TQ_SLOT(slotImageOpen(const KURL&))); + connect(sTab, TQ_SIGNAL(showProblemMessage(const TQString&)), + m_quanta->m_problemOutput, TQ_SLOT(showMessage(const TQString&))); + connect(sTab, TQ_SIGNAL(clearProblemOutput()), + m_quanta->m_problemOutput, TQ_SLOT(clear())); + connect(parser, TQ_SIGNAL(nodeTreeChanged()), sTab, TQ_SLOT(slotNodeTreeChanged())); + + connect(m_quanta->dTab, TQ_SIGNAL(openURL(const TQString&)), m_quanta, TQ_SLOT(openDoc(const TQString&))); + + connect(m_viewManager, TQ_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQ_SLOT(slotDragInsert(TQDropEvent *))); qConfig.windowLayout = "Default"; } @@ -706,75 +710,75 @@ void QuantaInit::loadInitialProject(const TQString& url) void QuantaInit::initActions() { TDEActionCollection *ac = m_quanta->actionCollection(); - new TDEAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate"); + new TDEAction(i18n("Annotate..."), 0, m_quanta, TQ_SLOT(slotAnnotate()),ac, "annotate"); m_quanta->editTagAction = new TDEAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditCurrentTag() ), - TQT_TQOBJECT(ac), "edit_current_tag" ); + m_quanta, TQ_SLOT( slotEditCurrentTag() ), + ac, "edit_current_tag" ); m_quanta->selectTagAreaAction = new TDEAction( i18n( "&Select Current Tag Area" ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotSelectTagArea() ), - TQT_TQOBJECT(ac), "select_tag_area" ); + m_quanta, TQ_SLOT( slotSelectTagArea() ), + ac, "select_tag_area" ); new TDEAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotExpandAbbreviation() ), - TQT_TQOBJECT(ac), "expand_abbreviation" ); + m_quanta, TQ_SLOT( slotExpandAbbreviation() ), + ac, "expand_abbreviation" ); - new TDEAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta + new TDEAction(i18n("&Report Bug..."), 0, m_quanta, TQ_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta //Kate actions //Edit menu - KStdAction::undo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUndo()), ac); - KStdAction::redo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRedo()), ac); - KStdAction::cut(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCut()), ac); - KStdAction::copy(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCopy()), ac) ; - KStdAction::pasteText(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPaste()), ac); + KStdAction::undo(m_quanta, TQ_SLOT(slotUndo()), ac); + KStdAction::redo(m_quanta, TQ_SLOT(slotRedo()), ac); + KStdAction::cut(m_quanta, TQ_SLOT(slotCut()), ac); + KStdAction::copy(m_quanta, TQ_SLOT(slotCopy()), ac) ; + KStdAction::pasteText(m_quanta, TQ_SLOT(slotPaste()), ac); //help - (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta), - TQT_SLOT(slotHelpTip()), TQT_TQOBJECT(ac), "help_tip"); + (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", m_quanta, + TQ_SLOT(slotHelpTip()), ac, "help_tip"); // File actions // - KStdAction::openNew( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileNew() ), ac); - KStdAction::open ( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileOpen() ), ac, "file_open"); - (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs"); + KStdAction::openNew( m_quanta, TQ_SLOT( slotFileNew() ), ac); + KStdAction::open ( m_quanta, TQ_SLOT( slotFileOpen() ), ac, "file_open"); + (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQ_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs"); - m_quanta->fileRecent = KStdAction::openRecent(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpenRecent(const KURL&)), + m_quanta->fileRecent = KStdAction::openRecent(m_quanta, TQ_SLOT(slotFileOpenRecent(const KURL&)), ac, "file_open_recent"); m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent")); - connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen())); + connect(m_quanta->fileRecent, TQ_SIGNAL(activated()), m_quanta, TQ_SLOT(slotFileOpen())); - (void) new TDEAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta), - TQT_SLOT( slotFileCloseAll() ), - TQT_TQOBJECT(ac), "file_close_all" ); + (void) new TDEAction( i18n( "Close All" ), 0, m_quanta, + TQ_SLOT( slotFileCloseAll() ), + ac, "file_close_all" ); - m_quanta->saveAction = KStdAction::save(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSave() ), ac); + m_quanta->saveAction = KStdAction::save(m_quanta, TQ_SLOT( slotFileSave() ), ac); - KStdAction::saveAs( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAs() ), ac ); + KStdAction::saveAs( m_quanta, TQ_SLOT( slotFileSaveAs() ), ac ); m_quanta->saveAllAction = new TDEAction( i18n( "Save All..." ), "save_all", SHIFT+TDEStdAccel::shortcut(TDEStdAccel::Save).keyCodeQt(), - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAll() ), - TQT_TQOBJECT(ac), "file_save_all" ); - (void) new TDEAction(i18n("Reloa&d"), "document-revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta), - TQT_SLOT(slotFileReload()), TQT_TQOBJECT(ac), "file_reload"); + m_quanta, TQ_SLOT( slotFileSaveAll() ), + ac, "file_save_all" ); + (void) new TDEAction(i18n("Reloa&d"), "document-revert", SHIFT+Key_F5, m_quanta, + TQ_SLOT(slotFileReload()), ac, "file_reload"); // (void) new TDEAction(i18n("Reload All "), 0, 0, m_quanta, -// TQT_SLOT(slotFileReloadAll()), TQT_TQOBJECT(ac), "file_reload_all"); +// TQ_SLOT(slotFileReloadAll()), ac, "file_reload_all"); (void) new TDEAction( i18n( "Save as Local Template..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAsLocalTemplate() ), - TQT_TQOBJECT(ac), "save_local_template" ); + m_quanta, TQ_SLOT( slotFileSaveAsLocalTemplate() ), + ac, "save_local_template" ); (void) new TDEAction( i18n( "Save Selection to Local Template File..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ), - TQT_TQOBJECT(ac), "save_selection_local_template" ); + m_quanta, TQ_SLOT( slotFileSaveSelectionAsLocalTemplate() ), + ac, "save_selection_local_template" ); - KStdAction::quit( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileQuit() ), ac ); + KStdAction::quit( m_quanta, TQ_SLOT( slotFileQuit() ), ac ); // Edit actions (void) new TDEAction( i18n( "Find in Files..." ), SmallIcon("filefind"), CTRL+ALT+Key_F, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditFindInFiles() ), - TQT_TQOBJECT(ac), "find_in_files" ); + m_quanta, TQ_SLOT( slotEditFindInFiles() ), + ac, "find_in_files" ); TDEAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation"); aux->setEnabled(false); @@ -783,78 +787,78 @@ void QuantaInit::initActions() // Tool actions (void) new TDEAction( i18n( "&Context Help..." ), CTRL+Key_H, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotContextHelp() ), - TQT_TQOBJECT(ac), "context_help" ); + m_quanta, TQ_SLOT( slotContextHelp() ), + ac, "context_help" ); (void) new TDEAction( i18n( "Tag &Attributes..." ), ALT+Key_Down, - m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ), - TQT_TQOBJECT(ac), "tag_attributes" ); + m_quanta->m_doc, TQ_SLOT( slotAttribPopup() ), + ac, "tag_attributes" ); (void) new TDEAction( i18n( "&Change the DTD..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotChangeDTD() ), - TQT_TQOBJECT(ac), "change_dtd" ); + m_quanta, TQ_SLOT( slotChangeDTD() ), + ac, "change_dtd" ); (void) new TDEAction( i18n( "&Edit DTD Settings..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditDTD() ), - TQT_TQOBJECT(ac), "edit_dtd" ); + m_quanta, TQ_SLOT( slotEditDTD() ), + ac, "edit_dtd" ); (void) new TDEAction( i18n( "&Load && Convert DTD..." ), 0, - DTDs::ref(), TQT_SLOT( slotLoadDTD() ), - TQT_TQOBJECT(ac), "load_dtd" ); + DTDs::ref(), TQ_SLOT( slotLoadDTD() ), + ac, "load_dtd" ); (void) new TDEAction( i18n( "Load DTD E&ntities..." ), 0, - DTDs::ref(), TQT_SLOT( slotLoadEntities() ), - TQT_TQOBJECT(ac), "load_entities" ); + DTDs::ref(), TQ_SLOT( slotLoadEntities() ), + ac, "load_entities" ); (void) new TDEAction( i18n( "Load DTD &Package (DTEP)..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotLoadDTEP() ), - TQT_TQOBJECT(ac), "load_dtep" ); + m_quanta, TQ_SLOT( slotLoadDTEP() ), + ac, "load_dtep" ); (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail-send", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEmailDTEP() ), - TQT_TQOBJECT(ac), "send_dtep" ); + m_quanta, TQ_SLOT( slotEmailDTEP() ), + ac, "send_dtep" ); (void) new TDEAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDownloadDTEP() ), - TQT_TQOBJECT(ac), "download_dtep" ); + m_quanta, TQ_SLOT( slotDownloadDTEP() ), + ac, "download_dtep" ); (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ), - TQT_TQOBJECT(ac), "upload_dtep" ); + m_quanta, TQ_SLOT( slotUploadDTEP() ), + ac, "upload_dtep" ); /* (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ), - TQT_TQOBJECT(ac), "send_dtep" ); + m_quanta, TQ_SLOT( slotUploadDTEP() ), + ac, "send_dtep" ); */ (void) new TDEAction( i18n( "&Document Properties" ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDocumentProperties() ), - TQT_TQOBJECT(ac), "tools_document_properties" ); + m_quanta, TQ_SLOT( slotDocumentProperties() ), + ac, "tools_document_properties" ); (void) new TDEAction ( i18n ("F&ormat XML Code"), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotCodeFormatting() ), - TQT_TQOBJECT(ac), "tools_code_formatting"); + m_quanta, TQ_SLOT( slotCodeFormatting() ), + ac, "tools_code_formatting"); (void) new TDEAction( i18n( "&Convert Tag && Attribute Case..."), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotConvertCase()), - TQT_TQOBJECT(ac), "tools_change_case"); + m_quanta, TQ_SLOT(slotConvertCase()), + ac, "tools_change_case"); // View actions m_quanta->showSourceAction = new TDEToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowSourceEditor()), - TQT_TQOBJECT(ac), "show_quanta_editor"); + m_quanta, TQ_SLOT( slotShowSourceEditor()), + ac, "show_quanta_editor"); m_quanta->showSourceAction->setExclusiveGroup("view"); m_quanta->showVPLAction = new TDEToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLOnly() ), - TQT_TQOBJECT(ac), "show_kafka_view"); + m_quanta, TQ_SLOT( slotShowVPLOnly() ), + ac, "show_kafka_view"); m_quanta->showVPLAction->setExclusiveGroup("view"); m_quanta->showVPLSourceAction = new TDEToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLAndSourceEditor() ), - TQT_TQOBJECT(ac), "show_kafka_and_quanta"); + m_quanta, TQ_SLOT( slotShowVPLAndSourceEditor() ), + ac, "show_kafka_and_quanta"); m_quanta->showVPLSourceAction->setExclusiveGroup("view"); /**kafkaSelectAction = new TDESelectAction(i18n("Main &View"), 0, ac,"show_kafka"); TQStringList list2; @@ -862,73 +866,73 @@ void QuantaInit::initActions() list2.append(i18n("&VPL Editor (experimental)")); list2.append(i18n("&Both Editors")); kafkaSelectAction->setItems(list2); - connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowKafkaPartl(int)));*/ + connect(kafkaSelectAction, TQ_SIGNAL(activated(int)), m_quanta, TQ_SLOT(slotShowKafkaPartl(int)));*/ (void) new TDEAction( i18n( "&Reload Preview" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload).keyCodeQt(), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRepaintPreview()), - TQT_TQOBJECT(ac), "reload" ); + m_quanta, TQ_SLOT(slotRepaintPreview()), + ac, "reload" ); (void) new TDEAction( i18n( "&Previous File" ), "1leftarrow", TDEStdAccel::back(), - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), - TQT_TQOBJECT(ac), "previous_file" ); + m_quanta, TQ_SLOT( slotBack() ), + ac, "previous_file" ); (void) new TDEAction( i18n( "&Next File" ), "1rightarrow", TDEStdAccel::forward(), - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), - TQT_TQOBJECT(ac), "next_file" ); + m_quanta, TQ_SLOT( slotForward() ), + ac, "next_file" ); // Options actions // (void) new TDEAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureActions() ), - TQT_TQOBJECT(ac), "configure_actions" ); + m_quanta, TQ_SLOT( slotOptionsConfigureActions() ), + ac, "configure_actions" ); - KStdAction::showMenubar(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); - KStdAction::keyBindings(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); - KStdAction::configureToolbars(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); - KStdAction::preferences(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptions() ), ac, "general_options"); - new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options"); + KStdAction::showMenubar(m_quanta, TQ_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); + KStdAction::keyBindings(m_quanta, TQ_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); + KStdAction::configureToolbars(m_quanta, TQ_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); + KStdAction::preferences(m_quanta, TQ_SLOT( slotOptions() ), ac, "general_options"); + new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQ_SLOT(slotPreviewOptions()), ac, "preview_options"); // Toolbars actions m_quanta->projectToolbarFiles = new TDERecentFilesAction(i18n("Load &Project Toolbar"),0, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)), - TQT_TQOBJECT(ac), "toolbars_load_project"); - - new TDEAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global"); - new TDEAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user"); - new TDEAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local"); - new TDEAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project"); - new TDEAction(i18n("&New User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add"); - new TDEAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove"); - new TDEAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename"); - new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send"); - new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" ); - new TDEAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" ); - - TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion"); - connect(toggle, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSmartTagInsertion())); - - m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar"); - - connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotToggleDTDToolbar(bool))); + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL&)), + ac, "toolbars_load_project"); + + new TDEAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQ_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global"); + new TDEAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQ_SLOT(slotLoadToolbar()), ac, "toolbars_load_user"); + new TDEAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQ_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local"); + new TDEAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQ_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project"); + new TDEAction(i18n("&New User Toolbar..."), 0, m_quanta, TQ_SLOT(slotAddToolbar()), ac, "toolbars_add"); + new TDEAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQ_SLOT(slotRemoveToolbar()), ac, "toolbars_remove"); + new TDEAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQ_SLOT(slotRenameToolbar()), ac, "toolbars_rename"); + new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, m_quanta, TQ_SLOT(slotSendToolbar()), ac, "toolbars_send"); + new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQ_SLOT(slotUploadToolbar()), ac, "toolbars_upload" ); + new TDEAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQ_SLOT(slotDownloadToolbar()), ac, "toolbars_download" ); + + TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, ac, "smart_tag_insertion"); + connect(toggle, TQ_SIGNAL(toggled(bool)), m_quanta, TQ_SLOT(slotSmartTagInsertion())); + + m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, ac, "view_dtd_toolbar"); + + connect(m_quanta->showDTDToolbar, TQ_SIGNAL(toggled(bool)), m_quanta, TQ_SLOT(slotToggleDTDToolbar(bool))); m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar")); new TDEAction(i18n("Complete Text"), CTRL+Key_Space, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletion()), ac,"show_completion"); + m_quanta, TQ_SLOT(slotShowCompletion()), ac,"show_completion"); new TDEAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); + m_quanta, TQ_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); - KStdAction::back(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), ac, "w_back"); - KStdAction::forward(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), ac, "w_forward"); + KStdAction::back(m_quanta, TQ_SLOT( slotBack() ), ac, "w_back"); + KStdAction::forward(m_quanta, TQ_SLOT( slotForward() ), ac, "w_forward"); - new TDEAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor"); - new TDEAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file"); - new TDEAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file"); + new TDEAction(i18n("Open File: none"), 0, m_quanta, TQ_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor"); + new TDEAction(i18n("Upload..."), 0, m_quanta, TQ_SLOT(slotUploadFile()), ac, "upload_file"); + new TDEAction(i18n("Delete File"), 0, m_quanta, TQ_SLOT(slotDeleteFile()), ac, "delete_file"); TQString ss = i18n("Upload Opened Project Files..."); -/* new TDEAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */ +/* new TDEAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQ_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */ TQString error; int el, ec; @@ -989,17 +993,17 @@ void QuantaInit::initActions() // create the preview action m_quanta->showPreviewAction = new TDEToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotToggleShowPreview() ), - TQT_TQOBJECT(ac), "show_preview" ); + m_quanta, TQ_SLOT( slotToggleShowPreview() ), + ac, "show_preview" ); TDEAction *act = new TDEAction( i18n( "Preview Without Frames" ), "", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowNoFramesPreview()), - TQT_TQOBJECT(ac), "show_preview_no_frames" ); + m_quanta, TQ_SLOT(slotShowNoFramesPreview()), + ac, "show_preview_no_frames" ); act->plug(m_quanta->showPreviewAction->popupMenu()); act = new TDEAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInKFM() ), - TQT_TQOBJECT(ac), "view_with_konqueror" ); + m_quanta, TQ_SLOT( slotViewInKFM() ), + ac, "view_with_konqueror" ); act->plug(m_quanta->showPreviewAction->popupMenu()); @@ -1020,62 +1024,62 @@ void QuantaInit::initActions() act->plug(m_quanta->showPreviewAction->popupMenu()); act = new TDEAction( i18n( "View with L&ynx" ), "terminal", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInLynx() ), - TQT_TQOBJECT(ac), "view_with_lynx" ); + m_quanta, TQ_SLOT( slotViewInLynx() ), + ac, "view_with_lynx" ); act->plug(m_quanta->showPreviewAction->popupMenu()); (void) new TDEAction( i18n( "Table Editor..." ), "quick_table", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagEditTable() ), - TQT_TQOBJECT(ac), "tag_edit_table" ); + m_quanta, TQ_SLOT( slotTagEditTable() ), + ac, "tag_edit_table" ); (void) new TDEAction( i18n( "Quick List..." ), "quick_list", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagQuickList() ), - TQT_TQOBJECT(ac), "tag_quick_list" ); + m_quanta, TQ_SLOT( slotTagQuickList() ), + ac, "tag_quick_list" ); (void) new TDEAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagColor() ), - TQT_TQOBJECT(ac), "tag_color" ); + m_quanta, TQ_SLOT( slotTagColor() ), + ac, "tag_color" ); (void) new TDEAction( i18n( "Email..." ), "tag_mail", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMail() ), - TQT_TQOBJECT(ac), "tag_mail" ); + m_quanta, TQ_SLOT( slotTagMail() ), + ac, "tag_mail" ); (void) new TDEAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMisc() ), - TQT_TQOBJECT(ac), "tag_misc" ); + m_quanta, TQ_SLOT( slotTagMisc() ), + ac, "tag_misc" ); (void) new TDEAction( i18n( "Frame Wizard..." ), "frame", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ), - TQT_TQOBJECT(ac), "tag_frame_wizard" ); + m_quanta, TQ_SLOT( slotFrameWizard() ), + ac, "tag_frame_wizard" ); (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "edit-paste", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ), - TQT_TQOBJECT(ac), "edit_paste_html_quoted" ); + m_quanta, TQ_SLOT( slotPasteHTMLQuoted() ), + ac, "edit_paste_html_quoted" ); (void) new TDEAction( i18n( "Paste &URL Encoded" ), "edit-paste", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ), - TQT_TQOBJECT(ac), "edit_paste_url_encoded" ); + m_quanta, TQ_SLOT( slotPasteURLEncoded() ), + ac, "edit_paste_url_encoded" ); (void) new TDEAction( i18n( "Insert CSS..." ),"css", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotInsertCSS() ), - TQT_TQOBJECT(ac), "insert_css" ); + m_quanta, TQ_SLOT( slotInsertCSS() ), + ac, "insert_css" ); // special-character combo TDEAction* char_action = new TDEAction( i18n( "Insert Special Character" ), "charset", 0, - TQT_TQOBJECT(ac), "insert_char" ); - connect( char_action, TQT_SIGNAL(activated()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertChar()) ); + ac, "insert_char" ); + connect( char_action, TQ_SIGNAL(activated()), + m_quanta, TQ_SLOT(slotInsertChar()) ); - connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta->doc(), TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(ViewManager::ref(), TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(TQT_TQOBJECT(m_quanta))); + QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(m_quanta)); m_bookmarks->createActions(ac); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQ_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); } /** Initialize the plugin architecture. */ @@ -1085,10 +1089,10 @@ void QuantaInit::initPlugins() m_quanta->m_pluginInterface = QuantaPluginInterface::ref(m_quanta); - connect(m_quanta->m_pluginInterface, TQT_SIGNAL(hideSplash()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); - connect(m_quanta->m_pluginInterface, TQT_SIGNAL(statusMsg(const TQString &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(m_quanta->m_pluginInterface, TQ_SIGNAL(hideSplash()), + m_quanta, TQ_SLOT(slotHideSplash())); + connect(m_quanta->m_pluginInterface, TQ_SIGNAL(statusMsg(const TQString &)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); m_quanta->m_pluginInterface->readConfig(); if (!m_quanta->m_pluginInterface->pluginAvailable("TDEFileReplace")) @@ -1272,12 +1276,12 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) TDEProcess *execCommand = new TDEProcess(); *(execCommand) << TQStringList::split(" ",cmd); - connect(execCommand, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(execCommand, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + m_quanta, TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(execCommand, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + m_quanta, TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(execCommand, TQ_SIGNAL(processExited(TDEProcess*)), + m_quanta, TQ_SLOT(slotProcessExited(TDEProcess*))); if (!execCommand->start(TDEProcess::NotifyOnExit,TDEProcess::All)) { @@ -1287,8 +1291,8 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) { //To avoid lock-ups, start a timer. TQTimer *timer = new TQTimer(m_quanta); - connect(timer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessTimeout())); + connect(timer, TQ_SIGNAL(timeout()), + m_quanta, TQ_SLOT(slotProcessTimeout())); timer->start(180*1000, true); QExtFileInfo internalFileInfo; m_quanta->m_loopStarted = true; @@ -1348,6 +1352,7 @@ TQString QuantaInit::retrievePID(const TQString& filename) TQString strPID = TQString(); strPID = filename.mid(filename.findRev("P") + 1); + if (strPID.isEmpty()) strPID = filename.mid(filename.findRev("N") + 1); @@ -1482,10 +1487,10 @@ void QuantaInit::checkRuntimeDependencies() } else { CVSService::ref(m_quanta->actionCollection())->setAppId(appId); - connect(CVSService::ref(), TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); - connect(CVSService::ref(), TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); - //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(CVSService::ref(), TQ_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQ_SLOT(clear())); + connect(CVSService::ref(), TQ_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&, bool))); + connect(CVSService::ref(), TQ_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQ_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); + //connect(CVSService::ref(), TQ_SIGNAL(statusMsg(const TQString &)), m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); m_quanta->fTab->plugCVSMenu(); pTab->plugCVSMenu(); } diff --git a/quanta/src/quanta_init.h b/quanta/src/quanta_init.h index 06e4cf07..5fec827e 100644 --- a/quanta/src/quanta_init.h +++ b/quanta/src/quanta_init.h @@ -41,7 +41,7 @@ class TDEConfig; */ class QuantaInit : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 354cb464..b77e2341 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -82,7 +82,7 @@ QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); - connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( attribMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); } QuantaDoc::~QuantaDoc() @@ -175,10 +175,10 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, { if (encoding.isEmpty()) encoding = quantaApp->defaultEncoding(); - w->disconnect(TQT_SIGNAL(openingFailed(const KURL&))); - connect(w, TQT_SIGNAL(openingFailed(const KURL&)), this, TQT_SLOT(slotOpeningFailed(const KURL&))); - w->disconnect(TQT_SIGNAL(openingCompleted(const KURL&))); - connect(w, TQT_SIGNAL(openingCompleted(const KURL&)), this, TQT_SLOT(slotOpeningCompleted(const KURL&))); + w->disconnect(TQ_SIGNAL(openingFailed(const KURL&))); + connect(w, TQ_SIGNAL(openingFailed(const KURL&)), this, TQ_SLOT(slotOpeningFailed(const KURL&))); + w->disconnect(TQ_SIGNAL(openingCompleted(const KURL&))); + connect(w, TQ_SIGNAL(openingCompleted(const KURL&)), this, TQ_SLOT(slotOpeningCompleted(const KURL&))); w->open(url, encoding); quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol)); } @@ -302,7 +302,7 @@ void QuantaDoc::slotAttribPopup() popUpMenu->setItemEnabled( menuId , false ); } } - connect( popUpMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( popUpMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); attribMenu->insertItem(*it, popUpMenu); } @@ -367,7 +367,7 @@ void QuantaDoc::slotInsertAttrib( int id ) delete attribMenu; attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); - connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( attribMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); } } diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h index f2bb84d8..3f9d0b95 100644 --- a/quanta/src/quantadoc.h +++ b/quanta/src/quantadoc.h @@ -27,7 +27,7 @@ class KURL; class QuantaDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 6d3ef86f..8e867d9a 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -86,8 +86,8 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti { setMDICaption(caption); //Connect the VPL update timers - connect(&m_sourceUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(sourceUpdateTimerTimeout())); - connect(&m_VPLUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(VPLUpdateTimerTimeout())); + connect(&m_sourceUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(sourceUpdateTimerTimeout())); + connect(&m_VPLUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(VPLUpdateTimerTimeout())); //create the source and VPL holding widgets m_documentArea = new TQWidget(this); @@ -95,10 +95,10 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti //get the reference to the user toolbar holding widget ToolbarTabWidget *m_toolbarTab = ToolbarTabWidget::ref(); m_toolbarTab->reparent(this, 0, TQPoint(), true); - m_toolbarTab ->setFocusPolicy( TQ_NoFocus ); + m_toolbarTab ->setFocusPolicy( TQWidget::NoFocus ); //create a splitter to separate the VPL and document area - m_splitter = new TQSplitter(Qt::Vertical, this); + m_splitter = new TQSplitter(TQt::Vertical, this); //place the widgets in a grid m_viewLayout = new TQGridLayout(this, 2, 0); m_viewLayout->setRowStretch(0, 0); @@ -186,18 +186,18 @@ void QuantaView::addDocument(Document *document) if (!document) return; m_document = document; - connect(m_document, TQT_SIGNAL(editorGotFocus()), this, TQT_SLOT(slotSourceGetFocus())); - connect(m_document->view(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SIGNAL(cursorPositionChanged())); + connect(m_document, TQ_SIGNAL(editorGotFocus()), this, TQ_SLOT(slotSourceGetFocus())); + connect(m_document->view(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SIGNAL(cursorPositionChanged())); m_kafkaDocument = KafkaDocument::ref(); - connect(m_kafkaDocument->getKafkaWidget(), TQT_SIGNAL(hasFocus(bool)), - this, TQT_SLOT(slotVPLGetFocus(bool))); - connect(m_kafkaDocument, TQT_SIGNAL(newCursorPosition(int,int)), - this, TQT_SLOT(slotSetCursorPositionInSource(int, int))); - connect(m_kafkaDocument, TQT_SIGNAL(loadingError(Node *)), - this, TQT_SLOT(slotVPLLoadingError(Node *))); + connect(m_kafkaDocument->getKafkaWidget(), TQ_SIGNAL(hasFocus(bool)), + this, TQ_SLOT(slotVPLGetFocus(bool))); + connect(m_kafkaDocument, TQ_SIGNAL(newCursorPosition(int,int)), + this, TQ_SLOT(slotSetCursorPositionInSource(int, int))); + connect(m_kafkaDocument, TQ_SIGNAL(loadingError(Node *)), + this, TQ_SLOT(slotVPLLoadingError(Node *))); m_kafkaReloadingEnabled = true; m_quantaReloadingEnabled = true; @@ -1134,8 +1134,8 @@ bool QuantaView::saveDocument(const KURL& url) { KTextEditor::Document *doc = m_document->doc(); m_eventLoopStarted = false; - connect(doc, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotSavingFailed(const TQString &))); - connect(doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSavingCompleted())); + connect(doc, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotSavingFailed(const TQString &))); + connect(doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSavingCompleted())); m_saveResult = m_document->saveAs(url); if (m_saveResult) { @@ -1144,8 +1144,8 @@ bool QuantaView::saveDocument(const KURL& url) m_eventLoopStarted = true; internalFileInfo.enter_loop(); } - disconnect(doc, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotSavingFailed(const TQString &))); - disconnect(doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSavingCompleted())); + disconnect(doc, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotSavingFailed(const TQString &))); + disconnect(doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSavingCompleted())); if (!m_saveResult) //there was an error while saving { if (oldURL.isLocalFile()) diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h index 1f59de19..2b8b30dd 100644 --- a/quanta/src/quantaview.h +++ b/quanta/src/quantaview.h @@ -63,7 +63,7 @@ class Node; * @version KDevelop version 0.4 code generation */ class QuantaView : public KMdiChildView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 831b81f0..2e70966b 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -12,6 +12,10 @@ * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + //qt includes #include <tqdir.h> @@ -67,20 +71,20 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, m_lastActiveEditorView = 0L; m_documentationView = 0L; m_tabPopup = new TDEPopupMenu(quantaApp); - m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(slotCloseView())); - m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs())); - m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll())); - m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReloadFile()), 0, RELOAD_ID); - m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID); - m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID); + m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQ_SLOT(slotCloseView())); + m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQ_SLOT(slotCloseOtherTabs())); + m_tabPopup->insertItem(i18n("Close &All"), this, TQ_SLOT(closeAll())); + m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReloadFile()), 0, RELOAD_ID); + m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQ_SLOT(slotUploadFile()), 0, UPLOAD_ID); + m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQ_SLOT(slotDeleteFile()), 0, DELETE_ID); m_tabPopup->insertSeparator(); m_fileListPopup = new TDEPopupMenu(quantaApp); - connect(m_fileListPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileListPopupAboutToShow())); - connect(m_fileListPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFileListPopupItemActivated(int))); + connect(m_fileListPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotFileListPopupAboutToShow())); + connect(m_fileListPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFileListPopupItemActivated(int))); m_bookmarks = new QuantaBookmarks(this, QuantaBookmarks::Position, true); m_bookmarksMenu = new TDEPopupMenu(quantaApp); m_bookmarks->setBookmarksMenu(m_bookmarksMenu); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQ_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); m_bookmarksMenuId = m_tabPopup->insertItem(SmallIconSet("bookmark"), i18n("&Bookmarks"), m_bookmarksMenu); m_tabPopup->insertItem(i18n("&Switch To"), m_fileListPopup); m_contextView = 0L; @@ -92,14 +96,14 @@ QuantaView* ViewManager::createView(const TQString &caption) { QuantaView *view = new QuantaView(quantaApp, "", caption); quantaApp->addWindow(view); - connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn())); - connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn())); - connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); - connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus())); - disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); - connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*))); - connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(view, TQ_SIGNAL(cursorPositionChanged()), quantaApp, TQ_SLOT(slotNewLineColumn())); + connect(view, TQ_SIGNAL(title(const TQString &)), quantaApp, TQ_SLOT(slotNewLineColumn())); + connect(view, TQ_SIGNAL(dragInsert(TQDropEvent*)), this, TQ_SIGNAL(dragInsert(TQDropEvent *))); + connect(view, TQ_SIGNAL(hidePreview()), quantaApp, TQ_SLOT(slotChangePreviewStatus())); + disconnect(view, TQ_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); + connect(view, TQ_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQ_SLOT(slotCloseRequest(KMdiChildView*))); + connect(view, TQ_SIGNAL(documentClosed(const KURL&)), this, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(view, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); return view; } @@ -118,10 +122,10 @@ void ViewManager::createNewDocument() "KTextEditor::Document" ); #else - KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(view), "KTextEditor::Document"); + KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", view, "KTextEditor::Document"); #endif Document *w = new Document(doc, 0L); - connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); + connect(w, TQ_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQ_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); TQString encoding = quantaApp->defaultEncoding(); KTextEditor::EncodingInterface* encodingIf = dynamic_cast<KTextEditor::EncodingInterface*>(doc); if (encodingIf) @@ -130,7 +134,7 @@ void ViewManager::createNewDocument() KTextEditor::View * v = w->view(); //[MB02] connect all kate views for drag and drop - connect(w->view(), TQT_SIGNAL(dropEventPass(TQDropEvent *)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); + connect(w->view(), TQ_SIGNAL(dropEventPass(TQDropEvent *)), this, TQ_SIGNAL(dragInsert(TQDropEvent *))); w->setUntitledUrl( fname ); KTextEditor::PopupMenuInterface* popupIf = dynamic_cast<KTextEditor::PopupMenuInterface*>(w->view()); @@ -138,8 +142,8 @@ void ViewManager::createNewDocument() popupIf->installPopup((TQPopupMenu *)quantaApp->factory()->container("popup_editor", quantaApp)); quantaApp->setFocusProxy(w->view()); - w->view()->setFocusPolicy(TQ_WheelFocus); - connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus())); + w->view()->setFocusPolicy(TQWidget::WheelFocus); + connect( v, TQ_SIGNAL(newStatus()), quantaApp, TQ_SLOT(slotNewStatus())); quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active view->addDocument(w); @@ -182,7 +186,7 @@ bool ViewManager::removeView(QuantaView *view, bool force, bool createNew) if (view == activeView()) ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); if (!createNew) - disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + disconnect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); quantaApp->closeWindow(view); if (createNew) { @@ -191,7 +195,7 @@ bool ViewManager::removeView(QuantaView *view, bool force, bool createNew) quantaApp->slotFileNew(); } } else - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); return true; } } @@ -480,8 +484,8 @@ bool ViewManager::closeAll(bool createNew) return false; //save aborted } } - disconnect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + disconnect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + disconnect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); for (childIt = children.begin(); childIt != children.end(); ++childIt) @@ -508,8 +512,8 @@ bool ViewManager::closeAll(bool createNew) } else { //actually this code should be never executed - connect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); view->activated(); emit filesClosed(false); return false; @@ -523,8 +527,8 @@ bool ViewManager::closeAll(bool createNew) } } } - connect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); if (createNew) { createNewDocument(); diff --git a/quanta/src/viewmanager.h b/quanta/src/viewmanager.h index 1fc3d642..63fd8527 100644 --- a/quanta/src/viewmanager.h +++ b/quanta/src/viewmanager.h @@ -31,7 +31,7 @@ class KMdiChildView; class ViewManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Returns a reference to the viewmanager object */ diff --git a/quanta/src/x-webprj.desktop b/quanta/src/x-webprj.desktop index b2ccdf0e..92c79dea 100644 --- a/quanta/src/x-webprj.desktop +++ b/quanta/src/x-webprj.desktop @@ -1,48 +1,8 @@ [Desktop Entry] Comment=Quanta Project -Comment[bg]=Проект на Quanta -Comment[br]=Raktres Quanta -Comment[ca]=Projecte Quanta -Comment[cs]=Quanta projekt -Comment[da]=Quanta-projekt -Comment[de]=Quanta Projekt -Comment[el]=Έργο Quanta -Comment[es]=Proyecto Quanta -Comment[et]=Quanta projekt -Comment[eu]=Quanta proiektua -Comment[fa]=پروژۀ Quanta -Comment[fi]=Quanta projekti -Comment[fr]=Projet Quanta -Comment[ga]=Tionscadal Quanta -Comment[hu]=Quanta-projekt -Comment[is]=Quanta verkefnið -Comment[it]=Progetto Quanta -Comment[ja]=Quanta プロジェクト -Comment[ka]=Quanta პროექტი -Comment[lt]=Quanta projektas -Comment[ms]=Projek Quanta -Comment[nds]=Quanta-Projekt -Comment[ne]=क्वान्टा परियोजना -Comment[nl]=Quanta project -Comment[pl]=Projekt Quanta -Comment[pt]=Projecto Quanta -Comment[pt_BR]=Projeto do Quanta -Comment[ro]=Proiect Quanta -Comment[ru]=Проект Quanta -Comment[sk]=Quanta projekt -Comment[sl]=Projekt Quante -Comment[sr]=Quanta пројекат -Comment[sr@Latn]=Quanta projekat -Comment[sv]=Quanta-projekt -Comment[ta]=குவாண்டா திட்டப்பணி -Comment[tg]=Нақшаи Quanta -Comment[tr]=Quanta Projesi -Comment[uk]=Проект Quanta -Comment[zh_CN]=Quanta 工程 -Comment[zh_HK]=Quanta 專案 -Comment[zh_TW]=Quanta 專案 -Icon=quanta + Type=MimeType +Icon=quanta MimeType=application/x-webprj Patterns=*.webprj diff --git a/quanta/treeviews/CMakeLists.txt b/quanta/treeviews/CMakeLists.txt index 094ab227..17754a1f 100644 --- a/quanta/treeviews/CMakeLists.txt +++ b/quanta/treeviews/CMakeLists.txt @@ -9,8 +9,11 @@ # ################################################# +add_compile_options( ${ICU_CXXFLAGS} ) + include_directories( ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/quanta/dialogs/tagdialogs ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/quanta/src @@ -22,9 +25,14 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/messages ${CMAKE_SOURCE_DIR}/quanta/parts/kafka ${CMAKE_SOURCE_DIR}/quanta/components/csseditor + ${CMAKE_SOURCE_DIR}/quanta/components/cvsservice ${CMAKE_SOURCE_DIR}/quanta/plugins +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} ${LIBXML_INCLUDE_DIRS} ) diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 3a3a7029..e8929f84 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -303,32 +303,32 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) setLineWidth(2); setFullWidth(true); setShowSortIndicator(true); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setShowFolderOpenPixmap(false); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotReturnPressed(TQListViewItem *))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotReturnPressed(TQListViewItem *))); - connect(this, TQT_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)), - this, TQT_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&))); + connect(this, TQ_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)), + this, TQ_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&))); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )), - this, TQT_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int ))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )), + this, TQ_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int ))); - connect(this, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(openFile(const KURL &)), - quantaApp, TQT_SLOT(slotFileOpen(const KURL &))); + connect(this, TQ_SIGNAL(openFile(const KURL &)), + quantaApp, TQ_SLOT(slotFileOpen(const KURL &))); - connect(this, TQT_SIGNAL(openImage(const KURL &)), - quantaApp, TQT_SLOT(slotImageOpen(const KURL &))); + connect(this, TQ_SIGNAL(openImage(const KURL &)), + quantaApp, TQ_SLOT(slotImageOpen(const KURL &))); - connect(this, TQT_SIGNAL(closeFile(const KURL &)), - quantaApp, TQT_SLOT(slotFileClose(const KURL &))); + connect(this, TQ_SIGNAL(closeFile(const KURL &)), + quantaApp, TQ_SLOT(slotFileClose(const KURL &))); - connect(this, TQT_SIGNAL(insertTag(const KURL &, DirInfo)), - quantaApp, TQT_SLOT(slotInsertTag(const KURL &, DirInfo))); + connect(this, TQ_SIGNAL(insertTag(const KURL &, DirInfo)), + quantaApp, TQ_SLOT(slotInsertTag(const KURL &, DirInfo))); } @@ -554,7 +554,7 @@ void BaseTreeView::slotOpenWith() void BaseTreeView::slotOpenWithApplication() { - KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name()); if (ptr) { KURL::List list; @@ -606,7 +606,7 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) for (it = offers.begin(); it != offers.end(); ++it) { TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data()); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenWithApplication())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenWithApplication())); action->plug(m_openWithMenu); m_openWithActions.append(action); } @@ -621,13 +621,13 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),TDEIcon::Small), it2.current()->name()); m_pluginIds[id] = it2.current(); } - connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int))); + connect(m_openWithMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenWithActivated(int))); m_openWithMenu->insertSeparator(); } - m_openWithMenu->insertItem(i18n("&Other..."), this, TQT_SLOT(slotOpenWith())); + m_openWithMenu->insertItem(i18n("&Other..."), this, TQ_SLOT(slotOpenWith())); m_openWithMenuId = menu->insertItem(i18n("Open &With"), m_openWithMenu, -1, position); } else - m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith()), 0, -1, position); + m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith()), 0, -1, position); } void BaseTreeView::slotInsertTag() @@ -740,7 +740,7 @@ void BaseTreeView::slotProperties() { fileInfoDlg = addFileInfoPage(propDlg); } - connect(propDlg, TQT_SIGNAL( applied() ), this, TQT_SLOT( slotPropertiesApplied()) ); + connect(propDlg, TQ_SIGNAL( applied() ), this, TQ_SLOT( slotPropertiesApplied()) ); propDlg->exec(); } @@ -915,11 +915,11 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil if (!job) return; - connect(job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotJobFinished(TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotJobFinished(TDEIO::Job *) ) ); progressBar->setTotalSteps(100); - connect(job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long)), - this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long))); + connect(job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long)), + this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long))); } diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index 64401101..690113f2 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -83,7 +83,7 @@ public: * @author Jens Herden <jens@kdewebdev.org> */ class BaseTreeBranch : public KFileTreeBranch { - Q_OBJECT + TQ_OBJECT public: @@ -133,7 +133,7 @@ public: * */ class BaseTreeView : public KFileTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 9b9e7d14..a379b512 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -54,17 +54,17 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name ) projectDocFolder = new TDEListViewItem(this, i18n("Project Documentation")); projectDocFolder->setOpen(true); slotRefreshTree(); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); - connect(this, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)) ); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect(this, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *)) ); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *))); m_contextMenu = new TDEPopupMenu(this); - m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQT_SLOT(slotReloadProjectDocs())); - m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQT_SIGNAL(downloadDoc())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQ_SLOT(slotReloadProjectDocs())); + m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQ_SIGNAL(downloadDoc())); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h index 6e963de2..c9f5d66c 100644 --- a/quanta/treeviews/doctreeview.h +++ b/quanta/treeviews/doctreeview.h @@ -34,7 +34,7 @@ class TDEPopupMenu; */ class DocTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DocTreeView(TQWidget *parent=0, const char *name=0); diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 1de8333b..1884cc1b 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -15,6 +15,9 @@ * * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif // KDE includes #include <kdebug.h> @@ -84,49 +87,49 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); - createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(); - m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder())); - m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop())); - m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder())); + m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQ_SLOT(slotAddToTop())); + m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate())); m_folderMenu->insertItem(SmallIcon("application-x-zerosize"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); - m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQT_SLOT(slotChangeAlias())); - m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQ_SLOT(slotChangeAlias())); + m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_emptyMenu = new TDEPopupMenu(); - m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()), 0, -1 , 0); + m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder()), 0, -1 , 0); addColumn(i18n("Files Tree"), -1); addColumn(""); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); // generate top list of directories for (uint i = 0; i < topURLList.count(); i++) diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h index 1cee782b..d8adabba 100644 --- a/quanta/treeviews/filestreeview.h +++ b/quanta/treeviews/filestreeview.h @@ -32,7 +32,7 @@ class KURL; class FilesTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp index 48fd6b5e..2ccc770c 100644 --- a/quanta/treeviews/newtemplatedirdlg.cpp +++ b/quanta/treeviews/newtemplatedirdlg.cpp @@ -20,8 +20,8 @@ NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name) { setCaption(name); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } NewTemplateDirDlg::~NewTemplateDirDlg() diff --git a/quanta/treeviews/newtemplatedirdlg.h b/quanta/treeviews/newtemplatedirdlg.h index 0f6ae128..81485d7c 100644 --- a/quanta/treeviews/newtemplatedirdlg.h +++ b/quanta/treeviews/newtemplatedirdlg.h @@ -24,7 +24,7 @@ */ class NewTemplateDirDlg : public TemplateDirForm { - Q_OBJECT + TQ_OBJECT public: NewTemplateDirDlg(TQWidget *parent=0, const char *name=0); diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index 1bb822b3..886bd511 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -15,6 +15,10 @@ * * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + // QT includes #include <tqpainter.h> #include <tqlabel.h> @@ -118,62 +122,62 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_projectDir->root()->setEnabled(false); m_uploadStatusMenu = new TDEPopupMenu(this); - m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQT_SLOT(slotAlwaysUpload())); - m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQT_SLOT(slotNeverUpload())); - m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQT_SLOT(slotConfirmUpload())); - connect(m_uploadStatusMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUploadMenuAboutToShow())); + m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQ_SLOT(slotAlwaysUpload())); + m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQ_SLOT(slotNeverUpload())); + m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQ_SLOT(slotConfirmUpload())); + connect(m_uploadStatusMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUploadMenuAboutToShow())); m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQT_SLOT(slotOpen())); - m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar())); - m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQ_SLOT(slotOpen())); + m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQ_SLOT(slotLoadToolbar())); + m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL())); - m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQ_SLOT(slotUploadSingleURL())); + m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQ_SLOT(slotQuickUploadURL())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int))); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); - createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(this); m_folderMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL())); - m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL())); - m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); - m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQ_SLOT(slotUploadSingleURL())); + m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQ_SLOT(slotQuickUploadURL())); + m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate())); + m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int))); + m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus())); + m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQ_SLOT(slotChangeDocumentFolderStatus())); m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_projectMenu = new TDEPopupMenu(this); m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_projectMenu->insertSeparator(); - m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject())); - m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQT_SLOT(slotRescan())); - m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions())); - m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQ_SLOT(slotUploadProject())); + m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQ_SLOT(slotRescan())); + m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQ_SLOT(slotOptions())); + m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_projectMenu->insertSeparator(); m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); restoreLayout(kapp->config(), className()); // the restored size of the first column might be too large for the current content @@ -208,8 +212,8 @@ KFileTreeBranch* ProjectTreeView::newBranch(const KURL& url) setRootIsDecorated(false); } - connect(m_projectDir, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), - this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*))); + connect(m_projectDir, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), + this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*))); addBranch(m_projectDir); m_projectDir->urlList = m_projectFiles; // set list for filter if (!m_projectName.isEmpty()) diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h index d8c65cbd..6d39edae 100644 --- a/quanta/treeviews/projecttreeview.h +++ b/quanta/treeviews/projecttreeview.h @@ -51,7 +51,7 @@ public: class ProjectTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/quantapropertiespage.ui b/quanta/treeviews/quantapropertiespage.ui index d70a6f6e..78a63b0d 100644 --- a/quanta/treeviews/quantapropertiespage.ui +++ b/quanta/treeviews/quantapropertiespage.ui @@ -244,4 +244,7 @@ <tabstop>parentAttr</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 78dbd78e..de2e3430 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -84,23 +84,23 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) m_localDir->excludeFilterRx.setPattern(excludeString); m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQT_SLOT(slotProperties())); - m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQT_SLOT(slotRun())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQ_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQ_SLOT(slotRun())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(i18n("&Edit Script"), this, TQT_SLOT(slotEditScript())); - m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQT_SLOT(slotEditInQuanta())); - m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQT_SLOT(slotEditDescription())); + m_fileMenu->insertItem(i18n("&Edit Script"), this, TQ_SLOT(slotEditScript())); + m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQ_SLOT(slotEditInQuanta())); + m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQ_SLOT(slotEditDescription())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQT_SLOT(slotAssignAction())); - m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail())); - m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQT_SLOT(slotUploadScript())); + m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQ_SLOT(slotAssignAction())); + m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQ_SLOT(slotSendScriptInMail())); + m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQ_SLOT(slotUploadScript())); m_folderMenu = new TDEPopupMenu(this); - m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQT_SIGNAL(downloadScript())); + m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQ_SIGNAL(downloadScript())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); restoreLayout( kapp->config(), className() ); // the restored size of the first column might be too large for the current content diff --git a/quanta/treeviews/scripttreeview.h b/quanta/treeviews/scripttreeview.h index 88f0e4cb..589f165d 100644 --- a/quanta/treeviews/scripttreeview.h +++ b/quanta/treeviews/scripttreeview.h @@ -40,7 +40,7 @@ * @author Andras Mantia <amantia@kde.org> */ class ScriptTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 922ea03a..5f9a9747 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -100,37 +100,37 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & m_fileMenu = new TDEPopupMenu(); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); -// m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); +// m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(); -// m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); - m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); +// m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); + m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); addColumn(i18n("Upload Tree"), -1); addColumn(""); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(Project::ref(), TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), - this, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(Project::ref(), TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), + this, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); restoreLayout(m_config, "UploadTreeView"); // a fixed name only for the tooltip configuration // the restored size of the first column might be too large for the current content diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h index 94ab33fe..2fc9b66f 100644 --- a/quanta/treeviews/servertreeview.h +++ b/quanta/treeviews/servertreeview.h @@ -58,7 +58,7 @@ public: class ServerTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index feb56bc9..a03f13a3 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -83,7 +83,7 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) setLineWidth( 2 ); addColumn( i18n("Name"), -1 ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); dtdMenu = new TDEPopupMenu(this); @@ -95,43 +95,43 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) dtdMenu->insertItem(dtdList[i], i, -1); } - connect(dtdMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDTDChanged(int))); + connect(dtdMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDTDChanged(int))); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); emptyAreaMenu = new TDEPopupMenu(this); emptyAreaMenu->insertItem(i18n("Show Groups For"), dtdMenu); - emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQT_SLOT(slotReparseMenuItem())); + emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQ_SLOT(slotReparseMenuItem())); popupMenu = new TDEPopupMenu(this); popupMenu -> insertItem( i18n("Show Groups For"), dtdMenu); popupMenu -> insertSeparator(); - popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQT_SLOT(slotSelectTag())); - popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQT_SLOT(slotGotoClosingTag())); - openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQT_SLOT(slotOpenFile())); + popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQ_SLOT(slotSelectTag())); + popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQ_SLOT(slotGotoClosingTag())); + openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQ_SLOT(slotOpenFile())); popupMenu -> insertSeparator(); - popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQT_SLOT(slotOpenSubTree())); - popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQT_SLOT(slotCloseSubTree())); + popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQ_SLOT(slotOpenSubTree())); + popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQ_SLOT(slotCloseSubTree())); popupMenu -> insertSeparator(); #if 0 - popupMenu -> insertItem( i18n("Remove"),this ,TQT_SLOT(slotRemoveTags())); + popupMenu -> insertItem( i18n("Remove"),this ,TQ_SLOT(slotRemoveTags())); popupMenu -> insertSeparator(); #endif - popupMenu -> insertItem( SmallIcon("reload"), i18n("&Reparse"), this ,TQT_SLOT(slotReparseMenuItem())); - followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQT_SLOT(changeFollowCursor())); + popupMenu -> insertItem( SmallIcon("reload"), i18n("&Reparse"), this ,TQ_SLOT(slotReparseMenuItem())); + followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQ_SLOT(changeFollowCursor())); popupMenu -> setItemChecked ( followCursorId, followCursor() ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem *)), TQT_SLOT(slotExpanded(TQListViewItem *))); - connect(this, TQT_SIGNAL(collapsed(TQListViewItem *)), TQT_SLOT(slotCollapsed(TQListViewItem *))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem *)), TQ_SLOT(slotExpanded(TQListViewItem *))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem *)), TQ_SLOT(slotCollapsed(TQListViewItem *))); write = 0L; timer = new TQTime(); @@ -489,7 +489,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ setSelected(item, true); - if (button == Qt::RightButton) + if (button == TQt::RightButton) { if (dynamic_cast<StructTreeTag*>(item)) { @@ -499,7 +499,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ return; } - if (button == Qt::LeftButton) + if (button == TQt::LeftButton) { if (handleLBM == i18n("Find Tag && Open Tree")) setOpen(item, !isOpen(item)); @@ -516,7 +516,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ slotGotoTag(item); } - if (button == Qt::MidButton) + if (button == TQt::MidButton) { if (handleMBM == i18n("nothing")) return; @@ -537,7 +537,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ setSelected(item, true); } } else - if (button == Qt::RightButton) + if (button == TQt::RightButton) emptyAreaMenu->popup(point); } @@ -866,7 +866,7 @@ void StructTreeView::startDrag() void StructTreeView::contentsMousePressEvent(TQMouseEvent* e) { - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) { TQPoint p = contentsToViewport(e->pos()); m_draggedItem = itemAt(p); diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index 2a0f8ed4..94d8c12f 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -39,7 +39,7 @@ class Document; struct DTDStruct; class StructTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 556a2823..e42754c9 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -133,12 +133,12 @@ void ParentItem::showList(bool show) if (show) { comboBox->show(); - TQObject::connect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int))); + TQObject::connect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int))); } else { comboBox->hide(); - TQObject::disconnect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int))); + TQObject::disconnect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int))); } } @@ -156,7 +156,7 @@ AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, con m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); lin2 = new TQLineEdit( m_listView->viewport() ); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -169,7 +169,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons lin2 = new TQLineEdit( m_listView->viewport() ); lin2->setText(title); lin->setText(title2); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -183,7 +183,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons lin2 = new TQLineEdit( m_listView->viewport() ); lin2->setText(title); lin->setText(title2); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -292,7 +292,7 @@ AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanTrue); combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanFalse); combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeBoolItem::~AttributeBoolItem() @@ -331,7 +331,7 @@ AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* p urlRequester = new KURLRequester( m_listView->viewport() ); urlRequester->setMode(KFile::File | KFile::ExistingOnly ); urlRequester->hide(); - TQObject::connect( urlRequester, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( urlRequester, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeUrlItem::~AttributeUrlItem() @@ -409,7 +409,7 @@ AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* par combo->setEditable(true); } combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeListItem::~AttributeListItem() @@ -462,7 +462,7 @@ AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* p combo = new KColorCombo( m_listView->viewport() ); combo->setEditable(true); combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeColorItem::~AttributeColorItem() @@ -508,7 +508,7 @@ AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* p //combo->setEditable(true); m_se->hide(); - TQObject::connect( m_se->button(), TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( m_se->button(), TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeStyleItem::~AttributeStyleItem() diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index e8d0bbfc..4d74e548 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -104,10 +104,10 @@ DualEditableTree::DualEditableTree(TQWidget *parent, const char *name) : EditableTree(parent, name) { curCol = 0; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); this->installEventFilter(this); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); } DualEditableTree::~DualEditableTree() @@ -128,7 +128,7 @@ bool DualEditableTree::eventFilter(TQObject *object, TQEvent *event) if(event->type() == TQEvent::KeyPress && m_editable) { - TQKeyEvent *keyevent = TQT_TQKEYEVENT(event); + TQKeyEvent *keyevent = static_cast<TQKeyEvent*>(event); switch(keyevent->key()) { case Key_Left: @@ -223,7 +223,7 @@ TagAttributeTree::TagAttributeTree(TQWidget *parent, const char *name) setSorting(-1); setFrameStyle( Panel | Sunken ); setLineWidth( 2 ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); addColumn(i18n("Attribute Name")); addColumn(i18n("Value")); setResizeMode(TQListView::LastColumn); @@ -367,8 +367,8 @@ void TagAttributeTree::setCurrentNode(Node *node) } } - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(slotCollapsed(TQListViewItem*))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(slotExpanded(TQListViewItem*))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(slotCollapsed(TQListViewItem*))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(slotExpanded(TQListViewItem*))); } void TagAttributeTree::editorContentChanged() @@ -423,7 +423,7 @@ void TagAttributeTree::slotParentSelected(int index) if (m_parentItem) { m_newNode = m_parentItem->node(index); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCurrentNode())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCurrentNode())); } } @@ -481,9 +481,9 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char widgetLayout->addWidget( deleteAll, 0, 3 ); clearWState( WState_Polished ); - connect(attrTree, TQT_SIGNAL(newNodeSelected(Node *)), this, TQT_SLOT(NodeSelected(Node *))); - connect(deleteTag, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteNode())); - connect(deleteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSubTree())); + connect(attrTree, TQ_SIGNAL(newNodeSelected(Node *)), this, TQ_SLOT(NodeSelected(Node *))); + connect(deleteTag, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteNode())); + connect(deleteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSubTree())); } EnhancedTagAttributeTree::~EnhancedTagAttributeTree() diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h index 1ecae329..2cf6001e 100644 --- a/quanta/treeviews/tagattributetree.h +++ b/quanta/treeviews/tagattributetree.h @@ -32,7 +32,7 @@ class KPushButton; class TQGridLayout; class EditableTree : public TDEListView { -Q_OBJECT +TQ_OBJECT public: @@ -55,7 +55,7 @@ protected: class DualEditableTree : public EditableTree { - Q_OBJECT + TQ_OBJECT public: DualEditableTree(TQWidget *parent = 0, const char *name = 0); @@ -82,7 +82,7 @@ private: }; class TagAttributeTree : public EditableTree { - Q_OBJECT + TQ_OBJECT public: @@ -115,7 +115,7 @@ private: //An enhanced TagAttributeTree with the tag name and buttons to delete the tag. class EnhancedTagAttributeTree : public TQWidget { -Q_OBJECT +TQ_OBJECT public: EnhancedTagAttributeTree(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index a8cb7705..d3574847 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -160,11 +160,11 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okBtn_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kcombobox.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">kcombobox.h</include> +</includes> </UI> diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 2fa9b7e1..463a56e4 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -143,35 +143,35 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) m_fileMenu = new TDEPopupMenu(this); - m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert())); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); - m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); - m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQ_SLOT(slotInsert())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail())); + m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate())); + m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(this); - m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir())); - m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); - m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); - m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); - m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQ_SLOT(slotNewDir())); + m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail())); + m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate())); + m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate())); + m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_emptyAreaMenu = new TDEPopupMenu(this); - m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); + m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate())); addColumn(i18n("Templates"), -1); addColumn(i18n("Group"), -1); @@ -182,11 +182,11 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) localURL.setPath(locateLocal("data", resourceDir + "templates/")); newBranch(localURL); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); setAcceptDrops(true); setSelectionMode(TQListView::Single); @@ -629,7 +629,7 @@ void TemplatesTreeView::slotProperties() } topLayout->addWidget( m_quantaProperties ); - connect( propDlg, TQT_SIGNAL( applied() ), this , TQT_SLOT( slotPropertiesApplied()) ); + connect( propDlg, TQ_SIGNAL( applied() ), this , TQ_SLOT( slotPropertiesApplied()) ); TQString name = url.path() + TMPL; TDEConfig config(name); @@ -862,7 +862,7 @@ void TemplatesTreeView::slotPaste() if ( ! currentKFileTreeViewItem()->isDir() ) url.setFileName(""); // don't paste on files but in dirs TDEIO::Job *job = TDEIO::copy( list, url); - connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); } } @@ -880,11 +880,11 @@ void TemplatesTreeView::slotDelete() if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { TDEIO::Job *job = TDEIO::del(url); - connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); url.setFileName(url.fileName()+ TMPL); if ( TQFileInfo(url.path()).exists() ) { TDEIO::Job *job2 = TDEIO::del(url); - connect( job2, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job2, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); }; } } diff --git a/quanta/treeviews/templatestreeview.h b/quanta/treeviews/templatestreeview.h index 22fd3535..697240e9 100644 --- a/quanta/treeviews/templatestreeview.h +++ b/quanta/treeviews/templatestreeview.h @@ -38,7 +38,7 @@ public: class TemplatesTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 7780f8aa..da77840e 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -37,13 +37,13 @@ UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : addColumn( i18n("Size") ); addColumn( i18n("Date") ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectFile())); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectFile())); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQT_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQ_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int ))); } UploadTreeView::~UploadTreeView() diff --git a/quanta/treeviews/uploadtreeview.h b/quanta/treeviews/uploadtreeview.h index f8a58e80..9a21b18a 100644 --- a/quanta/treeviews/uploadtreeview.h +++ b/quanta/treeviews/uploadtreeview.h @@ -30,7 +30,7 @@ class KFileItem; */ class UploadTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: UploadTreeView( TQWidget *parent, const char *name=0L ); diff --git a/quanta/utility/CMakeLists.txt b/quanta/utility/CMakeLists.txt index c65eb97a..5faa5f29 100644 --- a/quanta/utility/CMakeLists.txt +++ b/quanta/utility/CMakeLists.txt @@ -19,11 +19,13 @@ include_directories( ${CMAKE_SOURCE_DIR}/quanta/messages ${CMAKE_SOURCE_DIR}/quanta/parts/kafka ${CMAKE_SOURCE_DIR}/quanta/project +) + +include_directories( SYSTEM ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) - ##### utility (static) ########################## tde_add_library( utility STATIC_PIC AUTOMOC diff --git a/quanta/utility/myprocess.h b/quanta/utility/myprocess.h index a80a199c..bb12d2fe 100644 --- a/quanta/utility/myprocess.h +++ b/quanta/utility/myprocess.h @@ -20,7 +20,7 @@ class MyProcess:public TDEProcess { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp index a00e9c75..56d5027d 100644 --- a/quanta/utility/newstuff.cpp +++ b/quanta/utility/newstuff.cpp @@ -56,7 +56,7 @@ void QNewDTEPStuff::installResource() QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget) :TDENewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); + connect(this, TQ_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQ_SLOT(slotLoadToolbarFile(const KURL&))); } @@ -83,7 +83,7 @@ void QNewToolbarStuff::installResource() QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget) :TDENewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&))); + connect(this, TQ_SIGNAL(openFile(const KURL&)), parentWidget, TQ_SLOT(slotFileOpen(const KURL&))); } diff --git a/quanta/utility/newstuff.h b/quanta/utility/newstuff.h index c35be15b..929734d6 100644 --- a/quanta/utility/newstuff.h +++ b/quanta/utility/newstuff.h @@ -31,7 +31,7 @@ class KURL; class QNewDTEPStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: @@ -50,7 +50,7 @@ Makes possible downloading and installing a Toolbar resource files from a server */ class QNewToolbarStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: @@ -71,7 +71,7 @@ Makes possible downloading and installing a template resource files from a serve */ class QNewTemplateStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: @@ -92,7 +92,7 @@ Makes possible downloading and installing a script resource files from a server. */ class QNewScriptStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: @@ -111,7 +111,7 @@ Makes possible downloading and installing a documentation resource files from a */ class QNewDocStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index 8a8dfa26..87ec17d9 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -294,7 +294,7 @@ bool QPEvents::handleEvent(const EventAction& ev) TQTextStream stream(&file); stream.setEncoding(TQTextStream::UnicodeUTF8); //Note: the log text should not be translated. - TQString s = TQDateTime::currentDateTime().toString(Qt::ISODate) + ": "; + TQString s = TQDateTime::currentDateTime().toString(TQt::ISODate) + ": "; s.append( "Event : " + m_eventName + " : "); s.append( "Action: " + ev.action + " : "); if (ev.arguments[1] == "full") diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h index 6b3638ae..4c65c359 100644 --- a/quanta/utility/qpevents.h +++ b/quanta/utility/qpevents.h @@ -52,7 +52,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class QPEvents : public TQObject { -Q_OBJECT +TQ_OBJECT public: static QPEvents* const ref(TQObject *parent = 0L) diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 8d32e20a..87e953fb 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -86,33 +86,33 @@ void QuantaBookmarks::init(TDEActionCollection* ac) { m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, - this, TQT_SLOT(toggleBookmark()), + this, TQ_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, - this, TQT_SLOT(clearBookmarks()), + this, TQ_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); m_goNext = new TDEAction( i18n("Next Bookmark"), "go-next", ALT + Key_PageDown, - this, TQT_SLOT(goNext()), + this, TQ_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp, - this, TQT_SLOT(goPrevious()), + this, TQ_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow())); - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) ); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow())); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) ); marksChanged (); } @@ -234,7 +234,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse if ( next || prev ) menu.insertSeparator( idx ); } - connect(&menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(gotoLineNumber(int))); + connect(&menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(gotoLineNumber(int))); } return insertedItems; } @@ -361,10 +361,10 @@ void QuantaBookmarks::gotoLineNumber(int line) Document *doc = m_doc; if (!doc) doc = m_viewManager->activeDocument(); - TQObject *s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + TQObject *s = const_cast<TQObject*>(sender()); for (uint i = 0; i < m_othersMenuList.count(); i++) { - if (TQT_BASE_OBJECT(s) == TQT_BASE_OBJECT(m_othersMenuList[i])) + if (s == m_othersMenuList[i]) { doc = m_others[i]; break; @@ -395,5 +395,3 @@ void QuantaBookmarks::marksChanged () } #include "quantabookmarks.moc" - -// kate: space-indent on; indent-width 2; replace-tabs on; diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h index 71353c17..c1e4bb99 100644 --- a/quanta/utility/quantabookmarks.h +++ b/quanta/utility/quantabookmarks.h @@ -42,7 +42,7 @@ class TQMenuData; class QuantaBookmarks : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -95,6 +95,3 @@ class QuantaBookmarks : public TQObject }; #endif - -// kate: space-indent on; indent-width 2; replace-tabs on; -// vim: noet ts=2 diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 1ea54048..71eb0e41 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -93,15 +93,15 @@ TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bo m_file = 0L; loopStarted = false; #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) - connect(this, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), - TQT_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); + connect(this, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + TQ_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); #else - connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated())); + connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActionActivated())); #endif - connect(this, TQT_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQT_SIGNAL(showMessage(const TQString&, bool))); - connect(this, TQT_SIGNAL(clearMessages()), m_parentMainWindow, TQT_SIGNAL(clearMessages())); - connect(this, TQT_SIGNAL(showMessagesView()), m_parentMainWindow, TQT_SLOT(slotShowMessagesView())); - connect(this, TQT_SIGNAL(createNewFile()), m_parentMainWindow, TQT_SLOT(slotFileNew())); + connect(this, TQ_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQ_SIGNAL(showMessage(const TQString&, bool))); + connect(this, TQ_SIGNAL(clearMessages()), m_parentMainWindow, TQ_SIGNAL(clearMessages())); + connect(this, TQ_SIGNAL(showMessagesView()), m_parentMainWindow, TQ_SLOT(slotShowMessagesView())); + connect(this, TQ_SIGNAL(createNewFile()), m_parentMainWindow, TQ_SLOT(slotFileNew())); } TagAction::~TagAction() @@ -434,12 +434,12 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But firstOutput = true; firstError = true; - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this, - TQT_SLOT( slotProcessExited(TDEProcess*))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this, + TQ_SLOT( slotProcessExited(TDEProcess*))); @@ -688,12 +688,12 @@ bool TagAction::slotActionActivated() firstOutput = true; firstError = true; - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this, - TQT_SLOT( slotProcessExited(TDEProcess*))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this, + TQ_SLOT( slotProcessExited(TDEProcess*))); @@ -991,7 +991,7 @@ void TagAction::execute(bool blocking) { //To avoid lock-ups, start a timer. timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); timer->start(180*1000, true); QExtFileInfo internalFileInfo; loopStarted = true; diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h index eeff1560..783665e3 100644 --- a/quanta/utility/tagaction.h +++ b/quanta/utility/tagaction.h @@ -46,7 +46,7 @@ class NodeSelection; class TagAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 116832e9..72c764ea 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -102,17 +102,17 @@ void TagActionSet::initActions(TQWidget* /*parent*/) const char *actionName = "apply_source_indentation"; new TDEAction(i18n("Apply Source Indentation"), 0, this, - TQT_SLOT(slotApplySourceIndentation()), + TQ_SLOT(slotApplySourceIndentation()), ac, actionName); actionName = "copy_div_element"; new TDEAction(i18n("Copy DIV Area"), 0, this, - TQT_SLOT(slotCopyDivElement()), + TQ_SLOT(slotCopyDivElement()), ac, actionName); actionName = "cut_div_element"; new TDEAction(i18n("Cut DIV Area"), 0, this, - TQT_SLOT(slotCutDivElement()), + TQ_SLOT(slotCutDivElement()), ac, actionName); } @@ -281,7 +281,7 @@ void TableTagActionSet::initActionMenus(TQWidget* widget) { Q_ASSERT(!m_tableActionMenu_0); - m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), TQT_TQOBJECT(widget)); + m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), widget); m_insertActionMenu_1 = new TDEActionMenu(i18n("Insert..."), m_tableActionMenu_0); m_removeActionMenu_1 = new TDEActionMenu(i18n("Remove..."), m_tableActionMenu_0); } @@ -299,31 +299,31 @@ void TableTagActionSet::initActions(TQWidget* parent) const char *actionName = "insert_table"; //m_actionNames += actionName; new TDEAction(i18n("Table..."), 0, this, - TQT_SLOT(slotInsertTable()), + TQ_SLOT(slotInsertTable()), ac, actionName); actionName = "insert_row_above"; //m_actionNames += actionName; new TDEAction(i18n("Row Above"), 0, this, - TQT_SLOT(slotInsertRowAbove()), + TQ_SLOT(slotInsertRowAbove()), ac, actionName); actionName = "insert_row_below"; //m_actionNames += actionName; new TDEAction(i18n("Row Below"), 0, this, - TQT_SLOT(slotInsertRowBelow()), + TQ_SLOT(slotInsertRowBelow()), ac, actionName); actionName = "insert_column_left"; //m_actionNames += actionName; new TDEAction(i18n("Column Left"), 0, this, - TQT_SLOT(slotInsertColumnLeft()), + TQ_SLOT(slotInsertColumnLeft()), ac, actionName); actionName = "insert_column_right"; //m_actionNames += actionName; new TDEAction(i18n("Column Right"), 0, this, - TQT_SLOT(slotInsertColumnRight()), + TQ_SLOT(slotInsertColumnRight()), ac, actionName); // Remove___________________________________________________________________________ @@ -331,31 +331,31 @@ void TableTagActionSet::initActions(TQWidget* parent) actionName = "remove_table"; //m_actionNames += actionName; new TDEAction(i18n("Table"), 0, this, - TQT_SLOT(slotRemoveTable()), + TQ_SLOT(slotRemoveTable()), ac, actionName); actionName = "remove_rows"; //m_actionNames += actionName; new TDEAction(i18n("Row(s)"), 0, this, - TQT_SLOT(slotRemoveRows()), + TQ_SLOT(slotRemoveRows()), ac, actionName); actionName = "remove_columns"; //m_actionNames += actionName; new TDEAction(i18n("Column(s)"), 0, this, - TQT_SLOT(slotRemoveColumns()), + TQ_SLOT(slotRemoveColumns()), ac, actionName); actionName = "remove_cells"; //m_actionNames += actionName; new TDEAction(i18n("Cell(s)"), 0, this, - TQT_SLOT(slotRemoveCells()), + TQ_SLOT(slotRemoveCells()), ac, actionName); actionName = "remove_cells_content"; //m_actionNames += actionName; new TDEAction(i18n("Cell(s) Content"), 0, this, - TQT_SLOT(slotRemoveCellsContent()), + TQ_SLOT(slotRemoveCellsContent()), ac, actionName); // Merge___________________________________________________________________________ @@ -363,7 +363,7 @@ void TableTagActionSet::initActions(TQWidget* parent) actionName = "merge_selected_cells"; //m_actionNames += actionName; new TDEAction(i18n("Merge Selected Cells"), 0, this, - TQT_SLOT(slotMergeSelectedCells()), + TQ_SLOT(slotMergeSelectedCells()), ac, actionName); } diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h index 9e056543..7ecc6d1a 100644 --- a/quanta/utility/tagactionset.h +++ b/quanta/utility/tagactionset.h @@ -37,7 +37,7 @@ class NodeModifsSet; */ class TagActionSetAbstract : public TQObject { - Q_OBJECT + TQ_OBJECT public: TagActionSetAbstract(TQObject *parent = 0, const char *name = 0); @@ -66,7 +66,7 @@ private: class TagActionSet : public TagActionSetAbstract { - Q_OBJECT + TQ_OBJECT public: TagActionSet(TQObject *parent = 0, const char *name = 0); @@ -95,7 +95,7 @@ private: class TableTagActionSet : public TagActionSetAbstract { - Q_OBJECT + TQ_OBJECT public: TableTagActionSet(TQObject *parent = 0, const char *name = 0); diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 26765eee..e23145e3 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -43,23 +43,23 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags { m_popupMenu = new TDEPopupMenu(this); m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1); - m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction())); + m_popupMenu->insertItem(i18n("New Action..."), parent, TQ_SLOT(slotNewAction())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar())); - m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar())); - m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQ_SLOT(slotAddToolbar())); + m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQ_SLOT(slotRenameToolbar())); + m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQ_SLOT(slotEditToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), - parent, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(renameToolbar(const TQString&)), - parent, TQT_SLOT(slotRenameToolbar(const TQString&))); - connect(this, TQT_SIGNAL(editToolbar(const TQString&)), - parent, TQT_SLOT(slotConfigureToolbars(const TQString&))); - connect(this, TQT_SIGNAL(newAction()), - parent, TQT_SLOT(slotNewAction())); - connect(this, TQT_SIGNAL(addToolbar()), - parent, TQT_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), + parent, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(renameToolbar(const TQString&)), + parent, TQ_SLOT(slotRenameToolbar(const TQString&))); + connect(this, TQ_SIGNAL(editToolbar(const TQString&)), + parent, TQ_SLOT(slotConfigureToolbars(const TQString&))); + connect(this, TQ_SIGNAL(newAction()), + parent, TQ_SLOT(slotNewAction())); + connect(this, TQ_SIGNAL(addToolbar()), + parent, TQ_SLOT(slotAddToolbar())); TDEAcceleratorManager::setNoAccel(this); } @@ -157,7 +157,7 @@ void ToolbarTabWidget::slotEditToolbar() void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e ) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { TQPoint p = e->globalPos(); TQTab *tab = 0L; @@ -235,8 +235,8 @@ QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_styl m_iconTextMenu->insertItem(i18n("Text Only"), 1); m_iconTextMenu->insertItem(i18n("Text Alongside Icons"), 2); m_iconTextMenu->insertItem(i18n("Text Under Icons"), 3); - connect(m_iconTextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIconTextChanged(int))); - connect(m_iconTextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotIconTextMenuAboutToShow())); + connect(m_iconTextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotIconTextChanged(int))); + connect(m_iconTextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotIconTextMenuAboutToShow())); setIconText(ToolbarTabWidget::ref()->iconText(), false); } @@ -296,7 +296,7 @@ void QuantaToolBar::slotIconTextChanged(int id) void QuantaToolBar::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { m_popupMenu->clear(); TQPoint p = e->globalPos(); @@ -306,29 +306,29 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) m_toolbarTab->tabUnderMouseLabel = m_toolbarTab->label(m_toolbarTab->currentPageIndex()); m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - " + i18n(m_toolbarTab->tabUnderMouseLabel.utf8())); - m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction())); + m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQ_SIGNAL(newAction())); TQObjectList* childrenList = queryList("TDEToolBarButton"); for (uint i = 0; i < childrenList->count(); i++) { - TDEToolBarButton *w = static_cast<TDEToolBarButton*>(TQT_TQWIDGET(childrenList->at(i))); + TDEToolBarButton *w = static_cast<TDEToolBarButton*>(childrenList->at(i)); TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos()); TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height()); if (TQRect(p1, p2).contains(p)) { currentActionName = w->textLabel(); TQString actionName = currentActionName; - m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); - m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction())); + m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQ_SLOT(slotRemoveAction())); + m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQ_SLOT(slotEditAction())); break; } } m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQT_SIGNAL(addToolbar())); - m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQT_SLOT(slotRemoveToolbar())); - m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQT_SLOT(slotRenameToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQ_SIGNAL(addToolbar())); + m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQ_SLOT(slotRemoveToolbar())); + m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQ_SLOT(slotRenameToolbar())); m_popupMenu->insertSeparator(); m_popupMenu->insertItem( i18n("Text Position"), m_iconTextMenu); - m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQT_SLOT(slotEditToolbar())); + m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQ_SLOT(slotEditToolbar())); } m_popupMenu->popup(p); } diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h index a8ce9ecc..3536ca83 100644 --- a/quanta/utility/toolbartabwidget.h +++ b/quanta/utility/toolbartabwidget.h @@ -26,7 +26,7 @@ class TDEToolBar; class ToolbarTabWidget: public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: TQWidgetStack *m_widgetStack; @@ -84,7 +84,7 @@ private: class QuantaToolBar: public TDEToolBar { - Q_OBJECT + TQ_OBJECT public: |
