diff options
Diffstat (limited to 'tdeprint')
260 files changed, 1077 insertions, 1079 deletions
diff --git a/tdeprint/cups/CMakeLists.txt b/tdeprint/cups/CMakeLists.txt index 831c4db83..0cf2fd1e0 100644 --- a/tdeprint/cups/CMakeLists.txt +++ b/tdeprint/cups/CMakeLists.txt @@ -82,7 +82,7 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK driverparse-static tdefakes-shared ${ZLIB_LIBRARIES} ${DL_LIBRARIES} ${TQT_LIBRARIES} + LINK driverparse-static tdefakes-shared ${ZLIB_LIBRARIES} ${CMAKE_DL_LIBS} ${TQT_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index 0fd5e8116..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); @@ -64,7 +64,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) TQFont f(m_title->font()); f.setBold(true); m_title->setFont(f); - KSeparator *m_sep = new KSeparator(Qt::Horizontal, this); + KSeparator *m_sep = new KSeparator(TQt::Horizontal, this); m_textinfo = new TQLabel( this ); m_logined = new TQLineEdit( this ); m_passwded = new TQLineEdit( this ); @@ -109,7 +109,7 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) l1->addWidget(m_sep); l1->addWidget(m_text); TQGridLayout *l3 = new TQGridLayout( 0, 3, 2, 0, 10 ); - l1->addLayout( TQT_TQLAYOUT(l3) ); + l1->addLayout( l3 ); l3->addWidget( m_loginlab, 1, 0 ); l3->addWidget( m_passwdlab, 2, 0 ); l3->addWidget( m_serverlab, 0, 0 ); @@ -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/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h index 9aeccdd4a..fe04db01d 100644 --- a/tdeprint/cups/cupsaddsmb2.h +++ b/tdeprint/cups/cupsaddsmb2.h @@ -22,7 +22,7 @@ #include <tqobject.h> #include <tqstringlist.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kdialog.h> class TQProgressBar; @@ -34,7 +34,7 @@ class TQLineEdit; class CupsAddSmb : public KDialog { - Q_OBJECT + TQ_OBJECT public: enum State { None, Start, MkDir, Copy, AddDriver, AddPrinter }; diff --git a/tdeprint/cups/cupsdconf2/addressdialog.cpp b/tdeprint/cups/cupsdconf2/addressdialog.cpp index 83b4d0813..d3a137527 100644 --- a/tdeprint/cups/cupsdconf2/addressdialog.cpp +++ b/tdeprint/cups/cupsdconf2/addressdialog.cpp @@ -41,8 +41,8 @@ AddressDialog::AddressDialog(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(w, 2, 2, 0, 5); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); m1->addWidget(type_, 0, 1); m1->addWidget(address_, 1, 1); diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp index 3268c72bc..e73dac19d 100644 --- a/tdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp @@ -49,14 +49,14 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) TQLabel *l3 = new TQLabel(i18n("To:"), dummy); TQGridLayout *m1 = new TQGridLayout(dummy, 3, 2, 0, 5); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); m1->addWidget(type_, 0, 1); 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/browsedialog.h b/tdeprint/cups/cupsdconf2/browsedialog.h index 8db12bc34..cc4a12907 100644 --- a/tdeprint/cups/cupsdconf2/browsedialog.h +++ b/tdeprint/cups/cupsdconf2/browsedialog.h @@ -28,7 +28,7 @@ struct CupsdConf; class BrowseDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: BrowseDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cups-util.c b/tdeprint/cups/cupsdconf2/cups-util.c index e3039ea94..907459c65 100644 --- a/tdeprint/cups/cupsdconf2/cups-util.c +++ b/tdeprint/cups/cupsdconf2/cups-util.c @@ -513,13 +513,23 @@ cups_local_auth(http_t *http) /* I - Connection */ * See if we are accessing localhost... the struct has changed in newer versions - PiggZ (adam@piggz.co.uk) */ -#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) - if (!httpAddrLocalhost(http)) +#if (CUPS_VERSION_MAJOR >= 2) + if (!httpAddrLocalhost(httpGetAddress(http))) + { + return (0); + } +#elif CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) + if (!httpAddrLocalhost(http)) + { + return (0); + } #else if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 && - strcasecmp(http->hostname, "localhost") != 0) + strcasecmp(http->hostname, "localhost") != 0) + { + return (0); + } #endif - return (0); /* * Try opening a certificate file for this PID. If that fails, diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index e66048b73..91ef705bf 100644 --- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -79,12 +79,12 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) m2->addWidget(cups_); m2->addWidget(slp_); m2->addStretch(1); - m1->addWidget(l1, 1, 0, Qt::AlignRight); - m1->addWidget(l2, 2, 0, Qt::AlignRight); - m1->addWidget(l3, 3, 0, Qt::AlignRight); - m1->addWidget(l4, 4, 0, Qt::AlignRight|Qt::AlignTop); - m1->addWidget(l5, 5, 0, Qt::AlignRight); - m1->addWidget(l6, 6, 0, Qt::AlignRight|Qt::AlignTop); + m1->addWidget(l1, 1, 0, TQt::AlignRight); + m1->addWidget(l2, 2, 0, TQt::AlignRight); + m1->addWidget(l3, 3, 0, TQt::AlignRight); + m1->addWidget(l4, 4, 0, TQt::AlignRight|TQt::AlignTop); + m1->addWidget(l5, 5, 0, TQt::AlignRight); + m1->addWidget(l6, 6, 0, TQt::AlignRight|TQt::AlignTop); m1->addWidget(browseport_, 1, 1); m1->addWidget(browseinterval_, 2, 1); m1->addWidget(browsetimeout_, 3, 1); @@ -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/cupsdbrowsingpage.h b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h index bdbff1844..53bc266d7 100644 --- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h +++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h @@ -29,7 +29,7 @@ class TQComboBox; class CupsdBrowsingPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdBrowsingPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp index 8a788cad3..206c93e37 100644 --- a/tdeprint/cups/cupsdconf2/cupsdcomment.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdcomment.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqregexp.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> TQString Comment::comment() { diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp index 066d50953..5b1e3b811 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp @@ -43,7 +43,7 @@ #include <tqwhatsthis.h> #include <tdeio/passdlg.h> #include <kguiitem.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqprocess.h> #include <stdlib.h> diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.h b/tdeprint/cups/cupsdconf2/cupsddialog.h index 85eee172e..683e998d7 100644 --- a/tdeprint/cups/cupsdconf2/cupsddialog.h +++ b/tdeprint/cups/cupsdconf2/cupsddialog.h @@ -28,7 +28,7 @@ struct CupsdConf; class CupsdDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CupsdDialog(TQWidget *parent = 0, const char *name = 0); ~CupsdDialog(); @@ -52,7 +52,7 @@ protected: private: TQPtrList<CupsdPage> pagelist_; CupsdConf *conf_; - QString filename_; + TQString filename_; }; #endif diff --git a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp index 282657255..82848d03e 100644 --- a/tdeprint/cups/cupsdconf2/cupsddirpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsddirpage.cpp @@ -54,13 +54,13 @@ CupsdDirPage::CupsdDirPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight|Qt::AlignTop); - m1->addWidget(l4, 3, 0, Qt::AlignRight); - m1->addWidget(l5, 4, 0, Qt::AlignRight); - m1->addWidget(l6, 5, 0, Qt::AlignRight); - m1->addWidget(l7, 6, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight|TQt::AlignTop); + m1->addWidget(l4, 3, 0, TQt::AlignRight); + m1->addWidget(l5, 4, 0, TQt::AlignRight); + m1->addWidget(l6, 5, 0, TQt::AlignRight); + m1->addWidget(l7, 6, 0, TQt::AlignRight); m1->addWidget(datadir_, 0, 1); m1->addWidget(documentdir_, 1, 1); m1->addWidget(fontpath_, 2, 1); diff --git a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp index e9cb1a0ad..8de8f429a 100644 --- a/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdfilterpage.cpp @@ -54,10 +54,10 @@ CupsdFilterPage::CupsdFilterPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 5, 2, 10, 7); m1->setRowStretch(4, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 3, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 3, 0, TQt::AlignRight); m1->addWidget(user_, 0, 1); m1->addWidget(group_, 1, 1); m1->addWidget(ripcache_, 2, 1); diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp index 4fe84d769..1ac0c739b 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -62,14 +62,14 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name) m1->addWidget(keepjobhistory_, 0, 1); m1->addWidget(keepjobfiles_, 1, 1); m1->addWidget(autopurgejobs_, 2, 1); - m1->addWidget(l1, 3, 0, Qt::AlignRight); - m1->addWidget(l2, 4, 0, Qt::AlignRight); - m1->addWidget(l3, 5, 0, Qt::AlignRight); + m1->addWidget(l1, 3, 0, TQt::AlignRight); + m1->addWidget(l2, 4, 0, TQt::AlignRight); + m1->addWidget(l3, 5, 0, TQt::AlignRight); m1->addWidget(maxjobs_, 3, 1); 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/cupsdjobspage.h b/tdeprint/cups/cupsdconf2/cupsdjobspage.h index abbbd140d..8f6668aa3 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.h +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.h @@ -27,7 +27,7 @@ class TQCheckBox; class CupsdJobsPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdJobsPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp index 22128b39c..2052ece24 100644 --- a/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdlogpage.cpp @@ -66,11 +66,11 @@ CupsdLogPage::CupsdLogPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); m1->setRowStretch(5, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 3, 0, Qt::AlignRight); - m1->addWidget(l5, 4, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 3, 0, TQt::AlignRight); + m1->addWidget(l5, 4, 0, TQt::AlignRight); m1->addWidget(accesslog_, 0, 1); m1->addWidget(errorlog_, 1, 1); m1->addWidget(pagelog_, 2, 1); diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index e939c151f..f040f430c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -74,12 +74,12 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 8, 2, 10, 7); m1->setRowStretch(7, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 2, 0, Qt::AlignRight); - m1->addWidget(l3, 3, 0, Qt::AlignRight); - m1->addWidget(l4, 4, 0, Qt::AlignRight); - m1->addWidget(l5, 5, 0, Qt::AlignRight); - m1->addWidget(l6, 6, 0, Qt::AlignTop|Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 2, 0, TQt::AlignRight); + m1->addWidget(l3, 3, 0, TQt::AlignRight); + m1->addWidget(l4, 4, 0, TQt::AlignRight); + m1->addWidget(l5, 5, 0, TQt::AlignRight); + m1->addWidget(l6, 6, 0, TQt::AlignTop|TQt::AlignRight); m1->addWidget(keepalive_, 1, 1); m1->addWidget(hostnamelookup_, 0, 1); m1->addWidget(keepalivetimeout_, 2, 1); @@ -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/cupsdnetworkpage.h b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h index be46c280f..912d4bb4a 100644 --- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h +++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h @@ -30,7 +30,7 @@ class SizeWidget; class CupsdNetworkPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdNetworkPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdpage.h b/tdeprint/cups/cupsdconf2/cupsdpage.h index aadbd54b9..9d8008d1f 100644 --- a/tdeprint/cups/cupsdconf2/cupsdpage.h +++ b/tdeprint/cups/cupsdconf2/cupsdpage.h @@ -26,7 +26,7 @@ struct CupsdConf; class CupsdPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CupsdPage(TQWidget *parent = 0, const char *name = 0); virtual ~CupsdPage(); @@ -46,9 +46,9 @@ protected: protected: CupsdConf *conf_; - QString label_; - QString header_; - QString pixmap_; + TQString label_; + TQString header_; + TQString pixmap_; }; #endif diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index 6d6061264..1a5fa9e53 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -55,21 +55,21 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 6, 2, 10, 7); m1->setRowStretch(5, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 3, 0, Qt::AlignRight); - m1->addWidget(l5, 4, 0, Qt::AlignRight|Qt::AlignTop); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 3, 0, TQt::AlignRight); + m1->addWidget(l5, 4, 0, TQt::AlignRight|TQt::AlignTop); m1->addWidget(remoteroot_, 0, 1); m1->addWidget(systemgroup_, 1, 1); m1->addWidget(encryptcert_, 2, 1); 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/cupsdsecuritypage.h b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h index 5e97c1cf8..ebe86b6ad 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h @@ -30,7 +30,7 @@ struct CupsLocation; class CupsdSecurityPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdSecurityPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp index e89356af9..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); @@ -97,13 +97,13 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(this, 9, 2, 10, 7); m1->setRowStretch(8, 1); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 4, 0, Qt::AlignRight); - m1->addWidget(l5, 5, 0, Qt::AlignRight); - m1->addWidget(l6, 6, 0, Qt::AlignRight); - m1->addWidget(l7, 7, 0, Qt::AlignRight); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 4, 0, TQt::AlignRight); + m1->addWidget(l5, 5, 0, TQt::AlignRight); + m1->addWidget(l6, 6, 0, TQt::AlignRight); + m1->addWidget(l7, 7, 0, TQt::AlignRight); m1->addWidget(servername_, 0, 1); m1->addWidget(serveradmin_, 1, 1); m1->addWidget(charset_, 4, 1); diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.h b/tdeprint/cups/cupsdconf2/cupsdserverpage.h index f1f9eed2f..13bac0f6e 100644 --- a/tdeprint/cups/cupsdconf2/cupsdserverpage.h +++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.h @@ -28,7 +28,7 @@ class TQComboBox; class CupsdServerPage : public CupsdPage { - Q_OBJECT + TQ_OBJECT public: CupsdServerPage(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp index c28329e67..cb952ed4b 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsplash.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsplash.cpp @@ -23,7 +23,7 @@ #include <tqpixmap.h> #include <tqlayout.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) : CupsdPage(parent, name) @@ -39,11 +39,11 @@ CupsdSplash::CupsdSplash(TQWidget *parent, const char *name) TQLabel *cupslogo_ = new TQLabel(this); TQString logopath = locate("data", TQString("tdeprint/cups_logo.png")); cupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - cupslogo_->setAlignment(Qt::AlignCenter); + cupslogo_->setAlignment(TQt::AlignCenter); TQLabel *kupslogo_ = new TQLabel(this); logopath = locate("data", TQString("tdeprint/kde_logo.png")); kupslogo_->setPixmap(logopath.isEmpty() ? TQPixmap() : TQPixmap(logopath)); - kupslogo_->setAlignment(Qt::AlignCenter); + kupslogo_->setAlignment(TQt::AlignCenter); TQLabel *helptxt_ = new TQLabel(this); helptxt_->setText(i18n( "<p>This tool will help you to configure graphically the server of the CUPS printing system. " 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/editlist.h b/tdeprint/cups/cupsdconf2/editlist.h index 19a2da8c8..45783b0e3 100644 --- a/tdeprint/cups/cupsdconf2/editlist.h +++ b/tdeprint/cups/cupsdconf2/editlist.h @@ -28,7 +28,7 @@ class TQPushButton; class EditList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: EditList(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/kde_logo.png b/tdeprint/cups/cupsdconf2/kde_logo.png Binary files differindex dd51b555e..1e5a296dd 100644..100755 --- a/tdeprint/cups/cupsdconf2/kde_logo.png +++ b/tdeprint/cups/cupsdconf2/kde_logo.png diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp index 0754ae573..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); @@ -80,14 +80,14 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) TQGridLayout *m1 = new TQGridLayout(dummy, 8, 2, 0, 5); m1->setColStretch(1, 1); - m1->addWidget(l1, 0, 0, Qt::AlignRight); - m1->addWidget(l2, 1, 0, Qt::AlignRight); - m1->addWidget(l3, 2, 0, Qt::AlignRight); - m1->addWidget(l4, 3, 0, Qt::AlignRight); - m1->addWidget(l5, 4, 0, Qt::AlignRight); - m1->addWidget(l6, 5, 0, Qt::AlignRight); - m1->addWidget(l7, 6, 0, Qt::AlignRight); - m1->addWidget(l8, 7, 0, Qt::AlignRight|Qt::AlignTop); + m1->addWidget(l1, 0, 0, TQt::AlignRight); + m1->addWidget(l2, 1, 0, TQt::AlignRight); + m1->addWidget(l3, 2, 0, TQt::AlignRight); + m1->addWidget(l4, 3, 0, TQt::AlignRight); + m1->addWidget(l5, 4, 0, TQt::AlignRight); + m1->addWidget(l6, 5, 0, TQt::AlignRight); + m1->addWidget(l7, 6, 0, TQt::AlignRight); + m1->addWidget(l8, 7, 0, TQt::AlignRight|TQt::AlignTop); m1->addWidget(resource_, 0, 1); m1->addWidget(authtype_, 1, 1); m1->addWidget(authclass_, 2, 1); @@ -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/locationdialog.h b/tdeprint/cups/cupsdconf2/locationdialog.h index f0c182f42..2afd3600b 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.h +++ b/tdeprint/cups/cupsdconf2/locationdialog.h @@ -30,7 +30,7 @@ struct CupsLocation; class LocationDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: LocationDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdconf2/main.cpp b/tdeprint/cups/cupsdconf2/main.cpp index 78b0e1edf..f8eb86f91 100644 --- a/tdeprint/cups/cupsdconf2/main.cpp +++ b/tdeprint/cups/cupsdconf2/main.cpp @@ -30,7 +30,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDECmdLineArgs::init(argc,argv,"cupsdconf", I18N_NOOP("A CUPS configuration tool"), diff --git a/tdeprint/cups/cupsdconf2/portdialog.cpp b/tdeprint/cups/cupsdconf2/portdialog.cpp index f758d5d1e..a1fc7dd00 100644 --- a/tdeprint/cups/cupsdconf2/portdialog.cpp +++ b/tdeprint/cups/cupsdconf2/portdialog.cpp @@ -45,9 +45,9 @@ PortDialog::PortDialog(TQWidget *parent, const char *name) TQVBoxLayout *m1 = new TQVBoxLayout(dummy, 0, 10); TQGridLayout *m2 = new TQGridLayout(0, 3, 2, 0, 5); - m1->addLayout(TQT_TQLAYOUT(m2)); - m2->addWidget(l1, 0, 0, Qt::AlignRight); - m2->addWidget(l2, 1, 0, Qt::AlignRight); + m1->addLayout(m2); + m2->addWidget(l1, 0, 0, TQt::AlignRight); + m2->addWidget(l2, 1, 0, TQt::AlignRight); m2->addMultiCellWidget(usessl_, 2, 2, 0, 1); m2->addWidget(address_, 0, 1); m2->addWidget(port_, 1, 1); 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/qdirlineedit.h b/tdeprint/cups/cupsdconf2/qdirlineedit.h index d852897c3..f682d6fbe 100644 --- a/tdeprint/cups/cupsdconf2/qdirlineedit.h +++ b/tdeprint/cups/cupsdconf2/qdirlineedit.h @@ -28,7 +28,7 @@ class TQPushButton; class QDirLineEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: QDirLineEdit(bool file, TQWidget *parent = 0, const char *name = 0); ~QDirLineEdit(); 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/cupsdconf2/qdirmultilineedit.h b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h index a55f3355e..47b9530d3 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h @@ -28,7 +28,7 @@ class TQPushButton; class QDirMultiLineEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT public: QDirMultiLineEdit(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/cupsdoprint.c b/tdeprint/cups/cupsdoprint.c index 999b5f493..3741d7509 100644 --- a/tdeprint/cups/cupsdoprint.c +++ b/tdeprint/cups/cupsdoprint.c @@ -146,7 +146,7 @@ int main(int argc, char* argv[]) char *a; cups_option_t *options = NULL; int num_options = 0; - char* files[100] = {0}; + const char* files[100] = {0}; int num_files = 0; int jobID = 0; diff --git a/tdeprint/cups/image.cpp b/tdeprint/cups/image.cpp index ce56bb4b9..d26b01400 100644 --- a/tdeprint/cups/image.cpp +++ b/tdeprint/cups/image.cpp @@ -249,10 +249,10 @@ TQImage convertImage(const TQImage& image, int hue, int saturation, int brightne { float mat[3][3] = {{1.0,0.0,0.0},{0.0,1.0,0.0},{0.0,0.0,1.0}}; int lut[3][3][256]; - QRgb c; + TQRgb c; int r,g,b,v,r2,g2,b2; float gam = 1.0/(float(gamma)/1000.0); - QImage img(image); + TQImage img(image); saturate(mat,saturation*0.01); huerotate(mat,(float)hue); diff --git a/tdeprint/cups/imageposition.cpp b/tdeprint/cups/imageposition.cpp index 8ff617665..851738c42 100644 --- a/tdeprint/cups/imageposition.cpp +++ b/tdeprint/cups/imageposition.cpp @@ -20,21 +20,21 @@ #include "imageposition.h" #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> static void draw3DPage(TQPainter *p, TQRect r) { // draw white page - p->fillRect(r,Qt::white); + p->fillRect(r,TQt::white); // draw 3D border - p->setPen(Qt::black); + p->setPen(TQt::black); p->moveTo(r.left(),r.bottom()); p->lineTo(r.right(),r.bottom()); p->lineTo(r.right(),r.top()); - p->setPen(Qt::darkGray); + p->setPen(TQt::darkGray); p->lineTo(r.left(),r.top()); p->lineTo(r.left(),r.bottom()); - p->setPen(Qt::gray); + p->setPen(TQt::gray); p->moveTo(r.left()+1,r.bottom()-1); p->lineTo(r.right()-1,r.bottom()-1); p->lineTo(r.right()-1,r.top()+1); diff --git a/tdeprint/cups/imagepreview.cpp b/tdeprint/cups/imagepreview.cpp index e2401d6d3..549010f44 100644 --- a/tdeprint/cups/imagepreview.cpp +++ b/tdeprint/cups/imagepreview.cpp @@ -55,7 +55,7 @@ void ImagePreview::setParameters(int brightness, int hue, int saturation, int ga } void ImagePreview::paintEvent(TQPaintEvent*){ - QImage tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_); + TQImage tmpImage = convertImage(image_,hue_,(bw_ ? 0 : saturation_),brightness_,gamma_); int x = (width()-tmpImage.width())/2, y = (height()-tmpImage.height())/2; TQPixmap buffer(width(), height()); diff --git a/tdeprint/cups/ippreportdlg.cpp b/tdeprint/cups/ippreportdlg.cpp index 63f0207dd..e16b38dd5 100644 --- a/tdeprint/cups/ippreportdlg.cpp +++ b/tdeprint/cups/ippreportdlg.cpp @@ -62,7 +62,7 @@ void IppReportDlg::slotUser1() rich.draw(&painter, margin, margin, r, colorGroup()); TQString s = caption() + ": " + TQString::number(page); TQRect br = painter.fontMetrics().boundingRect(s); - painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, Qt::AlignRight|Qt::AlignTop, s); + painter.drawText(r.right()-br.width()-5, r.top()-br.height()-4, br.width()+5, br.height()+4, TQt::AlignRight|TQt::AlignTop, s); r.moveBy(0, r.height()-10); painter.translate(0, -(r.height()-10)); if (r.top() < hh) diff --git a/tdeprint/cups/ippreportdlg.h b/tdeprint/cups/ippreportdlg.h index e61ccd7b7..9d622562e 100644 --- a/tdeprint/cups/ippreportdlg.h +++ b/tdeprint/cups/ippreportdlg.h @@ -27,7 +27,7 @@ class KTextEdit; class IppReportDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: IppReportDlg(TQWidget *parent = 0, const char *name = 0); static void report(IppRequest *req, int group, const TQString& caption = TQString::null); diff --git a/tdeprint/cups/ipprequest.h b/tdeprint/cups/ipprequest.h index 84a7c5b18..8577c9b93 100644 --- a/tdeprint/cups/ipprequest.h +++ b/tdeprint/cups/ipprequest.h @@ -102,7 +102,7 @@ protected: private: ipp_t *request_; - QString host_; + TQString host_; int port_; bool connect_; int dump_; diff --git a/tdeprint/cups/kcupsprinterimpl.cpp b/tdeprint/cups/kcupsprinterimpl.cpp index 5c2245e8d..9d4fd1420 100644 --- a/tdeprint/cups/kcupsprinterimpl.cpp +++ b/tdeprint/cups/kcupsprinterimpl.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> #include <cups/cups.h> #include <stdlib.h> -#include <kprocess.h> +#include <tdeprocess.h> static void mapToCupsOptions(const TQMap<TQString,TQString>& opts, TQString& cmd); diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index 10a455226..7dd7e5abc 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -35,7 +35,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) setPageHeader(i18n("CUPS Folder Settings")); setPagePixmap("folder"); - TQGroupBox *m_dirbox = new TQGroupBox(0, Qt::Vertical, i18n("Installation Folder"), this); + TQGroupBox *m_dirbox = new TQGroupBox(0, TQt::Vertical, i18n("Installation Folder"), this); m_installdir = new KURLRequester(m_dirbox); m_installdir->setMode((KFile::Mode)(KFile::Directory|KFile::ExistingOnly|KFile::LocalOnly)); m_stddir = new TQCheckBox(i18n("Standard installation (/)"), m_dirbox); @@ -44,18 +44,18 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lay0->addWidget(m_dirbox); lay0->addStretch(1); - TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_dirbox->layout()), 10); + TQVBoxLayout *lay1 = new TQVBoxLayout(m_dirbox->layout(), 10); 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); } void KMConfigCupsDir::loadConfig(TDEConfig *conf) { conf->setGroup("CUPS"); - QString dir = conf->readPathEntry("InstallDir"); + TQString dir = conf->readPathEntry("InstallDir"); m_stddir->setChecked(dir.isEmpty()); m_installdir->setURL(dir); } diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index f93c1a4b3..9f05f3b16 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -41,7 +41,7 @@ public: }; PortValidator::PortValidator(TQWidget *parent, const char *name) -: TQIntValidator(1, 65535, TQT_TQOBJECT(parent), name) +: TQIntValidator(1, 65535, parent, name) { } @@ -62,8 +62,8 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) : TQWidget(parent,name) { // widget creation - TQGroupBox *m_hostbox = new TQGroupBox(0, Qt::Vertical, i18n("Server Information"), this); - TQGroupBox *m_loginbox = new TQGroupBox(0, Qt::Vertical, i18n("Account Information"), this); + TQGroupBox *m_hostbox = new TQGroupBox(0, TQt::Vertical, i18n("Server Information"), this); + TQGroupBox *m_loginbox = new TQGroupBox(0, TQt::Vertical, i18n("Account Information"), this); TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), m_hostbox); TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), m_hostbox); m_host = new TQLineEdit(m_hostbox); @@ -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/kmcupsjobmanager.h b/tdeprint/cups/kmcupsjobmanager.h index 0635dd8ea..00b218c20 100644 --- a/tdeprint/cups/kmcupsjobmanager.h +++ b/tdeprint/cups/kmcupsjobmanager.h @@ -28,7 +28,7 @@ class KMPrinter; class KMCupsJobManager : public KMJobManager { - Q_OBJECT + TQ_OBJECT public: KMCupsJobManager(TQObject *parent, const char *name, const TQStringList &/*args*/); diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index ee1c62728..8dffc7125 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -44,14 +44,14 @@ #include <tdeapplication.h> #include <tdelocale.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdesocketbase.h> #include <klibloader.h> #include <tdemessagebox.h> #include <tdeaction.h> #include <kdialogbase.h> #include <kextendedsocket.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kbufferedsocket.h> #include <kfilterdev.h> #include <cups/cups.h> @@ -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; @@ -639,7 +639,7 @@ DrMain* KMCupsManager::loadFileDriver(const TQString& filename) DrMain* KMCupsManager::loadMaticDriver(const TQString& drname) { TQStringList comps = TQStringList::split('/', drname, false); - TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); + TQString tmpFile = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8)); #if defined(__OpenBSD__) || defined(__FreeBSD__) TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/local/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); #else @@ -807,7 +807,7 @@ void KMCupsManager::saveDriverFile(DrMain *driver, const TQString& filename) bool KMCupsManager::savePrinterDriver(KMPrinter *p, DrMain *d) { - TQString tmpfilename = locateLocal("tmp","print_") + kapp->randomString(8); + TQString tmpfilename = locateLocal("tmp","print_") + tdeApp->randomString(8); // first save the driver in a temporary file saveDriverFile(d,tmpfilename); @@ -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/kmcupsmanager.h b/tdeprint/cups/kmcupsmanager.h index 1e7c21b19..cc4a74a85 100644 --- a/tdeprint/cups/kmcupsmanager.h +++ b/tdeprint/cups/kmcupsmanager.h @@ -35,7 +35,7 @@ class KMCupsManager : public KMManager friend class KMWIppPrinter; friend class KMCupsJobManager; - Q_OBJECT + TQ_OBJECT public: KMCupsManager(TQObject *parent, const char *name, const TQStringList & /*args*/); virtual ~KMCupsManager(); diff --git a/tdeprint/cups/kmcupsuimanager.cpp b/tdeprint/cups/kmcupsuimanager.cpp index 03b85bb0a..8438a7c1b 100644 --- a/tdeprint/cups/kmcupsuimanager.cpp +++ b/tdeprint/cups/kmcupsuimanager.cpp @@ -134,7 +134,7 @@ void KMCupsUiManager::setupWizard(KMWizard *wizard) backend->addBackend(KMWizard::Class,i18n("Cl&ass of printers"),false,whatsThisClassOfPrinters); IppRequest req; - QString uri; + TQString uri; req.setOperation(CUPS_GET_DEVICES); uri = TQString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr()); @@ -234,7 +234,7 @@ void KMCupsUiManager::setupPrintDialogPages(TQPtrList<KPrintDialogPage>* pages) void KMCupsUiManager::setupJobViewer(TQListView *lv) { lv->addColumn(i18n("Priority")); - lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter); + lv->setColumnAlignment(lv->columns()-1, TQt::AlignRight|TQt::AlignVCenter); lv->addColumn(i18n("Billing Information")); - lv->setColumnAlignment(lv->columns()-1, Qt::AlignRight|Qt::AlignVCenter); + lv->setColumnAlignment(lv->columns()-1, TQt::AlignRight|TQt::AlignVCenter); } diff --git a/tdeprint/cups/kmwipp.cpp b/tdeprint/cups/kmwipp.cpp index a8ec8d425..e2b4423d0 100644 --- a/tdeprint/cups/kmwipp.cpp +++ b/tdeprint/cups/kmwipp.cpp @@ -34,7 +34,7 @@ KMWIpp::KMWIpp(TQWidget *parent, const char *name) m_ID = KMWizard::IPP; m_title = i18n("Remote IPP server"); m_nextpage = KMWizard::IPPSelect; - lineEdit( 1 )->setValidator( new TQIntValidator( TQT_TQOBJECT(this) ) ); + lineEdit( 1 )->setValidator( new TQIntValidator( this ) ); setInfo(i18n("<p>Enter the information concerning the remote IPP server " "owning the targeted printer. This wizard will poll the server " 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/kmwippprinter.h b/tdeprint/cups/kmwippprinter.h index f578afba9..24758ab4a 100644 --- a/tdeprint/cups/kmwippprinter.h +++ b/tdeprint/cups/kmwippprinter.h @@ -31,7 +31,7 @@ class NetworkScanner; class KMWIppPrinter : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWIppPrinter(TQWidget *parent = 0, const char *name = 0); ~KMWIppPrinter(); 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/kmwother.h b/tdeprint/cups/kmwother.h index a650482f4..c25913a52 100644 --- a/tdeprint/cups/kmwother.h +++ b/tdeprint/cups/kmwother.h @@ -28,7 +28,7 @@ class TQListViewItem; class KMWOther : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWOther(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/cups/kmwquota.h b/tdeprint/cups/kmwquota.h index d8895c80d..e63f01aa4 100644 --- a/tdeprint/cups/kmwquota.h +++ b/tdeprint/cups/kmwquota.h @@ -27,7 +27,7 @@ class TQComboBox; class KMWQuota : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWQuota(TQWidget *parent = 0, const char *name = 0); virtual ~KMWQuota(); diff --git a/tdeprint/cups/kmwusers.h b/tdeprint/cups/kmwusers.h index cae8844a6..82c0d8a75 100644 --- a/tdeprint/cups/kmwusers.h +++ b/tdeprint/cups/kmwusers.h @@ -27,7 +27,7 @@ class TQComboBox; class KMWUsers : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWUsers(TQWidget *parent = 0, const char *name = 0); virtual ~KMWUsers(); diff --git a/tdeprint/cups/kphpgl2page.cpp b/tdeprint/cups/kphpgl2page.cpp index f804b249d..03271fa1c 100644 --- a/tdeprint/cups/kphpgl2page.cpp +++ b/tdeprint/cups/kphpgl2page.cpp @@ -110,7 +110,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) setTitle("HP-GL/2"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("HP-GL/2 Options"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("HP-GL/2 Options"), this); m_blackplot = new TQCheckBox(i18n("&Use only black pen"), box); TQWhatsThis::add(m_blackplot, whatsThisBlackplotHpgl2Page); @@ -119,7 +119,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) TQWhatsThis::add(m_fitplot, whatsThisFitplotHpgl2Page); m_penwidth = new KIntNumInput(1000, box); - m_penwidth->setLabel(i18n("&Pen width:"), Qt::AlignLeft|Qt::AlignVCenter); + m_penwidth->setLabel(i18n("&Pen width:"), TQt::AlignLeft|TQt::AlignVCenter); m_penwidth->setSuffix(" [um]"); m_penwidth->setRange(0, 10000, 100, true); TQWhatsThis::add(m_penwidth, whatsThisPenwidthHpgl2Page); @@ -128,7 +128,7 @@ KPHpgl2Page::KPHpgl2Page(TQWidget *parent, const char *name) l0->addWidget(box); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), 10); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), 10); l1->addWidget(m_blackplot); l1->addWidget(m_fitplot); l1->addWidget(m_penwidth); diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 8d23fe3e0..86acb1e8a 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <knuminput.h> #include <kseparator.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) : KPrintDialogPage(parent, name) @@ -236,11 +236,11 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) setTitle(i18n("Image")); - TQGroupBox *colorbox = new TQGroupBox(0, Qt::Vertical, i18n("Color Settings"), this); + TQGroupBox *colorbox = new TQGroupBox(0, TQt::Vertical, i18n("Color Settings"), this); TQWhatsThis::add(this, whatsThisImagePage); - TQGroupBox *sizebox = new TQGroupBox(0, Qt::Vertical, i18n("Image Size"), this); + TQGroupBox *sizebox = new TQGroupBox(0, TQt::Vertical, i18n("Image Size"), this); TQWhatsThis::add(sizebox, whatsThisSizeImagePage); - TQGroupBox *positionbox = new TQGroupBox(0, Qt::Vertical, i18n("Image Position"), this); + TQGroupBox *positionbox = new TQGroupBox(0, TQt::Vertical, i18n("Image Position"), this); TQWhatsThis::add(positionbox, whatsThisPositionImagePage); m_brightness = new KIntNumInput(100, colorbox); @@ -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); @@ -278,11 +278,11 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQImage img(locate("data", "tdeprint/preview.png")); m_preview->setImage(img); - KSeparator *sep = new KSeparator(Qt::Horizontal, colorbox); + KSeparator *sep = new KSeparator(TQt::Horizontal, colorbox); 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(); @@ -361,7 +361,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l1->addWidget(m_gamma, 4, 0); l1->addMultiCellWidget(m_preview, 0, 3, 1, 1); l1->addWidget(defbtn, 4, 1); - TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(sizebox->layout()), 3); + TQVBoxLayout *l2 = new TQVBoxLayout(sizebox->layout(), 3); l2->addStretch(1); l2->addWidget(lab); l2->addWidget(m_sizetype); @@ -374,12 +374,12 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) l3->addLayout(l4, 0, 1); l3->addLayout(l5, 1, 0); l3->addWidget(m_position, 1, 1); - l4->addWidget(left, Qt::AlignLeft); - l4->addWidget(hcenter, Qt::AlignCenter); - l4->addWidget(right, Qt::AlignRight); - l5->addWidget(top, Qt::AlignTop); - l5->addWidget(vcenter, Qt::AlignVCenter); - l5->addWidget(bottom, Qt::AlignBottom); + l4->addWidget(left, TQt::AlignLeft); + l4->addWidget(hcenter, TQt::AlignCenter); + l4->addWidget(right, TQt::AlignRight); + l5->addWidget(top, TQt::AlignTop); + l5->addWidget(vcenter, TQt::AlignVCenter); + l5->addWidget(bottom, TQt::AlignBottom); } KPImagePage::~KPImagePage() diff --git a/tdeprint/cups/kpimagepage.h b/tdeprint/cups/kpimagepage.h index 1a6bc6e44..71bf31e0b 100644 --- a/tdeprint/cups/kpimagepage.h +++ b/tdeprint/cups/kpimagepage.h @@ -30,7 +30,7 @@ class ImagePosition; class KPImagePage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPImagePage(DrMain *driver = 0, TQWidget *parent = 0, const char *name = 0); ~KPImagePage(); diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp index d7f13c8a4..0a3513c67 100644 --- a/tdeprint/cups/kpschedulepage.cpp +++ b/tdeprint/cups/kpschedulepage.cpp @@ -166,7 +166,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name) TQLabel *lab2 = new TQLabel(i18n("T&op/Bottom page label:"), this); TQWhatsThis::add(lab2, whatsThisPageLabel); lab2->setBuddy(m_pagelabel); - m_priority->setLabel(i18n("&Job priority:"), Qt::AlignVCenter|Qt::AlignLeft); + m_priority->setLabel(i18n("&Job priority:"), TQt::AlignVCenter|TQt::AlignLeft); TQWhatsThis::add(m_priority, whatsThisJobPriority); KSeparator *sep0 = new KSeparator(this); @@ -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() @@ -220,8 +220,8 @@ void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts) else if (t == "third-shift") item = 7; else { - TQTime qt = TQT_TQTIME_OBJECT(TQTime::fromString(t)); - m_tedit->setTime(TQT_TQTIME_OBJECT(qt.addSecs(-3600 * m_gmtdiff))); + TQTime qt = TQTime::fromString(t); + m_tedit->setTime(qt.addSecs(-3600 * m_gmtdiff)); item = 8; } diff --git a/tdeprint/cups/kpschedulepage.h b/tdeprint/cups/kpschedulepage.h index 4be11fab9..163cdcf23 100644 --- a/tdeprint/cups/kpschedulepage.h +++ b/tdeprint/cups/kpschedulepage.h @@ -29,7 +29,7 @@ class KIntNumInput; class KPSchedulePage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPSchedulePage(TQWidget *parent = 0, const char *name = 0); ~KPSchedulePage(); diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index 6fb0652ce..4e990007e 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -188,31 +188,31 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) setTitle(i18n("Text")); m_block = false; - TQGroupBox *formatbox = new TQGroupBox(0, Qt::Vertical, i18n("Text Format"), this); + TQGroupBox *formatbox = new TQGroupBox(0, TQt::Vertical, i18n("Text Format"), this); TQWhatsThis::add(formatbox, whatsThisFormatTextPage); - TQGroupBox *prettybox = new TQGroupBox(0, Qt::Vertical, i18n("Syntax Highlighting"), this); + TQGroupBox *prettybox = new TQGroupBox(0, TQt::Vertical, i18n("Syntax Highlighting"), this); TQWhatsThis::add(prettybox, whatsThisPrettyprintFrameTextPage); - TQGroupBox *marginbox = new TQGroupBox(0, Qt::Vertical, i18n("Margins"), this); + TQGroupBox *marginbox = new TQGroupBox(0, TQt::Vertical, i18n("Margins"), this); TQWhatsThis::add(marginbox, whatsThisMarginsTextPage); m_cpi = new KIntNumInput(10, formatbox); TQWhatsThis::add(m_cpi, whatsThisCPITextPage); - m_cpi->setLabel(i18n("&Chars per inch:"), Qt::AlignLeft|Qt::AlignVCenter); + m_cpi->setLabel(i18n("&Chars per inch:"), TQt::AlignLeft|TQt::AlignVCenter); m_cpi->setRange(1, 999, 1, false); m_lpi = new KIntNumInput(m_cpi, 6, formatbox); TQWhatsThis::add(m_lpi, whatsThisLPITextPage); - m_lpi->setLabel(i18n("&Lines per inch:"), Qt::AlignLeft|Qt::AlignVCenter); + m_lpi->setLabel(i18n("&Lines per inch:"), TQt::AlignLeft|TQt::AlignVCenter); m_lpi->setRange(1, 999, 1, false); m_columns = new KIntNumInput(m_lpi, 1, formatbox); TQWhatsThis::add(m_columns, whatsThisColumnsTextPage); - m_columns->setLabel(i18n("C&olumns:"), Qt::AlignLeft|Qt::AlignVCenter); + m_columns->setLabel(i18n("C&olumns:"), TQt::AlignLeft|TQt::AlignVCenter); m_columns->setRange(1, 10, 1, false); - KSeparator *sep = new KSeparator(Qt::Horizontal, formatbox); - connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int))); + KSeparator *sep = new KSeparator(TQt::Horizontal, formatbox); + connect(m_columns, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotColumnsChanged(int))); m_prettypix = new TQLabel(prettybox); TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); - m_prettypix->setAlignment(Qt::AlignCenter); + m_prettypix->setAlignment(TQt::AlignCenter); TQRadioButton *off = new TQRadioButton(i18n("&Disabled"), prettybox); TQWhatsThis::add(off, whatsThisPrettyprintButtonOffTextPage); TQRadioButton *on = new TQRadioButton(i18n("&Enabled"), prettybox); @@ -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); @@ -233,16 +233,16 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) l0->addWidget(formatbox, 0, 0); l0->addWidget(prettybox, 0, 1); l0->addMultiCellWidget(marginbox, 1, 1, 0, 1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(formatbox->layout()), 5); + TQVBoxLayout *l1 = new TQVBoxLayout(formatbox->layout(), 5); l1->addWidget(m_cpi); l1->addWidget(m_lpi); l1->addWidget(sep); l1->addWidget(m_columns); - TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(prettybox->layout()), 2, 2, 10); + TQGridLayout *l2 = new TQGridLayout(prettybox->layout(), 2, 2, 10); l2->addWidget(off, 0, 0); l2->addWidget(on, 1, 0); l2->addMultiCellWidget(m_prettypix, 0, 1, 1, 1); - TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(marginbox->layout()), 10); + TQVBoxLayout *l3 = new TQVBoxLayout(marginbox->layout(), 10); l3->addWidget(m_margin); } diff --git a/tdeprint/cups/kptextpage.h b/tdeprint/cups/kptextpage.h index 504e2d5c2..5aecfb526 100644 --- a/tdeprint/cups/kptextpage.h +++ b/tdeprint/cups/kptextpage.h @@ -30,7 +30,7 @@ class MarginWidget; class KPTextPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPTextPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0); ~KPTextPage(); diff --git a/tdeprint/cups/make_driver_db_cups.cpp b/tdeprint/cups/make_driver_db_cups.cpp index a5eb1b8e5..5c5000535 100644 --- a/tdeprint/cups/make_driver_db_cups.cpp +++ b/tdeprint/cups/make_driver_db_cups.cpp @@ -249,10 +249,10 @@ int parseCompressedPpdFile(const char *ppdfilename, const char *origin, const ch if (strlen(metadata) > 0) { TQString metadataProcessed(metadata); metadataProcessed = metadataProcessed.stripWhiteSpace(); - TQStringList metadataList = TQStringList::split(" ", metadataProcessed, TRUE); + TQStringList metadataList = TQStringList::split(" ", metadataProcessed, true); TQLocale ppdLanguage(metadataList[0]); TQString languageVersion = TQLocale::languageToString(ppdLanguage.language()); - metadataList = TQStringList::split("\" \"", metadataProcessed, TRUE); + metadataList = TQStringList::split("\" \"", metadataProcessed, true); TQString description = metadataList[1]; int pos = metadataProcessed.find("MFG:"); @@ -266,9 +266,9 @@ int parseCompressedPpdFile(const char *ppdfilename, const char *origin, const ch TQString pnpManufacturer; TQString pnpModel; TQString driver; - TQStringList metadataList = TQStringList::split(";", metadataProcessed.mid(pos), TRUE); + TQStringList metadataList = TQStringList::split(";", metadataProcessed.mid(pos), true); for (TQStringList::Iterator it = metadataList.begin(); it != metadataList.end(); ++it) { - TQStringList kvPair = TQStringList::split(":", *it, TRUE); + TQStringList kvPair = TQStringList::split(":", *it, true); if ((kvPair[0].upper() == "MFG") || (kvPair[0].upper() == "MANUFACTURER")) { manufacturer = kvPair[1]; } @@ -290,7 +290,7 @@ int parseCompressedPpdFile(const char *ppdfilename, const char *origin, const ch modelName = modelName.stripWhiteSpace(); driver = driver.stripWhiteSpace(); - TQStringList driverList = TQStringList::split(",", driver, TRUE); + TQStringList driverList = TQStringList::split(",", driver, true); driver = driverList[0]; if (driver.startsWith("D")) { driver = driver.mid(1); diff --git a/tdeprint/driver.cpp b/tdeprint/driver.cpp index 92eb7fc84..f4a07aa88 100644 --- a/tdeprint/driver.cpp +++ b/tdeprint/driver.cpp @@ -66,7 +66,7 @@ void DrBase::setOptions(const TQMap<TQString,TQString>& opts) void DrBase::getOptions(TQMap<TQString,TQString>& opts, bool incldef) { - QString val = valueText(); + TQString val = valueText(); if ( incldef || get( "persistent" ) == "1" || get("default") != val ) opts[name()] = val; } @@ -455,7 +455,7 @@ DrIntegerOption::~DrIntegerOption() TQString DrIntegerOption::valueText() { - QString s = TQString::number(m_value); + TQString s = TQString::number(m_value); return s; } @@ -505,7 +505,7 @@ DrFloatOption::~DrFloatOption() TQString DrFloatOption::valueText() { - QString s = TQString::number(m_value,'f',3); + TQString s = TQString::number(m_value,'f',3); return s; } @@ -555,7 +555,7 @@ DrListOption::~DrListOption() TQString DrListOption::valueText() { - QString s = (m_current ? m_current->name() : TQString::null); + TQString s = (m_current ? m_current->name() : TQString::null); return s; } @@ -654,7 +654,7 @@ bool DrConstraint::check(DrMain *driver) if (m_option1 && m_option2 && m_option1->currentChoice() && m_option2->currentChoice()) { bool f1(false), f2(false); - QString c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name()); + TQString c1(m_option1->currentChoice()->name()), c2(m_option2->currentChoice()->name()); // check choices if (m_choice1.isEmpty()) f1 = (c1 != "None" && c1 != "Off" && c1 != "False"); @@ -665,7 +665,7 @@ bool DrConstraint::check(DrMain *driver) else f2 = (c2 == m_choice2); // tag options - QString s((f1 && f2 ? "1" : "0")); + TQString s((f1 && f2 ? "1" : "0")); if (!m_option1->conflict()) m_option1->setConflict(f1 && f2); if (!m_option2->conflict()) m_option2->setConflict(f1 && f2); // return value diff --git a/tdeprint/driver.h b/tdeprint/driver.h index 813c0b7f6..9848be9a6 100644 --- a/tdeprint/driver.h +++ b/tdeprint/driver.h @@ -87,7 +87,7 @@ public: protected: TQMap<TQString,TQString> m_map; - QString m_name; // used as a search key, better to have defined directly + TQString m_name; // used as a search key, better to have defined directly Type m_type; bool m_conflict; }; @@ -212,7 +212,7 @@ public: virtual void setValueText(const TQString& s); protected: - QString m_value; + TQString m_value; }; /********************************** @@ -336,8 +336,8 @@ public: bool check(DrMain*); protected: - QString m_opt1, m_opt2; - QString m_choice1, m_choice2; + TQString m_opt1, m_opt2; + TQString m_choice1, m_choice2; DrListOption *m_option1, *m_option2; }; @@ -376,7 +376,7 @@ public: TQSize margins() const; protected: - QString m_name; + TQString m_name; float m_width, m_height, m_left, m_bottom, m_right, m_top; }; diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp index 0b66c51d9..0b4266c11 100644 --- a/tdeprint/driveritem.cpp +++ b/tdeprint/driveritem.cpp @@ -44,7 +44,7 @@ void DriverItem::updateText() { if (m_item) { - QString s(m_item->get("text")); + TQString s(m_item->get("text")); if (m_item->isOption()) s.append(TQString::fromLatin1(": <%1>").arg(m_item->prettyText())); if (m_item->type() == DrBase::List) @@ -91,25 +91,25 @@ void DriverItem::paintCell(TQPainter *p, const TQColorGroup& cg, int, int width, if (!m_item || !m_item->isOption() || isSelected()) { p->setPen((isSelected() ? cg.highlightedText() : (m_conflict ? red : cg.text()))); - p->drawText(w,0,width-w,height(),Qt::AlignLeft|Qt::AlignVCenter,text(0)); + p->drawText(w,0,width-w,height(),TQt::AlignLeft|TQt::AlignVCenter,text(0)); } else { int w1(0); - QString s(m_item->get("text") + ": <"); + TQString s(m_item->get("text") + ": <"); w1 = p->fontMetrics().width(s); p->setPen(cg.text()); - p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); + p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s); w += w1; p->setPen((m_conflict ? red : darkGreen)); s = m_item->prettyText(); w1 = p->fontMetrics().width(s); - p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); + p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s); w += w1; p->setPen(cg.text()); s = TQString::fromLatin1(">"); w1 = p->fontMetrics().width(s); - p->drawText(w,0,w1,height(),Qt::AlignLeft|Qt::AlignVCenter,s); + p->drawText(w,0,w1,height(),TQt::AlignLeft|TQt::AlignVCenter,s); } } diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp index fece6c40c..285a0864d 100644 --- a/tdeprint/driverview.cpp +++ b/tdeprint/driverview.cpp @@ -95,7 +95,7 @@ DriverView::DriverView(TQWidget *parent, const char *name) m_driver = 0; TQSplitter *splitter = new TQSplitter(this); - splitter->setOrientation(Qt::Vertical); + splitter->setOrientation(TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 10); vbox->addWidget(splitter); @@ -105,8 +105,8 @@ DriverView::DriverView(TQWidget *parent, const char *name) m_optview = new DrOptionView(splitter); TQWhatsThis::add(m_optview, whatsThisOptionSettingsDriverPage); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(m_optview,TQT_SIGNAL(changed()),TQT_SLOT(slotChanged())); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_optview,TQ_SIGNAL(changed()),TQ_SLOT(slotChanged())); } DriverView::~DriverView() diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h index 7e06648fa..5db76a0cd 100644 --- a/tdeprint/driverview.h +++ b/tdeprint/driverview.h @@ -38,7 +38,7 @@ public: class TDEPRINT_EXPORT DriverView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DriverView(TQWidget *parent = 0, const char *name = 0); ~DriverView(); diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp index de20a62fa..d58c20863 100644 --- a/tdeprint/droptionview.cpp +++ b/tdeprint/droptionview.cpp @@ -56,7 +56,7 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name) : OptionBaseView(parent,name) { m_edit = new TQLineEdit(this); - m_slider = new TQSlider(Qt::Horizontal,this); + m_slider = new TQSlider(TQt::Horizontal,this); m_slider->setTickmarks(TQSlider::Below); TQLabel *lab = new TQLabel(i18n("Value:"),this); m_minval = new TQLabel(this); @@ -78,8 +78,8 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name) sub2_->addWidget(m_slider,1); sub2_->addWidget(m_maxval,0); - connect(m_slider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotSliderChanged(int))); - connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotEditChanged(const TQString&))); + connect(m_slider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotSliderChanged(int))); + connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotEditChanged(const TQString&))); } void OptionNumericView::setOption(DrBase *opt) @@ -123,7 +123,7 @@ void OptionNumericView::slotSliderChanged(int value) { if (blockSS) return; - QString txt; + TQString txt; if (m_integer) txt = TQString::number(value); else @@ -172,7 +172,7 @@ OptionStringView::OptionStringView(TQWidget *parent, const char *name) main_->addWidget(m_edit,0); main_->addStretch(1); - connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SIGNAL(valueChanged(const TQString&))); } void OptionStringView::setOption(DrBase *opt) @@ -196,7 +196,7 @@ OptionListView::OptionListView(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(m_list); - connect(m_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); + connect(m_list,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); } void OptionListView::setOption(DrBase *opt) @@ -226,7 +226,7 @@ void OptionListView::slotSelectionChanged() { if (blockSS) return; - QString s = m_choices[m_list->currentItem()]; + TQString s = m_choices[m_list->currentItem()]; emit valueChanged(s); } @@ -246,7 +246,7 @@ OptionBooleanView::OptionBooleanView(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(m_group); - connect(m_group,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotSelected(int))); + connect(m_group,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotSelected(int))); } void OptionBooleanView::setOption(DrBase *opt) @@ -283,32 +283,32 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name) m_stack = new TQWidgetStack(this); OptionBaseView *w = new OptionListView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::List); w = new OptionStringView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::String); w = new OptionNumericView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::Integer); w = new OptionBooleanView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::Boolean); w = new OptionBaseView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,0); // empty widget m_stack->raiseWidget(w); setTitle(i18n("No Option Selected")); - setColumnLayout(0, Qt::Vertical ); + setColumnLayout(0, TQt::Vertical ); layout()->setSpacing( KDialog::spacingHint() ); layout()->setMargin( KDialog::marginHint() ); - TQVBoxLayout *main_ = new TQVBoxLayout(TQT_TQLAYOUT(layout()), KDialog::marginHint()); + TQVBoxLayout *main_ = new TQVBoxLayout(layout(), KDialog::marginHint()); main_->addWidget(m_stack); m_item = 0; diff --git a/tdeprint/droptionview.h b/tdeprint/droptionview.h index 6114efcbd..9304db3b3 100644 --- a/tdeprint/droptionview.h +++ b/tdeprint/droptionview.h @@ -37,7 +37,7 @@ class DriverItem; class OptionBaseView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: OptionBaseView(TQWidget *parent = 0, const char *name = 0); virtual void setOption(DrBase*); @@ -52,7 +52,7 @@ protected: class OptionNumericView : public OptionBaseView { - Q_OBJECT + TQ_OBJECT public: OptionNumericView(TQWidget *parent = 0, const char *name = 0); void setOption(DrBase *opt); @@ -82,7 +82,7 @@ private: class OptionListView : public OptionBaseView { - Q_OBJECT + TQ_OBJECT public: OptionListView(TQWidget *parent = 0, const char *name = 0); void setOption(DrBase *opt); @@ -98,7 +98,7 @@ private: class OptionBooleanView : public OptionBaseView { - Q_OBJECT + TQ_OBJECT public: OptionBooleanView(TQWidget *parent = 0, const char *name = 0); void setOption(DrBase *opt); @@ -114,7 +114,7 @@ private: class DrOptionView : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: DrOptionView(TQWidget *parent = 0, const char *name = 0); void setAllowFixed(bool on) { m_allowfixed = on; } diff --git a/tdeprint/ext/kextprinterimpl.cpp b/tdeprint/ext/kextprinterimpl.cpp index 7923ea729..e3443677e 100644 --- a/tdeprint/ext/kextprinterimpl.cpp +++ b/tdeprint/ext/kextprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> diff --git a/tdeprint/foomatic/kfoomaticprinterimpl.cpp b/tdeprint/foomatic/kfoomaticprinterimpl.cpp index dd694b31b..1e1c4c20b 100644 --- a/tdeprint/foomatic/kfoomaticprinterimpl.cpp +++ b/tdeprint/foomatic/kfoomaticprinterimpl.cpp @@ -20,7 +20,7 @@ #include "kfoomaticprinterimpl.h" #include "kprinter.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> KFoomaticPrinterImpl::KFoomaticPrinterImpl(TQObject *parent, const char *name, const TQStringList & /*args*/) @@ -35,13 +35,13 @@ KFoomaticPrinterImpl::~KFoomaticPrinterImpl() // look for executable TQString KFoomaticPrinterImpl::executable() { - QString exe = TDEStandardDirs::findExe("foomatic-printjob"); + TQString exe = TDEStandardDirs::findExe("foomatic-printjob"); return exe; } bool KFoomaticPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) { - QString exe = executable(); + TQString exe = executable(); if (!exe.isEmpty()) { cmd = exe + TQString::fromLatin1(" -P %1 -# %2").arg(quote(printer->printerName())).arg(printer->numCopies()); diff --git a/tdeprint/foomatic/kmfoomaticmanager.cpp b/tdeprint/foomatic/kmfoomaticmanager.cpp index e1e741003..ef8a74a0e 100644 --- a/tdeprint/foomatic/kmfoomaticmanager.cpp +++ b/tdeprint/foomatic/kmfoomaticmanager.cpp @@ -24,7 +24,7 @@ #include <tqdom.h> #include <tdelocale.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <unistd.h> @@ -76,7 +76,7 @@ DrMain* KMFoomaticManager::loadPrinterDriver(KMPrinter *printer, bool) return NULL; } - QString cmd = "foomatic-combo-xml -p "; + TQString cmd = "foomatic-combo-xml -p "; cmd += TDEProcess::quote(printer->option("printer")); cmd += " -d "; cmd += TDEProcess::quote(printer->option("driver")); @@ -99,7 +99,7 @@ KMPrinter* KMFoomaticManager::createPrinterFromElement(TQDomElement *elem) printer->setState(KMPrinter::Idle); /*if (printer->name().find('/') != -1) { - QString s(printer->name()); + TQString s(printer->name()); int p = s.find('/'); printer->setPrinterName(s.left(p)); printer->setInstanceName(s.mid(p+1)); @@ -136,7 +136,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) { driver->set("manufacturer", pelem.namedItem("make").toElement().text()); driver->set("model", pelem.namedItem("model").toElement().text()); - QString s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); + TQString s = TQString::fromLatin1("%1 %2 (%3)").arg(driver->get("manufacturer")).arg(driver->get("model")).arg(delem.namedItem("name").toElement().text()); driver->set("description", s); driver->set("text", s); @@ -148,14 +148,14 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) { if (o.tagName() == "option") { - QString type = o.attribute("type"); + TQString type = o.attribute("type"); DrBase *dropt(0); if (type == "bool" || type == "enum") { if (type == "bool") dropt = new DrBooleanOption(); else dropt = new DrListOption(); - QString defval = o.namedItem("arg_defval").toElement().text(), valuetext; + TQString defval = o.namedItem("arg_defval").toElement().text(), valuetext; QDomNode val = o.namedItem("enum_vals").firstChild(); while (!val.isNull()) { @@ -177,7 +177,7 @@ DrMain* KMFoomaticManager::createDriverFromXML(TQDomElement *elem) else dropt = new DrFloatOption(); dropt->set("minval", o.namedItem("arg_min").toElement().text()); dropt->set("maxval", o.namedItem("arg_max").toElement().text()); - QString defval = o.namedItem("arg_defval").toElement().text(); + TQString defval = o.namedItem("arg_defval").toElement().text(); dropt->set("default", defval); dropt->setValueText(defval); } diff --git a/tdeprint/foomatic2loader.cpp b/tdeprint/foomatic2loader.cpp index c498477fd..0856cc012 100644 --- a/tdeprint/foomatic2loader.cpp +++ b/tdeprint/foomatic2loader.cpp @@ -53,7 +53,7 @@ bool Foomatic2Loader::readFromFile( const TQString& filename ) TQFile f( filename ); m_foodata.clear(); if ( f.open( IO_ReadOnly ) ) - return read( TQT_TQIODEVICE(&f) ); + return read( &f ); return false; } @@ -63,7 +63,7 @@ bool Foomatic2Loader::readFromBuffer( const TQString& buffer ) TQBuffer d( buf ); m_foodata.clear(); if ( d.open( IO_ReadOnly ) ) - return read( TQT_TQIODEVICE(&d) ); + return read( &d ); return false; } diff --git a/tdeprint/fooparser.cpp b/tdeprint/fooparser.cpp index 2f1a59e0f..55e68532b 100644 --- a/tdeprint/fooparser.cpp +++ b/tdeprint/fooparser.cpp @@ -227,19 +227,19 @@ static const short yycheck[] = { 4, /* We think this test detects Watcom and Microsoft C. */ /* This used to test MSDOS, but that is a bad idea since that symbol is in the user namespace. */ -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__) +#if defined (_MSDOS) || defined (_MSDOS_) #if 0 /* No need for malloc.h, which pollutes the namespace; instead, just don't use alloca. */ #include <malloc.h> #endif -#else /* not MSDOS, or __TURBOC__ */ +#else /* not MSDOS */ #if defined(_AIX) /* I don't know what this was needed for, but it pollutes the namespace. So I turned it off. rms, 2 May 1997. */ /* #include <malloc.h> */ #pragma alloca #define YYSTACK_USE_ALLOCA -#else /* not MSDOS, or __TURBOC__, or _AIX */ +#else /* not MSDOS or _AIX */ #if 0 #ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up, and on HPUX 10. Eventually we can turn this on. */ @@ -248,7 +248,7 @@ static const short yycheck[] = { 4, #endif /* __hpux */ #endif #endif /* not _AIX */ -#endif /* not MSDOS, or __TURBOC__ */ +#endif /* not MSDOS */ #endif /* not sparc */ #endif /* not GNU C */ #endif /* alloca not defined */ diff --git a/tdeprint/fooscanner.cpp b/tdeprint/fooscanner.cpp index 441d411da..8873872b0 100644 --- a/tdeprint/fooscanner.cpp +++ b/tdeprint/fooscanner.cpp @@ -58,15 +58,6 @@ #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include <io.h> -#include <stdlib.h> -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else diff --git a/tdeprint/fooscanner.l b/tdeprint/fooscanner.l index df8f6e778..7770f28bb 100644 --- a/tdeprint/fooscanner.l +++ b/tdeprint/fooscanner.l @@ -72,7 +72,7 @@ D [[:digit:]] %% -void tdeprint_foomatic2scanner_init( QIODevice *d ) +void tdeprint_foomatic2scanner_init( TQIODevice *d ) { tdeprint_foomatic2scanner_device = d; } diff --git a/tdeprint/kmfactory.cpp b/tdeprint/kmfactory.cpp index 16ec56c32..2ffda7498 100644 --- a/tdeprint/kmfactory.cpp +++ b/tdeprint/kmfactory.cpp @@ -33,12 +33,12 @@ #include <klibloader.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kdebug.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kstaticdeleter.h> #include <tdeapplication.h> #include <dcopclient.h> @@ -49,7 +49,7 @@ #define UNLOAD_OBJECT(x) if (x != 0) { delete x; x = 0; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 extern void tqt_generate_epsf( bool b ); #endif @@ -101,7 +101,7 @@ KMFactory::KMFactory() // This is fixed in Qt 3.0, but for Qt 2.x we need to disable it explicitly. // If this is a problem for anyone, we can add a public method to set this flag. // (David Faure, doing as advised by Lars Knoll) -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 tqt_generate_epsf( false ); #endif #endif @@ -312,7 +312,7 @@ KMFactory::PluginInfo KMFactory::pluginInfo(const TQString& name) TQString path(name); if (path[0] != '/') path = locate("data", TQString::fromLatin1("tdeprint/plugins/%1.print").arg(name)); - KSimpleConfig conf(path); + TDESimpleConfig conf(path); PluginInfo info; conf.setGroup("TDE Print Entry"); diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h index baaf48477..86aaad676 100644 --- a/tdeprint/kmfactory.h +++ b/tdeprint/kmfactory.h @@ -44,7 +44,7 @@ class KPReloadObject; class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/tdeprint/kmjob.cpp b/tdeprint/kmjob.cpp index 9f314539e..c0974d646 100644 --- a/tdeprint/kmjob.cpp +++ b/tdeprint/kmjob.cpp @@ -78,7 +78,7 @@ TQString KMJob::pixmap() return TQString::fromLatin1("application-x-executable"); // normal case - QString str("tdeprint_job"); + TQString str("tdeprint_job"); switch (m_state) { case KMJob::Printing: @@ -104,7 +104,7 @@ TQString KMJob::pixmap() TQString KMJob::stateString() { - QString str; + TQString str; switch (m_state) { case KMJob::Printing: diff --git a/tdeprint/kmjob.h b/tdeprint/kmjob.h index 51b4f90d1..7b9f8c3c1 100644 --- a/tdeprint/kmjob.h +++ b/tdeprint/kmjob.h @@ -111,9 +111,9 @@ protected: protected: // normal members int m_ID; - QString m_name; - QString m_printer; - QString m_owner; + TQString m_name; + TQString m_printer; + TQString m_owner; int m_state; int m_size; int m_type; @@ -123,7 +123,7 @@ protected: bool m_remote; // internal members - QString m_uri; + TQString m_uri; TQValueVector<TQString> m_attributes; }; diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h index fce6e61d2..e2aa01f5b 100644 --- a/tdeprint/kmjobmanager.h +++ b/tdeprint/kmjobmanager.h @@ -45,7 +45,7 @@ class TDEAction; */ class TDEPRINT_EXPORT KMJobManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum JobType { ActiveJobs = 0, CompletedJobs = 1 }; diff --git a/tdeprint/kmmanager.cpp b/tdeprint/kmmanager.cpp index 19fdbc7cc..eed2c53ec 100644 --- a/tdeprint/kmmanager.cpp +++ b/tdeprint/kmmanager.cpp @@ -28,7 +28,7 @@ #include <zlib.h> #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> #include <kdebug.h> @@ -421,7 +421,7 @@ TQString KMManager::testPage() { TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); - QString tpage = conf->readPathEntry("TestPage"); + TQString tpage = conf->readPathEntry("TestPage"); if (tpage.isEmpty()) tpage = locate("data","tdeprint/testprint.ps"); return tpage; diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h index d90a02d23..67cca0978 100644 --- a/tdeprint/kmmanager.h +++ b/tdeprint/kmmanager.h @@ -47,7 +47,7 @@ class PrinterFilter; */ class TDEPRINT_EXPORT KMManager : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KMVirtualManager; friend class KMSpecialManager; @@ -170,7 +170,7 @@ protected: virtual void checkUpdatePossibleInternal(); protected: - QString m_errormsg; + TQString m_errormsg; KMPrinterList m_printers, m_fprinters; // filtered printers bool m_hasmanagement; int m_printeroperationmask; diff --git a/tdeprint/kmprinter.cpp b/tdeprint/kmprinter.cpp index c7676e382..3d28831ba 100644 --- a/tdeprint/kmprinter.cpp +++ b/tdeprint/kmprinter.cpp @@ -90,7 +90,7 @@ TQString KMPrinter::pixmap() { if (!m_pixmap.isEmpty()) return m_pixmap; - QString str("tdeprint_printer"); + TQString str("tdeprint_printer"); if (!isValid()) str.append("_defect"); else { @@ -133,7 +133,7 @@ int KMPrinter::compare(KMPrinter *p1, KMPrinter *p2) TQString KMPrinter::stateString() const { - QString s; + TQString s; switch (state()) { case KMPrinter::Idle: s = i18n("Idle"); break; @@ -184,7 +184,7 @@ bool KMPrinter::autoConfigure(KPrinter *printer, TQWidget *parent) true); dialog->setOperationMode (KFileDialog::Saving); - QString mimetype = option("kde-special-mimetype"); + TQString mimetype = option("kde-special-mimetype"); if (!mimetype.isEmpty()) { diff --git a/tdeprint/kmspecialmanager.cpp b/tdeprint/kmspecialmanager.cpp index 16a0ab616..d0ace8e17 100644 --- a/tdeprint/kmspecialmanager.cpp +++ b/tdeprint/kmspecialmanager.cpp @@ -25,9 +25,9 @@ #include "driver.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <tdelocale.h> #include <kdebug.h> @@ -43,7 +43,7 @@ KMSpecialManager::KMSpecialManager(KMManager *parent, const char *name) bool KMSpecialManager::savePrinters() { // for root, use a global location. - QString confname; + TQString confname; if (getuid() == 0) { confname = locate("data", "tdeprint/specials.desktop"); @@ -60,7 +60,7 @@ bool KMSpecialManager::savePrinters() else confname = locateLocal("data","tdeprint/specials.desktop"); - KSimpleConfig conf(confname); + TDESimpleConfig conf(confname); // first clear existing groups conf.setGroup("General"); @@ -134,12 +134,12 @@ bool KMSpecialManager::loadPrinters() bool KMSpecialManager::loadDesktopFile(const TQString& filename) { - KSimpleConfig conf(filename); + TDESimpleConfig conf(filename); conf.setGroup("General"); int n = conf.readNumEntry("Number",0); for (int i=0;i<n;i++) { - QString grpname = TQString::fromLatin1("Printer %1").arg(i); + TQString grpname = TQString::fromLatin1("Printer %1").arg(i); if (!conf.hasGroup(grpname)) continue; conf.setGroup(grpname); KMPrinter *printer = new KMPrinter; @@ -213,7 +213,7 @@ DrMain* KMSpecialManager::loadDriver(KMPrinter *pr) TQString KMSpecialManager::setupCommand(const TQString& cmd, const TQMap<TQString,TQString>& opts) { - QString s(cmd); + TQString s(cmd); if (!s.isEmpty()) { KXmlCommand *xmlCmd = loadCommand(cmd); diff --git a/tdeprint/kmthreadjob.cpp b/tdeprint/kmthreadjob.cpp index 309da96a9..f41a5551d 100644 --- a/tdeprint/kmthreadjob.cpp +++ b/tdeprint/kmthreadjob.cpp @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <tqstringlist.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <errno.h> #include <sys/types.h> @@ -44,7 +44,7 @@ KMThreadJob::~KMThreadJob() TQString KMThreadJob::jobFile() { - QString f = locateLocal("data","tdeprint/printjobs"); + TQString f = locateLocal("data","tdeprint/printjobs"); return f; } diff --git a/tdeprint/kmuimanager.cpp b/tdeprint/kmuimanager.cpp index 4dd6966d3..c1a7a442a 100644 --- a/tdeprint/kmuimanager.cpp +++ b/tdeprint/kmuimanager.cpp @@ -144,7 +144,7 @@ void KMUiManager::setupPropertyDialog(KPrinterPropertyDialog *dlg) // retrieve the KPrinter object KPrinter *prt(0); if (dlg->parent() && dlg->parent()->isA("KPrintDialog")) - prt = static_cast<KPrintDialog*>(TQT_TQWIDGET(dlg->parent()))->printer(); + prt = static_cast<KPrintDialog*>(dlg->parent())->printer(); // add margin page if ( ( prt && !prt->fullPage() && prt->applicationType() == KPrinter::Dialog ) diff --git a/tdeprint/kmuimanager.h b/tdeprint/kmuimanager.h index e59c61e40..6b9113d33 100644 --- a/tdeprint/kmuimanager.h +++ b/tdeprint/kmuimanager.h @@ -35,7 +35,7 @@ class TQListView; class TDEPRINT_EXPORT KMUiManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum PrintDialogFlagType { diff --git a/tdeprint/kmvirtualmanager.cpp b/tdeprint/kmvirtualmanager.cpp index 9262f3e3c..46b7fd46f 100644 --- a/tdeprint/kmvirtualmanager.cpp +++ b/tdeprint/kmvirtualmanager.cpp @@ -29,7 +29,7 @@ #include <tqdir.h> #include <tqfileinfo.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kdebug.h> #include <tdemessagebox.h> @@ -38,7 +38,7 @@ static TQString instanceName(const TQString& prname, const TQString& instname) { - QString str(prname); + TQString str(prname); if (!instname.isEmpty()) str.append("/"+instname); return str; @@ -60,7 +60,7 @@ KMPrinter* KMVirtualManager::findPrinter(const TQString& name) KMPrinter* KMVirtualManager::findInstance(KMPrinter *p, const TQString& name) { - QString instname(instanceName(p->printerName(),name)); + TQString instname(instanceName(p->printerName(),name)); return findPrinter(instname); } @@ -96,7 +96,7 @@ void KMVirtualManager::setDefault(KMPrinter *p, bool saveflag) bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name) { - QString instname(instanceName(p->printerName(),name)); + TQString instname(instanceName(p->printerName(),name)); KMPrinter *printer = findPrinter(instname); if (printer) return printer->isSoftDefault(); @@ -106,7 +106,7 @@ bool KMVirtualManager::isDefault(KMPrinter *p, const TQString& name) void KMVirtualManager::create(KMPrinter *p, const TQString& name) { - QString instname = instanceName(p->printerName(),name); + TQString instname = instanceName(p->printerName(),name); if (findPrinter(instname) != NULL) return; KMPrinter *printer = new KMPrinter; printer->setName(instname); @@ -123,7 +123,7 @@ void KMVirtualManager::create(KMPrinter *p, const TQString& name) void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& name) { - QString instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name)); + TQString instsrc(instanceName(p->printerName(),src)), instname(instanceName(p->printerName(),name)); KMPrinter *prsrc = findPrinter(instsrc); if (!prsrc || findPrinter(instname) != NULL) return; KMPrinter *printer = new KMPrinter; @@ -137,7 +137,7 @@ void KMVirtualManager::copy(KMPrinter *p, const TQString& src, const TQString& n void KMVirtualManager::remove(KMPrinter *p, const TQString& name) { - QString instname = instanceName(p->printerName(),name); + TQString instname = instanceName(p->printerName(),name); KMPrinter *printer = findPrinter(instname); if (!printer) return; if (name.isEmpty()) @@ -153,7 +153,7 @@ void KMVirtualManager::remove(KMPrinter *p, const TQString& name) void KMVirtualManager::setAsDefault(KMPrinter *p, const TQString& name, TQWidget *parent) { - QString instname(instanceName(p->printerName(),name)); + TQString instname(instanceName(p->printerName(),name)); if ( p->isSpecial() ) { @@ -294,7 +294,7 @@ void KMVirtualManager::loadFile(const TQString& filename) void KMVirtualManager::triggerSave() { - QString filename; + TQString filename; if (getuid() == 0) { if (TDEStandardDirs::makeDir(TQFile::decodeName("/etc/cups"))) diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp index 27b647208..7a305345c 100644 --- a/tdeprint/kpcopiespage.cpp +++ b/tdeprint/kpcopiespage.cpp @@ -165,7 +165,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) setId(KPrinter::CopiesPage); // widget creation - TQButtonGroup *m_pagebox = new TQButtonGroup(0, Qt::Vertical, i18n("Page Selection"), this); + TQButtonGroup *m_pagebox = new TQButtonGroup(0, TQt::Vertical, i18n("Page Selection"), this); TQWhatsThis::add(m_pagebox, whatsThisPageSelectionLabel); m_all = new TQRadioButton(i18n("&All"), m_pagebox); TQWhatsThis::add(m_all, whatsThisAllPagesLabel); @@ -175,19 +175,19 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) TQWhatsThis::add(m_range, whatsThisPageRangeLabel); m_rangeedit = new TQLineEdit(m_pagebox); TQWhatsThis::add(m_rangeedit, whatsThisPageRangeLabel); - connect(m_range, TQT_SIGNAL(clicked()), m_rangeedit, TQT_SLOT(setFocus())); + connect(m_range, TQ_SIGNAL(clicked()), m_rangeedit, TQ_SLOT(setFocus())); TQToolTip::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); // TQWhatsThis::add(m_rangeedit, i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); //TQLabel *m_rangeexpl = new TQLabel(m_pagebox); //m_rangeexpl->setText(i18n("<p>Enter pages or group of pages to print separated by commas (1,2-5,8).</p>")); - TQGroupBox *m_copybox = new TQGroupBox(0, Qt::Vertical, i18n("Output Settings"), this); + TQGroupBox *m_copybox = new TQGroupBox(0, TQt::Vertical, i18n("Output Settings"), this); TQWhatsThis::add(m_copybox, whatsThisCopiesLabel); m_collate = new TQCheckBox(i18n("Co&llate"), m_copybox); TQWhatsThis::add(m_collate, whatsThisCollateLabel); m_order = new TQCheckBox(i18n("Re&verse"), m_copybox); TQWhatsThis::add(m_order, whatsThisReverseLabel); m_collatepix = new TQLabel(m_copybox); - m_collatepix->setAlignment(Qt::AlignCenter); + m_collatepix->setAlignment(TQt::AlignCenter); m_collatepix->setMinimumHeight(70); TQLabel *m_copieslabel = new TQLabel(i18n("Cop&ies:"), m_copybox); m_copies = new TQSpinBox(m_copybox); @@ -203,7 +203,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) TQLabel *m_pagesetlabel = new TQLabel(i18n("Page &set:"), m_pagebox); m_pagesetlabel->setBuddy(m_pageset); TQWhatsThis::add(m_pagesetlabel, whatsThisPageSetLabel); - KSeparator *sepline = new KSeparator(Qt::Horizontal, m_pagebox); + KSeparator *sepline = new KSeparator(TQt::Horizontal, m_pagebox); sepline->setMinimumHeight(10); TQWidget::setTabOrder( m_all, m_current ); @@ -221,7 +221,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) l1->setColStretch(1,1); l1->addWidget(m_pagebox,0,0); l1->addWidget(m_copybox,0,1); - TQVBoxLayout *l3 = new TQVBoxLayout(TQT_TQLAYOUT(m_pagebox->layout()), 5); + TQVBoxLayout *l3 = new TQVBoxLayout(m_pagebox->layout(), 5); l3->addWidget(m_all); l3->addWidget(m_current); TQHBoxLayout *l4 = new TQHBoxLayout(0, 0, 5); @@ -249,11 +249,11 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) slotCollateClicked(); // connections - connect(m_rangeedit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotRangeEntered())); - connect(m_collate,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked())); - connect(m_order,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked())); + connect(m_rangeedit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotRangeEntered())); + connect(m_collate,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked())); + connect(m_order,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked())); - if (!kapp->authorize("print/copies")) + if (!tdeApp->authorize("print/copies")) { setTitle(i18n("Pages")); m_copybox->hide(); diff --git a/tdeprint/kpcopiespage.h b/tdeprint/kpcopiespage.h index ddb2b4f2a..2011c7ade 100644 --- a/tdeprint/kpcopiespage.h +++ b/tdeprint/kpcopiespage.h @@ -33,7 +33,7 @@ class KPrinter; class TDEPRINT_EXPORT KPCopiesPage : public KPrintDialogPage, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KPCopiesPage(KPrinter *prt = 0, TQWidget *parent = 0, const char *name = 0); ~KPCopiesPage(); diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp index 768e4b475..7ac9b146c 100644 --- a/tdeprint/kpfilterpage.cpp +++ b/tdeprint/kpfilterpage.cpp @@ -133,7 +133,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) m_view->setLineWidth(1); m_view->setSorting(-1); m_view->header()->hide(); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotItemSelected(TQListViewItem*))); m_add = new TQToolButton(this); TQWhatsThis::add(m_add, whatsThisAddFilterButton); @@ -160,12 +160,12 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) m_configure->setIconSet(BarIconSet("configure")); TQToolTip::add(m_configure, i18n("Configure filter")); - connect(m_add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddClicked())); - connect(m_remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemoveClicked())); - connect(m_up,TQT_SIGNAL(clicked()),TQT_SLOT(slotUpClicked())); - connect(m_down,TQT_SIGNAL(clicked()),TQT_SLOT(slotDownClicked())); - connect(m_configure,TQT_SIGNAL(clicked()),TQT_SLOT(slotConfigureClicked())); - connect(m_view,TQT_SIGNAL(doubleClicked(TQListViewItem*)),TQT_SLOT(slotConfigureClicked())); + connect(m_add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddClicked())); + connect(m_remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemoveClicked())); + connect(m_up,TQ_SIGNAL(clicked()),TQ_SLOT(slotUpClicked())); + connect(m_down,TQ_SIGNAL(clicked()),TQ_SLOT(slotDownClicked())); + connect(m_configure,TQ_SIGNAL(clicked()),TQ_SLOT(slotConfigureClicked())); + connect(m_view,TQ_SIGNAL(doubleClicked(TQListViewItem*)),TQ_SLOT(slotConfigureClicked())); m_info = new KActiveLabel(this); TQWhatsThis::add(m_info, whatsThisFilterInfoPane); diff --git a/tdeprint/kpfilterpage.h b/tdeprint/kpfilterpage.h index a5bc7f757..9845b87b8 100644 --- a/tdeprint/kpfilterpage.h +++ b/tdeprint/kpfilterpage.h @@ -33,7 +33,7 @@ class TQTextBrowser; class KPFilterPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPFilterPage(TQWidget *parent = 0, const char *name = 0); ~KPFilterPage(); diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index 821290704..bce57cd1f 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -262,15 +262,15 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const // widget creation TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); - m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_pagesizelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight); TQWhatsThis::add(m_pagesizelabel, whatsThisGeneralPageSizeLabel); TQLabel *m_papertypelabel = new TQLabel(i18n("Paper t&ype:"), this); - m_papertypelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_papertypelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight); TQWhatsThis::add(m_papertypelabel, whatsThisGeneralPaperTypeLabel); TQLabel *m_inputslotlabel = new TQLabel(i18n("Paper so&urce:"), this); - m_inputslotlabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_inputslotlabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight); TQWhatsThis::add(m_inputslotlabel, whatsThisGeneralPaperSourceLabel); m_pagesize = new TQComboBox(this); @@ -286,16 +286,16 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const m_papertypelabel->setBuddy(m_papertype); m_inputslotlabel->setBuddy(m_inputslot); - m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); + m_orientbox = new TQButtonGroup(0, TQt::Vertical, i18n("Orientation"), this); TQWhatsThis::add(m_orientbox, whatsThisGeneralOrientationLabel); - m_duplexbox = new TQButtonGroup(0, Qt::Vertical, i18n("Duplex Printing"), this); + m_duplexbox = new TQButtonGroup(0, TQt::Vertical, i18n("Duplex Printing"), this); TQWhatsThis::add(m_duplexbox, whatsThisGeneralDuplexLabel); - m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); + m_nupbox = new TQButtonGroup(0, TQt::Vertical, i18n("Pages per Sheet"), this); TQWhatsThis::add(m_nupbox, whatsThisGeneralPagesPerSheetLabel); - m_bannerbox = new TQGroupBox(0, Qt::Vertical, i18n("Banners"), this); + m_bannerbox = new TQGroupBox(0, TQt::Vertical, i18n("Banners"), this); TQWhatsThis::add(m_bannerbox, whatsThisGeneralBannersLabel); TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox); @@ -305,19 +305,19 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const m_portrait->setChecked(true); m_orientpix = new TQLabel(m_orientbox); - m_orientpix->setAlignment(Qt::AlignCenter); + m_orientpix->setAlignment(TQt::AlignCenter); TQRadioButton *m_dupnone = new TQRadioButton(i18n("duplex orientation", "&None"), m_duplexbox); TQRadioButton *m_duplong = new TQRadioButton(i18n("duplex orientation", "Lon&g side"), m_duplexbox); TQRadioButton *m_dupshort = new TQRadioButton(i18n("duplex orientation", "S&hort side"), m_duplexbox); m_dupnone->setChecked(true); m_duplexpix = new TQLabel(m_duplexbox); - m_duplexpix->setAlignment(Qt::AlignCenter); + m_duplexpix->setAlignment(TQt::AlignCenter); TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); TQRadioButton *m_nup2 = new TQRadioButton("&2", m_nupbox); TQRadioButton *m_nup4 = new TQRadioButton("&4", m_nupbox); m_nup1->setChecked(true); m_nuppix = new TQLabel(m_nupbox); - m_nuppix->setAlignment(Qt::AlignCenter); + m_nuppix->setAlignment(TQt::AlignCenter); m_startbanner = new TQComboBox(m_bannerbox); m_endbanner = new TQComboBox(m_bannerbox); TQLabel *m_startbannerlabel = new TQLabel(i18n("S&tart:"), m_bannerbox); @@ -331,9 +331,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, KDialog::spacingHint()); TQGridLayout *lay2 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); lay0->addStretch(1); - lay0->addLayout(TQT_TQLAYOUT(lay1)); + lay0->addLayout(lay1); lay0->addStretch(1); - lay0->addLayout(TQT_TQLAYOUT(lay2)); + lay0->addLayout(lay2); lay0->addStretch(2); lay1->addWidget(m_pagesizelabel, 0, 0); lay1->addWidget(m_papertypelabel, 1, 0); @@ -376,9 +376,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const lay6->setColStretch(1, 1); // connections (+ misc) - connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int))); - connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int))); - connect(m_duplexbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotDuplexChanged(int))); + connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int))); + connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int))); + connect(m_duplexbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotDuplexChanged(int))); // init initialize(); diff --git a/tdeprint/kpgeneralpage.h b/tdeprint/kpgeneralpage.h index dc8eef580..eea610cdc 100644 --- a/tdeprint/kpgeneralpage.h +++ b/tdeprint/kpgeneralpage.h @@ -30,7 +30,7 @@ class TQLabel; class TDEPRINT_EXPORT KPGeneralPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent = 0, const char *name = 0); ~KPGeneralPage(); diff --git a/tdeprint/kpmarginpage.cpp b/tdeprint/kpmarginpage.cpp index 019cf34d9..d4b87994e 100644 --- a/tdeprint/kpmarginpage.cpp +++ b/tdeprint/kpmarginpage.cpp @@ -42,7 +42,7 @@ KPMarginPage::KPMarginPage(KPrinter *prt, DrMain *driver, TQWidget *parent, cons setTitle(i18n("Margins")); m_usedriver = true; - TQGroupBox *box = new TQGroupBox(1, Qt::Vertical, i18n("Margins"), this); + TQGroupBox *box = new TQGroupBox(1, TQt::Vertical, i18n("Margins"), this); m_margin = new MarginWidget(box, "MarginWidget", (m_printer != 0)); //m_margin->setSymetricMargins(true); //if (m_printer) @@ -75,7 +75,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) if (driver() && m_usedriver ) { - QString pageSize(ps); + TQString pageSize(ps); if (pageSize.isEmpty()) { @@ -105,7 +105,7 @@ void KPMarginPage::initPageSize(const TQString& ps, bool landscape) void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts) { - QString orient = opts["orientation-requested"]; + TQString orient = opts["orientation-requested"]; bool land = (orient.isEmpty()? opts["kde-orientation"] == "Landscape" : orient == "4" || orient == "5"); TQString ps = opts[ "kde-printsize" ]; if ( ps.isEmpty() ) @@ -120,7 +120,7 @@ void KPMarginPage::setOptions(const TQMap<TQString,TQString>& opts) initPageSize(ps, land); bool marginset(false); - QString value; + TQString value; if (!(value=opts["kde-margin-top"]).isEmpty() && value.toFloat() != m_margin->top()) { marginset = true; diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp index 9c0a42501..23e11a760 100644 --- a/tdeprint/kpposterpage.cpp +++ b/tdeprint/kpposterpage.cpp @@ -199,15 +199,15 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name ) m_postersize->setCurrentItem( findIndex( KPrinter::A3 ) ); slotPosterSizeChanged( m_postersize->currentItem() ); - connect( m_postercheck, TQT_SIGNAL( toggled( bool ) ), dummy, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_postercheck, TQ_SIGNAL( toggled( bool ) ), dummy, TQ_SLOT( setEnabled( bool ) ) ); dummy->setEnabled( false ); - connect( m_postersize, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotPosterSizeChanged( int ) ) ); - connect( m_cutmargin, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotMarginChanged( int ) ) ); - connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), m_printsize, TQT_SLOT( setDisabled( bool ) ) ); + connect( m_postersize, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotPosterSizeChanged( int ) ) ); + connect( m_cutmargin, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotMarginChanged( int ) ) ); + connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), m_printsize, TQ_SLOT( setDisabled( bool ) ) ); m_printsize->setEnabled( false ); - connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotLockToggled( bool ) ) ); - connect( m_selection, TQT_SIGNAL( textChanged( const TQString& ) ), m_preview, TQT_SLOT( setSelectedPages( const TQString& ) ) ); - connect( m_preview, TQT_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQT_SLOT( setText( const TQString& ) ) ); + connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotLockToggled( bool ) ) ); + connect( m_selection, TQ_SIGNAL( textChanged( const TQString& ) ), m_preview, TQ_SLOT( setSelectedPages( const TQString& ) ) ); + connect( m_preview, TQ_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQ_SLOT( setText( const TQString& ) ) ); if ( KMFactory::self()->settings()->application != KPrinter::Dialog && KMFactory::self()->settings()->application >= 0 ) diff --git a/tdeprint/kpposterpage.h b/tdeprint/kpposterpage.h index ce4858aa3..bd5352a51 100644 --- a/tdeprint/kpposterpage.h +++ b/tdeprint/kpposterpage.h @@ -32,7 +32,7 @@ class TQLineEdit; class KPPosterPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPPosterPage( TQWidget *parent = 0, const char *name = 0 ); ~KPPosterPage(); diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index c0ca5656e..e6088d489 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -116,11 +116,11 @@ void KPQtPage::init() m_pagesize = new TQComboBox(this); TQWhatsThis::add(m_pagesize, whatsThisPageSizeOtPageLabel); TQLabel *m_pagesizelabel = new TQLabel(i18n("Page s&ize:"), this); - m_pagesizelabel->setAlignment(Qt::AlignVCenter|Qt::AlignRight); + m_pagesizelabel->setAlignment(TQt::AlignVCenter|TQt::AlignRight); m_pagesizelabel->setBuddy(m_pagesize); - m_orientbox = new TQButtonGroup(0, Qt::Vertical, i18n("Orientation"), this); + m_orientbox = new TQButtonGroup(0, TQt::Vertical, i18n("Orientation"), this); TQWhatsThis::add(m_orientbox, whatsThisOrientationOtPageLabel); - m_colorbox = new TQButtonGroup(0, Qt::Vertical, i18n("Color Mode"), this); + m_colorbox = new TQButtonGroup(0, TQt::Vertical, i18n("Color Mode"), this); TQWhatsThis::add(m_colorbox, whatsThisColorModeOtPageLabel); TQRadioButton *m_portrait = new TQRadioButton(i18n("&Portrait"), m_orientbox); TQWhatsThis::add(m_portrait, whatsThisOrientationOtPageLabel); @@ -129,7 +129,7 @@ void KPQtPage::init() TQWhatsThis::add(m_landscape, whatsThisOrientationOtPageLabel); m_orientpix = new TQLabel(m_orientbox); - m_orientpix->setAlignment(Qt::AlignCenter); + m_orientpix->setAlignment(TQt::AlignCenter); TQWhatsThis::add(m_orientpix, whatsThisOrientationOtPageLabel); TQRadioButton *m_color = new TQRadioButton(i18n("Colo&r"), m_colorbox); @@ -137,10 +137,10 @@ void KPQtPage::init() TQRadioButton *m_grayscale = new TQRadioButton(i18n("&Grayscale"), m_colorbox); m_colorpix = new TQLabel(m_colorbox); - m_colorpix->setAlignment(Qt::AlignCenter); + m_colorpix->setAlignment(TQt::AlignCenter); TQWhatsThis::add(m_colorpix, whatsThisColorModeOtPageLabel); - m_nupbox = new TQButtonGroup(0, Qt::Vertical, i18n("Pages per Sheet"), this); + m_nupbox = new TQButtonGroup(0, TQt::Vertical, i18n("Pages per Sheet"), this); // TQWhatsThis::add(m_nupbox, whatsThisPagesPerSheetOtPageLabel); TQRadioButton *m_nup1 = new TQRadioButton("&1", m_nupbox); TQWhatsThis::add(m_nup1, whatsThisPagesPerSheetOtPageLabel); @@ -152,7 +152,7 @@ void KPQtPage::init() TQWhatsThis::add(m_nupother, whatsThisPagesPerSheetOtPageLabel); m_nuppix = new TQLabel(m_nupbox); - m_nuppix->setAlignment(Qt::AlignCenter); + m_nuppix->setAlignment(TQt::AlignCenter); TQWhatsThis::add(m_nuppix, whatsThisPagesPerSheetOtPageLabel); // layout creation @@ -218,9 +218,9 @@ void KPQtPage::init() } // connections - connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int))); - connect(m_colorbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotColorModeChanged(int))); - connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int))); + connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int))); + connect(m_colorbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotColorModeChanged(int))); + connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int))); } void KPQtPage::slotOrientationChanged(int ID) @@ -235,7 +235,7 @@ void KPQtPage::slotColorModeChanged(int ID) void KPQtPage::slotNupChanged(int ID) { - QString pixstr; + TQString pixstr; switch (ID) { case NUP_1: pixstr = "tdeprint_nup1"; break; @@ -256,7 +256,7 @@ void KPQtPage::setOptions(const TQMap<TQString,TQString>& opts) slotColorModeChanged(ID); if (driver()) { - QString val = opts["PageSize"]; + TQString val = opts["PageSize"]; if (!val.isEmpty()) { DrListOption *opt = static_cast<DrListOption*>(driver()->findOption("PageSize")); diff --git a/tdeprint/kpqtpage.h b/tdeprint/kpqtpage.h index ee78ffa86..cfeefa465 100644 --- a/tdeprint/kpqtpage.h +++ b/tdeprint/kpqtpage.h @@ -31,7 +31,7 @@ class DrMain; class TDEPRINT_EXPORT KPQtPage : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: KPQtPage(TQWidget *parent = 0, const char *name = 0); KPQtPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp index 4a4aac597..d09997785 100644 --- a/tdeprint/kprintaction.cpp +++ b/tdeprint/kprintaction.cpp @@ -67,8 +67,8 @@ KPrintAction::~KPrintAction() void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); d->type = type; d->parentWidget = parentWidget; diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h index 94549402f..a381ac6dd 100644 --- a/tdeprint/kprintaction.h +++ b/tdeprint/kprintaction.h @@ -26,7 +26,7 @@ class KPrinter; class TDEPRINT_EXPORT KPrintAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: enum PrinterType { All, Regular, Specials }; diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index 9df774510..18e5f8628 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -262,7 +262,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) setCaption(i18n("Print")); // widget creation - TQGroupBox *m_pbox = new TQGroupBox(0,Qt::Vertical,i18n("Printer"), this); + TQGroupBox *m_pbox = new TQGroupBox(0,TQt::Vertical,i18n("Printer"), this); d->m_type = new TQLabel(m_pbox); TQWhatsThis::add(d->m_type, whatsThisPrinterType); d->m_state = new TQLabel(m_pbox); @@ -396,23 +396,23 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) l3->addMultiCellWidget(d->m_cmd,2,2,1,2); // connections - connect(d->m_ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept())); - connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject())); - connect(d->m_properties,TQT_SIGNAL(clicked()),TQT_SLOT(slotProperties())); - connect(d->m_default,TQT_SIGNAL(clicked()),TQT_SLOT(slotSetDefault())); - connect(d->m_printers,TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); - connect(d->m_options,TQT_SIGNAL(clicked()),TQT_SLOT(slotOptions())); - connect(d->m_wizard,TQT_SIGNAL(clicked()),TQT_SLOT(slotWizard())); - connect(d->m_extbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotExtensionClicked())); - connect(d->m_filter, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); - connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp())); - connect(d->m_file, TQT_SIGNAL(urlSelected(const TQString&)), TQT_SLOT(slotOutputFileSelected(const TQString&))); - connect( d->m_file, TQT_SIGNAL( openFileDialog( KURLRequester* ) ), TQT_SLOT( slotOpenFileDialog() ) ); - connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); - - d->b_optionsEnabled = kapp->authorize("print/options") && kapp->authorize("print/selection"); - d->b_propertiesEnabled = kapp->authorize("print/properties") && kapp->authorize("print/selection"); - d->b_systemEnabled = kapp->authorize("print/system") && kapp->authorize("print/selection"); + connect(d->m_ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept())); + connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject())); + connect(d->m_properties,TQ_SIGNAL(clicked()),TQ_SLOT(slotProperties())); + connect(d->m_default,TQ_SIGNAL(clicked()),TQ_SLOT(slotSetDefault())); + connect(d->m_printers,TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int))); + connect(d->m_options,TQ_SIGNAL(clicked()),TQ_SLOT(slotOptions())); + connect(d->m_wizard,TQ_SIGNAL(clicked()),TQ_SLOT(slotWizard())); + connect(d->m_extbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotExtensionClicked())); + connect(d->m_filter, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool))); + connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp())); + connect(d->m_file, TQ_SIGNAL(urlSelected(const TQString&)), TQ_SLOT(slotOutputFileSelected(const TQString&))); + connect( d->m_file, TQ_SIGNAL( openFileDialog( KURLRequester* ) ), TQ_SLOT( slotOpenFileDialog() ) ); + connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); + + d->b_optionsEnabled = tdeApp->authorize("print/options") && tdeApp->authorize("print/selection"); + d->b_propertiesEnabled = tdeApp->authorize("print/properties") && tdeApp->authorize("print/selection"); + d->b_systemEnabled = tdeApp->authorize("print/system") && tdeApp->authorize("print/selection"); if (!d->b_systemEnabled) { @@ -430,7 +430,7 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) d->m_wizard->hide(); } - if (!kapp->authorize("print/selection")) + if (!tdeApp->authorize("print/selection")) { d->m_extbtn->hide(); m_pbox->hide(); @@ -484,12 +484,12 @@ void KPrintDialog::setDialogPages(TQPtrList<KPrintDialogPage> *pages) d->m_pages.append(pages->take(0)); d->m_pages.first()->reparent(d->m_dummy, TQPoint(0,0)); d->m_pages.first()->show(); - delete d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING); + delete d->m_dummy->child("TabWidget", "TQTabWidget"); } else { // more than one page. - TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); + TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); if (!tabs) { // TQTabWidget doesn't exist. Create it and reparent all @@ -554,7 +554,7 @@ void KPrintDialog::initialize(KPrinter *printer) if (plist) { - QString oldP = d->m_printers->currentText(); + TQString oldP = d->m_printers->currentText(); d->m_printers->clear(); TQPtrListIterator<KMPrinter> it(*plist); int defsoft(-1), defhard(-1), defsearch(-1); @@ -822,7 +822,7 @@ void KPrintDialog::slotWizard() void KPrintDialog::reload() { // remove printer dependent pages (usually from plugin) - TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); + TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); for (uint i=0; i<d->m_pages.count(); i++) if (d->m_pages.at(i)->onlyRealPrinters()) { @@ -841,7 +841,7 @@ void KPrintDialog::reload() d->m_dummy->show(); // other initializations setFlags(KMFactory::self()->uiManager()->dialogFlags()); - connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); init(); } @@ -914,7 +914,7 @@ void KPrintDialog::slotToggleFilter(bool on) void KPrintDialog::slotHelp() { - kapp->invokeHelp(TQString::null, "tdeprint"); + tdeApp->invokeHelp(TQString::null, "tdeprint"); } void KPrintDialog::slotOutputFileSelected(const TQString& txt) @@ -951,7 +951,7 @@ void KPrintDialog::enableDialogPage( int index, bool flag ) if ( d->m_pages.count() > 1 ) { - TQTabWidget *tabs = static_cast<TQTabWidget*>(TQT_TQWIDGET(d->m_dummy->child("TabWidget", TQTABWIDGET_OBJECT_NAME_STRING))); + TQTabWidget *tabs = static_cast<TQTabWidget*>(d->m_dummy->child("TabWidget", "TQTabWidget")); tabs->setTabEnabled( d->m_pages.at( index ), flag ); } else @@ -969,8 +969,8 @@ void KPrintDialog::slotOpenFileDialog() KMPrinter *prt = KMFactory::self()->manager()->findPrinter(d->m_printers->currentText()); if (prt) { - QString mimetype(prt->option("kde-special-mimetype")); - QString ext(prt->option("kde-special-extension")); + TQString mimetype(prt->option("kde-special-mimetype")); + TQString ext(prt->option("kde-special-extension")); if (!mimetype.isEmpty()) { diff --git a/tdeprint/kprintdialog.h b/tdeprint/kprintdialog.h index c23e9cdc1..0c14f1407 100644 --- a/tdeprint/kprintdialog.h +++ b/tdeprint/kprintdialog.h @@ -40,7 +40,7 @@ class KPrintDialogPage; */ class TDEPRINT_EXPORT KPrintDialog : public KDialog, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KPrintDialog(TQWidget *parent = 0, const char *name = 0); ~KPrintDialog(); diff --git a/tdeprint/kprintdialogpage.h b/tdeprint/kprintdialogpage.h index 46152ee13..4cddf7f13 100644 --- a/tdeprint/kprintdialogpage.h +++ b/tdeprint/kprintdialogpage.h @@ -89,7 +89,7 @@ class DrMain; */ class TDEPRINT_EXPORT KPrintDialogPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** * Standard constructor. @@ -144,7 +144,7 @@ public: * @returns the page title * @see setTitle() */ - QString title() const { return m_title; } + TQString title() const { return m_title; } /** * Set the page title. This title will be used as tab name for this page in the print * dialog. @@ -183,7 +183,7 @@ protected: KMPrinter *m_printer; DrMain *m_driver; int m_ID; - QString m_title; + TQString m_title; bool m_onlyreal; }; diff --git a/tdeprint/kprinter.cpp b/tdeprint/kprinter.cpp index 010297e5a..c3f74316e 100644 --- a/tdeprint/kprinter.cpp +++ b/tdeprint/kprinter.cpp @@ -34,14 +34,14 @@ #include <tqdir.h> #include <tqguardedptr.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <tdeconfig.h> #include <krun.h> #include <knotifyclient.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klibloader.h> #include <tdemessagebox.h> @@ -101,14 +101,14 @@ public: bool m_restore; bool m_previewonly; WId m_parentId; - QString m_docfilename; + TQString m_docfilename; TQString m_docdirectory; KPrinterWrapper *m_wrapper; TQMap<TQString,TQString> m_options; - QString m_tmpbuffer; - QString m_printername; - QString m_searchname; - QString m_errormsg; + TQString m_tmpbuffer; + TQString m_printername; + TQString m_searchname; + TQString m_errormsg; bool m_ready; int m_pagenumber; DrPageSize *m_pagesize; @@ -218,7 +218,7 @@ void KPrinter::saveSettings() bool KPrinter::setup(TQWidget *parent, const TQString& caption, bool forceExpand) { - if (!kapp->authorize("print/dialog")) + if (!tdeApp->authorize("print/dialog")) { autoConfigure(TQString::null, parent); return true; // Just print it @@ -409,7 +409,7 @@ bool KPrinter::printFiles(const TQStringList& l, bool flag, bool startviewer) args << "-d"; args << printerName(); args << "--noshow"; - kapp->tdeinitExec("kjobviewer", args); + tdeApp->tdeinitExec("kjobviewer", args); } } } @@ -597,12 +597,15 @@ int KPrinter::metric(int m) const return val; } -void KPrinter::setOrientation(Orientation o) +void KPrinter::setOrientation(Orientation o, bool locking) { KMFactory::self()->settings()->orientation = o; setOption("kde-orientation",(o == Landscape ? "Landscape" : "Portrait")); d->m_impl->broadcastOption("kde-orientation",(o == Landscape ? "Landscape" : "Portrait")); - d->m_impl->broadcastOption( "kde-orientation-fixed", "1" ); + if (locking) + { + d->m_impl->broadcastOption( "kde-orientation-fixed", "1" ); + } } void KPrinter::setOption( const TQString& key, const TQString& value, bool broadcast ) @@ -612,11 +615,14 @@ void KPrinter::setOption( const TQString& key, const TQString& value, bool broad d->m_impl->broadcastOption( key, value ); } -void KPrinter::setPageSize(PageSize s) +void KPrinter::setPageSize(PageSize s, bool locking) { KMFactory::self()->settings()->pageSize = s; setOption("kde-pagesize",TQString::number((int)s),true); - d->m_impl->broadcastOption( "kde-pagesize-fixed", "1" ); + if (locking) + { + d->m_impl->broadcastOption( "kde-pagesize-fixed", "1" ); + } } void KPrinter::setOptions(const TQMap<TQString,TQString>& opts) diff --git a/tdeprint/kprinter.h b/tdeprint/kprinter.h index 0ac329604..3b31666a5 100644 --- a/tdeprint/kprinter.h +++ b/tdeprint/kprinter.h @@ -27,7 +27,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdelibs_export.h> #include <tdeprint/kpreloadobject.h> @@ -289,7 +289,7 @@ public: /** * See TQPrinter::setOrientation(). */ - void setOrientation(Orientation); + void setOrientation(Orientation, bool locking = false); /** * See TQPrinter::pageOrder(). */ @@ -326,7 +326,7 @@ public: * * @see pageList() */ - int fromPage() const KDE_DEPRECATED; + int fromPage() const TDE_DEPRECATED; /** * Returns the last page to be printed. * @deprecated Applications @@ -347,7 +347,7 @@ public: /** * See TQPrinter::setPageSize(). */ - void setPageSize(PageSize); + void setPageSize(PageSize, bool locking = false); /** * See TQPrinter::printerName(). */ diff --git a/tdeprint/kprinterimpl.cpp b/tdeprint/kprinterimpl.cpp index edd380009..f833e9464 100644 --- a/tdeprint/kprinterimpl.cpp +++ b/tdeprint/kprinterimpl.cpp @@ -35,12 +35,12 @@ #include <tdelocale.h> #include <dcopclient.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdatastream.h> #include <kdebug.h> #include <kmimemagic.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeconfig.h> #include <stdlib.h> @@ -79,7 +79,7 @@ void KPrinterImpl::preparePrinting(KPrinter *printer) // Find the page size: // 1) print option // 2) default driver option - QString psname = printer->option("PageSize"); + TQString psname = printer->option("PageSize"); if (psname.isEmpty()) { DrListOption *opt = (DrListOption*)driver->findOption("PageSize"); @@ -197,7 +197,7 @@ int KPrinterImpl::dcopPrint(const TQString& cmd, const TQStringList& files, bool kdDebug(500) << "tdeprint: print command: " << cmd << endl; int result = 0; - DCOPClient *dclient = kapp->dcopClient(); + DCOPClient *dclient = tdeApp->dcopClient(); if (!dclient || (!dclient->isAttached() && !dclient->attach())) { return result; @@ -232,7 +232,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) if (printer && !msg.isEmpty()) message.prepend(i18n("Printing document: %1").arg(printer->docName())+"\n"); - DCOPClient *dclient = kapp->dcopClient(); + DCOPClient *dclient = tdeApp->dcopClient(); if (!dclient || (!dclient->isAttached() && !dclient->attach())) { return; @@ -242,7 +242,7 @@ void KPrinterImpl::statusMessage(const TQString& msg, KPrinter *printer) TQDataStream arg( data, IO_WriteOnly ); arg << message; arg << (int)getpid(); - arg << kapp->caption(); + arg << tdeApp->caption(); dclient->send( "kded", "tdeprintd", "statusMessage(TQString,int,TQString)", data ); } diff --git a/tdeprint/kprinterimpl.h b/tdeprint/kprinterimpl.h index 24da07be4..2913a1406 100644 --- a/tdeprint/kprinterimpl.h +++ b/tdeprint/kprinterimpl.h @@ -33,7 +33,7 @@ class KMPrinter; class TDEPRINT_EXPORT KPrinterImpl : public TQObject { - Q_OBJECT + TQ_OBJECT public: KPrinterImpl(TQObject *parent = 0, const char *name = 0); virtual ~KPrinterImpl(); diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp index c120ba843..24479daba 100644 --- a/tdeprint/kprinterpropertydialog.cpp +++ b/tdeprint/kprinterpropertydialog.cpp @@ -40,7 +40,7 @@ KPrinterPropertyDialog::KPrinterPropertyDialog(KMPrinter *p, TQWidget *parent, c // set a margin m_tw = new TQTabWidget(this); m_tw->setMargin(10); - connect(m_tw,TQT_SIGNAL(currentChanged(TQWidget*)),TQT_SLOT(slotCurrentChanged(TQWidget*))); + connect(m_tw,TQ_SIGNAL(currentChanged(TQWidget*)),TQ_SLOT(slotCurrentChanged(TQWidget*))); setMainWidget(m_tw); if (m_printer) diff --git a/tdeprint/kprinterpropertydialog.h b/tdeprint/kprinterpropertydialog.h index e76f38212..62647fd24 100644 --- a/tdeprint/kprinterpropertydialog.h +++ b/tdeprint/kprinterpropertydialog.h @@ -32,7 +32,7 @@ class TQTabWidget; class TDEPRINT_EXPORT KPrinterPropertyDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KPrinterPropertyDialog(KMPrinter *printer, TQWidget *parent = 0, const char *name = 0); ~KPrinterPropertyDialog(); diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index d4de7925d..c9316bad9 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -33,7 +33,7 @@ #include <kuserprofile.h> #include <krun.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <kdebug.h> @@ -45,7 +45,7 @@ KPreviewProc::KPreviewProc() : TDEProcess() { m_bOk = false; - connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); } KPreviewProc::~KPreviewProc() @@ -56,7 +56,7 @@ bool KPreviewProc::startPreview() { if (start()) { - kapp->enter_loop(); + tdeApp->enter_loop(); return m_bOk; } else @@ -65,7 +65,7 @@ bool KPreviewProc::startPreview() void KPreviewProc::slotProcessExited(TDEProcess* proc) { - kapp->exit_loop(); + tdeApp->exit_loop(); if ( proc->normalExit() && proc->exitStatus() == 0 ) m_bOk = true; else @@ -129,7 +129,7 @@ static KLibFactory* componentFactory() static bool continuePrint(const TQString& msg_, TQWidget *parent, bool previewOnly) { - QString msg(msg_); + TQString msg(msg_); if (previewOnly) { KMessageBox::error(parent, msg); @@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) // create main view and actions setMainWidget(d->mainwidget_); if (previewOnly) - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "close_print"); + KStdAction::close(this, TQ_SLOT(reject()), d->actions_, "close_print"); else { - new TDEAction(i18n("Print"), "document-print", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(accept()), d->actions_, "continue_print"); - new TDEAction(i18n("Cancel"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(reject()), d->actions_, "stop_print"); + new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQ_SLOT(accept()), d->actions_, "continue_print"); + new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(reject()), d->actions_, "stop_print"); } } @@ -171,7 +171,7 @@ KPrintPreview::~KPrintPreview() void KPrintPreview::initView(KLibFactory *factory) { // load the component - d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(TQT_TQOBJECT(d->mainwidget_), "gvpart", "KParts::ReadOnlyPart"); + d->gvpart_ = (KParts::ReadOnlyPart*)factory->create(d->mainwidget_, "gvpart", "KParts::ReadOnlyPart"); // populate the toolbar if (d->previewonly_) @@ -248,7 +248,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId conf->setGroup("General"); KLibFactory *factory(0); bool externalPreview = conf->readBoolEntry("ExternalPreview", false); - TQWidget *parentW = TQT_TQWIDGET(TQWidget::find(parentId)); + TQWidget *parentW = TQWidget::find(parentId); TQString exe; if (!externalPreview && isPS && (factory = componentFactory()) != 0) { @@ -275,7 +275,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId exe = conf->readPathEntry("PreviewCommand", "gv"); if (TDEStandardDirs::findExe(exe).isEmpty()) { - QString msg = i18n("The preview program %1 cannot be found. " + TQString msg = i18n("The preview program %1 cannot be found. " "Check that the program is correctly installed and " "located in a directory included in your PATH " "environment variable.").arg(exe); @@ -314,7 +314,7 @@ bool KPrintPreview::preview(const TQString& file, bool previewOnly, WId parentId // start the preview process if (!proc.startPreview()) { - QString msg = i18n("Preview failed: unable to start program %1.").arg(exe); + TQString msg = i18n("Preview failed: unable to start program %1.").arg(exe); return continuePrint(msg, parentW, previewOnly); } else if (!previewOnly) diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h index ae99fb405..4aeaff446 100644 --- a/tdeprint/kprintpreview.h +++ b/tdeprint/kprintpreview.h @@ -23,13 +23,13 @@ #include <kdialogbase.h> #include <tqstring.h> -#include <kprocess.h> +#include <tdeprocess.h> class KLibFactory; class KPrintPreview : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KPrintPreview(TQWidget *parent = 0, bool previewOnly = false); ~KPrintPreview(); @@ -49,7 +49,7 @@ private: class KPreviewProc : public TDEProcess { - Q_OBJECT + TQ_OBJECT public: KPreviewProc(); virtual ~KPreviewProc(); diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index 2b0c0f6f6..13ed3f7ca 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -26,9 +26,9 @@ KPrintProcess::KPrintProcess() : KShellProcess() { // redirect everything to a single buffer - connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) ); + connect(this,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(this,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect( this, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotExited( TDEProcess* ) ) ); m_state = None; } diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h index 5ceb3835e..e5b42e82e 100644 --- a/tdeprint/kprintprocess.h +++ b/tdeprint/kprintprocess.h @@ -20,12 +20,12 @@ #ifndef KPRINTPROCESS_H #define KPRINTPROCESS_H -#include <kprocess.h> +#include <tdeprocess.h> #include <tqstringlist.h> class KPrintProcess : public KShellProcess { - Q_OBJECT + TQ_OBJECT public: KPrintProcess(); ~KPrintProcess(); @@ -54,7 +54,7 @@ protected slots: void slotExited( TDEProcess* ); private: - QString m_buffer; + TQString m_buffer; TQStringList m_tempfiles; TQString m_output, m_tempoutput, m_command; int m_state; diff --git a/tdeprint/kxmlcommand.cpp b/tdeprint/kxmlcommand.cpp index 2d5712674..8dd15f9bd 100644 --- a/tdeprint/kxmlcommand.cpp +++ b/tdeprint/kxmlcommand.cpp @@ -29,12 +29,12 @@ #include <tqinputdialog.h> #include <tqmap.h> #include <tqvaluelist.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <kdialogbase.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klibloader.h> #include <tdemessagebox.h> @@ -218,7 +218,7 @@ void KXmlCommand::check(bool use_xml) void KXmlCommand::loadDesktop() { - KSimpleConfig conf(locate("data", "tdeprint/filters/"+name()+".desktop")); + TDESimpleConfig conf(locate("data", "tdeprint/filters/"+name()+".desktop")); conf.setGroup("TDE Print Filter Entry"); d->m_description = conf.readEntry("Comment"); d->m_outputMime = conf.readEntry("MimeTypeOut"); @@ -229,7 +229,7 @@ void KXmlCommand::loadDesktop() void KXmlCommand::saveDesktop() { - KSimpleConfig conf(locateLocal("data", "tdeprint/filters/"+name()+".desktop")); + TDESimpleConfig conf(locateLocal("data", "tdeprint/filters/"+name()+".desktop")); conf.setGroup("TDE Print Filter Entry"); conf.writeEntry("Comment", d->m_description); conf.writeEntry("MimeTypeIn", d->m_inputMime); diff --git a/tdeprint/lpd/gschecker.cpp b/tdeprint/lpd/gschecker.cpp index 99044918b..2ea194453 100644 --- a/tdeprint/lpd/gschecker.cpp +++ b/tdeprint/lpd/gschecker.cpp @@ -41,7 +41,7 @@ void GsChecker::loadDriverList() if (proc.open("gs -h",IO_ReadOnly)) { QTextStream t(&proc); - QString buffer, line; + TQString buffer, line; bool ok(false); while (!t.eof()) { diff --git a/tdeprint/lpd/klpdprinterimpl.cpp b/tdeprint/lpd/klpdprinterimpl.cpp index 3647f0b38..5caecda55 100644 --- a/tdeprint/lpd/klpdprinterimpl.cpp +++ b/tdeprint/lpd/klpdprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> KLpdPrinterImpl::KLpdPrinterImpl(TQObject *parent, const char *name) @@ -40,7 +40,7 @@ TQString KLpdPrinterImpl::executable() bool KLpdPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) { - QString exestr = executable(); + TQString exestr = executable(); if (exestr.isEmpty()) { printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("lpr")); diff --git a/tdeprint/lpd/kmlpdfactory.h b/tdeprint/lpd/kmlpdfactory.h index ffc05af71..8748e1e19 100644 --- a/tdeprint/lpd/kmlpdfactory.h +++ b/tdeprint/lpd/kmlpdfactory.h @@ -29,7 +29,7 @@ public: virtual ~KLpdFactory(); protected: - TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList()); + TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char *className = "TQObject", const TQStringList& args = TQStringList()); }; #endif diff --git a/tdeprint/lpd/kmlpdmanager.cpp b/tdeprint/lpd/kmlpdmanager.cpp index e72733f89..affe4051d 100644 --- a/tdeprint/lpd/kmlpdmanager.cpp +++ b/tdeprint/lpd/kmlpdmanager.cpp @@ -33,9 +33,9 @@ #include <tqregexp.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <pwd.h> #include <unistd.h> @@ -44,7 +44,7 @@ // only there to allow testing on my system. Should be removed // when everything has proven to be working and stable -QString lpdprefix = ""; +TQString lpdprefix = ""; TQString ptPrinterType(KMPrinter*); //************************************************************************************************ @@ -83,7 +83,7 @@ bool KMLpdManager::completePrinterShort(KMPrinter *printer) PrintcapEntry *entry = m_entries.find(printer->name()); if (entry) { - QString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp")); + TQString type(entry->comment(2)), driver(entry->comment(7)), lp(entry->arg("lp")); printer->setDescription(i18n("Local printer queue (%1)").arg(type.isEmpty() ? i18n("Unknown type of local printer queue", "Unknown") : type)); printer->setLocation(i18n("<Not available>")); printer->setDriverInfo(driver.isEmpty() ? i18n("Unknown Driver", "Unknown") : driver); @@ -221,7 +221,7 @@ bool KMLpdManager::removePrinter(KMPrinter *printer) bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state) { KPipeProcess proc; - QString cmd = programName(0); + TQString cmd = programName(0); cmd += " "; cmd += state ? "up" : "down"; cmd += " "; @@ -229,7 +229,7 @@ bool KMLpdManager::enablePrinter(KMPrinter *printer, bool state) if (proc.open(cmd)) { QTextStream t(&proc); - QString buffer; + TQString buffer; while (!t.eof()) buffer.append(t.readLine()); if (buffer.startsWith("?Privilege")) @@ -287,11 +287,11 @@ TQString KMLpdManager::programName(int f) void KMLpdManager::checkStatus() { KPipeProcess proc; - QString cmd = programName(0) + " status all"; + TQString cmd = programName(0) + " status all"; if (proc.open(cmd)) { QTextStream t(&proc); - QString line; + TQString line; KMPrinter *printer(0); int p(-1); while (!t.eof()) @@ -326,7 +326,7 @@ void KMLpdManager::loadPrintcapFile(const TQString& filename) if (f.exists() && f.open(IO_ReadOnly)) { QTextStream t(&f); - QString line, comment; + TQString line, comment; PrintcapEntry *entry; while (!t.eof()) { @@ -391,7 +391,7 @@ void KMLpdManager::loadPrinttoolDb(const TQString& filename) DrMain* KMLpdManager::loadDbDriver(KMDBEntry *entry) { - QString ptdbfilename = driverDirectory() + "/printerdb"; + TQString ptdbfilename = driverDirectory() + "/printerdb"; if (entry->file == ptdbfilename) { PrinttoolEntry *ptentry = findPrinttoolEntry(entry->modelname); @@ -419,7 +419,7 @@ DrMain* KMLpdManager::loadPrinterDriver(KMPrinter *printer, bool config) return NULL; // check for printtool driver (only for configuration) - QString sd = entry->arg("sd"), dr(entry->comment(7)); + TQString sd = entry->arg("sd"), dr(entry->comment(7)); if (TQFile::exists(sd+"/postscript.cfg") && config && !dr.isEmpty()) { TQMap<TQString,TQString> map = loadPrinttoolCfgFile(sd+"/postscript.cfg"); @@ -462,7 +462,7 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file if (f.exists() && f.open(IO_ReadOnly)) { QTextStream t(&f); - QString line, name, val; + TQString line, name, val; int p(-1); while (!t.eof()) { @@ -488,14 +488,14 @@ TQMap<TQString,TQString> KMLpdManager::loadPrinttoolCfgFile(const TQString& file bool KMLpdManager::savePrinttoolCfgFile(const TQString& templatefile, const TQString& dirname, const TQMap<TQString,TQString>& options) { // defines input and output file - QString fname = TQFileInfo(templatefile).fileName(); + TQString fname = TQFileInfo(templatefile).fileName(); fname.replace(TQRegExp("\\.in$"),TQString::fromLatin1("")); QFile fin(templatefile); QFile fout(dirname + "/" + fname); if (fin.exists() && fin.open(IO_ReadOnly) && fout.open(IO_WriteOnly)) { QTextStream tin(&fin), tout(&fout); - QString line, name; + TQString line, name; int p(-1); while (!tin.eof()) { @@ -525,7 +525,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) { // To be able to save a printer driver, a printcap entry MUST exist. // We can then retrieve the spool directory from it. - QString spooldir; + TQString spooldir; PrintcapEntry *ent = findPrintcapEntry(printer->printerName()); if (!ent) return false; @@ -541,7 +541,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) options["PS_SEND_EOF"] = "NO"; if (!checkGsDriver(options["GSDEVICE"])) return false; - QString resol(options["RESOLUTION"]), color(options["COLOR"]); + TQString resol(options["RESOLUTION"]), color(options["COLOR"]); // update entry comment to make printtool happy and save printcap file ent->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1 %2 %3 %4 {} {%5} %6 {}").arg(options["PRINTER_TYPE"]).arg(options["GSDEVICE"]).arg((resol.isEmpty() ? TQString::fromLatin1("NAxNA") : resol)).arg(options["PAPERSIZE"]).arg(driver->name()).arg((color.isEmpty() ? TQString::fromLatin1("Default") : color.right(color.length()-15))); ent->m_args["if"] = spooldir+TQString::fromLatin1("/filter"); @@ -565,7 +565,7 @@ bool KMLpdManager::savePrinterDriver(KMPrinter *printer, DrMain *driver) bool KMLpdManager::createPrinttoolEntry(KMPrinter *printer, PrintcapEntry *entry) { KURL dev(printer->device()); - QString prot = dev.protocol(), sd(entry->arg("sd")); + TQString prot = dev.protocol(), sd(entry->arg("sd")); entry->m_comment = TQString::fromLatin1("##PRINTTOOL3## %1").arg(ptPrinterType(printer)); if (prot == "smb" || prot == "ncp" || prot == "socket") { @@ -619,7 +619,7 @@ bool KMLpdManager::createSpooldir(PrintcapEntry *entry) // first check if it has a "sd" defined if (entry->arg("sd").isEmpty()) entry->m_args["sd"] = TQString::fromLatin1("/var/spool/lpd/")+entry->m_name; - QString sd = entry->arg("sd"); + TQString sd = entry->arg("sd"); if (!TDEStandardDirs::exists(sd)) { if (!TDEStandardDirs::makeDir(sd,0750)) @@ -641,7 +641,7 @@ bool KMLpdManager::validateDbDriver(KMDBEntry *entry) TQString ptPrinterType(KMPrinter *p) { - QString type, prot = p->device().protocol(); + TQString type, prot = p->device().protocol(); if (prot == "lpd") type = "REMOTE"; else if (prot == "smb") type = "SMB"; else if (prot == "ncp") type = "NCP"; diff --git a/tdeprint/lpd/lpdtools.cpp b/tdeprint/lpd/lpdtools.cpp index 54f19c405..4d45a9760 100644 --- a/tdeprint/lpd/lpdtools.cpp +++ b/tdeprint/lpd/lpdtools.cpp @@ -88,8 +88,8 @@ bool PrintcapEntry::readLine(const TQString& line) { int p = l[i].find('='); if (p == -1) p = 2; - QString key = l[i].left(p); - QString value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p)); + TQString key = l[i].left(p); + TQString value = l[i].right(l[i].length()-(l[i][p] == '=' ? p+1 : p)); m_args[key] = value; } return true; @@ -114,7 +114,7 @@ void PrintcapEntry::writeEntry(TQTextStream& t) TQString PrintcapEntry::comment(int index) { - QString w; + TQString w; if (m_comment.startsWith("##PRINTTOOL3##")) { int p(0); @@ -166,7 +166,7 @@ TQStringList splitPrinttoolLine(const TQString& line) bool PrinttoolEntry::readEntry(TQTextStream& t) { - QString line; + TQString line; QStringList args; m_resolutions.setAutoDelete(true); @@ -264,7 +264,7 @@ DrMain* PrinttoolEntry::createDriver() ch->set("text",TQString::fromLatin1("%2x%3 DPI (%1)").arg(it.current()->comment).arg(it.current()->xdpi).arg(it.current()->ydpi)); lopt->addChoice(ch); } - QString defval = lopt->choices()->first()->name(); + TQString defval = lopt->choices()->first()->name(); lopt->set("default",defval); lopt->setValueText(defval); } @@ -290,7 +290,7 @@ DrMain* PrinttoolEntry::createDriver() ch->set("text",TQString::fromLatin1("%1 - %2").arg(it.current()->bpp).arg(it.current()->comment)); lopt->addChoice(ch); } - QString defval = lopt->choices()->first()->name(); + TQString defval = lopt->choices()->first()->name(); lopt->set("default",defval); lopt->setValueText(defval); } @@ -394,7 +394,7 @@ DrMain* PrinttoolEntry::createDriver() TQString getPrintcapLine(TQTextStream& t, TQString *lastcomment) { - QString line, buffer, comm; + TQString line, buffer, comm; while (!t.eof()) { buffer = t.readLine().stripWhiteSpace(); diff --git a/tdeprint/lpd/lpdtools.h b/tdeprint/lpd/lpdtools.h index 692dd0fa2..ef28ff089 100644 --- a/tdeprint/lpd/lpdtools.h +++ b/tdeprint/lpd/lpdtools.h @@ -38,8 +38,8 @@ public: TQString arg(const TQString& key) const { return m_args[key]; } TQString comment(int i); private: - QString m_name; - QString m_comment; + TQString m_name; + TQString m_comment; TQMap<TQString,TQString> m_args; }; @@ -48,13 +48,13 @@ private: struct Resolution { int xdpi, ydpi; - QString comment; + TQString comment; }; struct BitsPerPixel { - QString bpp; - QString comment; + TQString bpp; + TQString comment; }; class PrinttoolEntry @@ -64,7 +64,7 @@ public: bool readEntry(TQTextStream& t); DrMain* createDriver(); private: - QString m_name, m_gsdriver, m_description, m_about; + TQString m_name, m_gsdriver, m_description, m_about; TQPtrList<Resolution> m_resolutions; TQPtrList<BitsPerPixel> m_depths; }; diff --git a/tdeprint/lpdunix/klpdunixprinterimpl.cpp b/tdeprint/lpdunix/klpdunixprinterimpl.cpp index e628a1c41..e636f94cf 100644 --- a/tdeprint/lpdunix/klpdunixprinterimpl.cpp +++ b/tdeprint/lpdunix/klpdunixprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kmacroexpander.h> @@ -47,7 +47,7 @@ void KLpdUnixPrinterImpl::initLprPrint(TQString& cmd, KPrinter *printer) // look for executable, starting with "lpr" TQString KLpdUnixPrinterImpl::executable() { - QString exe = TDEStandardDirs::findExe("lpr"); + TQString exe = TDEStandardDirs::findExe("lpr"); if (exe.isEmpty()) exe = TDEStandardDirs::findExe("lp"); return exe; diff --git a/tdeprint/lpdunix/kmlpdunixmanager.cpp b/tdeprint/lpdunix/kmlpdunixmanager.cpp index 7a291f6df..6d7e5e9ab 100644 --- a/tdeprint/lpdunix/kmlpdunixmanager.cpp +++ b/tdeprint/lpdunix/kmlpdunixmanager.cpp @@ -27,7 +27,7 @@ #include <tqtextstream.h> #include <tqregexp.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <stdlib.h> @@ -186,7 +186,7 @@ void KMLpdUnixManager::parseEtcPrintcap() TQFile f(getPrintcapFileName()); if (f.exists() && f.open(IO_ReadOnly)) { - KTextBuffer t(TQT_TQIODEVICE(&f)); + KTextBuffer t(&f); TQMap<TQString,TQString> entry; while (!t.eof()) @@ -247,7 +247,7 @@ void KMLpdUnixManager::parseEtcPrintersConf() TQFile f(getEtcPrintersConfName()); if (f.exists() && f.open(IO_ReadOnly)) { - KTextBuffer t(TQT_TQIODEVICE(&f)); + KTextBuffer t(&f); TQMap<TQString,TQString> entry; TQString default_printer; @@ -297,7 +297,7 @@ void KMLpdUnixManager::parseEtcLpPrinters() TQFile f(it.current()->absFilePath() + "/configuration"); if (f.exists() && f.open(IO_ReadOnly)) { - KTextBuffer t(TQT_TQIODEVICE(&f)); + KTextBuffer t(&f); TQString line, remote; while (!t.eof()) { @@ -358,7 +358,7 @@ void KMLpdUnixManager::parseSpoolInterface() TQFile f(it.current()->absFilePath()); if (f.exists() && f.open(IO_ReadOnly)) { - KTextBuffer t(TQT_TQIODEVICE(&f)); + KTextBuffer t(&f); TQString line, remote; while (!t.eof()) diff --git a/tdeprint/lpr/CMakeLists.txt b/tdeprint/lpr/CMakeLists.txt index dfd932150..a6f9efafc 100644 --- a/tdeprint/lpr/CMakeLists.txt +++ b/tdeprint/lpr/CMakeLists.txt @@ -80,6 +80,6 @@ set( ${target}_SRCS tde_add_executable( ${target} SOURCES ${${target}_SRCS} - LINK driverparse-static tdefakes-shared ${DL_LIBRARIES} + LINK driverparse-static tdefakes-shared ${CMAKE_DL_LIBS} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdeprint/lpr/apshandler.cpp b/tdeprint/lpr/apshandler.cpp index acb0e0c2d..dd4c3a72e 100644 --- a/tdeprint/lpr/apshandler.cpp +++ b/tdeprint/lpr/apshandler.cpp @@ -30,7 +30,7 @@ #include <tqdir.h> #include <tqtextstream.h> #include <tqvaluestack.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp index bf61919c3..e70e85907 100644 --- a/tdeprint/lpr/editentrydialog.cpp +++ b/tdeprint/lpr/editentrydialog.cpp @@ -86,12 +86,12 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c slotTypeChanged(0); m_block = false; - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(m_string, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_boolean, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_number, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_string, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_boolean, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_number, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); + connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); resize(500,400); } diff --git a/tdeprint/lpr/editentrydialog.h b/tdeprint/lpr/editentrydialog.h index f4359dd89..888f87eed 100644 --- a/tdeprint/lpr/editentrydialog.h +++ b/tdeprint/lpr/editentrydialog.h @@ -33,7 +33,7 @@ class TQWidgetStack; class EditEntryDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: EditEntryDialog(PrintcapEntry *entry, TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/lpr/klprprinterimpl.cpp b/tdeprint/lpr/klprprinterimpl.cpp index 4dbe5e378..3de216f22 100644 --- a/tdeprint/lpr/klprprinterimpl.cpp +++ b/tdeprint/lpr/klprprinterimpl.cpp @@ -21,7 +21,7 @@ #include "kprinter.h" #include "kmlprmanager.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <stdlib.h> @@ -42,7 +42,7 @@ bool KLprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) return false; cmd = TQString::fromLatin1("%1 -P %1 '-#%1'").arg(m_exepath).arg(quote(printer->printerName())).arg( printer->numCopies() ); - QString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer); + TQString opts = static_cast<KMLprManager*>(KMManager::self())->printOptions(printer); if (!opts.isEmpty()) cmd += (" " + opts); return true; @@ -53,7 +53,7 @@ void KLprPrinterImpl::broadcastOption(const TQString& key, const TQString& value KPrinterImpl::broadcastOption(key,value); if (key == "kde-pagesize") { - QString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); + TQString pagename = TQString::fromLatin1(pageSizeToPageName((KPrinter::PageSize)value.toInt())); KPrinterImpl::broadcastOption("PageSize",pagename); } } diff --git a/tdeprint/lpr/klprprinterimpl.h b/tdeprint/lpr/klprprinterimpl.h index 508173f1d..3d3e9a080 100644 --- a/tdeprint/lpr/klprprinterimpl.h +++ b/tdeprint/lpr/klprprinterimpl.h @@ -32,7 +32,7 @@ public: void broadcastOption(const TQString& key, const TQString& value); private: - QString m_exepath; + TQString m_exepath; }; #endif diff --git a/tdeprint/lpr/kmconfiglpr.cpp b/tdeprint/lpr/kmconfiglpr.cpp index fed1dd17d..ffd8db77a 100644 --- a/tdeprint/lpr/kmconfiglpr.cpp +++ b/tdeprint/lpr/kmconfiglpr.cpp @@ -34,7 +34,7 @@ KMConfigLpr::KMConfigLpr(TQWidget *parent, const char *name) setPageHeader(i18n("Spooler Settings")); setPagePixmap("gear"); - TQGroupBox *m_modebox = new TQGroupBox(1, Qt::Vertical, i18n("Spooler"), this); + TQGroupBox *m_modebox = new TQGroupBox(1, TQt::Vertical, i18n("Spooler"), this); m_mode = new TQComboBox(m_modebox); m_mode->insertItem("LPR (BSD compatible)"); diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 046f082f7..da6a571e3 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -31,10 +31,10 @@ #include <tqfileinfo.h> #include <tqptrlist.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kprinter.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeaction.h> #include <tdemessagebox.h> #include <klibloader.h> @@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt) void KMLprManager::createPluginActions(TDEActionCollection *coll) { - TDEAction *act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); + TDEAction *act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQ_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); act->setGroup("plugin"); } diff --git a/tdeprint/lpr/kmlprmanager.h b/tdeprint/lpr/kmlprmanager.h index d26af4d77..c4be757b1 100644 --- a/tdeprint/lpr/kmlprmanager.h +++ b/tdeprint/lpr/kmlprmanager.h @@ -34,7 +34,7 @@ class KPrinter; class KMLprManager : public KMManager { - Q_OBJECT + TQ_OBJECT public: KMLprManager(TQObject *parent, const char *name, const TQStringList & /*args*/); diff --git a/tdeprint/lpr/lpchelper.cpp b/tdeprint/lpr/lpchelper.cpp index b366537e5..64e78397a 100644 --- a/tdeprint/lpr/lpchelper.cpp +++ b/tdeprint/lpr/lpchelper.cpp @@ -22,12 +22,12 @@ #include "kmjob.h" #include "lprsettings.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtextstream.h> #include <tqregexp.h> #include <kdebug.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <stdlib.h> static TQString execute(const TQString& cmd) diff --git a/tdeprint/lpr/lpqhelper.cpp b/tdeprint/lpr/lpqhelper.cpp index 1c02cafc7..aca879833 100644 --- a/tdeprint/lpr/lpqhelper.cpp +++ b/tdeprint/lpr/lpqhelper.cpp @@ -22,8 +22,8 @@ #include "kpipeprocess.h" #include "lprsettings.h" -#include <kstandarddirs.h> -#include <kprocess.h> +#include <tdestandarddirs.h> +#include <tdeprocess.h> #include <kdebug.h> LpqHelper::LpqHelper(TQObject *parent, const char *name) diff --git a/tdeprint/lpr/lprngtoolhandler.cpp b/tdeprint/lpr/lprngtoolhandler.cpp index 960f5adb8..5732b6808 100644 --- a/tdeprint/lpr/lprngtoolhandler.cpp +++ b/tdeprint/lpr/lprngtoolhandler.cpp @@ -30,7 +30,7 @@ #include <tqtextstream.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> LPRngToolHandler::LPRngToolHandler(KMManager *mgr) : LprHandler("lprngtool", mgr) diff --git a/tdeprint/lpr/lprsettings.h b/tdeprint/lpr/lprsettings.h index 590eafdff..2545993fc 100644 --- a/tdeprint/lpr/lprsettings.h +++ b/tdeprint/lpr/lprsettings.h @@ -58,9 +58,9 @@ protected: private: static LprSettings* m_self; Mode m_mode; - QString m_printcapfile; + TQString m_printcapfile; bool m_local; - QString m_spooldir; + TQString m_spooldir; TQString m_defaultremotehost; }; diff --git a/tdeprint/lpr/matichandler.cpp b/tdeprint/lpr/matichandler.cpp index 07fee1260..74c3c62c6 100644 --- a/tdeprint/lpr/matichandler.cpp +++ b/tdeprint/lpr/matichandler.cpp @@ -30,10 +30,10 @@ #include "foomatic2loader.h" #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqfile.h> #include <tqtextstream.h> #include <tqregexp.h> @@ -224,7 +224,7 @@ DrMain* MaticHandler::loadDriver(KMPrinter*, PrintcapEntry *entry, bool) // is not self-contained. If the printer is removed (when // changing printer name), the template would be also removed TQString origfilename = maticFile(entry); - TQString filename = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); + TQString filename = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8)); ::system(TQFile::encodeName("cp " + TDEProcess::quote(origfilename) + " " + TDEProcess::quote(filename))); DrMain *driver = Foomatic2Loader::loadDriver(filename); if (driver) @@ -246,7 +246,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) return NULL; } - TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8)); + TQString tmpFile = locateLocal("tmp", "foomatic_" + tdeApp->randomString(8)); TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin"); TQString exe = TDEStandardDirs::findExe("foomatic-datafile", PATH); if (exe.isEmpty()) @@ -291,7 +291,7 @@ DrMain* MaticHandler::loadDbDriver(const TQString& path) bool MaticHandler::savePrinterDriver(KMPrinter *prt, PrintcapEntry *entry, DrMain *driver, bool*) { - TQFile tmpFile(locateLocal("tmp", "foomatic_" + kapp->randomString(8))); + TQFile tmpFile(locateLocal("tmp", "foomatic_" + tdeApp->randomString(8))); TQFile inFile(driver->get("template")); TQString outFile = maticFile(entry); bool result(false); diff --git a/tdeprint/lpr/printcapreader.cpp b/tdeprint/lpr/printcapreader.cpp index 718ffca21..8a1e1ee9a 100644 --- a/tdeprint/lpr/printcapreader.cpp +++ b/tdeprint/lpr/printcapreader.cpp @@ -27,7 +27,7 @@ void PrintcapReader::setPrintcapFile(TQFile *f) { if (f->isOpen()) { - m_stream.setDevice(TQT_TQIODEVICE(f)); + m_stream.setDevice(f); m_buffer = TQString::null; } } diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp index 5bddffe02..58a051370 100644 --- a/tdeprint/management/cjanuswidget.cpp +++ b/tdeprint/management/cjanuswidget.cpp @@ -74,7 +74,7 @@ void CJanusWidget::CListBoxItem::paint(TQPainter *p) int w1 = (listBox()->contentsWidth()-m_pix.width())/2; p->drawPixmap(w1,5,m_pix); - p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),Qt::AlignHCenter,text()); + p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),TQt::AlignHCenter,text()); } //*********************************************************************************** @@ -143,7 +143,7 @@ CJanusWidget::CJanusWidget(TQWidget *parent, const char *name) f = m_iconlist->font(); f.setBold(true); m_iconlist->setFont(f); - connect(m_iconlist,TQT_SIGNAL(selectionChanged(TQListBoxItem*)),TQT_SLOT(slotSelected(TQListBoxItem*))); + connect(m_iconlist,TQ_SIGNAL(selectionChanged(TQListBoxItem*)),TQ_SLOT(slotSelected(TQListBoxItem*))); m_empty = new TQWidget(this, "Empty"); m_stack->addWidget(m_empty,0); diff --git a/tdeprint/management/cjanuswidget.h b/tdeprint/management/cjanuswidget.h index d33be1499..5b178c824 100644 --- a/tdeprint/management/cjanuswidget.h +++ b/tdeprint/management/cjanuswidget.h @@ -30,7 +30,7 @@ class TQListBoxItem; class CJanusWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CJanusWidget(TQWidget *parent, const char *name); ~CJanusWidget(); diff --git a/tdeprint/management/jobitem.h b/tdeprint/management/jobitem.h index 580a1b84f..66beeb7d2 100644 --- a/tdeprint/management/jobitem.h +++ b/tdeprint/management/jobitem.h @@ -40,7 +40,7 @@ public: private: KMJob *m_job; int m_ID; - QString m_uri; + TQString m_uri; }; inline int JobItem::jobID() const diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index 466c75853..923890c0e 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -12,7 +12,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDECmdLineArgs::init(argc, argv, "kaddprinterwizard", I18N_NOOP("Start the add printer wizard"), diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp index 984d2c128..132ca990c 100644 --- a/tdeprint/management/kiconselectaction.cpp +++ b/tdeprint/management/kiconselectaction.cpp @@ -76,7 +76,7 @@ void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList& int TDEIconSelectAction::plug(TQWidget* widget, int index) { int value(-1); - if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) + if (widget->inherits("TQPopupMenu")) { createPopupMenu(); value = TDESelectAction::plug(widget, index); @@ -94,7 +94,7 @@ int TDEIconSelectAction::plug(TQWidget* widget, int index) bar->getButton(id)->setPopup(d->m_menu, true); bar->setItemEnabled(id, isEnabled()); addContainer(bar, id); - connect(bar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotDestroyed())); + connect(bar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotDestroyed())); value = containerCount()-1; } diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h index 26e703fbf..7403d311a 100644 --- a/tdeprint/management/kiconselectaction.h +++ b/tdeprint/management/kiconselectaction.h @@ -26,7 +26,7 @@ class TDEIconSelectActionPrivate; class TDEIconSelectAction : public TDESelectAction { - Q_OBJECT + TQ_OBJECT public: TDEIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0); virtual ~TDEIconSelectAction(); diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp index 971f8cce5..3c82c8663 100644 --- a/tdeprint/management/kmconfigcommand.cpp +++ b/tdeprint/management/kmconfigcommand.cpp @@ -34,7 +34,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) setPageHeader(i18n("Command Settings")); setPagePixmap("application-x-executable"); - TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this); + TQGroupBox *gb = new TQGroupBox(0, TQt::Horizontal, i18n("Edit/Create Commands"), this); TQLabel *lab = new TQLabel(i18n( "<p>Command objects perform a conversion from input to output.<br>" "They are used as the basis to build both print filters " @@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(gb); l0->addStretch(1); - TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()), KDialog::spacingHint()); + TQVBoxLayout *l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint()); l2->addWidget(lab); l2->addWidget(sel); } diff --git a/tdeprint/management/kmconfigdialog.h b/tdeprint/management/kmconfigdialog.h index 6a47995cc..30dd2b2ef 100644 --- a/tdeprint/management/kmconfigdialog.h +++ b/tdeprint/management/kmconfigdialog.h @@ -27,7 +27,7 @@ class TDEPRINT_EXPORT KMConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMConfigDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index b7be0a1e6..18354839d 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -41,7 +41,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) setPageHeader(i18n("Printer Filtering Settings")); setPagePixmap("filter"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Printer Filter"), this); m_list1 = new TDEListBox(box); m_list1->setSelectionMode(TDEListBox::Extended); @@ -63,10 +63,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(lab); TQGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint()); - l1->addLayout(TQT_TQLAYOUT(l2)); + l1->addLayout(l2); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); l2->setColStretch(0, 1); @@ -80,10 +80,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) l3->addWidget(lab1, 0); l3->addWidget(m_locationre, 1); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); - connect(m_list1, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(m_list2, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked())); + connect(m_list1, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(m_list2, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); m_add->setEnabled(false); m_remove->setEnabled(false); } diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h index 8338ebd6f..1e0f6e2c9 100644 --- a/tdeprint/management/kmconfigfilter.h +++ b/tdeprint/management/kmconfigfilter.h @@ -28,7 +28,7 @@ class TQLineEdit; class KMConfigFilter : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigFilter(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index 4d9854774..7107bc74d 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -43,8 +43,8 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) setPageHeader(i18n("Font Settings")); setPagePixmap("fonts"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this); - TQGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Embedding"), this); + TQGroupBox *box2 = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Path"), this); m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box); m_fontpath = new TDEListView(box2); @@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); lab0->setBuddy(m_addpath); - TQVBoxLayout *l0 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l0->addWidget(m_embedfonts); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box2->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint()); l1->addWidget(m_fontpath); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); l1->addLayout(l2); @@ -91,12 +91,12 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) "font path is used, so adding those directories is not needed. The default " "search path should be sufficient in most cases.")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); - connect(m_fontpath, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelected())); - connect(m_addpath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown())); + connect(m_fontpath, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelected())); + connect(m_addpath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged(const TQString&))); m_add->setEnabled(false); m_remove->setEnabled(false); m_up->setEnabled(false); diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h index 8bd285f38..9ac9a43f5 100644 --- a/tdeprint/management/kmconfigfonts.h +++ b/tdeprint/management/kmconfigfonts.h @@ -29,7 +29,7 @@ class TQCheckBox; class KMConfigFonts : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigFonts(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index edf8902bf..1b21dbca6 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -45,7 +45,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) setPageHeader(i18n("General Settings")); setPagePixmap("document-print"); - TQGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); + TQGroupBox *m_timerbox = new TQGroupBox(0, TQt::Vertical, i18n("Refresh Interval"), this); m_timer = new KIntNumInput(m_timerbox,"Timer"); m_timer->setRange(0,30); m_timer->setSuffix( i18n( " sec" ) ); @@ -54,19 +54,19 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) "<b>TDE Print</b> components like the print manager " "and the job viewer.")); - TQGroupBox *m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this); + TQGroupBox *m_testpagebox = new TQGroupBox(0, TQt::Vertical, i18n("Test Page"), this); m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck"); m_testpage = new KURLRequester(m_testpagebox,"TestPage"); m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox); - connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool))); - connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool))); - connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview())); - connect(m_testpage->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(testPageChanged(const TQString & ))); + connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),m_testpage,TQ_SLOT(setEnabled(bool))); + connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabledPreviewButton(bool))); + connect(m_preview,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestPagePreview())); + connect(m_testpage->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(testPageChanged(const TQString & ))); m_testpage->setDisabled(true); m_preview->setDisabled(true); m_defaulttestpage->setCursor(KCursor::handCursor()); - TQGroupBox *m_statusbox = new TQGroupBox(0, Qt::Vertical, i18n("Miscellaneous"), this); + TQGroupBox *m_statusbox = new TQGroupBox(0, TQt::Vertical, i18n("Miscellaneous"), this); m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox); m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox); @@ -76,10 +76,10 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) lay0->addWidget(m_testpagebox); lay0->addWidget(m_statusbox); lay0->addStretch(1); - TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_timerbox->layout()), + TQVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->layout(), KDialog::spacingHint()); lay1->addWidget(m_timer); - TQVBoxLayout *lay2 = new TQVBoxLayout(TQT_TQLAYOUT(m_testpagebox->layout()), + TQVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->layout(), KDialog::spacingHint()); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0); lay2->addWidget(m_defaulttestpage); @@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) lay2->addLayout(lay3); lay3->addStretch(1); lay3->addWidget(m_preview); - TQVBoxLayout *lay4 = new TQVBoxLayout(TQT_TQLAYOUT(m_statusbox->layout()), + TQVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->layout(), KDialog::spacingHint()); lay4->addWidget(m_statusmsg); lay4->addWidget(m_uselast); diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h index b82a91daa..190b4f38a 100644 --- a/tdeprint/management/kmconfiggeneral.h +++ b/tdeprint/management/kmconfiggeneral.h @@ -28,7 +28,7 @@ class TQCheckBox; class TQPushButton; class KMConfigGeneral : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigGeneral(TQWidget *parent = 0); diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp index 1c712de3d..39b783d48 100644 --- a/tdeprint/management/kmconfigjobs.cpp +++ b/tdeprint/management/kmconfigjobs.cpp @@ -34,7 +34,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) setPageHeader(i18n("Print Job Settings")); setPagePixmap("application-x-executable"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Jobs Shown"), this); m_limit = new KIntNumInput(box); m_limit->setRange(0, 9999, 1, true); @@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 0); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(m_limit); } diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h index 29818d68a..0edab1056 100644 --- a/tdeprint/management/kmconfigjobs.h +++ b/tdeprint/management/kmconfigjobs.h @@ -26,7 +26,7 @@ class KIntNumInput; class KMConfigJobs : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigJobs(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h index f29b8a23e..533ff80f4 100644 --- a/tdeprint/management/kmconfigpage.h +++ b/tdeprint/management/kmconfigpage.h @@ -28,7 +28,7 @@ class TDEConfig; class TDEPRINT_EXPORT KMConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMConfigPage(TQWidget *parent = 0, const char *name = 0); @@ -45,9 +45,9 @@ protected: void setPagePixmap(const TQString& s) { m_pixmap = s; } protected: - QString m_name; - QString m_header; - QString m_pixmap; + TQString m_name; + TQString m_header; + TQString m_pixmap; }; #endif diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp index 2fdcbcb4b..b3c8aa39e 100644 --- a/tdeprint/management/kmconfigpreview.cpp +++ b/tdeprint/management/kmconfigpreview.cpp @@ -36,7 +36,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) setPageHeader(i18n("Preview Settings")); setPagePixmap("filefind"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Preview Program"), this); m_useext = new TQCheckBox(i18n("&Use external preview program"), box); m_program = new KURLRequester(box); @@ -50,12 +50,12 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(lab); l1->addWidget(m_useext); l1->addWidget(m_program); - connect(m_useext, TQT_SIGNAL(toggled(bool)), m_program, TQT_SLOT(setEnabled(bool))); + connect(m_useext, TQ_SIGNAL(toggled(bool)), m_program, TQ_SLOT(setEnabled(bool))); m_program->setEnabled(false); } diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 6154ebea2..3d0fa8638 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -26,7 +26,7 @@ #include <tqdir.h> #include <tdelocale.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> KMDBCreator::KMDBCreator(TQObject *parent, const char *name) @@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name) m_dlg = 0; m_status = true; - connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(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(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*))); } KMDBCreator::~KMDBCreator() @@ -51,7 +51,7 @@ KMDBCreator::~KMDBCreator() bool KMDBCreator::checkDriverDB(const TQString& dirname, const TQDateTime& d) { // don't block GUI - kapp->processEvents(); + tdeApp->processEvents(); // first check current directory TQFileInfo dfi(dirname); @@ -112,7 +112,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true); m_dlg->setLabelText(i18n("Please wait while TDE rebuilds a driver database.")); m_dlg->setCaption(i18n("Driver Database")); - connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled())); + connect(m_dlg,TQ_SIGNAL(canceled()),TQ_SLOT(slotCancelled())); } m_dlg->setMinimumDuration(0); // always show the dialog m_dlg->setProgress(0); // to force showing diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h index 4b1983ae6..156eb81a3 100644 --- a/tdeprint/management/kmdbcreator.h +++ b/tdeprint/management/kmdbcreator.h @@ -23,14 +23,14 @@ #include <tqobject.h> #include <tqstring.h> #include <tqdatetime.h> -#include <kprocess.h> +#include <tdeprocess.h> class TQWidget; class TQProgressDialog; class KMDBCreator : public TQObject { - Q_OBJECT + TQ_OBJECT public: KMDBCreator(TQObject *parent = 0, const char *name = 0); ~KMDBCreator(); diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index 5a172281b..5234dd6d6 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> @@ -47,7 +47,7 @@ KMDriverDB::KMDriverDB(TQObject *parent, const char *name) : TQObject(parent,name) { m_creator = new KMDBCreator(this,"db-creator"); - connect(m_creator,TQT_SIGNAL(dbCreated()),TQT_SLOT(slotDbCreated())); + connect(m_creator,TQ_SIGNAL(dbCreated()),TQ_SLOT(slotDbCreated())); m_entries.setAutoDelete(true); m_pnpentries.setAutoDelete(true); @@ -177,7 +177,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry) } // don't block GUI - kapp->processEvents(); + tdeApp->processEvents(); } /* diff --git a/tdeprint/management/kmdriverdb.h b/tdeprint/management/kmdriverdb.h index c5af6d53e..8dec3e8f0 100644 --- a/tdeprint/management/kmdriverdb.h +++ b/tdeprint/management/kmdriverdb.h @@ -31,7 +31,7 @@ class KMDBCreator; class KMDriverDB : public TQObject { - Q_OBJECT + TQ_OBJECT public: static KMDriverDB* self(); diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index 7223dbcd3..c49af544a 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -62,7 +62,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0); TQHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10); - main_->addLayout(TQT_TQLAYOUT(sub1_)); + main_->addLayout(sub1_); main_->addLayout(sub2_); main_->addWidget(m_raw); sub1_->addWidget(l1,0,0); @@ -74,19 +74,19 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) sub2_->addWidget(m_other,0); // build connections - connect(KMDriverDB::self(),TQT_SIGNAL(dbLoaded(bool)),TQT_SLOT(slotDbLoaded(bool))); - connect(KMDriverDB::self(), TQT_SIGNAL(error(const TQString&)), TQT_SLOT(slotError(const TQString&))); - connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),TQT_SLOT(slotManufacturerSelected(const TQString&))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_postscript,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_raw,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotPostscriptToggled(bool))); - connect(m_other,TQT_SIGNAL(clicked()),TQT_SLOT(slotOtherClicked())); + connect(KMDriverDB::self(),TQ_SIGNAL(dbLoaded(bool)),TQ_SLOT(slotDbLoaded(bool))); + connect(KMDriverDB::self(), TQ_SIGNAL(error(const TQString&)), TQ_SLOT(slotError(const TQString&))); + connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),TQ_SLOT(slotManufacturerSelected(const TQString&))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_postscript,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_raw,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotPostscriptToggled(bool))); + connect(m_other,TQ_SIGNAL(clicked()),TQ_SLOT(slotOtherClicked())); } KMDriverDbWidget::~KMDriverDbWidget() @@ -240,7 +240,7 @@ void KMDriverDbWidget::slotOtherClicked() if (driver) { m_external = filename; - disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); + disconnect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&))); m_manu->clear(); m_model->clear(); TQString s = driver->get("manufacturer"); @@ -264,7 +264,7 @@ void KMDriverDbWidget::slotOtherClicked() else { m_external = TQString::null; - connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); + connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&))); m_other->setText(i18n("Other")); m_desc = TQString::null; slotDbLoaded(true); diff --git a/tdeprint/management/kmdriverdbwidget.h b/tdeprint/management/kmdriverdbwidget.h index 05b50536d..2841fd51f 100644 --- a/tdeprint/management/kmdriverdbwidget.h +++ b/tdeprint/management/kmdriverdbwidget.h @@ -29,7 +29,7 @@ class TQPushButton; class KMDriverDbWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMDriverDbWidget(TQWidget *parent = 0, const char *name = 0); ~KMDriverDbWidget(); diff --git a/tdeprint/management/kmdriverdialog.h b/tdeprint/management/kmdriverdialog.h index 8b7b01c45..3a62619ed 100644 --- a/tdeprint/management/kmdriverdialog.h +++ b/tdeprint/management/kmdriverdialog.h @@ -27,7 +27,7 @@ class DrMain; class KMDriverDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMDriverDialog(TQWidget *parent = 0, const char *name = 0); ~KMDriverDialog(); diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 5cd37c948..bfc34570d 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -129,8 +129,8 @@ KMIconView::KMIconView(TQWidget *parent, const char *name) m_items.setAutoDelete(false); setViewMode(KMIconView::Big); - connect(this,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); - connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); + connect(this,TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); + connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); } KMIconView::~KMIconView() diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h index 1c8cb197e..ba56cabb1 100644 --- a/tdeprint/management/kmiconview.h +++ b/tdeprint/management/kmiconview.h @@ -40,14 +40,14 @@ protected: private: int m_mode; - QString m_pixmap; + TQString m_pixmap; char m_state; bool m_isclass; }; class KMIconView : public TDEIconView { - Q_OBJECT + TQ_OBJECT public: enum ViewMode { Big, Small }; diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp index bae2b6ad6..06b37713d 100644 --- a/tdeprint/management/kminfopage.cpp +++ b/tdeprint/management/kminfopage.cpp @@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) { m_title = new TQLabel(this); m_titlepixmap = new TQLabel(this); - m_titlepixmap->setAlignment(Qt::AlignCenter); + m_titlepixmap->setAlignment(TQt::AlignCenter); KSeparator* sep = new KSeparator( KSeparator::HLine, this); m_type = new TQLabel(this); m_description = new TQLabel(this); @@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) m_uri = new TQLabel(this); m_device = new TQLabel(this); TQLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this); - m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_loclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_desclabel = new TQLabel(i18n("Description:"), this); - m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_desclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_typelabel = new TQLabel(i18n("Type:"), this); - m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_typelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this); - m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_statelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_urilabel = new TQLabel(i18n("URI:"), this); - m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_urilabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); m_devlabel = new TQLabel(i18n("Device:"), this); - m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_devlabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_modellabel = new TQLabel(i18n("Model:"), this); - m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_modellabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5); TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); @@ -125,7 +125,7 @@ void KMInfoPage::setPrinter(KMPrinter *p) m_uri->setText(p->uri().prettyURL()); if (p->isClass(false)) { - QString s; + TQString s; for (TQStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it) s.append(KURL(*it).prettyURL() + ", "); s.truncate(s.length()-2); diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index 45030a587..57e5cb445 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -35,7 +35,7 @@ #include <tdelistbox.h> #include <tdelocale.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> KMInstancePage::KMInstancePage(TQWidget *parent, const char *name) @@ -78,20 +78,20 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons btn->setText(txt); btn->setIconSet(BarIconSet(pixmap)); btn->setFlat(true); - connect(btn, TQT_SIGNAL(clicked()), receiver); + connect(btn, TQ_SIGNAL(clicked()), receiver); m_buttons.append(btn); } void KMInstancePage::initActions() { - addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew())); - addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy())); - addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove())); + addButton(i18n("New..."), "document-new", TQ_SLOT(slotNew())); + addButton(i18n("Copy..."), "edit-copy", TQ_SLOT(slotCopy())); + addButton(i18n("Remove"), "edittrash", TQ_SLOT(slotRemove())); m_buttons.append(0); - addButton(i18n("Set as Default"), "application-x-executable", TQT_SLOT(slotDefault())); - addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings())); + addButton(i18n("Set as Default"), "application-x-executable", TQ_SLOT(slotDefault())); + addButton(i18n("Settings"), "configure", TQ_SLOT(slotSettings())); m_buttons.append(0); - addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest())); + addButton(i18n("Test..."), "document-print", TQ_SLOT(slotTest())); } void KMInstancePage::setPrinter(KMPrinter *p) diff --git a/tdeprint/management/kminstancepage.h b/tdeprint/management/kminstancepage.h index 56b045fe2..67bef455e 100644 --- a/tdeprint/management/kminstancepage.h +++ b/tdeprint/management/kminstancepage.h @@ -30,7 +30,7 @@ class TQButton; class KMInstancePage : public TQWidget, public KMPrinterPage { - Q_OBJECT + TQ_OBJECT public: KMInstancePage(TQWidget *parent = 0, const char *name = 0); ~KMInstancePage(); diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 70a6c6e85..5f0c6756b 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -105,7 +105,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name) resize( conf->readSizeEntry( "Size", &defSize ) ); } - connect(KMFactory::self()->manager(), TQT_SIGNAL(printerListUpdated()),TQT_SLOT(slotPrinterListUpdated())); + connect(KMFactory::self()->manager(), TQ_SIGNAL(printerListUpdated()),TQ_SLOT(slotPrinterListUpdated())); } KMJobViewer::~KMJobViewer() @@ -240,18 +240,18 @@ void KMJobViewer::init() m_view->addColumn(i18n("Status", "State")); m_view->addColumn(i18n("Size (KB)")); m_view->addColumn(i18n("Page(s)")); - m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter); - connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); + m_view->setColumnAlignment(5,TQt::AlignRight|TQt::AlignVCenter); + connect( m_view, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); //m_view->addColumn(i18n("Printer")); - //m_view->setColumnAlignment(6,Qt::AlignRight|Qt::AlignVCenter); + //m_view->setColumnAlignment(6,TQt::AlignRight|TQt::AlignVCenter); KMFactory::self()->uiManager()->setupJobViewer(m_view); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); m_view->setSorting(0); m_view->setAllColumnsShowFocus(true); m_view->setSelectionMode(TQListView::Extended); - connect(m_view,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); - connect(m_view,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int))); + connect(m_view,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); + connect(m_view,TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int))); setCentralWidget(m_view); } @@ -261,26 +261,26 @@ void KMJobViewer::init() void KMJobViewer::initActions() { // job actions - TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); - TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); - TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); - TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); + TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQ_SLOT(slotHold()),actionCollection(),"job_hold"); + TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQ_SLOT(slotResume()),actionCollection(),"job_resume"); + TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQ_SLOT(slotRemove()),actionCollection(),"job_remove"); + TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQ_SLOT(slotRestart()),actionCollection(),"job_restart"); TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move"); mact->setDelayed(false); - connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu())); + connect(mact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotMove(int))); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowMoveMenu())); TDEToggleAction *tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed"); tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowCompleted(bool))); TDEToggleAction *uact = new TDEToggleAction(i18n("Show Only User Jobs"), "preferences-desktop-personal", 0, actionCollection(), "view_user_jobs"); uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"preferences-desktop-personal")); - connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool))); + connect(uact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUserOnly(bool))); m_userfield = new TQLineEdit(0); m_userfield->setText(getenv("USER")); - connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged())); - connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool))); + connect(m_userfield, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotUserChanged())); + connect(uact, TQ_SIGNAL(toggled(bool)), m_userfield, TQ_SLOT(setEnabled(bool))); m_userfield->setEnabled(false); m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); KWidgetAction *ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username"); @@ -288,8 +288,8 @@ void KMJobViewer::initActions() if (!m_pop) { m_pop = new TQPopupMenu(this); - connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); + connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); hact->plug(m_pop); ract->plug(m_pop); m_pop->insertSeparator(); @@ -302,10 +302,10 @@ void KMJobViewer::initActions() // Filter actions TDEActionMenu *fact = new TDEActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify"); fact->setDelayed(false); - connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowPrinterMenu())); + connect(fact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int))); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowPrinterMenu())); if (!m_standalone) { @@ -324,12 +324,12 @@ void KMJobViewer::initActions() } else {// stand-alone application - KStdAction::quit(TQT_TQOBJECT(kapp),TQT_SLOT(quit()),actionCollection()); - KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(slotClose()),actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); + KStdAction::quit(tdeApp,TQ_SLOT(quit()),actionCollection()); + KStdAction::close(this,TQ_SLOT(slotClose()),actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); // refresh action - new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); + new TDEAction(i18n("Refresh"),"reload",0,this,TQ_SLOT(slotRefresh()),actionCollection(),"refresh"); // create status bar KStatusBar *statusbar = statusBar(); @@ -338,7 +338,7 @@ void KMJobViewer::initActions() TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); m_stickybox->setChecked(conf->readBoolEntry("KeepWindow",false)); - connect(m_stickybox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeepWindowChange(bool))); + connect(m_stickybox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeepWindowChange(bool))); statusbar->addWidget( m_stickybox, 1, false ); statusbar->insertItem(" " + i18n("Max.: %1").arg(i18n("Unlimited"))+ " ", 0, 0, true); statusbar->setItemFixed(0); @@ -617,7 +617,7 @@ void KMJobViewer::loadPluginActions() for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it) { // connect the action to this - connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int))); + connect((*it), TQ_SIGNAL(activated(int)), TQ_SLOT(pluginActionActivated(int))); // should add it to the toolbar and menubar (*it)->plug(toolBar(), toolbarindex++); @@ -674,7 +674,7 @@ void KMJobViewer::reload() void KMJobViewer::closeEvent(TQCloseEvent *e) { - if (m_standalone && !kapp->sessionSaving()) + if (m_standalone && !tdeApp->sessionSaving()) { hide(); e->ignore(); diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h index f9e6ffb80..38db6c16c 100644 --- a/tdeprint/management/kmjobviewer.h +++ b/tdeprint/management/kmjobviewer.h @@ -48,7 +48,7 @@ class TQCheckBox; */ class TDEPRINT_EXPORT KMJobViewer : public TDEMainWindow, public KMPrinterPage, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMJobViewer(TQWidget *parent = 0, const char *name = 0); ~KMJobViewer(); diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 806cc0d9f..09c89d915 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -81,7 +81,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p) int st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay); m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0)); update = (oldstate != m_state); - QString name = (p->isVirtual() ? p->instanceName() : p->name()); + TQString name = (p->isVirtual() ? p->instanceName() : p->name()); if (name != text(0)) setText(0, name); setPixmap(0, SmallIcon(p->pixmap(), 0, st)); @@ -117,10 +117,10 @@ KMListView::KMListView(TQWidget *parent, const char *name) setLineWidth(1); setSorting(0); - connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int))); - connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); - connect(this,TQT_SIGNAL(onItem(TQListViewItem*)),TQT_SLOT(slotOnItem(TQListViewItem*))); - connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport())); + connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int))); + connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); + connect(this,TQ_SIGNAL(onItem(TQListViewItem*)),TQ_SLOT(slotOnItem(TQListViewItem*))); + connect(this,TQ_SIGNAL(onViewport()),TQ_SLOT(slotOnViewport())); m_root = new KMListViewItem(this,i18n("Print System")); m_root->setPixmap(0,SmallIcon("tdeprint_printer")); diff --git a/tdeprint/management/kmlistview.h b/tdeprint/management/kmlistview.h index 20ddc5731..472f0d2cc 100644 --- a/tdeprint/management/kmlistview.h +++ b/tdeprint/management/kmlistview.h @@ -28,7 +28,7 @@ class KMPrinter; class KMListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: KMListView(TQWidget *parent = 0, const char *name = 0); ~KMListView(); diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index ce3f356d8..ee2802a57 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -52,10 +52,10 @@ #include <tdepopupmenu.h> #include <klibloader.h> #include <kdialogbase.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> -#include <kprocess.h> +#include <tdeprocess.h> #undef m_manager #define m_manager KMFactory::self()->manager() @@ -111,12 +111,12 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection * m_layout->addWidget(m_plugin, 0); // connections - connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer())); - connect(m_printerview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); - connect(m_printerview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&))); - connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect(KMTimer::self(),TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer())); + connect(m_printerview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); + connect(m_printerview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&))); + connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); // actions if (coll) @@ -148,7 +148,7 @@ void KMMainView::restoreSettings() TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons)); - setOrientation(conf->readNumEntry("Orientation", Qt::Vertical)); + setOrientation(conf->readNumEntry("Orientation", TQt::Vertical)); bool view = conf->readBoolEntry("ViewToolBar",false); slotToggleToolBar(view); ((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view); @@ -179,61 +179,61 @@ void KMMainView::initActions() iconlst << "view_icon" << "view_detailed" << "view_tree"; vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst); vact->setCurrentItem(0); - connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); + connect(vact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeView(int))); TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); - stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); + stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); - stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); - - new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove"); - new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); - new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); - new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); - new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); - new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); - new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); - new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); - new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh"); + stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + + new TDEAction(i18n("&Remove"),"edittrash",0,this,TQ_SLOT(slotRemove()),m_actions,"printer_remove"); + new TDEAction(i18n("&Configure..."),"configure",0,this,TQ_SLOT(slotConfigure()),m_actions,"printer_configure"); + new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQ_SLOT(slotAdd()),m_actions,"printer_add"); + new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQ_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQ_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQ_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQ_SLOT(slotTest()),m_actions,"printer_test"); + new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQ_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQ_SLOT(slotInit()),m_actions,"view_refresh"); TDEIconSelectAction *dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); iconlst.clear(); iconlst << "view_top_bottom" << "view_left_right"; dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst); dact->setCurrentItem(0); - connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); + connect(dact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeDirection(int))); - new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); - new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); - new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); + new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQ_SLOT(slotServerRestart()),m_actions,"server_restart"); + new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotToggleToolBar(bool))); tact = new TDEToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" ); tact->setCheckedState(i18n("Hide Me&nu Toolbar")); - connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) ); + connect( tact, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotToggleMenuBar( bool ) ) ); tact = new TDEToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos"); tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos")); tact->setChecked(true); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowPrinterInfos(bool))); tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter"); tact->setChecked(KMManager::self()->isFilterEnabled()); - connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); + connect(tact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool))); TDEActionMenu *mact = new TDEActionMenu(i18n("Pri&nter Tools"), "applications-utilities", m_actions, "printer_tool"); mact->setDelayed(false); - connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); + connect(mact->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotToolSelected(int))); TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { - KSimpleConfig conf(*it); + TDESimpleConfig conf(*it); conf.setGroup("Desktop Entry"); mact->popupMenu()->insertItem(conf.readEntry("Name", "Unnamed"), mact->popupMenu()->count()); m_toollist << conf.readEntry("X-TDE-Library"); @@ -493,7 +493,7 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p void KMMainView::slotChangePrinterState() { - TQString opname = TQT_TQOBJECT_CONST(sender())->name(); + TQString opname = sender()->name(); if (m_current && opname.startsWith("printer_")) { opname = opname.mid(8); @@ -608,13 +608,13 @@ void KMMainView::slotSoftDefault() void KMMainView::setOrientation(int o) { - int ID = (o == Qt::Horizontal ? 1 : 0); + int ID = (o == TQt::Horizontal ? 1 : 0); ((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID); slotChangeDirection(ID); } int KMMainView::orientation() const -{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); } +{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? TQt::Horizontal : TQt::Vertical); } void KMMainView::slotChangeDirection(int d) { @@ -776,7 +776,7 @@ void KMMainView::reload() loadPluginActions(); // redo the connection as the old manager object has been removed - connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); // We must delay the refresh such that all objects has been // correctly reloaded (otherwise, crash in KMJobViewer). @@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID) { TQStringList args; args << m_current->device() << m_current->printerName(); - KDialogBase *dlg = static_cast<KDialogBase*>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "Tool", 0, args))); + KDialogBase *dlg = static_cast<KDialogBase*>(factory->create(this, "Tool", 0, args)); if (dlg) dlg->exec(); delete dlg; diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h index b35e7ef0f..9c55fe433 100644 --- a/tdeprint/management/kmmainview.h +++ b/tdeprint/management/kmmainview.h @@ -52,7 +52,7 @@ class TQMenuBar; */ class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMMainView(TQWidget *parent = 0, const char *name = 0, TDEActionCollection *coll = 0); ~KMMainView(); diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp index d311f75c3..c937d3875 100644 --- a/tdeprint/management/kmprinterview.cpp +++ b/tdeprint/management/kmprinterview.cpp @@ -39,12 +39,12 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) m_current = TQString(); m_listset = false; - connect(m_iconview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); - connect(m_listview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); - connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&))); - connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&))); - connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); - connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); + connect(m_iconview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); + connect(m_listview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); + connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&))); + connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&))); + connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); + connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); setViewType(m_type); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); @@ -85,7 +85,7 @@ void KMPrinterView::setViewType(ViewType t) default: break; } - QString oldcurrent = m_current; + TQString oldcurrent = m_current; if ( m_listset ) setPrinterList(KMManager::self()->printerList(false)); if (m_type == KMPrinterView::Tree) diff --git a/tdeprint/management/kmprinterview.h b/tdeprint/management/kmprinterview.h index 14354a3b5..b73bc46da 100644 --- a/tdeprint/management/kmprinterview.h +++ b/tdeprint/management/kmprinterview.h @@ -30,7 +30,7 @@ class TQIconViewItem; class KMPrinterView : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: enum ViewType { Icons = 0, List, Tree }; @@ -55,7 +55,7 @@ private: KMIconView *m_iconview; KMListView *m_listview; ViewType m_type; - QString m_current; + TQString m_current; bool m_listset; }; diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp index c94838098..b1a993893 100644 --- a/tdeprint/management/kmpropcontainer.cpp +++ b/tdeprint/management/kmpropcontainer.cpp @@ -53,9 +53,9 @@ void KMPropContainer::setWidget(KMPropWidget *w) { m_widget = w; m_widget->reparent(this,TQPoint(0,0)); - connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange())); - connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool))); - connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool))); + connect(m_button,TQ_SIGNAL(clicked()),m_widget,TQ_SLOT(slotChange())); + connect(m_widget,TQ_SIGNAL(enable(bool)),TQ_SIGNAL(enable(bool))); + connect(m_widget,TQ_SIGNAL(enableChange(bool)),TQ_SLOT(slotEnableChange(bool))); TQVBoxLayout *lay = dynamic_cast<TQVBoxLayout*>(layout()); if (lay) { diff --git a/tdeprint/management/kmpropcontainer.h b/tdeprint/management/kmpropcontainer.h index d191dfeb6..eadcde1e3 100644 --- a/tdeprint/management/kmpropcontainer.h +++ b/tdeprint/management/kmpropcontainer.h @@ -28,7 +28,7 @@ class KMPrinter; class KMPropContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMPropContainer(TQWidget *parent = 0, const char *name = 0); ~KMPropContainer(); diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp index 6f20494fc..7fc31d977 100644 --- a/tdeprint/management/kmpropdriver.cpp +++ b/tdeprint/management/kmpropdriver.cpp @@ -44,7 +44,7 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name) main_->setRowStretch(3,1); main_->addWidget(l1,0,0); main_->addWidget(l2,1,0); - main_->addWidget(l3,2,0,Qt::AlignTop|Qt::AlignLeft); + main_->addWidget(l3,2,0,TQt::AlignTop|TQt::AlignLeft); main_->addWidget(m_manufacturer,0,1); main_->addWidget(m_model,1,1); main_->addWidget(m_driverinfo,2,1); diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index c38b399c6..eefa38372 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -55,7 +55,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) m_widgets.append(w); KMPropContainer *ctn = new KMPropContainer(this,"Container"); ctn->setWidget(w); - connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); + connect(ctn,TQ_SIGNAL(enable(bool)),TQ_SLOT(slotEnable(bool))); TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h index 5acee87fd..c54011d25 100644 --- a/tdeprint/management/kmpropertypage.h +++ b/tdeprint/management/kmpropertypage.h @@ -31,7 +31,7 @@ class KMPrinter; class TDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMPropertyPage(TQWidget *parent = 0, const char *name = 0); ~KMPropertyPage(); diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp index 50c1a75e8..c38b4c186 100644 --- a/tdeprint/management/kmpropwidget.cpp +++ b/tdeprint/management/kmpropwidget.cpp @@ -34,7 +34,7 @@ KMPropWidget::KMPropWidget(TQWidget *parent, const char *name) m_printer = 0; m_canchange = ((KMFactory::self()->manager()->printerOperationMask() & KMManager::PrinterCreation) && KMFactory::self()->manager()->hasManagement()); - connect(this,TQT_SIGNAL(enable(bool)),this,TQT_SIGNAL(enableChange(bool))); + connect(this,TQ_SIGNAL(enable(bool)),this,TQ_SIGNAL(enableChange(bool))); } KMPropWidget::~KMPropWidget() diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h index 9d418066a..3c8d0050d 100644 --- a/tdeprint/management/kmpropwidget.h +++ b/tdeprint/management/kmpropwidget.h @@ -29,7 +29,7 @@ class KMWizard; class TDEPRINT_EXPORT KMPropWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMPropWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KMPropWidget(); @@ -53,9 +53,9 @@ protected: virtual void configureWizard(KMWizard*); protected: - QString m_pixmap; - QString m_title; - QString m_header; + TQString m_pixmap; + TQString m_title; + TQString m_header; KMPrinter *m_printer; bool m_canchange; }; diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp index db6dc1486..3f2a22a75 100644 --- a/tdeprint/management/kmspecialprinterdlg.cpp +++ b/tdeprint/management/kmspecialprinterdlg.cpp @@ -50,7 +50,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) // widget creation m_name = new TQLineEdit(dummy); - connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & ))); + connect(m_name, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotTextChanged(const TQString & ))); m_description = new TQLineEdit(dummy); m_location = new TQLineEdit(dummy); TQLabel *m_namelabel = new TQLabel(i18n("&Name:"), dummy); @@ -63,10 +63,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, dummy); sep->setFixedHeight(10); - TQGroupBox *m_gb = new TQGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy); + TQGroupBox *m_gb = new TQGroupBox(1, TQt::Horizontal, i18n("Command &Settings"), dummy); m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this); - TQGroupBox *m_outfile_gb = new TQGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy ); + TQGroupBox *m_outfile_gb = new TQGroupBox( 0, TQt::Horizontal, i18n( "Outp&ut File" ), dummy ); m_usefile = new TQCheckBox( i18n("&Enable output file"), m_outfile_gb); @@ -92,10 +92,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) m_icon->setIcon("document-print"); m_icon->setFixedSize(TQSize(48,48)); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extension, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extensionlabel, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetype, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extension, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extensionlabel, TQ_SLOT( setEnabled( bool ) ) ); m_mimetypelabel->setEnabled( false ); m_mimetype->setEnabled( false ); m_extensionlabel->setEnabled( false ); @@ -125,10 +125,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) // layout creation TQVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10); TQGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5); - l0->addLayout(TQT_TQLAYOUT(l1)); + l0->addLayout(l1); l1->setColStretch(2,1); l1->addColSpacing(0,60); - l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, Qt::AlignCenter); + l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, TQt::AlignCenter); l1->addWidget(m_namelabel, 0, 1); l1->addWidget(m_desclabel, 1, 1); l1->addWidget(m_loclabel, 2, 1); diff --git a/tdeprint/management/kmspecialprinterdlg.h b/tdeprint/management/kmspecialprinterdlg.h index 3d334c7fd..efa927474 100644 --- a/tdeprint/management/kmspecialprinterdlg.h +++ b/tdeprint/management/kmspecialprinterdlg.h @@ -31,7 +31,7 @@ class KXmlCommandSelector; class KMSpecialPrinterDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMSpecialPrinterDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp index a0b1aa78d..a8ef55ee0 100644 --- a/tdeprint/management/kmtimer.cpp +++ b/tdeprint/management/kmtimer.cpp @@ -37,7 +37,7 @@ KMTimer* KMTimer::self() KMTimer::KMTimer(TQObject *parent, const char *name) : TQTimer(parent, name), m_count(0) { - connect(this, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(this, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); } KMTimer::~KMTimer() diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h index 0c2e0169a..d64c9c091 100644 --- a/tdeprint/management/kmtimer.h +++ b/tdeprint/management/kmtimer.h @@ -36,7 +36,7 @@ */ class TDEPRINT_EXPORT KMTimer : public TQTimer { - Q_OBJECT + TQ_OBJECT public: void delay(int t); ~KMTimer(); diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp index e04467632..e7ff0faff 100644 --- a/tdeprint/management/kmwclass.cpp +++ b/tdeprint/management/kmwclass.cpp @@ -46,8 +46,8 @@ KMWClass::KMWClass(TQWidget *parent, const char *name) TQToolButton *remove = new TQToolButton(this); add->setIconSet(BarIcon("forward")); remove->setIconSet(BarIcon("back")); - connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd())); - connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove())); + connect(add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAdd())); + connect(remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemove())); TQLabel *l1 = new TQLabel(i18n("Available printers:"), this); TQLabel *l2 = new TQLabel(i18n("Class printers:"), this); diff --git a/tdeprint/management/kmwclass.h b/tdeprint/management/kmwclass.h index a74f20117..286f930e7 100644 --- a/tdeprint/management/kmwclass.h +++ b/tdeprint/management/kmwclass.h @@ -26,7 +26,7 @@ class TDEListBox; class KMWClass : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWClass(TQWidget *parent = 0, const char *name = 0); ~KMWClass(); diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index cc52f1015..8d4e1e802 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -44,7 +44,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name) "you want to use. You will have the opportunity to test it as well as to " "change it if necessary.</p>")); m_drivercomment = new KPushButton(i18n("Driver Information"), this); - connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment())); + connect(m_drivercomment, TQ_SIGNAL(clicked()), TQ_SLOT(slotDriverComment())); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(l1,0); diff --git a/tdeprint/management/kmwdriverselect.h b/tdeprint/management/kmwdriverselect.h index 9c78008c1..6419232dd 100644 --- a/tdeprint/management/kmwdriverselect.h +++ b/tdeprint/management/kmwdriverselect.h @@ -28,7 +28,7 @@ class TQPushButton; class KMWDriverSelect : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWDriverSelect(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 73871988a..dcc83d661 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -65,14 +65,14 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) TQGridLayout *lay2 = new TQGridLayout(0, 3, 3, 0, 0); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); lay1->addWidget(l0,0); - lay1->addLayout(TQT_TQLAYOUT(lay2),0); + lay1->addLayout(lay2,0); lay1->addLayout(lay3,0); lay1->addStretch(1); lay2->setColStretch(2,1); lay2->addColSpacing(1,10); lay2->addWidget(l1,0,0); lay2->addWidget(l2,1,0); - lay2->addWidget(l3,2,0,Qt::AlignLeft|Qt::AlignTop); + lay2->addWidget(l3,2,0,TQt::AlignLeft|TQt::AlignTop); lay2->addWidget(m_manufacturer,0,2); lay2->addWidget(m_model,1,2); lay2->addWidget(m_driverinfo,2,2); @@ -80,8 +80,8 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) lay3->addWidget(m_settings,0); lay3->addStretch(1); - connect(m_test,TQT_SIGNAL(clicked()),TQT_SLOT(slotTest())); - connect(m_settings,TQT_SIGNAL(clicked()),TQT_SLOT(slotSettings())); + connect(m_test,TQ_SIGNAL(clicked()),TQ_SLOT(slotTest())); + connect(m_settings,TQ_SIGNAL(clicked()),TQ_SLOT(slotSettings())); } KMWDriverTest::~KMWDriverTest() diff --git a/tdeprint/management/kmwdrivertest.h b/tdeprint/management/kmwdrivertest.h index 5c1aefaee..4bf68f06a 100644 --- a/tdeprint/management/kmwdrivertest.h +++ b/tdeprint/management/kmwdrivertest.h @@ -28,7 +28,7 @@ class DrMain; class KMWDriverTest : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWDriverTest(TQWidget *parent = 0, const char *name = 0); ~KMWDriverTest(); diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp index bc894c478..6d7b20399 100644 --- a/tdeprint/management/kmwizard.cpp +++ b/tdeprint/management/kmwizard.cpp @@ -74,10 +74,10 @@ KMWizard::KMWizard(TQWidget *parent, const char *name) KSeparator* sep2 = new KSeparator( KSeparator::HLine, this); TQPushButton *m_help = new KPushButton(KStdGuiItem::help(), this); - connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject())); - connect(m_next,TQT_SIGNAL(clicked()),TQT_SLOT(slotNext())); - connect(m_prev,TQT_SIGNAL(clicked()),TQT_SLOT(slotPrev())); - connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp())); + connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject())); + connect(m_next,TQ_SIGNAL(clicked()),TQ_SLOT(slotNext())); + connect(m_prev,TQ_SIGNAL(clicked()),TQ_SLOT(slotPrev())); + connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp())); m_side = new SidePixmap(this); if (!m_side->isValid()) @@ -244,7 +244,7 @@ void KMWizard::slotNext() void KMWizard::slotHelp() { - kapp->invokeHelp(TQString::null, "tdeprint"); + tdeApp->invokeHelp(TQString::null, "tdeprint"); } void KMWizard::enableWizard() diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h index 171158b37..63849c5bb 100644 --- a/tdeprint/management/kmwizard.h +++ b/tdeprint/management/kmwizard.h @@ -36,7 +36,7 @@ class SidePixmap; class TDEPRINT_EXPORT KMWizard : public TQDialog { - Q_OBJECT + TQ_OBJECT public: enum PageType { Start = 0, diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h index b02dbe9fe..f2a2565d6 100644 --- a/tdeprint/management/kmwizardpage.h +++ b/tdeprint/management/kmwizardpage.h @@ -28,7 +28,7 @@ class KMPrinter; class TDEPRINT_EXPORT KMWizardPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMWizardPage(TQWidget *parent = 0, const char *name = 0); virtual ~KMWizardPage(); @@ -43,7 +43,7 @@ public: bool needsInitOnBack() { return m_needsinitonback; } protected: - QString m_title; + TQString m_title; int m_ID; int m_nextpage; bool m_needsinitonback; diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp index a3180000f..dce5fef41 100644 --- a/tdeprint/management/kmwlocal.cpp +++ b/tdeprint/management/kmwlocal.cpp @@ -50,10 +50,10 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name) TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); root->setPixmap(0, SmallIcon("tdeprint_computer")); root->setOpen(true); - connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); + connect(m_ports, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotPortSelected(TQListViewItem*))); TQLabel *l1 = new TQLabel(i18n("URI:"), this); m_localuri = new TQLineEdit(this); - connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_localuri, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotTextChanged( const TQString& ) ) ); m_parents[0] = new TQListViewItem(root, i18n("Parallel")); m_parents[1] = new TQListViewItem(root, m_parents[0], i18n("Serial")); m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB")); diff --git a/tdeprint/management/kmwlocal.h b/tdeprint/management/kmwlocal.h index e65128747..0216fae8f 100644 --- a/tdeprint/management/kmwlocal.h +++ b/tdeprint/management/kmwlocal.h @@ -30,7 +30,7 @@ class TQListViewItem; class KMWLocal : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWLocal(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp index 3c4794ad1..631d4253b 100644 --- a/tdeprint/management/kmwlpd.cpp +++ b/tdeprint/management/kmwlpd.cpp @@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg) void KMWLpd::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); + TQString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); p->setDevice(dev); } @@ -81,12 +81,12 @@ bool checkLpdQueue(const char *host, const char *queue) char res[64] = {0}; snprintf(res,64,"%c%s\n",(char)4,queue); - if (sock.tqwriteBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) + if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) return false; char buf[1024] = {0}; int n, tot(1); - while ((n = sock.tqreadBlock(res, 63)) > 0) + while ((n = sock.readBlock(res, 63)) > 0) { res[n] = 0; tot += n; diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp index e8378371a..88f8fb416 100644 --- a/tdeprint/management/kmwname.cpp +++ b/tdeprint/management/kmwname.cpp @@ -50,7 +50,7 @@ bool KMWName::isValid(TQString& msg) } else if (text(0).find(TQRegExp("\\s")) != -1) { - QString conv = text(0); + TQString conv = text(0); conv.replace(TQRegExp("\\s"), ""); int result = KMessageBox::warningYesNoCancel(this, i18n("It is usually not a good idea to include spaces " diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp index 3cd71aadd..f7340b71b 100644 --- a/tdeprint/management/kmwpassword.cpp +++ b/tdeprint/management/kmwpassword.cpp @@ -63,8 +63,8 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name) m_login->setEnabled(false); m_password->setEnabled(false); - connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool))); - connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool))); + connect(btn3,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setEnabled(bool))); + connect(btn3,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setEnabled(bool))); // layout TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 ); @@ -72,7 +72,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name) main_->addSpacing( 10 ); main_->addWidget( m_btngroup ); TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 ); - main_->addLayout( TQT_TQLAYOUT(l1) ); + main_->addLayout( l1 ); main_->addStretch( 1 ); l1->setColSpacing( 0, 35 ); l1->setColStretch( 2, 1 ); diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp index 44b2f493c..94bffc2b8 100644 --- a/tdeprint/management/kmwsmb.cpp +++ b/tdeprint/management/kmwsmb.cpp @@ -51,7 +51,7 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); - lay0->addLayout(TQT_TQLAYOUT(lay1),0); + lay0->addLayout(lay1,0); lay0->addWidget(m_view,1); lay0->addLayout(lay3,0); lay0->addSpacing(10); @@ -67,10 +67,10 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name) lay3->addWidget(m_scan); lay3->addWidget(m_abort); - connect(m_scan,TQT_SIGNAL(clicked()),TQT_SLOT(slotScan())); - connect(m_abort,TQT_SIGNAL(clicked()),TQT_SLOT(slotAbort())); - connect(m_view,TQT_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&))); - connect(m_view,TQT_SIGNAL(running(bool)),m_abort,TQT_SLOT(setEnabled(bool))); + connect(m_scan,TQ_SIGNAL(clicked()),TQ_SLOT(slotScan())); + connect(m_abort,TQ_SIGNAL(clicked()),TQ_SLOT(slotAbort())); + connect(m_view,TQ_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&))); + connect(m_view,TQ_SIGNAL(running(bool)),m_abort,TQ_SLOT(setEnabled(bool))); } bool KMWSmb::isValid(TQString& msg) diff --git a/tdeprint/management/kmwsmb.h b/tdeprint/management/kmwsmb.h index 695379a79..e8c5361ec 100644 --- a/tdeprint/management/kmwsmb.h +++ b/tdeprint/management/kmwsmb.h @@ -28,7 +28,7 @@ class TQLabel; class KMWSmb : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWSmb(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp index a3fb71b3d..6692d8785 100644 --- a/tdeprint/management/kmwsocket.cpp +++ b/tdeprint/management/kmwsocket.cpp @@ -60,11 +60,11 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(40); - 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_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() ) ); // layout TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); diff --git a/tdeprint/management/kmwsocket.h b/tdeprint/management/kmwsocket.h index 7489d6ec7..b765c594d 100644 --- a/tdeprint/management/kmwsocket.h +++ b/tdeprint/management/kmwsocket.h @@ -29,7 +29,7 @@ class NetworkScanner; class KMWSocket : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWSocket(TQWidget *parent = 0, const char *name = 0); ~KMWSocket(); diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp index 02b0a6b69..7467440e8 100644 --- a/tdeprint/management/kmwsocketutil.cpp +++ b/tdeprint/management/kmwsocketutil.cpp @@ -58,7 +58,7 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na mm->setFixedWidth(fontMetrics().width(mm->text())+10); mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + mask_->setAlignment(TQt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); @@ -178,7 +178,7 @@ bool KMWSocketUtil::scanNetwork(TQProgressBar *bar) if (bar) { bar->setProgress(i); - kapp->flushX(); + tdeApp->flushX(); } } return true; diff --git a/tdeprint/management/kmwsocketutil.h b/tdeprint/management/kmwsocketutil.h index dfb9f490e..a0194e5c9 100644 --- a/tdeprint/management/kmwsocketutil.h +++ b/tdeprint/management/kmwsocketutil.h @@ -26,8 +26,8 @@ struct SocketInfo { - QString IP; - QString Name; + TQString IP; + TQString Name; int Port; }; @@ -39,7 +39,7 @@ class KMWSocketUtil; class SocketConfig : public KDialogBase { friend class KMWSocketUtil; - Q_OBJECT + TQ_OBJECT public: SocketConfig(KMWSocketUtil *util, TQWidget *parent = 0, const char *name = 0); ~SocketConfig(); diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index 1fe9a51f2..a052c69d8 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -125,7 +125,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam m_commandlab->setBuddy(m_command); m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy ); - TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy); + TQGroupBox *gb = new TQGroupBox(0, TQt::Horizontal, i18n("Va&lues"), m_dummy); m_stack = new TQWidgetStack(gb); TQWidget *w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack); m_stack->addWidget(w1, 1); @@ -159,8 +159,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam KSeparator *sep1 = new KSeparator(KSeparator::HLine, m_dummy); - TQGroupBox *gb_input = new TQGroupBox(0, Qt::Horizontal, i18n("&Input From"), this); - TQGroupBox *gb_output = new TQGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this); + TQGroupBox *gb_input = new TQGroupBox(0, TQt::Horizontal, i18n("&Input From"), this); + TQGroupBox *gb_output = new TQGroupBox(0, TQt::Horizontal, i18n("O&utput To"), this); TQLabel *m_inputfilelab = new TQLabel(i18n("File:"), gb_input); TQLabel *m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input); TQLabel *m_outputfilelab = new TQLabel(i18n("File:"), gb_output); @@ -184,7 +184,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam TQHBoxLayout *l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQGridLayout *l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); l2->addLayout(l0, 1); - l0->addLayout(TQT_TQLAYOUT(l10)); + l0->addLayout(l10); l10->addMultiCellWidget(m_view, 0, 0, 0, 1); l10->addWidget(gb_input, 1, 0); l10->addWidget(gb_output, 1, 1); @@ -201,16 +201,16 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l7->addStretch(1); l0->addWidget(m_dummy, 1); TQGridLayout *l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint()); - l1->addWidget(m_desclab, 0, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_desclab, 0, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_desc, 0, 1); l1->addMultiCellWidget(sep1, 1, 1, 0, 1); - l1->addWidget(m_namelab, 2, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_namelab, 2, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_name, 2, 1); - l1->addWidget(m_typelab, 3, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_typelab, 3, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_type, 3, 1); - l1->addWidget(m_formatlab, 4, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_formatlab, 4, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_format, 4, 1); - l1->addWidget(m_defaultlab, 5, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_defaultlab, 5, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_default, 5, 1); l1->addWidget( m_persistent, 6, 1 ); l1->addMultiCellWidget(gb, 7, 7, 0, 1); @@ -225,8 +225,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l6->addStretch(1); TQGridLayout *l5 = new TQGridLayout(w1, 3, 2, 0, KDialog::spacingHint()); l5->setRowStretch(2, 1); - l5->addWidget(m_editlab1, 0, 0, Qt::AlignRight|Qt::AlignVCenter); - l5->addWidget(m_editlab2, 1, 0, Qt::AlignRight|Qt::AlignVCenter); + l5->addWidget(m_editlab1, 0, 0, TQt::AlignRight|TQt::AlignVCenter); + l5->addWidget(m_editlab2, 1, 0, TQt::AlignRight|TQt::AlignVCenter); l5->addWidget(m_edit1, 0, 1); l5->addWidget(m_edit2, 1, 1); @@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l9->addWidget(m_outputfile, 0, 1); l9->addWidget(m_outputpipe, 1, 1); - TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout())); + TQVBoxLayout *l11 = new TQVBoxLayout(gb->layout()); l11->addWidget(m_stack); TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); @@ -252,29 +252,29 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l12->addWidget( m_commentlab ); l12->addWidget( m_comment ); - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelectionChanged(TQListViewItem*))); - connect(m_values, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotValueSelected(TQListViewItem*))); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddValue())); - connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveValue())); - connect(m_apply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyChanges())); - connect(m_addgrp, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddGroup())); - connect(m_addopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddOption())); - connect(m_delopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveItem())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); - connect(m_command, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotCommandChanged(const TQString&))); - connect(m_view, TQT_SIGNAL(itemRenamed(TQListViewItem*,int)), TQT_SLOT(slotOptionRenamed(TQListViewItem*,int))); - connect(m_desc, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_format, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_default, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_edit1, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_edit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect( m_persistent, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_values, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotValueSelected(TQListViewItem*))); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); + connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddValue())); + connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveValue())); + connect(m_apply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyChanges())); + connect(m_addgrp, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddGroup())); + connect(m_addopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddOption())); + connect(m_delopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveItem())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown())); + connect(m_command, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotCommandChanged(const TQString&))); + connect(m_view, TQ_SIGNAL(itemRenamed(TQListViewItem*,int)), TQ_SLOT(slotOptionRenamed(TQListViewItem*,int))); + connect(m_desc, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_format, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_default, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_edit1, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_edit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect( m_persistent, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); m_dummy->setEnabled(false); viewItem(0); @@ -403,7 +403,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent TQString namestr = git.current()->name(); if (namestr.isEmpty()) { - namestr = "group_"+kapp->randomString(4); + namestr = "group_"+tdeApp->randomString(4); } git.current()->setName(namestr); item = new TQListViewItem(parent, item, git.current()->get("text"), git.current()->name()); @@ -420,7 +420,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent TQString namestr = oit.current()->name().mid(m_xmlcmd->name().length()+6); if (namestr.isEmpty()) { - namestr = "option_"+kapp->randomString(4); + namestr = "option_"+tdeApp->randomString(4); } oit.current()->setName(namestr); item = new TQListViewItem(parent, item, oit.current()->get("text"), namestr); @@ -836,8 +836,8 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) TQWidget *dummy = new TQWidget(this, "TopDetail"); TQWidget *topmain = new TQWidget(this, "TopMain"); - TQGroupBox *m_gb1 = new TQGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy); - TQGroupBox *m_gb2 = new TQGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain); + TQGroupBox *m_gb1 = new TQGroupBox(0, TQt::Horizontal, i18n("Supported &Input Formats"), dummy); + TQGroupBox *m_gb2 = new TQGroupBox(0, TQt::Horizontal, i18n("Requirements"), topmain); m_description = new TQLineEdit(topmain); m_idname = new TQLabel(topmain); @@ -877,7 +877,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(topmain, 0, 10); TQGridLayout *l5 = new TQGridLayout(0, 2, 2, 0, 5); - l0->addLayout(TQT_TQLAYOUT(l5)); + l0->addLayout(l5); l5->addWidget(m_idnamelab, 0, 0); l5->addWidget(m_idname, 0, 1); l5->addWidget(m_desclab, 1, 0); @@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l6->addWidget(m_mimetypelab, 0); l6->addWidget(m_mimetype, 1); l7->addWidget(m_gb1); - TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10); + TQGridLayout *l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10); l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2); l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0); l2->addWidget(m_addmime, 1, 1); l2->addWidget(m_removemime, 2, 1); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); - TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10); + TQHBoxLayout *l4 = new TQHBoxLayout(m_gb2->layout(), 10); l4->addWidget(m_requirements); TQVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); l4->addLayout(l8); @@ -910,14 +910,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l8->addWidget(m_removereq); l8->addStretch(1); - connect(m_addmime, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddMime())); - connect(m_removemime, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveMime())); - connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); - connect(m_requirements, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotReqSelected(TQListViewItem*))); - connect(m_availablemime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotAvailableSelected(TQListBoxItem*))); - connect(m_selectedmime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotSelectedSelected(TQListBoxItem*))); - connect(m_addreq, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddReq())); - connect(m_removereq, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveReq())); + connect(m_addmime, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddMime())); + connect(m_removemime, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveMime())); + connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand())); + connect(m_requirements, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotReqSelected(TQListViewItem*))); + connect(m_availablemime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotAvailableSelected(TQListBoxItem*))); + connect(m_selectedmime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotSelectedSelected(TQListBoxItem*))); + connect(m_addreq, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddReq())); + connect(m_removereq, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveReq())); KMimeType::List list = KMimeType::allMimeTypes(); for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it) diff --git a/tdeprint/management/kxmlcommanddlg.h b/tdeprint/management/kxmlcommanddlg.h index d69c19e62..d4c574514 100644 --- a/tdeprint/management/kxmlcommanddlg.h +++ b/tdeprint/management/kxmlcommanddlg.h @@ -42,7 +42,7 @@ class KXmlCommand; class KXmlCommandAdvancedDlg : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KXmlCommandAdvancedDlg(TQWidget *parent = 0, const char *name = 0); ~KXmlCommandAdvancedDlg(); @@ -93,7 +93,7 @@ private: class KXmlCommandDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KXmlCommandDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index 95f2b94a7..71ae148c3 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/management/kxmlcommandselector.cpp @@ -44,19 +44,19 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const : TQWidget(parent, name) { m_cmd = new TQComboBox(this); - connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int))); + connect(m_cmd, TQ_SIGNAL(activated(int)), TQ_SLOT(slotCommandSelected(int))); TQPushButton *m_add = new KPushButton(this); TQPushButton *m_edit = new KPushButton(this); m_add->setPixmap(SmallIcon("document-new")); m_edit->setPixmap(SmallIcon("configure")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand())); - connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddCommand())); + connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand())); TQToolTip::add(m_add, i18n("New command")); TQToolTip::add(m_edit, i18n("Edit command")); m_shortinfo = new TQLabel(this); m_helpbtn = new KPushButton( this ); m_helpbtn->setIconSet( SmallIconSet( "help" ) ); - connect( m_helpbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHelpCommand() ) ); + connect( m_helpbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHelpCommand() ) ); TQToolTip::add( m_helpbtn, i18n( "Information" ) ); m_helpbtn->setEnabled( false ); @@ -71,14 +71,14 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const m_line = new TQLineEdit(this); m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this); m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this); - connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_browse, TQT_SLOT(setDisabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_cmd, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_add, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_edit, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_shortinfo, TQT_SLOT(setEnabled(bool))); - connect( m_usefilter, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotXmlCommandToggled( bool ) ) ); + connect(m_browse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse())); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_line, TQ_SLOT(setDisabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_browse, TQ_SLOT(setDisabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_cmd, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_add, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_edit, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_shortinfo, TQ_SLOT(setEnabled(bool))); + connect( m_usefilter, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotXmlCommandToggled( bool ) ) ); m_usefilter->setChecked(true); m_usefilter->setChecked(false); //setFocusProxy(m_line); @@ -91,7 +91,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const l1->addWidget(m_line); l1->addWidget(m_browse); - KSeparator *sep = new KSeparator(Qt::Horizontal, this); + KSeparator *sep = new KSeparator(TQt::Horizontal, this); l0->addWidget(sep); } else @@ -99,7 +99,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const TQGridLayout *l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5); int c(0); - l0->addLayout(TQT_TQLAYOUT(l2)); + l0->addLayout(l2); if (m_usefilter) { l2->addWidget(m_usefilter, 0, c++); @@ -115,7 +115,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const l3->addWidget(m_edit); if ( dlg ) - connect( this, TQT_SIGNAL( commandValid( bool ) ), dlg, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( this, TQ_SIGNAL( commandValid( bool ) ), dlg, TQ_SLOT( enableButtonOK( bool ) ) ); loadCommands(); } diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h index 5b2d109ea..40b8f4bd3 100644 --- a/tdeprint/management/kxmlcommandselector.h +++ b/tdeprint/management/kxmlcommandselector.h @@ -34,7 +34,7 @@ class KDialogBase; class TDEPRINT_EXPORT KXmlCommandSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KXmlCommandSelector(bool canBeNull = true, TQWidget *parent = 0, const char *name = 0, KDialogBase *dlg = 0); diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp index ec859dc63..f9d7e585f 100644 --- a/tdeprint/management/networkscanner.cpp +++ b/tdeprint/management/networkscanner.cpp @@ -104,7 +104,7 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this ); d->timer = new TQTimer( this ); #ifdef USE_QSOCKET - d->socket = new TQSocket( TQT_TQOBJECT(this) ); + d->socket = new TQSocket( this ); #else d->socket = new KExtendedSocket(); #endif @@ -118,15 +118,15 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) l0->addWidget( d->settings, 3, 0 ); l0->addWidget( d->scan, 3, 1 ); - connect( d->timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) ); - connect( d->settings, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSettingsClicked() ) ); - connect( d->scan, TQT_SIGNAL( clicked() ), TQT_SLOT( slotScanClicked() ) ); + connect( d->timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) ); + connect( d->settings, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSettingsClicked() ) ); + connect( d->scan, TQ_SIGNAL( clicked() ), TQ_SLOT( slotScanClicked() ) ); #ifdef USE_QSOCKET - connect( d->socket, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnectionSuccess() ) ); - connect( d->socket, TQT_SIGNAL( error( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQ_SIGNAL( error( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); #else - connect( d->socket, TQT_SIGNAL( connectionSuccess() ), TQT_SLOT( slotConnectionSuccess() ) ); - connect( d->socket, TQT_SIGNAL( connectionFailed( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQ_SIGNAL( connectionSuccess() ), TQ_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQ_SIGNAL( connectionFailed( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); #endif } @@ -219,7 +219,7 @@ void NetworkScanner::next() else { d->bar->setProgress( d->currentaddress ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotNext() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotNext() ) ); } } @@ -344,7 +344,7 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char * mm->setFixedWidth(fontMetrics().width(mm->text())+10); mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + mask_->setAlignment(TQt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); diff --git a/tdeprint/management/networkscanner.h b/tdeprint/management/networkscanner.h index 80a017676..7218472a5 100644 --- a/tdeprint/management/networkscanner.h +++ b/tdeprint/management/networkscanner.h @@ -27,7 +27,7 @@ class TDEPRINT_EXPORT NetworkScanner : public TQWidget { - Q_OBJECT + TQ_OBJECT public: NetworkScanner( int port = 9100, TQWidget *parent = 0, const char *name = 0 ); @@ -77,7 +77,7 @@ class TQComboBox; class NetworkScannerConfig : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NetworkScannerConfig(NetworkScanner *scanner, const char *name = 0); diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp index 377a28217..3a19b6262 100644 --- a/tdeprint/management/pluginaction.cpp +++ b/tdeprint/management/pluginaction.cpp @@ -23,7 +23,7 @@ PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name) : TDEAction(txt, icon, accel, parent, name), m_id(ID) { - connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated())); + connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActivated())); } void PluginAction::slotActivated() diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h index 0f87460fd..d8aa98ca6 100644 --- a/tdeprint/management/pluginaction.h +++ b/tdeprint/management/pluginaction.h @@ -24,7 +24,7 @@ class TDEPRINT_EXPORT PluginAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent = 0, const char *name = 0); diff --git a/tdeprint/management/sidepixmap.cpp b/tdeprint/management/sidepixmap.cpp index a0be8f8b8..f047b7c11 100644 --- a/tdeprint/management/sidepixmap.cpp +++ b/tdeprint/management/sidepixmap.cpp @@ -20,7 +20,7 @@ #include "sidepixmap.h" #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> SidePixmap::SidePixmap(TQWidget *parent, const char *name) : TQFrame(parent, name) diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index f5977bfb0..6f4db992a 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -19,7 +19,7 @@ #include "smbview.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <tqheader.h> #include <tqapplication.h> @@ -52,9 +52,9 @@ SmbView::SmbView(TQWidget *parent, const char *name) m_proc = new TDEProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotSelectionChanged(TQListViewItem*))); } SmbView::~SmbView() @@ -140,7 +140,7 @@ void SmbView::init() while (!smb_stream.atEnd ()) { TQString smb_line = smb_stream.readLine (); - if (smb_line.contains (wins_keyword, FALSE) > 0) + if (smb_line.contains (wins_keyword, false) > 0) { TQString key = smb_line.section ('=', 0, 0); key = key.stripWhiteSpace(); diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h index 51193254e..7eb7623cb 100644 --- a/tdeprint/management/smbview.h +++ b/tdeprint/management/smbview.h @@ -27,7 +27,7 @@ class KTempFile; class SmbView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: SmbView(TQWidget *parent = 0, const char *name = 0); ~SmbView(); diff --git a/tdeprint/marginpreview.cpp b/tdeprint/marginpreview.cpp index 45f70b7f1..20fa3574b 100644 --- a/tdeprint/marginpreview.cpp +++ b/tdeprint/marginpreview.cpp @@ -37,16 +37,16 @@ static void draw3DPage(TQPainter *p, TQRect r) { // draw white page - p->fillRect(r,Qt::white); + p->fillRect(r,TQt::white); // draw 3D border - p->setPen(Qt::black); + p->setPen(TQt::black); p->moveTo(r.left(),r.bottom()); p->lineTo(r.right(),r.bottom()); p->lineTo(r.right(),r.top()); - p->setPen(Qt::darkGray); + p->setPen(TQt::darkGray); p->lineTo(r.left(),r.top()); p->lineTo(r.left(),r.bottom()); - p->setPen(Qt::gray); + p->setPen(TQt::gray); p->moveTo(r.left()+1,r.bottom()-1); p->lineTo(r.right()-1,r.bottom()-1); p->lineTo(r.right()-1,r.top()+1); @@ -189,7 +189,7 @@ void MarginPreview::mouseMoveEvent(TQMouseEvent *e) if (nopreview_ || state_ == Fixed) return; int pos = locateMouse(e->pos()); - if (state_ == None && e->button() == Qt::NoButton) + if (state_ == None && e->button() == TQt::NoButton) { switch (pos) { @@ -262,7 +262,7 @@ void MarginPreview::drawTempLine(TQPainter *p) void MarginPreview::mousePressEvent(TQMouseEvent *e) { - if (e->button() != Qt::LeftButton || state_ != None) + if (e->button() != TQt::LeftButton || state_ != None) return; int mpos = locateMouse(e->pos()); if (mpos) diff --git a/tdeprint/marginpreview.h b/tdeprint/marginpreview.h index e0ed3e775..6c01bde73 100644 --- a/tdeprint/marginpreview.h +++ b/tdeprint/marginpreview.h @@ -24,7 +24,7 @@ class MarginPreview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MarginPreview(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/marginvaluewidget.cpp b/tdeprint/marginvaluewidget.cpp index e4f1365c6..fc43b8bef 100644 --- a/tdeprint/marginvaluewidget.cpp +++ b/tdeprint/marginvaluewidget.cpp @@ -31,7 +31,7 @@ MarginValueWidget::MarginValueWidget(KNumInput *below, double value, TQWidget *p m_margin = ( float )value; setMode(m_mode); setRange(0, 999, 1, false); - connect(this, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotValueChanged(double))); + connect(this, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotValueChanged(double))); } float MarginValueWidget::margin() diff --git a/tdeprint/marginvaluewidget.h b/tdeprint/marginvaluewidget.h index 97f1409c1..1e9266d0e 100644 --- a/tdeprint/marginvaluewidget.h +++ b/tdeprint/marginvaluewidget.h @@ -24,7 +24,7 @@ class MarginValueWidget : public KDoubleNumInput { - Q_OBJECT + TQ_OBJECT public: enum Mode { Pixels = 0, IN, CM, MM }; MarginValueWidget(KNumInput *below, double value = 18.0, TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp index c483be123..d46cd8e2f 100644 --- a/tdeprint/marginwidget.cpp +++ b/tdeprint/marginwidget.cpp @@ -155,10 +155,10 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU TQWhatsThis::add(m_left, whatsThisLeftMarginWidget); m_right = new MarginValueWidget(m_left, 0.0, this); TQWhatsThis::add(m_right, whatsThisRightMarginWidget); - m_top->setLabel(i18n("&Top:"), Qt::AlignLeft|Qt::AlignVCenter); - m_bottom->setLabel(i18n("&Bottom:"), Qt::AlignLeft|Qt::AlignVCenter); - m_left->setLabel(i18n("Le&ft:"), Qt::AlignLeft|Qt::AlignVCenter); - m_right->setLabel(i18n("&Right:"), Qt::AlignLeft|Qt::AlignVCenter); + m_top->setLabel(i18n("&Top:"), TQt::AlignLeft|TQt::AlignVCenter); + m_bottom->setLabel(i18n("&Bottom:"), TQt::AlignLeft|TQt::AlignVCenter); + m_left->setLabel(i18n("Le&ft:"), TQt::AlignLeft|TQt::AlignVCenter); + m_right->setLabel(i18n("&Right:"), TQt::AlignLeft|TQt::AlignVCenter); m_units = new TQComboBox(this); TQWhatsThis::add(m_units, whatsThisMeasurementUnitMarginWidget); m_units->insertItem(i18n("Pixels (1/72nd in)")); @@ -169,25 +169,25 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU m_units->insertItem( i18n( "Millimeters (mm)" ) ); } m_units->setCurrentItem(0); - connect(m_units, TQT_SIGNAL(activated(int)), m_top, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_bottom, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_left, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_right, TQT_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_top, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_bottom, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_left, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_right, TQ_SLOT(setMode(int))); m_preview = new MarginPreview(this); TQWhatsThis::add(m_preview, whatsThisDragAndPreviewMarginWidget); m_preview->setMinimumSize(60, 80); m_preview->setPageSize(m_pagesize[ 0 ], m_pagesize[ 1 ]); - connect(m_preview, TQT_SIGNAL(marginChanged(int,float)), TQT_SLOT(slotMarginPreviewChanged(int,float))); - connect(m_top, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_bottom, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_left, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_right, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); + connect(m_preview, TQ_SIGNAL(marginChanged(int,float)), TQ_SLOT(slotMarginPreviewChanged(int,float))); + connect(m_top, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_bottom, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_left, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_right, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); slotMarginValueChanged(); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_top, TQT_SLOT(setEnabled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_left, TQT_SLOT(setEnabled(bool))); - //connect(m_custom, TQT_SIGNAL(toggled(bool)), m_units, TQT_SLOT(setEnabled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCustomMarginsToggled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_preview, TQT_SLOT(enableRubberBand(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_top, TQ_SLOT(setEnabled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_left, TQ_SLOT(setEnabled(bool))); + //connect(m_custom, TQ_SIGNAL(toggled(bool)), m_units, TQ_SLOT(setEnabled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCustomMarginsToggled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_preview, TQ_SLOT(enableRubberBand(bool))); m_top->setEnabled(false); m_bottom->setEnabled(false); m_left->setEnabled(false); @@ -237,8 +237,8 @@ void MarginWidget::setSymetricMargins(bool on) m_right->setEnabled(on && m_custom->isChecked()); if (on) { - connect(m_top, TQT_SIGNAL(marginChanged(float)), m_bottom, TQT_SLOT(setMargin(float))); - connect(m_left, TQT_SIGNAL(marginChanged(float)), m_right, TQT_SLOT(setMargin(float))); + connect(m_top, TQ_SIGNAL(marginChanged(float)), m_bottom, TQ_SLOT(setMargin(float))); + connect(m_left, TQ_SIGNAL(marginChanged(float)), m_right, TQ_SLOT(setMargin(float))); m_bottom->setMargin(m_top->margin()); m_right->setMargin(m_left->margin()); } diff --git a/tdeprint/marginwidget.h b/tdeprint/marginwidget.h index 0668beeb2..89e2e1af4 100644 --- a/tdeprint/marginwidget.h +++ b/tdeprint/marginwidget.h @@ -32,7 +32,7 @@ class TQComboBox; class TDEPRINT_EXPORT MarginWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: MarginWidget(TQWidget *parent = 0, const char *name = 0, bool allowMetricUnit = true); ~MarginWidget(); diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp index 7f642896e..a676e1cd6 100644 --- a/tdeprint/messagewindow.cpp +++ b/tdeprint/messagewindow.cpp @@ -50,7 +50,7 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, if ( delay == 0 ) slotTimer(); else - TQTimer::singleShot( delay, this, TQT_SLOT( slotTimer() ) ); + TQTimer::singleShot( delay, this, TQ_SLOT( slotTimer() ) ); } MessageWindow::~MessageWindow() @@ -65,7 +65,7 @@ void MessageWindow::slotTimer() if ( !isVisible() ) { show(); - kapp->processEvents(); + tdeApp->processEvents(); } } diff --git a/tdeprint/messagewindow.h b/tdeprint/messagewindow.h index 26de652db..7c64c0c5c 100644 --- a/tdeprint/messagewindow.h +++ b/tdeprint/messagewindow.h @@ -29,7 +29,7 @@ class TQLabel; class TDEPRINT_EXPORT MessageWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ~MessageWindow(); diff --git a/tdeprint/pics/tdeprint_landscape.png b/tdeprint/pics/tdeprint_landscape.png Binary files differindex 5182fd96a..967d3b9f2 100644..100755 --- a/tdeprint/pics/tdeprint_landscape.png +++ b/tdeprint/pics/tdeprint_landscape.png diff --git a/tdeprint/pics/tdeprint_portrait.png b/tdeprint/pics/tdeprint_portrait.png Binary files differindex 66ffe64c5..4a9df8298 100644..100755 --- a/tdeprint/pics/tdeprint_portrait.png +++ b/tdeprint/pics/tdeprint_portrait.png diff --git a/tdeprint/pics/tdeprint_revlandscape.png b/tdeprint/pics/tdeprint_revlandscape.png Binary files differindex e35e662d1..64ceb7230 100644..100755 --- a/tdeprint/pics/tdeprint_revlandscape.png +++ b/tdeprint/pics/tdeprint_revlandscape.png diff --git a/tdeprint/pics/tdeprint_revportrait.png b/tdeprint/pics/tdeprint_revportrait.png Binary files differindex a6ac5f9f6..89c04c92d 100644..100755 --- a/tdeprint/pics/tdeprint_revportrait.png +++ b/tdeprint/pics/tdeprint_revportrait.png diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp index b2a686f6e..22383ff98 100644 --- a/tdeprint/plugincombobox.cpp +++ b/tdeprint/plugincombobox.cpp @@ -63,7 +63,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name) m_pluginlist.append((*it).name); } - connect(m_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); + connect(m_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); configChanged(); } diff --git a/tdeprint/plugincombobox.h b/tdeprint/plugincombobox.h index fc217667b..247a20b53 100644 --- a/tdeprint/plugincombobox.h +++ b/tdeprint/plugincombobox.h @@ -30,7 +30,7 @@ class TQLabel; class TDEPRINT_EXPORT PluginComboBox : public TQWidget, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: PluginComboBox(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp index 80f9b1f81..1cfb53fd6 100644 --- a/tdeprint/posterpreview.cpp +++ b/tdeprint/posterpreview.cpp @@ -19,7 +19,7 @@ #include "posterpreview.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tqpainter.h> #include <tqsimplerichtext.h> #include <tqtimer.h> @@ -54,8 +54,8 @@ PosterPreview::~PosterPreview() void PosterPreview::init() { m_process = new TDEProcess; - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQ_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0; m_dirty = false; @@ -83,7 +83,7 @@ void PosterPreview::setDirty() if ( !m_dirty ) { m_dirty = true; - TQTimer::singleShot( 1, this, TQT_SLOT( updatePoster() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( updatePoster() ) ); } } @@ -144,9 +144,9 @@ void PosterPreview::drawContents( TQPainter *painter ) if ( pw > 0 && ph > 0 ) p->fillRect( x+m_mw+px, y+m_mh+py, TQMIN( pw, m_pw-2*m_mw-px ), TQMIN( ph, m_ph-2*m_mh-py ), ( selected ? TQColor(TDEGlobalSettings::highlightColor().dark( 160 )) : lightGray ) ); - p->setPen( Qt::DotLine ); + p->setPen( TQt::DotLine ); p->drawRect( x+m_mw, y+m_mh, m_pw-2*m_mw, m_ph-2*m_mh ); - p->setPen( Qt::SolidLine ); + p->setPen( TQt::SolidLine ); pw -= m_pw-2*m_mw-px; px = 0; @@ -177,7 +177,7 @@ void PosterPreview::mouseMoveEvent( TQMouseEvent *e ) void PosterPreview::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton && m_boundingrect.isValid() ) + if ( e->button() == TQt::LeftButton && m_boundingrect.isValid() ) { if ( m_boundingrect.contains( e->pos() ) ) { diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h index d9a23cb59..e5970dc9f 100644 --- a/tdeprint/posterpreview.h +++ b/tdeprint/posterpreview.h @@ -27,7 +27,7 @@ class TDEProcess; class PosterPreview : public TQFrame { - Q_OBJECT + TQ_OBJECT public: PosterPreview( TQWidget *parent = 0, const char *name = 0 ); PosterPreview( const TQString& postersize, const TQString& mediasize, TQWidget *parent = 0, const char *name = 0 ); diff --git a/tdeprint/ppdparser.y b/tdeprint/ppdparser.y index f750d9316..99677e65f 100644 --- a/tdeprint/ppdparser.y +++ b/tdeprint/ppdparser.y @@ -74,7 +74,7 @@ imgarea: IMGAREA OPTION ':' QUOTED { builder->putImageableArea | IMGAREA OPTION '/' TRANSLATION ':' QUOTED { builder->putImageableArea($2[0], $6[0]); } ; -openui: OPENUI OPTION ':' string { builder->openUi($2[0], QString::null, $4[0]); } +openui: OPENUI OPTION ':' string { builder->openUi($2[0], TQString::null, $4[0]); } | OPENUI OPTION '/' TRANSLATION ':' string { builder->openUi($2[0], $4[0], $6[0]); } ; @@ -82,7 +82,7 @@ endui: CLOSEUI ':' string { builder->endUi($3[0]); } | CLOSEUI string { builder->endUi($2[0]); } ; -opengroup: OPENGROUP ':' string { builder->openGroup($3.join(" "), QString::null); } +opengroup: OPENGROUP ':' string { builder->openGroup($3.join(" "), TQString::null); } | OPENGROUP ':' string '/' TRANSLATION { builder->openGroup($3.join(" "), $5[0]); } ; @@ -91,15 +91,15 @@ endgroup: CLOSEGROUP ':' string { builder->endGroup($3.join(" ; constraint: CONSTRAINT ':' KEYWORD OPTION KEYWORD OPTION { builder->putConstraint($3[0], $5[0], $4[0], $6[0]); } - | CONSTRAINT ':' KEYWORD OPTION KEYWORD { builder->putConstraint($3[0], $5[0], $4[0], QString::null); } - | CONSTRAINT ':' KEYWORD KEYWORD OPTION { builder->putConstraint($3[0], $4[0], QString::null, $5[0]); } - | CONSTRAINT ':' KEYWORD KEYWORD { builder->putConstraint($3[0], $4[0], QString::null, QString::null); } + | CONSTRAINT ':' KEYWORD OPTION KEYWORD { builder->putConstraint($3[0], $5[0], $4[0], TQString::null); } + | CONSTRAINT ':' KEYWORD KEYWORD OPTION { builder->putConstraint($3[0], $4[0], TQString::null, $5[0]); } + | CONSTRAINT ':' KEYWORD KEYWORD { builder->putConstraint($3[0], $4[0], TQString::null, TQString::null); } ; ppdelement: KEYWORD ':' value { builder->putStatement2($1[0], $3[0]); } - | KEYWORD OPTION ':' value { builder->putStatement($1[0], $2[0], QString::null, $4); } + | KEYWORD OPTION ':' value { builder->putStatement($1[0], $2[0], TQString::null, $4); } | KEYWORD OPTION '/' TRANSLATION ':' value { builder->putStatement($1[0], $2[0], $4[0], $6); } - | KEYWORD OPTION '/' ':' value { builder->putStatement($1[0], $2[0], QString::null, $4); } + | KEYWORD OPTION '/' ':' value { builder->putStatement($1[0], $2[0], TQString::null, $4); } | DEFAULT ':' string { builder->putDefault($1[0], $3[0]); } | DEFAULT ':' string '/' TRANSLATION { builder->putDefault($1[0], $3[0]); } | openui diff --git a/tdeprint/ppdscanner.cpp b/tdeprint/ppdscanner.cpp index 4b37737c0..8422b6c67 100644 --- a/tdeprint/ppdscanner.cpp +++ b/tdeprint/ppdscanner.cpp @@ -58,15 +58,6 @@ #endif /* __STDC__ */ #endif /* ! __cplusplus */ -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include <io.h> -#include <stdlib.h> -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - #ifdef YY_USE_CONST #define yyconst const #else diff --git a/tdeprint/ppdscanner.l b/tdeprint/ppdscanner.l index 168e3a535..361f94317 100644 --- a/tdeprint/ppdscanner.l +++ b/tdeprint/ppdscanner.l @@ -25,7 +25,7 @@ #define yylval tdeprint_ppdlval -QIODevice *tdeprint_ppdscanner_device = NULL; +TQIODevice *tdeprint_ppdscanner_device = NULL; #define YY_INPUT(buf,result,max_size) \ { \ if (tdeprint_ppdscanner_device) \ @@ -122,7 +122,7 @@ L [[:alnum:]] %% -void tdeprint_ppdscanner_init(QIODevice *d) +void tdeprint_ppdscanner_init(TQIODevice *d) { tdeprint_ppdscanner_device = d; tdeprint_ppdscanner_lno = 1; diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp index 870da43c4..38f914faf 100644 --- a/tdeprint/rlpr/kmproxywidget.cpp +++ b/tdeprint/rlpr/kmproxywidget.cpp @@ -29,7 +29,7 @@ #include <kcursor.h> KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) -: TQGroupBox(0, Qt::Vertical, i18n("Proxy Settings"), parent, name) +: TQGroupBox(0, TQt::Vertical, i18n("Proxy Settings"), parent, name) { TQLabel *m_hostlabel = new TQLabel(i18n("&Host:"), this); TQLabel *m_portlabel = new TQLabel(i18n("&Port:"), this); @@ -37,12 +37,12 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) m_useproxy->setCursor(KCursor::handCursor()); m_proxyhost = new TQLineEdit(this); m_proxyport = new TQLineEdit(this); - m_proxyport->setValidator(new TQIntValidator(TQT_TQOBJECT(m_proxyport))); + m_proxyport->setValidator(new TQIntValidator(m_proxyport)); m_hostlabel->setBuddy(m_proxyhost); m_portlabel->setBuddy(m_proxyport); - connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyhost,TQT_SLOT(setEnabled(bool))); - connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyport,TQT_SLOT(setEnabled(bool))); + connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyhost,TQ_SLOT(setEnabled(bool))); + connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyport,TQ_SLOT(setEnabled(bool))); m_proxyhost->setEnabled(false); m_proxyport->setEnabled(false); diff --git a/tdeprint/rlpr/kmrlprmanager.cpp b/tdeprint/rlpr/kmrlprmanager.cpp index 7b8ceac2d..1b7fbdc2e 100644 --- a/tdeprint/rlpr/kmrlprmanager.cpp +++ b/tdeprint/rlpr/kmrlprmanager.cpp @@ -25,7 +25,7 @@ #include <tqtextstream.h> #include <tqmap.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> KMRlprManager::KMRlprManager(TQObject *parent, const char *name, const TQStringList & /*args*/) diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp index 056cba1f0..1cb156342 100644 --- a/tdeprint/rlpr/kmwrlpr.cpp +++ b/tdeprint/rlpr/kmwrlpr.cpp @@ -63,7 +63,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name) TQLabel *m_queuelabel = new TQLabel(i18n("Queue:"), this); m_hostlabel->setBuddy(m_host); m_queuelabel->setBuddy(m_queue); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); TQHBoxLayout *lay0 = new TQHBoxLayout(this, 0, 10); TQVBoxLayout *lay1 = new TQVBoxLayout(0, 0, 5); diff --git a/tdeprint/rlpr/kmwrlpr.h b/tdeprint/rlpr/kmwrlpr.h index dc375303d..916390471 100644 --- a/tdeprint/rlpr/kmwrlpr.h +++ b/tdeprint/rlpr/kmwrlpr.h @@ -28,7 +28,7 @@ class TQListViewItem; class KMWRlpr : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWRlpr(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/rlpr/krlprprinterimpl.cpp b/tdeprint/rlpr/krlprprinterimpl.cpp index 4ef5ebe1e..e844367fe 100644 --- a/tdeprint/rlpr/krlprprinterimpl.cpp +++ b/tdeprint/rlpr/krlprprinterimpl.cpp @@ -24,7 +24,7 @@ #include "kmprinter.h" #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> @@ -44,10 +44,10 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) if (!rpr) return false; - QString host(rpr->option("host")), queue(rpr->option("queue")); + TQString host(rpr->option("host")), queue(rpr->option("queue")); if (!host.isEmpty() && !queue.isEmpty()) { - QString exestr = TDEStandardDirs::findExe("rlpr"); + TQString exestr = TDEStandardDirs::findExe("rlpr"); if (exestr.isEmpty()) { printer->setErrorMessage(i18n("The <b>%1</b> executable could not be found in your path. Check your installation.").arg("rlpr")); @@ -59,7 +59,7 @@ bool KRlprPrinterImpl::setupCommand(TQString& cmd, KPrinter *printer) // proxy settings TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("RLPR"); - QString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null); + TQString host = conf->readEntry("ProxyHost",TQString::null), port = conf->readEntry("ProxyPort",TQString::null); if (!host.isEmpty()) { cmd.append(" -X ").append(quote(host)); diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp index 311950e02..602329f33 100644 --- a/tdeprint/tdefilelist.cpp +++ b/tdeprint/tdefilelist.cpp @@ -107,38 +107,38 @@ KFileList::KFileList(TQWidget *parent, const char *name) m_files->setSelectionMode(TQListView::Extended); m_files->header()->setStretchEnabled(true, 2); TQWhatsThis::add(m_files, whatsThisFileSelectionListview); - connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(m_files, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); m_add = new TQToolButton(this); m_add->setIconSet(SmallIconSet("document-open")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddFile())); TQToolTip::add(m_add, i18n("Add file")); TQWhatsThis::add(m_add, whatsThisAddFileButton); m_remove = new TQToolButton(this); m_remove->setIconSet(SmallIconSet("remove")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveFile())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveFile())); TQToolTip::add(m_remove, i18n("Remove file")); TQWhatsThis::add(m_remove, whatsThisRemoveFileButton); m_remove->setEnabled(false); m_open = new TQToolButton(this); m_open->setIconSet(SmallIconSet("filefind")); - connect(m_open, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenFile())); + connect(m_open, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenFile())); TQToolTip::add(m_open, i18n("Open file")); TQWhatsThis::add(m_open, whatsThisOpenFileButton); m_open->setEnabled(false); m_up = new TQToolButton(this); m_up->setIconSet(SmallIconSet("go-up")); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); TQToolTip::add(m_up, i18n("Move up")); TQWhatsThis::add(m_up, whatsThisMoveFileUpButton); m_up->setEnabled(false); m_down = new TQToolButton(this); m_down->setIconSet(SmallIconSet("go-down")); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown())); TQToolTip::add(m_down, i18n("Move down")); TQWhatsThis::add(m_down, whatsThisMoveFileDownButton); m_down->setEnabled(false); diff --git a/tdeprint/tdefilelist.h b/tdeprint/tdefilelist.h index 912abd07a..0c36657ba 100644 --- a/tdeprint/tdefilelist.h +++ b/tdeprint/tdefilelist.h @@ -30,7 +30,7 @@ class TQListViewItem; class KFileList : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KFileList(TQWidget *parent = 0, const char *name = 0); virtual ~KFileList(); diff --git a/tdeprint/tdeprintcheck.cpp b/tdeprint/tdeprintcheck.cpp index a1985e804..25ab20f5c 100644 --- a/tdeprint/tdeprintcheck.cpp +++ b/tdeprint/tdeprintcheck.cpp @@ -38,7 +38,7 @@ #include "tdeprintcheck.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <kextsock.h> #include <tqfile.h> @@ -74,7 +74,7 @@ bool KdeprintChecker::check(const TQStringList& uris) bool KdeprintChecker::checkURL(const KURL& url) { - QString prot(url.protocol()); + TQString prot(url.protocol()); if (prot == "config") return checkConfig(url); else if (prot == "exec") @@ -89,7 +89,7 @@ bool KdeprintChecker::checkURL(const KURL& url) bool KdeprintChecker::checkConfig(const KURL& url) { // get the config filename (may contain a path) - QString f(url.path().mid(1)); + TQString f(url.path().mid(1)); bool state(false); // first check for standard KDE config file @@ -116,13 +116,13 @@ bool KdeprintChecker::checkConfig(const KURL& url) bool KdeprintChecker::checkExec(const KURL& url) { - QString execname(url.path().mid(1)); + TQString execname(url.path().mid(1)); return !(TDEStandardDirs::findExe(execname).isEmpty()); } bool KdeprintChecker::checkService(const KURL& url) { - QString serv(url.path().mid(1)); + TQString serv(url.path().mid(1)); KExtendedSocket sock; bool ok; diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 754f67c3c..c425bfe6a 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -31,7 +31,7 @@ #include <tqlabel.h> #include <kpushbutton.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <twin.h> #include <tdeapplication.h> #include <tqlayout.h> @@ -42,7 +42,7 @@ extern "C" { - KDE_EXPORT KDEDModule *create_tdeprintd(const TQCString& name) + TDE_EXPORT KDEDModule *create_tdeprintd(const TQCString& name) { return new KDEPrintd(name); } @@ -78,7 +78,7 @@ StatusWindow::StatusWindow(int pid) l0->addMultiCellWidget(m_label, 0, 0, 1, 2); l0->addWidget(m_button, 1, 2); l0->addMultiCellWidget(m_icon, 0, 1, 0, 0); - connect(m_button, TQT_SIGNAL(clicked()), TQT_SLOT(hide())); + connect(m_button, TQ_SIGNAL(clicked()), TQ_SLOT(hide())); resize(200, 50); } @@ -115,15 +115,15 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla TQString command(cmd); TQRegExp re( "\\$out\\{([^}]*)\\}" ); - connect(proc,TQT_SIGNAL(printTerminated(KPrintProcess*)),TQT_SLOT(slotPrintTerminated(KPrintProcess*))); - connect(proc,TQT_SIGNAL(printError(KPrintProcess*,const TQString&)),TQT_SLOT(slotPrintError(KPrintProcess*,const TQString&))); + connect(proc,TQ_SIGNAL(printTerminated(KPrintProcess*)),TQ_SLOT(slotPrintTerminated(KPrintProcess*))); + connect(proc,TQ_SIGNAL(printError(KPrintProcess*,const TQString&)),TQ_SLOT(slotPrintError(KPrintProcess*,const TQString&))); proc->setCommand( command ); if ( re.search( command ) != -1 ) { KURL url( re.cap( 1 ) ); if ( !url.isLocalFile() ) { - TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + kapp->randomString( 8 ) ); + TQString tmpFilename = locateLocal( "tmp", "tdeprint_" + tdeApp->randomString( 8 ) ); command.replace( re, TDEProcess::quote( tmpFilename ) ); proc->setOutput( re.cap( 1 ) ); proc->setTempOutput( tmpFilename ); @@ -200,7 +200,7 @@ void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appN w->setCaption(i18n("Printing Status - %1").arg("(pid="+TQString::number(pid)+")")); else w->setCaption(i18n("Printing Status - %1").arg(appName)); - connect(w, TQT_SIGNAL(destroyed()), TQT_SLOT(slotClosed())); + connect(w, TQ_SIGNAL(destroyed()), TQ_SLOT(slotClosed())); w->show(); m_windows.insert(pid, w); } @@ -242,7 +242,7 @@ TQString KDEPrintd::requestPassword( const TQString& user, const TQString& host, req->transaction = callingDcopClient()->beginTransaction(); m_requestsPending.append( req ); if ( m_requestsPending.count() == 1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) ); return "::"; } @@ -291,7 +291,7 @@ void KDEPrintd::processRequest() m_requestsPending.remove( ( unsigned int )0 ); if ( m_requestsPending.count() > 0 ) - TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) ); } void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, const TQString& host, int port ) diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h index 4ef54b894..e8a5fe51f 100644 --- a/tdeprint/tdeprintd.h +++ b/tdeprint/tdeprintd.h @@ -33,7 +33,7 @@ class StatusWindow; class KDEPrintd : public KDEDModule { - Q_OBJECT + TQ_OBJECT K_DCOP public: diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index e60aae845..8c44543d9 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -28,7 +28,7 @@ void drawColorWheel( TQPainter *p ) { TQFont f( "times", 18, TQFont::Bold ); p->setFont( f ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->setWindow( 0, 0, 500, 500 ); // defines coordinate system for ( int i=0; i<36; i++ ) { // draws 36 rotated rectangles @@ -83,12 +83,12 @@ void drawFonts( TQPainter *p ) void drawShapes( TQPainter *p ) { - TQBrush b1( Qt::blue ); - TQBrush b2( Qt::green, Qt::Dense6Pattern ); // green 12% fill - TQBrush b3( Qt::NoBrush ); // void brush - TQBrush b4( Qt::CrossPattern ); // black cross pattern + TQBrush b1( TQt::blue ); + TQBrush b2( TQt::green, TQt::Dense6Pattern ); // green 12% fill + TQBrush b3( TQt::NoBrush ); // void brush + TQBrush b4( TQt::CrossPattern ); // black cross pattern - p->setPen( Qt::red ); + p->setPen( TQt::red ); p->setBrush( b1 ); p->drawRect( 10, 10, 200, 100 ); p->setBrush( b2 ); @@ -133,7 +133,7 @@ DrawView::DrawView() // Create a button group to contain all buttons bgroup = new TQButtonGroup( this ); bgroup->resize( 200, 200 ); - connect( bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateIt(int)) ); + connect( bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateIt(int)) ); // Calculate the size for the radio buttons int maxwidth = 80; @@ -164,7 +164,7 @@ DrawView::DrawView() print = new TQPushButton( "Print...", bgroup ); print->resize( 80, 30 ); print->move( maxwidth/2 - print->width()/2, maxindex*30+20 ); - connect( print, TQT_SIGNAL(clicked()), TQT_SLOT(printIt()) ); + connect( print, TQ_SIGNAL(clicked()), TQ_SLOT(printIt()) ); bgroup->resize( maxwidth, print->y()+print->height()+10 ); diff --git a/tdeprint/tests/drawdemo.h b/tdeprint/tests/drawdemo.h index 963da64db..13f1df77a 100644 --- a/tdeprint/tests/drawdemo.h +++ b/tdeprint/tests/drawdemo.h @@ -8,7 +8,7 @@ class DrawView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DrawView(); ~DrawView(); diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp index 2f172acc0..c9188c25f 100644 --- a/tdeprint/tests/helpwindow.cpp +++ b/tdeprint/tests/helpwindow.cpp @@ -48,26 +48,26 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, browser = new TQTextBrowser( this ); browser->mimeSourceFactory()->setFilePath( _path ); browser->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - connect( browser, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( textChanged() ) ); + connect( browser, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( textChanged() ) ); setCentralWidget( browser ); if ( !home_.isEmpty() ) browser->setSource( home_ ); - connect( browser, TQT_SIGNAL( highlighted( const TQString&) ), - statusBar(), TQT_SLOT( message( const TQString&)) ); + connect( browser, TQ_SIGNAL( highlighted( const TQString&) ), + statusBar(), TQ_SLOT( message( const TQString&)) ); resize( 640,700 ); TQPopupMenu* file = new TQPopupMenu( this ); - file->insertItem( "&New Window", this, TQT_SLOT( newWindow() ), ALT | Key_N ); - file->insertItem( "&Open File", this, TQT_SLOT( openFile() ), ALT | Key_O ); - file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P ); + file->insertItem( "&New Window", this, TQ_SLOT( newWindow() ), ALT | Key_N ); + file->insertItem( "&Open File", this, TQ_SLOT( openFile() ), ALT | Key_O ); + file->insertItem( "&Print", this, TQ_SLOT( print() ), ALT | Key_P ); file->insertSeparator(); - file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q ); - file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); + file->insertItem( "&Close", this, TQ_SLOT( close() ), ALT | Key_Q ); + file->insertItem( "E&xit", tqApp, TQ_SLOT( closeAllWindows() ), ALT | Key_X ); // The same three icons are used twice each. TQIconSet icon_back( TQPixmap("back.xpm") ); @@ -76,33 +76,33 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, TQPopupMenu* go = new TQPopupMenu( this ); backwardId = go->insertItem( icon_back, - "&Backward", browser, TQT_SLOT( backward() ), + "&Backward", browser, TQ_SLOT( backward() ), ALT | Key_Left ); forwardId = go->insertItem( icon_forward, - "&Forward", browser, TQT_SLOT( forward() ), + "&Forward", browser, TQ_SLOT( forward() ), ALT | Key_Right ); - go->insertItem( icon_home, "&Home", browser, TQT_SLOT( home() ) ); + go->insertItem( icon_home, "&Home", browser, TQ_SLOT( home() ) ); TQPopupMenu* help = new TQPopupMenu( this ); - help->insertItem( "&About ...", this, TQT_SLOT( about() ) ); - help->insertItem( "About &Qt ...", this, TQT_SLOT( aboutQt() ) ); + help->insertItem( "&About ...", this, TQ_SLOT( about() ) ); + help->insertItem( "About &Qt ...", this, TQ_SLOT( aboutQt() ) ); hist = new TQPopupMenu( this ); TQStringList::Iterator it = history.begin(); for ( ; it != history.end(); ++it ) mHistory[ hist->insertItem( *it ) ] = *it; - connect( hist, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( histChosen( int ) ) ); + connect( hist, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( histChosen( int ) ) ); bookm = new TQPopupMenu( this ); - bookm->insertItem( tr( "Add Bookmark" ), this, TQT_SLOT( addBookmark() ) ); + bookm->insertItem( tr( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) ); bookm->insertSeparator(); TQStringList::Iterator it2 = bookmarks.begin(); for ( ; it2 != bookmarks.end(); ++it2 ) mBookmarks[ bookm->insertItem( *it2 ) ] = *it2; - connect( bookm, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( bookmChosen( int ) ) ); + connect( bookm, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( bookmChosen( int ) ) ); menuBar()->insertItem( tr("&File"), file ); menuBar()->insertItem( tr("&Go"), go ); @@ -113,29 +113,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, menuBar()->setItemEnabled( forwardId, false); menuBar()->setItemEnabled( backwardId, false); - connect( browser, TQT_SIGNAL( backwardAvailable( bool ) ), - this, TQT_SLOT( setBackwardAvailable( bool ) ) ); - connect( browser, TQT_SIGNAL( forwardAvailable( bool ) ), - this, TQT_SLOT( setForwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( backwardAvailable( bool ) ), + this, TQ_SLOT( setBackwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( forwardAvailable( bool ) ), + this, TQ_SLOT( setForwardAvailable( bool ) ) ); TQToolBar* toolbar = new TQToolBar( this ); addToolBar( toolbar, "Toolbar"); TQToolButton* button; - button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQT_SLOT(backward()), toolbar ); - connect( browser, TQT_SIGNAL( backwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT(backward()), toolbar ); + connect( browser, TQ_SIGNAL( backwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( false ); - button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQT_SLOT(forward()), toolbar ); - connect( browser, TQT_SIGNAL( forwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT(forward()), toolbar ); + connect( browser, TQ_SIGNAL( forwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( false ); - button = new TQToolButton( icon_home, tr("Home"), "", browser, TQT_SLOT(home()), toolbar ); + button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT(home()), toolbar ); toolbar->addSeparator(); pathCombo = new TQComboBox( true, toolbar ); - connect( pathCombo, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( pathSelected( const TQString & ) ) ); + connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( pathSelected( const TQString & ) ) ); toolbar->setStretchableWidget( pathCombo ); setRightJustification( true ); setDockEnabled( DockLeft, false ); diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h index 2ff3d3649..53a424d1b 100644 --- a/tdeprint/tests/helpwindow.h +++ b/tdeprint/tests/helpwindow.h @@ -22,7 +22,7 @@ class TQPopupMenu; class HelpWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: HelpWindow( const TQString& home_, const TQString& path, TQWidget* parent = 0, const char *name=0 ); ~HelpWindow(); diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp index c91cd23a7..0405fafe3 100644 --- a/tdeprint/tests/main.cpp +++ b/tdeprint/tests/main.cpp @@ -34,8 +34,8 @@ int main( int argc, char ** argv ) else help->showMaximized(); - TQObject::connect( &a, TQT_SIGNAL(lastWindowClosed()), - &a, TQT_SLOT(quit()) ); + TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()), + &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/tdeprint/tests/richpage.cpp b/tdeprint/tests/richpage.cpp index f12040b71..4abc71ea2 100644 --- a/tdeprint/tests/richpage.cpp +++ b/tdeprint/tests/richpage.cpp @@ -57,7 +57,7 @@ RichPage::~RichPage() void RichPage::setOptions(const TQMap<TQString,TQString>& opts) { - QString value; + TQString value; value = opts["app-rich-margin"]; if (!value.isEmpty()) diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index 901d509c9..232d10740 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -24,10 +24,10 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqaccel.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kdialogbase.h> #include <klibloader.h> @@ -39,23 +39,23 @@ class EscpFactory : public KLibFactory public: EscpFactory(TQObject *parent = 0, const char *name = 0) : KLibFactory(parent, name) {} protected: - TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList()) + TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList()) { Q_UNUSED(className); - KDialogBase *dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); + KDialogBase *dlg = new KDialogBase(static_cast<TQWidget*>(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); EscpWidget *w = new EscpWidget(dlg); if (args.count() > 0) w->setDevice(args[0]); if (args.count() > 1) w->setPrinterName(args[1]); dlg->setMainWidget(w); - return TQT_TQOBJECT(dlg); + return dlg; } }; extern "C" { - void* init_tdeprint_tool_escputil() KDE_EXPORT; + void* init_tdeprint_tool_escputil() TDE_EXPORT; void* init_tdeprint_tool_escputil() { return new EscpFactory; @@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) { m_hasoutput = false; - connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); TQPushButton *cleanbtn = new TQPushButton(this, "-c"); cleanbtn->setPixmap(DesktopIcon("application-x-executable")); @@ -90,11 +90,11 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) m_device->setFont(f); m_useraw = new TQCheckBox(i18n("&Use direct connection (might need root permissions)"), this); - connect(cleanbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(nozzlebtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(alignbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); + connect(cleanbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(nozzlebtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(alignbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(inkbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(identbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); TQLabel *printerlab = new TQLabel(i18n("Printer:"), this); printerlab->setAlignment(AlignRight|AlignVCenter); @@ -243,7 +243,7 @@ void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len) void EscpWidget::slotButtonClicked() { - TQString arg = TQT_TQOBJECT_CONST(sender())->name(); + TQString arg = sender()->name(); startCommand(arg); } diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h index 4ad284d00..b6f6abd75 100644 --- a/tdeprint/tools/escputil/escpwidget.h +++ b/tdeprint/tools/escputil/escpwidget.h @@ -21,7 +21,7 @@ #define ESCPWIDGET_H #include <tqwidget.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kurl.h> class TQLabel; @@ -29,7 +29,7 @@ class TQCheckBox; class EscpWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: EscpWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/treecombobox.cpp b/tdeprint/treecombobox.cpp index 5cee0cacc..1cbbb0c72 100644 --- a/tdeprint/treecombobox.cpp +++ b/tdeprint/treecombobox.cpp @@ -123,7 +123,7 @@ void TreeListBoxItem::paint(TQPainter *p) p->drawPixmap(xo, yo, *pix); xo += (pix->width() + 2); } - p->drawText(xo, 0, r.width()-xo, height(listBox()), Qt::AlignLeft, m_path[m_depth]); + p->drawText(xo, 0, r.width()-xo, height(listBox()), TQt::AlignLeft, m_path[m_depth]); } //----------------------------------------------------------------------------------------- |
