diff options
Diffstat (limited to 'tdeui')
125 files changed, 1230 insertions, 1230 deletions
diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp index 5fff4a0f1..2e7af38c3 100644 --- a/tdeui/kactivelabel.cpp +++ b/tdeui/kactivelabel.cpp @@ -47,12 +47,12 @@ void KActiveLabel::init() setFocusPolicy( TQWidget::TabFocus ); paletteChanged(); - connect(this, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(openLink(const TQString &))); + connect(this, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(openLink(const TQString &))); if (kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); } } diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index a730f179e..25a0b6847 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -43,10 +43,10 @@ KAnimWidget::KAnimWidget( const TQString& icons, int size, TQWidget *parent, : TQFrame( parent, name ), d( new KAnimWidgetPrivate ) { - connect( &d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimerUpdate())); + connect( &d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimerUpdate())); if (parent && parent->inherits( "TDEToolBar" )) - connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(updateIcons())); + connect(parent, TQ_SIGNAL(modechange()), this, TQ_SLOT(updateIcons())); d->loadingCompleted = false; d->size = size; diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 874aee4d4..dca2efc46 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -120,8 +120,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou // Configure email button m_configureEmail = new TQPushButton( i18n("Configure Email..."), parent ); - connect( m_configureEmail, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotConfigureEmail() ) ); + connect( m_configureEmail, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotConfigureEmail() ) ); glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, TQt::AlignTop|TQt::AlignRight ); // To @@ -152,7 +152,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou d->appcombo = new KComboBox( false, parent, "app"); TQWhatsThis::add( d->appcombo, qwtstr ); d->appcombo->insertStrList((const char**)packages); - connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int))); + connect(d->appcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(appChanged(int))); d->appname = TQString::fromLatin1( m_aboutData ? m_aboutData->productName() : tqApp->name() ); @@ -272,8 +272,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou lay->addWidget( d->submitBugButton ); lay->addSpacing(10); - connect( d->submitBugButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotOk())); + connect( d->submitBugButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotOk())); } } @@ -321,7 +321,7 @@ void KBugReport::slotConfigureEmail() if (m_process) return; m_process = new TDEProcess; *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount"); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom())); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotSetFrom())); if (!m_process->start()) { kdDebug() << "Couldn't start tdecmshell.." << endl; diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp index a1f107996..54329412e 100644 --- a/tdeui/kbuttonbox.cpp +++ b/tdeui/kbuttonbox.cpp @@ -130,7 +130,7 @@ KButtonBox::addButton( TQPushButton * pb = addButton(text, noexpand); if ((0 != receiver) && (0 != slot)) - TQObject::connect(pb, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(pb, TQ_SIGNAL(clicked()), receiver, slot); return pb; } @@ -146,7 +146,7 @@ KButtonBox::addButton( TQPushButton * pb = addButton(guiitem, noexpand); if ((0 != receiver) && (0 != slot)) - TQObject::connect(pb, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(pb, TQ_SIGNAL(clicked()), receiver, slot); return pb; } diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index 485c5e06e..064e905d2 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -389,7 +389,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f fillFontCombo(); fontCombo->resize( fontCombo->sizeHint() ); - connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) ); + connect( fontCombo, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( fontSelected( const TQString & ) ) ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); lTable->resize( lTable->sizeHint() ); @@ -399,7 +399,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); tableSpinBox->resize( tableSpinBox->sizeHint() ); - connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) ); + connect( tableSpinBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( tableChanged( int ) ) ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); lUnicode->resize( lUnicode->sizeHint() ); @@ -415,7 +415,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f d->unicodeLine->resize( d->unicodeLine->sizeHint() ); slotUpdateUnicode(_chr); - connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); + connect( d->unicodeLine, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotUnicodeEntered() ) ); charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQString(TQVBox::font().family()) : _font, _chr, _tableNum ); const TQSize sz( charTable->contentsWidth() + 4 , @@ -429,18 +429,18 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f setFont( _font.isEmpty() ? TQString(TQVBox::font().family()) : _font ); setTableNum( _tableNum ); - connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( slotUpdateUnicode( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( charHighlighted( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( highlighted() ), this, TQT_SLOT( charHighlighted() ) ); - connect( charTable, TQT_SIGNAL( activated( const TQChar & ) ), this, TQT_SLOT( charActivated( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( activated() ), this, TQT_SLOT( charActivated() ) ); - connect( charTable, TQT_SIGNAL( focusItemChanged( const TQChar & ) ), - this, TQT_SLOT( charFocusItemChanged( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( focusItemChanged() ), this, TQT_SLOT( charFocusItemChanged() ) ); - connect( charTable, TQT_SIGNAL( tableUp() ), this, TQT_SLOT( charTableUp() ) ); - connect( charTable, TQT_SIGNAL( tableDown() ), this, TQT_SLOT( charTableDown() ) ); - - connect( charTable, TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(slotDoubleClicked())); + connect( charTable, TQ_SIGNAL( highlighted( const TQChar & ) ), this, TQ_SLOT( slotUpdateUnicode( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( highlighted( const TQChar & ) ), this, TQ_SLOT( charHighlighted( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( highlighted() ), this, TQ_SLOT( charHighlighted() ) ); + connect( charTable, TQ_SIGNAL( activated( const TQChar & ) ), this, TQ_SLOT( charActivated( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( activated() ), this, TQ_SLOT( charActivated() ) ); + connect( charTable, TQ_SIGNAL( focusItemChanged( const TQChar & ) ), + this, TQ_SLOT( charFocusItemChanged( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( focusItemChanged() ), this, TQ_SLOT( charFocusItemChanged() ) ); + connect( charTable, TQ_SIGNAL( tableUp() ), this, TQ_SLOT( charTableUp() ) ); + connect( charTable, TQ_SIGNAL( tableDown() ), this, TQ_SLOT( charTableDown() ) ); + + connect( charTable, TQ_SIGNAL(doubleClicked()),this,TQ_SLOT(slotDoubleClicked())); setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( charTable ); diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp index 996623551..90cf47e2a 100644 --- a/tdeui/kcmenumngr.cpp +++ b/tdeui/kcmenumngr.cpp @@ -59,7 +59,7 @@ void KContextMenuManager::insert( TQWidget* widget, TQPopupMenu* popup ) if ( !manager ) manager = new KContextMenuManager; - manager->connect( widget, TQT_SIGNAL( destroyed() ), manager, TQT_SLOT( widgetDestroyed() ) ); + manager->connect( widget, TQ_SIGNAL( destroyed() ), manager, TQ_SLOT( widgetDestroyed() ) ); manager->menus.insert( widget, popup ); widget->installEventFilter( manager ); } diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index bebedf6c9..8f34024d8 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -47,7 +47,7 @@ KColorButton::KColorButton( TQWidget *parent, const char *name ) setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::KColorButton( const TQColor &c, TQWidget *parent, @@ -60,7 +60,7 @@ KColorButton::KColorButton( const TQColor &c, TQWidget *parent, setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::KColorButton( const TQColor &c, const TQColor &defaultColor, TQWidget *parent, @@ -73,7 +73,7 @@ KColorButton::KColorButton( const TQColor &c, const TQColor &defaultColor, TQWid setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::~KColorButton() diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp index 676774b2f..fd43ddcff 100644 --- a/tdeui/kcolorcombo.cpp +++ b/tdeui/kcolorcombo.cpp @@ -121,8 +121,8 @@ KColorCombo::KColorCombo( 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) ) ); } diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index 8bfcd8084..4c05522eb 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -597,12 +597,12 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) mNamedColorList->setFixedSize(minSize); mNamedColorList->hide(); layout->addWidget(mNamedColorList); - connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )), - this, TQT_SLOT( slotColorTextSelected( const TQString & )) ); + connect( mNamedColorList, TQ_SIGNAL(highlighted( const TQString & )), + this, TQ_SLOT( slotColorTextSelected( const TQString & )) ); setFixedSize( sizeHint()); - connect( combo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotSetPalette( const TQString &))); + connect( combo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotSetPalette( const TQString &))); } KPaletteTable::~KPaletteTable() @@ -704,7 +704,7 @@ KPaletteTable::readNamedColor( void ) // preventing the real dialog to become visible until the // error dialog box is removed (== bad UI). // - TQTimer::singleShot( 10, this, TQT_SLOT(slotShowNamedColorReadError()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotShowNamedColorReadError()) ); } } @@ -831,10 +831,10 @@ KPaletteTable::setPalette( const TQString &_paletteName ) { cells->setColor( i, mPalette->color(i) ); } - connect( cells, TQT_SIGNAL( colorSelected( int ) ), - TQT_SLOT( slotColorCellSelected( int ) ) ); - connect( cells, TQT_SIGNAL( colorDoubleClicked( int ) ), - TQT_SLOT( slotColorCellDoubleClicked( int ) ) ); + connect( cells, TQ_SIGNAL( colorSelected( int ) ), + TQ_SLOT( slotColorCellSelected( int ) ) ); + connect( cells, TQ_SIGNAL( colorDoubleClicked( int ) ), + TQ_SLOT( slotColorCellDoubleClicked( int ) ) ); sv->addChild( cells ); cells->show(); sv->updateScrollBars(); @@ -948,8 +948,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->oldfilter = 0; #endif d->cbDefaultColor = 0L; - connect( this, TQT_SIGNAL(okClicked(void)),this,TQT_SLOT(slotWriteSettings(void))); - connect( this, TQT_SIGNAL(closeClicked(void)),this,TQT_SLOT(slotWriteSettings(void))); + connect( this, TQ_SIGNAL(okClicked(void)),this,TQ_SLOT(slotWriteSettings(void))); + connect( this, TQ_SIGNAL(closeClicked(void)),this,TQ_SLOT(slotWriteSettings(void))); TQLabel *label; @@ -989,14 +989,14 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->hsSelector = new KHSSelector( page ); d->hsSelector->setMinimumSize(140, 70); l_ltop->addWidget(d->hsSelector, 8); - connect( d->hsSelector, TQT_SIGNAL( valueChanged( int, int ) ), - TQT_SLOT( slotHSChanged( int, int ) ) ); + connect( d->hsSelector, TQ_SIGNAL( valueChanged( int, int ) ), + TQ_SLOT( slotHSChanged( int, int ) ) ); d->valuePal = new KValueSelector( page ); d->valuePal->setMinimumSize(26, 70); l_ltop->addWidget(d->valuePal, 1); - connect( d->valuePal, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( slotVChanged( int ) ) ); + connect( d->valuePal, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( slotVChanged( int ) ) ); // @@ -1008,8 +1008,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->hedit = new KColorSpinBox( 0, 359, 1, page ); d->hedit->setValidator( new TQIntValidator( d->hedit ) ); l_lbot->addWidget(d->hedit, 0, 3); - connect( d->hedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->hedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("S:"), page ); label->setAlignment(AlignRight | AlignVCenter); @@ -1017,8 +1017,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->sedit = new KColorSpinBox( 0, 255, 1, page ); d->sedit->setValidator( new TQIntValidator( d->sedit ) ); l_lbot->addWidget(d->sedit, 1, 3); - connect( d->sedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->sedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("V:"), page ); label->setAlignment(AlignRight | AlignVCenter); @@ -1026,8 +1026,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->vedit = new KColorSpinBox( 0, 255, 1, page ); d->vedit->setValidator( new TQIntValidator( d->vedit ) ); l_lbot->addWidget(d->vedit, 2, 3); - connect( d->vedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->vedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); // // add the RGB fields @@ -1038,8 +1038,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->redit = new KColorSpinBox( 0, 255, 1, page ); d->redit->setValidator( new TQIntValidator( d->redit ) ); l_lbot->addWidget(d->redit, 0, 5); - connect( d->redit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->redit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("G:"), page ); label->setAlignment(AlignRight | AlignVCenter); @@ -1047,8 +1047,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->gedit = new KColorSpinBox( 0, 255,1, page ); d->gedit->setValidator( new TQIntValidator( d->gedit ) ); l_lbot->addWidget(d->gedit, 1, 5); - connect( d->gedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->gedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("B:"), page ); label->setAlignment(AlignRight | AlignVCenter); @@ -1056,8 +1056,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->bedit = new KColorSpinBox( 0, 255, 1, page ); d->bedit->setValidator( new TQIntValidator( d->bedit ) ); l_lbot->addWidget(d->bedit, 2, 5); - connect( d->bedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->bedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); // // the entry fields should be wide enough to hold 8888888 @@ -1083,13 +1083,13 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->table = new KPaletteTable( page ); d->l_right->addWidget(d->table, 10); - connect( d->table, TQT_SIGNAL( colorSelected( const TQColor &, const TQString & ) ), - TQT_SLOT( slotColorSelected( const TQColor &, const TQString & ) ) ); + connect( d->table, TQ_SIGNAL( colorSelected( const TQColor &, const TQString & ) ), + TQ_SLOT( slotColorSelected( const TQColor &, const TQString & ) ) ); connect( d->table, - TQT_SIGNAL( colorDoubleClicked( const TQColor &, const TQString & ) ), - TQT_SLOT( slotColorDoubleClicked( const TQColor &, const TQString & ) ) + TQ_SIGNAL( colorDoubleClicked( const TQColor &, const TQString & ) ), + TQ_SLOT( slotColorDoubleClicked( const TQColor &, const TQString & ) ) ); // Store the default value for saving time. d->originalPalette = d->table->palette(); @@ -1107,7 +1107,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQPushButton *button = new TQPushButton( page ); button->setText(i18n("&Add to Custom Colors")); l_hbox->addWidget(button, 0, AlignLeft); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( slotAddToCustomColors())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( slotAddToCustomColors())); // // The color picker button @@ -1115,7 +1115,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) button = new TQPushButton( page ); button->setPixmap( BarIcon("colorpicker")); l_hbox->addWidget(button, 0, AlignHCenter ); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( slotColorPicker())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( slotColorPicker())); // // a little space between @@ -1147,14 +1147,14 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->htmlName->setFixedWidth(w); l_grid->addWidget(d->htmlName, 1, 2, TQt::AlignLeft); - connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotHtmlChanged() ) ); + connect( d->htmlName, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotHtmlChanged() ) ); d->patch = new KColorPatch( page ); d->patch->setFixedSize(48, 48); l_grid->addMultiCellWidget(d->patch, 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); - connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), - TQT_SLOT( setColor( const TQColor&))); + connect( d->patch, TQ_SIGNAL( colorChanged( const TQColor&)), + TQ_SLOT( setColor( const TQColor&))); tl_layout->activate(); page->setMinimumSize( page->sizeHint() ); @@ -1226,7 +1226,7 @@ KColorDialog::setDefaultColor( const TQColor& col ) mainWidget()->setMinimumSize( mainWidget()->sizeHint() ); disableResize(); - connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) ); + connect( d->cbDefaultColor, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDefaultColorClicked() ) ); } d->defaultColor = col; diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index 466015adc..bcde35467 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -266,7 +266,7 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) // Connect the returnPressed signal for both Q[K]LineEdits' if (edit) - connect( edit, TQT_SIGNAL( returnPressed() ), TQT_SIGNAL( returnPressed() )); + connect( edit, TQ_SIGNAL( returnPressed() ), TQ_SIGNAL( returnPressed() )); if ( d->klineEdit ) { @@ -274,32 +274,32 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) // lineedit without us noticing. And TDECompletionBase::delegate would // be a dangling pointer then, so prevent that. Note: only do this // when it is a KLineEdit! - connect( edit, TQT_SIGNAL( destroyed() ), TQT_SLOT( lineEditDeleted() )); + connect( edit, TQ_SIGNAL( destroyed() ), TQ_SLOT( lineEditDeleted() )); - connect( d->klineEdit, TQT_SIGNAL( returnPressed( const TQString& )), - TQT_SIGNAL( returnPressed( const TQString& ) )); + connect( d->klineEdit, TQ_SIGNAL( returnPressed( const TQString& )), + TQ_SIGNAL( returnPressed( const TQString& ) )); - connect( d->klineEdit, TQT_SIGNAL( completion( const TQString& )), - TQT_SIGNAL( completion( const TQString& )) ); + connect( d->klineEdit, TQ_SIGNAL( completion( const TQString& )), + TQ_SIGNAL( completion( const TQString& )) ); - connect( d->klineEdit, TQT_SIGNAL( substringCompletion( const TQString& )), - TQT_SIGNAL( substringCompletion( const TQString& )) ); + connect( d->klineEdit, TQ_SIGNAL( substringCompletion( const TQString& )), + TQ_SIGNAL( substringCompletion( const TQString& )) ); connect( d->klineEdit, - TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )), - TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) ); + TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )), + TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) ); connect( d->klineEdit, - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); connect( d->klineEdit, - TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), - TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )) ); + TQ_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), + TQ_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )) ); connect( d->klineEdit, - TQT_SIGNAL( completionBoxActivated( const TQString& )), - TQT_SIGNAL( activated( const TQString& )) ); + TQ_SIGNAL( completionBoxActivated( const TQString& )), + TQ_SIGNAL( activated( const TQString& )) ); } } @@ -390,10 +390,10 @@ void KHistoryCombo::init( bool useCompletion ) if ( histControl == "ignoredups" || histControl == "ignoreboth" ) setDuplicatesEnabled( false ); - connect( this, TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), - TQT_SLOT(addContextMenuItems(TQPopupMenu*)) ); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotReset() )); - connect( this, TQT_SIGNAL( returnPressed(const TQString&) ), TQT_SLOT(slotReset())); + connect( this, TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), + TQ_SLOT(addContextMenuItems(TQPopupMenu*)) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotReset() )); + connect( this, TQ_SIGNAL( returnPressed(const TQString&) ), TQ_SLOT(slotReset())); } KHistoryCombo::~KHistoryCombo() @@ -455,10 +455,10 @@ void KHistoryCombo::addContextMenuItems( TQPopupMenu* menu ) { menu->insertSeparator(); if (d->bHistoryEditorEnabled) { - int idedit = menu->insertItem( SmallIconSet("edit"), i18n("&Edit History..."), this, TQT_SLOT( slotEdit()) ); + int idedit = menu->insertItem( SmallIconSet("edit"), i18n("&Edit History..."), this, TQ_SLOT( slotEdit()) ); menu->setItemEnabled(idedit, count()); } - int id = menu->insertItem( SmallIconSet("history_clear"), i18n("Clear &History"), this, TQT_SLOT( slotClear())); + int id = menu->insertItem( SmallIconSet("history_clear"), i18n("Clear &History"), this, TQ_SLOT( slotClear())); if (!count()) menu->setItemEnabled(id, false); } @@ -697,7 +697,7 @@ void KHistoryCombo::slotClear() void KHistoryCombo::slotEdit() { KHistoryComboEditor dlg( historyItems(), this ); - connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) ); + connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) ); dlg.exec(); } @@ -747,7 +747,7 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget TQLabel* slbl = new TQLabel(i18n("&Search:"), searchbox); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchbox); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); // Add ListView m_pListView = new TDEListView( box ); @@ -766,8 +766,8 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget m_pListView->setMinimumSize( m_pListView->sizeHint() ); - connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); enableButton( KDialogBase::User1, false ); diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index 2c3cbf335..8e6afbbe4 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -114,7 +114,7 @@ class KURL; * KComboBox *combo = new KComboBox( true, this, "mywidget" ); * TDECompletion *comp = combo->completionObject(); * // Connect to the return pressed signal - optional - * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(combo,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * * // Provide the to be completed strings. Note that those are separate from the combo's * // contents. @@ -128,7 +128,7 @@ class KURL; * KURLCompletion *comp = new KURLCompletion(); * combo->setCompletionObject( comp ); * // Connect to the return pressed signal - optional - * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(combo,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * Note that you have to either delete the allocated completion object @@ -553,8 +553,8 @@ public: * use * * \code - * connect( combo, TQT_SIGNAL( activated( const TQString& )), - * combo, TQT_SLOT( addToHistory( const TQString& ))); + * connect( combo, TQ_SIGNAL( activated( const TQString& )), + * combo, TQ_SLOT( addToHistory( const TQString& ))); * \endcode * * Use TQComboBox::setMaxCount() to limit the history. diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp index 5357e557a..cd30b861b 100644 --- a/tdeui/kcommand.cpp +++ b/tdeui/kcommand.cpp @@ -84,25 +84,25 @@ KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool wi if (withMenus) { TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo", - TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQT_SLOT( undo() ), + TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQ_SLOT( undo() ), actionCollection, KStdAction::stdName( KStdAction::Undo ) ); - connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); - connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); + connect( undo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUndoAboutToShow() ) ); + connect( undo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) ); m_undo = undo; m_undoPopup = undo->popupMenu(); TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo", - TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQT_SLOT( redo() ), + TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQ_SLOT( redo() ), actionCollection, KStdAction::stdName( KStdAction::Redo ) ); - connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) ); - connect( redo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) ); + connect( redo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotRedoAboutToShow() ) ); + connect( redo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) ); m_redo = redo; m_redoPopup = redo->popupMenu(); } else { - m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), actionCollection ); - m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), actionCollection ); + m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), actionCollection ); + m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), actionCollection ); m_undoPopup = 0L; m_redoPopup = 0L; } diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 8b004e339..a04786da7 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -250,8 +250,8 @@ KCursorPrivateAutoHideEventFilter::KCursorPrivateAutoHideEventFilter( TQWidget* , m_isOwnCursor( false ) { m_widget->setMouseTracking( true ); - connect( &m_autoHideTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( hideCursor() ) ); + connect( &m_autoHideTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( hideCursor() ) ); } KCursorPrivateAutoHideEventFilter::~KCursorPrivateAutoHideEventFilter() @@ -392,8 +392,8 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve m_eventFilters.insert( w, filter ); if ( !customEventFilter ) w->installEventFilter( filter ); - connect( w, TQT_SIGNAL( destroyed(TQObject*) ), - this, TQT_SLOT( slotWidgetDestroyed(TQObject*) ) ); + connect( w, TQ_SIGNAL( destroyed(TQObject*) ), + this, TQ_SLOT( slotWidgetDestroyed(TQObject*) ) ); } else { @@ -402,8 +402,8 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve return; w->removeEventFilter( filter ); delete filter; - disconnect( w, TQT_SIGNAL( destroyed(TQObject*) ), - this, TQT_SLOT( slotWidgetDestroyed(TQObject*) ) ); + disconnect( w, TQ_SIGNAL( destroyed(TQObject*) ), + this, TQ_SLOT( slotWidgetDestroyed(TQObject*) ) ); } } diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index 3d57d5a3f..0622cbc1a 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -187,17 +187,17 @@ void KDatePicker::init( const TQDate &dt ) monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); } - connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); - connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); - connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked())); - connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked())); - connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked())); - connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked())); - connect(d->selectWeek, TQT_SIGNAL(activated(int)), TQT_SLOT(weekSelected(int))); - connect(d->todayButton, TQT_SIGNAL(clicked()), TQT_SLOT(todayButtonClicked())); - connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked())); - connect(selectYear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectYearClicked())); - connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed())); + connect(table, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(dateChangedSlot(TQDate))); + connect(table, TQ_SIGNAL(tableClicked()), TQ_SLOT(tableClickedSlot())); + connect(monthForward, TQ_SIGNAL(clicked()), TQ_SLOT(monthForwardClicked())); + connect(monthBackward, TQ_SIGNAL(clicked()), TQ_SLOT(monthBackwardClicked())); + connect(yearForward, TQ_SIGNAL(clicked()), TQ_SLOT(yearForwardClicked())); + connect(yearBackward, TQ_SIGNAL(clicked()), TQ_SLOT(yearBackwardClicked())); + connect(d->selectWeek, TQ_SIGNAL(activated(int)), TQ_SLOT(weekSelected(int))); + connect(d->todayButton, TQ_SIGNAL(clicked()), TQ_SLOT(todayButtonClicked())); + connect(selectMonth, TQ_SIGNAL(clicked()), TQ_SLOT(selectMonthClicked())); + connect(selectYear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectYearClicked())); + connect(line, TQ_SIGNAL(returnPressed()), TQ_SLOT(lineEnterPressed())); table->setFocus(); @@ -394,7 +394,7 @@ KDatePicker::selectYearClicked() picker->setYear( table->getDate().year() ); picker->selectAll(); popup->setMainWidget(picker); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); + connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int))); picker->setFocus(); if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height())))) { @@ -416,7 +416,7 @@ KDatePicker::selectYearClicked() } delete popup; - TQTimer::singleShot(0, this, TQT_SLOT(ensureSelectYearIsUp())); + TQTimer::singleShot(0, this, TQ_SLOT(ensureSelectYearIsUp())); } void @@ -528,8 +528,8 @@ KDatePicker::setCloseButton( bool enable ) d->navigationLayout->addWidget(d->closeButton); TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); - connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + connect( d->closeButton, TQ_SIGNAL( clicked() ), + topLevelWidget(), TQ_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index b0d55f246..7d76c3fc1 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -158,12 +158,12 @@ KDateTable::~KDateTable() void KDateTable::initAccels() { TDEAccel* accel = new TDEAccel(this, "date table accel"); - accel->insert(TDEStdAccel::Next, this, TQT_SLOT(nextMonth())); - accel->insert(TDEStdAccel::Prior, this, TQT_SLOT(previousMonth())); - accel->insert(TDEStdAccel::Home, this, TQT_SLOT(beginningOfMonth())); - accel->insert(TDEStdAccel::End, this, TQT_SLOT(endOfMonth())); - accel->insert(TDEStdAccel::BeginningOfLine, this, TQT_SLOT(beginningOfWeek())); - accel->insert(TDEStdAccel::EndOfLine, this, TQT_SLOT(endOfWeek())); + accel->insert(TDEStdAccel::Next, this, TQ_SLOT(nextMonth())); + accel->insert(TDEStdAccel::Prior, this, TQ_SLOT(previousMonth())); + accel->insert(TDEStdAccel::Home, this, TQ_SLOT(beginningOfMonth())); + accel->insert(TDEStdAccel::End, this, TQ_SLOT(endOfMonth())); + accel->insert(TDEStdAccel::BeginningOfLine, this, TQ_SLOT(beginningOfWeek())); + accel->insert(TDEStdAccel::EndOfLine, this, TQ_SLOT(endOfWeek())); accel->readSettings(); } @@ -618,7 +618,7 @@ KDateInternalWeekSelector::KDateInternalWeekSelector setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(weekEnteredSlot())); } void @@ -861,7 +861,7 @@ KDateInternalYearSelector::KDateInternalYearSelector // we have to respect the limits of TQDate here, I fear: val->setRange(0, 8000); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(yearEnteredSlot())); } void diff --git a/tdeui/kdatetimewidget.cpp b/tdeui/kdatetimewidget.cpp index 76d92edd2..1aa9332be 100644 --- a/tdeui/kdatetimewidget.cpp +++ b/tdeui/kdatetimewidget.cpp @@ -44,10 +44,10 @@ void KDateTimeWidget::init() d->dateWidget = new KDateWidget(this); d->timeWidget = new KTimeWidget(this); - connect(d->dateWidget, TQT_SIGNAL(changed(TQDate)), - TQT_SLOT(slotValueChanged())); - connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)), - TQT_SLOT(slotValueChanged())); + connect(d->dateWidget, TQ_SIGNAL(changed(TQDate)), + TQ_SLOT(slotValueChanged())); + connect(d->timeWidget, TQ_SIGNAL(valueChanged(const TQTime &)), + TQ_SLOT(slotValueChanged())); } void KDateTimeWidget::setDateTime(const TQDateTime & datetime) diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp index 2fc9dda0a..8a7206d4a 100644 --- a/tdeui/kdatewidget.cpp +++ b/tdeui/kdatewidget.cpp @@ -88,9 +88,9 @@ void KDateWidget::init() d->m_year = new KDateWidgetSpinBox(locale->calendar()->minValidYear(), locale->calendar()->maxValidYear(), this); - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); + connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); } void KDateWidget::init(const TQDate& date) @@ -112,9 +112,9 @@ void KDateWidget::init(const TQDate& date) d->m_year = new KDateWidgetSpinBox(locale->calendar()->minValidYear(), locale->calendar()->maxValidYear(), this); - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); + connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); } KDateWidget::~KDateWidget() diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp index a2fb96425..5a90b5af9 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp @@ -32,8 +32,8 @@ KDETrayProxy::KDETrayProxy() : selection( makeSelectionAtom()) { - connect( &selection, TQT_SIGNAL( newOwner( Window )), TQT_SLOT( newOwner( Window ))); - connect( &module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId ))); + connect( &selection, TQ_SIGNAL( newOwner( Window )), TQ_SLOT( newOwner( Window ))); + connect( &module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId ))); selection.owner(); for( TQValueList< WId >::ConstIterator it = module.windows().begin(); it != module.windows().end(); diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 3f8a89311..a88640efe 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -295,7 +295,7 @@ void KDialogQueue::queueDialog(TQDialog *dialog) { KDialogQueue *_this = self(); _this->d->queue.append(dialog); - TQTimer::singleShot(0, _this, TQT_SLOT(slotShowQueuedDialog())); + TQTimer::singleShot(0, _this, TQ_SLOT(slotShowQueuedDialog())); } void KDialogQueue::slotShowQueuedDialog() @@ -317,7 +317,7 @@ void KDialogQueue::slotShowQueuedDialog() delete dialog; if (!d->queue.isEmpty()) - TQTimer::singleShot(20, this, TQT_SLOT(slotShowQueuedDialog())); + TQTimer::singleShot(20, this, TQ_SLOT(slotShowQueuedDialog())); else ksdkdq.destructObject(); // Suicide. } @@ -461,7 +461,7 @@ void KSMModalDialog::keepMeOnTop() { if (!m_keepOnTopTimer) { m_keepOnTopTimer = new TQTimer(); - connect(m_keepOnTopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(keepMeOnTop())); + connect(m_keepOnTopTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(keepMeOnTop())); m_keepOnTopTimer->start(100, FALSE); } setActiveWindow(); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 92226f954..d1cec7389 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -109,7 +109,7 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); enableButtonSeparator( separator ); makeButtonBox( buttonMask, defaultButton, user1, user2, user3 ); @@ -131,11 +131,11 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); mJanus = new KJanusWidget( this, "janus", dialogFace ); - connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)), - this, TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mJanus, TQ_SIGNAL(aboutToShowPage(TQWidget *)), + this, TQ_SIGNAL(aboutToShowPage(TQWidget *))); if( !mJanus || !mJanus->isValid() ) { return; } @@ -160,11 +160,11 @@ KDialogBase::KDialogBase( KDialogBase::DialogType dialogFace, WFlags f, TQWidge setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); mJanus = new KJanusWidget( this, "janus", dialogFace ); - connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)), - this, TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mJanus, TQ_SIGNAL(aboutToShowPage(TQWidget *)), + this, TQ_SIGNAL(aboutToShowPage(TQWidget *))); if( !mJanus || !mJanus->isValid() ) { return; } @@ -189,7 +189,7 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); enableButtonSeparator( separator ); @@ -281,7 +281,7 @@ KDialogBase::delayedDestruct() { if (isVisible()) hide(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotDelayedDestruct())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotDelayedDestruct())); } void @@ -373,15 +373,15 @@ void KDialogBase::makeRelay() { if( mTile ) { - connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); + connect( mTile, TQ_SIGNAL(pixmapChanged()), TQ_SLOT(updateBackground()) ); return; } mTile = new KDialogBaseTile; if( mTile ) { - connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); - connect( tqApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); + connect( mTile, TQ_SIGNAL(pixmapChanged()), TQ_SLOT(updateBackground()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), mTile, TQ_SLOT(cleanup()) ); } } @@ -576,35 +576,35 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, { KPushButton *pb = d->mButton.append( Help, KStdGuiItem::help() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) ); } if( d->mButton.mask & Default ) { KPushButton *pb = d->mButton.append( Default, KStdGuiItem::defaults() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefault()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefault()) ); } if( d->mButton.mask & Details ) { KPushButton *pb = d->mButton.append( Details, TQString() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails()) ); setDetails(false); } if( d->mButton.mask & User3 ) { KPushButton *pb = d->mButton.append( User3, user3 ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser3()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotUser3()) ); } if( d->mButton.mask & User2 ) { KPushButton *pb = d->mButton.append( User2, user2 ); if( mMessageBoxMode ) { - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotYes()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotYes()) ); } else { - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUser2()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUser2()) ); } } if( d->mButton.mask & User1 ) @@ -612,39 +612,39 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, KPushButton *pb = d->mButton.append( User1, user1 ); if( mMessageBoxMode ) { - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNo()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNo()) ); } else { - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser1()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotUser1()) ); } } if( d->mButton.mask & Ok ) { KPushButton *pb = d->mButton.append( Ok, KStdGuiItem::ok() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotOk()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotOk()) ); } if( d->mButton.mask & Apply ) { KPushButton *pb = d->mButton.append( Apply, KStdGuiItem::apply() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotApply()) ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(applyPressed()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotApply()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(applyPressed()) ); } if( d->mButton.mask & Try ) { KPushButton *pb = d->mButton.append( Try, i18n( "&Try" ) ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotTry()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotTry()) ); } if( d->mButton.mask & Cancel ) { KPushButton *pb = d->mButton.append( Cancel, KStdGuiItem::cancel() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancel()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancel()) ); } if( d->mButton.mask & Close ) { KPushButton *pb = d->mButton.append( Close, KStdGuiItem::close() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotClose()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotClose()) ); } if( defaultButton != NoDefault ) @@ -1256,8 +1256,8 @@ void KDialogBase::enableLinkedHelp( bool state ) mUrlHelp->setBackgroundPixmap(*mTile->get()); } mUrlHelp->setMinimumHeight( fontMetrics().height() + marginHint() ); - connect(mUrlHelp,TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(helpClickedSlot(const TQString &))); + connect(mUrlHelp,TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(helpClickedSlot(const TQString &))); mUrlHelp->show(); } else diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index ef26821f0..645b8214d 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -230,28 +230,28 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) TQToolTip::add( closeButton, i18n("Close") ); closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock())); stayButton = new KDockButton_Private( this, "DockStayButton" ); TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") ); stayButton->setToggleButton( true ); stayButton->setPixmap( const_cast< const char** >(not_close_xpm) ); stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked())); + connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked())); dockbackButton = new KDockButton_Private( this, "DockbackButton" ); TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack())); d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" ); TQToolTip::add( d->toDesktopButton, i18n("Detach") ); d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); + connect( d->toDesktopButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop())); stayButton->hide(); d->dummy = new TQWidget( this ); @@ -522,7 +522,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP setIcon( pixmap); widget = 0L; - TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); + TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) ); applyToWidget( parent, TQPoint(0,0) ); } @@ -1124,7 +1124,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if ( dockPos == KDockWidget::DockCenter ) { KDockTabGroup* tab = new KDockTabGroup( newDock, "_dock_tab"); - TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*))); + TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*))); newDock->setWidget( tab ); target->applyToWidget( tab ); @@ -1560,15 +1560,15 @@ void KDockWidget::setFormerBrotherDockWidget(KDockWidget *dockWidget) { formerBrotherDockWidget = dockWidget; if( formerBrotherDockWidget ) - TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); } void KDockWidget::loseFormerBrotherDockWidget() { if( formerBrotherDockWidget ) - TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; repaint(); } @@ -1658,8 +1658,8 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) menu = new TQPopupMenu(); #endif - connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) ); - connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) ); + connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) ); + connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) ); childDock = new TQObjectList(); childDock->setAutoDelete( false ); diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp index a550a7af1..85ccd1c88 100644 --- a/tdeui/keditcl1.cpp +++ b/tdeui/keditcl1.cpp @@ -67,8 +67,8 @@ KEdit::KEdit(TQWidget *_parent, const char *name) setAcceptDrops(true); KCursor::setAutoHideCursor( this, true ); - connect(this, TQT_SIGNAL(cursorPositionChanged(int,int)), - this, TQT_SLOT(slotCursorPositionChanged())); + connect(this, TQ_SIGNAL(cursorPositionChanged(int,int)), + this, TQ_SLOT(slotCursorPositionChanged())); } diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp index 77a7d9391..3ccb5226b 100644 --- a/tdeui/keditcl2.cpp +++ b/tdeui/keditcl2.cpp @@ -58,8 +58,8 @@ void KEdit::search(){ if( !srchdialog ) { srchdialog = new KEdFind( this, "searchdialog", false); - connect(srchdialog,TQT_SIGNAL(search()),this,TQT_SLOT(search_slot())); - connect(srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot())); + connect(srchdialog,TQ_SIGNAL(search()),this,TQ_SLOT(search_slot())); + connect(srchdialog,TQ_SIGNAL(done()),this,TQ_SLOT(searchdone_slot())); } // If we already searched / replaced something before make sure it shows @@ -254,10 +254,10 @@ void KEdit::replace() if( !replace_dialog ) { replace_dialog = new KEdReplace( this, "replace_dialog", false ); - connect(replace_dialog,TQT_SIGNAL(find()),this,TQT_SLOT(replace_search_slot())); - connect(replace_dialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replace_slot())); - connect(replace_dialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replace_all_slot())); - connect(replace_dialog,TQT_SIGNAL(done()),this,TQT_SLOT(replacedone_slot())); + connect(replace_dialog,TQ_SIGNAL(find()),this,TQ_SLOT(replace_search_slot())); + connect(replace_dialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replace_slot())); + connect(replace_dialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replace_all_slot())); + connect(replace_dialog,TQ_SIGNAL(done()),this,TQ_SLOT(replacedone_slot())); } TQString string = replace_dialog->getText(); @@ -715,8 +715,8 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) d->combo->setMinimumWidth(fontMetrics().maxWidth()*20); d->combo->setFocus(); - connect(d->combo, TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textSearchChanged ( const TQString & ))); + connect(d->combo, TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textSearchChanged ( const TQString & ))); topLayout->addWidget(d->combo); @@ -734,7 +734,7 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) enableButton( KDialogBase::User1, !d->combo->currentText().isEmpty() ); if ( !modal ) - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCancel() ) ); } KEdFind::~KEdFind() @@ -856,8 +856,8 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) d->replaceCombo->setMinimumWidth(fontMetrics().maxWidth()*20); topLayout->addWidget(d->replaceCombo); - connect(d->searchCombo, TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textSearchChanged ( const TQString & ))); + connect(d->searchCombo, TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textSearchChanged ( const TQString & ))); TQButtonGroup *group = new TQButtonGroup( i18n("Options"), page ); topLayout->addWidget( group ); diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp index 33ca5bc19..92efce083 100644 --- a/tdeui/keditlistbox.cpp +++ b/tdeui/keditlistbox.cpp @@ -105,10 +105,10 @@ void KEditListBox::init( bool checkAtEntering, int buttons, d->buttons = 0; setButtons( buttons ); - connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&))); + connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&))); m_lineEdit->setTrapReturnKey(true); - connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem())); - connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); + connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem())); + connect(m_listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int))); // maybe supplied lineedit has some text already typedSomething( m_lineEdit->text() ); @@ -124,7 +124,7 @@ void KEditListBox::setButtons( uint buttons ) servNewButton = new TQPushButton(i18n("&Add"), this); servNewButton->setEnabled(false); servNewButton->show(); - connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); grid->addWidget(servNewButton, 2, 1); } else if ( ( buttons & Add ) == 0 && servNewButton ) { @@ -136,7 +136,7 @@ void KEditListBox::setButtons( uint buttons ) servRemoveButton = new TQPushButton(i18n("&Remove"), this); servRemoveButton->setEnabled(false); servRemoveButton->show(); - connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); grid->addWidget(servRemoveButton, 3, 1); } else if ( ( buttons & Remove ) == 0 && servRemoveButton ) { @@ -148,12 +148,12 @@ void KEditListBox::setButtons( uint buttons ) servUpButton = new TQPushButton(i18n("Move &Up"), this); servUpButton->setEnabled(false); servUpButton->show(); - connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp())); + connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp())); servDownButton = new TQPushButton(i18n("Move &Down"), this); servDownButton->setEnabled(false); servDownButton->show(); - connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown())); + connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown())); grid->addWidget(servUpButton, 4, 1); grid->addWidget(servDownButton, 5, 1); diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index 40b4aa8d1..193a2e4ac 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -422,8 +422,8 @@ void KEditToolbar::init() setMainWidget(m_widget); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(acceptOK(bool))); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(acceptOK(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(enableButtonApply(bool))); enableButtonApply(false); setMinimumSize(sizeHint()); @@ -499,8 +499,8 @@ void KEditToolbar::slotDefault() setMainWidget(m_widget); m_widget->show(); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(acceptOK(bool))); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(acceptOK(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(enableButtonApply(bool))); enableButtonApply(false); emit newToolbarConfig(); @@ -762,8 +762,8 @@ void KEditToolbarWidget::setupLayout() m_toolbarCombo->setEnabled(false); d->m_comboLabel->setBuddy(m_toolbarCombo); d->m_comboSeparator = new KSeparator(this); - connect(m_toolbarCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotToolbarSelected(const TQString&))); + connect(m_toolbarCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotToolbarSelected(const TQString&))); // TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this); // new_toolbar->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall)); @@ -785,10 +785,10 @@ void KEditToolbarWidget::setupLayout() int column2 = m_inactiveList->addColumn(""); // text m_inactiveList->setSorting( column2 ); inactive_label->setBuddy(m_inactiveList); - connect(m_inactiveList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotInactiveSelected(TQListViewItem *))); - connect(m_inactiveList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(slotInsertButton())); + connect(m_inactiveList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotInactiveSelected(TQListViewItem *))); + connect(m_inactiveList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(slotInsertButton())); // our list of active actions TQLabel *active_label = new TQLabel(i18n("Curr&ent actions:"), this); @@ -804,14 +804,14 @@ void KEditToolbarWidget::setupLayout() m_activeList->setSorting(-1); active_label->setBuddy(m_activeList); - connect(m_inactiveList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); - connect(m_activeList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); - connect(m_activeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotActiveSelected(TQListViewItem *))); - connect(m_activeList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(slotRemoveButton())); + connect(m_inactiveList, TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); + connect(m_activeList, TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); + connect(m_activeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotActiveSelected(TQListViewItem *))); + connect(m_activeList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(slotRemoveButton())); // "change icon" button d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this ); @@ -819,8 +819,8 @@ void KEditToolbarWidget::setupLayout() d->m_hasKDialog = !kdialogExe.isEmpty(); d->m_changeIcon->setEnabled( d->m_hasKDialog ); - connect( d->m_changeIcon, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotChangeIcon() ) ); + connect( d->m_changeIcon, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotChangeIcon() ) ); // The buttons in the middle TQIconSet iconSet; @@ -830,26 +830,26 @@ void KEditToolbarWidget::setupLayout() m_upAction->setIconSet( iconSet ); m_upAction->setEnabled(false); m_upAction->setAutoRepeat(true); - connect(m_upAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotUpButton())); + connect(m_upAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotUpButton())); m_insertAction = new TQToolButton(this); iconSet = TQApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" ); m_insertAction->setIconSet( iconSet ); m_insertAction->setEnabled(false); - connect(m_insertAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotInsertButton())); + connect(m_insertAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotInsertButton())); m_removeAction = new TQToolButton(this); iconSet = TQApplication::reverseLayout() ? SmallIconSet( "forward" ) : SmallIconSet( "back" ); m_removeAction->setIconSet( iconSet ); m_removeAction->setEnabled(false); - connect(m_removeAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveButton())); + connect(m_removeAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveButton())); m_downAction = new TQToolButton(this); iconSet = SmallIconSet( "go-down" ); m_downAction->setIconSet( iconSet ); m_downAction->setEnabled(false); m_downAction->setAutoRepeat(true); - connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton())); + connect(m_downAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotDownButton())); d->m_helpArea = new TQLabel(this); d->m_helpArea->setAlignment( TQt::WordBreak ); @@ -1405,8 +1405,8 @@ void KEditToolbarWidget::slotChangeIcon() m_activeList->setEnabled( false ); // don't change the current item m_toolbarCombo->setEnabled( false ); // don't change the current toolbar - connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( d->m_kdialogProcess, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); } void KEditToolbarWidget::slotProcessExited( TDEProcess* ) diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h index b980b3cb4..d59756b71 100644 --- a/tdeui/kedittoolbar.h +++ b/tdeui/kedittoolbar.h @@ -67,7 +67,7 @@ namespace KEditToolbarInternal * { * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(actionCollection()); - * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + * connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); * dlg.exec(); * } * @@ -92,7 +92,7 @@ namespace KEditToolbarInternal * \code * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(factory()); - * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + * connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); * dlg.exec(); * * void MyClass::slotNewToolbarConfig() // This is called when OK, Apply or Defaults is clicked diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index 676afcfad..ad923b90e 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -89,13 +89,13 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData, if (actions) { - KStdAction::helpContents(this, TQT_SLOT(appHelpActivated()), actions); + KStdAction::helpContents(this, TQ_SLOT(appHelpActivated()), actions); if (showWhatsThis) - KStdAction::whatsThis(this, TQT_SLOT(contextHelpActivated()), actions); - KStdAction::reportBug(this, TQT_SLOT(reportBug()), actions); - KStdAction::aboutApp(this, TQT_SLOT(aboutApplication()), actions); - KStdAction::aboutKDE(this, TQT_SLOT(aboutKDE()), actions); - KStdAction::switchApplicationLanguage(this, TQT_SLOT(switchApplicationLanguage()), actions); + KStdAction::whatsThis(this, TQ_SLOT(contextHelpActivated()), actions); + KStdAction::reportBug(this, TQ_SLOT(reportBug()), actions); + KStdAction::aboutApp(this, TQ_SLOT(aboutApplication()), actions); + KStdAction::aboutKDE(this, TQ_SLOT(aboutKDE()), actions); + KStdAction::switchApplicationLanguage(this, TQ_SLOT(switchApplicationLanguage()), actions); } } @@ -122,14 +122,14 @@ TDEPopupMenu* KHelpMenu::menu() TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name()); mMenu = new TDEPopupMenu(); - connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed())); + connect( mMenu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(menuDestroyed())); bool need_separator = false; if (kapp->authorizeTDEAction("help_contents")) { mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall), TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents ); - mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) ); + mMenu->connectItem( menuHelpContents, this, TQ_SLOT(appHelpActivated()) ); mMenu->setAccel( TDEStdAccel::shortcut(TDEStdAccel::Help), menuHelpContents ); need_separator = true; } @@ -138,7 +138,7 @@ TDEPopupMenu* KHelpMenu::menu() { TQToolButton* wtb = TQWhatsThis::whatsThisButton(0); mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis); - mMenu->connectItem( menuWhatsThis, this, TQT_SLOT(contextHelpActivated()) ); + mMenu->connectItem( menuWhatsThis, this, TQ_SLOT(contextHelpActivated()) ); delete wtb; mMenu->setAccel( SHIFT + Key_F1, menuWhatsThis ); need_separator = true; @@ -149,7 +149,7 @@ TDEPopupMenu* KHelpMenu::menu() if (need_separator) mMenu->insertSeparator(); mMenu->insertItem( SmallIcon("bug"), i18n( "&Report Bug/Request Enhancement..." ), menuReportBug ); - mMenu->connectItem( menuReportBug, this, TQT_SLOT(reportBug()) ); + mMenu->connectItem( menuReportBug, this, TQ_SLOT(reportBug()) ); need_separator = true; } @@ -158,7 +158,7 @@ TDEPopupMenu* KHelpMenu::menu() if (need_separator) mMenu->insertSeparator(); mMenu->insertItem( SmallIcon("locale"), i18n( "Switch application &language..." ), menuSwitchLanguage ); - mMenu->connectItem( menuSwitchLanguage, this, TQT_SLOT(switchApplicationLanguage()) ); + mMenu->connectItem( menuSwitchLanguage, this, TQ_SLOT(switchApplicationLanguage()) ); need_separator = true; } @@ -169,13 +169,13 @@ TDEPopupMenu* KHelpMenu::menu() { mMenu->insertItem( kapp->miniIcon(), TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp ); - mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) ); + mMenu->connectItem( menuAboutApp, this, TQ_SLOT( aboutApplication() ) ); } if (kapp->authorizeTDEAction("help_about_kde")) { mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &TDE" ), menuAboutKDE ); - mMenu->connectItem( menuAboutKDE, this, TQT_SLOT( aboutKDE() ) ); + mMenu->connectItem( menuAboutKDE, this, TQ_SLOT( aboutKDE() ) ); } } @@ -197,7 +197,7 @@ void KHelpMenu::aboutApplication() if( !mAboutApp ) { mAboutApp = new TDEAboutApplication( d->mAboutData, mParent, "about", false ); - connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } mAboutApp->show(); } @@ -213,7 +213,7 @@ void KHelpMenu::aboutApplication() KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes, mParent, "about", false, true, KStdGuiItem::ok() ); - connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); TQHBox *hbox = new TQHBox( mAboutApp ); mAboutApp->setMainWidget( hbox ); @@ -239,7 +239,7 @@ void KHelpMenu::aboutKDE() if( !mAboutKDE ) { mAboutKDE = new TDEAboutKDE( mParent, "aboutkde", false ); - connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutKDE, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } mAboutKDE->show(); } @@ -250,7 +250,7 @@ void KHelpMenu::reportBug() if( !mBugReport ) { mBugReport = new KBugReport( mParent, false, d->mAboutData ); - connect( mBugReport, TQT_SIGNAL(finished()),this,TQT_SLOT( dialogFinished()) ); + connect( mBugReport, TQ_SIGNAL(finished()),this,TQ_SLOT( dialogFinished()) ); } mBugReport->show(); } @@ -260,7 +260,7 @@ void KHelpMenu::switchApplicationLanguage() if ( !d->mSwitchApplicationLanguage ) { d->mSwitchApplicationLanguage = new KSwitchLanguageDialog( mParent, "switchlanguagedialog", false ); - connect( d->mSwitchApplicationLanguage, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( d->mSwitchApplicationLanguage, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } d->mSwitchApplicationLanguage->show(); } @@ -268,7 +268,7 @@ void KHelpMenu::switchApplicationLanguage() void KHelpMenu::dialogFinished() { - TQTimer::singleShot( 0, this, TQT_SLOT(timerExpired()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(timerExpired()) ); } diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h index b2fbba759..ad0e65140 100644 --- a/tdeui/khelpmenu.h +++ b/tdeui/khelpmenu.h @@ -60,7 +60,7 @@ class KHelpMenuPrivate; * * \code * mHelpMenu = new KHelpMenu( this, <someText> ); - * connect( this, TQT_SIGNAL(someSignal()), mHelpMenu,TQT_SLOT(mHelpMenu->aboutKDE())); + * connect( this, TQ_SIGNAL(someSignal()), mHelpMenu,TQ_SLOT(mHelpMenu->aboutKDE())); * \endcode * * IMPORTANT: @@ -97,8 +97,8 @@ class KHelpMenuPrivate; * { * .. * KHelpMenu *helpMenu = new KHelpMenu( this ); - * connect( helpMenu, TQT_SIGNAL(showAboutApplication()), - * this, TQT_SLOT(myDialogSlot())); + * connect( helpMenu, TQ_SIGNAL(showAboutApplication()), + * this, TQ_SLOT(myDialogSlot())); * .. * } * @@ -116,7 +116,7 @@ class KHelpMenuPrivate; * { * KHelpMenu *helpMenu = new KHelpMenu( this ); * TDEPopupMenu *help = mHelpMenu->menu(); - * help->connectItem( KHelpMenu::menuAboutApp, this, TQT_SLOT(myDialogSlot()) ); + * help->connectItem( KHelpMenu::menuAboutApp, this, TQ_SLOT(myDialogSlot()) ); * } * * void MyClass::myDialogSlot() diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index e4ae13716..517730b9c 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -61,23 +61,23 @@ TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f ) { d = new TDEIconViewPrivate; - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); if ( kapp ) { // maybe null when used inside designer - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } m_pCurrentItem = 0L; m_pAutoSelect = new TQTimer( this ); - connect( m_pAutoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); + connect( m_pAutoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); - connect( &d->dragHoldTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragHoldTimeout()) ); + connect( &d->dragHoldTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragHoldTimeout()) ); } TDEIconView::~TDEIconView() @@ -128,25 +128,25 @@ void TDEIconView::slotSettingsChanged(int category) m_bUseSingle = TDEGlobalSettings::singleClick(); //kdDebug() << "TDEIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; - disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, + disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ) ); -// disconnect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *, +// disconnect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQIconViewItem *, +// this, TQ_SLOT( slotExecute( TQIconViewItem *, // const TQPoint & ) ) ); if( m_bUseSingle ) { - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ) ); } else { -// connect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *, +// connect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQIconViewItem *, +// this, TQ_SLOT( slotExecute( TQIconViewItem *, // const TQPoint & ) ) ); } diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp index 77b8082ea..f853221ff 100644 --- a/tdeui/kiconviewsearchline.cpp +++ b/tdeui/kiconviewsearchline.cpp @@ -152,15 +152,15 @@ void TDEIconViewSearchLine::setCaseSensitive( bool cs ) void TDEIconViewSearchLine::setIconView( TQIconView *iv ) { if ( d->iconView != NULL ) - disconnect( d->iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + disconnect( d->iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); d->iconView = iv; if ( iv != NULL ) { - connect( d->iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + connect( d->iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); setEnabled( true ); } else @@ -190,13 +190,13 @@ void TDEIconViewSearchLine::init( TQIconView *iconView ) d->iconView = iconView; - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( queueSearch( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( queueSearch( const TQString & ) ) ); if ( iconView != NULL ) { - connect( iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + connect( iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); setEnabled( true ); } else @@ -231,7 +231,7 @@ void TDEIconViewSearchLine::queueSearch( const TQString &s ) { d->queuedSearches++; d->search = s; - TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( activateSearch() ) ); } void TDEIconViewSearchLine::activateSearch() @@ -244,7 +244,7 @@ void TDEIconViewSearchLine::activateSearch() d->queuedSearches = 0; } else { - TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( activateSearch() ) ); } } diff --git a/tdeui/kinputdialog.cpp b/tdeui/kinputdialog.cpp index 9da93ba0f..5bf89ae20 100644 --- a/tdeui/kinputdialog.cpp +++ b/tdeui/kinputdialog.cpp @@ -77,9 +77,9 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, if ( !mask.isEmpty() ) d->m_lineEdit->setInputMask( mask ); - connect( d->m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), d->m_lineEdit, TQT_SLOT( clear() ) ); + connect( d->m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotEditTextChanged( const TQString & ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), d->m_lineEdit, TQ_SLOT( clear() ) ); slotEditTextChanged( value ); setMinimumWidth( 350 ); @@ -105,7 +105,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_textEdit->setFocus(); d->m_label->setBuddy( d->m_textEdit ); - connect( this, TQT_SIGNAL( user1Clicked() ), d->m_textEdit, TQT_SLOT( clear() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), d->m_textEdit, TQ_SLOT( clear() ) ); setMinimumWidth( 400 ); } @@ -176,10 +176,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_comboBox->setCurrentItem( current ); layout->addWidget( d->m_comboBox ); - connect( d->m_comboBox, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotUpdateButtons( const TQString & ) ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), - d->m_comboBox, TQT_SLOT( clearEdit() ) ); + connect( d->m_comboBox, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotUpdateButtons( const TQString & ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), + d->m_comboBox, TQ_SLOT( clearEdit() ) ); slotUpdateButtons( d->m_comboBox->currentText() ); d->m_comboBox->setFocus(); } else { @@ -188,10 +188,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_listBox->setSelected( current, true ); d->m_listBox->ensureCurrentVisible(); layout->addWidget( d->m_listBox, 10 ); - connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); d->m_listBox->setFocus(); } @@ -232,10 +232,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, } else { - connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); TQString text = select.first(); item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch ); @@ -370,7 +370,7 @@ TQString KInputDialog::getItem( const TQString &caption, const TQString &label, editable, parent, name ); if ( !editable) { - connect( dlg.listBox(), TQT_SIGNAL(doubleClicked ( TQListBoxItem *)), &dlg, TQT_SLOT( slotOk())); + connect( dlg.listBox(), TQ_SIGNAL(doubleClicked ( TQListBoxItem *)), &dlg, TQ_SLOT( slotOk())); } bool _ok = ( dlg.exec() == Accepted ); diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 685301ab8..a17afc59c 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -115,8 +115,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mTreeList->header()->hide(); mTreeList->setRootIsDecorated(true); mTreeList->setSorting( -1 ); - connect( mTreeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage()) ); - connect( mTreeList, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect( mTreeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage()) ); + connect( mTreeList, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotItemClicked(TQListViewItem *))); // // Page area. Title at top with a separator below and a pagestack using @@ -143,8 +143,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mIconList->setFont( listFont ); mIconList->verticalScrollBar()->installEventFilter( this ); - connect( mIconList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage())); - connect( mIconList, TQT_SIGNAL(onItem(TQListBoxItem *)), TQT_SLOT(slotOnItem(TQListBoxItem *))); + connect( mIconList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage())); + connect( mIconList, TQ_SIGNAL(onItem(TQListBoxItem *)), TQ_SLOT(slotOnItem(TQListBoxItem *))); hbox->addSpacing( KDialog::marginHint() ); page = new TQFrame( this ); @@ -170,8 +170,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) vbox->addWidget( mTitleSep ); mPageStack = new TQWidgetStack( page ); - connect(mPageStack, TQT_SIGNAL(aboutToShow(TQWidget *)), - TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mPageStack, TQ_SIGNAL(aboutToShow(TQWidget *)), + TQ_SIGNAL(aboutToShowPage(TQWidget *))); vbox->addWidget( mPageStack, 10 ); } else if( mFace == Tabbed ) @@ -180,8 +180,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mTabControl = new TQTabWidget( this ); mTabControl->setMargin (KDialog::marginHint()); - connect(mTabControl, TQT_SIGNAL(currentChanged(TQWidget *)), - TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mTabControl, TQ_SIGNAL(currentChanged(TQWidget *)), + TQ_SIGNAL(aboutToShowPage(TQWidget *))); topLayout->addWidget( mTabControl, 10 ); } else if( mFace == Swallow ) @@ -197,7 +197,7 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) } if ( kapp ) - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); mValid = true; setSwallowedWidget(0); // Set default size if 'mFace' is Swallow. @@ -430,7 +430,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, const TQString &header,const TQPixmap &pixmap ) { - connect(page, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(pageGone(TQObject*))); + connect(page, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(pageGone(TQObject*))); if( mFace == Tabbed ) { @@ -856,9 +856,9 @@ void KJanusWidget::unfoldTreeList( bool persist ) if( mFace == TreeList ) { if( persist ) - connect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) ); + connect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) ); else - disconnect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) ); + disconnect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) ); for( TQListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() ) item->setOpen( true ); @@ -878,7 +878,7 @@ void KJanusWidget::addButtonBelowList( const TQString & text, TQObject * recv, c if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame ) { TQPushButton * button = new TQPushButton( text, d->mListFrame, "KJanusWidget::buttonBelowList" ); - connect( button, TQT_SIGNAL( clicked() ), recv, slot ); + connect( button, TQ_SIGNAL( clicked() ), recv, slot ); } } @@ -887,7 +887,7 @@ void KJanusWidget::addButtonBelowList( const KGuiItem & item, TQObject * recv, c if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame ) { KPushButton * button = new KPushButton( item, d->mListFrame, "KJanusWidget::buttonBelowList" ); - connect( button, TQT_SIGNAL( clicked() ), recv, slot ); + connect( button, TQ_SIGNAL( clicked() ), recv, slot ); } } diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp index 42799b2a2..08ba14342 100644 --- a/tdeui/kkeybutton.cpp +++ b/tdeui/kkeybutton.cpp @@ -71,7 +71,7 @@ KKeyButton::KKeyButton(TQWidget *parent, const char *name) d = new KKeyButtonPrivate; setFocusPolicy( TQWidget::StrongFocus ); m_bEditing = false; - connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureShortcut()) ); + connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureShortcut()) ); setShortcut( TDEShortcut(), true ); } diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index c6cc490ae..04f17821f 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -326,7 +326,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(this); searchLayout->addWidget(listViewSearch); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); TQString wtstr = i18n("Search interactively for shortcut names (e.g. Copy) " "or combination of keys (e.g. Ctrl+C) by typing them here."); @@ -364,13 +364,13 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->pList->addColumn(i18n("Shortcut")); d->pList->addColumn(i18n("Alternate")); - connect( d->pList, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(slotListItemSelected(TQListViewItem*)) ); + connect( d->pList, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(slotListItemSelected(TQListViewItem*)) ); // handle double clicking an item - connect ( d->pList, TQT_SIGNAL ( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT ( captureCurrentItem()) ); - connect ( d->pList, TQT_SIGNAL ( spacePressed( TQListViewItem* )), TQT_SLOT( captureCurrentItem())); + connect ( d->pList, TQ_SIGNAL ( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT ( captureCurrentItem()) ); + connect ( d->pList, TQ_SIGNAL ( spacePressed( TQListViewItem* )), TQ_SLOT( captureCurrentItem())); // // CREATE CHOOSE KEY GROUP // @@ -396,7 +396,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //grid->addMultiCellWidget( rb, 1, 1, 1, 2 ); grid->addWidget( m_prbNone, 1, 0 ); TQWhatsThis::add( m_prbNone, i18n("The selected action will not be associated with any key.") ); - connect( m_prbNone, TQT_SIGNAL(clicked()), TQT_SLOT(slotNoKey()) ); + connect( m_prbNone, TQ_SIGNAL(clicked()), TQ_SLOT(slotNoKey()) ); m_prbDef = new TQRadioButton( i18n("default key", "De&fault"), d->fCArea ); d->kbGroup->insert( m_prbDef, DefaultKey ); @@ -404,7 +404,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //grid->addMultiCellWidget( rb, 2, 2, 1, 2 ); grid->addWidget( m_prbDef, 1, 1 ); TQWhatsThis::add( m_prbDef, i18n("This will bind the default key to the selected action. Usually a reasonable choice.") ); - connect( m_prbDef, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultKey()) ); + connect( m_prbDef, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultKey()) ); m_prbCustom = new TQRadioButton( i18n("C&ustom"), d->fCArea ); d->kbGroup->insert( m_prbCustom, CustomKey ); @@ -413,16 +413,16 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) grid->addWidget( m_prbCustom, 1, 2 ); TQWhatsThis::add( m_prbCustom, i18n("If this option is selected you can create a customized key binding for the" " selected action using the buttons below.") ); - connect( m_prbCustom, TQT_SIGNAL(clicked()), TQT_SLOT(slotCustomKey()) ); + connect( m_prbCustom, TQ_SIGNAL(clicked()), TQ_SLOT(slotCustomKey()) ); - //connect( d->kbGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( keyMode( int ) ) ); + //connect( d->kbGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( keyMode( int ) ) ); TQBoxLayout *pushLayout = new TQHBoxLayout( KDialog::spacingHint() ); grid->addLayout( pushLayout, 1, 3 ); d->pbtnShortcut = new KKeyButton(d->fCArea, "key"); d->pbtnShortcut->setEnabled( false ); - connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(capturedShortcut(const TDEShortcut&)) ); + connect( d->pbtnShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(capturedShortcut(const TDEShortcut&)) ); grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 ); wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, " @@ -451,7 +451,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //d->stdDict->setAutoDelete( true ); //if (type == Application || type == ApplicationGlobal) // readStdKeys(); - connect( kapp, TQT_SIGNAL( settingsChanged( int )), TQT_SLOT( slotSettingsChanged( int ))); + connect( kapp, TQ_SIGNAL( settingsChanged( int )), TQ_SLOT( slotSettingsChanged( int ))); if( allChoosers == NULL ) allChoosers = allChoosersDeleter.setObject( allChoosers, new TQValueList< KKeyChooser* > ); allChoosers->append( this ); @@ -1092,7 +1092,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts { m_pKeyChooser = new KKeyChooser( this, type, bAllowLetterShortcuts ); setMainWidget( m_pKeyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_pKeyChooser, TQ_SLOT(allDefault()) ); TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); @@ -1104,7 +1104,7 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char { m_pKeyChooser = new KKeyChooser( this, KKeyChooser::Application, bAllowLetterShortcuts ); setMainWidget( m_pKeyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_pKeyChooser, TQ_SLOT(allDefault()) ); TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); diff --git a/tdeui/klanguagebutton.cpp b/tdeui/klanguagebutton.cpp index abbc4f5d3..ff6695dec 100644 --- a/tdeui/klanguagebutton.cpp +++ b/tdeui/klanguagebutton.cpp @@ -172,10 +172,10 @@ void KLanguageButton::insertSubmenu( const TQIconSet & icon, checkInsertPos( pi, text, index ); pi->insertItem( icon, text, p, count(), index ); m_ids->append( id ); - connect( p, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( p, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SLOT( slotHighlighted( int ) ) ); + connect( p, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( p, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SLOT( slotHighlighted( int ) ) ); } void KLanguageButton::insertSubmenu( const TQString &text, const TQString &id, @@ -218,10 +218,10 @@ void KLanguageButton::clear() d->button->setPopup( m_popup ); - connect( m_popup, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( m_popup, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( slotHighlighted( int ) ) ); + connect( m_popup, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( m_popup, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( slotHighlighted( int ) ) ); if ( !d->staticText ) { diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index ac3722a7a..c1fc7d8f0 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -136,7 +136,7 @@ void KLineEdit::init() d->autoSuggest = (mode == TDEGlobalSettings::CompletionMan || mode == TDEGlobalSettings::CompletionPopupAuto || mode == TDEGlobalSettings::CompletionAuto); - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotRestoreSelectionColors())); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotRestoreSelectionColors())); TQPalette p = palette(); if ( !d->previousHighlightedTextColor.isValid() ) @@ -420,10 +420,10 @@ bool KLineEdit::copySqueezedText(bool clipboard) const return false; TQString t = d->squeezedText; t = t.mid(start, end - start); - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection ); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, - TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, + TQ_SLOT(clipboardChanged()) ); return true; } return false; @@ -821,7 +821,7 @@ void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e ) { possibleTripleClick=true; TQTimer::singleShot( TQApplication::doubleClickInterval(),this, - TQT_SLOT(tripleClickTimeout()) ); + TQ_SLOT(tripleClickTimeout()) ); } TQLineEdit::mouseDoubleClickEvent( e ); } @@ -879,8 +879,8 @@ TQPopupMenu *KLineEdit::createPopupMenu() if ( compObj() && !isReadOnly() && kapp->authorize("lineedit_text_completion") ) { TQPopupMenu *subMenu = new TQPopupMenu( popup ); - connect( subMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( completionMenuActivated( int ) ) ); + connect( subMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( completionMenuActivated( int ) ) ); popup->insertSeparator(); popup->insertItem( SmallIconSet("completion"), i18n("Text Completion"), @@ -1088,12 +1088,12 @@ void KLineEdit::setCompletionBox( TDECompletionBox *box ) d->completionBox = box; if ( handleSignals() ) { - connect( d->completionBox, TQT_SIGNAL(highlighted( const TQString& )), - TQT_SLOT(setTextWorkaround( const TQString& )) ); - connect( d->completionBox, TQT_SIGNAL(userCancelled( const TQString& )), - TQT_SLOT(userCancelled( const TQString& )) ); - connect( d->completionBox, TQT_SIGNAL( activated( const TQString& )), - TQT_SIGNAL(completionBoxActivated( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL(highlighted( const TQString& )), + TQ_SLOT(setTextWorkaround( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL(userCancelled( const TQString& )), + TQ_SLOT(userCancelled( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL( activated( const TQString& )), + TQ_SIGNAL(completionBoxActivated( const TQString& )) ); } } @@ -1271,12 +1271,12 @@ void KLineEdit::setCompletionObject( TDECompletion* comp, bool hsig ) { TDECompletion *oldComp = compObj(); if ( oldComp && handleSignals() ) - disconnect( oldComp, TQT_SIGNAL( matches( const TQStringList& )), - this, TQT_SLOT( setCompletedItems( const TQStringList& ))); + disconnect( oldComp, TQ_SIGNAL( matches( const TQStringList& )), + this, TQ_SLOT( setCompletedItems( const TQStringList& ))); if ( comp && hsig ) - connect( comp, TQT_SIGNAL( matches( const TQStringList& )), - this, TQT_SLOT( setCompletedItems( const TQStringList& ))); + connect( comp, TQ_SIGNAL( matches( const TQStringList& )), + this, TQ_SLOT( setCompletedItems( const TQStringList& ))); TDECompletionBase::setCompletionObject( comp, hsig ); } diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h index fed0b4a25..6c56d6a3a 100644 --- a/tdeui/klineedit.h +++ b/tdeui/klineedit.h @@ -99,7 +99,7 @@ class KURL; * KLineEdit *edit = new KLineEdit( this, "mywidget" ); * TDECompletion *comp = edit->completionObject(); * // Connect to the return pressed signal - optional - * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(edit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * To use a customized completion objects or your @@ -110,7 +110,7 @@ class KURL; * KURLCompletion *comp = new KURLCompletion(); * edit->setCompletionObject( comp ); * // Connect to the return pressed signal - optional - * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(edit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * Note if you specify your own completion object you have to either delete diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp index 8fc0a9a4f..9bdd429ce 100644 --- a/tdeui/klineeditdlg.cpp +++ b/tdeui/klineeditdlg.cpp @@ -46,12 +46,12 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, edit = new KLineEdit( plainPage(), 0L ); edit->setMinimumWidth(edit->sizeHint().width() * 3); label->setBuddy(edit); // please "scheck" style - // connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); - connect( edit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&)) ); + // connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(accept()) ); + connect( edit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&)) ); topLayout->addWidget( edit, 1 ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) ); edit->setText( _value ); if ( _value.isEmpty() ) { @@ -76,7 +76,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, edit = new KLineEdit( this, 0L ); edit->setMinimumWidth(edit->sizeHint().width() * 3); - connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(accept()) ); if ( _file_mode ) { completion = new KURLCompletion(); @@ -91,8 +91,8 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, if (_file_mode) { TQPushButton *browse = new TQPushButton(i18n("&Browse..."), this); layout->addWidget(browse, 1, 2, AlignCenter); - connect(browse, TQT_SIGNAL(clicked()), - TQT_SLOT(slotBrowse())); + connect(browse, TQ_SIGNAL(clicked()), + TQ_SLOT(slotBrowse())); } TQFrame *hLine = new TQFrame(this); @@ -104,17 +104,17 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, TQPushButton *ok = bBox->addButton(KStdGuiItem::ok()); ok->setDefault(true); - connect( ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect( ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); bBox->addStretch(1); TQPushButton *clear = bBox->addButton(KStdGuiItem::clear()); - connect( clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClear())); + connect( clear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClear())); bBox->addStretch(1); TQPushButton *cancel = bBox->addButton(KStdGuiItem::cancel()); - connect( cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect( cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); bBox->layout(); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index fbbf4dd9a..0820fd29b 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -298,9 +298,9 @@ void KIntNumInput::init(int val, int _base) if (_base != 10) m_spin->setValidator(new KIntValidator(this, _base, "KNumInput::KIntValidtr")); - connect(m_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinValueChanged(int))); - connect(this, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotEmitRelativeValueChanged(int))); + connect(m_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinValueChanged(int))); + connect(this, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotEmitRelativeValueChanged(int))); setFocusProxy(m_spin); layout(true); @@ -346,8 +346,8 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider) m_slider = new TQSlider(lower, upper, step, m_spin->value(), TQt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), - m_spin, TQT_SLOT(setValue(int))); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), + m_spin, TQ_SLOT(setValue(int))); } // calculate (upper-lower)/10 without overflowing int's: @@ -616,10 +616,10 @@ void KDoubleNumInput::init(double value, double lower, double upper, d->spin = new KDoubleSpinBox( lower, upper, step, value, precision, this, "KDoubleNumInput::d->spin" ); setFocusProxy(d->spin); - connect( d->spin, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(valueChanged(double)) ); - connect( this, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotEmitRelativeValueChanged(double)) ); + connect( d->spin, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(valueChanged(double)) ); + connect( this, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotEmitRelativeValueChanged(double)) ); updateLegacyMembers(); @@ -754,8 +754,8 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, if( m_slider ) { // don't update the slider to avoid an endless recursion TQSpinBox * spin = d->spin; - disconnect(spin, TQT_SIGNAL(valueChanged(int)), - m_slider, TQT_SLOT(setValue(int)) ); + disconnect(spin, TQ_SIGNAL(valueChanged(int)), + m_slider, TQ_SLOT(setValue(int)) ); } d->spin->setRange( lower, upper, step, d->spin->precision() ); @@ -774,11 +774,11 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, TQt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); // feedback line: when one moves, the other moves, too: - connect(m_slider, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(sliderMoved(int)) ); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(sliderMoved(int)) ); } - connect(spin, TQT_SIGNAL(valueChanged(int)), - m_slider, TQT_SLOT(setValue(int)) ); + connect(spin, TQ_SIGNAL(valueChanged(int)), + m_slider, TQ_SLOT(setValue(int)) ); // calculate ( slmax - slmin ) / 10 without overflowing ints: int major = calcDiffByTen( slmax, slmin ); if ( !major ) major = slstep; // ### needed? @@ -1014,7 +1014,7 @@ KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) editor()->setAlignment( TQt::AlignRight ); d = new Private(); updateValidator(); - connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)) ); } KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, @@ -1026,7 +1026,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, d = new Private(); setRange( lower, upper, step, precision ); setValue( value ); - connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)) ); } KDoubleSpinBox::~KDoubleSpinBox() { diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp index 287208b66..f2a3d8f08 100644 --- a/tdeui/kpanelmenu.cpp +++ b/tdeui/kpanelmenu.cpp @@ -59,8 +59,8 @@ void KPanelMenu::init(const TQString& path) setInitialized( false ); d->startPath = path; - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); // setup cache timer TDEConfig *config = TDEGlobal::config(); @@ -99,8 +99,8 @@ void KPanelMenu::hideEvent(TQHideEvent *ev) { // start the cache timer if(d->clearDelay) { - disconnect(&(d->t), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClear())); - connect(&(d->t), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClear())); + disconnect(&(d->t), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClear())); + connect(&(d->t), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClear())); d->t.start(d->clearDelay, true); } TQPopupMenu::hideEvent(ev); diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 4aebc70b6..c34801777 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -277,7 +277,7 @@ void KPasswordDialog::init() m_Keep = 0; m_keepWarnLbl->hide(); } - connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool))); + connect(cb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeep(bool))); m_pGrid->addWidget(cb, 9, 2, TQt::AlignLeft|TQt::AlignVCenter); // m_pGrid->addWidget(m_keepWarnLbl, 13, 2, TQt::AlignLeft|TQt::AlignVCenter); m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3); @@ -330,8 +330,8 @@ void KPasswordDialog::init() d->m_MatchLabel->setText(i18n("Passwords do not match")); - connect( m_pEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(enableOkBtn()) ); - connect( m_pEdit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(enableOkBtn()) ); + connect( m_pEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(enableOkBtn()) ); + connect( m_pEdit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(enableOkBtn()) ); enableOkBtn(); } @@ -446,7 +446,7 @@ void KPasswordDialog::slotKeep(bool keep) else { m_keepWarnLbl->hide(); } - TQTimer::singleShot(0, this, SLOT(slotLayout())); + TQTimer::singleShot(0, this, TQ_SLOT(slotLayout())); } m_Keep = keep; diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index 7821ec767..9da2a67ab 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -96,8 +96,8 @@ void KPassivePopup::init( int popupStyle ) setPalette(TQToolTip::palette()); setAutoMask(TRUE); } - connect( hideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( hide() ) ); - connect( this, TQT_SIGNAL( clicked() ), TQT_SLOT( hide() ) ); + connect( hideTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( hide() ) ); + connect( this, TQ_SIGNAL( clicked() ), TQ_SLOT( hide() ) ); } KPassivePopup::~KPassivePopup() diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp index 48ee280a0..43cfa311d 100644 --- a/tdeui/kpixmapregionselectorwidget.cpp +++ b/tdeui/kpixmapregionselectorwidget.cpp @@ -141,12 +141,12 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, this, TQT_SLOT(rotateClockwise()), + 0, this, TQ_SLOT(rotateClockwise()), popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, this, TQT_SLOT(rotateCounterclockwise()), + 0, this, TQ_SLOT(rotateCounterclockwise()), popup, "rotatecounterclockwise"); action->plug(popup); diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp index 8fb050a11..1d259d820 100644 --- a/tdeui/kprogress.cpp +++ b/tdeui/kprogress.cpp @@ -196,9 +196,9 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name, mProgressBar = new KProgress(mainWidget); layout->addWidget(mProgressBar); - connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)), - this, TQT_SLOT(slotAutoActions(int))); - connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); + connect(mProgressBar, TQ_SIGNAL(percentageChanged(int)), + this, TQ_SLOT(slotAutoActions(int))); + connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow())); mShowTimer->start(mMinDuration, true); } diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp index 2472207f4..12ddba0a4 100644 --- a/tdeui/kprogressbox.cpp +++ b/tdeui/kprogressbox.cpp @@ -86,9 +86,9 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name, mTextBox = new KTextEdit(mainWidget); layout->addWidget(mTextBox); - connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)), - this, TQT_SLOT(slotAutoActions(int))); - connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); + connect(mProgressBar, TQ_SIGNAL(percentageChanged(int)), + this, TQ_SLOT(slotAutoActions(int))); + connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow())); mShowTimer->start(mMinDuration, true); } diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 2baffc4ee..3c73de83e 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -106,8 +106,8 @@ void KPushButton::init( const KGuiItem &item ) if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), - TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), + TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } } diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp index 517821ea1..93cb1f456 100644 --- a/tdeui/krootpixmap.cpp +++ b/tdeui/krootpixmap.cpp @@ -67,14 +67,14 @@ void KRootPixmap::init() m_bActive = false; m_bCustomPaint = false; - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint())); #ifdef Q_WS_X11 - connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); + connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); d->twin = new KWinModule( this ); - connect(d->twin, TQT_SIGNAL(windowChanged(WId, unsigned int)), TQT_SLOT(desktopChanged(WId, unsigned int))); - connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int))); + connect(d->twin, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int))); + connect(d->twin, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(desktopChanged(int))); #endif d->toplevel = m_pWidget->topLevelWidget(); diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index cb211e4df..8256ad72a 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -101,18 +101,18 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, TQGridLayout *glay = new TQGridLayout( this, 6, 3, 0, KDialog::spacingHint() ); cb1 = new TQCheckBox( i18n("Create &root/affix combinations" " not in dictionary"), this, "NoRootAffix" ); - connect( cb1, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sNoAff(bool)) ); + connect( cb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sNoAff(bool)) ); glay->addMultiCellWidget( cb1, 0, 0, 0, 2 ); cb2 = new TQCheckBox( i18n("Consider run-together &words" " as spelling errors"), this, "RunTogether" ); - connect( cb2, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sRunTogether(bool)) ); + connect( cb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sRunTogether(bool)) ); glay->addMultiCellWidget( cb2, 1, 1, 0, 2 ); dictcombo = new TQComboBox( this, "DictFromList" ); dictcombo->setInsertionPolicy( TQComboBox::NoInsertion ); - connect( dictcombo, TQT_SIGNAL (activated(int)), - this, TQT_SLOT (sSetDictionary(int)) ); + connect( dictcombo, TQ_SIGNAL (activated(int)), + this, TQ_SLOT (sSetDictionary(int)) ); glay->addMultiCellWidget( dictcombo, 2, 2, 1, 2 ); dictlist = new TQLabel( dictcombo, i18n("&Dictionary:"), this ); @@ -136,8 +136,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, encodingcombo->insertItem( "CP1251" ); encodingcombo->insertItem( "CP1255" ); - connect( encodingcombo, TQT_SIGNAL(activated(int)), this, - TQT_SLOT(sChangeEncoding(int)) ); + connect( encodingcombo, TQ_SIGNAL(activated(int)), this, + TQ_SLOT(sChangeEncoding(int)) ); glay->addMultiCellWidget( encodingcombo, 3, 3, 1, 2 ); TQLabel *tmpQLabel = new TQLabel( encodingcombo, i18n("&Encoding:"), this); @@ -149,8 +149,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, clientcombo->insertItem( i18n("Aspell") ); clientcombo->insertItem( i18n("Hspell") ); clientcombo->insertItem( i18n("Zemberek") ); - connect( clientcombo, TQT_SIGNAL (activated(int)), this, - TQT_SLOT (sChangeClient(int)) ); + connect( clientcombo, TQ_SIGNAL (activated(int)), this, + TQ_SLOT (sChangeClient(int)) ); glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 ); tmpQLabel = new TQLabel( clientcombo, i18n("&Client:"), this ); @@ -159,7 +159,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, if( addHelpButton ) { TQPushButton *pushButton = new KPushButton( KStdGuiItem::help(), this ); - connect( pushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(sHelp()) ); + connect( pushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(sHelp()) ); glay->addWidget(pushButton, 5, 2); } @@ -926,7 +926,7 @@ KSpellConfig::sSetDictionary (int i) { setDictionary (langfnames[i]); setDictFromList (true); - TQTimer::singleShot( 0, this, TQT_SIGNAL( configChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SIGNAL( configChanged() ) ); } void diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp index b765e6a2c..f0d77be26 100644 --- a/tdeui/kscrollview.cpp +++ b/tdeui/kscrollview.cpp @@ -44,7 +44,7 @@ KScrollView::KScrollView( TQWidget *parent, const char *name, TQt::WFlags f ) : TQScrollView( parent, name, f ) { d = new KScrollViewPrivate; - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick())); } KScrollView::~KScrollView() diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h index 79fa57100..cd3d53ad4 100644 --- a/tdeui/ksharedpixmap.h +++ b/tdeui/ksharedpixmap.h @@ -41,7 +41,7 @@ class TDESharedPixmapPrivate; * An example: copy from a shared pixmap: * \code * TDESharedPixmap *pm = new TDESharedPixmap; - * connect(pm, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); + * connect(pm, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); * pm->loadFromShared("My Pixmap"); * \endcode * diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp index daa22f46b..ce6585686 100644 --- a/tdeui/kstatusbar.cpp +++ b/tdeui/kstatusbar.cpp @@ -44,8 +44,8 @@ KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id, setAlignment( AlignHCenter | AlignVCenter | SingleLine ); - connect (this, TQT_SIGNAL(itemPressed(int)), parent, TQT_SIGNAL(pressed(int))); - connect (this, TQT_SIGNAL(itemReleased(int)), parent, TQT_SIGNAL(released(int))); + connect (this, TQ_SIGNAL(itemPressed(int)), parent, TQ_SIGNAL(pressed(int))); + connect (this, TQ_SIGNAL(itemReleased(int)), parent, TQ_SIGNAL(released(int))); } void KStatusBarLabel::mousePressEvent (TQMouseEvent *) diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h index db1199757..76aad98a8 100644 --- a/tdeui/kstdaction.h +++ b/tdeui/kstdaction.h @@ -52,13 +52,13 @@ class TDEToggleFullScreenAction; * \code * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("document-new")), * TDEStdAccel::shortcut(TDEStdAccel::New), this, - * TQT_SLOT(fileNew()), actionCollection()); + * TQ_SLOT(fileNew()), actionCollection()); * \endcode * * You could drop that and replace it with: * * \code - * TDEAction *newAct = KStdAction::openNew(this, TQT_SLOT(fileNew()), + * TDEAction *newAct = KStdAction::openNew(this, TQ_SLOT(fileNew()), * actionCollection()); * \endcode * @@ -84,7 +84,7 @@ class TDEToggleFullScreenAction; * do something like: * * \code - * (void)KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection(), "my_cut"); + * (void)KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection(), "my_cut"); * \endcode * * Now, in your local XML resource file (e.g., yourappui.rc), simply @@ -102,14 +102,14 @@ class TDEToggleFullScreenAction; * * Another non-standard usage concerns instantiating the action in the * first place. Usually, you would use the member functions as - * shown above (e.g., KStdAction::cut(this, SLOT, parent)). You + * shown above (e.g., KStdAction::cut(this, TQ_SLOT, parent)). You * may, however, do this using the enums provided. This author can't * think of a reason why you would want to, but, hey, if you do, * here's how: * * \code - * (void)KStdAction::action(KStdAction::New, this, TQT_SLOT(fileNew()), actionCollection()); - * (void)KStdAction::action(KStdAction::Cut, this, TQT_SLOT(editCut()), actionCollection()); + * (void)KStdAction::action(KStdAction::New, this, TQ_SLOT(fileNew()), actionCollection()); + * (void)KStdAction::action(KStdAction::Cut, this, TQ_SLOT(editCut()), actionCollection()); * \endcode * * @author Kurt Granroth <granroth@kde.org> @@ -212,7 +212,7 @@ namespace KStdAction * Open a recently used document. The signature of the slot being called * is of the form slotURLSelected( const KURL & ). * @param recvr object to receive slot - * @param slot The TQT_SLOT to invoke when a URL is selected. The slot's + * @param slot The slot to invoke when a URL is selected. The slot's * signature is slotURLSelected( const KURL & ). * @param parent parent widget * @param name name of widget @@ -532,7 +532,7 @@ namespace KStdAction * Display the configure key bindings dialog. * * Note that you might be able to use the pre-built KXMLGUIFactory's fuction: - * KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + * KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); */ TDEUI_EXPORT TDEAction *keyBindings(const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name = 0 ); diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index 1f180c956..0d4563b6f 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -122,7 +122,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( KPushButton *addLangButton = new KPushButton(i18n("Add fallback language"), d->page, "addLangButton"); TQToolTip::add(addLangButton, i18n("Adds one more language which will be used if other translations do not contain proper translation")); - connect(addLangButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddLanguageButton())); + connect(addLangButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddLanguageButton())); addButtonHorizontalLayout->addWidget(addLangButton); addButtonHorizontalLayout->addStretch(); @@ -291,9 +291,9 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo TQObject::connect( languageButton, - TQT_SIGNAL(activated( const TQString &)), + TQ_SIGNAL(activated( const TQString &)), p, - TQT_SLOT(languageOnButtonChanged(const TQString &)) + TQ_SLOT(languageOnButtonChanged(const TQString &)) ); LanguageRowData languageRowData; @@ -305,9 +305,9 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo TQObject::connect( removeButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), p, - TQT_SLOT(removeButtonClicked()) + TQ_SLOT(removeButtonClicked()) ); } diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index 80529ed34..8e46e14ec 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -300,11 +300,11 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, textEdit->viewport()->installEventFilter( this ); d->rehighlightRequest = new TQTimer(this); - connect( d->rehighlightRequest, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRehighlight() )); + connect( d->rehighlightRequest, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRehighlight() )); d->spellTimeout = new TQTimer(this); - connect( d->spellTimeout, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotKSpellNotResponding() )); + connect( d->spellTimeout, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotKSpellNotResponding() )); if ( d->globalConfig ) { d->spellKey = spellKey(); @@ -314,8 +314,8 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, } else { d->mDict = new TQDict<int>(4001); - connect( d->mSpellConfig, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotLocalSpellConfigChanged() ) ); + connect( d->mSpellConfig, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotLocalSpellConfigChanged() ) ); } slotDictionaryChanged(); @@ -339,8 +339,8 @@ void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) if ( cg.readEntry("KSpell_DoSpellChecking") != "0" ) { if ( d->globalConfig ) { - connect( d->sDictionaryMonitor, TQT_SIGNAL( destroyed()), - this, TQT_SLOT( slotDictionaryChanged() )); + connect( d->sDictionaryMonitor, TQ_SIGNAL( destroyed()), + this, TQ_SLOT( slotDictionaryChanged() )); } if ( spell != d->spell ) { @@ -352,10 +352,10 @@ void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { d->spell->addPersonal( *it ); } - connect( spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int )), - this, TQT_SLOT( slotMisspelling( const TQString &, const TQStringList &, unsigned int ))); - connect( spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int )), - this, TQT_SLOT( slotCorrected( const TQString &, const TQString &, unsigned int ))); + connect( spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int )), + this, TQ_SLOT( slotMisspelling( const TQString &, const TQStringList &, unsigned int ))); + connect( spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int )), + this, TQ_SLOT( slotCorrected( const TQString &, const TQString &, unsigned int ))); d->checksRequested = 0; d->checksDone = 0; d->completeRehighlightRequired = true; @@ -514,7 +514,7 @@ void KDictSpellingHighlighter::slotRehighlight() } if (d->checksDone == d->checksRequested) d->completeRehighlightRequired = false; - TQTimer::singleShot( 0, this, TQT_SLOT( slotAutoDetection() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAutoDetection() )); } void KDictSpellingHighlighter::slotDictionaryChanged() @@ -526,7 +526,7 @@ void KDictSpellingHighlighter::slotDictionaryChanged() d->autoDict.clear(); d->spell = new KSpell( 0, i18n( "Incremental Spellcheck" ), this, - TQT_SLOT( slotSpellReady( KSpell * ) ), d->mSpellConfig ); + TQ_SLOT( slotSpellReady( KSpell * ) ), d->mSpellConfig ); } void KDictSpellingHighlighter::slotLocalSpellConfigChanged() @@ -657,7 +657,7 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) if ( k->key() == Key_Space || k->key() == Key_Enter || k->key() == Key_Return ) { - TQTimer::singleShot( 0, this, TQT_SLOT( slotAutoDetection() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAutoDetection() )); } } diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 7d4497d5a..295842f3f 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -77,12 +77,12 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) menu = new TDEPopupMenu( this ); menu->insertTitle( kapp->miniIcon(), kapp->caption() ); move( -1000, -1000 ); - KStdAction::quit(this, TQT_SLOT(maybeQuit()), d->actionCollection); + KStdAction::quit(this, TQ_SLOT(maybeQuit()), d->actionCollection); if (parentWidget()) { new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(), - this, TQT_SLOT( minimizeRestoreAction() ), + this, TQ_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index 01b228247..ed30bc466 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -43,12 +43,12 @@ KTabBar::KTabBar( TQWidget *parent, const char *name ) setMouseTracking( true ); mEnableCloseButtonTimer = new TQTimer( this ); - connect( mEnableCloseButtonTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( enableCloseButton() ) ); + connect( mEnableCloseButtonTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( enableCloseButton() ) ); mActivateDragSwitchTabTimer = new TQTimer( this ); - connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) ); + connect( mActivateDragSwitchTabTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( activateDragSwitchTab() ) ); - connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange())); + connect(this, TQ_SIGNAL(layoutChanged()), TQ_SLOT(onLayoutChange())); } KTabBar::~KTabBar() @@ -201,7 +201,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mEnableCloseButtonTimer->start( TQApplication::doubleClickInterval(), true ); } mHoverCloseButtonTab = t; - connect( mHoverCloseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( closeButtonClicked() ) ); + connect( mHoverCloseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( closeButtonClicked() ) ); return; } } diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp index 0ff9f64e4..193e68a38 100644 --- a/tdeui/ktabctl.cpp +++ b/tdeui/ktabctl.cpp @@ -35,7 +35,7 @@ KTabCtl::KTabCtl(TQWidget *parent, const char *name) : TQWidget(parent, name) { tabs = new TQTabBar(this, "_tabbar"); - connect(tabs, TQT_SIGNAL(selected(int)), this, TQT_SLOT(showTab(int))); + connect(tabs, TQ_SIGNAL(selected(int)), this, TQ_SLOT(showTab(int))); tabs->move(2, 1); blBorder = true; diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index 10ed6ae76..bcccc4c9a 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -58,16 +58,16 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f ) setHoverCloseButtonDelayed(false); - connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & ))); - connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int ))); - connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int ))); - connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int ))); - connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * ))); - connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int ))); - connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int ))); + connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & ))); + connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int ))); + connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int ))); + connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int ))); + connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * ))); + connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int ))); + connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int ))); #ifndef TQT_NO_WHEELEVENT - connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int ))); + connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int ))); #endif } diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index a0331ccf7..f53973352 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -32,8 +32,8 @@ KTextBrowser::KTextBrowser( TQWidget *parent, const char *name, { // //1999-10-04 Espen Sand: Not required anymore ? - //connect( this, TQT_SIGNAL(highlighted(const TQString &)), - // this, TQT_SLOT(refChanged(const TQString &))); + //connect( this, TQ_SIGNAL(highlighted(const TQString &)), + // this, TQ_SLOT(refChanged(const TQString &))); } KTextBrowser::~KTextBrowser( void ) diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index ac0b567e8..22d8dd0ab 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -229,16 +229,16 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos ) menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ), - this, TQT_SLOT( checkSpelling() ) ); + this, TQ_SLOT( checkSpelling() ) ); if( text().isEmpty() ) menu->setItemEnabled( id, false ); id = menu->insertItem( i18n( "Auto Spell Check" ), - this, TQT_SLOT( toggleAutoSpellCheck() ) ); + this, TQ_SLOT( toggleAutoSpellCheck() ) ); menu->setItemChecked(id, d->checkSpellingEnabled); menu->insertSeparator(); - id=menu->insertItem(i18n("Allow Tabulations"),this,TQT_SLOT(slotAllowTab())); + id=menu->insertItem(i18n("Allow Tabulations"),this,TQ_SLOT(slotAllowTab())); menu->setItemChecked(id, !tabChangesFocus()); } @@ -351,16 +351,16 @@ void KTextEdit::checkSpelling() { delete d->spell; d->spell = new KSpell( this, i18n( "Spell Checking" ), - this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); - connect( d->spell, TQT_SIGNAL( death() ), - this, TQT_SLOT( spellCheckerFinished() ) ); + connect( d->spell, TQ_SIGNAL( death() ), + this, TQ_SLOT( spellCheckerFinished() ) ); - connect( d->spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ), - this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); + connect( d->spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ), + this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); - connect( d->spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ), - this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); + connect( d->spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ), + this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); } void KTextEdit::spellCheckerMisspelling( const TQString &text, const TQStringList &, unsigned int pos ) @@ -398,7 +398,7 @@ void KTextEdit::spellCheckerFinished() void KTextEdit::slotSpellCheckReady( KSpell *s ) { s->check( text() ); - connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) ); + connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) ); } void KTextEdit::slotSpellCheckDone( const TQString &s ) diff --git a/tdeui/ktimewidget.cpp b/tdeui/ktimewidget.cpp index 4d48b2129..aaa0be9e4 100644 --- a/tdeui/ktimewidget.cpp +++ b/tdeui/ktimewidget.cpp @@ -41,8 +41,8 @@ void KTimeWidget::init() d->timeWidget = new TQTimeEdit(this); - connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)), - TQT_SIGNAL(valueChanged(const TQTime &))); + connect(d->timeWidget, TQ_SIGNAL(valueChanged(const TQTime &)), + TQ_SIGNAL(valueChanged(const TQTime &))); } void KTimeWidget::setTime(const TQTime & time) diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 76e44be0d..9480bf6ac 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -304,10 +304,10 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TDEConfigGroup config(kapp->config(), "TipOfDay"); mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true)); - connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip())); - connect(prev, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevTip())); - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(mTipOnStart, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showOnStart(bool))); + connect(next, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextTip())); + connect(prev, TQ_SIGNAL(clicked()), this, TQ_SLOT(prevTip())); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(mTipOnStart, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showOnStart(bool))); ok->setFocus(); diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 60e2faba6..4a296a284 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -50,7 +50,7 @@ public: MarginAltered(false), Timer (new TQTimer (label)) { - connect (Timer, TQT_SIGNAL (timeout ()), label, TQT_SLOT (updateColor ())); + connect (Timer, TQ_SIGNAL (timeout ()), label, TQ_SLOT (updateColor ())); } ~Private () diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h index 797ee320c..ab5ff067e 100644 --- a/tdeui/kurllabel.h +++ b/tdeui/kurllabel.h @@ -51,8 +51,8 @@ class TQPixmap; * KURLLabel *address = new KURLLabel(this); * address->setText("My homepage"); * address->setURL("http://www.home.com/~me"); - * connect(address, TQT_SIGNAL(leftClickedURL(const TQString&)), - * TQT_SLOT(processMyURL(const TQString&))); + * connect(address, TQ_SIGNAL(leftClickedURL(const TQString&)), + * TQ_SLOT(processMyURL(const TQString&))); * \endcode * * In this example, the text "My homepage" would be displayed diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h index b6b91ed47..775446308 100644 --- a/tdeui/kxmlguifactory.h +++ b/tdeui/kxmlguifactory.h @@ -183,7 +183,7 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject * This slot can be connected dirrectly to the action to configure shortcuts. This is very simple to * do that by adding a single line * \code - * KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + * KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); * \endcode * * @param bAllowLetterShortcuts Set to false if unmodified alphanumeric diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp index e9eb2f4b8..636d336f2 100644 --- a/tdeui/tdeaboutapplication.cpp +++ b/tdeui/tdeaboutapplication.cpp @@ -96,8 +96,8 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData ) url->setText(aboutData->homepage()); url->setURL(aboutData->homepage()); appPage->addWidget( url ); - connect( url, TQT_SIGNAL(leftClickedURL(const TQString &)), - this, TQT_SLOT(openURLSlot(const TQString &))); + connect( url, TQ_SIGNAL(leftClickedURL(const TQString &)), + this, TQ_SLOT(openURLSlot(const TQString &))); } int authorCount = aboutData->authors().count(); diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp index b2b09e6a2..57bc84d24 100644 --- a/tdeui/tdeaboutdialog.cpp +++ b/tdeui/tdeaboutdialog.cpp @@ -96,15 +96,15 @@ TDEAboutContributor::TDEAboutContributor( TQWidget *_parent, const char *wname, kurl->setFloat(true); kurl->setUnderline(true); kurl->setMargin(0); - connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(emailClickedSlot(const TQString &))); + connect(kurl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(emailClickedSlot(const TQString &))); kurl = static_cast<KURLLabel *>(mText[2]); kurl->setFloat(true); kurl->setUnderline(true); kurl->setMargin(0); - connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(urlClickedSlot(const TQString &))); + connect(kurl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(urlClickedSlot(const TQString &))); mLabel[3]->setAlignment( AlignTop ); @@ -359,8 +359,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, vbox = new TQVBoxLayout( mImageFrame, 1 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); vbox->addStretch(10); vbox->addWidget( mImageLabel ); vbox->addStretch(10); @@ -386,8 +386,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, gbox->setColStretch( 2, 10 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); gbox->addWidget( mImageLabel, 1, 1 ); gbox->activate(); } @@ -410,8 +410,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, vbox = new TQVBoxLayout( mImageFrame, 1 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); vbox->addStretch(10); vbox->addWidget( mImageLabel ); vbox->addStretch(10); @@ -475,10 +475,10 @@ TQFrame *TDEAboutContainerBase::addTextPage( const TQString &title, browser->setMinimumHeight( fontMetrics().lineSpacing()*numLines ); vbox->addWidget(browser); - connect(browser, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(browser, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(browser, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(browser, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); } else { @@ -527,10 +527,10 @@ TDEAboutContainer *TDEAboutContainerBase::addContainerPage( const TQString &titl innerAlignment ); mPageTab->addTab( container, title ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -559,10 +559,10 @@ TDEAboutContainer *TDEAboutContainerBase::addScrolledContainerPage( scrollView->addChild( container ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -591,10 +591,10 @@ TDEAboutContainer *TDEAboutContainerBase::addContainer( int childAlignment, 0, KDialog::spacingHint(), childAlignment, innerAlignment ); mTopLayout->addWidget( container, 0, childAlignment ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -883,10 +883,10 @@ void TDEAboutContainer::addPerson( const TQString &_name, const TQString &_email TDEAboutContributor* const cont = new TDEAboutContributor( this, "pers", _name, _email, _url, _task, showHeader, showFrame, showBold ); - connect( cont, TQT_SIGNAL( openURL(const TQString&)), - this, TQT_SIGNAL( urlClick(const TQString &))); - connect( cont, TQT_SIGNAL( sendEmail(const TQString &, const TQString &)), - this, TQT_SIGNAL( mailClick(const TQString &, const TQString &))); + connect( cont, TQ_SIGNAL( openURL(const TQString&)), + this, TQ_SIGNAL( urlClick(const TQString &))); + connect( cont, TQ_SIGNAL( sendEmail(const TQString &, const TQString &)), + this, TQ_SIGNAL( mailClick(const TQString &, const TQString &))); } @@ -1011,10 +1011,10 @@ TDEAboutContributor::TDEAboutContributor(TQWidget* parent, const char* n) } setFrameStyle(TQFrame::Panel | TQFrame::Raised); // ----- - connect(email, TQT_SIGNAL(leftClickedURL(const TQString&)), - TQT_SLOT(emailClickedSlot(const TQString&))); - connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), - TQT_SLOT(urlClickedSlot(const TQString&))); + connect(email, TQ_SIGNAL(leftClickedURL(const TQString&)), + TQ_SLOT(emailClickedSlot(const TQString&))); + connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)), + TQ_SLOT(urlClickedSlot(const TQString&))); // ############################################################ } @@ -1328,14 +1328,14 @@ TDEAboutWidget::TDEAboutWidget(TQWidget *_parent, const char *_name) logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised); version->setAlignment(AlignCenter); // ----- - connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(author, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); - connect(maintainer, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(maintainer, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); + connect(author, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(author, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); + connect(maintainer, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(maintainer, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); // ################################################################# } @@ -1439,9 +1439,9 @@ TDEAboutWidget::addContributor(const TQString &_name, const TQString &_email, c->setURL(_url); c->setWork(_w); contributors.append(c); - connect(c, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(c, TQT_SIGNAL(openURL(const TQString&)), TQT_SLOT(openURLSlot(const TQString&))); + connect(c, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(c, TQ_SIGNAL(openURL(const TQString&)), TQ_SLOT(openURLSlot(const TQString&))); // ############################################################################ } @@ -1515,10 +1515,10 @@ TDEAboutDialog::TDEAboutDialog(TQWidget *_parent, const char *_name, bool modal) tqApp->quit(); } setMainWidget(about); - connect(about, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(about, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); + connect(about, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(about, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); // ################################################################# } @@ -1537,12 +1537,12 @@ TDEAboutDialog::TDEAboutDialog( int layoutType, const TQString &_caption, mContainerBase = new TDEAboutContainerBase( layoutType, this ); setMainWidget(mContainerBase); - connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)), - this, TQT_SLOT(openURLSlot(const TQString &))); - connect( mContainerBase, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - this, TQT_SLOT(sendEmailSlot(const TQString &,const TQString &))); - connect( mContainerBase, TQT_SIGNAL(mouseTrack(int, const TQMouseEvent *)), - this, TQT_SLOT(mouseTrackSlot(int, const TQMouseEvent *))); + connect( mContainerBase, TQ_SIGNAL(urlClick(const TQString &)), + this, TQ_SLOT(openURLSlot(const TQString &))); + connect( mContainerBase, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + this, TQ_SLOT(sendEmailSlot(const TQString &,const TQString &))); + connect( mContainerBase, TQ_SIGNAL(mouseTrack(int, const TQMouseEvent *)), + this, TQ_SLOT(mouseTrackSlot(int, const TQMouseEvent *))); } diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp index bf818fc03..d63e71feb 100644 --- a/tdeui/tdeaction.cpp +++ b/tdeui/tdeaction.cpp @@ -262,7 +262,7 @@ void TDEAction::initPrivate( const TQString& text, const TDEShortcut& cut, m_parentCollection->insert( this ); if ( receiver && slot ) - connect( this, TQT_SIGNAL( activated() ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), receiver, slot ); if( !cut.isNull() && !qstrcmp( name(), "unnamed" ) ) kdWarning(129) << "TDEAction::initPrivate(): trying to assign a shortcut (" << cut.toStringInternal() << ") to an unnamed action." << endl; @@ -462,7 +462,7 @@ bool TDEAction::updateTDEAccelShortcut( TDEAccel* tdeaccel ) kdDebug(129) << "Inserting " << name() << ", " << d->text() << ", " << d->plainText() << endl; b = tdeaccel->insert( name(), d->plainText(), TQString::null, d->m_cut, - this, TQT_SLOT(slotActivated()), + this, TQ_SLOT(slotActivated()), isShortcutConfigurable(), isEnabled() ); } } @@ -478,7 +478,7 @@ void TDEAction::insertTDEAccel( TDEAccel* tdeaccel ) if ( !tdeaccel->actions().actionPtr( name() ) ) { if( updateTDEAccelShortcut( tdeaccel ) ) { d->m_tdeaccelList.append( tdeaccel ); - connect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); } } else @@ -496,7 +496,7 @@ void TDEAction::removeTDEAccel( TDEAccel* tdeaccel ) if( (*itr) == tdeaccel ) { tdeaccel->remove( name() ); accelList.remove( itr ); - disconnect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + disconnect( tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); break; } } @@ -664,12 +664,12 @@ int TDEAction::plug( TQWidget *w, int index ) else instance = TDEGlobal::instance(); id = menu->insertItem( d->iconSet( TDEIcon::Small, 0, instance ), d->text(), this,//dsweet - TQT_SLOT( slotPopupActivated() ), keyQt, + TQ_SLOT( slotPopupActivated() ), keyQt, -1, index ); } else id = menu->insertItem( d->text(), this, - TQT_SLOT( slotPopupActivated() ), + TQ_SLOT( slotPopupActivated() ), keyQt, -1, index ); // If the shortcut is already in a TDEAccel object, then @@ -686,7 +686,7 @@ int TDEAction::plug( TQWidget *w, int index ) menu->TQMenuData::setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( menu, this ); @@ -706,8 +706,8 @@ int TDEAction::plug( TQWidget *w, int index ) if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index ); } else @@ -715,8 +715,8 @@ int TDEAction::plug( TQWidget *w, int index ) TQString icon = d->iconName(); if ( icon.isEmpty() ) icon = "unknown"; - bar->insertButton( icon, id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( icon, id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index, instance ); } @@ -731,7 +731,7 @@ int TDEAction::plug( TQWidget *w, int index ) addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( bar, this ); @@ -791,10 +791,10 @@ void TDEAction::plugAccel(TDEAccel *kacc, bool configurable) d->m_tdeaccel = kacc; d->m_tdeaccel->insert(name(), d->plainText(), TQString::null, TDEShortcut(d->m_cut), - this, TQT_SLOT(slotActivated()), + this, TQ_SLOT(slotActivated()), configurable, isEnabled()); - connect(d->m_tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed())); - //connect(d->m_tdeaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged())); + connect(d->m_tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed())); + //connect(d->m_tdeaccel, TQ_SIGNAL(keycodeChanged()), this, TQ_SLOT(slotKeycodeChanged())); } else { @@ -1184,7 +1184,7 @@ void TDEAction::slotDestroyed() { if ( o == *itr ) { - disconnect( *itr, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + disconnect( *itr, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); accelList.remove(itr); return; } diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h index 355675e87..9bf232c49 100644 --- a/tdeui/tdeaction.h +++ b/tdeui/tdeaction.h @@ -109,12 +109,12 @@ class TDEMainWindow; * * \code * TQSignalMapper *desktopNumberMapper = new TQSignalMapper( this ); - * connect( desktopNumberMapper, TQT_SIGNAL( mapped( int ) ), - * this, TQT_SLOT( moveWindowToDesktop( int ) ) ); + * connect( desktopNumberMapper, TQ_SIGNAL( mapped( int ) ), + * this, TQ_SLOT( moveWindowToDesktop( int ) ) ); * * for ( uint i = 0; i < numberOfDesktops; ++i ) { * TDEAction *desktopAction = new TDEAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... ); - * connect( desktopAction, TQT_SIGNAL( activated() ), desktopNumberMapper, TQT_SLOT( map() ) ); + * connect( desktopAction, TQ_SIGNAL( activated() ), desktopNumberMapper, TQ_SLOT( map() ) ); * desktopNumberMapper->setMapping( desktopAction, i ); * } * \endcode @@ -135,7 +135,7 @@ class TDEMainWindow; * \code * TDEAction *newAct = new TDEAction(i18n("&New"), "document-new", * TDEStdAccel::shortcut(TDEStdAccel::New), - * this, TQT_SLOT(fileNew()), + * this, TQ_SLOT(fileNew()), * actionCollection(), "new"); * \endcode * This line creates our action. It says that wherever this action is @@ -215,7 +215,7 @@ class TDEUI_EXPORT TDEAction : public TQObject public: /** * Constructs an action with text, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. * * If you do not want or have a keyboard shortcut, @@ -228,8 +228,8 @@ public: * * @param text The text that will be displayed. * @param cut The corresponding keyboard shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -239,7 +239,7 @@ public: /** * Constructs an action with text, icon, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. * * If you do not want or have a keyboard shortcut, set the @@ -251,8 +251,8 @@ public: * @param text The text that will be displayed. * @param pix The icon to display. * @param cut The corresponding keyboard shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -262,7 +262,7 @@ public: /** * Constructs an action with text, icon, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. The icon is loaded on demand later based on where it * is plugged in. * @@ -275,8 +275,8 @@ public: * @param text The text that will be displayed. * @param pix The icon to display. * @param cut The corresponding keyboard shortcut (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -290,8 +290,8 @@ public: * * @param item The KGuiItem with the label and (optional) icon. * @param cut The corresponding keyboard shortcut (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index 3fff45564..ad9c4d102 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -507,7 +507,7 @@ void TDESelectAction::setupMenu() const for( uint id = 0; it != d->m_list.end(); ++it, ++id ) { TQString text = *it; if ( !text.isEmpty() ) - d->m_menu->insertItem( d->makeMenuText( text ), this, TQT_SLOT( slotActivated( int ) ), 0, id ); + d->m_menu->insertItem( d->makeMenuText( text ), this, TQ_SLOT( slotActivated( int ) ), 0, id ); else d->m_menu->insertSeparator(); } @@ -661,7 +661,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -670,8 +670,8 @@ int TDESelectAction::plug( TQWidget *widget, int index ) TDEToolBar* bar = static_cast<TDEToolBar*>( widget ); int id_ = TDEAction::getToolButtonID(); bar->insertCombo( comboItems(), id_, isEditable(), - TQT_SIGNAL( activated( const TQString & ) ), this, - TQT_SLOT( slotActivated( const TQString & ) ), isEnabled(), + TQ_SIGNAL( activated( const TQString & ) ), this, + TQ_SLOT( slotActivated( const TQString & ) ), isEnabled(), toolTip(), -1, index ); TQComboBox *cb = bar->getCombo( id_ ); @@ -691,7 +691,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); updateCurrentItem( containerCount() - 1 ); @@ -713,7 +713,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -771,7 +771,7 @@ void TDESelectAction::slotActivated( int id ) setCurrentItem( id ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. - TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) ); } void TDESelectAction::slotActivated( const TQString &text ) @@ -793,7 +793,7 @@ void TDESelectAction::slotActivated( const TQString &text ) setCurrentItem( comboItems().findIndex( text ) ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. - TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) ); } void TDESelectAction::slotActivated() @@ -858,7 +858,7 @@ TDEListAction::TDEListAction( const TQString& text, const TDEShortcut& cut, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix, @@ -885,7 +885,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( const TQString& text, const TQString& pix, @@ -896,7 +896,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQString& pix, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( TQObject* parent, const char* name ) @@ -970,7 +970,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1015,7 +1015,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1034,7 +1034,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1052,10 +1052,10 @@ void TDERecentFilesAction::init() { TDERecentFilesAction *that = const_cast<TDERecentFilesAction*>(this); that->d->m_popup = new TDEPopupMenu; - connect(d->m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow())); - connect(d->m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); - connect( this, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( itemSelected( const TQString& ) ) ); + connect(d->m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow())); + connect(d->m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); + connect( this, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( itemSelected( const TQString& ) ) ); setMenuAccelsEnabled( false ); } @@ -1284,13 +1284,13 @@ int TDERecentFilesAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotClicked() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotClicked() ), isEnabled(), plainText(), index, instance ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); bar->setDelayedPopup( id_, d->m_popup, true); @@ -1531,15 +1531,15 @@ int TDEFontAction::plug( TQWidget *w, int index ) TDEToolBar* bar = static_cast<TDEToolBar*>( w ); int id_ = TDEAction::getToolButtonID(); TDEFontCombo *cb = new TDEFontCombo( items(), bar ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - TQT_SLOT( slotActivated( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + TQ_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); updateCurrentItem( containerCount() - 1 ); @@ -1809,7 +1809,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) menu->setItemEnabled( id, false ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( menu, this ); @@ -1823,8 +1823,8 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index ); else { @@ -1835,8 +1835,8 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); } @@ -1845,7 +1845,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) if (!whatsThis().isEmpty()) TQWhatsThis::add( bar->getButton(id_), whatsThis() ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if (delayed()) { bar->setDelayedPopup( id_, popupMenu(), stickyMenu() ); @@ -1870,7 +1870,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) bar->setItemEnabled( id, false ); addContainer( bar, id ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -1950,8 +1950,8 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index ) int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), isEnabled(), plainText(), index ); } else { @@ -1961,15 +1961,15 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( icon(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), isEnabled(), plainText(), index, instance ); } addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if (delayed()) { bar->setDelayedPopup( id_, popupMenu(), stickyMenu() ); @@ -2036,9 +2036,9 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index ) if( m_toolBar ) { setChecked( m_toolBar->isVisible() ); - connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(setChecked(bool)) ); + connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(setChecked(bool)) ); // Also emit toggled when the toolbar's visibility changes (see comment in header) - connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SIGNAL(toggled(bool)) ); + connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SIGNAL(toggled(bool)) ); } else { setEnabled( false ); } @@ -2122,7 +2122,7 @@ KWidgetAction::KWidgetAction( TQWidget* widget, , m_widget( widget ) , m_autoSized( false ) { - connect( this, TQT_SIGNAL(enabled(bool)), widget, TQT_SLOT(setEnabled(bool)) ); + connect( this, TQ_SIGNAL(enabled(bool)), widget, TQ_SLOT(setEnabled(bool)) ); } KWidgetAction::~KWidgetAction() @@ -2173,8 +2173,8 @@ int KWidgetAction::plug( TQWidget* w, int index ) TQWhatsThis::add( m_widget, whatsThis() ); addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2187,7 +2187,7 @@ void KWidgetAction::unplug( TQWidget *w ) TDEToolBar* toolBar = (TDEToolBar*)m_widget->parent(); if ( toolBar == w ) { - disconnect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) ); + disconnect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) ); m_widget->reparent( 0L, TQPoint(), false /*showIt*/ ); } TDEAction::unplug( w ); @@ -2224,7 +2224,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) int id = menu->insertSeparator( index ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2236,7 +2236,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) addContainer( menuBar, id ); - connect( menuBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menuBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2248,7 +2248,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2265,8 +2265,8 @@ TDEPasteTextAction::TDEPasteTextAction( const TQString& text, : TDEAction( text, icon, cut, receiver, slot, parent, name ) { m_popup = new TDEPopupMenu; - connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow())); - connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); + connect(m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow())); + connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); m_popup->setCheckable(true); m_mixedMode = true; } @@ -2297,13 +2297,13 @@ int TDEPasteTextAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); bar->setDelayedPopup( id_, m_popup, true ); @@ -2357,7 +2357,7 @@ void TDEPasteTextAction::menuItemActivated( int id) if (reply.isValid()) kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl; } - TQTimer::singleShot(20, this, TQT_SLOT(slotActivated())); + TQTimer::singleShot(20, this, TQ_SLOT(slotActivated())); } void TDEPasteTextAction::slotActivated() diff --git a/tdeui/tdeactionclasses.h b/tdeui/tdeactionclasses.h index b865ccab5..f7536a6b3 100644 --- a/tdeui/tdeactionclasses.h +++ b/tdeui/tdeactionclasses.h @@ -88,8 +88,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -120,8 +120,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -132,8 +132,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -248,8 +248,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -280,8 +280,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -292,8 +292,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -355,8 +355,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -387,8 +387,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -399,8 +399,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -602,8 +602,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -634,8 +634,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -647,8 +647,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -717,8 +717,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -757,8 +757,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -773,8 +773,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -1124,8 +1124,8 @@ public: * @param text The text that will be displayed. * @param icon The icon to display. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -1143,8 +1143,8 @@ public: * * @param item The text and icon that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -1269,8 +1269,8 @@ public: /** * Create a TDEToggleFullScreenAction * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param window the window that will switch to/from full screen mode * @param name An internal name for this action. @@ -1393,8 +1393,8 @@ public: * @param text The text that will be displayed. * @param icon The icon to display. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp index d4d9576f5..7f4fe0191 100644 --- a/tdeui/tdeactioncollection.cpp +++ b/tdeui/tdeactioncollection.cpp @@ -503,19 +503,19 @@ void TDEActionCollection::connectHighlight( TQWidget *container, TDEAction *acti if ( ::tqt_cast<TQPopupMenu *>( container ) ) { - connect( container, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( slotMenuItemHighlighted( int ) ) ); - connect( container, TQT_SIGNAL( aboutToHide() ), - this, TQT_SLOT( slotMenuAboutToHide() ) ); + connect( container, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( slotMenuItemHighlighted( int ) ) ); + connect( container, TQ_SIGNAL( aboutToHide() ), + this, TQ_SLOT( slotMenuAboutToHide() ) ); } else if ( ::tqt_cast<TDEToolBar *>( container ) ) { - connect( container, TQT_SIGNAL( highlighted( int, bool ) ), - this, TQT_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); + connect( container, TQ_SIGNAL( highlighted( int, bool ) ), + this, TQ_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); } - connect( container, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotDestroyed() ) ); + connect( container, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotDestroyed() ) ); d->m_dctHighlightContainers.insert( container, actionList ); } diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h index c48bb5e2d..4de022d3e 100644 --- a/tdeui/tdeactioncollection.h +++ b/tdeui/tdeactioncollection.h @@ -69,10 +69,10 @@ typedef TQValueList<TDEAction *> TDEActionPtrList; * * \code * actionCollection()->setHighlightingEnabled(true); - * connect(actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - * statusBar(), TQT_SLOT( message( const TQString & ) ) ); - * connect(actionCollection(), TQT_SIGNAL( clearStatusText() ), - * statusBar(), TQT_SLOT( clear() ) ); + * connect(actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + * statusBar(), TQ_SLOT( message( const TQString & ) ) ); + * connect(actionCollection(), TQ_SIGNAL( clearStatusText() ), + * statusBar(), TQ_SLOT( clear() ) ); * \endcode */ class TDEUI_EXPORT TDEActionCollection : public TQObject diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp index 23829597e..4ac8ac71d 100644 --- a/tdeui/tdeactionselector.cpp +++ b/tdeui/tdeactionselector.cpp @@ -99,18 +99,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) loadIcons(); - connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); - connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); - connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); - connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); - connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp index d447ec17e..06ca1acda 100644 --- a/tdeui/tdecmodule.cpp +++ b/tdeui/tdecmodule.cpp @@ -98,7 +98,7 @@ void TDECModule::init() TDEConfigDialogManager* TDECModule::addConfig( TDEConfigSkeleton *config, TQWidget* widget ) { TDEConfigDialogManager* manager = new TDEConfigDialogManager( widget, config, name() ); - connect( manager, TQT_SIGNAL( widgetModified() ), TQT_SLOT( widgetChanged() )); + connect( manager, TQ_SIGNAL( widgetModified() ), TQ_SLOT( widgetChanged() )); d->managers.append( manager ); return manager; } diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp index 5392e2c41..9ff9b95e5 100644 --- a/tdeui/tdecompletionbox.cpp +++ b/tdeui/tdecompletionbox.cpp @@ -66,14 +66,14 @@ TDECompletionBox::TDECompletionBox( TQWidget *parent, const char *name ) setVScrollBarMode( Auto ); setHScrollBarMode( AlwaysOff ); - connect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem * )), - TQT_SLOT( slotActivated( TQListBoxItem * )) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem * )), + TQ_SLOT( slotActivated( TQListBoxItem * )) ); // grmbl, just TQListBox workarounds :[ Thanks Volker. - connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem * )), - TQT_SLOT( slotCurrentChanged() )); - connect( this, TQT_SIGNAL( clicked( TQListBoxItem * )), - TQT_SLOT( slotItemClicked( TQListBoxItem * )) ); + connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem * )), + TQ_SLOT( slotCurrentChanged() )); + connect( this, TQ_SIGNAL( clicked( TQListBoxItem * )), + TQ_SLOT( slotItemClicked( TQListBoxItem * )) ); } TDECompletionBox::~TDECompletionBox() diff --git a/tdeui/tdeconfigdialog.cpp b/tdeui/tdeconfigdialog.cpp index df43defc5..274355910 100644 --- a/tdeui/tdeconfigdialog.cpp +++ b/tdeui/tdeconfigdialog.cpp @@ -65,11 +65,11 @@ TDEConfigDialog::TDEConfigDialog( TQWidget *parent, const char *name, setName(genericName); } - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateButtons())); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault())); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateButtons())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateWidgetsDefault())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateButtons())); d->manager = new TDEConfigDialogManager(this, config); setupManagerConnections(d->manager); @@ -150,12 +150,12 @@ void TDEConfigDialog::addPageInternal(TQWidget *page, void TDEConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager) { - connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot())); - connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(manager, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChangedSlot())); + connect(manager, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); - connect(this, TQT_SIGNAL(okClicked()), manager, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), manager, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault())); + connect(this, TQ_SIGNAL(okClicked()), manager, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), manager, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(defaultClicked()), manager, TQ_SLOT(updateWidgetsDefault())); } TDEConfigDialog* TDEConfigDialog::exists(const char* name) diff --git a/tdeui/tdeconfigdialog.h b/tdeui/tdeconfigdialog.h index 67a22b698..6ce44da22 100644 --- a/tdeui/tdeconfigdialog.h +++ b/tdeui/tdeconfigdialog.h @@ -52,8 +52,8 @@ class TDEConfigDialogManager; * TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", MySettings::self(), KDialogBase::IconList); * dialog->addPage(new General(0, "General"), i18n("General") ); * dialog->addPage(new Appearance(0, "Style"), i18n("Appearance") ); - * connect(dialog, TQT_SIGNAL(settingsChanged()), mainWidget, TQT_SLOT(loadSettings())); - * connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); + * connect(dialog, TQ_SIGNAL(settingsChanged()), mainWidget, TQ_SLOT(loadSettings())); + * connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); * dialog->show(); * } * \endcode diff --git a/tdeui/tdefontcombo.cpp b/tdeui/tdefontcombo.cpp index cc3b090b7..31cc23849 100644 --- a/tdeui/tdefontcombo.cpp +++ b/tdeui/tdefontcombo.cpp @@ -283,7 +283,7 @@ void TDEFontCombo::init() setInsertionPolicy(NoInsertion); setAutoCompletion(true); setSize(12); - connect( this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotModified(int))); + connect( this, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotModified(int))); } TDEFontCombo::~TDEFontCombo() diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp index eb2186ca5..2b657a7a8 100644 --- a/tdeui/tdefontdialog.cpp +++ b/tdeui/tdefontdialog.cpp @@ -131,7 +131,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, familyLayout->addSpacing( checkBoxGap ); if (diff) { familyCheckbox = new TQCheckBox(i18n("Font"), page); - connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); + connect(familyCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); familyLayout->addWidget(familyCheckbox, 0, TQt::AlignLeft); TQString familyCBToolTipText = i18n("Change font family?"); @@ -150,7 +150,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, TQHBoxLayout *styleLayout = new TQHBoxLayout(); if (diff) { styleCheckbox = new TQCheckBox(i18n("Font style"), page); - connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); + connect(styleCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); styleLayout->addWidget(styleCheckbox, 0, TQt::AlignLeft); TQString styleCBToolTipText = i18n("Change font style?"); @@ -170,7 +170,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, TQHBoxLayout *sizeLayout = new TQHBoxLayout(); if (diff) { sizeCheckbox = new TQCheckBox(i18n("Size"),page); - connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); + connect(sizeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); sizeLayout->addWidget(sizeCheckbox, 0, TQt::AlignLeft); TQString sizeCBToolTipText = i18n("Change font size?"); @@ -200,8 +200,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, i18n("Here you can choose the font family to be used." ); TQWhatsThis::add( familyListBox, fontFamilyWhatsThisText ); TQWhatsThis::add(diff?(TQWidget *) familyCheckbox:(TQWidget *) familyLabel, fontFamilyWhatsThisText ); - connect(familyListBox, TQT_SIGNAL(highlighted(const TQString &)), - TQT_SLOT(family_chosen_slot(const TQString &))); + connect(familyListBox, TQ_SIGNAL(highlighted(const TQString &)), + TQ_SLOT(family_chosen_slot(const TQString &))); if(!fontList.isEmpty()) { familyListBox->insertStringList(fontList); @@ -230,8 +230,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, styleListBox->setMinimumHeight( minimumListHeight( styleListBox, visibleListSize ) ); - connect(styleListBox, TQT_SIGNAL(highlighted(const TQString &)), - TQT_SLOT(style_chosen_slot(const TQString &))); + connect(styleListBox, TQ_SIGNAL(highlighted(const TQString &)), + TQ_SLOT(style_chosen_slot(const TQString &))); sizeListBox = new TDEListBox( page, "sizeListBox"); @@ -280,11 +280,11 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, sizeListBox->setMinimumHeight( minimumListHeight( sizeListBox, visibleListSize ) ); - connect( sizeOfFont, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT(size_value_slot(int))); + connect( sizeOfFont, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT(size_value_slot(int))); - connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), - TQT_SLOT(size_chosen_slot(const TQString&)) ); + connect( sizeListBox, TQ_SIGNAL(highlighted(const TQString&)), + TQ_SLOT(size_chosen_slot(const TQString&)) ); sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. row ++; @@ -302,8 +302,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, i18n("This sample text illustrates the current settings. " "You may edit it to test special characters." ); TQWhatsThis::add( sampleEdit, sampleEditWhatsThisText ); - connect(this, TQT_SIGNAL(fontSelected(const TQFont &)), - TQT_SLOT(displaySample(const TQFont &))); + connect(this, TQ_SIGNAL(fontSelected(const TQFont &)), + TQ_SLOT(displaySample(const TQFont &))); TQVBoxLayout *vbox; if( makeFrame ) diff --git a/tdeui/tdefontrequester.cpp b/tdeui/tdefontrequester.cpp index 2cabede01..d5dd3b08c 100644 --- a/tdeui/tdefontrequester.cpp +++ b/tdeui/tdefontrequester.cpp @@ -43,7 +43,7 @@ TDEFontRequester::TDEFontRequester( TQWidget *parent, const char *name, layout->addWidget( m_sampleLabel, 1 ); layout->addWidget( m_button ); - connect( m_button, TQT_SIGNAL( clicked() ), TQT_SLOT( buttonClicked() ) ); + connect( m_button, TQ_SIGNAL( clicked() ), TQ_SLOT( buttonClicked() ) ); displaySampleText(); setToolTip(); diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp index a308f5cbe..256e1669d 100644 --- a/tdeui/tdelistbox.cpp +++ b/tdeui/tdelistbox.cpp @@ -30,22 +30,22 @@ TDEListBox::TDEListBox( TQWidget *parent, const char *name, WFlags f ) : TQListBox( parent, name, f ), d(0) { - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), - this, TQT_SLOT( slotOnItem( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), + this, TQ_SLOT( slotOnItem( TQListBoxItem * ) ) ); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } m_pCurrentItem = 0L; m_pAutoSelect = new TQTimer( this ); - connect( m_pAutoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); + connect( m_pAutoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); } void TDEListBox::slotOnItem( TQListBoxItem *item ) @@ -75,27 +75,27 @@ void TDEListBox::slotSettingsChanged(int category) return; m_bUseSingle = TDEGlobalSettings::singleClick(); - disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, + disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ) ); -// disconnect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem *, +// disconnect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQListBoxItem *, +// this, TQ_SLOT( slotExecute( TQListBoxItem *, // const TQPoint & ) ) ); if( m_bUseSingle ) { - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ) ); } else { -// connect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem *, +// connect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQListBoxItem *, +// this, TQ_SLOT( slotExecute( TQListBoxItem *, // const TQPoint & ) ) ); } diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp index 4935bf566..868be813d 100644 --- a/tdeui/tdelistview.cpp +++ b/tdeui/tdelistview.cpp @@ -109,9 +109,9 @@ public: initialFileManagerItem(0) { renameable.append(0); - connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int))); - connect(editor, TQT_SIGNAL(renameNext(TQListViewItem*,int)), listview, TQT_SLOT(renameNextProxy(TQListViewItem*,int))); - connect(editor, TQT_SIGNAL(renamePrev(TQListViewItem*,int)), listview, TQT_SLOT(renamePrevProxy(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(done(TQListViewItem*,int)), listview, TQ_SLOT(doneEditing(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(renameNext(TQListViewItem*,int)), listview, TQ_SLOT(renameNextProxy(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(renamePrev(TQListViewItem*,int)), listview, TQ_SLOT(renamePrevProxy(TQListViewItem*,int))); } ~TDEListViewPrivate () @@ -189,9 +189,9 @@ TDEListViewLineEdit::TDEListViewLineEdit(TDEListView *parent) { setFrame( false ); hide(); - connect( parent, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotSelectionChanged() )); - connect( parent, TQT_SIGNAL( itemRemoved( TQListViewItem * ) ), - TQT_SLOT( slotItemRemoved( TQListViewItem * ) )); + connect( parent, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotSelectionChanged() )); + connect( parent, TQ_SIGNAL( itemRemoved( TQListViewItem * ) ), + TQ_SLOT( slotItemRemoved( TQListViewItem * ) )); } TDEListViewLineEdit::~TDEListViewLineEdit() @@ -459,42 +459,42 @@ TDEListView::TDEListView( TQWidget *parent, const char *name ) { setDragAutoScroll(true); - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) ); - connect (this, TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(cleanDropVisualizer())); - connect (this, TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(cleanItemHighlighter())); + connect (this, TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(cleanDropVisualizer())); + connect (this, TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(cleanItemHighlighter())); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } - connect(&d->autoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); - connect(&d->dragExpand, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotDragExpand() ) ); + connect(&d->autoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); + connect(&d->dragExpand, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotDragExpand() ) ); // context menu handling if (d->showContextMenusOnPress) { - connect (this, TQT_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect (this, TQ_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } else { - connect (this, TQT_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect (this, TQ_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } - connect (this, TQT_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)), - this, TQT_SLOT (emitContextMenu (TDEListView*, TQListViewItem*))); + connect (this, TQ_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)), + this, TQ_SLOT (emitContextMenu (TDEListView*, TQListViewItem*))); d->alternateBackground = TDEGlobalSettings::alternateBackgroundColor(); } @@ -585,12 +585,12 @@ void TDEListView::slotSettingsChanged(int category) d->dragDelay = TDEGlobalSettings::dndEventDelay(); d->bUseSingle = TDEGlobalSettings::singleClick(); - disconnect(this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); + disconnect(this, TQ_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); if( d->bUseSingle ) - connect (this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); + connect (this, TQ_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); d->bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); if ( !d->disableAutoSelection ) @@ -607,17 +607,17 @@ void TDEListView::slotSettingsChanged(int category) if (d->showContextMenusOnPress) { - disconnect (0L, 0L, this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + disconnect (0L, 0L, this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } else { - disconnect (0L, 0L, this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + disconnect (0L, 0L, this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } break; diff --git a/tdeui/tdelistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp index 2ed43ba4b..88ac3746c 100644 --- a/tdeui/tdelistviewsearchline.cpp +++ b/tdeui/tdelistviewsearchline.cpp @@ -63,15 +63,15 @@ TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, TDEListView *list d->listView = listView; - connect(this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(queueSearch(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(queueSearch(const TQString &))); if(listView) { - connect(listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + connect(listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - connect(listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + connect(listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } else setEnabled(false); @@ -84,8 +84,8 @@ TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, const char *name) d->listView = 0; - connect(this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(queueSearch(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(queueSearch(const TQString &))); setEnabled(false); } @@ -178,21 +178,21 @@ void TDEListViewSearchLine::setSearchColumns(const TQValueList<int> &columns) void TDEListViewSearchLine::setListView(TDEListView *lv) { if(d->listView) { - disconnect(d->listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + disconnect(d->listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - disconnect(d->listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + disconnect(d->listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } d->listView = lv; if(lv) { - connect(d->listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + connect(d->listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - connect(d->listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + connect(d->listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } setEnabled(bool(lv)); @@ -237,7 +237,7 @@ TQPopupMenu *TDEListViewSearchLine::createPopupMenu() if (d->listView->columns()>1) { TQPopupMenu *subMenu = new TQPopupMenu(popup); - connect(subMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(searchColumnsMenuActivated(int))); + connect(subMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(searchColumnsMenuActivated(int))); popup->insertSeparator(); popup->insertItem(i18n("Search Columns"), subMenu); @@ -285,7 +285,7 @@ void TDEListViewSearchLine::queueSearch(const TQString &search) { d->queuedSearches++; d->search = search; - TQTimer::singleShot(200, this, TQT_SLOT(activateSearch())); + TQTimer::singleShot(200, this, TQ_SLOT(activateSearch())); } void TDEListViewSearchLine::activateSearch() @@ -425,7 +425,7 @@ TDEListViewSearchLineWidget::TDEListViewSearchLineWidget(TDEListView *listView, setSpacing(5); - TQTimer::singleShot(0, this, TQT_SLOT(createWidgets())); + TQTimer::singleShot(0, this, TQ_SLOT(createWidgets())); } TDEListViewSearchLineWidget::~TDEListViewSearchLineWidget() @@ -460,7 +460,7 @@ void TDEListViewSearchLineWidget::createWidgets() label->setBuddy(d->searchLine); label->show(); - connect(d->clearButton, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear())); + connect(d->clearButton, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear())); } TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index 9905d2991..2a112f196 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -184,7 +184,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags) mHelpMenu = 0; kapp->setTopWidget( this ); actionCollection()->setWidget( this ); - connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown())); + connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); if( !memberList ) memberList = new TQPtrList<TDEMainWindow>; @@ -340,8 +340,8 @@ TDEPopupMenu* TDEMainWindow::helpMenu( const TQString &aboutAppText, bool showWh if ( !mHelpMenu ) return 0; - connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ), - this, TQT_SLOT( showAboutApplication() ) ); + connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ), + this, TQ_SLOT( showAboutApplication() ) ); } return mHelpMenu->menu(); @@ -351,8 +351,8 @@ TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis ) { if( !mHelpMenu ) { mHelpMenu = new KHelpMenu( this, TQString::null, showWhatsThis ); - connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ), - this, TQT_SLOT( showAboutApplication() ) ); + connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ), + this, TQ_SLOT( showAboutApplication() ) ); } return mHelpMenu->menu(); @@ -441,7 +441,7 @@ int TDEMainWindow::configureToolbars() { saveMainWindowSettings(TDEGlobal::config()); KEditToolbar dlg(actionCollection(), xmlFile(), true, this); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(saveNewToolbarConfig())); return dlg.exec(); } @@ -458,7 +458,7 @@ void TDEMainWindow::setupGUI( int options, const TQString & xmlfile ) { void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xmlfile ) { if( options & Keys ){ KStdAction::keyBindings(guiFactory(), - TQT_SLOT(configureShortcuts()), actionCollection()); + TQ_SLOT(configureShortcuts()), actionCollection()); } if( (options & StatusBar) && internalStatusBar() ){ @@ -468,7 +468,7 @@ void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & if( options & ToolBar ){ setStandardToolBarMenuEnabled( true ); KStdAction::configureToolbars(this, - TQT_SLOT(configureToolbars() ), actionCollection()); + TQ_SLOT(configureToolbars() ), actionCollection()); } if( options & Create ){ @@ -659,7 +659,7 @@ void TDEMainWindow::closeEvent ( TQCloseEvent *e ) if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted? if ( queryExit() && !kapp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app? // don't call queryExit() twice - disconnect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown())); + disconnect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); d->shuttingDown = true; kapp->deref(); // ...and quit application. } else { @@ -804,9 +804,9 @@ bool TDEMainWindow::isStandardToolBarMenuEnabled() const void TDEMainWindow::createStandardStatusBarAction(){ if(!d->showStatusBarAction){ - d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection()); + d->showStatusBarAction = KStdAction::showStatusbar(this, TQ_SLOT(setSettingsDirty()), actionCollection()); KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. - connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); + connect(d->showStatusBarAction, TQ_SIGNAL(toggled(bool)), sb, TQ_SLOT(setShown(bool))); d->showStatusBarAction->setChecked(sb->isHidden()); } } @@ -1017,7 +1017,7 @@ void TDEMainWindow::setSettingsDirty() if ( !d->settingsTimer ) { d->settingsTimer = new TQTimer( this ); - connect( d->settingsTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAutoSaveSettings() ) ); + connect( d->settingsTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( saveAutoSaveSettings() ) ); } d->settingsTimer->start( 500, true ); } @@ -1039,10 +1039,10 @@ void TDEMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWi d->autoSaveGroup = groupName; d->autoSaveWindowSize = saveWindowSize; // Get notified when the user moves a toolbar around - disconnect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), - this, TQT_SLOT( setSettingsDirty() ) ); - connect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), - this, TQT_SLOT( setSettingsDirty() ) ); + disconnect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), + this, TQ_SLOT( setSettingsDirty() ) ); + connect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), + this, TQ_SLOT( setSettingsDirty() ) ); // Now read the previously saved settings applyMainWindowSettings( TDEGlobal::config(), groupName ); diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h index cca8e64ac..446b9c937 100644 --- a/tdeui/tdemainwindow.h +++ b/tdeui/tdemainwindow.h @@ -541,8 +541,8 @@ public: * this function) a connection needs to be made to let TDEMainWindow * know when that status (hidden/shown) of the statusbar has changed. * For example: - * connect(action, TQT_SIGNAL(activated()), - * tdemainwindow, TQT_SLOT(setSettingsDirty())); + * connect(action, TQ_SIGNAL(activated()), + * tdemainwindow, TQ_SLOT(setSettingsDirty())); * Otherwise the status (hidden/show) of the statusbar might not be saved * by TDEMainWindow. * @since 3.2 @@ -683,7 +683,7 @@ public slots: * This slot can be connected dirrectly to the action to configure shortcuts. * This is very simple to do that by adding a single line * \code - * KStdAction::configureToolbars( guiFactory(), TQT_SLOT( configureToolbars() ), + * KStdAction::configureToolbars( guiFactory(), TQ_SLOT( configureToolbars() ), * actionCollection() ); * \endcode * @@ -734,8 +734,8 @@ public slots: * \code * TDEIconLoader &loader = *TDEGlobal::iconLoader(); * TQPixmap pixmap = loader.loadIcon( "help" ); - * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()), - * this, TQT_SLOT(appHelpActivated()), true, i18n("Help") ); + * toolBar(0)->insertButton( pixmap, 0, TQ_SIGNAL(clicked()), + * this, TQ_SLOT(appHelpActivated()), true, i18n("Help") ); * \endcode * */ diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp index 78fd8eb30..eba259b28 100644 --- a/tdeui/tdemenubar.cpp +++ b/tdeui/tdemenubar.cpp @@ -137,15 +137,15 @@ KMenuBar::KMenuBar(TQWidget *parent, const char *name) QXEmbed::initialize(); #endif d = new KMenuBarPrivate; - connect( &d->selection_timer, TQT_SIGNAL( timeout()), - this, TQT_SLOT( selectionTimeout())); + connect( &d->selection_timer, TQ_SIGNAL( timeout()), + this, TQ_SLOT( selectionTimeout())); - connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); + connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( updateFallbackSize())); if ( kapp ) // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)), - this, TQT_SLOT(slotReadConfig())); + connect( kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), + this, TQ_SLOT(slotReadConfig())); slotReadConfig(); } @@ -179,10 +179,10 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) #ifdef Q_WS_X11 d->selection = new TDESelectionWatcher( KMenuBarPrivate::makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); - connect( d->selection, TQT_SIGNAL( newOwner( Window )), - this, TQT_SLOT( updateFallbackSize())); - connect( d->selection, TQT_SIGNAL( lostOwner()), - this, TQT_SLOT( updateFallbackSize())); + connect( d->selection, TQ_SIGNAL( newOwner( Window )), + this, TQ_SLOT( updateFallbackSize())); + connect( d->selection, TQ_SIGNAL( lostOwner()), + this, TQ_SLOT( updateFallbackSize())); #endif d->frameStyle = frameStyle(); d->lineWidth = lineWidth(); diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp index 728540ede..53c51d271 100644 --- a/tdeui/tdemessagebox.cpp +++ b/tdeui/tdemessagebox.cpp @@ -214,8 +214,8 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, KActiveLabel *label2 = new KActiveLabel( qt_text, contents ); if (!(options & KMessageBox::AllowLink)) { - TQObject::disconnect(label2, TQT_SIGNAL(linkClicked(const TQString &)), - label2, TQT_SLOT(openLink(const TQString &))); + TQObject::disconnect(label2, TQ_SIGNAL(linkClicked(const TQString &)), + label2, TQ_SLOT(openLink(const TQString &))); } // We add 10 pixels extra to compensate for some KActiveLabel margins. @@ -250,8 +250,8 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, label3->setMinimumSize(label3->sizeHint()); if (!(options & KMessageBox::AllowLink)) { - TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)), - label3, TQT_SLOT(openLink(const TQString &))); + TQObject::disconnect(label3, TQ_SIGNAL(linkClicked(const TQString &)), + label3, TQ_SLOT(openLink(const TQString &))); } } else { TQTextEdit* te = new TQTextEdit(details, TQString::null, detailsGroup); diff --git a/tdeui/tdepassivepopupstack.cpp b/tdeui/tdepassivepopupstack.cpp index aef49d15c..cef63db18 100644 --- a/tdeui/tdepassivepopupstack.cpp +++ b/tdeui/tdepassivepopupstack.cpp @@ -60,9 +60,9 @@ KPassivePopup* TDEPassivePopupStackContainer::displayMessage(TQString title, TQS leftCorner.setX(mRightOfStack-popupSize.width()); leftCorner.setY(mTopOfStack); } - connect(popup, SIGNAL(hidden(KPassivePopup*)), this, SLOT(popupClosed(KPassivePopup*))); - connect(popup, SIGNAL(clicked(TQPoint)), this, SLOT(popupClicked(TQPoint))); - connect(popup, SIGNAL(destroyed(TQObject*)), this, SLOT(popupDestroyed(TQObject*))); + connect(popup, TQ_SIGNAL(hidden(KPassivePopup*)), this, TQ_SLOT(popupClosed(KPassivePopup*))); + connect(popup, TQ_SIGNAL(clicked(TQPoint)), this, TQ_SLOT(popupClicked(TQPoint))); + connect(popup, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(popupDestroyed(TQObject*))); mPopupList.append(popup); mPopupIDMap[popup] = id; popup->show(leftCorner); diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp index 453a3e41f..5195c64a8 100644 --- a/tdeui/tdepopupmenu.cpp +++ b/tdeui/tdepopupmenu.cpp @@ -164,7 +164,7 @@ TDEPopupMenu::TDEPopupMenu(TQWidget *parent, const char *name) { d = new TDEPopupMenuPrivate; resetKeyboardVars(); - connect(&(d->clearTimer), TQT_SIGNAL(timeout()), TQT_SLOT(resetKeyboardVars())); + connect(&(d->clearTimer), TQ_SIGNAL(timeout()), TQ_SLOT(resetKeyboardVars())); } TDEPopupMenu::~TDEPopupMenu() @@ -514,7 +514,7 @@ TQPopupMenu* TDEPopupMenu::contextMenu() if (!d->m_ctxMenu) { d->m_ctxMenu = new TQPopupMenu(this); - connect(d->m_ctxMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(ctxMenuHiding())); + connect(d->m_ctxMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(ctxMenuHiding())); } return d->m_ctxMenu; @@ -559,7 +559,7 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TQPopupMenu* subMenu = item->popup(); if (subMenu) { - disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); + disconnect(subMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(ctxMenuHideShowingMenu())); } } @@ -576,8 +576,8 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { - connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu())); - TQTimer::singleShot(100, subMenu, TQT_SLOT(hide())); + connect(subMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(ctxMenuHideShowingMenu())); + TQTimer::singleShot(100, subMenu, TQ_SLOT(hide())); } if (!TDEPopupMenuPrivate::s_continueCtxMenuShow) @@ -588,7 +588,7 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TDEPopupMenuPrivate::s_contextedMenu = this; d->m_ctxMenu->popup(this->mapToGlobal(pos)); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(itemHighlighted(int))); } /* @@ -603,7 +603,7 @@ void TDEPopupMenu::ctxMenuHideShowingMenu() TQPopupMenu* subMenu = item->popup(); if (subMenu) { - TQTimer::singleShot(0, subMenu, TQT_SLOT(hide())); + TQTimer::singleShot(0, subMenu, TQ_SLOT(hide())); } } } @@ -615,11 +615,11 @@ void TDEPopupMenu::ctxMenuHiding() TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { - disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); + disconnect(subMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(ctxMenuHideShowingMenu())); } } - disconnect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int))); + disconnect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(itemHighlighted(int))); TDEPopupMenuPrivate::s_continueCtxMenuShow = true; } diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp index 4d95970b6..5436e3b17 100644 --- a/tdeui/tdeshortcutdialog.cpp +++ b/tdeui/tdeshortcutdialog.cpp @@ -91,21 +91,21 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort m_simple->m_btnClearShortcut->setPixmap( SmallIcon( "locationbar_erase" ) ); m_adv->m_btnClearPrimary->setPixmap( SmallIcon( "locationbar_erase" ) ); m_adv->m_btnClearAlternate->setPixmap( SmallIcon( "locationbar_erase" ) ); - connect(m_simple->m_btnClearShortcut, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearShortcut())); - connect(m_adv->m_btnClearPrimary, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearPrimary())); - connect(m_adv->m_btnClearAlternate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearAlternate())); - - connect(m_adv->m_txtPrimary, TQT_SIGNAL(clicked()), - m_adv->m_btnPrimary, TQT_SLOT(animateClick())); - connect(m_adv->m_txtAlternate, TQT_SIGNAL(clicked()), - m_adv->m_btnAlternate, TQT_SLOT(animateClick())); - connect(m_adv->m_btnPrimary, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectPrimary())); - connect(m_adv->m_btnAlternate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectAlternate())); + connect(m_simple->m_btnClearShortcut, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearShortcut())); + connect(m_adv->m_btnClearPrimary, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearPrimary())); + connect(m_adv->m_btnClearAlternate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearAlternate())); + + connect(m_adv->m_txtPrimary, TQ_SIGNAL(clicked()), + m_adv->m_btnPrimary, TQ_SLOT(animateClick())); + connect(m_adv->m_txtAlternate, TQ_SIGNAL(clicked()), + m_adv->m_btnAlternate, TQ_SLOT(animateClick())); + connect(m_adv->m_btnPrimary, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectPrimary())); + connect(m_adv->m_btnAlternate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectAlternate())); KGuiItem ok = KStdGuiItem::ok(); ok.setText( i18n( "OK" ) ); @@ -442,7 +442,7 @@ void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e ) updateShortcutDisplay(); if( !m_adv->m_btnMultiKey->isChecked() ) - TQTimer::singleShot(500, this, TQT_SLOT(accept())); + TQTimer::singleShot(500, this, TQ_SLOT(accept())); } return; } @@ -520,7 +520,7 @@ void TDEShortcutDialog::keyPressed( KKey key ) updateShortcutDisplay(); if( !m_adv->m_btnMultiKey->isChecked() ) - TQTimer::singleShot(500, this, TQT_SLOT(accept())); + TQTimer::singleShot(500, this, TQ_SLOT(accept())); } #include "tdeshortcutdialog.moc" diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp index e5d21d45b..05f5c09d4 100644 --- a/tdeui/tdespell.cpp +++ b/tdeui/tdespell.cpp @@ -97,10 +97,10 @@ public: // Connects a slot to KProcIO's output signal -#define OUTPUT(x) (connect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *)))) +#define OUTPUT(x) (connect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *)))) // Disconnect a slot from... -#define NOOUTPUT(x) (disconnect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *)))) +#define NOOUTPUT(x) (disconnect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *)))) @@ -296,11 +296,11 @@ KSpell::startIspell() if (trystart == 0) //don't connect these multiple times { - connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) ); + connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(ispellErrors(TDEProcess *, char *, int)) ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(ispellExit (TDEProcess *)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(ispellExit (TDEProcess *)) ); OUTPUT(KSpell2); } @@ -308,7 +308,7 @@ KSpell::startIspell() if ( !proc->start() ) { m_status = Error; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath())); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath())); } } @@ -331,14 +331,14 @@ void KSpell::KSpell2( KProcIO * ) if ( proc->readln( line, true ) == -1 ) { - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } if ( line[0] != '@' ) //@ indicates that ispell is working fine { - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -346,7 +346,7 @@ void KSpell::KSpell2( KProcIO * ) if ( !ignore("kde") ) { kdDebug(750) << "@KDE was false" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -354,7 +354,7 @@ void KSpell::KSpell2( KProcIO * ) if ( !ignore("linux") ) { kdDebug(750) << "@Linux was false" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -375,10 +375,10 @@ KSpell::setUpDialog( bool reallyuseprogressbar ) progressbar && reallyuseprogressbar, modaldlg ); ksdlg->setCaption( caption ); - connect( ksdlg, TQT_SIGNAL(command(int)), - this, TQT_SLOT(slotStopCancel(int)) ); - connect( this, TQT_SIGNAL(progress(unsigned int)), - ksdlg, TQT_SLOT(slotProgress(unsigned int)) ); + connect( ksdlg, TQ_SIGNAL(command(int)), + this, TQ_SLOT(slotStopCancel(int)) ); + connect( this, TQ_SIGNAL(progress(unsigned int)), + ksdlg, TQ_SLOT(slotProgress(unsigned int)) ); #ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded KWin::setIcons( ksdlg->winId(), kapp->icon(), kapp->miniIcon() ); @@ -488,7 +488,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) return false; } ///set the dialog signal handler - dialog3slot = TQT_SLOT(checkWord3()); + dialog3slot = TQ_SLOT(checkWord3()); usedialog = _usedialog; setUpDialog( false ); @@ -503,7 +503,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) while (proc->readln( blank_line, true ) != -1); // eat spurious blanks OUTPUT(checkWord2); - // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); + // connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3())); proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell @@ -532,7 +532,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) ///set the dialog signal handler if ( !suggest ) { - dialog3slot = TQT_SLOT(checkWord3()); + dialog3slot = TQ_SLOT(checkWord3()); usedialog = _usedialog; setUpDialog( false ); if ( _usedialog ) @@ -547,7 +547,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) while (proc->readln( blank_line, true ) != -1); // eat spurious blanks OUTPUT(checkWord2); - // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); + // connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3())); proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell @@ -578,7 +578,7 @@ void KSpell::checkWord2( KProcIO* ) if ( mistake && usedialog ) { cwword = word; - dialog( word, sugg, TQT_SLOT(checkWord3()) ); + dialog( word, sugg, TQ_SLOT(checkWord3()) ); d->checkNextTimer->start( 0, true ); return; } @@ -626,14 +626,14 @@ void KSpell::suggestWord( KProcIO * ) if ( mistake && usedialog ) { cwword=word; - dialog( word, sugg, TQT_SLOT(checkWord3()) ); + dialog( word, sugg, TQ_SLOT(checkWord3()) ); return; } } void KSpell::checkWord3() { - disconnect( this, TQT_SIGNAL(dialog3()), this, TQT_SLOT(checkWord3()) ); + disconnect( this, TQ_SIGNAL(dialog3()), this, TQ_SLOT(checkWord3()) ); emit corrected( cwword, replacement(), 0L ); } @@ -792,7 +792,7 @@ bool KSpell::checkList (TQStringList *_wordlist, bool _usedialog) setUpDialog(); //set the dialog signal handler - dialog3slot = TQT_SLOT (checkList4 ()); + dialog3slot = TQ_SLOT (checkList4 ()); proc->writeStdin (TQString("%")); // turn off terse mode & check one word at a time @@ -883,7 +883,7 @@ void KSpell::checkList3a (KProcIO *) cwword = word; dlgon = true; // show the dialog - dialog( word, sugg, TQT_SLOT(checkList4()) ); + dialog( word, sugg, TQ_SLOT(checkList4()) ); return; } else @@ -930,7 +930,7 @@ void KSpell::checkList4 () dlgon=false; TQString old; - disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkList4())); + disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkList4())); //others should have been processed by dialog() already switch (dlgresult) @@ -980,7 +980,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) usedialog = _usedialog; setUpDialog(); //set the dialog signal handler - dialog3slot = TQT_SLOT(check3()); + dialog3slot = TQ_SLOT(check3()); kdDebug(750) << "KS: check" << endl; origbuffer = _buffer; @@ -1090,7 +1090,7 @@ void KSpell::check2( KProcIO * ) //kdDebug(750) << "(Before dialog) word=[" << word << "] cwword =[" << cwword << "]\n" << endl; if ( usedialog ) { // show the word in the dialog - dialog( word, sugg, TQT_SLOT(check3()) ); + dialog( word, sugg, TQ_SLOT(check3()) ); } else { // No dialog, just emit misspelling and continue d->m_bNoMisspellingsEncountered = false; @@ -1152,7 +1152,7 @@ void KSpell::check2( KProcIO * ) void KSpell::check3 () // evaluates the return value of the dialog { - disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (check3())); + disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (check3())); kdDebug(750) << "check3 [" << cwword << "] [" << replacement() << "] " << dlgresult << endl; //others should have been processed by dialog() already @@ -1199,7 +1199,7 @@ KSpell::slotStopCancel (int result) if (!dialog3slot.isEmpty()) { dlgresult=result; - connect (this, TQT_SIGNAL (dialog3()), this, dialog3slot.ascii()); + connect (this, TQ_SIGNAL (dialog3()), this, dialog3slot.ascii()); emit dialog3(); } } @@ -1211,7 +1211,7 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl dialog3slot = _slot; dialogwillprocess = true; - connect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) ); + connect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) ); TQString tmpBuf = newbuffer; kdDebug(750)<<" position = "<<lastpos<<endl; @@ -1238,7 +1238,7 @@ void KSpell::dialog2( int result ) { TQString qs; - disconnect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) ); + disconnect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) ); dialogwillprocess = false; dlgresult = result; ksdlg->standby(); @@ -1277,7 +1277,7 @@ void KSpell::dialog2( int result ) break; } - connect( this, TQT_SIGNAL(dialog3()), this, dialog3slot.ascii() ); + connect( this, TQ_SIGNAL(dialog3()), this, dialog3slot.ascii() ); emit dialog3(); } @@ -1334,7 +1334,7 @@ void KSpell::ispellExit( TDEProcess* ) return; // Dead already kdDebug(750) << "Death" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); } // This is always called from the event loop to make @@ -1423,12 +1423,12 @@ void KSpell::slotModalReady() //kdDebug(750) << "MODAL READY------------------" << endl; Q_ASSERT( m_status == Running ); - connect( this, TQT_SIGNAL( done( const TQString & ) ), - this, TQT_SLOT( slotModalDone( const TQString & ) ) ); - TQObject::connect( this, TQT_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ), - this, TQT_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) ); - TQObject::connect( this, TQT_SIGNAL( death() ), - this, TQT_SLOT( slotModalSpellCheckerFinished( ) ) ); + connect( this, TQ_SIGNAL( done( const TQString & ) ), + this, TQ_SLOT( slotModalDone( const TQString & ) ) ); + TQObject::connect( this, TQ_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ), + this, TQ_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) ); + TQObject::connect( this, TQ_SIGNAL( death() ), + this, TQ_SLOT( slotModalSpellCheckerFinished( ) ) ); check( modaltext ); } @@ -1463,8 +1463,8 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption, d->checking = false; d->aspellV6 = false; d->checkNextTimer = new TQTimer( this ); - connect( d->checkNextTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( checkNext() )); + connect( d->checkNextTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( checkNext() )); autoDelete = false; modaldlg = _modal; progressbar = _progressbar; @@ -1559,10 +1559,10 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption, if ( obj && slot ) // caller wants to know when tdespell is ready - connect( this, TQT_SIGNAL(ready(KSpell *)), obj, slot); + connect( this, TQ_SIGNAL(ready(KSpell *)), obj, slot); else // Hack for modal spell checking - connect( this, TQT_SIGNAL(ready(KSpell *)), this, TQT_SLOT(slotModalReady()) ); + connect( this, TQ_SIGNAL(ready(KSpell *)), this, TQ_SLOT(slotModalReady()) ); proc = new KProcIO( codec ); diff --git a/tdeui/tdespelldlg.cpp b/tdeui/tdespelldlg.cpp index 9e8206505..f111eb50f 100644 --- a/tdeui/tdespelldlg.cpp +++ b/tdeui/tdespelldlg.cpp @@ -60,44 +60,44 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b d->ui = new KSpellUI( this ); setMainWidget( d->ui ); - connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(replace())); - connect( this, TQT_SIGNAL(ready(bool)), - d->ui->m_replaceBtn, TQT_SLOT(setEnabled(bool)) ); + connect( d->ui->m_replaceBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(replace())); + connect( this, TQ_SIGNAL(ready(bool)), + d->ui->m_replaceBtn, TQ_SLOT(setEnabled(bool)) ); - connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(replaceAll())); - connect(this, TQT_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_replaceAllBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(replaceAll())); + connect(this, TQ_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignore())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_skipBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(ignore())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_skipAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignoreAll())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipAllBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_skipAllBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(ignoreAll())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_skipAllBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_addBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_addBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(add())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_addBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_suggestBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(suggest())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_suggestBtn, TQT_SLOT(setEnabled(bool)) ); + connect( d->ui->m_suggestBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(suggest())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_suggestBtn, TQ_SLOT(setEnabled(bool)) ); d->ui->m_suggestBtn->hide(); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(stop())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(stop())); - connect( d->ui->m_replacement, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(textChanged(const TQString &)) ); + connect( d->ui->m_replacement, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(textChanged(const TQString &)) ); - connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), TQT_SLOT(replace()) ); - connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->ui->m_replacement, TQ_SIGNAL(returnPressed()), TQ_SLOT(replace()) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( d->ui->m_suggestions, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( replace() ) ); + connect( d->ui->m_suggestions, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( replace() ) ); d->spellConfig = new KSpellConfig( 0, 0 ,0, false ); d->spellConfig->fillDicts( d->ui->m_language ); - connect( d->ui->m_language, TQT_SIGNAL(activated(int)), - d->spellConfig, TQT_SLOT(sSetDictionary(int)) ); - connect( d->spellConfig, TQT_SIGNAL(configChanged()), - TQT_SLOT(slotConfigChanged()) ); + connect( d->ui->m_language, TQ_SIGNAL(activated(int)), + d->spellConfig, TQ_SLOT(sSetDictionary(int)) ); + connect( d->spellConfig, TQ_SIGNAL(configChanged()), + TQ_SLOT(slotConfigChanged()) ); setHelp( "spelldlg", "tdespell" ); setMinimumSize( sizeHint() ); diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index 73d9ec2b8..817af5007 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -149,8 +149,8 @@ TDEToolBarSeparator::TDEToolBarSeparator(Orientation o , bool l, TQToolBar *pare const char* name ) :TQFrame( parent, name ), line( l ) { - connect( parent, TQT_SIGNAL(orientationChanged(Orientation)), - this, TQT_SLOT(setOrientation(Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(Orientation)), + this, TQ_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -232,16 +232,16 @@ void TDEToolBar::init( bool readConfig, bool honorStyle ) d->m_honorStyle = honorStyle; context = 0; layoutTimer = new TQTimer( this ); - connect( layoutTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( rebuildLayout() ) ); - connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRepaint() ) ); + connect( layoutTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( rebuildLayout() ) ); + connect( &(d->repaintTimer), TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRepaint() ) ); if ( kapp ) { // may be null when started inside designer - connect(kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)), this, TQT_SLOT(slotAppearanceChanged())); + connect(kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged())); // request notification of changes in icon style kapp->addKipcEventMask(KIPC::IconChanged); - connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int))); + connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int))); } // finally, read in our configurable settings @@ -249,11 +249,11 @@ void TDEToolBar::init( bool readConfig, bool honorStyle ) slotReadConfig(); if ( mainWindow() ) - connect( mainWindow(), TQT_SIGNAL( toolBarPositionChanged( TQToolBar * ) ), - this, TQT_SLOT( toolBarPosChanged( TQToolBar * ) ) ); + connect( mainWindow(), TQ_SIGNAL( toolBarPositionChanged( TQToolBar * ) ), + this, TQ_SLOT( toolBarPosChanged( TQToolBar * ) ) ); // Hack to make sure we recalculate our size when we dock. - connect( this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(rebuildLayout()) ); + connect( this, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), TQ_SLOT(rebuildLayout()) ); } int TDEToolBar::insertButton(const TQString& icon, int id, bool enabled, @@ -422,7 +422,7 @@ int TDEToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slo insertWidgetInternal( anim, index, id ); if ( receiver ) - connect( anim, TQT_SIGNAL(clicked()), receiver, slot); + connect( anim, TQ_SIGNAL(clicked()), receiver, slot); return index; } @@ -1145,12 +1145,12 @@ TQString TDEToolBar::text() const void TDEToolBar::doConnections( TDEToolBarButton *button ) { - connect(button, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL( clicked( int ) ) ); - connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL( doubleClicked( int ) ) ); - connect(button, TQT_SIGNAL(released(int)), this, TQT_SIGNAL( released( int ) ) ); - connect(button, TQT_SIGNAL(pressed(int)), this, TQT_SIGNAL( pressed( int ) ) ); - connect(button, TQT_SIGNAL(toggled(int)), this, TQT_SIGNAL( toggled( int ) ) ); - connect(button, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SIGNAL( highlighted( int, bool ) ) ); + connect(button, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL( clicked( int ) ) ); + connect(button, TQ_SIGNAL(doubleClicked(int)), this, TQ_SIGNAL( doubleClicked( int ) ) ); + connect(button, TQ_SIGNAL(released(int)), this, TQ_SIGNAL( released( int ) ) ); + connect(button, TQ_SIGNAL(pressed(int)), this, TQ_SIGNAL( pressed( int ) ) ); + connect(button, TQ_SIGNAL(toggled(int)), this, TQ_SIGNAL( toggled( int ) ) ); + connect(button, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SIGNAL( highlighted( int, bool ) ) ); } void TDEToolBar::mousePressEvent ( TQMouseEvent *m ) @@ -1309,8 +1309,8 @@ void TDEToolBar::insertWidgetInternal( TQWidget *w, int &index, int id ) // we can't have it in widgets, or something is really wrong //widgets.removeRef( w ); - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); if ( index == -1 || index > (int)widgets.count() ) { index = (int)widgets.count(); widgets.append( w ); @@ -2125,10 +2125,10 @@ TDEPopupMenu *TDEToolBar::contextMenu() context->setItemChecked(CONTEXT_ICONS, true); context->insertItem( i18n("Icon Size"), size ); - connect( context, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotContextAboutToShow() ) ); + connect( context, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotContextAboutToShow() ) ); // Unplugging a submenu from abouttohide leads to the popupmenu floating around // So better simply call that code from after exec() returns (DF) - //connect( context, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotContextAboutToHide() ) ); + //connect( context, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotContextAboutToHide() ) ); return context; } diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h index adbb5b521..919af5cfe 100644 --- a/tdeui/tdetoolbar.h +++ b/tdeui/tdetoolbar.h @@ -466,8 +466,8 @@ public: * You will insert a normal button with connection (or use signals from * toolbar): * \code - * bar->insertButton(icon, id, TQT_SIGNAL(clicked ()), this, - * TQT_SLOT (slotClick()), true, "click or wait for popup"); + * bar->insertButton(icon, id, TQ_SIGNAL(clicked ()), this, + * TQ_SLOT (slotClick()), true, "click or wait for popup"); * \endcode * And then add a delayed popup: * \code diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp index d957a2edf..1c3f550db 100644 --- a/tdeui/tdetoolbarbutton.cpp +++ b/tdeui/tdetoolbarbutton.cpp @@ -125,19 +125,19 @@ TDEToolBarButton::TDEToolBarButton( const TQString& _icon, int _id, d->m_parent = dynamic_cast<TDEToolBar*>(_parent); if (d->m_parent) { - connect(d->m_parent, TQT_SIGNAL( modechange() ), - this, TQT_SLOT( modeChange() )); + connect(d->m_parent, TQ_SIGNAL( modechange() ), + this, TQ_SLOT( modeChange() )); } setFocusPolicy( TQWidget::NoFocus ); // connect all of our slots and start trapping events - connect(this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() ) ); - connect(this, TQT_SIGNAL( pressed() ), - this, TQT_SLOT( slotPressed() ) ); - connect(this, TQT_SIGNAL( released() ), - this, TQT_SLOT( slotReleased() ) ); + connect(this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() ) ); + connect(this, TQ_SIGNAL( pressed() ), + this, TQ_SLOT( slotPressed() ) ); + connect(this, TQ_SIGNAL( released() ), + this, TQ_SLOT( slotReleased() ) ); installEventFilter(this); d->m_iconName = _icon; @@ -158,19 +158,19 @@ TDEToolBarButton::TDEToolBarButton( const TQPixmap& pixmap, int _id, d->m_parent = dynamic_cast<TDEToolBar*>(_parent); if (d->m_parent) { - connect(d->m_parent, TQT_SIGNAL( modechange() ), - this, TQT_SLOT( modeChange() )); + connect(d->m_parent, TQ_SIGNAL( modechange() ), + this, TQ_SLOT( modeChange() )); } setFocusPolicy( TQWidget::NoFocus ); // connect all of our slots and start trapping events - connect(this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() )); - connect(this, TQT_SIGNAL( pressed() ), - this, TQT_SLOT( slotPressed() )); - connect(this, TQT_SIGNAL( released() ), - this, TQT_SLOT( slotReleased() )); + connect(this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() )); + connect(this, TQ_SIGNAL( pressed() ), + this, TQ_SLOT( slotPressed() )); + connect(this, TQ_SIGNAL( released() ), + this, TQ_SLOT( slotReleased() )); installEventFilter(this); // set our pixmap and do our initial setup @@ -734,9 +734,9 @@ void TDEToolBarButton::setToggle(bool flag) { setToggleButton(flag); if (flag) - connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); else - disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + disconnect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); } TQSize TDEToolBarButton::sizeHint() const diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp index 45f2564e9..37540ae92 100644 --- a/tdeui/tdetoolbarhandler.cpp +++ b/tdeui/tdetoolbarhandler.cpp @@ -177,8 +177,8 @@ void ToolBarHandler::setupActions() /* for ( TQPtrListIterator<TDEToolBar> toolBarIt( m_toolBars ); toolBarIt.current(); ++toolBarIt ) - connect( toolBarIt.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( setupActions() ) ); + connect( toolBarIt.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( setupActions() ) ); */ if (kapp && kapp->authorizeTDEAction("options_show_toolbar")) @@ -198,8 +198,8 @@ void ToolBarHandler::init( TDEMainWindow *mainWindow ) d = 0; m_mainWindow = mainWindow; - connect( m_mainWindow->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( m_mainWindow->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -236,8 +236,8 @@ void ToolBarHandler::connectToActionContainer( TQWidget *container ) if ( !popupMenu ) return; - connect( popupMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupActions() ) ); + connect( popupMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupActions() ) ); } #include "tdetoolbarhandler.moc" diff --git a/tdeui/tdetoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h index f57365359..801f0ed78 100644 --- a/tdeui/tdetoolbarlabelaction.h +++ b/tdeui/tdetoolbarlabelaction.h @@ -36,10 +36,10 @@ class TQLabel; * KHistoryCombo* findCombo = new KHistoryCombo(true, this); * KWidgetAction* action * = new KWidgetAction(findCombo, i18n("F&ind Combo"), TQt::Key_F6, this, - * TQT_SLOT(slotFocus()), actionCollection(), "find_combo"); + * TQ_SLOT(slotFocus()), actionCollection(), "find_combo"); * * new TDEToolBarLabelAction(findCombo, i18n("F&ind "), 0, this, - * TQT_SLOT(slotFocus()), actionCollection(), + * TQ_SLOT(slotFocus()), actionCollection(), * "find_label"); * * \endcode @@ -54,8 +54,8 @@ public: * * @param text The label's and the action's text. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -70,8 +70,8 @@ public: * typed. * @param text The label's and the action's text. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -93,8 +93,8 @@ public: * * @param label the label which is displayed in the toolbar. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdetoolbarradiogroup.cpp b/tdeui/tdetoolbarradiogroup.cpp index 937354357..0f5febb0a 100644 --- a/tdeui/tdetoolbarradiogroup.cpp +++ b/tdeui/tdetoolbarradiogroup.cpp @@ -36,7 +36,7 @@ TDEToolBarRadioGroup::TDEToolBarRadioGroup (TDEToolBar *_parent, const char *_na { buttons = new TDEToolBarButtonList(); tb = _parent; - connect (tb, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int))); + connect (tb, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int))); } TDEToolBarRadioGroup::~TDEToolBarRadioGroup() diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index 4837fe119..7226eb6f5 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -74,8 +74,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) m_pbgMode->setExclusive( true ); vBox->addWidget( m_pbgMode ); - connect( m_pbgMode, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotSwitchMode( int ) ) ); + connect( m_pbgMode, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotSwitchMode( int ) ) ); //Signal labels TQGroupBox* gbWiget = new TQGroupBox( 1, TQt::Horizontal, "Widget", this); @@ -91,8 +91,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) TQButtonGroup* bgListView = new TQButtonGroup( 1, TQt::Horizontal, "TDEListView", this); TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView); vBox->addWidget( bgListView ); - connect( cbListView, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleSingleColumn( bool ) ) ); + connect( cbListView, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleSingleColumn( bool ) ) ); TDEGlobal::config()->reparseConfiguration(); @@ -101,8 +101,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) m_pIconView = new TDEIconView( gbIconView ); hBox->addWidget( gbIconView ); hBox->addSpacing( 5 ); - connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( slotIconViewExec( TQIconViewItem* ) ) ); //Create ListView TQGroupBox* gbListView = new TQGroupBox( 1, TQt::Horizontal, "TDEListView", this); @@ -111,15 +111,15 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) m_pListView->addColumn("Text"); hBox->addWidget( gbListView ); hBox->addSpacing( 5 ); - connect( m_pListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) ); + connect( m_pListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( slotListViewExec( TQListViewItem* ) ) ); //Create ListBox TQGroupBox* gbListBox = new TQGroupBox( 1, TQt::Horizontal, "TDEListBox", this); m_pListBox = new TDEListBox( gbListBox ); hBox->addWidget( gbListBox ); - connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), - this, TQT_SLOT( slotListBoxExec( TQListBoxItem* ) ) ); + connect( m_pListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ), + this, TQ_SLOT( slotListBoxExec( TQListBoxItem* ) ) ); //Initialize buttons cbListView->setChecked( !m_pListView->allColumnsShowFocus() ); @@ -137,10 +137,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) new TQListBoxPixmap( m_pListBox, TQPixmap(item_xpm), TQString("Item%1").arg(i)); } - connect( m_pIconView, TQT_SIGNAL( clicked( TQIconViewItem* ) ), - this, TQT_SLOT( slotClicked( TQIconViewItem* ) ) ); - connect( m_pIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ), - this, TQT_SLOT( slotDoubleClicked( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( clicked( TQIconViewItem* ) ), + this, TQ_SLOT( slotClicked( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ), + this, TQ_SLOT( slotDoubleClicked( TQIconViewItem* ) ) ); } void TopLevel::slotSwitchMode( int id ) diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp index a44175b68..3390ce5f3 100644 --- a/tdeui/tests/kbuttonboxtest.cpp +++ b/tdeui/tests/kbuttonboxtest.cpp @@ -43,10 +43,10 @@ int main(int argc, char **argv) { KButtonBox *bbox = new KButtonBox(w); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->addButton("Help"); @@ -72,10 +72,10 @@ int main(int argc, char **argv) { bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->layout(); tl->addWidget(bbox,0); tl->activate(); @@ -98,10 +98,10 @@ int main(int argc, char **argv) { bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->layout(); tl->addWidget(bbox,0); @@ -127,10 +127,10 @@ int main(int argc, char **argv) { bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addButton("Push me and I give you a banana"); bbox->addStretch(1); @@ -159,10 +159,10 @@ int main(int argc, char **argv) { bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addButton("Push me and I give you a banana", true); bbox->addStretch(1); @@ -188,10 +188,10 @@ int main(int argc, char **argv) { KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->layout(); diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index d2b59a4c2..7e51396c1 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -40,8 +40,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" ); lbl->setBuddy (m_qc); - TQObject::connect (m_qc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_qc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_qc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_qc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); // Read-only combobox @@ -53,8 +53,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_ro, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_ro, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); // Read-write combobox @@ -68,10 +68,10 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_rw->setDuplicatesEnabled( true ); m_rw->setInsertionPolicy( TQComboBox::NoInsertion ); m_rw->setTrapReturnKey( true ); - TQObject::connect (m_rw, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_rw, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&))); - TQObject::connect (m_rw, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); - TQObject::connect (m_rw, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&))); + TQObject::connect (m_rw, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_rw, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&))); + TQObject::connect (m_rw, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); + TQObject::connect (m_rw, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(slotReturnPressed(const TQString&))); vbox->addWidget (hbox); // History combobox... @@ -84,9 +84,9 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) lbl->setBuddy (m_hc); m_hc->setDuplicatesEnabled( true ); m_hc->setInsertionPolicy( TQComboBox::NoInsertion ); - TQObject::connect (m_hc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_hc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&))); - TQObject::connect (m_hc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); + TQObject::connect (m_hc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_hc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&))); + TQObject::connect (m_hc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); vbox->addWidget (hbox); m_hc->setTrapReturnKey(true); @@ -99,19 +99,19 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_konqc = new KComboBox( true, hbox, "KonqyCombo" ); lbl->setBuddy (m_konqc); m_konqc->setMaxCount( 10 ); - TQObject::connect (m_konqc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_konqc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); - TQObject::connect (m_konqc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); + TQObject::connect (m_konqc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_konqc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_konqc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); vbox->addWidget (hbox); // Create an exit button hbox = new TQHBox (this); m_btnExit = new TQPushButton( "E&xit", hbox ); - TQObject::connect( m_btnExit, TQT_SIGNAL(clicked()), TQT_SLOT(quitApp()) ); + TQObject::connect( m_btnExit, TQ_SIGNAL(clicked()), TQ_SLOT(quitApp()) ); // Create a disable button... m_btnEnable = new TQPushButton( "Disa&ble", hbox ); - TQObject::connect (m_btnEnable, TQT_SIGNAL(clicked()), TQT_SLOT(slotDisable())); + TQObject::connect (m_btnEnable, TQ_SIGNAL(clicked()), TQ_SLOT(slotDisable())); vbox->addWidget (hbox); @@ -150,7 +150,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_konqc->setCurrentItem( m_konqc->count()-1 ); m_timer = new TQTimer (this); - connect (m_timer, TQT_SIGNAL (timeout()), TQT_SLOT (slotTimeout())); + connect (m_timer, TQ_SIGNAL (timeout()), TQ_SLOT (slotTimeout())); } KComboBoxTest::~KComboBoxTest() diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp index ff477e027..a6c010fc7 100644 --- a/tdeui/tests/kcompletiontest.cpp +++ b/tdeui/tests/kcompletiontest.cpp @@ -74,8 +74,8 @@ Form1::Form1( TQWidget* parent, const char* name ) combo->setCompletionObject( edit->completionObject() ); // combo->setMaxCount( 5 ); combo->setHistoryItems( defaultItems(), true ); - connect( combo, TQT_SIGNAL( activated( const TQString& )), - combo, TQT_SLOT( addToHistory( const TQString& ))); + connect( combo, TQ_SIGNAL( activated( const TQString& )), + combo, TQ_SLOT( addToHistory( const TQString& ))); TQToolTip::add( combo, "KHistoryCombo" ); Layout2->addWidget( combo ); @@ -84,7 +84,7 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1 = new TQPushButton( GroupBox1, "PushButton1" ); PushButton1->setText( "Add" ); - connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() )); + connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() )); Layout2->addWidget( PushButton1 ); Layout9->addLayout( Layout2 ); @@ -96,7 +96,7 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1_4 = new TQPushButton( GroupBox1, "PushButton1_4" ); PushButton1_4->setText( "Remove" ); - connect( PushButton1_4, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() )); + connect( PushButton1_4, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() )); Layout3->addWidget( PushButton1_4 ); Layout9->addLayout( Layout3 ); @@ -106,8 +106,8 @@ Form1::Form1( TQWidget* parent, const char* name ) ListBox1 = new TQListBox( GroupBox1, "ListBox1" ); Layout8->addWidget( ListBox1 ); - connect( ListBox1, TQT_SIGNAL( highlighted( const TQString& )), - TQT_SLOT( slotHighlighted( const TQString& ))); + connect( ListBox1, TQ_SIGNAL( highlighted( const TQString& )), + TQ_SLOT( slotHighlighted( const TQString& ))); TQToolTip::add( ListBox1, "Contains the contents of the completion object.\n:x is the weighting, i.e. how often an item has been inserted"); Layout7 = new TQVBoxLayout; @@ -116,13 +116,13 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1_3 = new TQPushButton( GroupBox1, "PushButton1_3" ); PushButton1_3->setText( "Completion items" ); - connect( PushButton1_3, TQT_SIGNAL( clicked() ), TQT_SLOT( slotList() )); + connect( PushButton1_3, TQ_SIGNAL( clicked() ), TQ_SLOT( slotList() )); Layout7->addWidget( PushButton1_3 ); PushButton1_2 = new TQPushButton( GroupBox1, "PushButton1_2" ); PushButton1_2->setText( "Clear" ); - connect( PushButton1_2, TQT_SIGNAL( clicked() ), - edit->completionObject(), TQT_SLOT( clear() )); + connect( PushButton1_2, TQ_SIGNAL( clicked() ), + edit->completionObject(), TQ_SLOT( clear() )); Layout7->addWidget( PushButton1_2 ); Layout8->addLayout( Layout7 ); Layout9->addLayout( Layout8 ); diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp index a986ce026..3daf22b08 100644 --- a/tdeui/tests/kdesattest.cpp +++ b/tdeui/tests/kdesattest.cpp @@ -15,7 +15,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name) slide = new KDoubleNumInput(700, this, "desat"); slide->setRange(0, 1, 0.001); slide->setLabel("Desaturate: ", AlignVCenter | AlignLeft); - connect(slide,TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(change(double))); + connect(slide,TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(change(double))); resize(image.width()*2, image.height() + slide->height()); slide->setGeometry(0, image.height(), image.width()*2, slide->height()); diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp index a922acf2d..ba3f97d74 100644 --- a/tdeui/tests/kdockwidgetdemo.cpp +++ b/tdeui/tests/kdockwidgetdemo.cpp @@ -116,8 +116,8 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const fd->reparent(d_fd, TQPoint(0,0)); d_fd->setWidget( fd ); - connect( dirView, TQT_SIGNAL( folderSelected( const TQString & ) ), fd, TQT_SLOT( setDir2( const TQString & ) ) ); - connect( fd, TQT_SIGNAL( dirEntered( const TQString & ) ), dirView, TQT_SLOT( setDir( const TQString & ) ) ); + connect( dirView, TQ_SIGNAL( folderSelected( const TQString & ) ), fd, TQ_SLOT( setDir2( const TQString & ) ) ); + connect( fd, TQ_SIGNAL( dirEntered( const TQString & ) ), dirView, TQ_SLOT( setDir( const TQString & ) ) ); d_fd->setDockSite( KDockWidget::DockTop|KDockWidget::DockLeft|KDockWidget::DockRight|KDockWidget::DockBottom ); d_fd->setEnableDocking(KDockWidget::DockNone); @@ -128,16 +128,16 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const d_dirView->manualDock( d_fd, KDockWidget::DockLeft, 20 ); d_preview->manualDock( d_fd, KDockWidget::DockBottom, 70 ); - connect(fd, TQT_SIGNAL(fileHighlighted(const TQString&)), preview, TQT_SLOT(showPreview(const TQString&))); - connect(fd, TQT_SIGNAL(signalDone(int)), this, TQT_SLOT(done(int))); + connect(fd, TQ_SIGNAL(fileHighlighted(const TQString&)), preview, TQ_SLOT(showPreview(const TQString&))); + connect(fd, TQ_SIGNAL(signalDone(int)), this, TQ_SLOT(done(int))); - connect(fd, TQT_SIGNAL(dirEntered(const TQString&)), this, TQT_SLOT(changeDir(const TQString&))); - connect(dirView, TQT_SIGNAL(folderSelected(const TQString&)), this, TQT_SLOT(changeDir(const TQString&))); + connect(fd, TQ_SIGNAL(dirEntered(const TQString&)), this, TQ_SLOT(changeDir(const TQString&))); + connect(dirView, TQ_SIGNAL(folderSelected(const TQString&)), this, TQ_SLOT(changeDir(const TQString&))); b_tree = new TQToolButton( fd ); TQToolTip::add( b_tree, "Show/Hide Tree" ); b_tree->setPixmap( TQPixmap( dir_tree_xpm ) ); - connect( b_tree, TQT_SIGNAL(clicked()), d_dirView, TQT_SLOT(changeHideShowState()) ); + connect( b_tree, TQ_SIGNAL(clicked()), d_dirView, TQ_SLOT(changeHideShowState()) ); b_tree->setToggleButton(true); b_tree->setOn(true); fd->addToolButton( b_tree, true ); @@ -145,13 +145,13 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const b_preview = new TQToolButton( fd ); TQToolTip::add( b_preview, "Show/Hide Preview" ); b_preview->setPixmap( TQPixmap( preview_xpm ) ); - connect( b_preview, TQT_SIGNAL(clicked()), d_preview, TQT_SLOT(changeHideShowState()) ); + connect( b_preview, TQ_SIGNAL(clicked()), d_preview, TQ_SLOT(changeHideShowState()) ); b_preview->setToggleButton(true); b_preview->setOn(true); fd->addToolButton( b_preview ); - connect( dockManager, TQT_SIGNAL(change()), this, TQT_SLOT(dockChange())); - connect( dockManager, TQT_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQT_SLOT(setDockDefaultPos(KDockWidget*))); + connect( dockManager, TQ_SIGNAL(change()), this, TQ_SLOT(dockChange())); + connect( dockManager, TQ_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQ_SLOT(setDockDefaultPos(KDockWidget*))); setCaption("Open File"); resize(550,450); tqDebug("read config"); @@ -403,7 +403,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent ) TQToolTip::add( p, tr( "Bookmarks" ) ); bookmarkMenu = new TQPopupMenu( this ); - connect( bookmarkMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( bookmarkChosen( int ) ) ); + connect( bookmarkMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( bookmarkChosen( int ) ) ); addId = bookmarkMenu->insertItem( "Add bookmark" ); clearId = bookmarkMenu->insertItem( TQPixmap(folder_trash), "Clear bookmarks" ); bookmarkMenu->insertSeparator(); @@ -416,7 +416,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent ) TQToolTip::add( b, tr( "Go Home!" ) ); b->setPixmap( TQPixmap( homepage_xpm ) ); - connect( b, TQT_SIGNAL( clicked() ), this, TQT_SLOT( goHome() ) ); + connect( b, TQ_SIGNAL( clicked() ), this, TQ_SLOT( goHome() ) ); addToolButton( b ); } @@ -695,12 +695,12 @@ TQString Directory::text( int column ) const DirectoryView::DirectoryView( TQWidget *parent, const char *name ) :TQListView( parent, name ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); setAcceptDrops( true ); viewport()->setAcceptDrops( true ); diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp index f27fd0b4e..154d02463 100644 --- a/tdeui/tests/kdockwidgettest.cpp +++ b/tdeui/tests/kdockwidgettest.cpp @@ -120,12 +120,12 @@ DockApplication::DockApplication( const char* name ) TQPushButton* b1 = new TQPushButton(mainW); b1->setGeometry(10, 10, 250, 25); b1->setText("write dock config"); - connect(b1, TQT_SIGNAL(clicked()), TQT_SLOT(wConfig())); + connect(b1, TQ_SIGNAL(clicked()), TQ_SLOT(wConfig())); TQPushButton* b2 = new TQPushButton(mainW); b2->setGeometry(10, 35, 250, 25); b2->setText("read dock config"); - connect(b2, TQT_SIGNAL(clicked()), TQT_SLOT(rConfig())); + connect(b2, TQ_SIGNAL(clicked()), TQ_SLOT(rConfig())); m_bname = new TQPushButton(mainW); m_bname->setGeometry(10, 60, 250, 25); @@ -134,12 +134,12 @@ DockApplication::DockApplication( const char* name ) TQPushButton *b3 = new TQPushButton(mainW); b3->setGeometry(10,95,250,25); b3->setText("change the icon of the green widget"); - connect(b3,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix1())); + connect(b3,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix1())); TQPushButton *b4 = new TQPushButton(mainW); b4->setGeometry(10,130,250,25); b4->setText("remove icon "); - connect(b4,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix2())); + connect(b4,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix2())); setGeometry(200, 100, 500, 300); @@ -170,11 +170,11 @@ void DockApplication::initMenuBar() TQPixmap p(folder); TQPopupMenu *file_menu = new TQPopupMenu(); - file_menu->insertItem(p, "Change Green Widget Caption", this, TQT_SLOT(cap()) ); + file_menu->insertItem(p, "Change Green Widget Caption", this, TQ_SLOT(cap()) ); file_menu->insertSeparator(); - file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQT_SLOT(greenMain()) ); - file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQT_SLOT(blueMain()) ); - file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQT_SLOT(nullMain()) ); + file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQ_SLOT(greenMain()) ); + file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQ_SLOT(blueMain()) ); + file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQ_SLOT(nullMain()) ); KMenuBar* menu_bar = menuBar(); menu_bar->insertItem( "&Test", file_menu ); diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp index 512bfc610..a9be04cac 100644 --- a/tdeui/tests/kdualcolortest.cpp +++ b/tdeui/tests/kdualcolortest.cpp @@ -12,12 +12,12 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) KDualColorButton *colorBtn = new KDualColorButton(lbl->colorGroup().text(), lbl->colorGroup().background(), this); - connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)), - TQT_SLOT(slotFgChanged(const TQColor &))); - connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)), - TQT_SLOT(slotBgChanged(const TQColor &))); - connect(colorBtn, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)), - TQT_SLOT(slotCurrentChanged(KDualColorButton::DualColor))); + connect(colorBtn, TQ_SIGNAL(fgChanged(const TQColor &)), + TQ_SLOT(slotFgChanged(const TQColor &))); + connect(colorBtn, TQ_SIGNAL(bgChanged(const TQColor &)), + TQ_SLOT(slotBgChanged(const TQColor &))); + connect(colorBtn, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)), + TQ_SLOT(slotCurrentChanged(KDualColorButton::DualColor))); TQHBoxLayout *layout = new TQHBoxLayout(this, 5); layout->addWidget(colorBtn, 0); diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp index 71e72fb13..798145f47 100644 --- a/tdeui/tests/kjanuswidgettest.cpp +++ b/tdeui/tests/kjanuswidgettest.cpp @@ -18,7 +18,7 @@ int main(int argc, char** argv) TQCheckBox* cb2 = new TQCheckBox( "a", page2 ); janus->show(); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); return app.exec(); } diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp index 564d4d2f2..4694bd2c9 100644 --- a/tdeui/tests/kledtest.cpp +++ b/tdeui/tests/kledtest.cpp @@ -42,9 +42,9 @@ KLedTest::KLedTest(TQWidget* parent) t_toggle.start(1000, false); t_color.start(3500, false); t_look.start(3500, false); - TQObject::connect(&t_toggle, TQT_SIGNAL(timeout()), l, TQT_SLOT(toggle())); - TQObject::connect(&t_color, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextColor())); - TQObject::connect(&t_look, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextLook())); + TQObject::connect(&t_toggle, TQ_SIGNAL(timeout()), l, TQ_SLOT(toggle())); + TQObject::connect(&t_color, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextColor())); + TQObject::connect(&t_look, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextLook())); l->show(); resize(240,140); } @@ -66,7 +66,7 @@ KLedTest::KLedTest(TQWidget* parent) y+=Grid+LedHeight; } setFixedSize(x+Grid, y+Grid); - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); timer.start(500); } } diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp index 20e9b6ca8..e9601ccec 100644 --- a/tdeui/tests/klineedittest.cpp +++ b/tdeui/tests/klineedittest.cpp @@ -31,28 +31,28 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name ) m_lineedit->completionObject()->setItems( list ); m_lineedit->setFixedSize(500,30); m_lineedit->setEnableSqueezedText( true ); - connect( m_lineedit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) ); - connect( m_lineedit, TQT_SIGNAL( returnPressed(const TQString&) ), - TQT_SLOT( slotReturnPressed(const TQString&) ) ); + connect( m_lineedit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) ); + connect( m_lineedit, TQ_SIGNAL( returnPressed(const TQString&) ), + TQ_SLOT( slotReturnPressed(const TQString&) ) ); TQHBox *hbox = new TQHBox (this); m_btnExit = new TQPushButton( "E&xit", hbox ); m_btnExit->setFixedSize(100,30); - connect( m_btnExit, TQT_SIGNAL( clicked() ), TQT_SLOT( quitApp() ) ); + connect( m_btnExit, TQ_SIGNAL( clicked() ), TQ_SLOT( quitApp() ) ); m_btnReadOnly = new TQPushButton( "&Read Only", hbox ); m_btnReadOnly->setToggleButton (true); m_btnReadOnly->setFixedSize(100,30); - connect( m_btnReadOnly, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotReadOnly(bool) ) ); + connect( m_btnReadOnly, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotReadOnly(bool) ) ); m_btnEnable = new TQPushButton( "Dis&able", hbox ); m_btnEnable->setToggleButton (true); m_btnEnable->setFixedSize(100,30); - connect( m_btnEnable, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotEnable(bool) ) ); + connect( m_btnEnable, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotEnable(bool) ) ); m_btnHide = new TQPushButton( "Hi&de", hbox ); m_btnHide->setFixedSize(100,30); - connect( m_btnHide, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHide() ) ); + connect( m_btnHide, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHide() ) ); layout->addWidget( m_lineedit ); layout->addWidget( hbox ); @@ -113,7 +113,7 @@ void KLineEditTest::slotHide() m_btnHide->setEnabled( false ); m_lineedit->setText( "My dog ate the homework, whaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaa! I want my mommy!" ); - TQTimer::singleShot( 1000, this, TQT_SLOT(show()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(show()) ); } int main ( int argc, char **argv) diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp index 9a333dfda..8e99df1b9 100644 --- a/tdeui/tests/knuminputtest.cpp +++ b/tdeui/tests/knuminputtest.cpp @@ -26,7 +26,7 @@ void TopLevel::slotPrint( double n ) { kdDebug() << "slotPrint( " << n << " )" << endl; } -#define conn(x,y) connect( x, TQT_SIGNAL(valueChanged(y)), TQT_SLOT(slotPrint(y))) +#define conn(x,y) connect( x, TQ_SIGNAL(valueChanged(y)), TQ_SLOT(slotPrint(y))) TopLevel::TopLevel(TQWidget *parent, const char *name) : TQWidget(parent, name) { @@ -67,10 +67,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) i6->setLabel("Height (should be 2xWidth):"); i6->setRange(0, 200, 1, false); i6->setReferencePoint( 10 ); - connect( i5, TQT_SIGNAL(relativeValueChanged(double)), - i6, TQT_SLOT(setRelativeValue(double)) ); - connect( i6, TQT_SIGNAL(relativeValueChanged(double)), - i5, TQT_SLOT(setRelativeValue(double)) ); + connect( i5, TQ_SIGNAL(relativeValueChanged(double)), + i6, TQ_SLOT(setRelativeValue(double)) ); + connect( i6, TQ_SIGNAL(relativeValueChanged(double)), + i5, TQ_SLOT(setRelativeValue(double)) ); i7 = new KIntNumInput(i6, 0, b1, 10); i7->setLabel("math test:", AlignVCenter|AlignLeft ); @@ -119,10 +119,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) d7 = new KDoubleNumInput(d6, -30, 30, 0, 0.001, 3, b2, "d7"); d7->setReferencePoint( -3 ); - connect( d6, TQT_SIGNAL(relativeValueChanged(double)), - d7, TQT_SLOT(setRelativeValue(double)) ); - connect( d7, TQT_SIGNAL(relativeValueChanged(double)), - d6, TQT_SLOT(setRelativeValue(double)) ); + connect( d6, TQ_SIGNAL(relativeValueChanged(double)), + d7, TQ_SLOT(setRelativeValue(double)) ); + connect( d7, TQ_SIGNAL(relativeValueChanged(double)), + d6, TQ_SLOT(setRelativeValue(double)) ); l->addWidget(b2); } diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp index a14cb3366..c08c03a8c 100644 --- a/tdeui/tests/kpanelmenutest.cpp +++ b/tdeui/tests/kpanelmenutest.cpp @@ -15,8 +15,8 @@ TestWidget::TestWidget(TQWidget *parent, const char *name) KPanelAppMenu *ssub = subMenu->insertMenu(locate("mini", "x.png"), "One more"); - connect(testMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuCalled(int))); - connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubMenuCalled(int))); + connect(testMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuCalled(int))); + connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubMenuCalled(int))); init(); setText("We added \"Client Test\" to kicker. Click the TDE Menu to check."); diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp index 628c5096e..28bc2a362 100644 --- a/tdeui/tests/krulertest.cpp +++ b/tdeui/tests/krulertest.cpp @@ -76,14 +76,14 @@ KRulerTest::KRulerTest( const char *name ) vruler->setOffset( 0 ); vruler->setRange( 0, 1000 ); - connect( bigwidget, TQT_SIGNAL(newXPos(int)), - hruler, TQT_SLOT(slotNewValue(int)) ); - connect( bigwidget, TQT_SIGNAL(newYPos(int)), - vruler, TQT_SLOT(slotNewValue(int)) ); - connect( bigwidget, TQT_SIGNAL(newWidth(int)), - TQT_SLOT(slotNewWidth(int)) ); - connect( bigwidget, TQT_SIGNAL(newHeight(int)), - TQT_SLOT(slotNewHeight(int)) ); + connect( bigwidget, TQ_SIGNAL(newXPos(int)), + hruler, TQ_SLOT(slotNewValue(int)) ); + connect( bigwidget, TQ_SIGNAL(newYPos(int)), + vruler, TQ_SLOT(slotNewValue(int)) ); + connect( bigwidget, TQ_SIGNAL(newWidth(int)), + TQ_SLOT(slotNewWidth(int)) ); + connect( bigwidget, TQ_SIGNAL(newHeight(int)), + TQ_SLOT(slotNewHeight(int)) ); layout->addWidget(miniwidget, 0, 0); layout->addWidget(hruler, 0, 1); @@ -101,38 +101,38 @@ KRulerTest::KRulerTest( const char *name ) showTM->adjustSize(); showTM->move(5,15); showTM->setChecked(true); - connect(showTM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetTinyMarks(bool)) ); + connect(showTM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetTinyMarks(bool)) ); showLM = new TQCheckBox("show little marks", showMarks); showLM->adjustSize(); showLM->move(5,35); showLM->setChecked(true); - connect(showLM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetLittleMarks(bool)) ); + connect(showLM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetLittleMarks(bool)) ); showMM = new TQCheckBox("show medium marks", showMarks); showMM->adjustSize(); showMM->move(5,55); showMM->setChecked(true); - connect(showMM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetMediumMarks(bool)) ); + connect(showMM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetMediumMarks(bool)) ); showBM = new TQCheckBox("show big marks", showMarks); showBM->adjustSize(); showBM->move(5,75); showBM->setChecked(true); - connect(showBM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetBigMarks(bool)) ); + connect(showBM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetBigMarks(bool)) ); showEM = new TQCheckBox("show end marks", showMarks); showEM->adjustSize(); showEM->move(5,95); showEM->setChecked(true); - connect(showEM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetEndMarks(bool)) ); + connect(showEM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetEndMarks(bool)) ); showPT = new TQCheckBox("show ruler pointer", showMarks); showPT->adjustSize(); showPT->move(5,115); showPT->setChecked(true); - connect(showPT, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetRulerPointer(bool)) ); + connect(showPT, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetRulerPointer(bool)) ); fixLen = new TQCheckBox("fix ruler length", showMarks); fixLen->adjustSize(); fixLen->move(5,135); fixLen->setChecked(true); - connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFixRulerLength(bool)) ); - connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckLength(bool)) ); + connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFixRulerLength(bool)) ); + connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckLength(bool)) ); lineEdit = new TQGroupBox("Value of begin/end", bigwidget); lineEdit->setFixedSize(140, 80); @@ -141,26 +141,26 @@ KRulerTest::KRulerTest( const char *name ) beginMark->setRange(-1000, 1000, 1, false); beginMark->move(5, 15); beginMark->setFixedSize(beginMark->sizeHint()); - connect(beginMark, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotNewOffset(int)) ); - connect(beginMark, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotNewOffset(int)) ); + connect(beginMark, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotNewOffset(int)) ); + connect(beginMark, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotNewOffset(int)) ); endMark = new KIntNumInput(0, lineEdit); endMark->setRange(-1000, 1000, 1, false); endMark->move(5, 35); endMark->setFixedSize(endMark->sizeHint()); - connect(endMark, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotEndOffset(int)) ); - connect(endMark, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotEndOffset(int)) ); + connect(endMark, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotEndOffset(int)) ); + connect(endMark, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotEndOffset(int)) ); lengthInput = new KIntNumInput(0, lineEdit); lengthInput->setRange(-1000, 1000, 1, false); lengthInput->move(5, 55); lengthInput->setFixedSize(lengthInput->sizeHint()); - connect(lengthInput, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotEndOffset(int)) ); - connect(lengthInput, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotEndOffset(int)) ); + connect(lengthInput, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotEndOffset(int)) ); + connect(lengthInput, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotEndOffset(int)) ); vertrot = new TQGroupBox("Value of rotate translate for Vert.", bigwidget); @@ -171,22 +171,22 @@ KRulerTest::KRulerTest( const char *name ) transX->move(5, 15); transX->setFixedSize(transX->sizeHint()); //transX->setLabel("transx", AlignLeft); - connect(transX, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetXTrans(double)) ); + connect(transX, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetXTrans(double)) ); transY = new KDoubleNumInput(-12.0, vertrot); transY->setRange(-1000, 1000, 1, false); transY->move(5, 35); transY->setFixedSize(transY->sizeHint()); //transY->setLabel("transy", AlignLeft); - connect(transY, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetYTrans(double)) ); + connect(transY, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetYTrans(double)) ); rotV = new KDoubleNumInput(90.0, vertrot); rotV->setRange(-1000, 1000, 1, false); rotV->move(5, 55); rotV->setFixedSize(rotV->sizeHint()); //rotV->setLabel("rot", AlignLeft); - connect(rotV, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetRotate(double)) ); + connect(rotV, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetRotate(double)) ); metricstyle = new TQButtonGroup("metric styles", bigwidget); @@ -212,7 +212,7 @@ KRulerTest::KRulerTest( const char *name ) mmetric->adjustSize(); mmetric->move(5,95); metricstyle->insert(mmetric, (int)KRuler::Metres); - connect ( metricstyle, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSetMStyle(int)) ); + connect ( metricstyle, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotSetMStyle(int)) ); setCentralWidget(mainframe); diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp index 0a8c6d10c..a2bb2b6e8 100644 --- a/tdeui/tests/kstatusbartest.cpp +++ b/tdeui/tests/kstatusbartest.cpp @@ -23,7 +23,7 @@ testWindow::testWindow (TQWidget *, const char *name) fileMenu = new TQPopupMenu; menuBar->insertItem ("&File", fileMenu); fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), - TQT_SLOT( quit() ), ALT + Key_Q ); + TQ_SLOT( quit() ), ALT + Key_Q ); statusbar = new KStatusBar (this); statusbar->insertItem("Zoom: XXXX", 0); statusbar->insertItem("XXX", 1); @@ -34,8 +34,8 @@ testWindow::testWindow (TQWidget *, const char *name) insert = true; statusbar->changeItem("Line: 13567", 2); - connect (statusbar, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(slotPress(int))); - connect (statusbar, TQT_SIGNAL(released(int)), this, TQT_SLOT(slotClick(int))); + connect (statusbar, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(slotPress(int))); + connect (statusbar, TQ_SIGNAL(released(int)), this, TQ_SLOT(slotClick(int))); widget = new TQMultiLineEdit (this); @@ -53,7 +53,7 @@ testWindow::testWindow (TQWidget *, const char *name) smenu->insertItem("400%"); smenu->insertItem("oo%"); - connect (smenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenu(int))); + connect (smenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenu(int))); } void testWindow::slotClick(int id) diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp index 05fe2aeb3..27229e436 100644 --- a/tdeui/tests/ktabctltest.cpp +++ b/tdeui/tests/ktabctltest.cpp @@ -43,10 +43,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) */ test = new KTabCtl(this, "test"); - connect(test, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(tabChanged(int))); + connect(test, TQ_SIGNAL(tabSelected(int)), this, TQ_SLOT(tabChanged(int))); TQWidget *w = new TQWidget(test, "_page1"); TQPushButton *bt = new TQPushButton("Click me to quit", w, "_bt1"); - connect(bt, TQT_SIGNAL(clicked()), this, TQT_SLOT(okPressed())); + connect(bt, TQ_SIGNAL(clicked()), this, TQ_SLOT(okPressed())); bt->adjustSize(); bt->move(20, 20); test->addTab(w, "Seite 1"); diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp index 01bafd192..362df8558 100644 --- a/tdeui/tests/ktabwidgettest.cpp +++ b/tdeui/tests/ktabwidgettest.cpp @@ -24,18 +24,18 @@ Test::Test( TQWidget* parent, const char *name ) mWidget->setTabColor( mWidget->page(0), TQt::red ); mWidget->setTabColor( mWidget->page(1), TQt::blue ); - connect( mWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), TQT_SLOT( currentChanged( TQWidget * ) ) ); - connect( mWidget, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQT_SLOT(contextMenu( TQWidget *, const TQPoint & ))); - connect( mWidget, TQT_SIGNAL( contextMenu( const TQPoint & )), TQT_SLOT(tabbarContextMenu( const TQPoint & ))); - connect( mWidget, TQT_SIGNAL( mouseDoubleClick( TQWidget * )), TQT_SLOT(mouseDoubleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( mouseMiddleClick() ), TQT_SLOT(addTab() )); - connect( mWidget, TQT_SIGNAL( mouseMiddleClick( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SLOT(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQDropEvent * ))); - connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * ))); - connect( mWidget, TQT_SIGNAL( initiateDrag( TQWidget * )), TQT_SLOT(initiateDrag( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( movedTab( int, int )), TQT_SLOT(movedTab( int, int ))); + connect( mWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), TQ_SLOT( currentChanged( TQWidget * ) ) ); + connect( mWidget, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQ_SLOT(contextMenu( TQWidget *, const TQPoint & ))); + connect( mWidget, TQ_SIGNAL( contextMenu( const TQPoint & )), TQ_SLOT(tabbarContextMenu( const TQPoint & ))); + connect( mWidget, TQ_SIGNAL( mouseDoubleClick( TQWidget * )), TQ_SLOT(mouseDoubleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( mouseMiddleClick() ), TQ_SLOT(addTab() )); + connect( mWidget, TQ_SIGNAL( mouseMiddleClick( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SLOT(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQDropEvent * ))); + connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * ))); + connect( mWidget, TQ_SIGNAL( initiateDrag( TQWidget * )), TQ_SLOT(initiateDrag( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( movedTab( int, int )), TQ_SLOT(movedTab( int, int ))); mWidget->setTabReorderingEnabled( true ); TQWidget * grid = new TQWidget(this); @@ -43,48 +43,48 @@ Test::Test( TQWidget* parent, const char *name ) TQPushButton * addTab = new TQPushButton( "Add Tab", grid ); gridlayout->addWidget( addTab, 0, 0 ); - connect( addTab, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) ); + connect( addTab, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) ); TQPushButton * removeTab = new TQPushButton( "Remove Current Tab", grid ); gridlayout->addWidget( removeTab, 0, 1 ); - connect( removeTab, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) ); + connect( removeTab, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) ); mLeftButton = new TQCheckBox( "Show left button", grid ); gridlayout->addWidget( mLeftButton, 1, 0 ); - connect( mLeftButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftButton(bool) ) ); + connect( mLeftButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftButton(bool) ) ); mLeftButton->setChecked(true); TQCheckBox * leftPopup = new TQCheckBox( "Enable left popup", grid ); gridlayout->addWidget( leftPopup, 2, 0 ); - connect( leftPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftPopup(bool) ) ); + connect( leftPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftPopup(bool) ) ); leftPopup->setChecked(true); mRightButton = new TQCheckBox( "Show right button", grid ); gridlayout->addWidget( mRightButton, 1, 1 ); - connect( mRightButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightButton(bool) ) ); + connect( mRightButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightButton(bool) ) ); mRightButton->setChecked(true); TQCheckBox * rightPopup = new TQCheckBox( "Enable right popup", grid ); gridlayout->addWidget( rightPopup, 2, 1 ); - connect( rightPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightPopup(bool) ) ); + connect( rightPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightPopup(bool) ) ); rightPopup->setChecked(true); mTabsBottom = new TQCheckBox( "Show tabs at bottom", grid ); gridlayout->addWidget( mTabsBottom, 3, 0 ); - connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) ); + connect( mTabsBottom, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabPosition(bool) ) ); TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid ); gridlayout->addWidget( tabshape, 3, 1 ); - connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); + connect( tabshape, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabShape(bool) ) ); TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid ); gridlayout->addWidget( tabClose, 4, 0 ); - connect( tabClose, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleCloseButtons(bool) ) ); + connect( tabClose, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleCloseButtons(bool) ) ); tabClose->setChecked(true); TQCheckBox * showlabels = new TQCheckBox( "Show labels", grid ); gridlayout->addWidget( showlabels, 4, 1 ); - connect( showlabels, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( toggleLabels(bool) ) ); + connect( showlabels, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( toggleLabels(bool) ) ); } void Test::currentChanged(TQWidget* w) @@ -137,7 +137,7 @@ void Test::toggleLeftButton(bool state) if (state) { if (!mLeftWidget) { mLeftWidget = new TQToolButton( mWidget ); - connect( mLeftWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) ); + connect( mLeftWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) ); mLeftWidget->setIconSet( SmallIcon( "tab_new" ) ); mLeftWidget->setTextLabel("New"); mLeftWidget->setTextPosition(TQToolButton::Right); @@ -162,7 +162,7 @@ void Test::toggleLeftPopup(bool state) mLeftPopup->insertSeparator(); mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Button Tab", 1); mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Label Tab", 2); - connect(mLeftPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(leftPopupActivated(int))); + connect(mLeftPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(leftPopupActivated(int))); } mLeftWidget->setPopup(mLeftPopup); } @@ -188,7 +188,7 @@ void Test::toggleRightButton(bool state) if (state) { if ( !mRightWidget) { mRightWidget = new TQToolButton( mWidget ); - TQObject::connect( mRightWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) ); + TQObject::connect( mRightWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) ); mRightWidget->setIconSet( SmallIcon( "tab_remove" ) ); mRightWidget->setTextLabel("Close"); mRightWidget->setTextPosition(TQToolButton::Right); @@ -212,7 +212,7 @@ void Test::toggleRightPopup(bool state) mRightPopup->insertSeparator(); mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Left Tab", 0); mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Right Tab", 2); - connect(mRightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(rightPopupActivated(int))); + connect(mRightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(rightPopupActivated(int))); } mRightWidget->setPopup(mRightPopup); } @@ -264,7 +264,7 @@ void Test::contextMenu(TQWidget *w, const TQPoint &p) mContextPopup->insertSeparator(); mContextPopup->insertItem( mWidget->isTabEnabled(w) ? "Disable Tab" : "Enable Tab", 2); mContextPopup->insertItem( mWidget->tabToolTip(w).isEmpty() ? "Set Tooltip" : "Remove Tooltip", 3); - connect(mContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(mContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); mContextWidget = w; mContextPopup->popup(p); @@ -300,7 +300,7 @@ void Test::tabbarContextMenu(const TQPoint &p) mTabbarContextPopup->insertItem(SmallIcon( "tab_remove" ), mRightWidget->isVisible() ? "Hide \"Remove\" Button" : "Show \"Remove\" Button", 1); mTabbarContextPopup->insertSeparator(); mTabbarContextPopup->insertItem(mWidget->tabPosition()==TQTabWidget::Top ? "Put Tabbar to Bottom" : "Put Tabbar to Top", 2); - connect(mTabbarContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(tabbarContextMenuActivated(int))); + connect(mTabbarContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(tabbarContextMenuActivated(int))); mTabbarContextPopup->popup(p); } diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp index cf76e7980..839a9c71a 100644 --- a/tdeui/tests/kunbalancedgrdtest.cpp +++ b/tdeui/tests/kunbalancedgrdtest.cpp @@ -138,8 +138,8 @@ myTopWidget::myTopWidget (TQWidget *parent, const char *name) ySlider = new TQSlider ( -200, 200, 1, 100, TQSlider::Horizontal, this); lay->addWidget(ySlider, 1, 2); - connect(xSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance())); - connect(ySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance())); + connect(xSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance())); + connect(ySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance())); rebalance(); diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp index bbe028a1a..591e71d7e 100644 --- a/tdeui/tests/kwizardtest.cpp +++ b/tdeui/tests/kwizardtest.cpp @@ -27,10 +27,10 @@ int main(int argc, char **argv) { TDEApplication a(argc,argv,"kwizardtest"); KWizard *wiz = new KWizard(0, "kwizardtest", false); - TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()), - &a, TQT_SLOT(quit())); - TQObject::connect((TQObject*) wiz->finishButton(), TQT_SIGNAL(clicked()), - &a, TQT_SLOT(quit())); + TQObject::connect((TQObject*) wiz->cancelButton(), TQ_SIGNAL(clicked()), + &a, TQ_SLOT(quit())); + TQObject::connect((TQObject*) wiz->finishButton(), TQ_SIGNAL(clicked()), + &a, TQ_SLOT(quit())); for(int i = 1; i < 11; i++) { TQWidget *p = new TQWidget; diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index 7c224db8d..d32593094 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -48,7 +48,7 @@ int main( int argc, char **argv ) Client *part = new Client; (void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" ); - (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" ); + (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQ_SLOT( slotSec() ), part->actionCollection(), "security" ); part->setXMLFile( "./kxmlguitest_part.rc" ); diff --git a/tdeui/tests/qxembedtest.cpp b/tdeui/tests/qxembedtest.cpp index 2ee3d7907..fe6c9aef9 100644 --- a/tdeui/tests/qxembedtest.cpp +++ b/tdeui/tests/qxembedtest.cpp @@ -28,7 +28,7 @@ main(int argc, char**argv) TQWidget *main = new TQVBox(NULL,"main",TQt::WDestructiveClose); TQWidget *top = new TQHBox(main); TQPushButton *quit = new TQPushButton("Quit", top); - TQObject::connect( quit, TQT_SIGNAL(clicked()), main, TQT_SLOT(close()) ); + TQObject::connect( quit, TQ_SIGNAL(clicked()), main, TQ_SLOT(close()) ); TQLineEdit *edit = new TQLineEdit(top); edit->setText( "Just to see focus changes"); QXEmbed *embed = new QXEmbed(main); diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp index bf92dc11c..ffaaa8862 100644 --- a/tdeui/tests/tdemainwindowtest.cpp +++ b/tdeui/tests/tdemainwindowtest.cpp @@ -9,7 +9,7 @@ MainWindow::MainWindow() { - TQTimer::singleShot( 2*1000, this, TQT_SLOT( showMessage() ) ); + TQTimer::singleShot( 2*1000, this, TQ_SLOT( showMessage() ) ); setCentralWidget( new TQLabel( "foo", this ) ); diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp index f9a97bad4..637031443 100644 --- a/tdeui/tests/tdepopuptest.cpp +++ b/tdeui/tests/tdepopuptest.cpp @@ -24,7 +24,7 @@ public: menu->insertItem("Item1"); menu->insertItem("Item2"); menu->insertSeparator(); - menu->insertItem("Quit", tqApp, TQT_SLOT(quit())); + menu->insertItem("Quit", tqApp, TQ_SLOT(quit())); } }; diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp index f826f13b0..8fd5170e0 100644 --- a/tdeui/tests/twindowtest.cpp +++ b/tdeui/tests/twindowtest.cpp @@ -56,13 +56,13 @@ setAutoSaveSettings(); // We insert item "Exit" with accelerator ALT-Q, and connect // it to application's exit-slot. fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), - TQT_SLOT( quit() ), ALT + Key_Q ); + TQ_SLOT( quit() ), ALT + Key_Q ); // Another popup... toolBarMenu = new TQPopupMenu; menuBar->insertItem ("&Toolbars", toolBarMenu); - toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQT_SLOT(slotHide1())); - toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQT_SLOT(slotHide2())); + toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQ_SLOT(slotHide1())); + toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQ_SLOT(slotHide2())); itemsMenu = new TQPopupMenu; menuBar->insertItem ("&Items", itemsMenu); @@ -71,15 +71,15 @@ setAutoSaveSettings(); lineL = true; // Lined is enabled greenF = false; // Frame not inserted - itemsMenu->insertItem ("delete/insert exit button", this, TQT_SLOT(slotExit())); - itemsMenu->insertItem ("insert/delete green frame!", this, TQT_SLOT(slotFrame())); - itemsMenu->insertItem ("enable/disable Lined", this, TQT_SLOT(slotLined())); - itemsMenu->insertItem ("Toggle fileNew", this, TQT_SLOT(slotNew())); - itemsMenu->insertItem ("Clear comboBox", this, TQT_SLOT(slotClearCombo())); - itemsMenu->insertItem ("Insert List in Combo", this, TQT_SLOT(slotInsertListInCombo())); - itemsMenu->insertItem ("Make item 3 curent", this, TQT_SLOT(slotMakeItem3Current())); - //itemsMenu->insertItem ("Insert clock!", this, TQT_SLOT(slotInsertClock())); - itemsMenu->insertItem ("Important!", this, TQT_SLOT(slotImportant())); + itemsMenu->insertItem ("delete/insert exit button", this, TQ_SLOT(slotExit())); + itemsMenu->insertItem ("insert/delete green frame!", this, TQ_SLOT(slotFrame())); + itemsMenu->insertItem ("enable/disable Lined", this, TQ_SLOT(slotLined())); + itemsMenu->insertItem ("Toggle fileNew", this, TQ_SLOT(slotNew())); + itemsMenu->insertItem ("Clear comboBox", this, TQ_SLOT(slotClearCombo())); + itemsMenu->insertItem ("Insert List in Combo", this, TQ_SLOT(slotInsertListInCombo())); + itemsMenu->insertItem ("Make item 3 curent", this, TQ_SLOT(slotMakeItem3Current())); + //itemsMenu->insertItem ("Insert clock!", this, TQ_SLOT(slotInsertClock())); + itemsMenu->insertItem ("Important!", this, TQ_SLOT(slotImportant())); menuBar->insertSeparator(); helpMenu = new KHelpMenu(this, "KWindowTest was programmed by Sven Radej"); @@ -113,30 +113,30 @@ setAutoSaveSettings(); // First four buttons pix = BarIcon("document-new"); - itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()), + itemId = tb->insertButton(pix, 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()), true, "Create.. (toggles upper button)", 50); pix = BarIcon("document-open"); - tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), + tb->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()), false, "Open"); pix = BarIcon("filefloppy"); - tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), + tb->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()), true, "Save (beep or delayed popup)"); tb->setDelayedPopup(2, itemsMenu); pix = BarIcon("document-print"); - tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()), + tb->insertButton(pix, 3, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrint()), true, "Print (enables/disables open)"); // And a combobox // arguments: text (or strList), ID, writable, signal, object, slot, enabled, // tooltiptext, size - tb->insertCombo (TQString("one"), 4, true, TQT_SIGNAL(activated(const TQString&)), this, - TQT_SLOT(slotList(const TQString&)), true, "ComboBox", 150); + tb->insertCombo (TQString("one"), 4, true, TQ_SIGNAL(activated(const TQString&)), this, + TQ_SLOT(slotList(const TQString&)), true, "ComboBox", 150); // Then one line editor // arguments: text, id, signal, object (this), slot, enabled, tooltiptext, size - tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQT_SIGNAL(returnPressed()), this, - TQT_SLOT(slotReturn()), true, "Location", 200); + tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQ_SIGNAL(returnPressed()), this, + TQ_SLOT(slotReturn()), true, "Location", 200); // Set this Lined to auto size itself. Note that only one item (Lined or Combo) // Can be set to autosize; If you specify more of them only last (according to @@ -148,8 +148,8 @@ setAutoSaveSettings(); // Now add another button and align it right pix = BarIcon("system-log-out"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), - TQT_SLOT( quit() ), true, "Exit"); + tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(), + TQ_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); // Another toolbar @@ -159,16 +159,16 @@ setAutoSaveSettings(); pix = BarIcon("document-new"); tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)"); tb1->setToggle(0); - tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool))); + tb1->addConnection (0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggle(bool))); pix = BarIcon("document-open"); - tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), + tb1->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()), true, "Open (starts progres in sb)"); tb1->insertSeparator (); pix = BarIcon("filefloppy"); - tb1->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), + tb1->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()), true, "Save file2 (autorepeat)"); tb1->setAutoRepeat(2); @@ -201,7 +201,7 @@ setAutoSaveSettings(); rg->addButton(6); rg->addButton(7); - connect (tb1, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int))); + connect (tb1, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int))); // Set caption for floating toolbars tb->setTitle ("Toolbar 1"); @@ -216,8 +216,8 @@ setAutoSaveSettings(); //addToolBar (tb1); //addToolBar (tb); - connect (tb, TQT_SIGNAL(highlighted(int,bool)), this, TQT_SLOT(slotMessage(int, bool))); - connect (tb1, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SLOT(slotMessage(int, bool))); + connect (tb, TQ_SIGNAL(highlighted(int,bool)), this, TQ_SLOT(slotMessage(int, bool))); + connect (tb1, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SLOT(slotMessage(int, bool))); // Floating is enabled by default, so you don't need this. // tb->enableFloating(true); @@ -243,7 +243,7 @@ setAutoSaveSettings(); completions->insertItem("/home/"); completions->insertItem("/vmlinuz :-)"); - connect (completions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotCompletionsMenu(int))); + connect (completions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotCompletionsMenu(int))); pr = 0; } /***********************************/ @@ -273,7 +273,7 @@ void testWindow::slotOpen() // statusBar->message(pr); timer = new TQTimer (pr); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGoGoGoo())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGoGoGoo())); timer->start(100); } @@ -408,8 +408,8 @@ void testWindow::slotExit () { TQPixmap pix; pix = BarIcon("system-log-out"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), - TQT_SLOT( quit() ), true, "Exit"); + tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(), + TQ_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); exitB = true; } diff --git a/tdeui/twindowinfo.cpp b/tdeui/twindowinfo.cpp index 41e5691ea..d687efaac 100644 --- a/tdeui/twindowinfo.cpp +++ b/tdeui/twindowinfo.cpp @@ -67,7 +67,7 @@ void KWindowInfo::message( const TQString &text, const TQPixmap &pix, int timeou if ( timeout < 0 ) timeout = DEFAULT_MESSAGE_TIMEOUT; if ( timeout != 0 ) - TQTimer::singleShot( timeout, this, TQT_SLOT( restore() ) ); + TQTimer::singleShot( timeout, this, TQ_SLOT( restore() ) ); } void KWindowInfo::permanent( const TQString &text ) diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp index 8e07dde71..fee6c2c05 100644 --- a/tdeui/twindowlistmenu.cpp +++ b/tdeui/twindowlistmenu.cpp @@ -87,7 +87,7 @@ KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) { twin_module = new KWinModule(this); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); } KWindowListMenu::~KWindowListMenu() @@ -127,9 +127,9 @@ void KWindowListMenu::init() map.clear(); int unclutter = insertItem( i18n("Unclutter Windows"), - this, TQT_SLOT( slotUnclutterWindows() ) ); + this, TQ_SLOT( slotUnclutterWindows() ) ); int cascade = insertItem( i18n("Cascade Windows"), - this, TQT_SLOT( slotCascadeWindows() ) ); + this, TQ_SLOT( slotCascadeWindows() ) ); // if we only have one desktop we won't be showing titles, so put a separator in if (nd == 1) |