diff options
Diffstat (limited to 'quanta')
88 files changed, 1137 insertions, 1137 deletions
diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index c41b8368..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() @@ -68,11 +68,11 @@ void colorRequester::init() setFocusProxy( widget ); d->connectSignals( this ); - connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() )); - connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) )); + 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, this, TQT_SLOT( openColorDialog() )); + accel->insert( TDEStdAccel::Open, this, TQ_SLOT( openColorDialog() )); accel->readSettings(); } diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index 1a639106..8191d8c6 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -47,9 +47,9 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c, 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/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index 34cd9e6f..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(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(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_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/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index c2f1bb75..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){ @@ -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/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/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/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/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/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/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/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/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index e979c417..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() 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/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/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/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/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/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/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/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/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/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/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/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp index 92ecf122..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(){ diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index 7fc11420..3f74574f 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -307,8 +307,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ sa->view()->setGeometry(n->atts()->geometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); - connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); - connect(sa, TQT_SIGNAL(selected(const TQString &)),this, TQT_SIGNAL(areaSelected(const TQString &))); + connect(sa, TQ_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQ_SLOT(setGeometry(TQRect))); + connect(sa, TQ_SIGNAL(selected(const TQString &)),this, TQ_SIGNAL(areaSelected(const TQString &))); } } diff --git a/quanta/components/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/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp index 0b704529..ba10c9bb 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -48,7 +48,7 @@ TQWidget* TableItem::createEditor() const Editor->setVScrollBarMode(TQScrollView::AlwaysOff); Editor->setBold(m_header); Editor->setText(text()); - TQObject::connect(Editor, TQT_SIGNAL(textChanged()), table(), TQT_SLOT(doValueChanged())); + TQObject::connect(Editor, TQ_SIGNAL(textChanged()), table(), TQ_SLOT(doValueChanged())); return Editor; } diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index a1a53eab..b93e9bcd 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -63,18 +63,18 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, currentAction = 0L; m_toolbarItem = 0L; - connect(actionTreeView, TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), - TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); - connect(actionTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut &)), - TQT_SLOT(slotShortcutCaptured(const TDEShortcut &))); - connect(scriptPath, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&))); - connect(this, TQT_SIGNAL(addToolbar()), m_mainWindow, TQT_SLOT(slotAddToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(TDEAction*))); - connect(this, TQT_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQT_SLOT(slotConfigureToolbars(const TQString&))); + connect(actionTreeView, TQ_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), + TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); + connect(actionTreeView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(shortcutKeyButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut &)), + TQ_SLOT(slotShortcutCaptured(const TDEShortcut &))); + connect(scriptPath, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&))); + connect(this, TQ_SIGNAL(addToolbar()), m_mainWindow, TQ_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQ_SLOT(slotDeleteAction(TDEAction*))); + connect(this, TQ_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQ_SLOT(slotConfigureToolbars(const TQString&))); //fill up the tree view with the toolbars and actions actionTreeView->setSorting(-1); allActionsItem = new TDEListViewItem(actionTreeView, i18n("All")); @@ -148,9 +148,9 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, allActionsItem->sortChildItems(0, true); treeMenu = new TDEPopupMenu(actionTreeView); - treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQT_SLOT(slotAddToolbar())); - treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar())); + treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQ_SLOT(slotAddToolbar())); + treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQ_SLOT(slotEditToolbar())); globalShortcuts = TDEGlobal::config()->entryMap( "Global Shortcuts" ); } @@ -193,7 +193,7 @@ void ActionConfigDialog::slotRemoveToolbar() if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; - connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); + connect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), TQ_SLOT(slotToolbarRemoved(const TQString&))); emit removeToolbar(s.lower()); } } @@ -204,7 +204,7 @@ void ActionConfigDialog::slotToolbarRemoved(const TQString &/*name*/) actionTreeView->setCurrentItem(allActionsItem); delete m_toolbarItem; m_toolbarItem = 0L; - disconnect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), this, TQT_SLOT(slotToolbarRemoved(const TQString&))); + disconnect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), this, TQ_SLOT(slotToolbarRemoved(const TQString&))); } void ActionConfigDialog::slotEditToolbar() diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index b5c53356..a7d5a55b 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -63,8 +63,8 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) destURL.adjustPath(1); TDEIO::CopyJob *job = TDEIO::copy(urlToCopy, destURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); TQString path = destURL.path(); if (path != "." && path != "..") @@ -117,8 +117,8 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) } TDEIO::CopyJob *job = TDEIO::copy(sourceList, targetDirURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } return m_destList; diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 720c3d8a..6f8f2b6c 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -56,7 +56,7 @@ void DirtyDlg::slotOk() TDEProcess *proc = new TDEProcess(); *proc << "kompare" << m_src.path() << m_dest.path(); proc->start(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotCompareDone(TDEProcess*))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotCompareDone(TDEProcess*))); enableButton(KDialogBase::Ok, false); enableButton(KDialogBase::Cancel, false); } else @@ -88,8 +88,8 @@ void DirtyDlg::slotCompareDone(TDEProcess* proc) //TODO: Replace with TDEIO::NetAccess::file_move, when KDE 3.1 support //is dropped TDEIO::FileCopyJob *job = TDEIO::file_move(m_dest, m_src, m_permissions, true, false,false ); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 1293d8b4..2f5938f1 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -47,9 +47,9 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } @@ -69,9 +69,9 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 85d3065b..8d3aa45c 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -98,7 +98,7 @@ void AbbreviationDlg::slotNewGroup() if (qConfig.abbreviations.contains(groupName)) { KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists")); - TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); + TQTimer::singleShot(0, this, TQ_SLOT(slotNewGroup())); } else { groupCombo->insertItem(groupName); diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index fee135f8..5688b920 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -26,7 +26,7 @@ FileMasks::FileMasks(TQWidget *parent, const char *name) :FileMasksS(parent,name) { - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(setToDefault())); } FileMasks::~FileMasks(){ diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index b9f90264..378c0c22 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -31,13 +31,13 @@ SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl) :SpecialCharDialogS( parent, name, modal, fl ) { - connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(filterChars(const TQString&)) ); - connect ( CharsListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - TQT_SLOT(insertCode()) ); - connect (buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(insertCode())); - connect (buttonChar, TQT_SIGNAL(clicked()), TQT_SLOT(insertChar())); - connect (buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancel())); + connect ( FilterLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(filterChars(const TQString&)) ); + connect ( CharsListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + TQ_SLOT(insertCode()) ); + connect (buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(insertCode())); + connect (buttonChar, TQ_SIGNAL(clicked()), TQ_SLOT(insertChar())); + connect (buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancel())); filterChars(""); } diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 5b735fcf..c12f2136 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -78,8 +78,8 @@ ColorCombo::ColorCombo( TQWidget *parent, const char *name ) addColors(); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); - connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) ); } ColorCombo::~ColorCombo() diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index eeb6bfc2..413add61 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -42,7 +42,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) adjustSize(); resize(sizeHint()); - connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); + connect(listbox,TQ_SIGNAL(doubleClicked( TQListBoxItem * )), TQ_SLOT(slotOk())); } ListDlg::~ListDlg(){ diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 7db3c307..b788bb3a 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -118,8 +118,8 @@ void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect( this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(slotAccept()) ); - connect( this, TQT_SIGNAL(cancelButtonPressed()), TQT_SLOT(reject()) ); + connect( this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(slotAccept()) ); + connect( this, TQ_SIGNAL(cancelButtonPressed()), TQ_SLOT(reject()) ); if (!a_dtdTag) //the tag is invalid, let's create a default one { diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index a169d745..02e61726 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -45,9 +45,9 @@ TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) initDialog(); - connect( buttonImgSource, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( buttonRecalcImgSize, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecalcImgSize()) ); - connect( lineImgSource, TQT_SIGNAL( returnPressed()), this, TQT_SLOT(slotLineFileSelect()) ); + connect( buttonImgSource, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( buttonRecalcImgSize, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecalcImgSize()) ); + connect( lineImgSource, TQ_SIGNAL( returnPressed()), this, TQ_SLOT(slotLineFileSelect()) ); } TagImgDlg::~TagImgDlg() diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index ff91277d..925d79c0 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -40,9 +40,9 @@ TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) setCaption(name); setModal(true); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); - connect( buttonAddressSelect, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAddress()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); + connect( buttonAddressSelect, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAddress()) ); buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); lineEmail->setFocus(); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index bea9a81f..b95fe0e9 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -23,7 +23,7 @@ TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) { miscWidget = new TagMisc(this); - connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) ); + connect( miscWidget->elementName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotMiscTagChanged(const TQString & ) ) ); setMainWidget(miscWidget); miscWidget->addClosingTag->setChecked(addClosingTag); miscWidget->elementName->setText(element); diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 7a9edbdb..f070eeaf 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -33,8 +33,8 @@ TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) groupBox->insert(radioOrdered); groupBox->insert(radioUnordered); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } TagQuickListDlg::~TagQuickListDlg(){ diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 58b3044e..892f6dc9 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -50,7 +50,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_yourAnnotations->setLineWidth(2); addTab(m_yourAnnotations, i18n("For You")); - connect(m_yourAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); + connect(m_yourAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); m_allAnnotations = new TDEListView(this); m_allAnnotations->addColumn("1", -1); @@ -59,14 +59,14 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_allAnnotations->header()->hide(); m_allAnnotations->setSorting(1); m_allAnnotations->setLineWidth(2); - connect(m_allAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); + connect(m_allAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); addTab(m_allAnnotations, i18n("All Files")); - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(tabChanged(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(tabChanged(TQWidget*))); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateNextFile())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateNextFile())); m_yourAnnotationsNum = 0; } diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 6b396e94..1abab263 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -44,14 +44,14 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) setFocusPolicy( TQWidget::NoFocus ); m_popupMenu = new TDEPopupMenu(this); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); - m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ; - m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ; + connect(this, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQ_SLOT(copyContent()) ) ; + m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveContent()) ) ; m_popupMenu->insertSeparator(); - m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ; + m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clear()) ) ; - connect( this, TQT_SIGNAL(clicked(TQListBoxItem*)), TQT_SLOT(clickItem(TQListBoxItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListBoxItem*)), TQ_SLOT(clickItem(TQListBoxItem*)) ); } MessageOutput::~MessageOutput() diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index cfca7279..f789f911 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -79,10 +79,10 @@ Parser::Parser() m_parsingNeeded = true; m_parseIncludedFiles = true; m_saParser = new SAParser(); - connect(m_saParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(m_saParser, TQT_SIGNAL(cleanGroups()), TQT_SLOT(cleanGroups())); + connect(m_saParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(m_saParser, TQ_SIGNAL(cleanGroups()), TQ_SLOT(cleanGroups())); ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); } Parser::~Parser() @@ -567,7 +567,7 @@ Node *Parser::parse(Document *w, bool force) emit nodeTreeChanged(); if (saParserEnabled) - TQTimer::singleShot(0, this, TQT_SLOT(slotParseInDetail())); + TQTimer::singleShot(0, this, TQ_SLOT(slotParseInDetail())); return m_node; } @@ -1244,7 +1244,7 @@ Node *Parser::rebuild(Document *w) m_saParser->init(m_node, w); if (saParserEnabled) - TQTimer::singleShot(0, this, TQT_SLOT(slotParseInDetail())); + TQTimer::singleShot(0, this, TQ_SLOT(slotParseInDetail())); emit nodeTreeChanged(); m_parsingNeeded = false; return m_node; @@ -1297,7 +1297,7 @@ void Parser::clearGroups() ParserCommon::includedFilesDTD.clear(); delete ParserCommon::includeWatch; ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); m_parseIncludedFiles = true; } @@ -1345,7 +1345,7 @@ void Parser::cleanGroups() { delete ParserCommon::includeWatch; ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); parseIncludedFiles(); } } diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp index 000ba002..1b665ebf 100644 --- a/quanta/parsers/sagroupparser.cpp +++ b/quanta/parsers/sagroupparser.cpp @@ -46,7 +46,7 @@ SAGroupParser::SAGroupParser(SAParser *parent, Document *write, Node *startNode, m_write = write; m_count = 0; m_parseForGroupTimer = new TQTimer(this); - connect(m_parseForGroupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseForScriptGroup())); + connect(m_parseForGroupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseForScriptGroup())); } void SAGroupParser::slotParseForScriptGroup() diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index 691c2d2e..fcf9b17d 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -44,9 +44,9 @@ SAParser::SAParser() m_parsingEnabled = true; m_synchronous = true; m_parseOneLineTimer = new TQTimer(this); - connect(m_parseOneLineTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseOneLine())); + connect(m_parseOneLineTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseOneLine())); m_parseInDetailTimer = new TQTimer(this); - connect(m_parseInDetailTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseNodeInDetail())); + connect(m_parseInDetailTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseNodeInDetail())); } SAParser::~SAParser() @@ -396,9 +396,9 @@ bool SAParser::slotParseOneLine() } } SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, g_endNode, m_synchronous, parsingLastNode, true); - connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups())); - connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*))); + connect(groupParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(groupParser, TQ_SIGNAL(cleanGroups()), TQ_SIGNAL(cleanGroups())); + connect(groupParser, TQ_SIGNAL(parsingDone(SAGroupParser*)), TQ_SLOT(slotGroupParsingDone(SAGroupParser*))); groupParser->slotParseForScriptGroup(); m_groupParsers.append(groupParser); } @@ -818,9 +818,9 @@ Node *SAParser::parsingDone() if (!m_synchronous) { SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, 0L, m_synchronous, true /*last node*/, true); - connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups())); - connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*))); + connect(groupParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(groupParser, TQ_SIGNAL(cleanGroups()), TQ_SIGNAL(cleanGroups())); + connect(groupParser, TQ_SIGNAL(parsingDone(SAGroupParser*)), TQ_SLOT(slotGroupParsingDone(SAGroupParser*))); groupParser->slotParseForScriptGroup(); m_groupParsers.append(groupParser); } diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index 1c5c572d..6c74b132 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -38,8 +38,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char addColumn(""); setSorting(-1); part = currentpart; - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *))); m_nodedict.setAutoDelete(true); title = ""; titleItem = new TQListViewItem(static_cast<TQListView *>(this), title, ""); diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index 18cf44da..ce078a8c 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -230,20 +230,20 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cancel->setIconSet(SmallIconSet("button_cancel")); //connect buttons - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - connect(cssRulesAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newCSSRule())); - connect(cssRulesEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editCSSRule())); - connect (cssRulesDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentCSSRule())); - connect(metaItemsAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newMetaItem())); - connect(metaItemsDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentMetaItem())); - connect(title, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(titleChanged(const TQString &))); - connect(metaItems, TQT_SIGNAL(itemModified( TQListViewItem * )), - this, TQT_SLOT(metaChanged(TQListViewItem * ))); - connect(cssRules, TQT_SIGNAL(itemModified( TQListViewItem * )), - this, TQT_SLOT(CSSChanged(TQListViewItem * ))); - connect(cssStylesheet, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(linkChanged( const TQString& ))); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); + connect(cssRulesAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newCSSRule())); + connect(cssRulesEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(editCSSRule())); + connect (cssRulesDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentCSSRule())); + connect(metaItemsAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newMetaItem())); + connect(metaItemsDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentMetaItem())); + connect(title, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(titleChanged(const TQString &))); + connect(metaItems, TQ_SIGNAL(itemModified( TQListViewItem * )), + this, TQ_SLOT(metaChanged(TQListViewItem * ))); + connect(cssRules, TQ_SIGNAL(itemModified( TQListViewItem * )), + this, TQ_SLOT(CSSChanged(TQListViewItem * ))); + connect(cssStylesheet, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(linkChanged( const TQString& ))); } htmlDocumentProperties::~htmlDocumentProperties() diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index ad300f88..fc0460ad 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -104,12 +104,12 @@ KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument // With the mix of Leo Savernik's caret Mode and the current editing // functions, it will be kind of VERY messy setCaretMode(true); - connect(this, TQT_SIGNAL(caretPositionChanged(const DOM::Node &, long)), - this, TQT_SLOT(slotNewCursorPos(const DOM::Node &, long))); + connect(this, TQ_SIGNAL(caretPositionChanged(const DOM::Node &, long)), + this, TQ_SLOT(slotNewCursorPos(const DOM::Node &, long))); setCaretDisplayPolicyNonFocused(TDEHTMLPart::CaretVisible); - connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), - this, TQT_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&))); + connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), + this, TQ_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&))); view()->setMouseTracking(true); view()->installEventFilter(this); @@ -186,7 +186,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) kdDebug(25001) << "KafkaWidget::insertText() - added text - 1" << endl; #endif - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); return; } } @@ -263,7 +263,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) } //document().updateRendering(); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } void KafkaWidget::slotDelayedSetCaretPosition() @@ -467,7 +467,7 @@ void KafkaWidget::keyReturn(bool specialPressed) kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":" << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":" << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; //emit domNodeNewCursorPos(m_currentNode, d->m_cursorOffset); @@ -478,7 +478,7 @@ void KafkaWidget::keyReturn(bool specialPressed) << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; #endif - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) @@ -1533,7 +1533,7 @@ void KafkaWidget::keyBackspace() emit domNodeModified(temp, m_modifs); if(boolTmp) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } } @@ -1599,7 +1599,7 @@ void KafkaWidget::keyBackspace() { m_currentNode = _nodePrev; d->m_cursorOffset += (static_cast<DOM::CharacterData>(_nodePrev)).length(); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } _nodePrev.setNodeValue(_nodePrev.nodeValue() + _node.nodeValue()); emit domNodeModified(_nodePrev, m_modifs); @@ -1620,7 +1620,7 @@ void KafkaWidget::keyBackspace() m_currentNode = m_currentNode.previousSibling(); d->m_cursorOffset = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } else if(!m_currentNode.nextSibling().isNull()) { @@ -2090,7 +2090,7 @@ void KafkaWidget::setCurrentNode(DOM::Node node, int offset) d->m_cursorOffset = offset; makeCursorVisible(); if(!m_currentNode.isNull() && m_currentNode.nodeName().string() != "#document") - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); //setCaretPosition(m_currentNode, (long)d->m_cursorOffset); } @@ -2141,7 +2141,7 @@ void KafkaWidget::putCursorAtFirstAvailableLocation() } m_currentNode = node; d->m_cursorOffset = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); #ifdef LIGHT_DEBUG @@ -2238,7 +2238,7 @@ void KafkaWidget::removeSelection() setCurrentNode(m_currentNode, domNodeCursorOffset); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); NodeSelection* cursorPos = new NodeSelection(); cursorPos->setCursorNode(cursorNode); diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 8cb3c05c..483454ee 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -116,17 +116,17 @@ TQString ab = i18n("Ident all"); file.close(); } - connect(m_kafkaPart, TQT_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*))); - - connect(m_kafkaPart, TQT_SIGNAL(domNodeNewCursorPos(DOM::Node, int)), - this, TQT_SLOT(slotdomNodeNewCursorPos(DOM::Node, int))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*))); + + connect(m_kafkaPart, TQ_SIGNAL(domNodeNewCursorPos(DOM::Node, int)), + this, TQ_SLOT(slotdomNodeNewCursorPos(DOM::Node, int))); } diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 92f9b761..2de57fbf 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -53,11 +53,11 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable if (m_enableViewSource) { m_contextMenu = new TDEPopupMenu(parentWidget); - m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource())); + m_contextMenu->insertItem(i18n("View &Document Source"), this, TQ_SLOT(slotViewSource())); - connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&))); + connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQ_SLOT(popupMenu(const TQString&, const TQPoint&))); } - connect(browserExtension(), TQT_SIGNAL(openURLRequest (const KURL &, const KParts::URLArgs &)), this, TQT_SLOT(openURL(const KURL&))); + connect(browserExtension(), TQ_SIGNAL(openURLRequest (const KURL &, const KParts::URLArgs &)), this, TQ_SLOT(openURL(const KURL&))); // setCharset( konqConfig.readEntry("DefaultEncoding") ); // setEncoding( konqConfig.readEntry("DefaultEncoding") ); diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index fcfd9427..71b6fe1d 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -73,7 +73,7 @@ void QuantaPlugin::setPluginName(const TQString &a_name) m_name = a_name; if (!m_action) { - m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQT_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); + m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQ_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); } m_action->setText(a_name); } @@ -184,8 +184,8 @@ bool QuantaPlugin::run() } addWidget(); setRunning(true); - connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - quantaApp, TQT_SLOT(slotStatusMsg( const TQString & ))); + connect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + quantaApp, TQ_SLOT(slotStatusMsg( const TQString & ))); emit pluginStarted(); @@ -287,8 +287,8 @@ bool QuantaPlugin::unload(bool remove) if(!isLoaded()) return false; - disconnect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - quantaApp, TQT_SLOT(slotStatusMsg( const TQString & ))); + disconnect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + quantaApp, TQ_SLOT(slotStatusMsg( const TQString & ))); delete (KParts::ReadOnlyPart*) m_part; m_part = 0; diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp index 57488d2f..f4f509d7 100644 --- a/quanta/plugins/quantapluginconfig.cpp +++ b/quanta/plugins/quantapluginconfig.cpp @@ -47,8 +47,8 @@ QuantaPluginConfig::QuantaPluginConfig(TQWidget *a_parent, const char *a_name) m_pluginConfigWidget->outputWindow->insertStringList(windows); m_pluginConfigWidget->iconButton->setStrictIconSize(false); - connect(m_pluginConfigWidget->pluginName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); - connect(m_pluginConfigWidget->locationButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectLocation())); + connect(m_pluginConfigWidget->pluginName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(nameChanged(const TQString &))); + connect(m_pluginConfigWidget->locationButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectLocation())); setMainWidget(m_pluginConfigWidget); } diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp index ba5294f2..a3ec85bb 100644 --- a/quanta/plugins/quantaplugineditor.cpp +++ b/quanta/plugins/quantaplugineditor.cpp @@ -52,14 +52,14 @@ QuantaPluginEditor::QuantaPluginEditor(TQWidget *a_parent, const char *a_name) m_pluginEditorWidget->pluginList->setAllColumnsShowFocus(true); m_pluginEditorWidget->pluginList->setColumnAlignment(2, TQt::AlignHCenter); - connect(this, TQT_SIGNAL(pluginsChanged()), TQT_SLOT(refreshPlugins())); - connect(m_pluginEditorWidget->refreshButton, TQT_SIGNAL(clicked()), TQT_SLOT(refreshPlugins())); - connect(m_pluginEditorWidget->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addPlugin())); - connect(m_pluginEditorWidget->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removePlugin())); - connect(m_pluginEditorWidget->addSearchPathButton, TQT_SIGNAL(clicked()), TQT_SLOT(addSearchPath())); - connect(m_pluginEditorWidget->configureButton, TQT_SIGNAL(clicked()), TQT_SLOT(configurePlugin())); - connect(m_pluginEditorWidget->pluginList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(configurePlugin(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(pluginsChanged()), TQ_SLOT(refreshPlugins())); + connect(m_pluginEditorWidget->refreshButton, TQ_SIGNAL(clicked()), TQ_SLOT(refreshPlugins())); + connect(m_pluginEditorWidget->addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addPlugin())); + connect(m_pluginEditorWidget->removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removePlugin())); + connect(m_pluginEditorWidget->addSearchPathButton, TQ_SIGNAL(clicked()), TQ_SLOT(addSearchPath())); + connect(m_pluginEditorWidget->configureButton, TQ_SIGNAL(clicked()), TQ_SLOT(configurePlugin())); + connect(m_pluginEditorWidget->pluginList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(configurePlugin(TQListViewItem*, const TQPoint&, int))); } QuantaPluginEditor::~QuantaPluginEditor() diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index ce838550..d963f3a1 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -42,7 +42,7 @@ QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent) { m_parent = parent; (void) new TDEAction( i18n( "Configure &Plugins..." ), 0, 0, - this, TQT_SLOT( slotPluginsEdit() ), + this, TQ_SLOT( slotPluginsEdit() ), ((TDEMainWindow*)parent)->actionCollection(), "configure_plugins" ); m_pluginMenu = 0L; // m_plugins.setAutoDelete(true); diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 107ba14a..48e13beb 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -72,7 +72,7 @@ Project::Project(TDEMainWindow *parent) : TQObject() { d = new ProjectPrivate(this); - connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_mainWindow = parent; d->m_uploadDialog = 0L; keepPasswd = true; @@ -131,8 +131,8 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) if ( !destination.isEmpty() ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), d, - TQT_SLOT(slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), d, + TQ_SLOT(slotDeleteCopytoDlg(CopyTo*))); url = dlg->copy( nameURL, destination ); } else // Copy canceled, addition aborted @@ -307,10 +307,10 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) (!destination.isEmpty()) ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), d, - TQT_SLOT (slotDeleteCopytoDlg(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), d, + TQ_SLOT (slotDeleteCopytoDlg(CopyTo *))); //if ( rdir.right(1) == "/" ) rdir.remove( rdir.length()-1,1); dirURL = dlg->copy(dirURL, destination); return; @@ -477,10 +477,10 @@ void Project::slotOptions() optionsPage.lineEmail->setText( d->email ); // Signals to handle debugger settings - connect(optionsPage.buttonDebuggerOptions, TQT_SIGNAL(clicked()), - d, TQT_SLOT(slotDebuggerOptions())); - connect(optionsPage.comboDebuggerClient, TQT_SIGNAL(activated(const TQString &)), - d, TQT_SLOT(slotDebuggerChanged(const TQString &))); + connect(optionsPage.buttonDebuggerOptions, TQ_SIGNAL(clicked()), + d, TQ_SLOT(slotDebuggerOptions())); + connect(optionsPage.comboDebuggerClient, TQ_SIGNAL(activated(const TQString &)), + d, TQ_SLOT(slotDebuggerChanged(const TQString &))); // Debuggers Combo @@ -863,7 +863,7 @@ void Project::slotUpload() if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(KURL(), "", false, false, false, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -878,7 +878,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -1052,8 +1052,8 @@ void Project::slotReloadProjectDocs() { delete d->m_dirWatch; d->m_dirWatch = new KDirWatch(this); - connect(d->m_dirWatch, TQT_SIGNAL(dirty(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); - connect(d->m_dirWatch, TQT_SIGNAL(deleted(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(dirty(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(deleted(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); if (d->baseURL.isLocalFile()) d->m_dirWatch->addDir(d->baseURL.path() + "/doc"); KURL url; diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index b845a40b..1503b951 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -67,21 +67,21 @@ ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name ) linePrjTmpl->setText("templates"); linePrjToolbar->setText("toolbars"); - connect(comboProtocol, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotProtocolChanged(const TQString &))); - connect( linePrjFile, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonDir, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotButtonDir())); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeNames(const TQString &))); - connect( linePrjTmpl, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonTmpl, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonTmpl())); - connect( linePrjToolbar, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonToolbar, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonToolbar())); + connect(comboProtocol, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotProtocolChanged(const TQString &))); + connect( linePrjFile, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonDir, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotButtonDir())); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeNames(const TQString &))); + connect( linePrjTmpl, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonTmpl, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonTmpl())); + connect( linePrjToolbar, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonToolbar, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonToolbar())); linePrjTmpl->installEventFilter(this); linePrjToolbar->installEventFilter(this); diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 1f4750b1..6964b030 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -59,13 +59,13 @@ ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name ) checkInsertWeb->setChecked( true ); - connect( checkInsert, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWeb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWithMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); + connect( checkInsert, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWeb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWithMask, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); - connect(addFiles, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFiles())); - connect(addFolder, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFolder())); - connect(clearList, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClearList())); + connect(addFiles, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFiles())); + connect(addFolder, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFolder())); + connect(clearList, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClearList())); } ProjectNewLocal::~ProjectNewLocal(){ @@ -202,10 +202,10 @@ void ProjectNewLocal::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); list = dlg->copy( list, destination ); return; } else @@ -263,10 +263,10 @@ void ProjectNewLocal::slotAddFolder() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); dirURL = dlg->copy(dirURL, destination); return; } else diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index d1692ab6..7e904fe8 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -49,14 +49,14 @@ ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name ) listView->removeColumn(1); listView->removeColumn(1); - connect( commandLine, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (enableStart(const TQString&))); - connect( siteUrl, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (setCommandL(const TQString&))); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT (slotStart())); - connect( protocolCombo,TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT (setProtocol(const TQString&))); + connect( commandLine, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (enableStart(const TQString&))); + connect( siteUrl, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (setCommandL(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT (slotStart())); + connect( protocolCombo,TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT (setProtocol(const TQString&))); start = false; KLed1->setState(KLed::Off); @@ -115,12 +115,12 @@ void ProjectNewWeb::slotStart() *proc << *it; } - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess *)), this, - TQT_SLOT( slotGetWgetExited(TDEProcess *))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess *)), this, + TQ_SLOT( slotGetWgetExited(TDEProcess *))); if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 1c8f7179..f1e13c5d 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -83,73 +83,73 @@ ProjectPrivate::~ProjectPrivate() void ProjectPrivate::initActions(TDEActionCollection *ac) { (void) new TDEAction( i18n( "&New Project..." ), "window-new", 0, - this, TQT_SLOT( slotNewProject() ), + this, TQ_SLOT( slotNewProject() ), ac, "project_new" ); (void) new TDEAction( i18n( "&Open Project..." ), "project_open", 0, - this, TQT_SLOT( slotOpenProject() ), + this, TQ_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = - KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)), + KStdAction::openRecent(parent, TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent"); m_projectRecent->setText(i18n("Open Recent Project")); m_projectRecent->setIcon("project_open"); m_projectRecent->setToolTip(i18n("Open/Open recent project")); - connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject())); + connect(m_projectRecent, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenProject())); closeprjAction = new TDEAction( i18n( "&Close Project" ), "window-close", 0, - this, TQT_SLOT( slotCloseProject() ), + this, TQ_SLOT( slotCloseProject() ), ac, "project_close" ); openPrjViewAction = new TDESelectAction( i18n( "Open Project &View..." ), 0, ac, "project_view_open" ); - connect(openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotOpenProjectView(const TQString &))); + connect(openPrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotOpenProjectView(const TQString &))); openPrjViewAction->setToolTip(i18n("Open project view")); savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "document-save", 0, - this, TQT_SLOT( slotSaveProjectView() ), + this, TQ_SLOT( slotSaveProjectView() ), ac, "project_view_save" ); saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "document-save-as", 0, - this, TQT_SLOT( slotSaveAsProjectView() ), + this, TQ_SLOT( slotSaveAsProjectView() ), ac, "project_view_save_as" ); deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "edit-delete", 0, ac, "project_view_delete" ); - connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotDeleteProjectView(const TQString &))); + connect(deletePrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotDeleteProjectView(const TQString &))); deletePrjViewAction->setToolTip(i18n("Close project view")); insertFileAction = new TDEAction( i18n( "&Insert Files..." ), 0, - this, TQT_SLOT( slotAddFiles() ), + this, TQ_SLOT( slotAddFiles() ), ac, "project_insert_file" ); insertDirAction = new TDEAction( i18n( "Inser&t Folder..." ), 0, - this, TQT_SLOT( slotAddDirectory() ), + this, TQ_SLOT( slotAddDirectory() ), ac, "project_insert_directory" ); rescanPrjDirAction = new TDEAction( i18n( "&Rescan Project Folder..." ), "reload", 0, - parent, TQT_SLOT( slotRescanPrjDir() ), + parent, TQ_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "go-up", Key_F8, - parent, TQT_SLOT( slotUpload() ), + parent, TQ_SLOT( slotUpload() ), ac, "project_upload" ); projectOptionAction = new TDEAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, - parent, TQT_SLOT( slotOptions() ), + parent, TQ_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = new TDEAction( i18n( "Save as Project Template..." ), 0, - m_mainWindow, TQT_SLOT( slotFileSaveAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = new TDEAction( i18n( "Save Selection to Project Template File..." ), 0, - m_mainWindow, TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); } @@ -1145,27 +1145,27 @@ void ProjectPrivate::slotNewProject() wiz->setNextEnabled ( pnf, false ); wiz->setFinishEnabled( pnf, true ); - connect( png, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnl, TQT_SLOT( setBaseURL(const KURL&))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnw, TQT_SLOT( setBaseURL(const KURL&))); - connect( this,TQT_SIGNAL(setLocalFiles(bool)), - pnl, TQT_SLOT(slotSetFiles(bool))); + connect( png, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnl, TQ_SLOT( setBaseURL(const KURL&))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnw, TQ_SLOT( setBaseURL(const KURL&))); + connect( this,TQ_SIGNAL(setLocalFiles(bool)), + pnl, TQ_SLOT(slotSetFiles(bool))); - connect(wiz, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT (slotSelectProjectType(const TQString &))); - connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked())); - - connect( pnw, TQT_SIGNAL(enableMessagesWidget()), - parent, TQT_SIGNAL(enableMessageWidget())); - connect( pnw, TQT_SIGNAL(messages(const TQString&)), - parent, TQT_SLOT (slotGetMessages(const TQString&))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setBackEnabled(TQWidget*,bool))); + connect(wiz, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT (slotSelectProjectType(const TQString &))); + connect(wiz, TQ_SIGNAL(helpClicked()), TQ_SLOT(slotNewProjectHelpClicked())); + + connect( pnw, TQ_SIGNAL(enableMessagesWidget()), + parent, TQ_SIGNAL(enableMessageWidget())); + connect( pnw, TQ_SIGNAL(messages(const TQString&)), + parent, TQ_SLOT (slotGetMessages(const TQString&))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setBackEnabled(TQWidget*,bool))); TQStringList lst = DTDs::ref()->nickNameList(true); pnf->dtdCombo->insertStringList(lst); @@ -1204,13 +1204,13 @@ void ProjectPrivate::slotNewProject() void ProjectPrivate::slotCloseProject() { if (!parent->hasProject()) return; - connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + connect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); parent->closeFiles(); } void ProjectPrivate::slotProceedWithCloseProject(bool success) { - disconnect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + disconnect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); if (!success) return; emit eventHappened("before_project_close", baseURL.url(), TQString()); if (!uploadProjectFile()) @@ -1446,10 +1446,10 @@ void ProjectPrivate::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), - TQT_SLOT (slotDeleteCopytoDlg(CopyTo*))); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent, - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), + TQ_SLOT (slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), parent, + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); list = dlg->copy( list, destination ); return; } diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index 481ea134..8c949951 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -83,7 +83,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool { if (markOnly) markAsUploaded->setChecked(true); - TQTimer::singleShot(10, this, TQT_SLOT(slotBuildTree())); + TQTimer::singleShot(10, this, TQ_SLOT(slotBuildTree())); currentItem = 0L; } } @@ -149,7 +149,7 @@ void ProjectUpload::initProjectInfo(const TQString& defaultProfile) buttonRemoveProfile->setEnabled(comboProfile->count() > 1); keepPasswords->setChecked(m_project->keepPasswd); uploadInProgress = false; - connect( this, TQT_SIGNAL( uploadNext() ), TQT_SLOT( slotUploadNext() ) ); + connect( this, TQ_SIGNAL( uploadNext() ), TQ_SLOT( slotUploadNext() ) ); setProfileTooltip(); } @@ -456,12 +456,12 @@ void ProjectUpload::upload() emit eventHappened("before_upload", from.url(), to.url()); TDEIO::FileCopyJob *job = TDEIO::file_copy( from, to, fileItem->permissions(), true, false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),this, - TQT_SLOT( uploadFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), - this, TQT_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), - this, TQT_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),this, + TQ_SLOT( uploadFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), + this, TQ_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), + this, TQ_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); currentProgress->setProgress( 0 ); diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index e78eb438..89c65e86 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -56,22 +56,22 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, co TDEIO::ListJob *job = TDEIO::listRecursive( baseURL, false ); m_listJobCount = 1; - connect( job, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); - - - connect( buttonSelect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelect())); - connect( buttonDeselect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeselect())); - connect( buttonInvert, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInvert())); - connect( buttonExpand, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotExpand())); - connect( buttonCollapse, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCollapse())); + connect( job, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); + + + connect( buttonSelect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelect())); + connect( buttonDeselect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeselect())); + connect( buttonInvert, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInvert())); + connect( buttonExpand, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotExpand())); + connect( buttonCollapse, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCollapse())); } RescanPrj::~RescanPrj() @@ -151,10 +151,10 @@ void RescanPrj::addEntries(TDEIO::Job *job,const TDEIO::UDSEntryList &list) TDEIO::ListJob *ljob = TDEIO::listRecursive( (*it)->url(), false ); m_listJobCount++; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); } } diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index 6ca6e6ab..49b3d195 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -200,25 +200,25 @@ Document::Document(KTextEditor::Document *doc, //path of the backup copy file of the document m_backupPathValue = TQString(); - connect( m_doc, TQT_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), - this, TQT_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); + connect( m_doc, TQ_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), + this, TQ_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); - connect( m_view, TQT_SIGNAL(completionAborted()), - this, TQT_SLOT( slotCompletionAborted()) ); + connect( m_view, TQ_SIGNAL(completionAborted()), + this, TQ_SLOT( slotCompletionAborted()) ); - connect( m_view, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - this, TQT_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); + connect( m_view, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), + this, TQ_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); - connect( m_view, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), - this, TQT_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); - connect( m_doc, TQT_SIGNAL(textChanged()), TQT_SLOT(slotTextChanged())); + connect( m_view, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), + this, TQ_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); + connect( m_doc, TQ_SIGNAL(textChanged()), TQ_SLOT(slotTextChanged())); - connect(m_view, TQT_SIGNAL(gotFocus(Kate::View*)), TQT_SIGNAL(editorGotFocus())); + connect(m_view, TQ_SIGNAL(gotFocus(Kate::View*)), TQ_SIGNAL(editorGotFocus())); - connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotFileDirty(const TQString&))); + connect(fileWatcher, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotFileDirty(const TQString&))); -// connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(slotMarksChanged())); - connect(m_doc, TQT_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQT_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); +// connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(slotMarksChanged())); + connect(m_doc, TQ_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQ_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); } @@ -725,7 +725,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) /* if (completion.type == "charCompletion") { m_lastCompletionList = getCharacterCompletions(completion.userdata); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } else*/ if (completion.type == "attribute") { @@ -736,7 +736,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) if (tag) { m_lastCompletionList = getAttributeValueCompletions(tag->name(), completion.text); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } } } else @@ -755,7 +755,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) { m_lastLine = line; m_lastCol = col - 1; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedScriptAutoCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedScriptAutoCompletion())); } } } @@ -859,7 +859,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(string[0].unicode()); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -872,7 +872,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(c); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -2367,7 +2367,7 @@ void Document::slotTextChanged() { kdDebug(24000) << "Delayed text changed called." << endl; //delay the handling, otherwise we may get wrong values for (line,column) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedTextChanged())); delayedTextChangedEnabled = false; } } @@ -2378,7 +2378,7 @@ void Document::slotDelayedTextChanged(bool forced) { kdDebug(24000) << "Reparsing delayed!" << endl; parser->setParsingNeeded(true); - TQTimer::singleShot(1000, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDelayedTextChanged())); reparseEnabled = false; delayedTextChangedEnabled = false; return; @@ -2872,8 +2872,8 @@ void Document::open(const KURL &url, const TQString &encoding) m_encoding = encoding; m_codec = TQTextCodec::codecForName(m_encoding.ascii()); } - connect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - connect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + connect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + connect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); if (!openURL(url)) slotOpeningFailed(TQString()); if (!url.isLocalFile()) @@ -2897,8 +2897,8 @@ void Document::slotOpeningCompleted() m_modifTime = TQFileInfo(u.path()).lastModified(); // kdDebug(24000) << "addFile[Document::open]: " << u.path() << endl; } - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); m_dirty = false; m_view->setFocus(); processDTD(); @@ -2911,8 +2911,8 @@ void Document::slotOpeningFailed(const TQString &errorMessage) Q_UNUSED(errorMessage); //TODO: append the error message to our own error message if (!url().isLocalFile()) tqApp->exit_loop(); - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); emit openingFailed(url()); } diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 737a3a00..bf257a0c 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -59,9 +59,9 @@ const TQString m_rcFilename("description.rc"); DTDs::DTDs(TQObject *parent) :TQObject(parent) { - connect(this, TQT_SIGNAL(hideSplash()), parent, TQT_SLOT(slotHideSplash())); - connect(this, TQT_SIGNAL(enableIdleTimer(bool)), parent, TQT_SLOT(slotEnableIdleTimer(bool))); - connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&))); + connect(this, TQ_SIGNAL(hideSplash()), parent, TQ_SLOT(slotHideSplash())); + connect(this, TQ_SIGNAL(enableIdleTimer(bool)), parent, TQ_SLOT(slotEnableIdleTimer(bool))); + connect(this, TQ_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQ_SLOT(slotLoadToolbarForDTD(const TQString&))); // kdDebug(24000) << "dtds::dtds" << endl; m_dict = new TQDict<DTDStruct>(119, false); //optimized for max 119 DTD. This should be enough. m_dict->setAutoDelete(true); diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index fc826178..8bd35024 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -93,8 +93,8 @@ KQApplication::KQApplication() { sp = new KSplashScreen(UserIcon(SPLASH_PICTURE)); sp->show(); - connect(quantaApp, TQT_SIGNAL(showSplash(bool)), sp, TQT_SLOT(setShown(bool))); - TQTimer::singleShot(10*1000, this, TQT_SLOT(slotSplashTimeout())); + connect(quantaApp, TQ_SIGNAL(showSplash(bool)), sp, TQ_SLOT(setShown(bool))); + TQTimer::singleShot(10*1000, this, TQ_SLOT(slotSplashTimeout())); } setMainWidget(quantaApp); slotInit(); @@ -164,8 +164,8 @@ int KQUniqueApplication::newInstance() { sp = new KSplashScreen(UserIcon(SPLASH_PICTURE)); sp->show(); - connect(quantaApp, TQT_SIGNAL(showSplash(bool)), sp, TQT_SLOT(setShown(bool))); - TQTimer::singleShot(10*1000, this, TQT_SLOT(slotSplashTimeout())); + connect(quantaApp, TQ_SIGNAL(showSplash(bool)), sp, TQ_SLOT(setShown(bool))); + TQTimer::singleShot(10*1000, this, TQ_SLOT(slotSplashTimeout())); } setMainWidget(quantaApp); slotInit(); diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index 11b8efeb..46a098df 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -219,7 +219,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( currentToolbarDTD = TQString(); m_config=kapp->config(); idleTimer = new TQTimer(this); - connect(idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimerExpired())); + connect(idleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimerExpired())); m_idleTimerEnabled = true; qConfig.globalDataDir = TDEGlobal::dirs()->findResourceDir("data",resourceDir + "toolbar/quantalogo.png"); @@ -230,7 +230,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( kdWarning() << i18n("Quanta data files were not found.") << endl; kdWarning() << i18n("You may have forgotten to run \"make install\", or your TDEDIR, TDEDIRS or PATH are not set correctly.") << endl; kdWarning() << "***************************************************************************" << endl; - TQTimer::singleShot(20, kapp, TQT_SLOT(quit())); + TQTimer::singleShot(20, kapp, TQ_SLOT(quit())); return; } qConfig.enableDTDToolbar = true; @@ -243,10 +243,10 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_partManager = new KParts::PartManager(this); // When the manager says the active part changes, // the builder updates (recreates) the GUI - connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), - this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); - connect(this, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget *)), this, TQT_SLOT(slotDockWidgetHasUndocked(KDockWidget *))); - connect(tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget *)), this, TQT_SLOT(slotTabDragged(TQWidget*))); + connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )), + this, TQ_SLOT(slotActivePartChanged(KParts::Part * ))); + connect(this, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget *)), this, TQ_SLOT(slotDockWidgetHasUndocked(KDockWidget *))); + connect(tabWidget(), TQ_SIGNAL(initiateDrag(TQWidget *)), this, TQ_SLOT(slotTabDragged(TQWidget*))); m_oldKTextEditor = 0L; m_previewToolView = 0L; @@ -280,9 +280,9 @@ QuantaApp::~QuantaApp() m_newScriptStuff = 0L; delete m_newDTEPStuff; m_newDocStuff = 0L; - // disconnect(m_htmlPart, TQT_SIGNAL(destroyed(TQObject *))); - // disconnect(m_htmlPartDoc, TQT_SIGNAL(destroyed(TQObject *))); - disconnect(this, TQT_SIGNAL(lastChildViewClosed()), ViewManager::ref(), TQT_SLOT(slotLastViewClosed())); + // disconnect(m_htmlPart, TQ_SIGNAL(destroyed(TQObject *))); + // disconnect(m_htmlPartDoc, TQ_SIGNAL(destroyed(TQObject *))); + disconnect(this, TQ_SIGNAL(lastChildViewClosed()), ViewManager::ref(), TQ_SLOT(slotLastViewClosed())); //kdDebug(24000) << "QuantaApp::~QuantaApp" << endl; #ifdef ENABLE_CVSSERVICE delete CVSService::ref(); @@ -1081,7 +1081,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar) } } - connect(dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotNewToolbarConfig())); + connect(dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotNewToolbarConfig())); dlg->exec(); delete dlg; TQPopupMenu *menu = 0L; @@ -1389,8 +1389,8 @@ void QuantaApp::slotShowPreviewWidget(bool show) if (!m_previewToolView) { m_previewToolView= addToolWindow(m_htmlPart->view(), prevDockPosition(m_htmlPart->view(), KDockWidget::DockBottom), getMainDockWidget()); - connect(m_previewToolView->wrapperWidget(), TQT_SIGNAL(iMBeingClosed -()), this, TQT_SLOT(slotPreviewBeingClosed())); + connect(m_previewToolView->wrapperWidget(), TQ_SIGNAL(iMBeingClosed +()), this, TQ_SLOT(slotPreviewBeingClosed())); } m_htmlPart->view()->show(); m_previewToolView->show(); @@ -1819,10 +1819,10 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl toolbarTab->insertTab(tb, tabname, idStr); qInstallMsgHandler( oldHandler ); - connect(tb, TQT_SIGNAL(removeAction(const TQString&, const TQString&)), - TQT_SLOT(slotRemoveAction(const TQString&, const TQString&))); - connect(tb, TQT_SIGNAL(editAction(const TQString&)), - TQT_SLOT(slotEditAction(const TQString&))); + connect(tb, TQ_SIGNAL(removeAction(const TQString&, const TQString&)), + TQ_SLOT(slotRemoveAction(const TQString&, const TQString&))); + connect(tb, TQ_SIGNAL(editAction(const TQString&)), + TQ_SLOT(slotEditAction(const TQString&))); return tb; } @@ -3694,7 +3694,7 @@ void QuantaApp::slotDownloadDoc() if (!m_newDocStuff) { m_newDocStuff = new QNewDocStuff("quanta documentation", this); - connect(m_newDocStuff, TQT_SIGNAL(installFinished()), dTab, TQT_SLOT(slotRefreshTree())); + connect(m_newDocStuff, TQ_SIGNAL(installFinished()), dTab, TQ_SLOT(slotRefreshTree())); } m_newDocStuff->downloadResource(); } @@ -5092,8 +5092,8 @@ void QuantaApp::initTabWidget(bool closeButtonsOnly) { tab->setTabReorderingEnabled(true); tab->setTabPosition(TQTabWidget::Bottom); - connect(tab, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), ViewManager::ref(), TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & ) ) ); - connect(tab, TQT_SIGNAL(initiateTabMove(int, int)), this, TQT_SLOT(slotTabAboutToMove(int, int))); connect(tab, TQT_SIGNAL(movedTab(int, int)), this, TQT_SLOT(slotTabMoved(int, int))); setTabWidgetVisibility(KMdi::AlwaysShowTabs); + connect(tab, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), ViewManager::ref(), TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & ) ) ); + connect(tab, TQ_SIGNAL(initiateTabMove(int, int)), this, TQ_SLOT(slotTabAboutToMove(int, int))); connect(tab, TQ_SIGNAL(movedTab(int, int)), this, TQ_SLOT(slotTabMoved(int, int))); setTabWidgetVisibility(KMdi::AlwaysShowTabs); } } if (!closeButtonsOnly) @@ -5267,10 +5267,10 @@ void QuantaApp::createPreviewPart() m_htmlPart->view()->setIcon(UserIcon("preview")); m_htmlPart->view()->setCaption(i18n("Preview")); slotNewPart(m_htmlPart, false); - connect(m_htmlPart, TQT_SIGNAL(previewHasFocus(bool)), this, TQT_SLOT(slotPreviewHasFocus(bool))); - connect(m_htmlPart, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotHTMLPartDeleted(TQObject *))); - connect(m_htmlPart, TQT_SIGNAL(openFile(const KURL&, const TQString&, bool)), this, TQT_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); - connect(m_htmlPart, TQT_SIGNAL(showPreview(bool)), this, TQT_SLOT(slotShowPreviewWidget(bool))); + connect(m_htmlPart, TQ_SIGNAL(previewHasFocus(bool)), this, TQ_SLOT(slotPreviewHasFocus(bool))); + connect(m_htmlPart, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotHTMLPartDeleted(TQObject *))); + connect(m_htmlPart, TQ_SIGNAL(openFile(const KURL&, const TQString&, bool)), this, TQ_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); + connect(m_htmlPart, TQ_SIGNAL(showPreview(bool)), this, TQ_SLOT(slotShowPreviewWidget(bool))); } @@ -5281,7 +5281,7 @@ void QuantaApp::createDocPart() m_htmlPartDoc->view()->setIcon(SmallIcon("contents")); m_htmlPartDoc->view()->setCaption(i18n("Documentation")); slotNewPart(m_htmlPartDoc, false); - connect(m_htmlPartDoc, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotHTMLPartDeleted(TQObject *))); + connect(m_htmlPartDoc, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotHTMLPartDeleted(TQObject *))); } void QuantaApp::insertTagActionPoolItem(TQString const& action_item) @@ -5320,14 +5320,14 @@ void QuantaApp::slotTabMoved(int from, int to) KMdiChildView *view = m_pDocumentViews->at(from); m_pDocumentViews->remove(from); m_pDocumentViews->insert(to, view); - connect(this, TQT_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQT_SLOT(slotViewActivated(KMdiChildView*))); + connect(this, TQ_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQ_SLOT(slotViewActivated(KMdiChildView*))); } void QuantaApp::slotTabAboutToMove(int from, int to) { Q_UNUSED(from); Q_UNUSED(to); - disconnect(this, TQT_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQT_SLOT(slotViewActivated(KMdiChildView*))); + disconnect(this, TQ_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQ_SLOT(slotViewActivated(KMdiChildView*))); } TQString QuantaApp::currentURL() const diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 134e34a4..42e72e38 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -123,7 +123,7 @@ QuantaInit::QuantaInit(QuantaApp * quantaApp) : TQObject() { m_quanta = quantaApp; - connect(this, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); + connect(this, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); } QuantaInit::~QuantaInit() @@ -175,11 +175,11 @@ void QuantaInit::initQuanta() // Initialize debugger m_quanta->m_debugger = new DebuggerManager(m_quanta); - connect(Project::ref(), TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->m_debugger, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(Project::ref(), TQT_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), - m_quanta->m_debugger, TQT_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); - connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); + connect(Project::ref(), TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->m_debugger, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(Project::ref(), TQ_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), + m_quanta->m_debugger, TQ_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); + connect(m_quanta->m_debugger, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); //m_quanta->KDockMainWindow::createGUI( TQString(), false /* conserveMemory */ ); m_quanta->createShellGUI(true); @@ -213,7 +213,7 @@ void QuantaInit::initQuanta() if (mdiMode == KMdi::ToplevelMode) { m_quanta->switchToChildframeMode(); - TQTimer::singleShot(0, m_quanta, TQT_SLOT(switchToToplevelMode())); + TQTimer::singleShot(0, m_quanta, TQ_SLOT(switchToToplevelMode())); } // Always hide debugger toolbar at this point @@ -257,19 +257,19 @@ void QuantaInit::initQuanta() toolviewMenu->plug(m_quanta->windowMenu()); TQPopupMenu *toolbarsMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("toolbars_load", m_quanta); - connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotBuildPrjToolbarsMenu())); + connect(toolbarsMenu, TQ_SIGNAL(aboutToShow()), m_quanta, TQ_SLOT(slotBuildPrjToolbarsMenu())); TQPopupMenu *contextMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("popup_editor", m_quanta); - connect(contextMenu, TQT_SIGNAL(aboutToShow()), m_quanta, TQT_SLOT(slotContextMenuAboutToShow())); + connect(contextMenu, TQ_SIGNAL(aboutToShow()), m_quanta, TQ_SLOT(slotContextMenuAboutToShow())); - connect(m_quanta->m_messageOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_problemOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_annotationOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_messageOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_problemOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_annotationOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); m_quanta->slotFileNew(); m_quanta->slotNewStatus(); @@ -283,12 +283,12 @@ void QuantaInit::initQuanta() qConfig.backupDirPath = TDEGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); m_quanta->autosaveTimer = new TQTimer(m_quanta); - connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotAutosaveTimer())); + connect(m_quanta->autosaveTimer, TQ_SIGNAL(timeout()), m_quanta, TQ_SLOT(slotAutosaveTimer())); m_quanta->autosaveTimer->start(qConfig.autosaveInterval * 60000, false); - connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); - connect(parser, TQT_SIGNAL(rebuildStructureTree(bool)), - m_quanta, TQT_SLOT(slotReloadStructTreeView(bool))); + connect(m_quanta->m_doc, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); + connect(parser, TQ_SIGNAL(rebuildStructureTree(bool)), + m_quanta, TQ_SLOT(slotReloadStructTreeView(bool))); // Read list of characters TQFile file(locate("appdata","chars")); @@ -319,7 +319,7 @@ void QuantaInit::initQuanta() ViewManager::ref()->activeDocument()->view()->setFocus(); m_quanta->refreshTimer = new TQTimer(m_quanta); - connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), m_quanta, TQT_SLOT(slotReparse())); + connect(m_quanta->refreshTimer, TQ_SIGNAL(timeout()), m_quanta, TQ_SLOT(slotReparse())); m_quanta->refreshTimer->start( qConfig.refreshFrequency*1000, false ); //update the structure tree every 5 seconds if (qConfig.instantUpdate || qConfig.refreshFrequency == 0) { @@ -337,8 +337,8 @@ void QuantaInit::initToolBars() void QuantaInit::initStatusBar() { m_quanta->statusbarTimer = new TQTimer(m_quanta); - connect(m_quanta->statusbarTimer,TQT_SIGNAL(timeout()), - m_quanta, TQT_SLOT(statusBarTimeout())); + connect(m_quanta->statusbarTimer,TQ_SIGNAL(timeout()), + m_quanta, TQ_SLOT(statusBarTimeout())); progressBar = new KProgress(m_quanta->statusBar()); progressBar->setTextEnabled(false); @@ -360,111 +360,111 @@ void QuantaInit::initStatusBar() void QuantaInit::initDocument() { m_quanta->m_doc = new QuantaDoc(0L); - connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()), - m_quanta, TQT_SLOT(slotNewStatus())); + connect(m_quanta->m_doc, TQ_SIGNAL(newStatus()), + m_quanta, TQ_SLOT(slotNewStatus())); } void QuantaInit::initProject() { Project *m_project = Project::ref(m_quanta); - connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)), - pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *))); - connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)), - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL &))); - connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)), - m_quanta, TQT_SLOT(slotGetUserToolbarFiles(KURL::List *))); - connect(m_project, TQT_SIGNAL(openFiles(const KURL::List &, const TQString&)), - m_quanta, TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&))); - connect(m_project, TQT_SIGNAL(openFile(const KURL &, const TQString&)), - m_quanta, TQT_SLOT(slotFileOpen(const KURL &, const TQString&))); - connect(m_project, TQT_SIGNAL(closeFile(const KURL &)), - m_quanta, TQT_SLOT(slotFileClose(const KURL &))); - connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), - pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); - connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll())); - connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - - connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)), - m_project, TQT_SLOT(slotAddDirectory(const KURL&))); - - connect(m_quanta->fTab, TQT_SIGNAL(insertFileInProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - - connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertDirInProject(const KURL&)), - m_project, TQT_SLOT(slotAddDirectory(const KURL&))); - - connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertFileInProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(downloadTemplate()), - m_quanta, TQT_SLOT(slotDownloadTemplate())); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQT_SLOT(slotUploadTemplate(const TQString&))); + connect(m_project, TQ_SIGNAL(getTreeStatus(TQStringList *)), + pTab, TQ_SLOT(slotGetTreeStatus(TQStringList *))); + connect(m_project, TQ_SIGNAL(loadToolbarFile(const KURL &)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL &))); + connect(m_project, TQ_SIGNAL(getUserToolbarFiles(KURL::List *)), + m_quanta, TQ_SLOT(slotGetUserToolbarFiles(KURL::List *))); + connect(m_project, TQ_SIGNAL(openFiles(const KURL::List &, const TQString&)), + m_quanta, TQ_SLOT(slotFileOpen(const KURL::List &, const TQString&))); + connect(m_project, TQ_SIGNAL(openFile(const KURL &, const TQString&)), + m_quanta, TQ_SLOT(slotFileOpen(const KURL &, const TQString&))); + connect(m_project, TQ_SIGNAL(closeFile(const KURL &)), + m_quanta, TQ_SLOT(slotFileClose(const KURL &))); + connect(m_project, TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), + pTab, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); + connect(m_project, TQ_SIGNAL(closeFiles()), ViewManager::ref(), TQ_SLOT(closeAll())); + connect(m_project, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + + connect(m_quanta->fTab, TQ_SIGNAL(insertDirInProject(const KURL&)), + m_project, TQ_SLOT(slotAddDirectory(const KURL&))); + + connect(m_quanta->fTab, TQ_SIGNAL(insertFileInProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + + connect(TemplatesTreeView::ref(), TQ_SIGNAL(insertDirInProject(const KURL&)), + m_project, TQ_SLOT(slotAddDirectory(const KURL&))); + + connect(TemplatesTreeView::ref(), TQ_SIGNAL(insertFileInProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + connect(TemplatesTreeView::ref(), TQ_SIGNAL(downloadTemplate()), + m_quanta, TQ_SLOT(slotDownloadTemplate())); + connect(TemplatesTreeView::ref(), TQ_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQ_SLOT(slotUploadTemplate(const TQString&))); // inform project if something was renamed - connect(pTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - connect(m_quanta->fTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - connect(tTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - - connect(pTab, TQT_SIGNAL(insertToProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - connect(pTab, TQT_SIGNAL(removeFromProject(const KURL&)), - m_project, TQT_SLOT(slotRemove(const KURL&))); - connect(pTab, TQT_SIGNAL(uploadSingleURL(const KURL&, const TQString&, bool, bool)), - m_project, TQT_SLOT(slotUploadURL(const KURL&, const TQString&, bool, bool))); - connect(pTab, TQT_SIGNAL(rescanProjectDir()), m_project, TQT_SLOT(slotRescanPrjDir())); - connect(pTab, TQT_SIGNAL(showProjectOptions()), m_project, TQT_SLOT(slotOptions())); - connect(pTab, TQT_SIGNAL(uploadProject()), m_project, TQT_SLOT(slotUpload())); - - connect(m_quanta->dTab, TQT_SIGNAL(reloadProjectDocs()), m_project, TQT_SLOT(slotReloadProjectDocs())); - connect(m_project, TQT_SIGNAL(reloadProjectDocs()), m_quanta->dTab, TQT_SLOT(slotReloadProjectDocs())); - connect(m_project, TQT_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQT_SLOT(slotAddProjectDoc(const KURL&))); - - connect(m_project, TQT_SIGNAL(enableMessageWidget()), - m_quanta, TQT_SLOT(slotShowMessagesView())); - - connect(m_project, TQT_SIGNAL(messages(const TQString&)), - m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&))); - - connect(m_project, TQT_SIGNAL(newStatus()), - m_quanta, TQT_SLOT(slotNewStatus())); - - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - pTab, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->fTab, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->annotationOutput(), TQT_SLOT(updateAnnotations())); - - connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)), - m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&))); - connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)), - m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int))); - connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), - m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); - - connect(m_project, TQT_SIGNAL(hideSplash()), m_quanta, TQT_SLOT(slotHideSplash())); - - connect(m_project, TQT_SIGNAL(statusMsg(const TQString &)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(pTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + connect(m_quanta->fTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + connect(tTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + + connect(pTab, TQ_SIGNAL(insertToProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + connect(pTab, TQ_SIGNAL(removeFromProject(const KURL&)), + m_project, TQ_SLOT(slotRemove(const KURL&))); + connect(pTab, TQ_SIGNAL(uploadSingleURL(const KURL&, const TQString&, bool, bool)), + m_project, TQ_SLOT(slotUploadURL(const KURL&, const TQString&, bool, bool))); + connect(pTab, TQ_SIGNAL(rescanProjectDir()), m_project, TQ_SLOT(slotRescanPrjDir())); + connect(pTab, TQ_SIGNAL(showProjectOptions()), m_project, TQ_SLOT(slotOptions())); + connect(pTab, TQ_SIGNAL(uploadProject()), m_project, TQ_SLOT(slotUpload())); + + connect(m_quanta->dTab, TQ_SIGNAL(reloadProjectDocs()), m_project, TQ_SLOT(slotReloadProjectDocs())); + connect(m_project, TQ_SIGNAL(reloadProjectDocs()), m_quanta->dTab, TQ_SLOT(slotReloadProjectDocs())); + connect(m_project, TQ_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQ_SLOT(slotAddProjectDoc(const KURL&))); + + connect(m_project, TQ_SIGNAL(enableMessageWidget()), + m_quanta, TQ_SLOT(slotShowMessagesView())); + + connect(m_project, TQ_SIGNAL(messages(const TQString&)), + m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&))); + + connect(m_project, TQ_SIGNAL(newStatus()), + m_quanta, TQ_SLOT(slotNewStatus())); + + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + TemplatesTreeView::ref(), TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + pTab, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->fTab, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->annotationOutput(), TQ_SLOT(updateAnnotations())); + + connect(pTab, TQ_SIGNAL(changeFileDescription(const KURL&, const TQString&)), + m_project, TQ_SLOT(slotFileDescChanged(const KURL&, const TQString&))); + connect(pTab, TQ_SIGNAL(changeUploadStatus(const KURL&, int)), + m_project, TQ_SLOT(slotUploadStatusChanged(const KURL&, int))); + connect(pTab, TQ_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), + m_project, TQ_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); + + connect(m_project, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); + + connect(m_project, TQ_SIGNAL(statusMsg(const TQString &)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); } void QuantaInit::initView() { ViewManager *m_viewManager = ViewManager::ref(m_quanta); - connect(m_quanta, TQT_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(m_quanta, TQT_SIGNAL(lastChildViewClosed()), m_viewManager, TQT_SLOT(slotLastViewClosed())); -// connect(m_quanta, TQT_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewDeactivated(KMdiChildView*))); + connect(m_quanta, TQ_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(m_quanta, TQ_SIGNAL(lastChildViewClosed()), m_viewManager, TQ_SLOT(slotLastViewClosed())); +// connect(m_quanta, TQ_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQ_SLOT(slotViewDeactivated(KMdiChildView*))); KafkaDocument *m_kafkaDocument = KafkaDocument::ref(0, 0, "KafkaPart"); m_kafkaDocument->getKafkaWidget()->view()->setMinimumHeight(50); m_kafkaDocument->readConfig(quantaApp->config()); loadVPLConfig(); ToolbarTabWidget *toolBarTab = ToolbarTabWidget::ref(quantaApp); - connect(toolBarTab, TQT_SIGNAL(iconTextModeChanged()), quantaApp, TQT_SLOT(slotRefreshActiveWindow())); + connect(toolBarTab, TQ_SIGNAL(iconTextModeChanged()), quantaApp, TQ_SLOT(slotRefreshActiveWindow())); //set the toolview and close button style before the GUI is created m_config->setGroup("General Options"); @@ -487,8 +487,8 @@ void QuantaInit::initView() m_quanta->m_messageOutput = new MessageOutput(m_quanta, "Messages"); m_quanta->m_messageOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->m_messageOutput->showMessage(i18n("Message Window...")); - connect(m_quanta, TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(m_quanta, TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); + connect(m_quanta, TQ_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&, bool))); + connect(m_quanta, TQ_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQ_SLOT(clear())); m_quanta->m_problemOutput = new MessageOutput(m_quanta, "Problems"); m_quanta->m_problemOutput->setFocusPolicy(TQWidget::NoFocus); @@ -498,59 +498,59 @@ void QuantaInit::initView() m_quanta->createPreviewPart(); m_quanta->createDocPart(); - connect(m_quanta, TQT_SIGNAL(reloadAllTrees()), - m_quanta->fTab, TQT_SLOT(slotReloadAllTrees())); - - connect(pTab, TQT_SIGNAL(loadToolbarFile (const KURL&)), - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(viewActivated(const KURL&)), - pTab, TQT_SLOT(slotViewActivated(const KURL&))); - - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - pTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - tTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - m_quanta->scriptTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - m_quanta->fTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - - connect(tTab, TQT_SIGNAL(insertFile (const KURL &)), - m_quanta, TQT_SLOT(slotInsertFile(const KURL &))); - - connect(m_quanta->scriptTab, TQT_SIGNAL(openFileInPreview(const KURL &)), - m_quanta, TQT_SLOT(slotOpenFileInPreview(const KURL &))); - connect(m_quanta->scriptTab, TQT_SIGNAL(showPreviewWidget(bool)), - m_quanta, TQT_SLOT(slotShowPreviewWidget(bool))); - connect(m_quanta->scriptTab, TQT_SIGNAL(assignActionToScript(const KURL &, const TQString&)), - m_quanta, TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); - connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), m_quanta, TQT_SLOT(slotDownloadScript())); - connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), m_quanta, TQT_SLOT(slotUploadScript(const TQString&))); - connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), m_quanta, TQT_SLOT(slotDownloadDoc())); - - connect(m_quanta->m_htmlPart, TQT_SIGNAL(onURL(const TQString&)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString&))); - connect(m_quanta->m_htmlPartDoc, TQT_SIGNAL(onURL(const TQString&)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString&))); - - connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), m_quanta, TQT_SLOT(setCursorPosition(int,int))); - connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQT_SLOT( selectArea(int,int,int,int))); - connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), m_quanta, TQT_SLOT(slotSelectTagArea(Node*))); - connect(sTab, TQT_SIGNAL(needReparse()), m_quanta, TQT_SLOT(slotForceReparse())); - connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); - connect(sTab, TQT_SIGNAL(openFile(const KURL &)), - m_quanta, TQT_SLOT (slotFileOpen(const KURL &))); - connect(sTab, TQT_SIGNAL(openImage (const KURL&)), - m_quanta, TQT_SLOT(slotImageOpen(const KURL&))); - connect(sTab, TQT_SIGNAL(showProblemMessage(const TQString&)), - m_quanta->m_problemOutput, TQT_SLOT(showMessage(const TQString&))); - connect(sTab, TQT_SIGNAL(clearProblemOutput()), - m_quanta->m_problemOutput, TQT_SLOT(clear())); - connect(parser, TQT_SIGNAL(nodeTreeChanged()), sTab, TQT_SLOT(slotNodeTreeChanged())); - - connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), m_quanta, TQT_SLOT(openDoc(const TQString&))); - - connect(m_viewManager, TQT_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQT_SLOT(slotDragInsert(TQDropEvent *))); + connect(m_quanta, TQ_SIGNAL(reloadAllTrees()), + m_quanta->fTab, TQ_SLOT(slotReloadAllTrees())); + + connect(pTab, TQ_SIGNAL(loadToolbarFile (const KURL&)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(viewActivated(const KURL&)), + pTab, TQ_SLOT(slotViewActivated(const KURL&))); + + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + pTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + tTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + m_quanta->scriptTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + m_quanta->fTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + + connect(tTab, TQ_SIGNAL(insertFile (const KURL &)), + m_quanta, TQ_SLOT(slotInsertFile(const KURL &))); + + connect(m_quanta->scriptTab, TQ_SIGNAL(openFileInPreview(const KURL &)), + m_quanta, TQ_SLOT(slotOpenFileInPreview(const KURL &))); + connect(m_quanta->scriptTab, TQ_SIGNAL(showPreviewWidget(bool)), + m_quanta, TQ_SLOT(slotShowPreviewWidget(bool))); + connect(m_quanta->scriptTab, TQ_SIGNAL(assignActionToScript(const KURL &, const TQString&)), + m_quanta, TQ_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); + connect(m_quanta->scriptTab, TQ_SIGNAL(downloadScript()), m_quanta, TQ_SLOT(slotDownloadScript())); + connect(m_quanta->scriptTab, TQ_SIGNAL(uploadScript(const TQString&)), m_quanta, TQ_SLOT(slotUploadScript(const TQString&))); + connect(m_quanta->dTab, TQ_SIGNAL(downloadDoc()), m_quanta, TQ_SLOT(slotDownloadDoc())); + + connect(m_quanta->m_htmlPart, TQ_SIGNAL(onURL(const TQString&)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString&))); + connect(m_quanta->m_htmlPartDoc, TQ_SIGNAL(onURL(const TQString&)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString&))); + + connect(sTab, TQ_SIGNAL(newCursorPosition(int,int)), m_quanta, TQ_SLOT(setCursorPosition(int,int))); + connect(sTab, TQ_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQ_SLOT( selectArea(int,int,int,int))); + connect(sTab, TQ_SIGNAL(selectTagArea(Node*)), m_quanta, TQ_SLOT(slotSelectTagArea(Node*))); + connect(sTab, TQ_SIGNAL(needReparse()), m_quanta, TQ_SLOT(slotForceReparse())); + connect(sTab, TQ_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQ_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); + connect(sTab, TQ_SIGNAL(openFile(const KURL &)), + m_quanta, TQ_SLOT (slotFileOpen(const KURL &))); + connect(sTab, TQ_SIGNAL(openImage (const KURL&)), + m_quanta, TQ_SLOT(slotImageOpen(const KURL&))); + connect(sTab, TQ_SIGNAL(showProblemMessage(const TQString&)), + m_quanta->m_problemOutput, TQ_SLOT(showMessage(const TQString&))); + connect(sTab, TQ_SIGNAL(clearProblemOutput()), + m_quanta->m_problemOutput, TQ_SLOT(clear())); + connect(parser, TQ_SIGNAL(nodeTreeChanged()), sTab, TQ_SLOT(slotNodeTreeChanged())); + + connect(m_quanta->dTab, TQ_SIGNAL(openURL(const TQString&)), m_quanta, TQ_SLOT(openDoc(const TQString&))); + + connect(m_viewManager, TQ_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQ_SLOT(slotDragInsert(TQDropEvent *))); qConfig.windowLayout = "Default"; } @@ -710,74 +710,74 @@ void QuantaInit::loadInitialProject(const TQString& url) void QuantaInit::initActions() { TDEActionCollection *ac = m_quanta->actionCollection(); - new TDEAction(i18n("Annotate..."), 0, m_quanta, TQT_SLOT(slotAnnotate()),ac, "annotate"); + new TDEAction(i18n("Annotate..."), 0, m_quanta, TQ_SLOT(slotAnnotate()),ac, "annotate"); m_quanta->editTagAction = new TDEAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E, - m_quanta, TQT_SLOT( slotEditCurrentTag() ), + m_quanta, TQ_SLOT( slotEditCurrentTag() ), ac, "edit_current_tag" ); m_quanta->selectTagAreaAction = new TDEAction( i18n( "&Select Current Tag Area" ), 0, - m_quanta, TQT_SLOT( slotSelectTagArea() ), + m_quanta, TQ_SLOT( slotSelectTagArea() ), ac, "select_tag_area" ); new TDEAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J, - m_quanta, TQT_SLOT( slotExpandAbbreviation() ), + m_quanta, TQ_SLOT( slotExpandAbbreviation() ), ac, "expand_abbreviation" ); - new TDEAction(i18n("&Report Bug..."), 0, m_quanta, TQT_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta + new TDEAction(i18n("&Report Bug..."), 0, m_quanta, TQ_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta //Kate actions //Edit menu - KStdAction::undo(m_quanta, TQT_SLOT(slotUndo()), ac); - KStdAction::redo(m_quanta, TQT_SLOT(slotRedo()), ac); - KStdAction::cut(m_quanta, TQT_SLOT(slotCut()), ac); - KStdAction::copy(m_quanta, TQT_SLOT(slotCopy()), ac) ; - KStdAction::pasteText(m_quanta, TQT_SLOT(slotPaste()), ac); + KStdAction::undo(m_quanta, TQ_SLOT(slotUndo()), ac); + KStdAction::redo(m_quanta, TQ_SLOT(slotRedo()), ac); + KStdAction::cut(m_quanta, TQ_SLOT(slotCut()), ac); + KStdAction::copy(m_quanta, TQ_SLOT(slotCopy()), ac) ; + KStdAction::pasteText(m_quanta, TQ_SLOT(slotPaste()), ac); //help (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", m_quanta, - TQT_SLOT(slotHelpTip()), ac, "help_tip"); + TQ_SLOT(slotHelpTip()), ac, "help_tip"); // File actions // - KStdAction::openNew( m_quanta, TQT_SLOT( slotFileNew() ), ac); - KStdAction::open ( m_quanta, TQT_SLOT( slotFileOpen() ), ac, "file_open"); - (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs"); + KStdAction::openNew( m_quanta, TQ_SLOT( slotFileNew() ), ac); + KStdAction::open ( m_quanta, TQ_SLOT( slotFileOpen() ), ac, "file_open"); + (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQ_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs"); - m_quanta->fileRecent = KStdAction::openRecent(m_quanta, TQT_SLOT(slotFileOpenRecent(const KURL&)), + m_quanta->fileRecent = KStdAction::openRecent(m_quanta, TQ_SLOT(slotFileOpenRecent(const KURL&)), ac, "file_open_recent"); m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent")); - connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), m_quanta, TQT_SLOT(slotFileOpen())); + connect(m_quanta->fileRecent, TQ_SIGNAL(activated()), m_quanta, TQ_SLOT(slotFileOpen())); (void) new TDEAction( i18n( "Close All" ), 0, m_quanta, - TQT_SLOT( slotFileCloseAll() ), + TQ_SLOT( slotFileCloseAll() ), ac, "file_close_all" ); - m_quanta->saveAction = KStdAction::save(m_quanta, TQT_SLOT( slotFileSave() ), ac); + m_quanta->saveAction = KStdAction::save(m_quanta, TQ_SLOT( slotFileSave() ), ac); - KStdAction::saveAs( m_quanta, TQT_SLOT( slotFileSaveAs() ), ac ); + KStdAction::saveAs( m_quanta, TQ_SLOT( slotFileSaveAs() ), ac ); m_quanta->saveAllAction = new TDEAction( i18n( "Save All..." ), "save_all", SHIFT+TDEStdAccel::shortcut(TDEStdAccel::Save).keyCodeQt(), - m_quanta, TQT_SLOT( slotFileSaveAll() ), + m_quanta, TQ_SLOT( slotFileSaveAll() ), ac, "file_save_all" ); (void) new TDEAction(i18n("Reloa&d"), "document-revert", SHIFT+Key_F5, m_quanta, - TQT_SLOT(slotFileReload()), ac, "file_reload"); + TQ_SLOT(slotFileReload()), ac, "file_reload"); // (void) new TDEAction(i18n("Reload All "), 0, 0, m_quanta, -// TQT_SLOT(slotFileReloadAll()), ac, "file_reload_all"); +// TQ_SLOT(slotFileReloadAll()), ac, "file_reload_all"); (void) new TDEAction( i18n( "Save as Local Template..." ), 0, - m_quanta, TQT_SLOT( slotFileSaveAsLocalTemplate() ), + m_quanta, TQ_SLOT( slotFileSaveAsLocalTemplate() ), ac, "save_local_template" ); (void) new TDEAction( i18n( "Save Selection to Local Template File..." ), 0, - m_quanta, TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ), + m_quanta, TQ_SLOT( slotFileSaveSelectionAsLocalTemplate() ), ac, "save_selection_local_template" ); - KStdAction::quit( m_quanta, TQT_SLOT( slotFileQuit() ), ac ); + KStdAction::quit( m_quanta, TQ_SLOT( slotFileQuit() ), ac ); // Edit actions (void) new TDEAction( i18n( "Find in Files..." ), SmallIcon("filefind"), CTRL+ALT+Key_F, - m_quanta, TQT_SLOT( slotEditFindInFiles() ), + m_quanta, TQ_SLOT( slotEditFindInFiles() ), ac, "find_in_files" ); TDEAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation"); @@ -787,57 +787,57 @@ void QuantaInit::initActions() // Tool actions (void) new TDEAction( i18n( "&Context Help..." ), CTRL+Key_H, - m_quanta, TQT_SLOT( slotContextHelp() ), + m_quanta, TQ_SLOT( slotContextHelp() ), ac, "context_help" ); (void) new TDEAction( i18n( "Tag &Attributes..." ), ALT+Key_Down, - m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ), + m_quanta->m_doc, TQ_SLOT( slotAttribPopup() ), ac, "tag_attributes" ); (void) new TDEAction( i18n( "&Change the DTD..." ), 0, - m_quanta, TQT_SLOT( slotChangeDTD() ), + m_quanta, TQ_SLOT( slotChangeDTD() ), ac, "change_dtd" ); (void) new TDEAction( i18n( "&Edit DTD Settings..." ), 0, - m_quanta, TQT_SLOT( slotEditDTD() ), + m_quanta, TQ_SLOT( slotEditDTD() ), ac, "edit_dtd" ); (void) new TDEAction( i18n( "&Load && Convert DTD..." ), 0, - DTDs::ref(), TQT_SLOT( slotLoadDTD() ), + DTDs::ref(), TQ_SLOT( slotLoadDTD() ), ac, "load_dtd" ); (void) new TDEAction( i18n( "Load DTD E&ntities..." ), 0, - DTDs::ref(), TQT_SLOT( slotLoadEntities() ), + DTDs::ref(), TQ_SLOT( slotLoadEntities() ), ac, "load_entities" ); (void) new TDEAction( i18n( "Load DTD &Package (DTEP)..." ), 0, - m_quanta, TQT_SLOT( slotLoadDTEP() ), + m_quanta, TQ_SLOT( slotLoadDTEP() ), ac, "load_dtep" ); (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail-send", 0, - m_quanta, TQT_SLOT( slotEmailDTEP() ), + m_quanta, TQ_SLOT( slotEmailDTEP() ), ac, "send_dtep" ); (void) new TDEAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0, - m_quanta, TQT_SLOT( slotDownloadDTEP() ), + m_quanta, TQ_SLOT( slotDownloadDTEP() ), ac, "download_dtep" ); (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0, - m_quanta, TQT_SLOT( slotUploadDTEP() ), + m_quanta, TQ_SLOT( slotUploadDTEP() ), ac, "upload_dtep" ); /* (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), 0, - m_quanta, TQT_SLOT( slotUploadDTEP() ), + m_quanta, TQ_SLOT( slotUploadDTEP() ), ac, "send_dtep" ); */ (void) new TDEAction( i18n( "&Document Properties" ), 0, - m_quanta, TQT_SLOT( slotDocumentProperties() ), + m_quanta, TQ_SLOT( slotDocumentProperties() ), ac, "tools_document_properties" ); (void) new TDEAction ( i18n ("F&ormat XML Code"), 0, - m_quanta, TQT_SLOT( slotCodeFormatting() ), + m_quanta, TQ_SLOT( slotCodeFormatting() ), ac, "tools_code_formatting"); (void) new TDEAction( i18n( "&Convert Tag && Attribute Case..."), 0, - m_quanta, TQT_SLOT(slotConvertCase()), + m_quanta, TQ_SLOT(slotConvertCase()), ac, "tools_change_case"); // View actions @@ -845,19 +845,19 @@ void QuantaInit::initActions() m_quanta->showSourceAction = new TDEToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9, - m_quanta, TQT_SLOT( slotShowSourceEditor()), + m_quanta, TQ_SLOT( slotShowSourceEditor()), ac, "show_quanta_editor"); m_quanta->showSourceAction->setExclusiveGroup("view"); m_quanta->showVPLAction = new TDEToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9, - m_quanta, TQT_SLOT( slotShowVPLOnly() ), + m_quanta, TQ_SLOT( slotShowVPLOnly() ), ac, "show_kafka_view"); m_quanta->showVPLAction->setExclusiveGroup("view"); m_quanta->showVPLSourceAction = new TDEToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9, - m_quanta, TQT_SLOT( slotShowVPLAndSourceEditor() ), + m_quanta, TQ_SLOT( slotShowVPLAndSourceEditor() ), ac, "show_kafka_and_quanta"); m_quanta->showVPLSourceAction->setExclusiveGroup("view"); /**kafkaSelectAction = new TDESelectAction(i18n("Main &View"), 0, ac,"show_kafka"); @@ -866,73 +866,73 @@ void QuantaInit::initActions() list2.append(i18n("&VPL Editor (experimental)")); list2.append(i18n("&Both Editors")); kafkaSelectAction->setItems(list2); - connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), m_quanta, TQT_SLOT(slotShowKafkaPartl(int)));*/ + connect(kafkaSelectAction, TQ_SIGNAL(activated(int)), m_quanta, TQ_SLOT(slotShowKafkaPartl(int)));*/ (void) new TDEAction( i18n( "&Reload Preview" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload).keyCodeQt(), - m_quanta, TQT_SLOT(slotRepaintPreview()), + m_quanta, TQ_SLOT(slotRepaintPreview()), ac, "reload" ); (void) new TDEAction( i18n( "&Previous File" ), "1leftarrow", TDEStdAccel::back(), - m_quanta, TQT_SLOT( slotBack() ), + m_quanta, TQ_SLOT( slotBack() ), ac, "previous_file" ); (void) new TDEAction( i18n( "&Next File" ), "1rightarrow", TDEStdAccel::forward(), - m_quanta, TQT_SLOT( slotForward() ), + m_quanta, TQ_SLOT( slotForward() ), ac, "next_file" ); // Options actions // (void) new TDEAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0, - m_quanta, TQT_SLOT( slotOptionsConfigureActions() ), + m_quanta, TQ_SLOT( slotOptionsConfigureActions() ), ac, "configure_actions" ); - KStdAction::showMenubar(m_quanta, TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); - KStdAction::keyBindings(m_quanta, TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); - KStdAction::configureToolbars(m_quanta, TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); - KStdAction::preferences(m_quanta, TQT_SLOT( slotOptions() ), ac, "general_options"); - new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQT_SLOT(slotPreviewOptions()), ac, "preview_options"); + KStdAction::showMenubar(m_quanta, TQ_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); + KStdAction::keyBindings(m_quanta, TQ_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); + KStdAction::configureToolbars(m_quanta, TQ_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); + KStdAction::preferences(m_quanta, TQ_SLOT( slotOptions() ), ac, "general_options"); + new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQ_SLOT(slotPreviewOptions()), ac, "preview_options"); // Toolbars actions m_quanta->projectToolbarFiles = new TDERecentFilesAction(i18n("Load &Project Toolbar"),0, - m_quanta, TQT_SLOT(slotLoadToolbarFile(const KURL&)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL&)), ac, "toolbars_load_project"); - new TDEAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global"); - new TDEAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotLoadToolbar()), ac, "toolbars_load_user"); - new TDEAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local"); - new TDEAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQT_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project"); - new TDEAction(i18n("&New User Toolbar..."), 0, m_quanta, TQT_SLOT(slotAddToolbar()), ac, "toolbars_add"); - new TDEAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRemoveToolbar()), ac, "toolbars_remove"); - new TDEAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQT_SLOT(slotRenameToolbar()), ac, "toolbars_rename"); - new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, m_quanta, TQT_SLOT(slotSendToolbar()), ac, "toolbars_send"); - new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotUploadToolbar()), ac, "toolbars_upload" ); - new TDEAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQT_SLOT(slotDownloadToolbar()), ac, "toolbars_download" ); + new TDEAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQ_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global"); + new TDEAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQ_SLOT(slotLoadToolbar()), ac, "toolbars_load_user"); + new TDEAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQ_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local"); + new TDEAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQ_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project"); + new TDEAction(i18n("&New User Toolbar..."), 0, m_quanta, TQ_SLOT(slotAddToolbar()), ac, "toolbars_add"); + new TDEAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQ_SLOT(slotRemoveToolbar()), ac, "toolbars_remove"); + new TDEAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQ_SLOT(slotRenameToolbar()), ac, "toolbars_rename"); + new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, m_quanta, TQ_SLOT(slotSendToolbar()), ac, "toolbars_send"); + new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQ_SLOT(slotUploadToolbar()), ac, "toolbars_upload" ); + new TDEAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQ_SLOT(slotDownloadToolbar()), ac, "toolbars_download" ); TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, ac, "smart_tag_insertion"); - connect(toggle, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotSmartTagInsertion())); + connect(toggle, TQ_SIGNAL(toggled(bool)), m_quanta, TQ_SLOT(slotSmartTagInsertion())); m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, ac, "view_dtd_toolbar"); - connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), m_quanta, TQT_SLOT(slotToggleDTDToolbar(bool))); + connect(m_quanta->showDTDToolbar, TQ_SIGNAL(toggled(bool)), m_quanta, TQ_SLOT(slotToggleDTDToolbar(bool))); m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar")); new TDEAction(i18n("Complete Text"), CTRL+Key_Space, - m_quanta, TQT_SLOT(slotShowCompletion()), ac,"show_completion"); + m_quanta, TQ_SLOT(slotShowCompletion()), ac,"show_completion"); new TDEAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space, - m_quanta, TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); + m_quanta, TQ_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); - KStdAction::back(m_quanta, TQT_SLOT( slotBack() ), ac, "w_back"); - KStdAction::forward(m_quanta, TQT_SLOT( slotForward() ), ac, "w_forward"); + KStdAction::back(m_quanta, TQ_SLOT( slotBack() ), ac, "w_back"); + KStdAction::forward(m_quanta, TQ_SLOT( slotForward() ), ac, "w_forward"); - new TDEAction(i18n("Open File: none"), 0, m_quanta, TQT_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor"); - new TDEAction(i18n("Upload..."), 0, m_quanta, TQT_SLOT(slotUploadFile()), ac, "upload_file"); - new TDEAction(i18n("Delete File"), 0, m_quanta, TQT_SLOT(slotDeleteFile()), ac, "delete_file"); + new TDEAction(i18n("Open File: none"), 0, m_quanta, TQ_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor"); + new TDEAction(i18n("Upload..."), 0, m_quanta, TQ_SLOT(slotUploadFile()), ac, "upload_file"); + new TDEAction(i18n("Delete File"), 0, m_quanta, TQ_SLOT(slotDeleteFile()), ac, "delete_file"); TQString ss = i18n("Upload Opened Project Files..."); -/* new TDEAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQT_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */ +/* new TDEAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQ_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */ TQString error; int el, ec; @@ -993,16 +993,16 @@ void QuantaInit::initActions() // create the preview action m_quanta->showPreviewAction = new TDEToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6, - m_quanta, TQT_SLOT( slotToggleShowPreview() ), + m_quanta, TQ_SLOT( slotToggleShowPreview() ), ac, "show_preview" ); TDEAction *act = new TDEAction( i18n( "Preview Without Frames" ), "", 0, - m_quanta, TQT_SLOT(slotShowNoFramesPreview()), + m_quanta, TQ_SLOT(slotShowNoFramesPreview()), ac, "show_preview_no_frames" ); act->plug(m_quanta->showPreviewAction->popupMenu()); act = new TDEAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12, - m_quanta, TQT_SLOT( slotViewInKFM() ), + m_quanta, TQ_SLOT( slotViewInKFM() ), ac, "view_with_konqueror" ); act->plug(m_quanta->showPreviewAction->popupMenu()); @@ -1024,62 +1024,62 @@ void QuantaInit::initActions() act->plug(m_quanta->showPreviewAction->popupMenu()); act = new TDEAction( i18n( "View with L&ynx" ), "terminal", 0, - m_quanta, TQT_SLOT( slotViewInLynx() ), + m_quanta, TQ_SLOT( slotViewInLynx() ), ac, "view_with_lynx" ); act->plug(m_quanta->showPreviewAction->popupMenu()); (void) new TDEAction( i18n( "Table Editor..." ), "quick_table", 0, - m_quanta, TQT_SLOT( slotTagEditTable() ), + m_quanta, TQ_SLOT( slotTagEditTable() ), ac, "tag_edit_table" ); (void) new TDEAction( i18n( "Quick List..." ), "quick_list", 0, - m_quanta, TQT_SLOT( slotTagQuickList() ), + m_quanta, TQ_SLOT( slotTagQuickList() ), ac, "tag_quick_list" ); (void) new TDEAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C, - m_quanta, TQT_SLOT( slotTagColor() ), + m_quanta, TQ_SLOT( slotTagColor() ), ac, "tag_color" ); (void) new TDEAction( i18n( "Email..." ), "tag_mail", 0, - m_quanta, TQT_SLOT( slotTagMail() ), + m_quanta, TQ_SLOT( slotTagMail() ), ac, "tag_mail" ); (void) new TDEAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T, - m_quanta, TQT_SLOT( slotTagMisc() ), + m_quanta, TQ_SLOT( slotTagMisc() ), ac, "tag_misc" ); (void) new TDEAction( i18n( "Frame Wizard..." ), "frame", 0, - m_quanta, TQT_SLOT( slotFrameWizard() ), + m_quanta, TQ_SLOT( slotFrameWizard() ), ac, "tag_frame_wizard" ); (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "edit-paste", 0, - m_quanta, TQT_SLOT( slotPasteHTMLQuoted() ), + m_quanta, TQ_SLOT( slotPasteHTMLQuoted() ), ac, "edit_paste_html_quoted" ); (void) new TDEAction( i18n( "Paste &URL Encoded" ), "edit-paste", 0, - m_quanta, TQT_SLOT( slotPasteURLEncoded() ), + m_quanta, TQ_SLOT( slotPasteURLEncoded() ), ac, "edit_paste_url_encoded" ); (void) new TDEAction( i18n( "Insert CSS..." ),"css", 0, - m_quanta, TQT_SLOT( slotInsertCSS() ), + m_quanta, TQ_SLOT( slotInsertCSS() ), ac, "insert_css" ); // special-character combo TDEAction* char_action = new TDEAction( i18n( "Insert Special Character" ), "charset", 0, ac, "insert_char" ); - connect( char_action, TQT_SIGNAL(activated()), - m_quanta, TQT_SLOT(slotInsertChar()) ); + connect( char_action, TQ_SIGNAL(activated()), + m_quanta, TQ_SLOT(slotInsertChar()) ); - connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta->doc(), TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(ViewManager::ref(), TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(m_quanta)); m_bookmarks->createActions(ac); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQ_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); } /** Initialize the plugin architecture. */ @@ -1089,10 +1089,10 @@ void QuantaInit::initPlugins() m_quanta->m_pluginInterface = QuantaPluginInterface::ref(m_quanta); - connect(m_quanta->m_pluginInterface, TQT_SIGNAL(hideSplash()), - m_quanta, TQT_SLOT(slotHideSplash())); - connect(m_quanta->m_pluginInterface, TQT_SIGNAL(statusMsg(const TQString &)), - m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(m_quanta->m_pluginInterface, TQ_SIGNAL(hideSplash()), + m_quanta, TQ_SLOT(slotHideSplash())); + connect(m_quanta->m_pluginInterface, TQ_SIGNAL(statusMsg(const TQString &)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); m_quanta->m_pluginInterface->readConfig(); if (!m_quanta->m_pluginInterface->pluginAvailable("TDEFileReplace")) @@ -1276,12 +1276,12 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) TDEProcess *execCommand = new TDEProcess(); *(execCommand) << TQStringList::split(" ",cmd); - connect(execCommand, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - m_quanta, TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - m_quanta, TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(processExited(TDEProcess*)), - m_quanta, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(execCommand, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + m_quanta, TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(execCommand, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + m_quanta, TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(execCommand, TQ_SIGNAL(processExited(TDEProcess*)), + m_quanta, TQ_SLOT(slotProcessExited(TDEProcess*))); if (!execCommand->start(TDEProcess::NotifyOnExit,TDEProcess::All)) { @@ -1291,8 +1291,8 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) { //To avoid lock-ups, start a timer. TQTimer *timer = new TQTimer(m_quanta); - connect(timer, TQT_SIGNAL(timeout()), - m_quanta, TQT_SLOT(slotProcessTimeout())); + connect(timer, TQ_SIGNAL(timeout()), + m_quanta, TQ_SLOT(slotProcessTimeout())); timer->start(180*1000, true); QExtFileInfo internalFileInfo; m_quanta->m_loopStarted = true; @@ -1487,10 +1487,10 @@ void QuantaInit::checkRuntimeDependencies() } else { CVSService::ref(m_quanta->actionCollection())->setAppId(appId); - connect(CVSService::ref(), TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); - connect(CVSService::ref(), TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); - //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)), m_quanta, TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(CVSService::ref(), TQ_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQ_SLOT(clear())); + connect(CVSService::ref(), TQ_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&, bool))); + connect(CVSService::ref(), TQ_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQ_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); + //connect(CVSService::ref(), TQ_SIGNAL(statusMsg(const TQString &)), m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); m_quanta->fTab->plugCVSMenu(); pTab->plugCVSMenu(); } diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 354cb464..b77e2341 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -82,7 +82,7 @@ QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); - connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( attribMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); } QuantaDoc::~QuantaDoc() @@ -175,10 +175,10 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, { if (encoding.isEmpty()) encoding = quantaApp->defaultEncoding(); - w->disconnect(TQT_SIGNAL(openingFailed(const KURL&))); - connect(w, TQT_SIGNAL(openingFailed(const KURL&)), this, TQT_SLOT(slotOpeningFailed(const KURL&))); - w->disconnect(TQT_SIGNAL(openingCompleted(const KURL&))); - connect(w, TQT_SIGNAL(openingCompleted(const KURL&)), this, TQT_SLOT(slotOpeningCompleted(const KURL&))); + w->disconnect(TQ_SIGNAL(openingFailed(const KURL&))); + connect(w, TQ_SIGNAL(openingFailed(const KURL&)), this, TQ_SLOT(slotOpeningFailed(const KURL&))); + w->disconnect(TQ_SIGNAL(openingCompleted(const KURL&))); + connect(w, TQ_SIGNAL(openingCompleted(const KURL&)), this, TQ_SLOT(slotOpeningCompleted(const KURL&))); w->open(url, encoding); quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol)); } @@ -302,7 +302,7 @@ void QuantaDoc::slotAttribPopup() popUpMenu->setItemEnabled( menuId , false ); } } - connect( popUpMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( popUpMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); attribMenu->insertItem(*it, popUpMenu); } @@ -367,7 +367,7 @@ void QuantaDoc::slotInsertAttrib( int id ) delete attribMenu; attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); - connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( attribMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); } } diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 8003ce62..8e867d9a 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -86,8 +86,8 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti { setMDICaption(caption); //Connect the VPL update timers - connect(&m_sourceUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(sourceUpdateTimerTimeout())); - connect(&m_VPLUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(VPLUpdateTimerTimeout())); + connect(&m_sourceUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(sourceUpdateTimerTimeout())); + connect(&m_VPLUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(VPLUpdateTimerTimeout())); //create the source and VPL holding widgets m_documentArea = new TQWidget(this); @@ -186,18 +186,18 @@ void QuantaView::addDocument(Document *document) if (!document) return; m_document = document; - connect(m_document, TQT_SIGNAL(editorGotFocus()), this, TQT_SLOT(slotSourceGetFocus())); - connect(m_document->view(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SIGNAL(cursorPositionChanged())); + connect(m_document, TQ_SIGNAL(editorGotFocus()), this, TQ_SLOT(slotSourceGetFocus())); + connect(m_document->view(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SIGNAL(cursorPositionChanged())); m_kafkaDocument = KafkaDocument::ref(); - connect(m_kafkaDocument->getKafkaWidget(), TQT_SIGNAL(hasFocus(bool)), - this, TQT_SLOT(slotVPLGetFocus(bool))); - connect(m_kafkaDocument, TQT_SIGNAL(newCursorPosition(int,int)), - this, TQT_SLOT(slotSetCursorPositionInSource(int, int))); - connect(m_kafkaDocument, TQT_SIGNAL(loadingError(Node *)), - this, TQT_SLOT(slotVPLLoadingError(Node *))); + connect(m_kafkaDocument->getKafkaWidget(), TQ_SIGNAL(hasFocus(bool)), + this, TQ_SLOT(slotVPLGetFocus(bool))); + connect(m_kafkaDocument, TQ_SIGNAL(newCursorPosition(int,int)), + this, TQ_SLOT(slotSetCursorPositionInSource(int, int))); + connect(m_kafkaDocument, TQ_SIGNAL(loadingError(Node *)), + this, TQ_SLOT(slotVPLLoadingError(Node *))); m_kafkaReloadingEnabled = true; m_quantaReloadingEnabled = true; @@ -1134,8 +1134,8 @@ bool QuantaView::saveDocument(const KURL& url) { KTextEditor::Document *doc = m_document->doc(); m_eventLoopStarted = false; - connect(doc, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotSavingFailed(const TQString &))); - connect(doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSavingCompleted())); + connect(doc, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotSavingFailed(const TQString &))); + connect(doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSavingCompleted())); m_saveResult = m_document->saveAs(url); if (m_saveResult) { @@ -1144,8 +1144,8 @@ bool QuantaView::saveDocument(const KURL& url) m_eventLoopStarted = true; internalFileInfo.enter_loop(); } - disconnect(doc, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotSavingFailed(const TQString &))); - disconnect(doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSavingCompleted())); + disconnect(doc, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotSavingFailed(const TQString &))); + disconnect(doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSavingCompleted())); if (!m_saveResult) //there was an error while saving { if (oldURL.isLocalFile()) diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index c2717de4..2e70966b 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -71,20 +71,20 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, m_lastActiveEditorView = 0L; m_documentationView = 0L; m_tabPopup = new TDEPopupMenu(quantaApp); - m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(slotCloseView())); - m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs())); - m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll())); - m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReloadFile()), 0, RELOAD_ID); - m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID); - m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID); + m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQ_SLOT(slotCloseView())); + m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQ_SLOT(slotCloseOtherTabs())); + m_tabPopup->insertItem(i18n("Close &All"), this, TQ_SLOT(closeAll())); + m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReloadFile()), 0, RELOAD_ID); + m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQ_SLOT(slotUploadFile()), 0, UPLOAD_ID); + m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQ_SLOT(slotDeleteFile()), 0, DELETE_ID); m_tabPopup->insertSeparator(); m_fileListPopup = new TDEPopupMenu(quantaApp); - connect(m_fileListPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileListPopupAboutToShow())); - connect(m_fileListPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFileListPopupItemActivated(int))); + connect(m_fileListPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotFileListPopupAboutToShow())); + connect(m_fileListPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFileListPopupItemActivated(int))); m_bookmarks = new QuantaBookmarks(this, QuantaBookmarks::Position, true); m_bookmarksMenu = new TDEPopupMenu(quantaApp); m_bookmarks->setBookmarksMenu(m_bookmarksMenu); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQ_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); m_bookmarksMenuId = m_tabPopup->insertItem(SmallIconSet("bookmark"), i18n("&Bookmarks"), m_bookmarksMenu); m_tabPopup->insertItem(i18n("&Switch To"), m_fileListPopup); m_contextView = 0L; @@ -96,14 +96,14 @@ QuantaView* ViewManager::createView(const TQString &caption) { QuantaView *view = new QuantaView(quantaApp, "", caption); quantaApp->addWindow(view); - connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn())); - connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn())); - connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); - connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus())); - disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); - connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*))); - connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(view, TQ_SIGNAL(cursorPositionChanged()), quantaApp, TQ_SLOT(slotNewLineColumn())); + connect(view, TQ_SIGNAL(title(const TQString &)), quantaApp, TQ_SLOT(slotNewLineColumn())); + connect(view, TQ_SIGNAL(dragInsert(TQDropEvent*)), this, TQ_SIGNAL(dragInsert(TQDropEvent *))); + connect(view, TQ_SIGNAL(hidePreview()), quantaApp, TQ_SLOT(slotChangePreviewStatus())); + disconnect(view, TQ_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); + connect(view, TQ_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQ_SLOT(slotCloseRequest(KMdiChildView*))); + connect(view, TQ_SIGNAL(documentClosed(const KURL&)), this, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(view, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); return view; } @@ -125,7 +125,7 @@ void ViewManager::createNewDocument() KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", view, "KTextEditor::Document"); #endif Document *w = new Document(doc, 0L); - connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); + connect(w, TQ_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQ_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); TQString encoding = quantaApp->defaultEncoding(); KTextEditor::EncodingInterface* encodingIf = dynamic_cast<KTextEditor::EncodingInterface*>(doc); if (encodingIf) @@ -134,7 +134,7 @@ void ViewManager::createNewDocument() KTextEditor::View * v = w->view(); //[MB02] connect all kate views for drag and drop - connect(w->view(), TQT_SIGNAL(dropEventPass(TQDropEvent *)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); + connect(w->view(), TQ_SIGNAL(dropEventPass(TQDropEvent *)), this, TQ_SIGNAL(dragInsert(TQDropEvent *))); w->setUntitledUrl( fname ); KTextEditor::PopupMenuInterface* popupIf = dynamic_cast<KTextEditor::PopupMenuInterface*>(w->view()); @@ -143,7 +143,7 @@ void ViewManager::createNewDocument() quantaApp->setFocusProxy(w->view()); w->view()->setFocusPolicy(TQWidget::WheelFocus); - connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus())); + connect( v, TQ_SIGNAL(newStatus()), quantaApp, TQ_SLOT(slotNewStatus())); quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active view->addDocument(w); @@ -186,7 +186,7 @@ bool ViewManager::removeView(QuantaView *view, bool force, bool createNew) if (view == activeView()) ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); if (!createNew) - disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + disconnect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); quantaApp->closeWindow(view); if (createNew) { @@ -195,7 +195,7 @@ bool ViewManager::removeView(QuantaView *view, bool force, bool createNew) quantaApp->slotFileNew(); } } else - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); return true; } } @@ -484,8 +484,8 @@ bool ViewManager::closeAll(bool createNew) return false; //save aborted } } - disconnect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + disconnect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + disconnect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); for (childIt = children.begin(); childIt != children.end(); ++childIt) @@ -512,8 +512,8 @@ bool ViewManager::closeAll(bool createNew) } else { //actually this code should be never executed - connect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); view->activated(); emit filesClosed(false); return false; @@ -527,8 +527,8 @@ bool ViewManager::closeAll(bool createNew) } } } - connect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); if (createNew) { createNewDocument(); diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 6abdc5b7..e8929f84 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -306,29 +306,29 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) setFocusPolicy(TQWidget::ClickFocus); setShowFolderOpenPixmap(false); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotReturnPressed(TQListViewItem *))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotReturnPressed(TQListViewItem *))); - connect(this, TQT_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)), - this, TQT_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&))); + connect(this, TQ_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)), + this, TQ_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&))); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )), - this, TQT_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int ))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )), + this, TQ_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int ))); - connect(this, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(openFile(const KURL &)), - quantaApp, TQT_SLOT(slotFileOpen(const KURL &))); + connect(this, TQ_SIGNAL(openFile(const KURL &)), + quantaApp, TQ_SLOT(slotFileOpen(const KURL &))); - connect(this, TQT_SIGNAL(openImage(const KURL &)), - quantaApp, TQT_SLOT(slotImageOpen(const KURL &))); + connect(this, TQ_SIGNAL(openImage(const KURL &)), + quantaApp, TQ_SLOT(slotImageOpen(const KURL &))); - connect(this, TQT_SIGNAL(closeFile(const KURL &)), - quantaApp, TQT_SLOT(slotFileClose(const KURL &))); + connect(this, TQ_SIGNAL(closeFile(const KURL &)), + quantaApp, TQ_SLOT(slotFileClose(const KURL &))); - connect(this, TQT_SIGNAL(insertTag(const KURL &, DirInfo)), - quantaApp, TQT_SLOT(slotInsertTag(const KURL &, DirInfo))); + connect(this, TQ_SIGNAL(insertTag(const KURL &, DirInfo)), + quantaApp, TQ_SLOT(slotInsertTag(const KURL &, DirInfo))); } @@ -606,7 +606,7 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) for (it = offers.begin(); it != offers.end(); ++it) { TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data()); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenWithApplication())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenWithApplication())); action->plug(m_openWithMenu); m_openWithActions.append(action); } @@ -621,13 +621,13 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),TDEIcon::Small), it2.current()->name()); m_pluginIds[id] = it2.current(); } - connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int))); + connect(m_openWithMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenWithActivated(int))); m_openWithMenu->insertSeparator(); } - m_openWithMenu->insertItem(i18n("&Other..."), this, TQT_SLOT(slotOpenWith())); + m_openWithMenu->insertItem(i18n("&Other..."), this, TQ_SLOT(slotOpenWith())); m_openWithMenuId = menu->insertItem(i18n("Open &With"), m_openWithMenu, -1, position); } else - m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith()), 0, -1, position); + m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith()), 0, -1, position); } void BaseTreeView::slotInsertTag() @@ -740,7 +740,7 @@ void BaseTreeView::slotProperties() { fileInfoDlg = addFileInfoPage(propDlg); } - connect(propDlg, TQT_SIGNAL( applied() ), this, TQT_SLOT( slotPropertiesApplied()) ); + connect(propDlg, TQ_SIGNAL( applied() ), this, TQ_SLOT( slotPropertiesApplied()) ); propDlg->exec(); } @@ -915,11 +915,11 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil if (!job) return; - connect(job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotJobFinished(TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotJobFinished(TDEIO::Job *) ) ); progressBar->setTotalSteps(100); - connect(job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long)), - this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long))); + connect(job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long)), + this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long))); } diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index abe67424..a379b512 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -56,15 +56,15 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name ) slotRefreshTree(); setFocusPolicy(TQWidget::ClickFocus); - connect(this, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)) ); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect(this, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *)) ); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *))); m_contextMenu = new TDEPopupMenu(this); - m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQT_SLOT(slotReloadProjectDocs())); - m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQT_SIGNAL(downloadDoc())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQ_SLOT(slotReloadProjectDocs())); + m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQ_SIGNAL(downloadDoc())); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 444bbc0c..1884cc1b 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -87,49 +87,49 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); - createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(); - m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder())); - m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop())); - m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder())); + m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQ_SLOT(slotAddToTop())); + m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate())); m_folderMenu->insertItem(SmallIcon("application-x-zerosize"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); - m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQT_SLOT(slotChangeAlias())); - m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQ_SLOT(slotChangeAlias())); + m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_emptyMenu = new TDEPopupMenu(); - m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()), 0, -1 , 0); + m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder()), 0, -1 , 0); addColumn(i18n("Files Tree"), -1); addColumn(""); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); // generate top list of directories for (uint i = 0; i < topURLList.count(); i++) diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp index 48fd6b5e..2ccc770c 100644 --- a/quanta/treeviews/newtemplatedirdlg.cpp +++ b/quanta/treeviews/newtemplatedirdlg.cpp @@ -20,8 +20,8 @@ NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name) { setCaption(name); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } NewTemplateDirDlg::~NewTemplateDirDlg() diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index c07a7183..886bd511 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -122,62 +122,62 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_projectDir->root()->setEnabled(false); m_uploadStatusMenu = new TDEPopupMenu(this); - m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQT_SLOT(slotAlwaysUpload())); - m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQT_SLOT(slotNeverUpload())); - m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQT_SLOT(slotConfirmUpload())); - connect(m_uploadStatusMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUploadMenuAboutToShow())); + m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQ_SLOT(slotAlwaysUpload())); + m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQ_SLOT(slotNeverUpload())); + m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQ_SLOT(slotConfirmUpload())); + connect(m_uploadStatusMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUploadMenuAboutToShow())); m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQT_SLOT(slotOpen())); - m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar())); - m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQ_SLOT(slotOpen())); + m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQ_SLOT(slotLoadToolbar())); + m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL())); - m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQ_SLOT(slotUploadSingleURL())); + m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQ_SLOT(slotQuickUploadURL())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int))); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); - createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(this); m_folderMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL())); - m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL())); - m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); - m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQ_SLOT(slotUploadSingleURL())); + m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQ_SLOT(slotQuickUploadURL())); + m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate())); + m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int))); + m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus())); + m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQ_SLOT(slotChangeDocumentFolderStatus())); m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_projectMenu = new TDEPopupMenu(this); m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_projectMenu->insertSeparator(); - m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject())); - m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQT_SLOT(slotRescan())); - m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions())); - m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQ_SLOT(slotUploadProject())); + m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQ_SLOT(slotRescan())); + m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQ_SLOT(slotOptions())); + m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_projectMenu->insertSeparator(); m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); restoreLayout(kapp->config(), className()); // the restored size of the first column might be too large for the current content @@ -212,8 +212,8 @@ KFileTreeBranch* ProjectTreeView::newBranch(const KURL& url) setRootIsDecorated(false); } - connect(m_projectDir, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), - this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*))); + connect(m_projectDir, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), + this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*))); addBranch(m_projectDir); m_projectDir->urlList = m_projectFiles; // set list for filter if (!m_projectName.isEmpty()) diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 78dbd78e..de2e3430 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -84,23 +84,23 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) m_localDir->excludeFilterRx.setPattern(excludeString); m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQT_SLOT(slotProperties())); - m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQT_SLOT(slotRun())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQ_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQ_SLOT(slotRun())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(i18n("&Edit Script"), this, TQT_SLOT(slotEditScript())); - m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQT_SLOT(slotEditInQuanta())); - m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQT_SLOT(slotEditDescription())); + m_fileMenu->insertItem(i18n("&Edit Script"), this, TQ_SLOT(slotEditScript())); + m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQ_SLOT(slotEditInQuanta())); + m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQ_SLOT(slotEditDescription())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQT_SLOT(slotAssignAction())); - m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail())); - m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQT_SLOT(slotUploadScript())); + m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQ_SLOT(slotAssignAction())); + m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQ_SLOT(slotSendScriptInMail())); + m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQ_SLOT(slotUploadScript())); m_folderMenu = new TDEPopupMenu(this); - m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQT_SIGNAL(downloadScript())); + m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQ_SIGNAL(downloadScript())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); restoreLayout( kapp->config(), className() ); // the restored size of the first column might be too large for the current content diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 922ea03a..5f9a9747 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -100,37 +100,37 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & m_fileMenu = new TDEPopupMenu(); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); -// m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); +// m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(); -// m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); - m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); +// m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); + m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); addColumn(i18n("Upload Tree"), -1); addColumn(""); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(Project::ref(), TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), - this, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(Project::ref(), TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), + this, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); restoreLayout(m_config, "UploadTreeView"); // a fixed name only for the tooltip configuration // the restored size of the first column might be too large for the current content diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index f2b827cc..a03f13a3 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -95,43 +95,43 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) dtdMenu->insertItem(dtdList[i], i, -1); } - connect(dtdMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDTDChanged(int))); + connect(dtdMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDTDChanged(int))); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); emptyAreaMenu = new TDEPopupMenu(this); emptyAreaMenu->insertItem(i18n("Show Groups For"), dtdMenu); - emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQT_SLOT(slotReparseMenuItem())); + emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQ_SLOT(slotReparseMenuItem())); popupMenu = new TDEPopupMenu(this); popupMenu -> insertItem( i18n("Show Groups For"), dtdMenu); popupMenu -> insertSeparator(); - popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQT_SLOT(slotSelectTag())); - popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQT_SLOT(slotGotoClosingTag())); - openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQT_SLOT(slotOpenFile())); + popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQ_SLOT(slotSelectTag())); + popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQ_SLOT(slotGotoClosingTag())); + openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQ_SLOT(slotOpenFile())); popupMenu -> insertSeparator(); - popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQT_SLOT(slotOpenSubTree())); - popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQT_SLOT(slotCloseSubTree())); + popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQ_SLOT(slotOpenSubTree())); + popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQ_SLOT(slotCloseSubTree())); popupMenu -> insertSeparator(); #if 0 - popupMenu -> insertItem( i18n("Remove"),this ,TQT_SLOT(slotRemoveTags())); + popupMenu -> insertItem( i18n("Remove"),this ,TQ_SLOT(slotRemoveTags())); popupMenu -> insertSeparator(); #endif - popupMenu -> insertItem( SmallIcon("reload"), i18n("&Reparse"), this ,TQT_SLOT(slotReparseMenuItem())); - followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQT_SLOT(changeFollowCursor())); + popupMenu -> insertItem( SmallIcon("reload"), i18n("&Reparse"), this ,TQ_SLOT(slotReparseMenuItem())); + followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQ_SLOT(changeFollowCursor())); popupMenu -> setItemChecked ( followCursorId, followCursor() ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem *)), TQT_SLOT(slotExpanded(TQListViewItem *))); - connect(this, TQT_SIGNAL(collapsed(TQListViewItem *)), TQT_SLOT(slotCollapsed(TQListViewItem *))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem *)), TQ_SLOT(slotExpanded(TQListViewItem *))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem *)), TQ_SLOT(slotCollapsed(TQListViewItem *))); write = 0L; timer = new TQTime(); diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 556a2823..e42754c9 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -133,12 +133,12 @@ void ParentItem::showList(bool show) if (show) { comboBox->show(); - TQObject::connect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int))); + TQObject::connect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int))); } else { comboBox->hide(); - TQObject::disconnect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int))); + TQObject::disconnect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int))); } } @@ -156,7 +156,7 @@ AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, con m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); lin2 = new TQLineEdit( m_listView->viewport() ); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -169,7 +169,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons lin2 = new TQLineEdit( m_listView->viewport() ); lin2->setText(title); lin->setText(title2); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -183,7 +183,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons lin2 = new TQLineEdit( m_listView->viewport() ); lin2->setText(title); lin->setText(title2); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -292,7 +292,7 @@ AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanTrue); combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanFalse); combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeBoolItem::~AttributeBoolItem() @@ -331,7 +331,7 @@ AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* p urlRequester = new KURLRequester( m_listView->viewport() ); urlRequester->setMode(KFile::File | KFile::ExistingOnly ); urlRequester->hide(); - TQObject::connect( urlRequester, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( urlRequester, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeUrlItem::~AttributeUrlItem() @@ -409,7 +409,7 @@ AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* par combo->setEditable(true); } combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeListItem::~AttributeListItem() @@ -462,7 +462,7 @@ AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* p combo = new KColorCombo( m_listView->viewport() ); combo->setEditable(true); combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeColorItem::~AttributeColorItem() @@ -508,7 +508,7 @@ AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* p //combo->setEditable(true); m_se->hide(); - TQObject::connect( m_se->button(), TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( m_se->button(), TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeStyleItem::~AttributeStyleItem() diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index 335fafc6..4d74e548 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -106,8 +106,8 @@ DualEditableTree::DualEditableTree(TQWidget *parent, const char *name) curCol = 0; setFocusPolicy(TQWidget::ClickFocus); this->installEventFilter(this); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); } DualEditableTree::~DualEditableTree() @@ -367,8 +367,8 @@ void TagAttributeTree::setCurrentNode(Node *node) } } - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(slotCollapsed(TQListViewItem*))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(slotExpanded(TQListViewItem*))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(slotCollapsed(TQListViewItem*))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(slotExpanded(TQListViewItem*))); } void TagAttributeTree::editorContentChanged() @@ -423,7 +423,7 @@ void TagAttributeTree::slotParentSelected(int index) if (m_parentItem) { m_newNode = m_parentItem->node(index); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCurrentNode())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCurrentNode())); } } @@ -481,9 +481,9 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char widgetLayout->addWidget( deleteAll, 0, 3 ); clearWState( WState_Polished ); - connect(attrTree, TQT_SIGNAL(newNodeSelected(Node *)), this, TQT_SLOT(NodeSelected(Node *))); - connect(deleteTag, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteNode())); - connect(deleteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSubTree())); + connect(attrTree, TQ_SIGNAL(newNodeSelected(Node *)), this, TQ_SLOT(NodeSelected(Node *))); + connect(deleteTag, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteNode())); + connect(deleteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSubTree())); } EnhancedTagAttributeTree::~EnhancedTagAttributeTree() diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 2fa9b7e1..463a56e4 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -143,35 +143,35 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) m_fileMenu = new TDEPopupMenu(this); - m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert())); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); - m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); - m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQ_SLOT(slotInsert())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail())); + m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate())); + m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(this); - m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir())); - m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); - m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); - m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); - m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQ_SLOT(slotNewDir())); + m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail())); + m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate())); + m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate())); + m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_emptyAreaMenu = new TDEPopupMenu(this); - m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); + m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate())); addColumn(i18n("Templates"), -1); addColumn(i18n("Group"), -1); @@ -182,11 +182,11 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) localURL.setPath(locateLocal("data", resourceDir + "templates/")); newBranch(localURL); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); setAcceptDrops(true); setSelectionMode(TQListView::Single); @@ -629,7 +629,7 @@ void TemplatesTreeView::slotProperties() } topLayout->addWidget( m_quantaProperties ); - connect( propDlg, TQT_SIGNAL( applied() ), this , TQT_SLOT( slotPropertiesApplied()) ); + connect( propDlg, TQ_SIGNAL( applied() ), this , TQ_SLOT( slotPropertiesApplied()) ); TQString name = url.path() + TMPL; TDEConfig config(name); @@ -862,7 +862,7 @@ void TemplatesTreeView::slotPaste() if ( ! currentKFileTreeViewItem()->isDir() ) url.setFileName(""); // don't paste on files but in dirs TDEIO::Job *job = TDEIO::copy( list, url); - connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); } } @@ -880,11 +880,11 @@ void TemplatesTreeView::slotDelete() if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { TDEIO::Job *job = TDEIO::del(url); - connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); url.setFileName(url.fileName()+ TMPL); if ( TQFileInfo(url.path()).exists() ) { TDEIO::Job *job2 = TDEIO::del(url); - connect( job2, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job2, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); }; } } diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 4761b25f..da77840e 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -39,11 +39,11 @@ UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : setFocusPolicy(TQWidget::ClickFocus); - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectFile())); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectFile())); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQT_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQ_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int ))); } UploadTreeView::~UploadTreeView() diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp index a00e9c75..56d5027d 100644 --- a/quanta/utility/newstuff.cpp +++ b/quanta/utility/newstuff.cpp @@ -56,7 +56,7 @@ void QNewDTEPStuff::installResource() QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget) :TDENewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); + connect(this, TQ_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQ_SLOT(slotLoadToolbarFile(const KURL&))); } @@ -83,7 +83,7 @@ void QNewToolbarStuff::installResource() QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget) :TDENewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&))); + connect(this, TQ_SIGNAL(openFile(const KURL&)), parentWidget, TQ_SLOT(slotFileOpen(const KURL&))); } diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index c5d57a56..87e953fb 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -86,33 +86,33 @@ void QuantaBookmarks::init(TDEActionCollection* ac) { m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, - this, TQT_SLOT(toggleBookmark()), + this, TQ_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, - this, TQT_SLOT(clearBookmarks()), + this, TQ_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); m_goNext = new TDEAction( i18n("Next Bookmark"), "go-next", ALT + Key_PageDown, - this, TQT_SLOT(goNext()), + this, TQ_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp, - this, TQT_SLOT(goPrevious()), + this, TQ_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow())); - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) ); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow())); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) ); marksChanged (); } @@ -234,7 +234,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse if ( next || prev ) menu.insertSeparator( idx ); } - connect(&menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(gotoLineNumber(int))); + connect(&menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(gotoLineNumber(int))); } return insertedItems; } diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 1ea54048..71eb0e41 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -93,15 +93,15 @@ TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bo m_file = 0L; loopStarted = false; #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) - connect(this, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), - TQT_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); + connect(this, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + TQ_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); #else - connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated())); + connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActionActivated())); #endif - connect(this, TQT_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQT_SIGNAL(showMessage(const TQString&, bool))); - connect(this, TQT_SIGNAL(clearMessages()), m_parentMainWindow, TQT_SIGNAL(clearMessages())); - connect(this, TQT_SIGNAL(showMessagesView()), m_parentMainWindow, TQT_SLOT(slotShowMessagesView())); - connect(this, TQT_SIGNAL(createNewFile()), m_parentMainWindow, TQT_SLOT(slotFileNew())); + connect(this, TQ_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQ_SIGNAL(showMessage(const TQString&, bool))); + connect(this, TQ_SIGNAL(clearMessages()), m_parentMainWindow, TQ_SIGNAL(clearMessages())); + connect(this, TQ_SIGNAL(showMessagesView()), m_parentMainWindow, TQ_SLOT(slotShowMessagesView())); + connect(this, TQ_SIGNAL(createNewFile()), m_parentMainWindow, TQ_SLOT(slotFileNew())); } TagAction::~TagAction() @@ -434,12 +434,12 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But firstOutput = true; firstError = true; - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this, - TQT_SLOT( slotProcessExited(TDEProcess*))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this, + TQ_SLOT( slotProcessExited(TDEProcess*))); @@ -688,12 +688,12 @@ bool TagAction::slotActionActivated() firstOutput = true; firstError = true; - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this, - TQT_SLOT( slotProcessExited(TDEProcess*))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this, + TQ_SLOT( slotProcessExited(TDEProcess*))); @@ -991,7 +991,7 @@ void TagAction::execute(bool blocking) { //To avoid lock-ups, start a timer. timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); timer->start(180*1000, true); QExtFileInfo internalFileInfo; loopStarted = true; diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 2eb9bf68..72c764ea 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -102,17 +102,17 @@ void TagActionSet::initActions(TQWidget* /*parent*/) const char *actionName = "apply_source_indentation"; new TDEAction(i18n("Apply Source Indentation"), 0, this, - TQT_SLOT(slotApplySourceIndentation()), + TQ_SLOT(slotApplySourceIndentation()), ac, actionName); actionName = "copy_div_element"; new TDEAction(i18n("Copy DIV Area"), 0, this, - TQT_SLOT(slotCopyDivElement()), + TQ_SLOT(slotCopyDivElement()), ac, actionName); actionName = "cut_div_element"; new TDEAction(i18n("Cut DIV Area"), 0, this, - TQT_SLOT(slotCutDivElement()), + TQ_SLOT(slotCutDivElement()), ac, actionName); } @@ -299,31 +299,31 @@ void TableTagActionSet::initActions(TQWidget* parent) const char *actionName = "insert_table"; //m_actionNames += actionName; new TDEAction(i18n("Table..."), 0, this, - TQT_SLOT(slotInsertTable()), + TQ_SLOT(slotInsertTable()), ac, actionName); actionName = "insert_row_above"; //m_actionNames += actionName; new TDEAction(i18n("Row Above"), 0, this, - TQT_SLOT(slotInsertRowAbove()), + TQ_SLOT(slotInsertRowAbove()), ac, actionName); actionName = "insert_row_below"; //m_actionNames += actionName; new TDEAction(i18n("Row Below"), 0, this, - TQT_SLOT(slotInsertRowBelow()), + TQ_SLOT(slotInsertRowBelow()), ac, actionName); actionName = "insert_column_left"; //m_actionNames += actionName; new TDEAction(i18n("Column Left"), 0, this, - TQT_SLOT(slotInsertColumnLeft()), + TQ_SLOT(slotInsertColumnLeft()), ac, actionName); actionName = "insert_column_right"; //m_actionNames += actionName; new TDEAction(i18n("Column Right"), 0, this, - TQT_SLOT(slotInsertColumnRight()), + TQ_SLOT(slotInsertColumnRight()), ac, actionName); // Remove___________________________________________________________________________ @@ -331,31 +331,31 @@ void TableTagActionSet::initActions(TQWidget* parent) actionName = "remove_table"; //m_actionNames += actionName; new TDEAction(i18n("Table"), 0, this, - TQT_SLOT(slotRemoveTable()), + TQ_SLOT(slotRemoveTable()), ac, actionName); actionName = "remove_rows"; //m_actionNames += actionName; new TDEAction(i18n("Row(s)"), 0, this, - TQT_SLOT(slotRemoveRows()), + TQ_SLOT(slotRemoveRows()), ac, actionName); actionName = "remove_columns"; //m_actionNames += actionName; new TDEAction(i18n("Column(s)"), 0, this, - TQT_SLOT(slotRemoveColumns()), + TQ_SLOT(slotRemoveColumns()), ac, actionName); actionName = "remove_cells"; //m_actionNames += actionName; new TDEAction(i18n("Cell(s)"), 0, this, - TQT_SLOT(slotRemoveCells()), + TQ_SLOT(slotRemoveCells()), ac, actionName); actionName = "remove_cells_content"; //m_actionNames += actionName; new TDEAction(i18n("Cell(s) Content"), 0, this, - TQT_SLOT(slotRemoveCellsContent()), + TQ_SLOT(slotRemoveCellsContent()), ac, actionName); // Merge___________________________________________________________________________ @@ -363,7 +363,7 @@ void TableTagActionSet::initActions(TQWidget* parent) actionName = "merge_selected_cells"; //m_actionNames += actionName; new TDEAction(i18n("Merge Selected Cells"), 0, this, - TQT_SLOT(slotMergeSelectedCells()), + TQ_SLOT(slotMergeSelectedCells()), ac, actionName); } diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 990b4372..e23145e3 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -43,23 +43,23 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags { m_popupMenu = new TDEPopupMenu(this); m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1); - m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction())); + m_popupMenu->insertItem(i18n("New Action..."), parent, TQ_SLOT(slotNewAction())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar())); - m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar())); - m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQ_SLOT(slotAddToolbar())); + m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQ_SLOT(slotRenameToolbar())); + m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQ_SLOT(slotEditToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), - parent, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(renameToolbar(const TQString&)), - parent, TQT_SLOT(slotRenameToolbar(const TQString&))); - connect(this, TQT_SIGNAL(editToolbar(const TQString&)), - parent, TQT_SLOT(slotConfigureToolbars(const TQString&))); - connect(this, TQT_SIGNAL(newAction()), - parent, TQT_SLOT(slotNewAction())); - connect(this, TQT_SIGNAL(addToolbar()), - parent, TQT_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), + parent, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(renameToolbar(const TQString&)), + parent, TQ_SLOT(slotRenameToolbar(const TQString&))); + connect(this, TQ_SIGNAL(editToolbar(const TQString&)), + parent, TQ_SLOT(slotConfigureToolbars(const TQString&))); + connect(this, TQ_SIGNAL(newAction()), + parent, TQ_SLOT(slotNewAction())); + connect(this, TQ_SIGNAL(addToolbar()), + parent, TQ_SLOT(slotAddToolbar())); TDEAcceleratorManager::setNoAccel(this); } @@ -235,8 +235,8 @@ QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_styl m_iconTextMenu->insertItem(i18n("Text Only"), 1); m_iconTextMenu->insertItem(i18n("Text Alongside Icons"), 2); m_iconTextMenu->insertItem(i18n("Text Under Icons"), 3); - connect(m_iconTextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIconTextChanged(int))); - connect(m_iconTextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotIconTextMenuAboutToShow())); + connect(m_iconTextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotIconTextChanged(int))); + connect(m_iconTextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotIconTextMenuAboutToShow())); setIconText(ToolbarTabWidget::ref()->iconText(), false); } @@ -306,7 +306,7 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) m_toolbarTab->tabUnderMouseLabel = m_toolbarTab->label(m_toolbarTab->currentPageIndex()); m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - " + i18n(m_toolbarTab->tabUnderMouseLabel.utf8())); - m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction())); + m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQ_SIGNAL(newAction())); TQObjectList* childrenList = queryList("TDEToolBarButton"); for (uint i = 0; i < childrenList->count(); i++) { @@ -317,18 +317,18 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) { currentActionName = w->textLabel(); TQString actionName = currentActionName; - m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); - m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction())); + m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQ_SLOT(slotRemoveAction())); + m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQ_SLOT(slotEditAction())); break; } } m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQT_SIGNAL(addToolbar())); - m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQT_SLOT(slotRemoveToolbar())); - m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQT_SLOT(slotRenameToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQ_SIGNAL(addToolbar())); + m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQ_SLOT(slotRemoveToolbar())); + m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQ_SLOT(slotRenameToolbar())); m_popupMenu->insertSeparator(); m_popupMenu->insertItem( i18n("Text Position"), m_iconTextMenu); - m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQT_SLOT(slotEditToolbar())); + m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQ_SLOT(slotEditToolbar())); } m_popupMenu->popup(p); } |