From ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 12 Jan 2024 11:17:33 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- tdeprint/cups/cupsaddsmb2.cpp | 12 +++---- tdeprint/cups/cupsdconf2/browsedialog.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp | 46 +++++++++++++------------- tdeprint/cups/cupsdconf2/cupsdjobspage.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp | 8 ++--- tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp | 8 ++--- tdeprint/cups/cupsdconf2/cupsdserverpage.cpp | 2 +- tdeprint/cups/cupsdconf2/editlist.cpp | 10 +++--- tdeprint/cups/cupsdconf2/locationdialog.cpp | 10 +++--- tdeprint/cups/cupsdconf2/qdirlineedit.cpp | 2 +- tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp | 6 ++-- tdeprint/cups/kmconfigcupsdir.cpp | 2 +- tdeprint/cups/kmcupsconfigwidget.cpp | 6 ++-- tdeprint/cups/kmcupsmanager.cpp | 20 +++++------ tdeprint/cups/kmwippprinter.cpp | 12 +++---- tdeprint/cups/kmwother.cpp | 2 +- tdeprint/cups/kpimagepage.cpp | 16 ++++----- tdeprint/cups/kpschedulepage.cpp | 2 +- tdeprint/cups/kptextpage.cpp | 4 +-- 19 files changed, 86 insertions(+), 86 deletions(-) (limited to 'tdeprint/cups') diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index e9ff1256d..0e03b04a2 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -48,15 +48,15 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) m_state = None; m_status = false; m_actionindex = 0; - connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); m_side = new SidePixmap(this); m_doit = new TQPushButton(i18n("&Export"), this); m_cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); - connect(m_doit, TQT_SIGNAL(clicked()), TQT_SLOT(slotActionClicked())); + connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); + connect(m_doit, TQ_SIGNAL(clicked()), TQ_SLOT(slotActionClicked())); m_bar = new TQProgressBar(this); m_text = new KActiveLabel(this); TQLabel *m_title = new TQLabel(i18n("Export Printer Driver to Windows Clients"), this); @@ -245,7 +245,7 @@ void CupsAddSmb::checkActionStatus() void CupsAddSmb::nextAction() { if (m_actionindex < (int)(m_actions.count())) - TQTimer::singleShot(1, this, TQT_SLOT(doNextAction())); + TQTimer::singleShot(1, this, TQ_SLOT(doNextAction())); } void CupsAddSmb::doNextAction() diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp index a62e93ee9..e73dac19d 100644 --- a/tdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp @@ -56,7 +56,7 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) m1->addWidget(from_, 1, 1); m1->addWidget(to_, 2, 1); - connect(type_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); + connect(type_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); slotTypeChanged(type_->currentItem()); setCaption(i18n("Browse Address")); diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index 0bd0e53ae..91ef705bf 100644 --- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -97,29 +97,29 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) m3->addWidget(hideimplicitmembers_, 1, 0); m3->addWidget(useshortnames_, 1, 1); - connect(browsing_, TQT_SIGNAL(toggled(bool)), cups_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), slp_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseport_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseinterval_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browsetimeout_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseaddresses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseorder_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useimplicitclasses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useanyclasses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), hideimplicitmembers_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useshortnames_, TQT_SLOT(setEnabled(bool))); - - connect(browsing_, TQT_SIGNAL(toggled(bool)), l1, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l2, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l3, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l4, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l5, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l6, TQT_SLOT(setEnabled(bool))); - - connect(browseaddresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(browseaddresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(browseaddresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(browseinterval_, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), cups_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), slp_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseport_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseinterval_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browsetimeout_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseaddresses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseorder_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useimplicitclasses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useanyclasses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), hideimplicitmembers_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useshortnames_, TQ_SLOT(setEnabled(bool))); + + connect(browsing_, TQ_SIGNAL(toggled(bool)), l1, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l2, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l3, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l4, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l5, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l6, TQ_SLOT(setEnabled(bool))); + + connect(browseaddresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(browseaddresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(browseaddresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(browseinterval_, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(intervalChanged(int))); browsing_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp index b277006b2..1ac0c739b 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -69,7 +69,7 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name) m1->addWidget(maxjobsperprinter_, 4, 1); m1->addWidget(maxjobsperuser_, 5, 1); - connect(keepjobhistory_, TQT_SIGNAL(toggled(bool)), TQT_SLOT(historyChanged(bool))); + connect(keepjobhistory_, TQ_SIGNAL(toggled(bool)), TQ_SLOT(historyChanged(bool))); keepjobhistory_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index a9341fcf2..f040f430c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -88,10 +88,10 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name) m1->addWidget(clienttimeout_, 5, 1); m1->addWidget(listen_, 6, 1); - connect(listen_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(listen_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(listen_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(keepalive_, TQT_SIGNAL(toggled(bool)), keepalivetimeout_, TQT_SLOT(setEnabled(bool))); + connect(listen_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(listen_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(listen_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(keepalive_, TQ_SIGNAL(toggled(bool)), keepalivetimeout_, TQ_SLOT(setEnabled(bool))); keepalive_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index c23a753dd..1a5fa9e53 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -66,10 +66,10 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name) m1->addWidget(encryptkey_, 3, 1); m1->addWidget(locations_, 4, 1); - connect(locations_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(locations_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(locations_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(locations_, TQT_SIGNAL(deleted(int)), TQT_SLOT(slotDeleted(int))); + connect(locations_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(locations_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(locations_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(locations_, TQ_SIGNAL(deleted(int)), TQ_SLOT(slotDeleted(int))); } bool CupsdSecurityPage::loadConfig(CupsdConf *conf, TQString&) diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp index a2bb81972..ac38bb19c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -88,7 +88,7 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name) TQLabel *l6 = new TQLabel(i18n("Printcap file:"), this); TQLabel *l7 = new TQLabel(i18n("Printcap format:"), this); - connect(classification_, TQT_SIGNAL(activated(int)), TQT_SLOT(classChanged(int))); + connect(classification_, TQ_SIGNAL(activated(int)), TQ_SLOT(classChanged(int))); classification_->setCurrentItem(0); charset_->setCurrentItem(0); printcapformat_->setCurrentItem(0); diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp index 2e0d523f0..fd7f6b6c6 100644 --- a/tdeprint/cups/cupsdconf2/editlist.cpp +++ b/tdeprint/cups/cupsdconf2/editlist.cpp @@ -43,11 +43,11 @@ EditList::EditList(TQWidget *parent, const char *name) m1->addWidget(delbtn_, 2, 1); m1->addWidget(defbtn_, 3, 1); - connect(addbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(add())); - connect(editbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); - connect(delbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); - connect(defbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(defaultList())); - connect(list_, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSelected(int))); + connect(addbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(add())); + connect(editbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit())); + connect(delbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete())); + connect(defbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(defaultList())); + connect(list_, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSelected(int))); slotSelected(-1); } diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp index addd3eea4..a203f4e5e 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp @@ -66,8 +66,8 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) order_->insertItem(i18n("Allow, Deny")); order_->insertItem(i18n("Deny, Allow")); - connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int))); - connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); + connect(authclass_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotClassChanged(int))); + connect(authtype_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); TQLabel *l1 = new TQLabel(i18n("Resource:"), dummy); TQLabel *l2 = new TQLabel(i18n("Authentication:"), dummy); @@ -104,9 +104,9 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) slotClassChanged(AUTHCLASS_ANONYMOUS); encryption_->setCurrentItem(ENCRYPT_IFREQUESTED); - connect(addresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(addresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(addresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); + connect(addresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(addresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(addresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); } void LocationDialog::setInfos(CupsdConf *conf) diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp index c3a6d50d2..e82a6fba6 100644 --- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -31,7 +31,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name) edit_ = new TQLineEdit(this); button_ = new KPushButton(this); button_->setPixmap(SmallIcon("document-open")); - connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked())); + connect(button_,TQ_SIGNAL(clicked()),TQ_SLOT(buttonClicked())); TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); main_->addWidget(edit_); diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index e6cade32e..cc1392577 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -34,14 +34,14 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) m_view->header()->hide(); m_view->addColumn(""); m_view->setFullWidth(true); - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*))); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelected(TQListViewItem*))); m_add = new TQPushButton(this); m_add->setPixmap(SmallIcon("folder-new")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked())); m_remove = new TQPushButton(this); m_remove->setPixmap(SmallIcon("edit-delete")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked())); m_remove->setEnabled(false); m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2)); diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index 47d2c7f32..7dd7e5abc 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -48,7 +48,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) lay1->addWidget(m_stddir); lay1->addWidget(m_installdir); - connect(m_stddir,TQT_SIGNAL(toggled(bool)),m_installdir,TQT_SLOT(setDisabled(bool))); + connect(m_stddir,TQ_SIGNAL(toggled(bool)),m_installdir,TQ_SLOT(setDisabled(bool))); m_stddir->setChecked(true); } diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index 08ec61911..9f05f3b16 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -103,9 +103,9 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) lay3->addMultiCellWidget(m_anonymous,3,3,0,1); // connections - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setDisabled(bool))); - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setDisabled(bool))); - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_savepwd,TQT_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_savepwd,TQ_SLOT(setDisabled(bool))); } void KMCupsConfigWidget::load() diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index ee1c62728..3e5876451 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -292,8 +292,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) // Give 2 seconds to connect to the printer, or abort KExtendedSocket *kes = new KExtendedSocket(p->uri().host(), p->uri().port()); - connect(kes, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(hostPingSlot())); - connect(kes, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(hostPingFailedSlot())); + connect(kes, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(hostPingSlot())); + connect(kes, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(hostPingFailedSlot())); if (kes->startAsyncConnect() != 0) { delete kes; m_hostSuccess = false; @@ -938,9 +938,9 @@ TQStringList KMCupsManager::detectLocalPrinters() void KMCupsManager::createPluginActions(TDEActionCollection *coll) { - TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); + TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQ_SLOT(exportDriver()), coll, "plugin_export_driver"); act->setGroup("plugin"); - act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); + act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQ_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); act->setGroup("plugin"); } @@ -1020,12 +1020,12 @@ void KMCupsManager::checkUpdatePossibleInternal() delete m_socket; m_socket = new KNetwork::TDEBufferedSocket; m_socket->setTimeout( 1500 ); - connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), - TQT_SLOT( slotConnectionSuccess() ) ); - connect( m_socket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( m_socket, TQ_SIGNAL( connected(const KResolverEntry&) ), + TQ_SLOT( slotConnectionSuccess() ) ); + connect( m_socket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); trials = 5; - TQTimer::singleShot( 1, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( slotAsyncConnect() ) ); } void KMCupsManager::slotConnectionSuccess() @@ -1044,7 +1044,7 @@ void KMCupsManager::slotConnectionSuccess() if ( trials > 0 ) { trials--; - TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) ); } else { @@ -1074,7 +1074,7 @@ void KMCupsManager::slotConnectionFailed( int errcode ) //m_socket->cancelAsyncConnect(); trials--; m_socket->close(); - TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) ); return; } diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp index f7a4f0593..bbc878055 100644 --- a/tdeprint/cups/kmwippprinter.cpp +++ b/tdeprint/cups/kmwippprinter.cpp @@ -70,12 +70,12 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(20); - connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) ); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); - connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport())); + connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) ); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) ); + connect(m_ippreport, TQ_SIGNAL(clicked()), TQ_SLOT(slotIppReport())); // layout TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp index 497fa03c3..67707b3ea 100644 --- a/tdeprint/cups/kmwother.cpp +++ b/tdeprint/cups/kmwother.cpp @@ -53,7 +53,7 @@ KMWOther::KMWOther(TQWidget *parent, const char *name) m_uriview->addColumn( "" ); m_uriview->header()->hide(); m_uriview->setSorting( -1 ); - connect( m_uriview, TQT_SIGNAL( pressed( TQListViewItem* ) ), TQT_SLOT( slotPressed( TQListViewItem* ) ) ); + connect( m_uriview, TQ_SIGNAL( pressed( TQListViewItem* ) ), TQ_SLOT( slotPressed( TQListViewItem* ) ) ); TQVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15); TQVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5); diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 29be5bc0c..0c6eb4770 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -263,10 +263,10 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_gamma->setRange(1, 3000, 100, true); TQWhatsThis::add(m_gamma, whatsThisGammaImagePage); - connect(m_brightness, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - connect(m_hue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - connect(m_saturation, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - //connect(m_gamma, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); + connect(m_brightness, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + connect(m_hue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + connect(m_saturation, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + //connect(m_gamma, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); m_preview = new ImagePreview(colorbox); bool useColor = (driver ? driver->get("colordevice") == "1" : true); @@ -282,7 +282,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQPushButton *defbtn = new TQPushButton(i18n("&Default Settings"), colorbox); TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage); - connect(defbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultClicked())); + connect(defbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultClicked())); slotDefaultClicked(); m_sizetype = new TQComboBox(sizebox); @@ -297,7 +297,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_size->setRange(1, 1200, 20, true); m_size->setValue(72); - connect(m_sizetype, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeTypeChanged(int))); + connect(m_sizetype, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeTypeChanged(int))); m_sizetype->setCurrentItem(0); slotSizeTypeChanged(0); @@ -342,8 +342,8 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_horizgrp->insert(hcenter, 1); m_horizgrp->insert(right, 2); } - connect(m_vertgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged())); - connect(m_horizgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged())); + connect(m_vertgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged())); + connect(m_horizgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged())); m_vertgrp->setButton(1); m_horizgrp->setButton(1); slotPositionChanged(); diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp index e37400679..0a3513c67 100644 --- a/tdeprint/cups/kpschedulepage.cpp +++ b/tdeprint/cups/kpschedulepage.cpp @@ -186,7 +186,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name) l0->addMultiCellWidget(m_priority, 4, 4, 0, 1); l0->setRowStretch(5, 1); - connect(m_time, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeChanged())); + connect(m_time, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeChanged())); } KPSchedulePage::~KPSchedulePage() diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index 9ad9d7cb5..4e990007e 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -208,7 +208,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) m_columns->setLabel(i18n("C&olumns:"), TQt::AlignLeft|TQt::AlignVCenter); m_columns->setRange(1, 10, 1, false); KSeparator *sep = new KSeparator(TQt::Horizontal, formatbox); - connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int))); + connect(m_columns, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotColumnsChanged(int))); m_prettypix = new TQLabel(prettybox); TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); @@ -222,7 +222,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) m_prettyprint->insert(off, 0); m_prettyprint->insert(on, 1); m_prettyprint->setButton(0); - connect(m_prettyprint, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPrettyChanged(int))); + connect(m_prettyprint, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPrettyChanged(int))); slotPrettyChanged(0); m_margin = new MarginWidget(marginbox); -- cgit v1.2.1