diff options
-rw-r--r-- | kbiff/kbiff.cpp | 64 | ||||
-rw-r--r-- | kbiff/kbiffmonitor.cpp | 18 | ||||
-rw-r--r-- | kbiff/kbiffmonitor.h | 8 | ||||
-rw-r--r-- | kbiff/notify.cpp | 6 | ||||
-rw-r--r-- | kbiff/setupdlg.cpp | 90 |
5 files changed, 93 insertions, 93 deletions
diff --git a/kbiff/kbiff.cpp b/kbiff/kbiff.cpp index 2b4f421..fa5b79c 100644 --- a/kbiff/kbiff.cpp +++ b/kbiff/kbiff.cpp @@ -45,7 +45,7 @@ KBiff::KBiff(DCOPClient *client_, TQWidget *parent_) setAlignment(AlignLeft | AlignTop); // enable the session management stuff - connect(kapp, SIGNAL(saveYourself()), this, SLOT(saveYourself())); + connect(kapp, TQ_SIGNAL(saveYourself()), this, TQ_SLOT(saveYourself())); // nuke the list stuff when removed monitorList.setAutoDelete(true); @@ -124,7 +124,7 @@ void KBiff::processSetup(const KBiffSetup* setup_, bool run_) // handle session management disabling if (sessions == false) { - disconnect(this, SLOT(saveYourself())); + disconnect(this, TQ_SLOT(saveYourself())); kapp->disableSessionManagement(); } @@ -169,23 +169,23 @@ void KBiff::setMailboxList(const TQPtrList<KBiffMailbox>& mailbox_list, unsigned monitor->setMailbox(*url); monitor->setPollInterval(poll); monitor->setMailboxKey(mbox->key); - connect(monitor, SIGNAL(signal_newMail(const int, const TQString&)), - this, SLOT(haveNewMail(const int, const TQString&))); - connect(monitor, SIGNAL(signal_currentStatus(const int, const TQString&, const KBiffMailState)), - this, SLOT(currentStatus(const int, const TQString&, const KBiffMailState))); - connect(monitor, SIGNAL(signal_noMail()), this, SLOT(displayPixmap())); - connect(monitor, SIGNAL(signal_noMail()), - this, SLOT(haveNoNewMail())); - connect(monitor, SIGNAL(signal_oldMail()), this, SLOT(displayPixmap())); - connect(monitor, SIGNAL(signal_oldMail()), - this, SLOT(haveNoNewMail())); - connect(monitor, SIGNAL(signal_noConn()), this, SLOT(displayPixmap())); - connect(monitor, SIGNAL(signal_noConn()), - this, SLOT(haveNoNewMail())); - connect(monitor, SIGNAL(signal_invalidLogin(const TQString&)), - this, SLOT(invalidLogin(const TQString&))); - connect(monitor, SIGNAL(signal_fetchMail(const TQString&)), - this, SLOT(slotLaunchFetchClient(const TQString&))); + connect(monitor, TQ_SIGNAL(signal_newMail(const int, const TQString&)), + this, TQ_SLOT(haveNewMail(const int, const TQString&))); + connect(monitor, TQ_SIGNAL(signal_currentStatus(const int, const TQString&, const KBiffMailState)), + this, TQ_SLOT(currentStatus(const int, const TQString&, const KBiffMailState))); + connect(monitor, TQ_SIGNAL(signal_noMail()), this, TQ_SLOT(displayPixmap())); + connect(monitor, TQ_SIGNAL(signal_noMail()), + this, TQ_SLOT(haveNoNewMail())); + connect(monitor, TQ_SIGNAL(signal_oldMail()), this, TQ_SLOT(displayPixmap())); + connect(monitor, TQ_SIGNAL(signal_oldMail()), + this, TQ_SLOT(haveNoNewMail())); + connect(monitor, TQ_SIGNAL(signal_noConn()), this, TQ_SLOT(displayPixmap())); + connect(monitor, TQ_SIGNAL(signal_noConn()), + this, TQ_SLOT(haveNoNewMail())); + connect(monitor, TQ_SIGNAL(signal_invalidLogin(const TQString&)), + this, TQ_SLOT(invalidLogin(const TQString&))); + connect(monitor, TQ_SIGNAL(signal_fetchMail(const TQString&)), + this, TQ_SLOT(slotLaunchFetchClient(const TQString&))); monitorList.append(monitor); } myMUTEX = false; @@ -257,7 +257,7 @@ void KBiff::enterEvent(TQEvent *e) // popup the status in one second statusTimer = new TQTimer(this); - connect(statusTimer, SIGNAL(timeout()), this, SLOT(popupStatus())); + connect(statusTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(popupStatus())); statusTimer->start(1000, true); } @@ -536,8 +536,8 @@ void KBiff::haveNewMail(const int num, const TQString& the_mailbox) if (notify) { KBiffNotify *notify_dlg = new KBiffNotify(this, num, the_mailbox); - connect(notify_dlg, SIGNAL(signalLaunchMailClient()), - this, SLOT(slotLaunchMailClient())); + connect(notify_dlg, TQ_SIGNAL(signalLaunchMailClient()), + this, TQ_SLOT(slotLaunchMailClient())); notifyList.append(notify_dlg); notify_dlg->show(); @@ -643,7 +643,7 @@ void KBiff::dock() // (un)dock it! this->show(); - TQTimer::singleShot(1000, this, SLOT(displayPixmap())); + TQTimer::singleShot(1000, this, TQ_SLOT(displayPixmap())); } void KBiff::setup() @@ -727,35 +727,35 @@ void KBiff::popupMenu() if (isSecure == false) { if (docked) - popup->insertItem(i18n("&UnDock"), this, SLOT(dock())); + popup->insertItem(i18n("&UnDock"), this, TQ_SLOT(dock())); else - popup->insertItem(i18n("&Dock"), this, SLOT(dock())); - popup->insertItem(i18n("&Setup..."), this, SLOT(setup())); + popup->insertItem(i18n("&Dock"), this, TQ_SLOT(dock())); + popup->insertItem(i18n("&Setup..."), this, TQ_SLOT(setup())); popup->insertSeparator(); - popup->insertItem(i18n("&Help..."), this, SLOT(invokeHelp())); + popup->insertItem(i18n("&Help..."), this, TQ_SLOT(invokeHelp())); popup->insertSeparator(); int check_id; - check_id = popup->insertItem(i18n("&Check Mail Now"), this, SLOT(checkMailNow())); + check_id = popup->insertItem(i18n("&Check Mail Now"), this, TQ_SLOT(checkMailNow())); int read_id; - read_id = popup->insertItem(i18n("&Read Mail Now"), this, SLOT(readMailNow())); + read_id = popup->insertItem(i18n("&Read Mail Now"), this, TQ_SLOT(readMailNow())); if (isRunning()) { popup->setItemEnabled(check_id, true); popup->setItemEnabled(read_id, true); - popup->insertItem(i18n("&Stop"), this, SLOT(stop())); + popup->insertItem(i18n("&Stop"), this, TQ_SLOT(stop())); } else { popup->setItemEnabled(check_id, false); popup->setItemEnabled(read_id, false); - popup->insertItem(i18n("&Start"), this, SLOT(start())); + popup->insertItem(i18n("&Start"), this, TQ_SLOT(start())); } popup->insertSeparator(); } - popup->insertItem(i18n("E&xit"), kapp, SLOT(quit())); + popup->insertItem(i18n("E&xit"), kapp, TQ_SLOT(quit())); popup->popup(TQCursor::pos()); } diff --git a/kbiff/kbiffmonitor.cpp b/kbiff/kbiffmonitor.cpp index 5fa72d9..6e67bfc 100644 --- a/kbiff/kbiffmonitor.cpp +++ b/kbiff/kbiffmonitor.cpp @@ -256,7 +256,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) imap = new KBiffImap; - connect(this, SIGNAL(signal_checkMail()), SLOT(checkImap())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkImap())); server = url.host(); user = url.user(); password = url.pass(); @@ -281,7 +281,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) imap = new KBiffImap; - connect(this, SIGNAL(signal_checkMail()), SLOT(checkImap())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkImap())); server = url.host(); user = url.user(); password = url.pass(); @@ -304,7 +304,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) pop = new KBiffPop; - connect(this, SIGNAL(signal_checkMail()), SLOT(checkPop())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkPop())); server = url.host(); user = url.user(); password = url.pass(); @@ -332,7 +332,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) pop = new KBiffPop; - connect(this, SIGNAL(signal_checkMail()), SLOT(checkPop())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkPop())); server = url.host(); user = url.user(); password = url.pass(); @@ -356,7 +356,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) { disconnect(this); - connect(this, SIGNAL(signal_checkMail()), SLOT(checkMbox())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkMbox())); mailbox = url.path(); simpleURL = "mbox:" + mailbox; @@ -366,7 +366,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) { disconnect(this); - connect(this, SIGNAL(signal_checkMail()), SLOT(checkLocal())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkLocal())); mailbox = url.path(); simpleURL = "file:" + mailbox; @@ -376,7 +376,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) { disconnect(this); - connect(this, SIGNAL(signal_checkMail()), SLOT(checkMaildir())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkMaildir())); mailbox = url.path(); simpleURL = "maildir:" + mailbox; @@ -386,7 +386,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) { disconnect(this); - connect(this, SIGNAL(signal_checkMail()), SLOT(checkMHdir())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkMHdir())); mailbox = url.path(); simpleURL = "mh:" + mailbox; @@ -398,7 +398,7 @@ void KBiffMonitor::setMailbox(KBiffURL& url) nntp = new KBiffNntp; - connect(this, SIGNAL(signal_checkMail()), SLOT(checkNntp())); + connect(this, TQ_SIGNAL(signal_checkMail()), TQ_SLOT(checkNntp())); server = url.host(); user = url.user(); password = url.pass(); diff --git a/kbiff/kbiffmonitor.h b/kbiff/kbiffmonitor.h index 90869a0..a3c1a81 100644 --- a/kbiff/kbiffmonitor.h +++ b/kbiff/kbiffmonitor.h @@ -252,10 +252,10 @@ typedef enum * mon.setPollInterval(15); * mon.start(); * - * connect(&mon, SIGNAL(signal_newMail()), this, SLOT(processNewMail())); - * connect(&mon, SIGNAL(signal_oldMail()), this, SLOT(processOldMail())); - * connect(&mon, SIGNAL(signal_noMail()), this, SLOT(processNoMail())); - * connect(&mon, SIGNAL(signal_noConn()), this, SLOT(processNoConn())); + * connect(&mon, TQ_SIGNAL(signal_newMail()), this, TQ_SLOT(processNewMail())); + * connect(&mon, TQ_SIGNAL(signal_oldMail()), this, TQ_SLOT(processOldMail())); + * connect(&mon, TQ_SIGNAL(signal_noMail()), this, TQ_SLOT(processNoMail())); + * connect(&mon, TQ_SIGNAL(signal_noConn()), this, TQ_SLOT(processNoConn())); * </PRE> * * @short A "biff" class that monitors local and remote mailboxes diff --git a/kbiff/notify.cpp b/kbiff/notify.cpp index e933b34..2c53265 100644 --- a/kbiff/notify.cpp +++ b/kbiff/notify.cpp @@ -49,9 +49,9 @@ KBiffNotify::KBiffNotify(TQWidget *parent_, const int num_new, TQPushButton *launch = new TQPushButton(i18n("Mailer"), this); // connect the signals to slots - connect(ok, SIGNAL(clicked()), SLOT(accept())); - connect(launch, SIGNAL(clicked()), SLOT(slotLaunchMailClient())); - connect(launch, SIGNAL(clicked()), this, SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(launch, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchMailClient())); + connect(launch, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); // Now do the layout TQVBoxLayout *info_layout = new TQVBoxLayout(12); diff --git a/kbiff/setupdlg.cpp b/kbiff/setupdlg.cpp index 864ab8e..5d74fb7 100644 --- a/kbiff/setupdlg.cpp +++ b/kbiff/setupdlg.cpp @@ -98,21 +98,21 @@ KBiffSetup::KBiffSetup(const TQString& profile_, bool secure_) profile_groupbox); whatsthis = i18n("Create a new profile"); TQWhatsThis::add(new_profile_button, whatsthis); - connect(new_profile_button, SIGNAL(clicked()), SLOT(slotAddNewProfile())); + connect(new_profile_button, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddNewProfile())); // Rename Profile button TQPushButton *rename_profile_button = new TQPushButton(i18n("&Rename..."), profile_groupbox); whatsthis = i18n("Rename the current profile"); TQWhatsThis::add(rename_profile_button, whatsthis); - connect(rename_profile_button, SIGNAL(clicked()), SLOT(slotRenameProfile())); + connect(rename_profile_button, TQ_SIGNAL(clicked()), TQ_SLOT(slotRenameProfile())); // Delete Profile button TQPushButton *delete_profile_button = new TQPushButton(i18n("&Delete"), profile_groupbox); whatsthis = i18n("Delete the current profile"); TQWhatsThis::add(delete_profile_button, whatsthis); - connect(delete_profile_button, SIGNAL(clicked()), SLOT(slotDeleteProfile())); + connect(delete_profile_button, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteProfile())); // setup the tabs TQTabWidget *tabctl = new TQTabWidget(this); @@ -121,12 +121,12 @@ KBiffSetup::KBiffSetup(const TQString& profile_, bool secure_) mailboxTab = new KBiffMailboxTab(the_profile, tabctl); aboutTab = new KBiffAboutTab(tabctl); - connect(comboProfile, SIGNAL(highlighted(const TQString&)), - generalTab, SLOT(readConfig(const TQString&))); - connect(comboProfile, SIGNAL(highlighted(const TQString&)), - newmailTab, SLOT(readConfig(const TQString&))); - connect(comboProfile, SIGNAL(highlighted(const TQString&)), - mailboxTab, SLOT(readConfig(const TQString&))); + connect(comboProfile, TQ_SIGNAL(highlighted(const TQString&)), + generalTab, TQ_SLOT(readConfig(const TQString&))); + connect(comboProfile, TQ_SIGNAL(highlighted(const TQString&)), + newmailTab, TQ_SLOT(readConfig(const TQString&))); + connect(comboProfile, TQ_SIGNAL(highlighted(const TQString&)), + mailboxTab, TQ_SLOT(readConfig(const TQString&))); // add the tabs tabctl->addTab(generalTab, i18n("General")); @@ -136,16 +136,16 @@ KBiffSetup::KBiffSetup(const TQString& profile_, bool secure_) // help button TQPushButton *help_button = new TQPushButton(i18n("&Help"), this); - connect(help_button, SIGNAL(clicked()), SLOT(invokeHelp())); + connect(help_button, TQ_SIGNAL(clicked()), TQ_SLOT(invokeHelp())); // ok button TQPushButton *ok_button = new TQPushButton(i18n("&OK"), this); ok_button->setDefault(true); - connect(ok_button, SIGNAL(clicked()), SLOT(slotDone())); + connect(ok_button, TQ_SIGNAL(clicked()), TQ_SLOT(slotDone())); // cancel button TQPushButton *cancel_button = new TQPushButton(i18n("&Cancel"), this); - connect(cancel_button, SIGNAL(clicked()), SLOT(reject())); + connect(cancel_button, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); // are we secure? isSecure = secure_; @@ -826,13 +826,13 @@ KBiffNewMailTab::KBiffNewMailTab(const TQString& profile_, TQWidget *parent_) checkStatus = new TQCheckBox(i18n("&Floating Status"), this); // connect some slots and signals - connect(buttonBrowsePlaySound, SIGNAL(clicked()), SLOT(browsePlaySound())); - connect(buttonBrowseRunCommand, SIGNAL(clicked()), SLOT(browseRunCommand())); - connect(buttonBrowseRunResetCommand, SIGNAL(clicked()), SLOT(browseRunResetCommand())); - connect(checkPlaySound, SIGNAL(toggled(bool)), SLOT(enablePlaySound(bool))); - connect(buttonTestPlaySound, SIGNAL(clicked()), SLOT(testPlaySound())); - connect(checkRunCommand, SIGNAL(toggled(bool)), SLOT(enableRunCommand(bool))); - connect(checkRunResetCommand, SIGNAL(toggled(bool)), SLOT(enableRunResetCommand(bool))); + connect(buttonBrowsePlaySound, TQ_SIGNAL(clicked()), TQ_SLOT(browsePlaySound())); + connect(buttonBrowseRunCommand, TQ_SIGNAL(clicked()), TQ_SLOT(browseRunCommand())); + connect(buttonBrowseRunResetCommand, TQ_SIGNAL(clicked()), TQ_SLOT(browseRunResetCommand())); + connect(checkPlaySound, TQ_SIGNAL(toggled(bool)), TQ_SLOT(enablePlaySound(bool))); + connect(buttonTestPlaySound, TQ_SIGNAL(clicked()), TQ_SLOT(testPlaySound())); + connect(checkRunCommand, TQ_SIGNAL(toggled(bool)), TQ_SLOT(enableRunCommand(bool))); + connect(checkRunResetCommand, TQ_SIGNAL(toggled(bool)), TQ_SLOT(enableRunResetCommand(bool))); // NOW DO THE LAYOUT TQHBoxLayout *run_command_layout = new TQHBoxLayout(5); @@ -1106,16 +1106,16 @@ KBiffMailboxAdvanced::KBiffMailboxAdvanced() TQPushButton *cancel = new TQPushButton(i18n("&Cancel"), this); // connect all the slots to signals - connect(preauth, SIGNAL(toggled(bool)), SLOT(preauthModified(bool))); - connect(keepalive, SIGNAL(toggled(bool)), SLOT(keepaliveModified(bool))); - connect(async, SIGNAL(toggled(bool)), SLOT(asyncModified(bool))); - connect(apop, SIGNAL(toggled(bool)), SLOT(apopModified(bool))); - connect(port, SIGNAL(textChanged(const TQString&)), - SLOT(portModified(const TQString&))); - connect(ok, SIGNAL(clicked()), SLOT(accept())); - connect(cancel, SIGNAL(clicked()), SLOT(reject())); - connect(timeout, SIGNAL(textChanged(const TQString&)), - SLOT(timeoutModified(const TQString&))); + connect(preauth, TQ_SIGNAL(toggled(bool)), TQ_SLOT(preauthModified(bool))); + connect(keepalive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(keepaliveModified(bool))); + connect(async, TQ_SIGNAL(toggled(bool)), TQ_SLOT(asyncModified(bool))); + connect(apop, TQ_SIGNAL(toggled(bool)), TQ_SLOT(apopModified(bool))); + connect(port, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(portModified(const TQString&))); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); + connect(timeout, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(timeoutModified(const TQString&))); // NOW DO THE LAYOUT TQGridLayout *top_layout = new TQGridLayout(this, 7, 4, 12); @@ -1331,16 +1331,16 @@ KBiffMailboxTab::KBiffMailboxTab(const TQString& profile_, TQWidget *parent_) enableFetchCommand(false); // connect all the signals - connect(mailboxes, SIGNAL(selectionChanged(TQListViewItem *)), - SLOT(slotMailboxSelected(TQListViewItem *))); - connect(new_mailbox, SIGNAL(clicked()), SLOT(slotNewMailbox())); - connect(delete_mailbox, SIGNAL(clicked()), SLOT(slotDeleteMailbox())); - connect(comboProtocol, SIGNAL(highlighted(int)), - SLOT(protocolSelected(int))); - connect(buttonBrowse, SIGNAL(clicked()), SLOT(browse())); - connect(advanced_button, SIGNAL(clicked()), SLOT(advanced())); - connect(buttonBrowseFetchCommand, SIGNAL(clicked()), SLOT(browseFetchCommand())); - connect(checkFetchCommand, SIGNAL(toggled(bool)), SLOT(enableFetchCommand(bool))); + connect(mailboxes, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotMailboxSelected(TQListViewItem *))); + connect(new_mailbox, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewMailbox())); + connect(delete_mailbox, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteMailbox())); + connect(comboProtocol, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(protocolSelected(int))); + connect(buttonBrowse, TQ_SIGNAL(clicked()), TQ_SLOT(browse())); + connect(advanced_button, TQ_SIGNAL(clicked()), TQ_SLOT(advanced())); + connect(buttonBrowseFetchCommand, TQ_SIGNAL(clicked()), TQ_SLOT(browseFetchCommand())); + connect(checkFetchCommand, TQ_SIGNAL(toggled(bool)), TQ_SLOT(enableFetchCommand(bool))); // NOW DO THE LAYOUT TQHBoxLayout *fetch_command_layout = new TQHBoxLayout(5); @@ -1943,8 +1943,8 @@ KBiffAboutTab::KBiffAboutTab(TQWidget *parent_) logo_label->setUnderline(false); logo_label->setGlow(false); logo_label->setFloat(true); - connect(logo_label, SIGNAL(leftClickedURL(const TQString&)), - SLOT(homepage(const TQString&))); + connect(logo_label, TQ_SIGNAL(leftClickedURL(const TQString&)), + TQ_SLOT(homepage(const TQString&))); TQLabel *version_label = new TQLabel(this); version_label->setText(TQString("Version %1\n\nCopyright (C) 1998-2008\nKurt Granroth").arg(kbiff_version)); @@ -1955,8 +1955,8 @@ KBiffAboutTab::KBiffAboutTab(TQWidget *parent_) email_label->setUnderline(false); email_label->setGlow(false); email_label->setFloat(true); - connect(email_label, SIGNAL(leftClickedURL(const TQString&)), - SLOT(mailTo(const TQString&))); + connect(email_label, TQ_SIGNAL(leftClickedURL(const TQString&)), + TQ_SLOT(mailTo(const TQString&))); // about tab text layout TQVBoxLayout *text_layout = new TQVBoxLayout(0); @@ -2003,8 +2003,8 @@ KBiffNewDlg::KBiffNewDlg(TQWidget* parent_, const char * name_) // cancel button TQPushButton* button_cancel = new TQPushButton(i18n("&Cancel"), this); - connect(button_ok, SIGNAL(clicked()), SLOT(accept())); - connect(button_cancel, SIGNAL(clicked()), SLOT(reject())); + connect(button_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(button_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); // NOW DO THE LAYOUT TQGridLayout *top_layout = new TQGridLayout(this, 2, 3, 12); |