diff options
Diffstat (limited to 'tdeprint/cups/cupsdconf2')
33 files changed, 153 insertions, 142 deletions
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 3772b35d0..907459c65 100644 --- a/tdeprint/cups/cupsdconf2/cups-util.c +++ b/tdeprint/cups/cupsdconf2/cups-util.c @@ -237,11 +237,11 @@ cupsGetConf(void) while ((bytes = #if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - httpRead + httpRead(cups_server, buffer, sizeof(buffer)) #else - httpRead2 + httpRead2(cups_server, buffer, sizeof(buffer)) #endif - (cups_server, buffer, sizeof(buffer))) > 0) + ) > 0) { write(fd, buffer, bytes); } @@ -341,21 +341,22 @@ cupsPutConf(const char *name) /* I - Name of the config file to send */ break; } else + { #if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - httpWrite + httpWrite(cups_server, buffer, bytes); #else - httpWrite2 + httpWrite2(cups_server, buffer, bytes); #endif - (cups_server, buffer, bytes); + } if (status == HTTP_CONTINUE) { #if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2) - httpWrite + httpWrite(cups_server, buffer, 0); #else - httpWrite2 + httpWrite2(cups_server, buffer, 0); #endif - (cups_server, buffer, 0); + while ((status = httpUpdate(cups_server)) == HTTP_CONTINUE); } @@ -512,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); |
