diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-13 17:34:53 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-13 17:51:33 +0900 |
| commit | 1329ec6abbcb7b79cd960e0ca138f16598d5f11f (patch) | |
| tree | 8b64fab3a352aada6a046f69f1f7e8a6ad819594 /ksirc | |
| parent | 69c2eb8d5f2ed64c876b2a1081cc83ed9f4652d3 (diff) | |
| download | tdenetwork-1329ec6abbcb7b79cd960e0ca138f16598d5f11f.tar.gz tdenetwork-1329ec6abbcb7b79cd960e0ca138f16598d5f11f.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'ksirc')
44 files changed, 370 insertions, 370 deletions
diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp index 357ad1d7..44d9d338 100644 --- a/ksirc/FilterRuleEditor.cpp +++ b/ksirc/FilterRuleEditor.cpp @@ -37,17 +37,17 @@ FilterRuleEditor::FilterRuleEditor newHighlight(0); // ### split "OkPressed()" into 2 slots - connect( filter->ModifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(OkPressed()) ); - connect( filter->InsertButton, TQT_SIGNAL(clicked()), TQT_SLOT(OkPressed()) ); + connect( filter->ModifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(OkPressed()) ); + connect( filter->InsertButton, TQ_SIGNAL(clicked()), TQ_SLOT(OkPressed()) ); - connect( filter->NewButton, TQT_SIGNAL(clicked()), TQT_SLOT(newRule()) ); - connect( filter->DeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteRule()) ); + connect( filter->NewButton, TQ_SIGNAL(clicked()), TQ_SLOT(newRule()) ); + connect( filter->DeleteButton, TQ_SIGNAL(clicked()), TQ_SLOT(deleteRule()) ); - connect( filter->UpButton, TQT_SIGNAL(clicked()), TQT_SLOT(raiseRule()) ); - connect( filter->DownButton, TQT_SIGNAL(clicked()), TQT_SLOT(lowerRule()) ); + connect( filter->UpButton, TQ_SIGNAL(clicked()), TQ_SLOT(raiseRule()) ); + connect( filter->DownButton, TQ_SIGNAL(clicked()), TQ_SLOT(lowerRule()) ); - connect( filter->RuleList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(newHighlight(int)) ); - connect( filter->RuleList, TQT_SIGNAL(selected(int)), TQT_SLOT(newHighlight(int)) ); + connect( filter->RuleList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(newHighlight(int)) ); + connect( filter->RuleList, TQ_SIGNAL(selected(int)), TQ_SLOT(newHighlight(int)) ); filter->RuleList->setHScrollBarMode( TQListBox::AlwaysOff ); diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index 0630de34..7a7cee21 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -110,21 +110,21 @@ open_ksirc::open_ksirc TQString blah = i18n("Recent"); setGroup(blah); - connect(ComboB_ServerGroup, TQT_SIGNAL(activated( const TQString& )), - this, TQT_SLOT(setGroup( const TQString& ))); - connect(ComboB_ServerName, TQT_SIGNAL(activated( const TQString& )), - this, TQT_SLOT(setServer( const TQString& ))); + connect(ComboB_ServerGroup, TQ_SIGNAL(activated( const TQString& )), + this, TQ_SLOT(setGroup( const TQString& ))); + connect(ComboB_ServerName, TQ_SIGNAL(activated( const TQString& )), + this, TQ_SLOT(setServer( const TQString& ))); - connect(PB_Connect, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickConnect())); - connect(PB_Edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickEdit())); - connect(PB_Cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickCancel())); + connect(PB_Connect, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickConnect())); + connect(PB_Edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickEdit())); + connect(PB_Cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickCancel())); PB_Connect->setDefault(TRUE); PB_Connect->setAutoDefault(TRUE); PB_Edit->setEnabled(false); // Not yet implemented. ComboB_ServerName->setFocus(); - connect(ComboB_ServerName, TQT_SIGNAL(enterPressed()), this, TQT_SLOT(clickConnect())); + connect(ComboB_ServerName, TQ_SIGNAL(enterPressed()), this, TQ_SLOT(clickConnect())); } // insert a sorted list of groups into ComboB_ServerGroup, note that diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp index 6de1e845..34071979 100644 --- a/ksirc/KSPrefs/ksprefs.cpp +++ b/ksirc/KSPrefs/ksprefs.cpp @@ -69,20 +69,20 @@ KSPrefs::KSPrefs(TQWidget * parent, const char * name): pageAutoConnect = new PageAutoConnect( itemAutoConnect ); pageShortcuts = new PageShortcuts( itemShortcuts ); - connect(pageLooknFeel, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageGeneral, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageStartup, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageColors, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageIRCColors, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageFont, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageRMBMenu, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageServChan, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageAutoConnect, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageShortcuts, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - - connect(this, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( saveConfig() ) ); - connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( saveConfig() ) ); - connect(this, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT(defaultConfig() ) ); + connect(pageLooknFeel, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageGeneral, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageStartup, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageColors, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageIRCColors, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageFont, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageRMBMenu, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageServChan, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageAutoConnect, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageShortcuts, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + + connect(this, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( saveConfig() ) ); + connect(this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( saveConfig() ) ); + connect(this, TQ_SIGNAL( defaultClicked() ), this, TQ_SLOT(defaultConfig() ) ); looknfeelTopLayout->addWidget( pageLooknFeel ); generalTopLayout->addWidget( pageGeneral ); diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp index a4a59c1b..9230503f 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -6,7 +6,7 @@ PageFont::PageFont( TQWidget *parent, const char *name ) : layout = new TQHBoxLayout(this); fontchooser = new TDEFontChooser(this); layout->addWidget(fontchooser); - connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update())); + connect(fontchooser,TQ_SIGNAL(fontSelected ( const TQFont&)), this, TQ_SLOT(update())); } PageFont::~PageFont( ) diff --git a/ksirc/KSPrefs/page_rmbmenu.cpp b/ksirc/KSPrefs/page_rmbmenu.cpp index 0a5c223f..03f7fa0d 100644 --- a/ksirc/KSPrefs/page_rmbmenu.cpp +++ b/ksirc/KSPrefs/page_rmbmenu.cpp @@ -41,21 +41,21 @@ PageRMBMenu::PageRMBMenu( TQWidget *parent, const char *name ) : PageRMBMenuBase changeItemPB->hide(); - connect(commandLB, TQT_SIGNAL(highlighted( int )), - this, TQT_SLOT(highlighted( int ))); - connect(moveUpPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(moveDown())); - connect(moveDownPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(moveUp())); + connect(commandLB, TQ_SIGNAL(highlighted( int )), + this, TQ_SLOT(highlighted( int ))); + connect(moveUpPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(moveDown())); + connect(moveDownPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(moveUp())); - connect(insertSeperatorPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(insSeperator())); + connect(insertSeperatorPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(insSeperator())); - connect(insertItemPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(insCommand())); + connect(insertItemPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(insCommand())); - connect(deleteItemPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(delCommand())); + connect(deleteItemPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(delCommand())); } diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp index 91edf864..fc9e73e6 100644 --- a/ksirc/KSPrefs/page_servchan.cpp +++ b/ksirc/KSPrefs/page_servchan.cpp @@ -17,10 +17,10 @@ PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name) { - connect(serverDeleteItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedSL())); - connect(ServerAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedSL())); - connect(chanDeleteItmPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedCL())); - connect(ChanAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedCL())); + connect(serverDeleteItemPB, TQ_SIGNAL(pressed()), this, TQ_SLOT(deletePressedSL())); + connect(ServerAddItemPB, TQ_SIGNAL(pressed()), this, TQ_SLOT(addPressedSL())); + connect(chanDeleteItmPB, TQ_SIGNAL(pressed()), this, TQ_SLOT(deletePressedCL())); + connect(ChanAddItemPB, TQ_SIGNAL(pressed()), this, TQ_SLOT(addPressedCL())); } diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp index c1f3da12..fc52334a 100644 --- a/ksirc/KSPrefs/page_shortcuts.cpp +++ b/ksirc/KSPrefs/page_shortcuts.cpp @@ -21,7 +21,7 @@ PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcu globalGB->setColumnLayout( 0, TQt::Horizontal ); m_key = new KKeyChooser(servercontroller::self()->getGlobalAccel(), globalGB); - connect(m_key, TQT_SIGNAL(keyChange()), this, TQT_SLOT(changed())); + connect(m_key, TQ_SIGNAL(keyChange()), this, TQ_SLOT(changed())); globalGB->layout()->add(m_key); } diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp index d95a2725..e2a4813d 100644 --- a/ksirc/KSPrefs/page_startup.cpp +++ b/ksirc/KSPrefs/page_startup.cpp @@ -27,8 +27,8 @@ PageStartup::PageStartup( TQWidget *parent, const char *name ) : PageStartupBase serverLB->downButton()->hide(); TQListBox *lb = serverLB->listBox(); - connect(lb, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(clickedLB(int))); + connect(lb, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(clickedLB(int))); changing = false; diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp index 5aacdb59..4c83794d 100644 --- a/ksirc/KSProgress/ksprogressdata.cpp +++ b/ksirc/KSProgress/ksprogressdata.cpp @@ -38,7 +38,7 @@ ksprogressData::ksprogressData dlgedit_PushButton_1->setGeometry( 70, 90, 100, 30 ); dlgedit_PushButton_1->setMinimumSize( 10, 10 ); dlgedit_PushButton_1->setMaximumSize( 32767, 32767 ); - connect( dlgedit_PushButton_1, TQT_SIGNAL(clicked()), TQT_SLOT(cancelPressed()) ); + connect( dlgedit_PushButton_1, TQ_SIGNAL(clicked()), TQ_SLOT(cancelPressed()) ); dlgedit_PushButton_1->setAutoRepeat( FALSE ); fileName = new TQLabel( this, "Label_1" ); diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index 8e81ae1d..5fe687e2 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -55,12 +55,12 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f) chars = this->width() / onechar; popup = new TQPopupMenu(); - popup->insertItem(i18n( "Font..." ), this, TQT_SLOT(fontSelector())); - popup->insertItem(i18n( "Scroll Rate..." ), this, TQT_SLOT(scrollRate())); - iScrollItem = popup->insertItem(i18n( "Scroll Constantly" ), this, TQT_SLOT(scrollConstantly())); + popup->insertItem(i18n( "Font..." ), this, TQ_SLOT(fontSelector())); + popup->insertItem(i18n( "Scroll Rate..." ), this, TQ_SLOT(scrollRate())); + iScrollItem = popup->insertItem(i18n( "Scroll Constantly" ), this, TQ_SLOT(scrollConstantly())); popup->setItemChecked(iScrollItem, bScrollConstantly); popup->insertSeparator(); - popup->insertItem(i18n( "Return to Normal Mode" ), this, TQT_SIGNAL(doubleClick())); + popup->insertItem(i18n( "Return to Normal Mode" ), this, TQ_SIGNAL(doubleClick())); currentStr = ""; @@ -434,8 +434,8 @@ void KSTicker::scrollRate() { SpeedDialog *sd = new SpeedDialog(tickRate, tickStep); sd->setLimit(5, 200, 1, onechar); - connect(sd, TQT_SIGNAL(stateChange(int, int)), - this, TQT_SLOT(setSpeed(int, int))); + connect(sd, TQ_SIGNAL(stateChange(int, int)), + this, TQ_SLOT(setSpeed(int, int))); sd->show(); } diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index f11be8da..88669f8d 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -80,10 +80,10 @@ int main(int argc, char **argv){ StdInTicker *kst = new StdInTicker(); TQSocketNotifier *sn = new TQSocketNotifier(0, TQSocketNotifier::Read); - TQObject::connect(sn, TQT_SIGNAL(activated(int)), - kst, TQT_SLOT(readsocket(int))); - TQObject::connect(kst, TQT_SIGNAL(doubleClick()), kst, TQT_SLOT(end())); - TQObject::connect(kst, TQT_SIGNAL(closing()), kst, TQT_SLOT(end())); + TQObject::connect(sn, TQ_SIGNAL(activated(int)), + kst, TQ_SLOT(readsocket(int))); + TQObject::connect(kst, TQ_SIGNAL(doubleClick()), kst, TQ_SLOT(end())); + TQObject::connect(kst, TQ_SIGNAL(closing()), kst, TQ_SLOT(end())); a.setMainWidget(kst); kst->show(); return a.exec(); diff --git a/ksirc/KSTicker/speeddialog.cpp b/ksirc/KSTicker/speeddialog.cpp index 8bc3ca0d..8a6628ae 100644 --- a/ksirc/KSTicker/speeddialog.cpp +++ b/ksirc/KSTicker/speeddialog.cpp @@ -21,10 +21,10 @@ SpeedDialog::SpeedDialog : speeddialogData( parent, name ) { setCaption(i18n( "Speed Setup") ); - connect(sliderTick, TQT_SIGNAL(valueChanged(int)), - lcdTick, TQT_SLOT(display(int))); - connect(sliderStep, TQT_SIGNAL(valueChanged(int)), - lcdStep, TQT_SLOT(display(int))); + connect(sliderTick, TQ_SIGNAL(valueChanged(int)), + lcdTick, TQ_SLOT(display(int))); + connect(sliderStep, TQ_SIGNAL(valueChanged(int)), + lcdStep, TQ_SLOT(display(int))); lcdTick->display(tick); sliderTick->setValue(tick); lcdStep->display(step); diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp index 38d5b524..6e2c01bf 100644 --- a/ksirc/KSTicker/speeddialogData.cpp +++ b/ksirc/KSTicker/speeddialogData.cpp @@ -25,7 +25,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) TQGridLayout *grid = new TQGridLayout( this, 3, 2 , KDialog::marginHint(), KDialog::spacingHint()); sliderTick = new TQSlider( this, "Slider_1" ); grid->addWidget( sliderTick, 0, 1 ); - connect( sliderTick, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateTick(int)) ); + connect( sliderTick, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateTick(int)) ); sliderTick->setOrientation( TQt::Horizontal ); sliderTick->setRange( 10, 200 ); sliderTick->setSteps( 10, 50 ); @@ -37,7 +37,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) sliderStep = new TQSlider( this, "Slider_2" ); grid->addWidget( sliderStep, 1, 1 ); - connect( sliderStep, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateStep(int)) ); + connect( sliderStep, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateStep(int)) ); sliderStep->setOrientation( TQt::Horizontal ); sliderStep->setRange( 1, 10 ); sliderStep->setSteps( 1, 2 ); @@ -81,7 +81,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) TQPushButton* dlgedit_PushButton_2; dlgedit_PushButton_2 = new KPushButton( KStdGuiItem::close(), this, "PushButton_2" ); - connect( dlgedit_PushButton_2, TQT_SIGNAL(pressed()), TQT_SLOT(terminate()) ); + connect( dlgedit_PushButton_2, TQ_SIGNAL(pressed()), TQ_SLOT(terminate()) ); grid->addWidget( dlgedit_PushButton_2, 2, 2 ); //resize( 270,120 ); diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp index f7cf4f69..de243be6 100644 --- a/ksirc/NewWindowDialog.cpp +++ b/ksirc/NewWindowDialog.cpp @@ -30,10 +30,10 @@ NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * par l2->setBuddy(m_le); connect( - m_combo, TQT_SIGNAL(activated(const TQString &)), - m_combo, TQT_SLOT(addToHistory(const TQString &))); - connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT( slotTextChanged( const TQString &))); + m_combo, TQ_SIGNAL(activated(const TQString &)), + m_combo, TQ_SLOT(addToHistory(const TQString &))); + connect( m_combo->lineEdit(), TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT( slotTextChanged( const TQString &))); TDEConfig *kConfig = kapp->config(); TDEConfigGroupSaver saver(kConfig, "Recent"); diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 6f3b038e..902ac0bd 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -66,8 +66,8 @@ aHistLineEdit::aHistLineEdit(TQWidget *parent, const char *name) setVScrollBarMode( AlwaysOff ); setHScrollBarMode( AlwaysOff ); -// connect( this, TQT_SIGNAL( returnPressed () ), this, TQT_SLOT( slotReturn() ) ); - connect( this, TQT_SIGNAL( textChanged () ), this, TQT_SLOT( slotMaybeResize() ) ); +// connect( this, TQ_SIGNAL( returnPressed () ), this, TQ_SLOT( slotReturn() ) ); + connect( this, TQ_SIGNAL( textChanged () ), this, TQ_SLOT( slotMaybeResize() ) ); setTabChangesFocus(true); setTextFormat(PlainText); diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp index 7cb71022..7557e2b6 100644 --- a/ksirc/alistbox.cpp +++ b/ksirc/alistbox.cpp @@ -29,15 +29,15 @@ aListBox::aListBox(TQWidget *parent, const char *name ) clear(); p_scroll = TQPalette(palette()); setAcceptDrops( true ); - connect(this, TQT_SIGNAL(selected (const TQString&)), - this, TQT_SIGNAL(selectedNick(const TQString&))); + connect(this, TQ_SIGNAL(selected (const TQString&)), + this, TQ_SIGNAL(selectedNick(const TQString&))); m_nickListDirty = true; updateNickPrefixWidth(); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListBoxItem *, const TQPoint & ) ), - this, TQT_SLOT( reEmitContextMenuRequest( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListBoxItem *, const TQPoint & ) ), + this, TQ_SLOT( reEmitContextMenuRequest( TQListBoxItem * ) ) ); } aListBox::~aListBox() diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index b7a4f307..482c96ad 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -28,15 +28,15 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name) { Popupmenu = new TDEPopupMenu( this ); Popupmenu->insertTitle(i18n("Channel Modes")); - toggleMenu[0] = Popupmenu->insertItem(i18n("i (invite-only)"), this, TQT_SLOT(invite())); - toggleMenu[1] = Popupmenu->insertItem(i18n("l (limited users)"), this, TQT_SLOT(limited())); - toggleMenu[2] = Popupmenu->insertItem(i18n("k (key to join)"), this, TQT_SLOT(key())); - toggleMenu[3] = Popupmenu->insertItem(i18n("s (secret)"), this, TQT_SLOT(secret())); + toggleMenu[0] = Popupmenu->insertItem(i18n("i (invite-only)"), this, TQ_SLOT(invite())); + toggleMenu[1] = Popupmenu->insertItem(i18n("l (limited users)"), this, TQ_SLOT(limited())); + toggleMenu[2] = Popupmenu->insertItem(i18n("k (key to join)"), this, TQ_SLOT(key())); + toggleMenu[3] = Popupmenu->insertItem(i18n("s (secret)"), this, TQ_SLOT(secret())); Popupmenu->insertSeparator(); Popupmenu->insertTitle(i18n("User Modes")); - toggleMenu[4] = Popupmenu->insertItem(i18n("i (be invisible)"), this, TQT_SLOT(invisible())); - toggleMenu[5] = Popupmenu->insertItem(i18n("w (receive wallops)"), this, TQT_SLOT(wallops())); - toggleMenu[6] = Popupmenu->insertItem(i18n("s (get server notices)"), this, TQT_SLOT(serverNotices())); + toggleMenu[4] = Popupmenu->insertItem(i18n("i (be invisible)"), this, TQ_SLOT(invisible())); + toggleMenu[5] = Popupmenu->insertItem(i18n("w (receive wallops)"), this, TQ_SLOT(wallops())); + toggleMenu[6] = Popupmenu->insertItem(i18n("s (get server notices)"), this, TQ_SLOT(serverNotices())); layout = new TQHBoxLayout(this); layout->setSpacing(0); @@ -46,21 +46,21 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name) protectButton->setToggleButton(true); makeSquare(protectButton); TQToolTip::add(protectButton, i18n("Only op'ed users can change the topic")); - connect(protectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(protectMode())); + connect(protectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(protectMode())); layout->addWidget(protectButton); outsideButton = new TQPushButton(i18n("N"), this); outsideButton->setToggleButton(true); makeSquare(outsideButton); TQToolTip::add(outsideButton, i18n("No outside messages")); - connect(outsideButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(outsideMode())); + connect(outsideButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(outsideMode())); layout->addWidget(outsideButton); moderateButton = new TQPushButton(i18n("M"), this); moderateButton->setToggleButton(true); makeSquare(moderateButton); TQToolTip::add(moderateButton, i18n("Only op'ed users and voiced users (+v) can speak")); - connect(moderateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(moderateMode())); + connect(moderateButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(moderateMode())); layout->addWidget(moderateButton); menuButton = new TQPushButton(i18n("..."), this); @@ -235,10 +235,10 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, Layout->addWidget(okButton); switch (modeType) { case limited: - connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(limitedUsers())); + connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(limitedUsers())); break; case key: - connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(keyString())); + connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(keyString())); break; } @@ -248,7 +248,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, cancelButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, cancelButton->sizePolicy().hasHeightForWidth())); Layout->addWidget(cancelButton); - connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); LimitedLayout->addLayout(Layout); TQSpacerItem *spacer = new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding); diff --git a/ksirc/charSelector.cpp b/ksirc/charSelector.cpp index 32f4be55..7d239276 100644 --- a/ksirc/charSelector.cpp +++ b/ksirc/charSelector.cpp @@ -19,13 +19,13 @@ charSelector::charSelector(TQWidget *parent, const char* name) testLayout->addWidget(charSelect); charSelect->installEventFilter(this); - connect(charSelect, TQT_SIGNAL(doubleClicked()), TQT_SLOT(insertText())); + connect(charSelect, TQ_SIGNAL(doubleClicked()), TQ_SLOT(insertText())); TQHBoxLayout *buttonLayout = new TQHBoxLayout; buttonLayout->setSpacing( spacingHint() ); insertButton = new TQPushButton(i18n("&Insert Char"), this); - connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertText())); + connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertText())); buttonLayout->addWidget(insertButton); TQSpacerItem *spacer = new TQSpacerItem(50, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding); diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp index 84eb1eb0..cbd7317a 100644 --- a/ksirc/colorpicker.cpp +++ b/ksirc/colorpicker.cpp @@ -71,10 +71,10 @@ ColorPicker::ColorPicker( TQWidget *parent, const char *name ) ok->setAutoDefault( false ); cancel->setAutoDefault( false ); - connect( foregroundColor, TQT_SIGNAL( colorPicked( int ) ), - this, TQT_SLOT( setForegroundColor( int ) ) ); - connect( backgroundColor, TQT_SIGNAL( colorPicked( int ) ), - this, TQT_SLOT( setBackgroundColor( int ) ) ); + connect( foregroundColor, TQ_SIGNAL( colorPicked( int ) ), + this, TQ_SLOT( setForegroundColor( int ) ) ); + connect( backgroundColor, TQ_SIGNAL( colorPicked( int ) ), + this, TQ_SLOT( setBackgroundColor( int ) ) ); ok->setEnabled( false ); diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp index a7576c7f..9ac46b7f 100644 --- a/ksirc/dccManager.cpp +++ b/ksirc/dccManager.cpp @@ -215,10 +215,10 @@ dccManager::dccManager( TQWidget *parent, const char *name ) : dccManagerbase( p m_sendit->setSelectable(false); m_chatit->setSelectable(false); -// connect(klvBox, TQT_SIGNAL(clicked(TQListViewItem *)), -// this, TQT_SLOT(getSelChange(TQListViewItem *))); - connect(klvBox, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(getSelChange(TQListViewItem *))); +// connect(klvBox, TQ_SIGNAL(clicked(TQListViewItem *)), +// this, TQ_SLOT(getSelChange(TQListViewItem *))); + connect(klvBox, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(getSelChange(TQListViewItem *))); klvBox->setCurrentItem(m_chatit); getSelChange(klvBox->currentItem()); @@ -232,8 +232,8 @@ dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dccS { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_sendit, this, dccItem::dccSend, file, who, status, size); - connect(it, TQT_SIGNAL(statusChanged(TQListViewItem *)), - this, TQT_SLOT(getSelChange(TQListViewItem *))); + connect(it, TQ_SIGNAL(statusChanged(TQListViewItem *)), + this, TQ_SLOT(getSelChange(TQListViewItem *))); return it; } @@ -241,8 +241,8 @@ dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dccSt { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_getit, this, dccItem::dccGet, file, who, status, size); - connect(it, TQT_SIGNAL(statusChanged(TQListViewItem *)), - this, TQT_SLOT(getSelChange(TQListViewItem *))); + connect(it, TQ_SIGNAL(statusChanged(TQListViewItem *)), + this, TQ_SLOT(getSelChange(TQListViewItem *))); return it; } @@ -251,8 +251,8 @@ dccItem *dccManager::newChatItem(TQString who, enum dccItem::dccStatus status) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_chatit, this, dccItem::dccChat, "", who, status, 0); - connect(it, TQT_SIGNAL(statusChanged(TQListViewItem *)), - this, TQT_SLOT(getSelChange(TQListViewItem *))); + connect(it, TQ_SIGNAL(statusChanged(TQListViewItem *)), + this, TQ_SLOT(getSelChange(TQListViewItem *))); return it; } @@ -268,8 +268,8 @@ void dccManager::kpbNew_clicked() dccNewDialog = new dccNew(); dccNewDialog->show(); - connect(dccNewDialog, TQT_SIGNAL(accepted(int, TQString, TQString)), - this, TQT_SLOT(dccNewAccepted(int, TQString, TQString))); + connect(dccNewDialog, TQ_SIGNAL(accepted(int, TQString, TQString)), + this, TQ_SLOT(dccNewAccepted(int, TQString, TQString))); } diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp index fe30011d..03aa40f0 100644 --- a/ksirc/dccNew.cpp +++ b/ksirc/dccNew.cpp @@ -94,14 +94,14 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick ) fileSendClicked(); } - connect(nickList, TQT_SIGNAL(highlighted(const TQString &)), - cbNicks, TQT_SLOT(setEditText(const TQString &))); + connect(nickList, TQ_SIGNAL(highlighted(const TQString &)), + cbNicks, TQ_SLOT(setEditText(const TQString &))); - connect(pbCancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject())); + connect(pbCancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject())); - connect(pbSend, TQT_SIGNAL(clicked()), - this, TQT_SLOT(accept())); + connect(pbSend, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept())); } diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp index 4e6e9353..8db0c1ee 100644 --- a/ksirc/dccToplevel.cpp +++ b/ksirc/dccToplevel.cpp @@ -22,10 +22,10 @@ dccTopLevel::dccTopLevel(TQWidget *parent, const char *name) // m_mgr->show(); setCentralWidget(m_mgr); - connect(m_mgr, TQT_SIGNAL(changed(bool, TQString)), this, TQT_SIGNAL(changed(bool, TQString))); + connect(m_mgr, TQ_SIGNAL(changed(bool, TQString)), this, TQ_SIGNAL(changed(bool, TQString))); TQPopupMenu *win = new TQPopupMenu(this, TQCString(this->name()) + "_popup_window"); - TDEAction *act = KStdAction::close(this, TQT_SLOT( close() ), actionCollection() ); + TDEAction *act = KStdAction::close(this, TQ_SLOT( close() ), actionCollection() ); act->plug(win); menuBar()->insertItem(i18n("&File"), win, DTL_WINDOW_ID, -1); diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index 9dbbc981..ae2c45bf 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -36,7 +36,7 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) topLevel()->addWidget( w, show ); if(w->inherits("KSircTopLevel")){ KSircTopLevel *t = static_cast<KSircTopLevel *>(w); - connect(m_topLevel->tabWidget(), TQT_SIGNAL(currentChanged(TQWidget *)), t, TQT_SLOT(focusChange(TQWidget *))); + connect(m_topLevel->tabWidget(), TQ_SIGNAL(currentChanged(TQWidget *)), t, TQ_SLOT(focusChange(TQWidget *))); } if(w->inherits("TDEMainWindow")){ TDEMainWindow *t = static_cast<TDEMainWindow *>(w); @@ -45,10 +45,10 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) if(cmenu){ TQPopupMenu *m = new TQPopupMenu(t, TQCString(t->name()) + "_popup_MDI"); m->setCheckable(true); - m->insertItem(i18n("Detach Window"), this, TQT_SLOT(reparentReq()), 0, DMM_DEATCH_ID, 0); + m->insertItem(i18n("Detach Window"), this, TQ_SLOT(reparentReq()), 0, DMM_DEATCH_ID, 0); m->insertSeparator(0); - m->insertItem(i18n("Move Tab Left"), this, TQT_SLOT(moveWindowLeft()), ALT+SHIFT+Key_Left, DMM_MOVEL_ID, 0); - m->insertItem(i18n("Move Tab Right"), this, TQT_SLOT(moveWindowRight()), ALT+SHIFT+Key_Right, DMM_MOVER_ID, 0); + m->insertItem(i18n("Move Tab Left"), this, TQ_SLOT(moveWindowLeft()), ALT+SHIFT+Key_Left, DMM_MOVEL_ID, 0); + m->insertItem(i18n("Move Tab Right"), this, TQ_SLOT(moveWindowRight()), ALT+SHIFT+Key_Right, DMM_MOVER_ID, 0); /* * By using an posisiton of 4 this works for KSircTopLevel * and DCCTopLevel but will cause problems when we have @@ -62,7 +62,7 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) TDEToggleAction *showmenu = KStdAction::showMenubar( 0, 0, t->actionCollection() ); showmenu->plug( sm ); - connect( showmenu, TQT_SIGNAL(toggled(bool)), cmenu, TQT_SLOT(setShown(bool)) ); + connect( showmenu, TQ_SIGNAL(toggled(bool)), cmenu, TQ_SLOT(setShown(bool)) ); TDESelectAction *selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, "tabbar" ); TQStringList tabbaritems; @@ -70,11 +70,11 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) selectTabbar->setItems(tabbaritems); selectTabbar->setCurrentItem(1); selectTabbar->plug( sm ); - connect( selectTabbar, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setTabPosition(int)) ); + connect( selectTabbar, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setTabPosition(int)) ); TDEToggleAction *showfull = KStdAction::fullScreen( 0, 0, t->actionCollection(), t ); showfull->plug( sm ); - connect( showfull, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setFullScreen(bool)) ); + connect( showfull, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setFullScreen(bool)) ); cmenu->insertItem( i18n("&Settings"), sm, -1, 5 ); } @@ -239,8 +239,8 @@ MDITopLevel *DisplayMgrMDI::topLevel() m_topLevel->show(); TDEAccel *a = new TDEAccel( m_topLevel ); - a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) ); - a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) ); + a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQ_SLOT(slotCycleTabsLeft()) ); + a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQ_SLOT(slotCycleTabsRight()) ); } return m_topLevel; diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index be5bb6bc..d46d8c43 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -63,24 +63,24 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren pop->setName("dockServerController_menu_pop"); #ifndef NDEBUG - pop->insertItem(i18n("Dump Object Tree"), sc, TQT_SLOT(dump_obj())); - pop->insertItem(i18n("Server Debug Window"), sc, TQT_SLOT(server_debug())); + pop->insertItem(i18n("Dump Object Tree"), sc, TQ_SLOT(dump_obj())); + pop->insertItem(i18n("Server Debug Window"), sc, TQ_SLOT(server_debug())); pop->insertSeparator(); #endif pop->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."), - m_sc, TQT_SLOT(filter_rule_editor())); + m_sc, TQ_SLOT(filter_rule_editor())); - KStdAction::preferences(m_sc, TQT_SLOT(general_prefs()), + KStdAction::preferences(m_sc, TQ_SLOT(general_prefs()), m_sc->actionCollection())->plug(pop); - KStdAction::configureNotifications(m_sc, TQT_SLOT(notification_prefs()), actionCollection())->plug(pop); + KStdAction::configureNotifications(m_sc, TQ_SLOT(notification_prefs()), actionCollection())->plug(pop); pop->insertSeparator(); pop->insertItem(i18n("New &Server..."), - m_sc, TQT_SLOT(new_connection())); - pop->insertItem(i18n("&Do Autoconnect..."), m_sc, TQT_SLOT(start_autoconnect_check())); - connect(this, TQT_SIGNAL(quitSelected()), m_sc, TQT_SLOT(endksirc())); + m_sc, TQ_SLOT(new_connection())); + pop->insertItem(i18n("&Do Autoconnect..."), m_sc, TQ_SLOT(start_autoconnect_check())); + connect(this, TQ_SIGNAL(quitSelected()), m_sc, TQ_SLOT(endksirc())); #if KDE_IS_VERSION(3,1,92) m_pic_dock = KSystemTray::loadIcon( "ksirc" ); @@ -97,7 +97,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren createMainPopup(); m_blinkTimer = new TQTimer( this ); - connect( m_blinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( blinkDockedIcon() ) ); + connect( m_blinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( blinkDockedIcon() ) ); m_blinkStatus = false; m_blinkActive = false; @@ -107,14 +107,14 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren i18n("If someone said your nick in a window, this action " "will make that window active for you."), ALT+CTRL+Key_A, KKey::QtWIN+CTRL+Key_A, this, - TQT_SLOT(raiseLastActiveWindow())); + TQ_SLOT(raiseLastActiveWindow())); servercontroller::self() ->getGlobalAccel() ->insert("Clear Blink", i18n("Clear Blinking Dock Icon"), i18n("If the dock icon is blinking, but you don't want " "to go to the window this will clear the blinking."), ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, this, - TQT_SLOT(blinkClear())); + TQ_SLOT(blinkClear())); // mainPop = new TDEPopupMenu(this, "dockServerController_main_pop"); // mainPop->setTitle(i18n("KSirc Dock Menu")); @@ -161,12 +161,12 @@ void dockServerController::createMainPopup() if(mainPop) delete mainPop; mainPop = new TDEPopupMenu(this, "dockservercontrller_main_pop"); - connect(mainPop, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(mainActivated(int))); - connect(mainPop, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(mainPopShow())); - connect(mainPop, TQT_SIGNAL(aboutToHide()), - this, TQT_SLOT(mainPopHide())); + connect(mainPop, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(mainActivated(int))); + connect(mainPop, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(mainPopShow())); + connect(mainPop, TQ_SIGNAL(aboutToHide()), + this, TQ_SLOT(mainPopHide())); TQDictIterator<dscNickInfo> it( m_nicks ); @@ -187,8 +187,8 @@ void dockServerController::createMainPopup() sub->setItemParameter(cid, id); sub->setItemParameter(wid, id); sub->setItemParameter(dcid, id); - connect(sub, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(subItemActivated(int))); + connect(sub, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(subItemActivated(int))); } else { sub->insertItem(i18n("Went Offline: ") + it.current()->offline().toString("hh:mm")); @@ -206,8 +206,8 @@ void dockServerController::createMainPopup() } } if(mainPop->count() == 0){ - mainPop->insertItem(i18n("Help on Notify Popup..."), this, TQT_SLOT(helpNotice())); - mainPop->insertItem(i18n("Configure Notify..."), this, TQT_SLOT(configNotify())); + mainPop->insertItem(i18n("Help on Notify Popup..."), this, TQ_SLOT(helpNotice())); + mainPop->insertItem(i18n("Configure Notify..."), this, TQ_SLOT(configNotify())); } } @@ -421,8 +421,8 @@ void dockServerController::helpNotice() void dockServerController::configNotify() { KSPrefs *kp = new KSPrefs(); - connect(kp, TQT_SIGNAL(update(int)), - m_sc, TQT_SLOT(configChange())); + connect(kp, TQ_SIGNAL(update(int)), + m_sc, TQ_SLOT(configChange())); kp->resize(550, 450); kp->showPage(2); /* Show auto connect page */ kp->show(); diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp index be0cdbb6..f5053400 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -31,11 +31,11 @@ KSircIODCC::KSircIODCC(KSircProcess *_proc) : displayMgr->newTopLevel(mgr, FALSE); displayMgr->setCaption(mgr, proc->serverName() + i18n(" DCC Controller")); - connect(mgr->mgr(), TQT_SIGNAL(dccConnectClicked(dccItem *)), this, TQT_SLOT(dccConnectClicked(dccItem *))); - connect(mgr->mgr(), TQT_SIGNAL(dccResumeClicked(dccItem *)), this, TQT_SLOT(dccResumeClicked(dccItem *))); - connect(mgr->mgr(), TQT_SIGNAL(dccRenameClicked(dccItem *)), this, TQT_SLOT(dccRenameClicked(dccItem *))); - connect(mgr->mgr(), TQT_SIGNAL(dccAbortClicked(dccItem *)), this, TQT_SLOT(dccAbortClicked(dccItem *))); - connect(mgr->mgr(), TQT_SIGNAL(outputLine(TQCString)), this, TQT_SIGNAL(outputLine(TQCString))); + connect(mgr->mgr(), TQ_SIGNAL(dccConnectClicked(dccItem *)), this, TQ_SLOT(dccConnectClicked(dccItem *))); + connect(mgr->mgr(), TQ_SIGNAL(dccResumeClicked(dccItem *)), this, TQ_SLOT(dccResumeClicked(dccItem *))); + connect(mgr->mgr(), TQ_SIGNAL(dccRenameClicked(dccItem *)), this, TQ_SLOT(dccRenameClicked(dccItem *))); + connect(mgr->mgr(), TQ_SIGNAL(dccAbortClicked(dccItem *)), this, TQ_SLOT(dccAbortClicked(dccItem *))); + connect(mgr->mgr(), TQ_SIGNAL(outputLine(TQCString)), this, TQ_SIGNAL(outputLine(TQCString))); } @@ -99,8 +99,8 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // setup dcc dialog displayMgr->show(mgr); dccItem *it = mgr->mgr()->newGetItem(filename, who, dccItem::dccGotOffer, fileSize); - connect(it, TQT_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), - this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString))); + connect(it, TQ_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), + this, TQ_SLOT(dccRenameDone(dccItem *, TQString, TQString))); it->setWhoPostfix("(" + ip + ")"); TQString key = TQString("%1/%2").arg(filename).arg(who); @@ -173,8 +173,8 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // setup dcc dialog displayMgr->show(mgr); dccItem *it = mgr->mgr()->newChatItem(who, dccItem::dccGotOffer); - connect(it, TQT_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), - this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString))); + connect(it, TQ_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), + this, TQ_SLOT(dccRenameDone(dccItem *, TQString, TQString))); it->setWhoPostfix("(" + ip + ")"); DCCChatItems.insert(who, it); } @@ -190,8 +190,8 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // setup dcc dialog displayMgr->show(mgr); dccItem *it = mgr->mgr()->newChatItem(who, dccItem::dccSentOffer); - connect(it, TQT_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), - this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString))); + connect(it, TQ_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), + this, TQ_SLOT(dccRenameDone(dccItem *, TQString, TQString))); DCCChatItems.insert(who, it); } else { diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index b197cbda..a9e5571a 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -103,20 +103,20 @@ KSircIOController::KSircIOController(TDEProcess *_proc, KSircProcess *_ksircproc // Connect the data arrived // to sirc receive for adding // the main text window - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(stdout_read(TDEProcess*, char*, int))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(stdout_read(TDEProcess*, char*, int))); // Connect the stderr data // to sirc receive for adding // the main text window - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(stderr_read(TDEProcess*, char*, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(stderr_read(TDEProcess*, char*, int))); - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(sircDied(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(sircDied(TDEProcess *))); // Notify on sirc dying - connect(proc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(procCTS(TDEProcess*))); + connect(proc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(procCTS(TDEProcess*))); proc_CTS = TRUE; #if 0 showDebugTraffic(true); @@ -397,8 +397,8 @@ void KSircIOController::showDebugTraffic(bool show) m_debugLB = new TQListBox(0x0, TQCString(this->name()) + "_debugWindow"); m_debugLB->resize(600, 300); m_debugLB->show(); - connect(m_debugLB,TQT_SIGNAL(contextMenuRequested(TQListBoxItem *,const TQPoint &)), - this,TQT_SLOT(showContextMenuOnDebugWindow(TQListBoxItem *,const TQPoint &))); + connect(m_debugLB,TQ_SIGNAL(contextMenuRequested(TQListBoxItem *,const TQPoint &)), + this,TQ_SLOT(showContextMenuOnDebugWindow(TQListBoxItem *,const TQPoint &))); } else if(m_debugLB != 0 && show == false){ delete m_debugLB; diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 4184bd06..3bbee663 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -215,22 +215,22 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa KSircIODCC *dcc = new KSircIODCC(this); TopList.insert("!dcc", dcc); dcc = static_cast<KSircIODCC *>( TopList["!dcc"] ); // g++ bug - connect(dcc, TQT_SIGNAL(outputLine(TQCString)), - iocontrol, TQT_SLOT(stdin_write(TQCString))); + connect(dcc, TQ_SIGNAL(outputLine(TQCString)), + iocontrol, TQ_SLOT(stdin_write(TQCString))); KSircIOLAG *lag = new KSircIOLAG(this); TopList.insert("!lag", lag); lag = static_cast<KSircIOLAG*>( TopList["!lag"] ); // g++ bug! - connect(lag, TQT_SIGNAL(outputLine(TQCString)), - iocontrol, TQT_SLOT(stdin_write(TQCString))); + connect(lag, TQ_SIGNAL(outputLine(TQCString)), + iocontrol, TQ_SLOT(stdin_write(TQCString))); KSircIONotify *notify = new KSircIONotify(this); TopList.insert("!notify", notify); notify = static_cast<KSircIONotify *>( TopList["!notify"] ); // g++ bug - connect(notify, TQT_SIGNAL(notify_online(TQString)), - this, TQT_SLOT(notify_forw_online(TQString))); - connect(notify, TQT_SIGNAL(notify_offline(TQString)), - this, TQT_SLOT(notify_forw_offline(TQString))); + connect(notify, TQ_SIGNAL(notify_online(TQString)), + this, TQ_SLOT(notify_forw_online(TQString))); + connect(notify, TQ_SIGNAL(notify_offline(TQString)), + this, TQ_SLOT(notify_forw_offline(TQString))); TopList.insert("!base_rules", new KSMBaseRules(this)); @@ -383,20 +383,20 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) // Connect needed signals. For a message window we never want it // becomming the default so we ignore focusIn events into it. - connect(wm, TQT_SIGNAL(outputLine(TQCString)), - iocontrol, TQT_SLOT(stdin_write(TQCString))); - connect(wm, TQT_SIGNAL(open_toplevel(const KSircChannel &)), - this,TQT_SLOT(new_toplevel (const KSircChannel &))); - connect(wm, TQT_SIGNAL(closing(KSircTopLevel *, TQString)), - this,TQT_SLOT(close_toplevel(KSircTopLevel *, TQString))); - connect(wm, TQT_SIGNAL(currentWindow(KSircTopLevel *)), - this,TQT_SLOT(default_window(KSircTopLevel *))); - connect(wm, TQT_SIGNAL(changeChannel(const TQString &, const TQString &)), - this,TQT_SLOT(recvChangeChannel(const TQString &, const TQString &))); - connect(wm, TQT_SIGNAL(destroyed(TQObject *)), - this,TQT_SLOT(clean_toplevel(TQObject *))); - connect( wm, TQT_SIGNAL( requestQuit( const TQCString& ) ), - TQT_SLOT( request_quit( const TQCString& ) ) ); + connect(wm, TQ_SIGNAL(outputLine(TQCString)), + iocontrol, TQ_SLOT(stdin_write(TQCString))); + connect(wm, TQ_SIGNAL(open_toplevel(const KSircChannel &)), + this,TQ_SLOT(new_toplevel (const KSircChannel &))); + connect(wm, TQ_SIGNAL(closing(KSircTopLevel *, TQString)), + this,TQ_SLOT(close_toplevel(KSircTopLevel *, TQString))); + connect(wm, TQ_SIGNAL(currentWindow(KSircTopLevel *)), + this,TQ_SLOT(default_window(KSircTopLevel *))); + connect(wm, TQ_SIGNAL(changeChannel(const TQString &, const TQString &)), + this,TQ_SLOT(recvChangeChannel(const TQString &, const TQString &))); + connect(wm, TQ_SIGNAL(destroyed(TQObject *)), + this,TQ_SLOT(clean_toplevel(TQObject *))); + connect( wm, TQ_SIGNAL( requestQuit( const TQCString& ) ), + TQ_SLOT( request_quit( const TQCString& ) ) ); default_window(wm); // Set it to the default window. emit ProcMessage(serverID(), ProcCommand::addTopLevel, channelInfo.channel()); @@ -457,7 +457,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) // Let's let em know she's deleted! if(ksopts->autoCreateWin == TRUE){ emit ProcMessage(serverID(), ProcCommand::turnOffAutoCreate, TQString()); - TQTimer::singleShot(5000, this, TQT_SLOT(turn_on_autocreate())); + TQTimer::singleShot(5000, this, TQ_SLOT(turn_on_autocreate())); auto_create_really = TRUE; } else{ @@ -496,7 +496,7 @@ void KSircProcess::request_quit( const TQCString& command ) iocontrol->stdin_write( command ); // Since removing the toplevels will delete the one that emitted this // signal as well, we need to defer this a little (malte) - TQTimer::singleShot( 0, this, TQT_SLOT( do_quit() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( do_quit() ) ); } void KSircProcess::do_quit() diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 12a6747e..85bb62cb 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -1625,8 +1625,8 @@ TextView::TextView( TQWidget *parent, const char *name ) viewport()->setBackgroundMode( PaletteBase ); viewport()->setMouseTracking( true ); m_autoScrollTimer = new TQTimer( this ); - connect(verticalScrollBar(), TQT_SIGNAL(valueChanged( int ) ), - this, TQT_SLOT(scrolling( int ))); + connect(verticalScrollBar(), TQ_SIGNAL(valueChanged( int ) ), + this, TQ_SLOT(scrolling( int ))); setDragAutoScroll( false ); @@ -2028,16 +2028,16 @@ void TextView::emitLinkClickedForMouseEvent( TQMouseEvent *ev ) void TextView::startAutoScroll() { if(m_autoScrollTimer->isActive() == false){ - connect( m_autoScrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( autoScroll() ) ); + connect( m_autoScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoScroll() ) ); m_autoScrollTimer->start( 75, false ); } } void TextView::stopAutoScroll() { - disconnect( m_autoScrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( autoScroll() ) ); + disconnect( m_autoScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoScroll() ) ); m_autoScrollTimer->stop(); } diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 5a34d95a..fe2261de 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -49,8 +49,8 @@ KSircView::KSircView(KSircProcess *proc, TQWidget *parent, const char *name) m_timestamps = false; viewport()->setAcceptDrops(true); clear(); - connect( this, TQT_SIGNAL( linkClicked( const TQMouseEvent *, const TQString & ) ), - this, TQT_SLOT( anchorClicked( const TQMouseEvent *, const TQString & ) ) ); + connect( this, TQ_SIGNAL( linkClicked( const TQMouseEvent *, const TQString & ) ), + this, TQ_SLOT( anchorClicked( const TQMouseEvent *, const TQString & ) ) ); TQPixmap background = ksopts->backgroundPixmap(); if ( !background.isNull() ) diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index 326286de..3576b554 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -39,11 +39,11 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) setCentralWidget( m_tab ); - connect( m_tab, TQT_SIGNAL( currentChanged( TQWidget * ) ), - this, TQT_SLOT( slotCurrentChanged( TQWidget * ) ) ); + connect( m_tab, TQ_SIGNAL( currentChanged( TQWidget * ) ), + this, TQ_SLOT( slotCurrentChanged( TQWidget * ) ) ); - connect( m_tab, TQT_SIGNAL( showContexMenu(TQWidget *, const TQPoint &) ), - this, TQT_SLOT( slotShowContexMenu(TQWidget *, const TQPoint &) ) ); + connect( m_tab, TQ_SIGNAL( showContexMenu(TQWidget *, const TQPoint &) ), + this, TQ_SLOT( slotShowContexMenu(TQWidget *, const TQPoint &) ) ); TDEConfig *config = kapp->config(); config->setGroup("MDI"); @@ -54,7 +54,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) m_addressedIcon = UserIcon( "application-vnd.tde.info" ); m_pop = new TDEPopupMenu(m_tab, ""); - m_pop->insertItem( SmallIcon("window-close"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() )); + m_pop->insertItem( SmallIcon("window-close"), i18n("Close"), this, TQ_SLOT( slotCloseLastWid() )); } @@ -89,16 +89,16 @@ void MDITopLevel::addWidget( TQWidget *widget, bool show ) m_tabWidgets.append( widget ); - connect( widget, TQT_SIGNAL( destroyed() ) , - this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( widget, TQ_SIGNAL( destroyed() ) , + this, TQ_SLOT( slotWidgetDestroyed() ) ); - connect( widget, TQT_SIGNAL( changeChannel( const TQString &, const TQString & ) ), - this, TQT_SLOT( slotChangeChannelName( const TQString &, const TQString & ) ) ); + connect( widget, TQ_SIGNAL( changeChannel( const TQString &, const TQString & ) ), + this, TQ_SLOT( slotChangeChannelName( const TQString &, const TQString & ) ) ); widget->installEventFilter( this ); - connect( widget, TQT_SIGNAL( changed( bool, TQString ) ), - this, TQT_SLOT( slotMarkPageDirty( bool ) ) ); + connect( widget, TQ_SIGNAL( changed( bool, TQString ) ), + this, TQ_SLOT( slotMarkPageDirty( bool ) ) ); } void MDITopLevel::removeWidget( TQWidget *widget ) diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index 993fd743..38042963 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -43,8 +43,8 @@ void objFinder::insert(TQObject *obj, const char *key){ } } objList->insert(name, obj); - connect(obj, TQT_SIGNAL(destroyed()), - objFind, TQT_SLOT(objDest())); + connect(obj, TQ_SIGNAL(destroyed()), + objFind, TQ_SLOT(objDest())); emit objFind->inserted(obj); } diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp index 06d290fb..a854cd60 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -103,11 +103,11 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name // accept() never blocks. qsnListen = new TQSocketNotifier(iListenFd, TQSocketNotifier::Read, this, TQString(name) + "_iListen"); - connect(qsnListen, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(NewConnect(int))); + connect(qsnListen, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(NewConnect(int))); - connect(objFind, TQT_SIGNAL(inserted(TQObject *)), - this, TQT_SLOT(slotInserted(TQObject *))); + connect(objFind, TQ_SIGNAL(inserted(TQObject *)), + this, TQ_SLOT(slotInserted(TQObject *))); qidConnectFd.setAutoDelete(TRUE); @@ -124,8 +124,8 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name * Connect outputMessage to the acutal write buffer function * outputMessage signals from pobjects are chained until they finally reach us. */ - connect(this, TQT_SIGNAL(outputMessage(int, PukeMessage *)), - this, TQT_SLOT(writeBuffer(int, PukeMessage *))); + connect(this, TQ_SIGNAL(outputMessage(int, PukeMessage *)), + this, TQ_SLOT(writeBuffer(int, PukeMessage *))); initHdlr(); // Setup message command handlers. @@ -176,10 +176,10 @@ void PukeController::NewConnect(int) fdStatus *fds = new fdStatus(); fds->sr = new TQSocketNotifier(cfd, TQSocketNotifier::Read, this); fds->sw = new TQSocketNotifier(cfd, TQSocketNotifier::Write, this); - connect(fds->sr, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(Traffic(int))); - connect(fds->sw, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(Writeable(int))); + connect(fds->sr, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(Traffic(int))); + connect(fds->sw, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(Writeable(int))); qidConnectFd.insert(cfd, fds); qsnListen->setEnabled(TRUE); @@ -609,8 +609,8 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm) } ws->type = iType; - connect(ws->pwidget, TQT_SIGNAL(outputMessage(int, PukeMessage*)), - this, TQT_SIGNAL(outputMessage(int, PukeMessage*))); + connect(ws->pwidget, TQ_SIGNAL(outputMessage(int, PukeMessage*)), + this, TQ_SIGNAL(outputMessage(int, PukeMessage*))); // insertPBoject(fd, uiBaseWinId, ws); // The widget list has to exist since we have ourselves in the list @@ -796,8 +796,8 @@ void PukeController::insertPObject(int fd, int iWinId, WidgetS *obj){ // Now connect to the destroyed signal so we can remove the object from the lists // Once it is deleted - connect(obj->pwidget, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(pobjectDestroyed())); + connect(obj->pwidget, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(pobjectDestroyed())); } void PukeController::pobjectDestroyed(){ @@ -959,8 +959,8 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm) } ws->type = iType; - connect(ws->pwidget, TQT_SIGNAL(outputMessage(int, PukeMessage*)), - this, TQT_SIGNAL(outputMessage(int, PukeMessage*))); + connect(ws->pwidget, TQ_SIGNAL(outputMessage(int, PukeMessage*)), + this, TQ_SIGNAL(outputMessage(int, PukeMessage*))); // insertPBoject(fd, uiBaseWinId, ws); // The widget list has to exist since we have ourselves in the list diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp index edccbe81..6f128464 100644 --- a/ksirc/puke/pbutton.cpp +++ b/ksirc/puke/pbutton.cpp @@ -92,14 +92,14 @@ void PButton::setWidget(TQObject *_qb) button = (TQButton *) _qb; if(button != 0){ - connect(button, TQT_SIGNAL(pressed()), - this, TQT_SLOT(buttonPressed())); - connect(button, TQT_SIGNAL(released()), - this, TQT_SLOT(buttonReleased())); - connect(button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(buttonClicked())); - connect(button, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(buttonToggled(bool))); + connect(button, TQ_SIGNAL(pressed()), + this, TQ_SLOT(buttonPressed())); + connect(button, TQ_SIGNAL(released()), + this, TQ_SLOT(buttonReleased())); + connect(button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(buttonClicked())); + connect(button, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(buttonToggled(bool))); } PWidget::setWidget(_qb); diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp index 56a4ddc0..1817e0a9 100644 --- a/ksirc/puke/plined.cpp +++ b/ksirc/puke/plined.cpp @@ -111,10 +111,10 @@ void PLineEdit::setWidget(TQObject *_le) lineedit = (TQLineEdit *) _le; if(lineedit != 0){ - connect(lineedit, TQT_SIGNAL(textChanged(const char *)), - this, TQT_SLOT(updateText(const char *))); - connect(lineedit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(returnPress())); + connect(lineedit, TQ_SIGNAL(textChanged(const char *)), + this, TQ_SLOT(updateText(const char *))); + connect(lineedit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(returnPress())); } PWidget::setWidget(_le); diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp index d0b98305..b8f9b8b8 100644 --- a/ksirc/puke/plistbox.cpp +++ b/ksirc/puke/plistbox.cpp @@ -160,10 +160,10 @@ void PListBox::setWidget(TQObject *_lb) lb = (TQListBox *) _lb; if(lb != 0){ - connect(lb, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(highlighted(int))); - connect(lb, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(selected(int))); + connect(lb, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(highlighted(int))); + connect(lb, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(selected(int))); } PFrame::setWidget(lb); diff --git a/ksirc/puke/pmenudta.cpp b/ksirc/puke/pmenudta.cpp index 576ebc39..1bf7f9bd 100644 --- a/ksirc/puke/pmenudta.cpp +++ b/ksirc/puke/pmenudta.cpp @@ -7,8 +7,8 @@ PMenuData::PMenuData(PObject *_child) : PObject() { child = _child; - connect(this, TQT_SIGNAL(outputMessage(int, PukeMessage*)), - child, TQT_SIGNAL(outputMessage(int, PukeMessage*))); + connect(this, TQ_SIGNAL(outputMessage(int, PukeMessage*)), + child, TQ_SIGNAL(outputMessage(int, PukeMessage*))); } PMenuData::~PMenuData() diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp index 99be1274..28a305c1 100644 --- a/ksirc/puke/pobject.cpp +++ b/ksirc/puke/pobject.cpp @@ -83,14 +83,14 @@ void PObject::setWidget(TQObject *_o) // Disconnect everything from the object we where listning too // Just in case it fires something off, we don't want to get it if(widget() != 0){ - disconnect(widget(), TQT_SIGNAL(destroyed()), - this, TQT_SLOT(swidgetDestroyed())); + disconnect(widget(), TQ_SIGNAL(destroyed()), + this, TQ_SLOT(swidgetDestroyed())); } obj = _o; if(obj != 0){ - connect(widget(), TQT_SIGNAL(destroyed()), - this, TQT_SLOT(swidgetDestroyed())); + connect(widget(), TQ_SIGNAL(destroyed()), + this, TQ_SLOT(swidgetDestroyed())); } } diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp index 2931ec77..27f5ce1e 100644 --- a/ksirc/puke/pobjfinder.cpp +++ b/ksirc/puke/pobjfinder.cpp @@ -19,8 +19,8 @@ PObjFinder::PObjFinder(PObject *parent) // We don't actually encase a widget since all the ObjFinder interface // is static setWidget(0x0); - connect(controller(), TQT_SIGNAL(inserted(TQObject *)), - this, TQT_SLOT(newObject(TQObject *))); + connect(controller(), TQ_SIGNAL(inserted(TQObject *)), + this, TQ_SLOT(newObject(TQObject *))); } PObjFinder::~PObjFinder() diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp index d50f6610..fe8bb1f7 100644 --- a/ksirc/puke/ppopmenu.cpp +++ b/ksirc/puke/ppopmenu.cpp @@ -89,8 +89,8 @@ void PPopupMenu::setWidget(TQObject *_menu) menu = (TQPopupMenu *) _menu; if(menu != 0x0){ - connect(menu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(got_activated(int))); + connect(menu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(got_activated(int))); } PFrame::setWidget(menu); } diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp index e1a6203c..4666fa59 100644 --- a/ksirc/puke/pprogress.cpp +++ b/ksirc/puke/pprogress.cpp @@ -115,8 +115,8 @@ void PProgress::setWidget(TQObject *_f) ksp = (KSProgress *) _f; if(widget() != 0){ - connect(widget(), TQT_SIGNAL(cancel()), - this, TQT_SLOT(cancelPressed())); + connect(widget(), TQ_SIGNAL(cancel()), + this, TQ_SLOT(cancelPressed())); } PWidget::setWidget(ksp); diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 273fd6ef..67736f44 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -145,25 +145,25 @@ servercontroller::servercontroller( TQWidget*, const char* name ) sci->setFrameStyle(TQFrame::Box | TQFrame::Raised); ConnectionTree = sci->ConnectionTree; - connect(ConnectionTree, TQT_SIGNAL(clicked( TQListViewItem * )), - this, TQT_SLOT(WindowSelected(TQListViewItem *))); + connect(ConnectionTree, TQ_SIGNAL(clicked( TQListViewItem * )), + this, TQ_SLOT(WindowSelected(TQListViewItem *))); setFrameBorderWidth(5); TQPopupMenu *file = new TQPopupMenu(this, TQCString(name) + "_menu_file"); - KStdAction::quit(this, TQT_SLOT(endksirc()), actionCollection())->plug(file); + KStdAction::quit(this, TQ_SLOT(endksirc()), actionCollection())->plug(file); #ifndef NDEBUG - file->insertItem(i18n("Dump Object Tree"), this, TQT_SLOT(dump_obj())); - file->insertItem(i18n("Server Debug Window"), this, TQT_SLOT(server_debug())); + file->insertItem(i18n("Dump Object Tree"), this, TQ_SLOT(dump_obj())); + file->insertItem(i18n("Server Debug Window"), this, TQ_SLOT(server_debug())); #endif MenuBar->insertItem(i18n("&File"), file); connections = new TQPopupMenu(this, TQCString(name) + "_menu_connections"); - server_id = connections->insertItem(i18n("&New Server..."), this, TQT_SLOT(new_connection()), Key_F2 ); - join_id = connections->insertItem(i18n("&Join Channel..."), this, TQT_SLOT(new_channel()), Key_F3 ); + server_id = connections->insertItem(i18n("&New Server..."), this, TQ_SLOT(new_connection()), Key_F2 ); + join_id = connections->insertItem(i18n("&Join Channel..."), this, TQ_SLOT(new_channel()), Key_F3 ); connections->insertSeparator(); - connections->insertItem(i18n("&Do Autoconnect..."), this, TQT_SLOT(start_autoconnect_check())); + connections->insertItem(i18n("&Do Autoconnect..."), this, TQ_SLOT(start_autoconnect_check())); connections->setItemEnabled(join_id, FALSE); MenuBar->insertItem(i18n("&Connections"), connections); @@ -171,11 +171,11 @@ servercontroller::servercontroller( TQWidget*, const char* name ) options->setCheckable(TRUE); options->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."), - this, TQT_SLOT(filter_rule_editor())); + this, TQ_SLOT(filter_rule_editor())); options->insertSeparator(); - KStdAction::configureNotifications(this, TQT_SLOT(notification_prefs()), actionCollection())->plug(options); + KStdAction::configureNotifications(this, TQ_SLOT(notification_prefs()), actionCollection())->plug(options); - KStdAction::preferences(this, TQT_SLOT(general_prefs()), actionCollection())->plug(options); + KStdAction::preferences(this, TQ_SLOT(general_prefs()), actionCollection())->plug(options); MenuBar->insertItem(i18n("&Settings"), options); @@ -188,7 +188,7 @@ servercontroller::servercontroller( TQWidget*, const char* name ) "when in docked mode, since you don't need to click on the " "dock icon."), ALT+CTRL+Key_C, KKey::QtWIN+CTRL+Key_C, this, - TQT_SLOT(new_connection())); + TQ_SLOT(new_connection())); open_toplevels = 0; @@ -239,8 +239,8 @@ void servercontroller::checkDocking() void servercontroller::new_connection() { open_ksirc *w = new open_ksirc(); // Create new ksirc popup - connect(w, TQT_SIGNAL(open_ksircprocess(KSircServer &)), // connected ok to process - this, TQT_SLOT(new_ksircprocess(KSircServer &))); // start + connect(w, TQ_SIGNAL(open_ksircprocess(KSircServer &)), // connected ok to process + this, TQ_SLOT(new_ksircprocess(KSircServer &))); // start w->exec(); // show the sucker! delete w; } @@ -270,10 +270,10 @@ void servercontroller::new_ksircprocess(KSircServer &kss) //this->insertChild(proc); // Add it to out inheritance tree so we can retreive child widgets from it. objFinder::insert(proc); proc_list.insert(server_id, proc); // Add proc to hash - connect(proc, TQT_SIGNAL(ProcMessage(TQString, int, TQString)), - this, TQT_SLOT(ProcMessage(TQString, int, TQString))); - connect(this, TQT_SIGNAL(ServMessage(TQString, int, TQString)), - proc, TQT_SLOT(ServMessage(TQString, int, TQString))); + connect(proc, TQ_SIGNAL(ProcMessage(TQString, int, TQString)), + this, TQ_SLOT(ProcMessage(TQString, int, TQString))); + connect(this, TQ_SIGNAL(ServMessage(TQString, int, TQString)), + proc, TQ_SLOT(ServMessage(TQString, int, TQString))); if(!ConnectionTree->currentItem()){ // If nothing's highlighted ConnectionTree->setCurrentItem(rootItem); // highlight it. @@ -305,8 +305,8 @@ void servercontroller::new_channel() KSircChannel ci(server, TQString()); NewWindowDialog w(ci); - connect(&w, TQT_SIGNAL(openTopLevel(const KSircChannel &)), - this, TQT_SLOT(new_toplevel(const KSircChannel &))); + connect(&w, TQ_SIGNAL(openTopLevel(const KSircChannel &)), + this, TQ_SLOT(new_toplevel(const KSircChannel &))); w.exec(); } @@ -330,8 +330,8 @@ void servercontroller::ToggleAutoCreate() void servercontroller::general_prefs() { KSPrefs *kp = new KSPrefs(); - connect(kp, TQT_SIGNAL(update(int)), - this, TQT_SLOT(configChange())); + connect(kp, TQ_SIGNAL(update(int)), + this, TQ_SLOT(configChange())); kp->resize(550, 450); kp->show(); } @@ -373,8 +373,8 @@ void servercontroller::server_debug() void servercontroller::filter_rule_editor() { FilterRuleEditor *fe = new FilterRuleEditor(); - connect(fe, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slot_filters_update())); + connect(fe, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slot_filters_update())); fe->show(); } @@ -917,7 +917,7 @@ void servercontroller::do_autoconnect() void servercontroller::start_autoconnect() { at = new TQTimer(this); - connect(at, TQT_SIGNAL(timeout()), this, TQT_SLOT(do_autoconnect())); + connect(at, TQ_SIGNAL(timeout()), this, TQ_SLOT(do_autoconnect())); at->start(250, FALSE); } @@ -929,15 +929,15 @@ void servercontroller::start_autoconnect_check() { if(servers.count() == 0){ KSPrefs *kp = new KSPrefs(); - connect(kp, TQT_SIGNAL(update(int)), - this, TQT_SLOT(configChange())); + connect(kp, TQ_SIGNAL(update(int)), + this, TQ_SLOT(configChange())); kp->resize(550, 450); kp->showPage(7); /* Show auto connect page */ kp->show(); } else { at = new TQTimer(this); - connect(at, TQT_SIGNAL(timeout()), this, TQT_SLOT(do_autoconnect())); + connect(at, TQ_SIGNAL(timeout()), this, TQ_SLOT(do_autoconnect())); at->start(250, FALSE); } diff --git a/ksirc/ssfepromptdata.cpp b/ksirc/ssfepromptdata.cpp index 15349f44..b9a5acdc 100644 --- a/ksirc/ssfepromptdata.cpp +++ b/ksirc/ssfepromptdata.cpp @@ -38,7 +38,7 @@ ssfepromptdata::ssfepromptdata SLine->setGeometry( 240, 10, 100, 30 ); SLine->setMinimumSize( 10, 10 ); SLine->setMaximumSize( 32767, 32767 ); - connect( SLine, TQT_SIGNAL(returnPressed()), TQT_SLOT(terminate()) ); + connect( SLine, TQ_SIGNAL(returnPressed()), TQ_SLOT(terminate()) ); SLine->setText( "" ); SLine->setMaxLength( 32767 ); SLine->setEchoMode( TQLineEdit::Normal ); @@ -49,7 +49,7 @@ ssfepromptdata::ssfepromptdata dlgedit_PushButton_1->setGeometry( 240, 50, 100, 30 ); dlgedit_PushButton_1->setMinimumSize( 10, 10 ); dlgedit_PushButton_1->setMaximumSize( 32767, 32767 ); - connect( dlgedit_PushButton_1, TQT_SIGNAL(clicked()), TQT_SLOT(terminate()) ); + connect( dlgedit_PushButton_1, TQ_SIGNAL(clicked()), TQ_SLOT(terminate()) ); dlgedit_PushButton_1->setAutoRepeat( FALSE ); dlgedit_PushButton_1->setAutoDefault( TRUE ); diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index b2ab5840..bcb61263 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -99,12 +99,12 @@ void KSircTopic::contentsMouseReleaseEvent( TQMouseEvent *e ) m_editor = new KSircTopicEditor( this ); - connect( m_editor, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setNewTopic() ) ); - connect( m_editor, TQT_SIGNAL( resized() ), - this, TQT_SLOT( slotEditResized() ) ); - connect( m_editor, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( doResize() ) ); + connect( m_editor, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setNewTopic() ) ); + connect( m_editor, TQ_SIGNAL( resized() ), + this, TQ_SLOT( slotEditResized() ) ); + connect( m_editor, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( doResize() ) ); /* * If you don't do this order @@ -132,9 +132,9 @@ void KSircTopic::setNewTopic() * from the server. If we can't set the topic * don't make it look like it was set */ - TQTimer::singleShot( 0, m_editor, TQT_SLOT( close() ) ); - disconnect( m_editor, TQT_SIGNAL( resized() ), - this, TQT_SLOT( slotEditResized() ) ); + TQTimer::singleShot( 0, m_editor, TQ_SLOT( close() ) ); + disconnect( m_editor, TQ_SIGNAL( resized() ), + this, TQ_SLOT( slotEditResized() ) ); doResize(); emit topicChange( topic ); } @@ -185,7 +185,7 @@ KSircTopicEditor::KSircTopicEditor( TQWidget *parent, const char *name ) { setWFlags( WDestructiveClose ); setFocusPolicy( TQWidget::ClickFocus ); - connect( this, TQT_SIGNAL( textChanged () ), this, TQT_SLOT( slotMaybeResize() ) ); + connect( this, TQ_SIGNAL( textChanged () ), this, TQ_SLOT( slotMaybeResize() ) ); } void KSircTopicEditor::keyPressEvent( TQKeyEvent *ev ) @@ -193,7 +193,7 @@ void KSircTopicEditor::keyPressEvent( TQKeyEvent *ev ) if ( ev->key() == Key_Escape ) { ev->accept(); - TQTimer::singleShot( 0, this, TQT_SLOT( close() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( close() ) ); return; } else if ( ev->key() == Key_Return ) @@ -216,7 +216,7 @@ void KSircTopicEditor::focusOutEvent( TQFocusEvent * fe ) return; } - TQTimer::singleShot( 0, this, TQT_SLOT( close() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( close() ) ); } TQPopupMenu *KSircTopicEditor::createPopupMenu( const TQPoint &pos ) diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 840987f9..d1fbb2ef 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -149,34 +149,34 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf m_channelInfo.setEncoding(ksopts->chan(m_channelInfo).encoding); selector = new charSelector(); - connect(selector, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertText())); + connect(selector, TQ_SIGNAL(clicked()), this, TQ_SLOT(insertText())); selector->setFont(ksopts->defaultFont.family()); file = new TQPopupMenu(this, TQCString(this->name()) + "_popup_file"); file->setCheckable(true); - TDEAction *act = KStdAction::openNew( this, TQT_SLOT( newWindow() ), actionCollection() ); + TDEAction *act = KStdAction::openNew( this, TQ_SLOT( newWindow() ), actionCollection() ); act->plug( file ); - file->insertItem(i18n("New Ser&ver..."), servercontroller::self(), TQT_SLOT(new_connection()), Key_F2); + file->insertItem(i18n("New Ser&ver..."), servercontroller::self(), TQ_SLOT(new_connection()), Key_F2); file->insertSeparator(); - file->insertItem(i18n("&DCC Manager..."), this, TQT_SLOT(showDCCMgr())); - file->insertItem(i18n("&Save to Logfile..."), this, TQT_SLOT(saveCurrLog()), CTRL + Key_S); + file->insertItem(i18n("&DCC Manager..."), this, TQ_SLOT(showDCCMgr())); + file->insertItem(i18n("&Save to Logfile..."), this, TQ_SLOT(saveCurrLog()), CTRL + Key_S); - tsitem = file->insertItem(i18n("Time St&"), this, TQT_SLOT(toggleTimestamp()), CTRL + Key_T); + tsitem = file->insertItem(i18n("Time St&"), this, TQ_SLOT(toggleTimestamp()), CTRL + Key_T); file->setItemChecked(tsitem, ksopts->chan(m_channelInfo).timeStamp); - fjpitem = file->insertItem(i18n("Hide Join/Part Messages"), this, TQT_SLOT(toggleFilterJoinPart())); + fjpitem = file->insertItem(i18n("Hide Join/Part Messages"), this, TQ_SLOT(toggleFilterJoinPart())); file->setItemChecked(fjpitem, ksopts->chan(m_channelInfo).filterJoinPart); - file->insertItem(i18n("Character &Table"), selector, TQT_SLOT(show()), CTRL + Key_H); - beepitem = file->insertItem(i18n("N&otify on Change"), this, TQT_SLOT(toggleBeep()), CTRL + Key_P); + file->insertItem(i18n("Character &Table"), selector, TQ_SLOT(show()), CTRL + Key_H); + beepitem = file->insertItem(i18n("N&otify on Change"), this, TQ_SLOT(toggleBeep()), CTRL + Key_P); file->setItemChecked(beepitem, ksopts->chan(m_channelInfo).beepOnMsg); encodingAction = new TDESelectAction( i18n( "&Encoding" ), 0, this ); - connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) ); + connect( encodingAction, TQ_SIGNAL( activated() ), this, TQ_SLOT( setEncoding() ) ); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); - topicitem = file->insertItem(i18n("S&how Topic"), this, TQT_SLOT(toggleTopic()), CTRL + Key_O); + topicitem = file->insertItem(i18n("S&how Topic"), this, TQ_SLOT(toggleTopic()), CTRL + Key_O); if (isPrivateChat() || m_channelInfo.channel().startsWith("!no_channel")) { file->setItemEnabled(topicitem, false); } @@ -184,7 +184,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf file->setItemChecked(topicitem, ksopts->chan(m_channelInfo).topicShow); } - tickeritem = file->insertItem(i18n("Ticker &Mode"), this, TQT_SLOT(toggleTicker())); + tickeritem = file->insertItem(i18n("Ticker &Mode"), this, TQ_SLOT(toggleTicker())); // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); @@ -208,7 +208,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf setEncoding(); file->insertSeparator(); - act = KStdAction::close( this, TQT_SLOT( terminate() ), actionCollection() ); + act = KStdAction::close( this, TQ_SLOT( terminate() ), actionCollection() ); act->plug( file ); kmenu = menuBar(); @@ -231,8 +231,8 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf ksTopic = new KSircTopic( top ); ksTopic->setFont(ksopts->defaultFont); - connect( ksTopic, TQT_SIGNAL( topicChange( const TQString & ) ), - this, TQT_SLOT( setTopicIntern( const TQString & ) ) ); + connect( ksTopic, TQ_SIGNAL( topicChange( const TQString & ) ), + this, TQ_SLOT( setTopicIntern( const TQString & ) ) ); TQCString kstn = TQCString(this->name()) + "_"; @@ -249,8 +249,8 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf nicks_box = new TQVBox(pan); channelButtons = new chanButtons(ksircProcess(), nicks_box); - connect(channelButtons, TQT_SIGNAL(mode(TQString, int, TQString)), - this, TQT_SLOT(setMode(TQString, int, TQString))); + connect(channelButtons, TQ_SIGNAL(mode(TQString, int, TQString)), + this, TQ_SLOT(setMode(TQString, int, TQString))); nicks = new aListBox(nicks_box, kstn + "aListBox"); nicks->setFocusPolicy(TQWidget::NoFocus); @@ -312,11 +312,11 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf mainw->enableTimeStamps(ksopts->chan(m_channelInfo).timeStamp); edit = new TQPopupMenu(this); - act = KStdAction::copy( mainw, TQT_SLOT( copy() ), actionCollection() ); + act = KStdAction::copy( mainw, TQ_SLOT( copy() ), actionCollection() ); act->plug( edit ); - act = KStdAction::paste( this, TQT_SLOT( pasteToWindow() ), actionCollection() ); + act = KStdAction::paste( this, TQ_SLOT( pasteToWindow() ), actionCollection() ); act->plug( edit ); - edit->insertItem(i18n("C&lear Window"), this, TQT_SLOT(clearWindow()), CTRL + Key_L); + edit->insertItem(i18n("C&lear Window"), this, TQ_SLOT(clearWindow()), CTRL + Key_L); kmenu->insertItem(i18n("&Edit"), edit, -1, -1); linee = new aHistLineEdit(top, ""); @@ -353,8 +353,8 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf } - connect(mainw, TQT_SIGNAL(pasteReq( const TQString& )), - this, TQT_SLOT( slotTextDropped( const TQString& ))); + connect(mainw, TQ_SIGNAL(pasteReq( const TQString& )), + this, TQ_SLOT( slotTextDropped( const TQString& ))); nicks->setFont(ksopts->defaultFont); @@ -370,17 +370,17 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf linee->setWordWrap(TQTextEdit::WidgetWidth); } - connect(linee, TQT_SIGNAL(gotFocus()), - this, TQT_SLOT(gotFocus())); - connect(linee, TQT_SIGNAL(lostFocus()), - this, TQT_SLOT(lostFocus())); - connect(linee, TQT_SIGNAL(pasteText(const TQString&)), - this, TQT_SLOT(slotTextDropped(const TQString&))); - connect(linee, TQT_SIGNAL(notTab()), - this, TQT_SLOT(lineeNotTab())); + connect(linee, TQ_SIGNAL(gotFocus()), + this, TQ_SLOT(gotFocus())); + connect(linee, TQ_SIGNAL(lostFocus()), + this, TQ_SLOT(lostFocus())); + connect(linee, TQ_SIGNAL(pasteText(const TQString&)), + this, TQ_SLOT(slotTextDropped(const TQString&))); + connect(linee, TQ_SIGNAL(notTab()), + this, TQ_SLOT(lineeNotTab())); - connect( linee, TQT_SIGNAL( gotReturnPressed() ), - this, TQT_SLOT( returnPressed() ) ); + connect( linee, TQ_SIGNAL( gotReturnPressed() ), + this, TQ_SLOT( returnPressed() ) ); linee->setFocus(); // Give SLE focus linee->slotMaybeResize(); @@ -440,7 +440,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf cml.insert(top, new TQPopupMenu(this)); command->insertItem(top, cml[top]); } - cml[top]->insertItem(item, this, TQT_SLOT(cmd_process(int)), 0, i); + cml[top]->insertItem(item, this, TQ_SLOT(cmd_process(int)), 0, i); i++; } @@ -449,17 +449,17 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf kmenu->insertItem( KStdGuiItem::help().text(), helpMenu( TQString(), false )); - connect(user_controls, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(UserParseMenu(int))); + connect(user_controls, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(UserParseMenu(int))); - connect(nicks, TQT_SIGNAL(contextMenuRequested(int)), this, - TQT_SLOT(UserSelected(int))); - connect(nicks, TQT_SIGNAL(selectedNick(const TQString &)), - this, TQT_SLOT(openQueryFromNick(const TQString &))); - connect(nicks, TQT_SIGNAL(mouseButtonClicked ( int, TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(pasteToNickList(int, TQListBoxItem *, const TQPoint &))); - connect(nicks, TQT_SIGNAL(textDropped( const TQListBoxItem *, const TQString& )), - this, TQT_SLOT(dndTextToNickList(const TQListBoxItem *, const TQString&))); + connect(nicks, TQ_SIGNAL(contextMenuRequested(int)), this, + TQ_SLOT(UserSelected(int))); + connect(nicks, TQ_SIGNAL(selectedNick(const TQString &)), + this, TQ_SLOT(openQueryFromNick(const TQString &))); + connect(nicks, TQ_SIGNAL(mouseButtonClicked ( int, TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(pasteToNickList(int, TQListBoxItem *, const TQPoint &))); + connect(nicks, TQ_SIGNAL(textDropped( const TQListBoxItem *, const TQString& )), + this, TQ_SLOT(dndTextToNickList(const TQListBoxItem *, const TQString&))); UserUpdateMenu(); // Must call to update Popup. @@ -467,10 +467,10 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf accel->connectItem(accel->insertItem(SHIFT + Key_PageUp), this, - TQT_SLOT(AccelScrollUpPage())); + TQ_SLOT(AccelScrollUpPage())); accel->connectItem(accel->insertItem(SHIFT + Key_PageDown), this, - TQT_SLOT(AccelScrollDownPage())); + TQ_SLOT(AccelScrollDownPage())); /* * Pageup/dn @@ -479,41 +479,41 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf accel->connectItem(accel->insertItem(Key_PageUp), this, - TQT_SLOT(AccelScrollUpPage())); + TQ_SLOT(AccelScrollUpPage())); accel->connectItem(accel->insertItem(Key_PageDown), this, - TQT_SLOT(AccelScrollDownPage())); + TQ_SLOT(AccelScrollDownPage())); /* * These are not presently implemented, so let's not fill the logs. accel->connectItem(accel->insertItem(CTRL + Key_Return), this, - TQT_SLOT(AccelPriorMsgNick())); + TQ_SLOT(AccelPriorMsgNick())); accel->connectItem(accel->insertItem(CTRL + SHIFT + Key_Return), this, - TQT_SLOT(AccelNextMsgNick())); + TQ_SLOT(AccelNextMsgNick())); */ accel->connectItem(accel->insertItem(Key_Tab), // adds TAB accelerator this, // connected to the main - TQT_SLOT(TabNickCompletionNormal())); // TabNickCompletion() slot + TQ_SLOT(TabNickCompletionNormal())); // TabNickCompletion() slot accel->connectItem(accel->insertItem(SHIFT+Key_Tab), // adds TAB accelerator this, // connected to the main - TQT_SLOT(TabNickCompletionShift())); // TabNickCompletion() slot + TQ_SLOT(TabNickCompletionShift())); // TabNickCompletion() slot accel->connectItem(accel->insertItem(CTRL + Key_N), - this, TQT_SLOT(newWindow())); + this, TQ_SLOT(newWindow())); // accel->connectItem(accel->insertItem(CTRL + Key_S), -// this, TQT_SLOT(toggleTimestamp())); +// this, TQ_SLOT(toggleTimestamp())); // Drag & Drop - connect( mainw, TQT_SIGNAL( textDropped(const TQString&) ), - TQT_SLOT( slotTextDropped(const TQString&) )); - connect( mainw, TQT_SIGNAL( urlsDropped(const TQStringList&) ), - TQT_SLOT( slotDropURLs(const TQStringList&) )); - connect( nicks, TQT_SIGNAL( urlsDropped( const TQStringList&, const TQString& )), - TQT_SLOT( slotDccURLs( const TQStringList&, const TQString& ))); - connect( this, TQT_SIGNAL( changed(bool, TQString) ), this, TQT_SLOT( doChange(bool, TQString) )); + connect( mainw, TQ_SIGNAL( textDropped(const TQString&) ), + TQ_SLOT( slotTextDropped(const TQString&) )); + connect( mainw, TQ_SIGNAL( urlsDropped(const TQStringList&) ), + TQ_SLOT( slotDropURLs(const TQStringList&) )); + connect( nicks, TQ_SIGNAL( urlsDropped( const TQStringList&, const TQString& )), + TQ_SLOT( slotDccURLs( const TQStringList&, const TQString& ))); + connect( this, TQ_SIGNAL( changed(bool, TQString) ), this, TQ_SLOT( doChange(bool, TQString) )); mainw->setAcceptFiles( isPrivateChat() ); resize(600, 360); @@ -748,8 +748,8 @@ void KSircTopLevel::TabNickCompletion(int dir) TQString line = tab_nick + ": "; // tab_nick holds the last night since we haven't overritten it yet. linee->setText(line); linee->setCursorPosition(line.length()); - connect(linee, TQT_SIGNAL(notTab()), - this, TQT_SLOT(lineeNotTab())); + connect(linee, TQ_SIGNAL(notTab()), + this, TQ_SLOT(lineeNotTab())); return; } @@ -800,8 +800,8 @@ void KSircTopLevel::TabNickCompletion(int dir) tab_pressed = tab; // setText causes lineeTextChanged to get called and erase tab_pressed - connect(linee, TQT_SIGNAL(notTab()), - this, TQT_SLOT(lineeNotTab())); + connect(linee, TQ_SIGNAL(notTab()), + this, TQ_SLOT(lineeNotTab())); } @@ -1193,7 +1193,7 @@ void KSircTopLevel::AccelScrollUpPage() void KSircTopLevel::newWindow() { NewWindowDialog w(KSircChannel(m_channelInfo.server(), TQString())); - connect(&w, TQT_SIGNAL(openTopLevel(const KSircChannel &)), TQT_SIGNAL(open_toplevel(const KSircChannel &))); + connect(&w, TQ_SIGNAL(openTopLevel(const KSircChannel &)), TQ_SIGNAL(open_toplevel(const KSircChannel &))); w.exec(); } @@ -1637,8 +1637,8 @@ void KSircTopLevel::clearWindow() void KSircTopLevel::lineeNotTab() { tab_pressed = -1; - disconnect(linee, TQT_SIGNAL(notTab()), - this, TQT_SLOT(lineeNotTab())); + disconnect(linee, TQ_SIGNAL(notTab()), + this, TQ_SLOT(lineeNotTab())); addCompleteNick(tab_nick); } @@ -1651,7 +1651,7 @@ bool KSircTopLevel::event( TQEvent *e) if(e->type() == TQEvent::ApplicationPaletteChange || e->type() == TQEvent::ApplicationFontChange) { - TQTimer::singleShot(750, this, TQT_SLOT(initColors())); + TQTimer::singleShot(750, this, TQ_SLOT(initColors())); initColors(); } return TDEMainWindow::event(e); @@ -1804,7 +1804,7 @@ void KSircTopLevel::toggleTicker() ticker->show(); displayMgr->hide(this); - connect(ticker, TQT_SIGNAL(doubleClick()), this, TQT_SLOT(toggleTicker())); + connect(ticker, TQ_SIGNAL(doubleClick()), this, TQ_SLOT(toggleTicker())); } } |