diff options
Diffstat (limited to 'quanta/components')
91 files changed, 412 insertions, 495 deletions
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 1124273e..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){ @@ -209,7 +209,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ TQListView *lv = i->listView(); TQListViewItem *temp; TQString s; - TQObjectList *l = queryList( TQLISTVIEW_OBJECT_NAME_STRING ); + TQObjectList *l = queryList( "TQListView" ); TQObjectListIt it( *l ); // iterate over the listviews TQObject *obj; @@ -291,8 +291,8 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ } void CSSSelector::setCurrentListView(TQWidget* w){ - TQObjectList *l = w->queryList( TQLISTVIEW_OBJECT_NAME_STRING ); - m_currentListView = static_cast<TQListView*>(TQT_TQWIDGET(l->first())); + TQObjectList *l = w->queryList( "TQListView" ); + 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 4b1f62f3..3f74574f 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -231,7 +231,7 @@ void VisualFrameEditor::paintEvent ( TQPaintEvent * ){ delete m_firstInsertedSA; m_firstInsertedSA = 0L; - TQObjectList* splitterList = queryList(TQSPLITTER_OBJECT_NAME_STRING); + TQObjectList* splitterList = queryList("TQSplitter"); for (uint i = 0; i < splitterList->count(); i++) { TQObject* o = splitterList->at(i); removeChild(o); //this will delete all childr of "o" @@ -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(); @@ -301,14 +301,14 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ } else { SelectableArea *sa=new SelectableArea(parent,n->label().ascii()); - if(parent->isA(TQSPLITTER_OBJECT_NAME_STRING)) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); + if(parent->isA("TQSplitter")) dynamic_cast<TQSplitter *>(parent)->setResizeMode(sa->view(),TQSplitter::KeepSize ); else if(!m_firstInsertedSA) m_firstInsertedSA = sa; 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 f236ef76..ba10c9bb 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -48,13 +48,13 @@ 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; } void TableItem::setContentFromEditor(TQWidget *w) { - if (w->inherits( TQTEXTEDIT_OBJECT_NAME_STRING )) + if (w->inherits( "TQTextEdit" )) setText(((TQTextEdit*)w)->text()); else TQTableItem::setContentFromEditor(w); |