From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdeprint/management/cjanuswidget.cpp | 72 ++-- kdeprint/management/cjanuswidget.h | 24 +- kdeprint/management/jobitem.cpp | 14 +- kdeprint/management/jobitem.h | 12 +- kdeprint/management/kdeprint_management_module.cpp | 8 +- kdeprint/management/kiconselectaction.cpp | 16 +- kdeprint/management/kiconselectaction.h | 6 +- kdeprint/management/kmconfigcommand.cpp | 16 +- kdeprint/management/kmconfigcommand.h | 2 +- kdeprint/management/kmconfigdialog.cpp | 14 +- kdeprint/management/kmconfigdialog.h | 6 +- kdeprint/management/kmconfigfilter.cpp | 48 +-- kdeprint/management/kmconfigfilter.h | 2 +- kdeprint/management/kmconfigfonts.cpp | 62 ++-- kdeprint/management/kmconfigfonts.h | 4 +- kdeprint/management/kmconfiggeneral.cpp | 48 +-- kdeprint/management/kmconfiggeneral.h | 4 +- kdeprint/management/kmconfigjobs.cpp | 12 +- kdeprint/management/kmconfigjobs.h | 2 +- kdeprint/management/kmconfigpage.cpp | 4 +- kdeprint/management/kmconfigpage.h | 16 +- kdeprint/management/kmconfigpreview.cpp | 22 +- kdeprint/management/kmconfigpreview.h | 2 +- kdeprint/management/kmdbcreator.cpp | 34 +- kdeprint/management/kmdbcreator.h | 12 +- kdeprint/management/kmdriverdb.cpp | 38 +- kdeprint/management/kmdriverdb.h | 28 +- kdeprint/management/kmdriverdbwidget.cpp | 92 ++--- kdeprint/management/kmdriverdbwidget.h | 20 +- kdeprint/management/kmdriverdialog.cpp | 2 +- kdeprint/management/kmdriverdialog.h | 2 +- kdeprint/management/kmiconview.cpp | 70 ++-- kdeprint/management/kmiconview.h | 26 +- kdeprint/management/kminfopage.cpp | 68 ++-- kdeprint/management/kminfopage.h | 6 +- kdeprint/management/kminstancepage.cpp | 72 ++-- kdeprint/management/kminstancepage.h | 12 +- kdeprint/management/kmjobviewer.cpp | 148 ++++---- kdeprint/management/kmjobviewer.h | 30 +- kdeprint/management/kmlistview.cpp | 72 ++-- kdeprint/management/kmlistview.h | 22 +- kdeprint/management/kmmainview.cpp | 156 ++++----- kdeprint/management/kmmainview.h | 18 +- kdeprint/management/kmpages.cpp | 6 +- kdeprint/management/kmpages.h | 8 +- kdeprint/management/kmprinterview.cpp | 32 +- kdeprint/management/kmprinterview.h | 16 +- kdeprint/management/kmpropbackend.cpp | 16 +- kdeprint/management/kmpropbackend.h | 2 +- kdeprint/management/kmpropcontainer.cpp | 20 +- kdeprint/management/kmpropcontainer.h | 4 +- kdeprint/management/kmpropdriver.cpp | 20 +- kdeprint/management/kmpropdriver.h | 2 +- kdeprint/management/kmpropertypage.cpp | 12 +- kdeprint/management/kmpropertypage.h | 6 +- kdeprint/management/kmpropgeneral.cpp | 20 +- kdeprint/management/kmpropgeneral.h | 2 +- kdeprint/management/kmpropmembers.cpp | 14 +- kdeprint/management/kmpropmembers.h | 2 +- kdeprint/management/kmpropwidget.cpp | 8 +- kdeprint/management/kmpropwidget.h | 10 +- kdeprint/management/kmspecialprinterdlg.cpp | 86 ++--- kdeprint/management/kmspecialprinterdlg.h | 4 +- kdeprint/management/kmtimer.cpp | 6 +- kdeprint/management/kmtimer.h | 4 +- kdeprint/management/kmwbackend.cpp | 34 +- kdeprint/management/kmwbackend.h | 10 +- kdeprint/management/kmwclass.cpp | 38 +- kdeprint/management/kmwclass.h | 4 +- kdeprint/management/kmwdriver.cpp | 20 +- kdeprint/management/kmwdriver.h | 4 +- kdeprint/management/kmwdriverselect.cpp | 20 +- kdeprint/management/kmwdriverselect.h | 4 +- kdeprint/management/kmwdrivertest.cpp | 32 +- kdeprint/management/kmwdrivertest.h | 2 +- kdeprint/management/kmwend.cpp | 24 +- kdeprint/management/kmwend.h | 2 +- kdeprint/management/kmwfile.cpp | 18 +- kdeprint/management/kmwfile.h | 4 +- kdeprint/management/kmwinfobase.cpp | 28 +- kdeprint/management/kmwinfobase.h | 18 +- kdeprint/management/kmwinfopage.cpp | 10 +- kdeprint/management/kmwinfopage.h | 2 +- kdeprint/management/kmwizard.cpp | 32 +- kdeprint/management/kmwizard.h | 12 +- kdeprint/management/kmwizardpage.cpp | 6 +- kdeprint/management/kmwizardpage.h | 8 +- kdeprint/management/kmwlocal.cpp | 64 ++-- kdeprint/management/kmwlocal.h | 12 +- kdeprint/management/kmwlpd.cpp | 10 +- kdeprint/management/kmwlpd.h | 4 +- kdeprint/management/kmwname.cpp | 16 +- kdeprint/management/kmwname.h | 4 +- kdeprint/management/kmwpassword.cpp | 54 +-- kdeprint/management/kmwpassword.h | 10 +- kdeprint/management/kmwsmb.cpp | 44 +-- kdeprint/management/kmwsmb.h | 8 +- kdeprint/management/kmwsocket.cpp | 48 +-- kdeprint/management/kmwsocket.h | 6 +- kdeprint/management/kmwsocketutil.cpp | 60 ++-- kdeprint/management/kmwsocketutil.h | 16 +- kdeprint/management/kxmlcommanddlg.cpp | 388 ++++++++++----------- kdeprint/management/kxmlcommanddlg.h | 42 +-- kdeprint/management/kxmlcommandselector.cpp | 90 ++--- kdeprint/management/kxmlcommandselector.h | 14 +- kdeprint/management/networkscanner.cpp | 124 +++---- kdeprint/management/networkscanner.h | 18 +- kdeprint/management/pluginaction.cpp | 4 +- kdeprint/management/pluginaction.h | 2 +- kdeprint/management/sidepixmap.cpp | 16 +- kdeprint/management/sidepixmap.h | 10 +- kdeprint/management/smbview.cpp | 72 ++-- kdeprint/management/smbview.h | 10 +- 113 files changed, 1561 insertions(+), 1561 deletions(-) (limited to 'kdeprint/management') diff --git a/kdeprint/management/cjanuswidget.cpp b/kdeprint/management/cjanuswidget.cpp index a2ea52b2e..7bad07264 100644 --- a/kdeprint/management/cjanuswidget.cpp +++ b/kdeprint/management/cjanuswidget.cpp @@ -19,11 +19,11 @@ #include "cjanuswidget.h" -#include -#include -#include +#include +#include +#include #include -#include +#include #include class CJanusWidget::CPage @@ -41,35 +41,35 @@ public: class CJanusWidget::CListBoxItem : public QListBoxItem { public: - CListBoxItem(QListBox *lb, QListBoxItem *after, const QPixmap& pix, const QString& text); - int height(const QListBox*) const; - int width(const QListBox*) const; + CListBoxItem(TQListBox *lb, TQListBoxItem *after, const TQPixmap& pix, const TQString& text); + int height(const TQListBox*) const; + int width(const TQListBox*) const; protected: - void paint(QPainter*); + void paint(TQPainter*); private: QPixmap m_pix; }; -CJanusWidget::CListBoxItem::CListBoxItem(QListBox *lb, QListBoxItem *after, const QPixmap& pix, const QString& text) -: QListBoxItem(lb, after), m_pix(pix) +CJanusWidget::CListBoxItem::CListBoxItem(TQListBox *lb, TQListBoxItem *after, const TQPixmap& pix, const TQString& text) +: TQListBoxItem(lb, after), m_pix(pix) { setText(text); } -int CJanusWidget::CListBoxItem::height(const QListBox *lb) const +int CJanusWidget::CListBoxItem::height(const TQListBox *lb) const { return (m_pix.height() + lb->fontMetrics().lineSpacing() + 12); } -int CJanusWidget::CListBoxItem::width(const QListBox *lb) const +int CJanusWidget::CListBoxItem::width(const TQListBox *lb) const { int w = QMAX(lb->fontMetrics().width(text()),m_pix.width()); return (w + 10); } -void CJanusWidget::CListBoxItem::paint(QPainter *p) +void CJanusWidget::CListBoxItem::paint(TQPainter *p) { int w1 = (listBox()->contentsWidth()-m_pix.width())/2; @@ -82,16 +82,16 @@ void CJanusWidget::CListBoxItem::paint(QPainter *p) class CJanusWidget::CListBox : public KListBox { public: - CListBox(QWidget *parent = 0, const char *name = 0); + CListBox(TQWidget *parent = 0, const char *name = 0); ~CListBox(); void computeWidth(); protected: - virtual bool eventFilter(QObject*, QEvent*); + virtual bool eventFilter(TQObject*, TQEvent*); }; -CJanusWidget::CListBox::CListBox(QWidget *parent, const char *name) +CJanusWidget::CListBox::CListBox(TQWidget *parent, const char *name) : KListBox(parent,name) { verticalScrollBar()->installEventFilter(this); @@ -101,9 +101,9 @@ CJanusWidget::CListBox::~CListBox() { } -bool CJanusWidget::CListBox::eventFilter(QObject *o, QEvent *e) +bool CJanusWidget::CListBox::eventFilter(TQObject *o, TQEvent *e) { - if (e->type() == QEvent::Show || e->type() == QEvent::Hide) + if (e->type() == TQEvent::Show || e->type() == TQEvent::Hide) computeWidth(); return KListBox::eventFilter(o,e); } @@ -125,13 +125,13 @@ void CJanusWidget::CListBox::computeWidth() //*********************************************************************************** -CJanusWidget::CJanusWidget(QWidget *parent, const char *name) -: QWidget(parent,name) +CJanusWidget::CJanusWidget(TQWidget *parent, const char *name) +: TQWidget(parent,name) { m_pages.setAutoDelete(true); - m_stack = new QWidgetStack(this); - m_header = new QLabel(this); + m_stack = new TQWidgetStack(this); + m_header = new TQLabel(this); QFont f(m_header->font()); f.setBold(true); m_header->setFont(f); @@ -143,13 +143,13 @@ CJanusWidget::CJanusWidget(QWidget *parent, const char *name) f = m_iconlist->font(); f.setBold(true); m_iconlist->setFont(f); - connect(m_iconlist,SIGNAL(selectionChanged(QListBoxItem*)),SLOT(slotSelected(QListBoxItem*))); + connect(m_iconlist,TQT_SIGNAL(selectionChanged(TQListBoxItem*)),TQT_SLOT(slotSelected(TQListBoxItem*))); - m_empty = new QWidget(this, "Empty"); + m_empty = new TQWidget(this, "Empty"); m_stack->addWidget(m_empty,0); - QHBoxLayout *main_ = new QHBoxLayout(this, 0, 10); - QVBoxLayout *sub_ = new QVBoxLayout(0, 0, 5); + QHBoxLayout *main_ = new TQHBoxLayout(this, 0, 10); + QVBoxLayout *sub_ = new TQVBoxLayout(0, 0, 5); main_->addWidget(m_iconlist,0); main_->addLayout(sub_,1); sub_->addWidget(m_header,0); @@ -161,7 +161,7 @@ CJanusWidget::~CJanusWidget() { } -void CJanusWidget::addPage(QWidget *w, const QString& text, const QString& header, const QPixmap& pix) +void CJanusWidget::addPage(TQWidget *w, const TQString& text, const TQString& header, const TQPixmap& pix) { CPage *page = new CPage(); m_pages.append(page); @@ -177,7 +177,7 @@ void CJanusWidget::addPage(QWidget *w, const QString& text, const QString& heade m_iconlist->setSelected(page->m_item,true); } -void CJanusWidget::enablePage(QWidget *w) +void CJanusWidget::enablePage(TQWidget *w) { CPage *page = findPage(w); if (page && !page->m_item) @@ -189,7 +189,7 @@ void CJanusWidget::enablePage(QWidget *w) } } -void CJanusWidget::disablePage(QWidget *w) +void CJanusWidget::disablePage(TQWidget *w) { CPage *page = findPage(w); if (page && page->m_item) @@ -206,7 +206,7 @@ void CJanusWidget::disablePage(QWidget *w) } } -void CJanusWidget::slotSelected(QListBoxItem *item) +void CJanusWidget::slotSelected(TQListBoxItem *item) { CPage *page = findPage(item); if (page) @@ -221,25 +221,25 @@ void CJanusWidget::slotSelected(QListBoxItem *item) } } -CJanusWidget::CPage* CJanusWidget::findPage(QWidget *w) +CJanusWidget::CPage* CJanusWidget::findPage(TQWidget *w) { - QPtrListIterator it(m_pages); + TQPtrListIterator it(m_pages); for (;it.current();++it) if (it.current()->m_widget == w) return it.current(); return 0; } -CJanusWidget::CPage* CJanusWidget::findPage(QListBoxItem *i) +CJanusWidget::CPage* CJanusWidget::findPage(TQListBoxItem *i) { - QPtrListIterator it(m_pages); + TQPtrListIterator it(m_pages); for (;it.current();++it) if (it.current()->m_item == i) return it.current(); return 0; } -QListBoxItem* CJanusWidget::findPrevItem(CPage *p) +TQListBoxItem* CJanusWidget::findPrevItem(CPage *p) { if (m_pages.findRef(p) == -1) m_pages.last(); @@ -253,7 +253,7 @@ QListBoxItem* CJanusWidget::findPrevItem(CPage *p) void CJanusWidget::clearPages() { - QPtrListIterator it(m_pages); + TQPtrListIterator it(m_pages); for (;it.current(); ++it) { delete it.current()->m_widget; diff --git a/kdeprint/management/cjanuswidget.h b/kdeprint/management/cjanuswidget.h index b0d1da50f..7bfb2ab46 100644 --- a/kdeprint/management/cjanuswidget.h +++ b/kdeprint/management/cjanuswidget.h @@ -20,9 +20,9 @@ #ifndef CJANUSWIDGET_H #define CJANUSWIDGET_H -#include -#include -#include +#include +#include +#include class QWidgetStack; class QLabel; @@ -32,16 +32,16 @@ class CJanusWidget : public QWidget { Q_OBJECT public: - CJanusWidget(QWidget *parent, const char *name); + CJanusWidget(TQWidget *parent, const char *name); ~CJanusWidget(); - void addPage(QWidget *w, const QString& text, const QString& header, const QPixmap& pix); - void enablePage(QWidget *w); - void disablePage(QWidget *w); + void addPage(TQWidget *w, const TQString& text, const TQString& header, const TQPixmap& pix); + void enablePage(TQWidget *w); + void disablePage(TQWidget *w); void clearPages(); protected slots: - void slotSelected(QListBoxItem*); + void slotSelected(TQListBoxItem*); public: class CPage; @@ -49,12 +49,12 @@ public: class CListBoxItem; private: - CPage* findPage(QWidget *w); - CPage* findPage(QListBoxItem *i); - QListBoxItem* findPrevItem(CPage*); + CPage* findPage(TQWidget *w); + CPage* findPage(TQListBoxItem *i); + TQListBoxItem* findPrevItem(CPage*); private: - QPtrList m_pages; + TQPtrList m_pages; CListBox *m_iconlist; QLabel *m_header; QWidgetStack *m_stack; diff --git a/kdeprint/management/jobitem.cpp b/kdeprint/management/jobitem.cpp index 61a2eaf9d..171a91657 100644 --- a/kdeprint/management/jobitem.cpp +++ b/kdeprint/management/jobitem.cpp @@ -22,8 +22,8 @@ #include -JobItem::JobItem(QListView *parent, KMJob *job) -: QListViewItem(parent) +JobItem::JobItem(TQListView *parent, KMJob *job) +: TQListViewItem(parent) { m_job = new KMJob; init(job); @@ -39,13 +39,13 @@ void JobItem::init(KMJob *job) m_job->copy(job ? *job : KMJob()); setPixmap(0,SmallIcon(m_job->pixmap())); - setText(0,QString::number(m_job->id())); + setText(0,TQString::number(m_job->id())); //setText(6,m_job->printer()); setText(2,m_job->name()); setText(1,m_job->owner()); setText(3,m_job->stateString()); - setText(4,QString::number(m_job->size())); - setText(5,QString::number(m_job->processedPages())); + setText(4,TQString::number(m_job->size())); + setText(5,TQString::number(m_job->processedPages())); m_ID = m_job->id(); m_uri = m_job->uri(); @@ -56,7 +56,7 @@ void JobItem::init(KMJob *job) widthChanged(); } -int JobItem::compare(QListViewItem *item, int col, bool asc) const +int JobItem::compare(TQListViewItem *item, int col, bool asc) const { switch (col) { @@ -69,6 +69,6 @@ int JobItem::compare(QListViewItem *item, int col, bool asc) const break; } default: - return QListViewItem::compare(item, col, asc); + return TQListViewItem::compare(item, col, asc); } } diff --git a/kdeprint/management/jobitem.h b/kdeprint/management/jobitem.h index fdb310b31..31c7923d8 100644 --- a/kdeprint/management/jobitem.h +++ b/kdeprint/management/jobitem.h @@ -20,21 +20,21 @@ #ifndef JOBITEM_H #define JOBITEM_H -#include +#include #include "kmobject.h" class KMJob; -class JobItem : public QListViewItem, public KMObject +class JobItem : public TQListViewItem, public KMObject { public: - JobItem(QListView *parent, KMJob *job = 0); + JobItem(TQListView *parent, KMJob *job = 0); ~JobItem(); void init(KMJob *job); - int compare(QListViewItem*, int, bool) const; + int compare(TQListViewItem*, int, bool) const; int jobID() const; - QString jobUri() const; + TQString jobUri() const; KMJob* job() const; private: @@ -49,7 +49,7 @@ inline int JobItem::jobID() const inline KMJob* JobItem::job() const { return m_job; } -inline QString JobItem::jobUri() const +inline TQString JobItem::jobUri() const { return m_uri; } #endif diff --git a/kdeprint/management/kdeprint_management_module.cpp b/kdeprint/management/kdeprint_management_module.cpp index 276eb76f5..70c7b4cfd 100644 --- a/kdeprint/management/kdeprint_management_module.cpp +++ b/kdeprint/management/kdeprint_management_module.cpp @@ -32,25 +32,25 @@ extern "C" { - KDEPRINT_EXPORT int add_printer_wizard(QWidget *parent) + KDEPRINT_EXPORT int add_printer_wizard(TQWidget *parent) { return kdeprint_management_add_printer_wizard( parent ); } - KDEPRINT_EXPORT bool config_dialog(QWidget *parent) + KDEPRINT_EXPORT bool config_dialog(TQWidget *parent) { KMConfigDialog dlg(parent); return dlg.exec(); } - KDEPRINT_EXPORT QString select_command( QWidget* parent ) + KDEPRINT_EXPORT TQString select_command( TQWidget* parent ) { KDialogBase dlg( parent, 0, true, i18n( "Select Command" ), KDialogBase::Ok|KDialogBase::Cancel ); KXmlCommandSelector *xmlSel = new KXmlCommandSelector( false, &dlg, "CommandSelector", &dlg ); dlg.setMainWidget( xmlSel ); if ( dlg.exec() ) return xmlSel->command(); - return QString::null; + return TQString::null; } } diff --git a/kdeprint/management/kiconselectaction.cpp b/kdeprint/management/kiconselectaction.cpp index 9939d061e..6b22dbee8 100644 --- a/kdeprint/management/kiconselectaction.cpp +++ b/kdeprint/management/kiconselectaction.cpp @@ -19,7 +19,7 @@ #include "kiconselectaction.h" -#include +#include #include #include #include @@ -33,10 +33,10 @@ public: m_menu = 0; } QStringList m_iconlst; - QPopupMenu* m_menu; + TQPopupMenu* m_menu; }; -KIconSelectAction::KIconSelectAction(const QString& text, int accel, QObject* parent, const char* name) +KIconSelectAction::KIconSelectAction(const TQString& text, int accel, TQObject* parent, const char* name) : KSelectAction(text, accel, parent, name) { d = new KIconSelectActionPrivate; @@ -66,17 +66,17 @@ void KIconSelectAction::createPopupMenu() } } -void KIconSelectAction::setItems(const QStringList& lst, const QStringList& iconlst) +void KIconSelectAction::setItems(const TQStringList& lst, const TQStringList& iconlst) { KSelectAction::setItems(lst); d->m_iconlst = iconlst; updateIcons(); } -int KIconSelectAction::plug(QWidget* widget, int index) +int KIconSelectAction::plug(TQWidget* widget, int index) { int value(-1); - if (widget->inherits("QPopupMenu")) + if (widget->inherits("TQPopupMenu")) { createPopupMenu(); value = KSelectAction::plug(widget, index); @@ -94,7 +94,7 @@ int KIconSelectAction::plug(QWidget* widget, int index) bar->getButton(id)->setPopup(d->m_menu, true); bar->setItemEnabled(id, isEnabled()); addContainer(bar, id); - connect(bar, SIGNAL(destroyed()), SLOT(slotDestroyed())); + connect(bar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotDestroyed())); value = containerCount()-1; } @@ -103,7 +103,7 @@ int KIconSelectAction::plug(QWidget* widget, int index) void KIconSelectAction::updateCurrentItem(int id) { - QWidget* w = container(id); + TQWidget* w = container(id); if (w->inherits("KToolBar")) static_cast(w)->getButton(itemId(id))->setIcon(d->m_iconlst[currentItem()]); else diff --git a/kdeprint/management/kiconselectaction.h b/kdeprint/management/kiconselectaction.h index 0cfcdaf84..dfd6ea17b 100644 --- a/kdeprint/management/kiconselectaction.h +++ b/kdeprint/management/kiconselectaction.h @@ -28,13 +28,13 @@ class KIconSelectAction : public KSelectAction { Q_OBJECT public: - KIconSelectAction(const QString& text, int accel = 0, QObject* parent = 0, const char* name = 0); + KIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0); virtual ~KIconSelectAction(); - virtual int plug(QWidget* widget, int index = -1); + virtual int plug(TQWidget* widget, int index = -1); public slots: - virtual void setItems(const QStringList& lst, const QStringList& iconlst); + virtual void setItems(const TQStringList& lst, const TQStringList& iconlst); virtual void setCurrentItem(int index); protected: diff --git a/kdeprint/management/kmconfigcommand.cpp b/kdeprint/management/kmconfigcommand.cpp index 5af13e170..21a1a330b 100644 --- a/kdeprint/management/kmconfigcommand.cpp +++ b/kdeprint/management/kmconfigcommand.cpp @@ -20,22 +20,22 @@ #include "kmconfigcommand.h" #include "kxmlcommandselector.h" -#include -#include -#include +#include +#include +#include #include #include -KMConfigCommand::KMConfigCommand(QWidget *parent, const char *name) +KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) : KMConfigPage(parent, name) { setPageName(i18n("Commands")); setPageHeader(i18n("Command Settings")); setPagePixmap("exec"); - QGroupBox *gb = new QGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this); - QLabel *lab = new QLabel(i18n( + QGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this); + QLabel *lab = new TQLabel(i18n( "

Command objects perform a conversion from input to output.
" "They are used as the basis to build both print filters " "and special printers. They are described by a command string, a " @@ -44,10 +44,10 @@ KMConfigCommand::KMConfigCommand(QWidget *parent, const char *name) "changes will only be effective for you."), gb); KXmlCommandSelector *sel = new KXmlCommandSelector(false, gb); - QVBoxLayout *l0 = new QVBoxLayout(this, 0, KDialog::spacingHint()); + QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(gb); l0->addStretch(1); - QVBoxLayout *l2 = new QVBoxLayout(gb->layout(), KDialog::spacingHint()); + QVBoxLayout *l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint()); l2->addWidget(lab); l2->addWidget(sel); } diff --git a/kdeprint/management/kmconfigcommand.h b/kdeprint/management/kmconfigcommand.h index 17aa88042..2ec662d95 100644 --- a/kdeprint/management/kmconfigcommand.h +++ b/kdeprint/management/kmconfigcommand.h @@ -25,7 +25,7 @@ class KMConfigCommand : public KMConfigPage { public: - KMConfigCommand(QWidget *parent = 0, const char *name = 0); + KMConfigCommand(TQWidget *parent = 0, const char *name = 0); }; #endif diff --git a/kdeprint/management/kmconfigdialog.cpp b/kdeprint/management/kmconfigdialog.cpp index b775786e8..9bd20e494 100644 --- a/kdeprint/management/kmconfigdialog.cpp +++ b/kdeprint/management/kmconfigdialog.cpp @@ -29,12 +29,12 @@ #include "kmconfigfonts.h" #include "kmconfigjobs.h" -#include +#include #include #include #include -KMConfigDialog::KMConfigDialog(QWidget *parent, const char *name) +KMConfigDialog::KMConfigDialog(TQWidget *parent, const char *name) : KDialogBase(IconList,i18n("KDE Print Configuration"),Ok|Cancel,Ok,parent,name,true,true) { m_pages.setAutoDelete(false); @@ -48,7 +48,7 @@ KMConfigDialog::KMConfigDialog(QWidget *parent, const char *name) // initialize pages KConfig *conf = KMFactory::self()->printConfig(); - QPtrListIterator it(m_pages); + TQPtrListIterator it(m_pages); for (;it.current();++it) it.current()->loadConfig(conf); @@ -60,15 +60,15 @@ void KMConfigDialog::addConfigPage(KMConfigPage *page) { if (page) { - QPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( page->pagePixmap(), KIcon::NoGroup, KIcon::SizeMedium ); QFrame *frame = addPage(page->pageName(),page->pageHeader(),icon); - page->reparent(frame,QPoint(0,0)); - QVBoxLayout *lay = new QVBoxLayout(frame, 0, 0); + page->reparent(frame,TQPoint(0,0)); + QVBoxLayout *lay = new TQVBoxLayout(frame, 0, 0); lay->addWidget(page); m_pages.append(page); } @@ -78,7 +78,7 @@ void KMConfigDialog::slotOk() { // save configuration KConfig *conf = KMFactory::self()->printConfig(); - QPtrListIterator it(m_pages); + TQPtrListIterator it(m_pages); for (;it.current();++it) it.current()->saveConfig(conf); KMFactory::self()->saveConfig(); diff --git a/kdeprint/management/kmconfigdialog.h b/kdeprint/management/kmconfigdialog.h index 977408d70..ed60378c5 100644 --- a/kdeprint/management/kmconfigdialog.h +++ b/kdeprint/management/kmconfigdialog.h @@ -21,7 +21,7 @@ #define KMCONFIGDIALOG_H #include -#include +#include #include "kmconfigpage.h" @@ -29,7 +29,7 @@ class KDEPRINT_EXPORT KMConfigDialog : public KDialogBase { Q_OBJECT public: - KMConfigDialog(QWidget *parent = 0, const char *name = 0); + KMConfigDialog(TQWidget *parent = 0, const char *name = 0); void addConfigPage(KMConfigPage*); @@ -37,7 +37,7 @@ protected slots: void slotOk(); private: - QPtrList m_pages; + TQPtrList m_pages; }; #endif diff --git a/kdeprint/management/kmconfigfilter.cpp b/kdeprint/management/kmconfigfilter.cpp index 1a62112f7..10dff4749 100644 --- a/kdeprint/management/kmconfigfilter.cpp +++ b/kdeprint/management/kmconfigfilter.cpp @@ -21,12 +21,12 @@ #include "kmmanager.h" #include "kmfactory.h" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -34,38 +34,38 @@ #include #include -KMConfigFilter::KMConfigFilter(QWidget *parent, const char *name) +KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) : KMConfigPage(parent, name) { setPageName(i18n("Filter")); setPageHeader(i18n("Printer Filtering Settings")); setPagePixmap("filter"); - QGroupBox *box = new QGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this); + QGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this); m_list1 = new KListBox(box); m_list1->setSelectionMode(KListBox::Extended); m_list2 = new KListBox(box); m_list2->setSelectionMode(KListBox::Extended); - m_add = new QToolButton( box ); - m_add->setIconSet(QApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" )); - m_remove = new QToolButton( box ); - m_remove->setIconSet(QApplication::reverseLayout() ? SmallIconSet( "forward" ) : SmallIconSet( "back" )); - m_locationre = new QLineEdit(box); - QLabel *lab = new QLabel(box); + m_add = new TQToolButton( box ); + m_add->setIconSet(TQApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" )); + m_remove = new TQToolButton( box ); + m_remove->setIconSet(TQApplication::reverseLayout() ? SmallIconSet( "forward" ) : SmallIconSet( "back" )); + m_locationre = new TQLineEdit(box); + QLabel *lab = new TQLabel(box); lab->setText(i18n("The printer filtering allows you to view only a specific set of " "printers instead of all of them. This may be useful when there are a " "lot of printers available but you only use a few ones. Select the " "printers you want to see from the list on the left or enter a Location " "filter (ex: Group_1*). Both are cumulative and ignored if empty.")); lab->setTextFormat(Qt::RichText); - QLabel *lab1 = new QLabel(i18n("Location filter:"), box); + QLabel *lab1 = new TQLabel(i18n("Location filter:"), box); - QVBoxLayout *l0 = new QVBoxLayout(this, 0, KDialog::spacingHint()); + QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 1); - QVBoxLayout *l1 = new QVBoxLayout(box->layout(), KDialog::spacingHint()); + QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(lab); - QGridLayout *l2 = new QGridLayout(0, 4, 3, 0, KDialog::spacingHint()); + QGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint()); l1->addLayout(l2); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); @@ -75,15 +75,15 @@ KMConfigFilter::KMConfigFilter(QWidget *parent, const char *name) l2->addMultiCellWidget(m_list2, 0, 3, 2, 2); l2->addWidget(m_add, 1, 1); l2->addWidget(m_remove, 2, 1); - QHBoxLayout *l3 = new QHBoxLayout(0, 0, KDialog::spacingHint()); + QHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); l1->addLayout(l3, 0); l3->addWidget(lab1, 0); l3->addWidget(m_locationre, 1); - connect(m_add, SIGNAL(clicked()), SLOT(slotAddClicked())); - connect(m_remove, SIGNAL(clicked()), SLOT(slotRemoveClicked())); - connect(m_list1, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged())); - connect(m_list2, SIGNAL(selectionChanged()), SLOT(slotSelectionChanged())); + 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())); m_add->setEnabled(false); m_remove->setEnabled(false); } @@ -92,7 +92,7 @@ void KMConfigFilter::loadConfig(KConfig *conf) { conf->setGroup("Filter"); QStringList m_plist = conf->readListEntry("Printers"); - QPtrListIterator it(*(KMManager::self()->printerListComplete(false))); + TQPtrListIterator it(*(KMManager::self()->printerListComplete(false))); for (; it.current(); ++it) { if (!it.current()->isSpecial() && !it.current()->isVirtual()) diff --git a/kdeprint/management/kmconfigfilter.h b/kdeprint/management/kmconfigfilter.h index 2374f3b05..82ac2190b 100644 --- a/kdeprint/management/kmconfigfilter.h +++ b/kdeprint/management/kmconfigfilter.h @@ -30,7 +30,7 @@ class KMConfigFilter : public KMConfigPage { Q_OBJECT public: - KMConfigFilter(QWidget *parent = 0, const char *name = 0); + KMConfigFilter(TQWidget *parent = 0, const char *name = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); diff --git a/kdeprint/management/kmconfigfonts.cpp b/kdeprint/management/kmconfigfonts.cpp index c7b4420cb..e59f75728 100644 --- a/kdeprint/management/kmconfigfonts.cpp +++ b/kdeprint/management/kmconfigfonts.cpp @@ -19,14 +19,14 @@ #include "kmconfigfonts.h" -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -36,17 +36,17 @@ #include #include -KMConfigFonts::KMConfigFonts(QWidget *parent, const char *name) +KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) : KMConfigPage(parent, name) { setPageName(i18n("Fonts")); setPageHeader(i18n("Font Settings")); setPagePixmap("fonts"); - QGroupBox *box = new QGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this); - QGroupBox *box2 = new QGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this); + QGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this); + QGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this); - m_embedfonts = new QCheckBox(i18n("&Embed fonts in PostScript data when printing"), box); + m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box); m_fontpath = new KListView(box2); m_fontpath->addColumn(""); m_fontpath->header()->setStretchEnabled(true, 0); @@ -58,14 +58,14 @@ KMConfigFonts::KMConfigFonts(QWidget *parent, const char *name) m_down = new KPushButton(KGuiItem(i18n("&Down"), "down"), box2); m_add = new KPushButton(KGuiItem(i18n("&Add"), "add"), box2); m_remove = new KPushButton(KGuiItem(i18n("&Remove"), "editdelete"), box2); - QLabel *lab0 = new QLabel(i18n("Additional director&y:"), box2); + QLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); lab0->setBuddy(m_addpath); - QVBoxLayout *l0 = new QVBoxLayout(box->layout(), KDialog::spacingHint()); + QVBoxLayout *l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l0->addWidget(m_embedfonts); - QVBoxLayout *l1 = new QVBoxLayout(box2->layout(), KDialog::spacingHint()); + QVBoxLayout *l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint()); l1->addWidget(m_fontpath); - QHBoxLayout *l2 = new QHBoxLayout(0, 0, KDialog::spacingHint()); + QHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); l1->addLayout(l2); l2->addWidget(m_up); l2->addWidget(m_down); @@ -73,30 +73,30 @@ KMConfigFonts::KMConfigFonts(QWidget *parent, const char *name) l1->addSpacing(10); l1->addWidget(lab0); l1->addWidget(m_addpath); - QHBoxLayout *l3 = new QHBoxLayout(0, 0, KDialog::spacingHint()); + QHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); l1->addLayout(l3); l3->addStretch(1); l3->addWidget(m_add); - QVBoxLayout *l4 = new QVBoxLayout(this, 0, KDialog::spacingHint()); + QVBoxLayout *l4 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l4->addWidget(box); l4->addWidget(box2); - QWhatsThis::add(m_embedfonts, + TQWhatsThis::add(m_embedfonts, i18n("These options will automatically put fonts in the PostScript file " "which are not present on the printer. Font embedding usually produces better print results " "(closer to what you see on the screen), but larger print data as well.")); - QWhatsThis::add(m_fontpath, + TQWhatsThis::add(m_fontpath, i18n("When using font embedding you can select additional directories where " "KDE should search for embeddable font files. By default, the X server " "font path is used, so adding those directories is not needed. The default " "search path should be sufficient in most cases.")); - connect(m_remove, SIGNAL(clicked()), SLOT(slotRemove())); - connect(m_add, SIGNAL(clicked()), SLOT(slotAdd())); - connect(m_up, SIGNAL(clicked()), SLOT(slotUp())); - connect(m_down, SIGNAL(clicked()), SLOT(slotDown())); - connect(m_fontpath, SIGNAL(selectionChanged()), SLOT(slotSelected())); - connect(m_addpath, SIGNAL(textChanged(const QString&)), SLOT(slotTextChanged(const QString&))); + 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&))); m_add->setEnabled(false); m_remove->setEnabled(false); m_up->setEnabled(false); @@ -109,8 +109,8 @@ void KMConfigFonts::loadConfig(KConfig *) m_embedfonts->setChecked(settings.readBoolEntry("/qt/embedFonts", true)); QStringList paths = settings.readListEntry("/qt/fontPath", ':'); QListViewItem *item(0); - for (QStringList::ConstIterator it=paths.begin(); it!=paths.end(); ++it) - item = new QListViewItem(m_fontpath, item, *it); + for (TQStringList::ConstIterator it=paths.begin(); it!=paths.end(); ++it) + item = new TQListViewItem(m_fontpath, item, *it); } void KMConfigFonts::saveConfig(KConfig *) @@ -142,7 +142,7 @@ void KMConfigFonts::slotAdd() QListViewItem *lastItem(m_fontpath->firstChild()); while (lastItem && lastItem->nextSibling()) lastItem = lastItem->nextSibling(); - QListViewItem *item = new QListViewItem(m_fontpath, lastItem, m_addpath->url()); + QListViewItem *item = new TQListViewItem(m_fontpath, lastItem, m_addpath->url()); m_fontpath->setSelected(item, true); } @@ -159,7 +159,7 @@ void KMConfigFonts::slotUp() QListViewItem *citem = m_fontpath->selectedItem(), *nitem = 0; if (!citem || !citem->itemAbove()) return; - nitem = new QListViewItem(m_fontpath, citem->itemAbove()->itemAbove(), citem->text(0)); + nitem = new TQListViewItem(m_fontpath, citem->itemAbove()->itemAbove(), citem->text(0)); delete citem; m_fontpath->setSelected(nitem, true); } @@ -169,12 +169,12 @@ void KMConfigFonts::slotDown() QListViewItem *citem = m_fontpath->selectedItem(), *nitem = 0; if (!citem || !citem->itemBelow()) return; - nitem = new QListViewItem(m_fontpath, citem->itemBelow(), citem->text(0)); + nitem = new TQListViewItem(m_fontpath, citem->itemBelow(), citem->text(0)); delete citem; m_fontpath->setSelected(nitem, true); } -void KMConfigFonts::slotTextChanged(const QString& t) +void KMConfigFonts::slotTextChanged(const TQString& t) { m_add->setEnabled(!t.isEmpty()); } diff --git a/kdeprint/management/kmconfigfonts.h b/kdeprint/management/kmconfigfonts.h index c1c383199..a20ead918 100644 --- a/kdeprint/management/kmconfigfonts.h +++ b/kdeprint/management/kmconfigfonts.h @@ -31,7 +31,7 @@ class KMConfigFonts : public KMConfigPage { Q_OBJECT public: - KMConfigFonts(QWidget *parent = 0, const char *name = 0); + KMConfigFonts(TQWidget *parent = 0, const char *name = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); @@ -42,7 +42,7 @@ protected slots: void slotRemove(); void slotAdd(); void slotSelected(); - void slotTextChanged(const QString&); + void slotTextChanged(const TQString&); private: QCheckBox *m_embedfonts; diff --git a/kdeprint/management/kmconfiggeneral.cpp b/kdeprint/management/kmconfiggeneral.cpp index 65f9d2437..c729c6516 100644 --- a/kdeprint/management/kmconfiggeneral.cpp +++ b/kdeprint/management/kmconfiggeneral.cpp @@ -19,11 +19,11 @@ #include "kmconfiggeneral.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -38,63 +38,63 @@ #include #include -KMConfigGeneral::KMConfigGeneral(QWidget *parent) +KMConfigGeneral::KMConfigGeneral(TQWidget *parent) : KMConfigPage(parent,"ConfigTimer") { setPageName(i18n("General")); setPageHeader(i18n("General Settings")); setPagePixmap("fileprint"); - QGroupBox *m_timerbox = new QGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); + QGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); m_timer = new KIntNumInput(m_timerbox,"Timer"); m_timer->setRange(0,30); m_timer->setSuffix( i18n( " sec" ) ); m_timer->setSpecialValueText(i18n("Disabled")); - QWhatsThis::add(m_timer, i18n("This time setting controls the refresh rate of various " + TQWhatsThis::add(m_timer, i18n("This time setting controls the refresh rate of various " "KDE Print components like the print manager " "and the job viewer.")); - QGroupBox *m_testpagebox = new QGroupBox(0, Qt::Vertical, i18n("Test Page"), this); - m_defaulttestpage = new QCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck"); + QGroupBox *m_testpagebox = new TQGroupBox(0, Qt::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,SIGNAL(toggled(bool)),m_testpage,SLOT(setEnabled(bool))); - connect(m_defaulttestpage,SIGNAL(toggled(bool)),this,SLOT(setEnabledPreviewButton(bool))); - connect(m_preview,SIGNAL(clicked()),SLOT(slotTestPagePreview())); - connect(m_testpage->lineEdit(),SIGNAL(textChanged ( const QString & )),this,SLOT(testPageChanged(const QString & ))); + 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 & ))); m_testpage->setDisabled(true); m_preview->setDisabled(true); m_defaulttestpage->setCursor(KCursor::handCursor()); - QGroupBox *m_statusbox = new QGroupBox(0, Qt::Vertical, i18n("Miscellaneous"), this); - m_statusmsg = new QCheckBox(i18n("Sho&w printing status message box"), m_statusbox); - m_uselast = new QCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox); + QGroupBox *m_statusbox = new TQGroupBox(0, Qt::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); //layout - QVBoxLayout *lay0 = new QVBoxLayout(this, 0, KDialog::spacingHint()); + QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); lay0->addWidget(m_timerbox); lay0->addWidget(m_testpagebox); lay0->addWidget(m_statusbox); lay0->addStretch(1); - QVBoxLayout *lay1 = new QVBoxLayout(m_timerbox->layout(), + QVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->layout(), KDialog::spacingHint()); lay1->addWidget(m_timer); - QVBoxLayout *lay2 = new QVBoxLayout(m_testpagebox->layout(), + QVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->layout(), KDialog::spacingHint()); - QHBoxLayout *lay3 = new QHBoxLayout(0, 0, 0); + QHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0); lay2->addWidget(m_defaulttestpage); lay2->addWidget(m_testpage); lay2->addLayout(lay3); lay3->addStretch(1); lay3->addWidget(m_preview); - QVBoxLayout *lay4 = new QVBoxLayout(m_statusbox->layout(), + QVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->layout(), KDialog::spacingHint()); lay4->addWidget(m_statusmsg); lay4->addWidget(m_uselast); m_preview->setEnabled( !m_testpage->url().isEmpty()); } -void KMConfigGeneral::testPageChanged(const QString &test ) +void KMConfigGeneral::testPageChanged(const TQString &test ) { m_preview->setEnabled( !test.isEmpty()); } @@ -122,7 +122,7 @@ void KMConfigGeneral::saveConfig(KConfig *conf) { conf->setGroup("General"); conf->writeEntry("TimerDelay",m_timer->value()); - conf->writePathEntry("TestPage",(m_defaulttestpage->isChecked() ? m_testpage->url() : QString::null)); + conf->writePathEntry("TestPage",(m_defaulttestpage->isChecked() ? m_testpage->url() : TQString::null)); if (m_defaulttestpage->isChecked() && KMimeMagic::self()->findFileType(m_testpage->url())->mimeType() != "application/postscript") KMessageBox::sorry(this, i18n("The selected test page is not a PostScript file. You may not " "be able to test your printer anymore.")); diff --git a/kdeprint/management/kmconfiggeneral.h b/kdeprint/management/kmconfiggeneral.h index 87c10c2bf..f28f29446 100644 --- a/kdeprint/management/kmconfiggeneral.h +++ b/kdeprint/management/kmconfiggeneral.h @@ -30,14 +30,14 @@ class KMConfigGeneral : public KMConfigPage { Q_OBJECT public: - KMConfigGeneral(QWidget *parent = 0); + KMConfigGeneral(TQWidget *parent = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); protected slots: void slotTestPagePreview(); - void testPageChanged(const QString & ); + void testPageChanged(const TQString & ); void setEnabledPreviewButton(bool b); private: KIntNumInput *m_timer; diff --git a/kdeprint/management/kmconfigjobs.cpp b/kdeprint/management/kmconfigjobs.cpp index 31ca1ed26..1aaf0ec26 100644 --- a/kdeprint/management/kmconfigjobs.cpp +++ b/kdeprint/management/kmconfigjobs.cpp @@ -19,32 +19,32 @@ #include "kmconfigjobs.h" -#include -#include +#include +#include #include #include #include #include -KMConfigJobs::KMConfigJobs(QWidget *parent, const char *name) +KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) : KMConfigPage(parent, name) { setPageName(i18n("Jobs")); setPageHeader(i18n("Print Job Settings")); setPagePixmap("exec"); - QGroupBox *box = new QGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this); + QGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this); m_limit = new KIntNumInput(box); m_limit->setRange(0, 9999, 1, true); m_limit->setSpecialValueText(i18n("Unlimited")); m_limit->setLabel(i18n("Maximum number of jobs shown:")); - QVBoxLayout *l0 = new QVBoxLayout(this, 0, KDialog::spacingHint()); + QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 0); l0->addStretch(1); - QVBoxLayout *l1 = new QVBoxLayout(box->layout(), KDialog::spacingHint()); + QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(m_limit); } diff --git a/kdeprint/management/kmconfigjobs.h b/kdeprint/management/kmconfigjobs.h index c1a301b32..73d6274ba 100644 --- a/kdeprint/management/kmconfigjobs.h +++ b/kdeprint/management/kmconfigjobs.h @@ -28,7 +28,7 @@ class KMConfigJobs : public KMConfigPage { Q_OBJECT public: - KMConfigJobs(QWidget *parent = 0, const char *name = 0); + KMConfigJobs(TQWidget *parent = 0, const char *name = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); diff --git a/kdeprint/management/kmconfigpage.cpp b/kdeprint/management/kmconfigpage.cpp index afeda5f9e..b31575d33 100644 --- a/kdeprint/management/kmconfigpage.cpp +++ b/kdeprint/management/kmconfigpage.cpp @@ -19,8 +19,8 @@ #include "kmconfigpage.h" -KMConfigPage::KMConfigPage(QWidget *parent, const char *name) -: QWidget(parent,name) +KMConfigPage::KMConfigPage(TQWidget *parent, const char *name) +: TQWidget(parent,name) { m_name = "Name"; m_header = "Header"; diff --git a/kdeprint/management/kmconfigpage.h b/kdeprint/management/kmconfigpage.h index d3db9994b..138d7c152 100644 --- a/kdeprint/management/kmconfigpage.h +++ b/kdeprint/management/kmconfigpage.h @@ -20,7 +20,7 @@ #ifndef KMCONFIGPAGE_H #define KMCONFIGPAGE_H -#include +#include #include @@ -30,19 +30,19 @@ class KDEPRINT_EXPORT KMConfigPage : public QWidget { Q_OBJECT public: - KMConfigPage(QWidget *parent = 0, const char *name = 0); + KMConfigPage(TQWidget *parent = 0, const char *name = 0); virtual void loadConfig(KConfig*); virtual void saveConfig(KConfig*); - QString pageName() const { return m_name; } - QString pageHeader() const { return m_header; } - QString pagePixmap() const { return m_pixmap; } + TQString pageName() const { return m_name; } + TQString pageHeader() const { return m_header; } + TQString pagePixmap() const { return m_pixmap; } protected: - void setPageName(const QString& s) { m_name = s; } - void setPageHeader(const QString& s) { m_header = s; } - void setPagePixmap(const QString& s) { m_pixmap = s; } + void setPageName(const TQString& s) { m_name = s; } + void setPageHeader(const TQString& s) { m_header = s; } + void setPagePixmap(const TQString& s) { m_pixmap = s; } protected: QString m_name; diff --git a/kdeprint/management/kmconfigpreview.cpp b/kdeprint/management/kmconfigpreview.cpp index a3ed5581e..1bd9f46e5 100644 --- a/kdeprint/management/kmconfigpreview.cpp +++ b/kdeprint/management/kmconfigpreview.cpp @@ -19,43 +19,43 @@ #include "kmconfigpreview.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -KMConfigPreview::KMConfigPreview(QWidget *parent, const char *name) +KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) : KMConfigPage(parent, name) { setPageName(i18n("Preview")); setPageHeader(i18n("Preview Settings")); setPagePixmap("filefind"); - QGroupBox *box = new QGroupBox(0, Qt::Vertical, i18n("Preview Program"), this); + TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this); - m_useext = new QCheckBox(i18n("&Use external preview program"), box); + m_useext = new TQCheckBox(i18n("&Use external preview program"), box); m_program = new KURLRequester(box); - QLabel *lab = new QLabel(box); + QLabel *lab = new TQLabel(box); lab->setText(i18n("You can use an external preview program (PS viewer) instead of the " "KDE built-in preview system. Note that if the KDE default PS viewer " "(KGhostView) cannot be found, KDE tries automatically to find another " "external PostScript viewer")); lab->setTextFormat(Qt::RichText); - QVBoxLayout *l0 = new QVBoxLayout(this, 0, KDialog::spacingHint()); + QVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box); l0->addStretch(1); - QVBoxLayout *l1 = new QVBoxLayout(box->layout(), KDialog::spacingHint()); + QVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(lab); l1->addWidget(m_useext); l1->addWidget(m_program); - connect(m_useext, SIGNAL(toggled(bool)), m_program, SLOT(setEnabled(bool))); + connect(m_useext, TQT_SIGNAL(toggled(bool)), m_program, TQT_SLOT(setEnabled(bool))); m_program->setEnabled(false); } diff --git a/kdeprint/management/kmconfigpreview.h b/kdeprint/management/kmconfigpreview.h index e37aa2b8f..52a9704d1 100644 --- a/kdeprint/management/kmconfigpreview.h +++ b/kdeprint/management/kmconfigpreview.h @@ -28,7 +28,7 @@ class KURLRequester; class KMConfigPreview : public KMConfigPage { public: - KMConfigPreview(QWidget *parent = 0, const char *name = 0); + KMConfigPreview(TQWidget *parent = 0, const char *name = 0); void loadConfig(KConfig*); void saveConfig(KConfig*); diff --git a/kdeprint/management/kmdbcreator.cpp b/kdeprint/management/kmdbcreator.cpp index 021619db9..3b271ff00 100644 --- a/kdeprint/management/kmdbcreator.cpp +++ b/kdeprint/management/kmdbcreator.cpp @@ -21,23 +21,23 @@ #include "kmfactory.h" #include "kmmanager.h" -#include -#include -#include +#include +#include +#include #include #include #include #include -KMDBCreator::KMDBCreator(QObject *parent, const char *name) -: QObject(parent,name) +KMDBCreator::KMDBCreator(TQObject *parent, const char *name) +: TQObject(parent,name) { m_dlg = 0; m_status = true; - connect(&m_proc,SIGNAL(receivedStdout(KProcess*,char*,int)),SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(&m_proc,SIGNAL(receivedStderr(KProcess*,char*,int)),SLOT(slotReceivedStderr(KProcess*,char*,int))); - connect(&m_proc,SIGNAL(processExited(KProcess*)),SLOT(slotProcessExited(KProcess*))); + connect(&m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(receivedStderr(KProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(KProcess*,char*,int))); + connect(&m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); } KMDBCreator::~KMDBCreator() @@ -48,7 +48,7 @@ KMDBCreator::~KMDBCreator() // it's parent. It will be destroyed along with its parent. } -bool KMDBCreator::checkDriverDB(const QString& dirname, const QDateTime& d) +bool KMDBCreator::checkDriverDB(const TQString& dirname, const TQDateTime& d) { // don't block GUI kapp->processEvents(); @@ -60,13 +60,13 @@ bool KMDBCreator::checkDriverDB(const QString& dirname, const QDateTime& d) // then check most recent file in current directory QDir dir(dirname); - const QFileInfoList *list = dir.entryInfoList(QDir::Files,QDir::Time); + const QFileInfoList *list = dir.entryInfoList(TQDir::Files,TQDir::Time); if (list && list->count() > 0 && list->getFirst()->lastModified() > d) return false; // then loop into subdirs - QStringList slist = dir.entryList(QDir::Dirs,QDir::Time); - for (QStringList::ConstIterator it=slist.begin(); it!=slist.end(); ++it) + QStringList slist = dir.entryList(TQDir::Dirs,TQDir::Time); + for (TQStringList::ConstIterator it=slist.begin(); it!=slist.end(); ++it) if ((*it) != "." && (*it) != ".." && !checkDriverDB(dir.absFilePath(*it),d)) return false; @@ -74,7 +74,7 @@ bool KMDBCreator::checkDriverDB(const QString& dirname, const QDateTime& d) return true; } -bool KMDBCreator::createDriverDB(const QString& dirname, const QString& filename, QWidget *parent) +bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filename, TQWidget *parent) { bool started(true); @@ -109,10 +109,10 @@ bool KMDBCreator::createDriverDB(const QString& dirname, const QString& filename { if (!m_dlg) { - m_dlg = new QProgressDialog(parent->topLevelWidget(),"progress-dialog",true); + m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true); m_dlg->setLabelText(i18n("Please wait while KDE rebuilds a driver database.")); m_dlg->setCaption(i18n("Driver Database")); - connect(m_dlg,SIGNAL(canceled()),SLOT(slotCancelled())); + connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled())); } m_dlg->setMinimumDuration(0); // always show the dialog m_dlg->setProgress(0); // to force showing @@ -127,7 +127,7 @@ bool KMDBCreator::createDriverDB(const QString& dirname, const QString& filename void KMDBCreator::slotReceivedStdout(KProcess*, char *buf, int len) { // save buffer - QString str( QCString(buf, len) ); + QString str( TQCString(buf, len) ); // get the number, cut the string at the first '\n' otherwise // the toInt() will return 0. If that occurs for the first number, @@ -171,7 +171,7 @@ void KMDBCreator::slotProcessExited(KProcess*) KMFactory::self()->manager()->setErrorMsg(i18n("Error while creating driver database: abnormal child-process termination.")); // remove the incomplete driver DB file so that, it will be // reconstructed on next check - QFile::remove(m_proc.args()[2]); + TQFile::remove(m_proc.args()[2]); } //else emit dbCreated(); diff --git a/kdeprint/management/kmdbcreator.h b/kdeprint/management/kmdbcreator.h index 8af6e5bcf..188ff9a42 100644 --- a/kdeprint/management/kmdbcreator.h +++ b/kdeprint/management/kmdbcreator.h @@ -20,9 +20,9 @@ #ifndef KMDBCREATOR_H #define KMDBCREATOR_H -#include -#include -#include +#include +#include +#include #include class QWidget; @@ -32,11 +32,11 @@ class KMDBCreator : public QObject { Q_OBJECT public: - KMDBCreator(QObject *parent = 0, const char *name = 0); + KMDBCreator(TQObject *parent = 0, const char *name = 0); ~KMDBCreator(); - bool checkDriverDB(const QString& dirname, const QDateTime& d); - bool createDriverDB(const QString& dirname, const QString& filename, QWidget *parent = 0); + bool checkDriverDB(const TQString& dirname, const TQDateTime& d); + bool createDriverDB(const TQString& dirname, const TQString& filename, TQWidget *parent = 0); bool status() const { return m_status; } protected slots: diff --git a/kdeprint/management/kmdriverdb.cpp b/kdeprint/management/kmdriverdb.cpp index d75588d0d..6e275a6d4 100644 --- a/kdeprint/management/kmdriverdb.cpp +++ b/kdeprint/management/kmdriverdb.cpp @@ -24,9 +24,9 @@ #include "kmfactory.h" #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -43,11 +43,11 @@ KMDriverDB* KMDriverDB::self() return m_self; } -KMDriverDB::KMDriverDB(QObject *parent, const char *name) -: QObject(parent,name) +KMDriverDB::KMDriverDB(TQObject *parent, const char *name) +: TQObject(parent,name) { m_creator = new KMDBCreator(this,"db-creator"); - connect(m_creator,SIGNAL(dbCreated()),SLOT(slotDbCreated())); + connect(m_creator,TQT_SIGNAL(dbCreated()),TQT_SLOT(slotDbCreated())); m_entries.setAutoDelete(true); m_pnpentries.setAutoDelete(true); @@ -57,21 +57,21 @@ KMDriverDB::~KMDriverDB() { } -QString KMDriverDB::dbFile() +TQString KMDriverDB::dbFile() { // this calls insure missing directories creation - QString filename = locateLocal("data",QString::fromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); + QString filename = locateLocal("data",TQString::fromLatin1("kdeprint/printerdb_%1.txt").arg(KMFactory::self()->printSystem())); return filename; } -void KMDriverDB::init(QWidget *parent) +void KMDriverDB::init(TQWidget *parent) { QFileInfo dbfi(dbFile()); QString dirname = KMFactory::self()->manager()->driverDirectory(); - QStringList dbDirs = QStringList::split(':', dirname, false); + QStringList dbDirs = TQStringList::split(':', dirname, false); bool createflag(false); - for (QStringList::ConstIterator it=dbDirs.begin(); it!=dbDirs.end() && !createflag; ++it) + for (TQStringList::ConstIterator it=dbDirs.begin(); it!=dbDirs.end() && !createflag; ++it) if (!(*it).startsWith("module:") && !m_creator->checkDriverDB(*it, dbfi.lastModified())) createflag = true; @@ -108,23 +108,23 @@ void KMDriverDB::slotDbCreated() //emit dbLoaded(true); } -KMDBEntryList* KMDriverDB::findEntry(const QString& manu, const QString& model) +KMDBEntryList* KMDriverDB::findEntry(const TQString& manu, const TQString& model) { - QDict *models = m_entries.find(manu); + TQDict *models = m_entries.find(manu); if (models) return models->find(model); return 0; } -KMDBEntryList* KMDriverDB::findPnpEntry(const QString& manu, const QString& model) +KMDBEntryList* KMDriverDB::findPnpEntry(const TQString& manu, const TQString& model) { - QDict *models = m_pnpentries.find(manu); + TQDict *models = m_pnpentries.find(manu); if (models) return models->find(model); return 0; } -QDict* KMDriverDB::findModels(const QString& manu) +TQDict* KMDriverDB::findModels(const TQString& manu) { return m_entries.find(manu); } @@ -140,10 +140,10 @@ void KMDriverDB::insertEntry(KMDBEntry *entry) } // insert it in normal entries - QDict *models = m_entries.find(entry->manufacturer); + TQDict *models = m_entries.find(entry->manufacturer); if (!models) { - models = new QDict(17,false); + models = new TQDict(17,false); models->setAutoDelete(true); m_entries.insert(entry->manufacturer,models); } @@ -162,7 +162,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry) models = m_pnpentries.find(entry->manufacturer); if (!models) { - models = new QDict(17,false); + models = new TQDict(17,false); models->setAutoDelete(true); m_pnpentries.insert(entry->manufacturer,models); } diff --git a/kdeprint/management/kmdriverdb.h b/kdeprint/management/kmdriverdb.h index e0f3a7eba..1ffecdc0a 100644 --- a/kdeprint/management/kmdriverdb.h +++ b/kdeprint/management/kmdriverdb.h @@ -20,10 +20,10 @@ #ifndef KMDRIVERDB_H #define KMDRIVERDB_H -#include -#include -#include -#include +#include +#include +#include +#include #include "kmdbentry.h" @@ -35,31 +35,31 @@ class KMDriverDB : public QObject public: static KMDriverDB* self(); - KMDriverDB(QObject *parent = 0, const char *name = 0); + KMDriverDB(TQObject *parent = 0, const char *name = 0); ~KMDriverDB(); - void init(QWidget *parent = 0); - KMDBEntryList* findEntry(const QString& manu, const QString& model); - KMDBEntryList* findPnpEntry(const QString& manu, const QString& model); - QDict* findModels(const QString& manu); - const QDict< QDict >& manufacturers() const { return m_entries; } + void init(TQWidget *parent = 0); + KMDBEntryList* findEntry(const TQString& manu, const TQString& model); + KMDBEntryList* findPnpEntry(const TQString& manu, const TQString& model); + TQDict* findModels(const TQString& manu); + const TQDict< TQDict >& manufacturers() const { return m_entries; } protected: void loadDbFile(); void insertEntry(KMDBEntry *entry); - QString dbFile(); + TQString dbFile(); protected slots: void slotDbCreated(); signals: void dbLoaded(bool reloaded); - void error(const QString&); + void error(const TQString&); private: KMDBCreator *m_creator; - QDict< QDict > m_entries; - QDict< QDict > m_pnpentries; + TQDict< TQDict > m_entries; + TQDict< TQDict > m_pnpentries; static KMDriverDB *m_self; }; diff --git a/kdeprint/management/kmdriverdbwidget.cpp b/kdeprint/management/kmdriverdbwidget.cpp index 076b8897e..fdd3d263c 100644 --- a/kdeprint/management/kmdriverdbwidget.cpp +++ b/kdeprint/management/kmdriverdbwidget.cpp @@ -25,13 +25,13 @@ #include #include -#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include @@ -39,29 +39,29 @@ #include #include -KMDriverDbWidget::KMDriverDbWidget(QWidget *parent, const char *name) -: QWidget(parent,name) +KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) +: TQWidget(parent,name) { - m_external = QString::null; + m_external = TQString::null; m_valid = false; // build widget m_manu = new KListBox(this); m_model = new KListBox(this); - m_postscript = new QCheckBox(i18n("&PostScript printer"),this); - m_raw = new QCheckBox(i18n("&Raw printer (no driver needed)"),this); + m_postscript = new TQCheckBox(i18n("&PostScript printer"),this); + m_raw = new TQCheckBox(i18n("&Raw printer (no driver needed)"),this); m_postscript->setCursor(KCursor::handCursor()); m_raw->setCursor(KCursor::handCursor()); m_other = new KPushButton(KGuiItem(i18n("&Other..."), "fileopen"), this); - QLabel *l1 = new QLabel(i18n("&Manufacturer:"), this); - QLabel *l2 = new QLabel(i18n("Mo&del:"), this); + QLabel *l1 = new TQLabel(i18n("&Manufacturer:"), this); + QLabel *l2 = new TQLabel(i18n("Mo&del:"), this); l1->setBuddy(m_manu); l2->setBuddy(m_model); // build layout - QVBoxLayout *main_ = new QVBoxLayout(this, 0, 10); - QGridLayout *sub1_ = new QGridLayout(0, 2, 3, 0, 0); - QHBoxLayout *sub2_ = new QHBoxLayout(0, 0, 10); + QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); + QGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0); + QHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10); main_->addLayout(sub1_); main_->addLayout(sub2_); main_->addWidget(m_raw); @@ -74,26 +74,26 @@ KMDriverDbWidget::KMDriverDbWidget(QWidget *parent, const char *name) sub2_->addWidget(m_other,0); // build connections - connect(KMDriverDB::self(),SIGNAL(dbLoaded(bool)),SLOT(slotDbLoaded(bool))); - connect(KMDriverDB::self(), SIGNAL(error(const QString&)), SLOT(slotError(const QString&))); - connect(m_manu,SIGNAL(highlighted(const QString&)),SLOT(slotManufacturerSelected(const QString&))); - connect(m_raw,SIGNAL(toggled(bool)),m_manu,SLOT(setDisabled(bool))); - connect(m_raw,SIGNAL(toggled(bool)),m_model,SLOT(setDisabled(bool))); - connect(m_raw,SIGNAL(toggled(bool)),m_other,SLOT(setDisabled(bool))); - connect(m_raw,SIGNAL(toggled(bool)),m_postscript,SLOT(setDisabled(bool))); - connect(m_postscript,SIGNAL(toggled(bool)),m_manu,SLOT(setDisabled(bool))); - connect(m_postscript,SIGNAL(toggled(bool)),m_model,SLOT(setDisabled(bool))); - connect(m_postscript,SIGNAL(toggled(bool)),m_other,SLOT(setDisabled(bool))); - connect(m_postscript,SIGNAL(toggled(bool)),m_raw,SLOT(setDisabled(bool))); - connect(m_postscript,SIGNAL(toggled(bool)),SLOT(slotPostscriptToggled(bool))); - connect(m_other,SIGNAL(clicked()),SLOT(slotOtherClicked())); + 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())); } KMDriverDbWidget::~KMDriverDbWidget() { } -void KMDriverDbWidget::setDriver(const QString& manu, const QString& model) +void KMDriverDbWidget::setDriver(const TQString& manu, const TQString& model) { QListBoxItem *item = m_manu->findItem(manu); QString model_(model); @@ -105,7 +105,7 @@ void KMDriverDbWidget::setDriver(const QString& manu, const QString& model) // try by stripping the manufacturer name from // the beginning of the model string. This is // often the case with PPD files - item = m_model->findItem(model_.replace(0,manu.length()+1,QString::fromLatin1(""))); + item = m_model->findItem(model_.replace(0,manu.length()+1,TQString::fromLatin1(""))); if (item) m_model->setCurrentItem(item); } @@ -127,12 +127,12 @@ void KMDriverDbWidget::setHaveOther(bool on) m_other->hide(); } -QString KMDriverDbWidget::manufacturer() +TQString KMDriverDbWidget::manufacturer() { return m_manu->currentText(); } -QString KMDriverDbWidget::model() +TQString KMDriverDbWidget::model() { return m_model->currentText(); } @@ -151,7 +151,7 @@ void KMDriverDbWidget::init() { if (!m_valid) { - QApplication::setOverrideCursor(KCursor::waitCursor()); + TQApplication::setOverrideCursor(KCursor::waitCursor()); m_manu->clear(); m_model->clear(); m_manu->insertItem(i18n("Loading...")); @@ -161,13 +161,13 @@ void KMDriverDbWidget::init() void KMDriverDbWidget::slotDbLoaded(bool reloaded) { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); m_valid = true; if (reloaded || m_manu->count() == 0 || (m_manu->count() == 1 && m_manu->text(0) == i18n("Loading..."))) { // do something only if DB reloaded m_manu->clear(); m_model->clear(); - QDictIterator< QDict > it(KMDriverDB::self()->manufacturers()); + TQDictIterator< TQDict > it(KMDriverDB::self()->manufacturers()); for (;it.current();++it) m_manu->insertItem(it.currentKey()); m_manu->sort(); @@ -175,22 +175,22 @@ void KMDriverDbWidget::slotDbLoaded(bool reloaded) } } -void KMDriverDbWidget::slotError(const QString& msg) +void KMDriverDbWidget::slotError(const TQString& msg) { - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); m_valid = false; m_manu->clear(); KMessageBox::error(this, ""+msg+""); } -void KMDriverDbWidget::slotManufacturerSelected(const QString& name) +void KMDriverDbWidget::slotManufacturerSelected(const TQString& name) { m_model->clear(); - QDict *models = KMDriverDB::self()->findModels(name); + TQDict *models = KMDriverDB::self()->findModels(name); if (models) { QStrIList ilist(true); - QDictIterator it(*models); + TQDictIterator it(*models); for (;it.current();++it) ilist.append(it.currentKey().latin1()); ilist.sort(); @@ -223,7 +223,7 @@ void KMDriverDbWidget::slotOtherClicked() { if (m_external.isEmpty()) { - KFileDialog dlg( QString::null, QString::null, this, 0, true ); + KFileDialog dlg( TQString::null, TQString::null, this, 0, true ); KURL url; dlg.setMode( KFile::File ); @@ -233,14 +233,14 @@ void KMDriverDbWidget::slotOtherClicked() if ( !url.isEmpty() ) { - QString filename; + TQString filename; if ( KIO::NetAccess::download( url, filename, this ) ) { DrMain *driver = KMFactory::self()->manager()->loadFileDriver(filename); if (driver) { m_external = filename; - disconnect(m_manu,SIGNAL(highlighted(const QString&)),this,SLOT(slotManufacturerSelected(const QString&))); + disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); m_manu->clear(); m_model->clear(); QString s = driver->get("manufacturer"); @@ -263,10 +263,10 @@ void KMDriverDbWidget::slotOtherClicked() } else { - m_external = QString::null; - connect(m_manu,SIGNAL(highlighted(const QString&)),this,SLOT(slotManufacturerSelected(const QString&))); + m_external = TQString::null; + connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); m_other->setText(i18n("Other")); - m_desc = QString::null; + m_desc = TQString::null; slotDbLoaded(true); } } diff --git a/kdeprint/management/kmdriverdbwidget.h b/kdeprint/management/kmdriverdbwidget.h index aa040e110..8e111f042 100644 --- a/kdeprint/management/kmdriverdbwidget.h +++ b/kdeprint/management/kmdriverdbwidget.h @@ -20,7 +20,7 @@ #ifndef KMDRIVERDBWIDGET_H #define KMDRIVERDBWIDGET_H -#include +#include #include "kmdbentry.h" class QListBox; @@ -31,28 +31,28 @@ class KMDriverDbWidget : public QWidget { Q_OBJECT public: - KMDriverDbWidget(QWidget *parent = 0, const char *name = 0); + KMDriverDbWidget(TQWidget *parent = 0, const char *name = 0); ~KMDriverDbWidget(); void init(); void setHaveRaw(bool on); void setHaveOther(bool on); - void setDriver(const QString& manu, const QString& model); + void setDriver(const TQString& manu, const TQString& model); - QString manufacturer(); - QString model(); - QString description() { return m_desc; } + TQString manufacturer(); + TQString model(); + TQString description() { return m_desc; } KMDBEntryList* drivers(); - QString driverFile(); + TQString driverFile(); bool isRaw(); bool isExternal(); protected slots: void slotDbLoaded(bool reloaded); - void slotManufacturerSelected(const QString& name); + void slotManufacturerSelected(const TQString& name); void slotPostscriptToggled(bool); void slotOtherClicked(); - void slotError(const QString&); + void slotError(const TQString&); private: QListBox *m_manu; @@ -65,7 +65,7 @@ private: bool m_valid; }; -inline QString KMDriverDbWidget::driverFile() +inline TQString KMDriverDbWidget::driverFile() { return m_external; } inline bool KMDriverDbWidget::isExternal() diff --git a/kdeprint/management/kmdriverdialog.cpp b/kdeprint/management/kmdriverdialog.cpp index f25ba8725..2e79a8c6f 100644 --- a/kdeprint/management/kmdriverdialog.cpp +++ b/kdeprint/management/kmdriverdialog.cpp @@ -23,7 +23,7 @@ #include #include -KMDriverDialog::KMDriverDialog(QWidget *parent, const char *name) +KMDriverDialog::KMDriverDialog(TQWidget *parent, const char *name) : KDialogBase(KDialogBase::Swallow,i18n("Configure"),KDialogBase::Ok|KDialogBase::Cancel,KDialogBase::Ok,parent,name,true,false) { m_view = new DriverView(0); diff --git a/kdeprint/management/kmdriverdialog.h b/kdeprint/management/kmdriverdialog.h index b3368ae13..8720213d7 100644 --- a/kdeprint/management/kmdriverdialog.h +++ b/kdeprint/management/kmdriverdialog.h @@ -29,7 +29,7 @@ class KMDriverDialog : public KDialogBase { Q_OBJECT public: - KMDriverDialog(QWidget *parent = 0, const char *name = 0); + KMDriverDialog(TQWidget *parent = 0, const char *name = 0); ~KMDriverDialog(); void setDriver(DrMain*); diff --git a/kdeprint/management/kmiconview.cpp b/kdeprint/management/kmiconview.cpp index cabd4496a..5d16e34d0 100644 --- a/kdeprint/management/kmiconview.cpp +++ b/kdeprint/management/kmiconview.cpp @@ -20,21 +20,21 @@ #include "kmiconview.h" #include "kmprinter.h" -#include +#include #include #include -KMIconViewItem::KMIconViewItem(QIconView *parent, KMPrinter *p) -: QIconViewItem(parent) +KMIconViewItem::KMIconViewItem(TQIconView *parent, KMPrinter *p) +: TQIconViewItem(parent) { m_state = 0; m_mode = parent->itemTextPos(); - m_pixmap = QString::null; + m_pixmap = TQString::null; m_isclass = false; updatePrinter(p, m_mode); } -void KMIconViewItem::paintItem(QPainter *p, const QColorGroup& cg) +void KMIconViewItem::paintItem(TQPainter *p, const TQColorGroup& cg) { if (m_state != 0) { @@ -43,10 +43,10 @@ void KMIconViewItem::paintItem(QPainter *p, const QColorGroup& cg) if (m_state & 0x2) f.setItalic(true); p->setFont(f); } - QIconViewItem::paintItem(p,cg); + TQIconViewItem::paintItem(p,cg); } -void KMIconViewItem::calcRect(const QString&) +void KMIconViewItem::calcRect(const TQString&) { QRect ir(rect()), pr, tr; @@ -59,25 +59,25 @@ void KMIconViewItem::calcRect(const QString&) if (m_state & 0x1) f.setBold(true); if (m_state & 0x2) f.setItalic(true); QFontMetrics fm(f); - if (m_mode == QIconView::Bottom) + if (m_mode == TQIconView::Bottom) tr = fm.boundingRect(0, 0, iconView()->maxItemWidth(), 0xFFFFFF, AlignHCenter|AlignTop|WordBreak|BreakAnywhere, text()+"X"); else tr = fm.boundingRect(0, 0, 0xFFFFFF, 0xFFFFFF, AlignLeft|AlignTop, text()+"X"); // item rect - if (m_mode == QIconView::Bottom) + if (m_mode == TQIconView::Bottom) { ir.setHeight(pr.height() + tr.height() + 15); ir.setWidth(QMAX(pr.width(), tr.width()) + 10); - pr = QRect((ir.width()-pr.width())/2, 5, pr.width(), pr.height()); - tr = QRect((ir.width()-tr.width())/2, 10+pr.height(), tr.width(), tr.height()); + pr = TQRect((ir.width()-pr.width())/2, 5, pr.width(), pr.height()); + tr = TQRect((ir.width()-tr.width())/2, 10+pr.height(), tr.width(), tr.height()); } else { ir.setHeight(QMAX(pr.height(), tr.height()) + 4); ir.setWidth(pr.width() + tr.width() + 6); - pr = QRect(2, (ir.height()-pr.height())/2, pr.width(), pr.height()); - tr = QRect(4+pr.width(), (ir.height()-tr.height())/2, tr.width(), tr.height()); + pr = TQRect(2, (ir.height()-pr.height())/2, pr.width(), pr.height()); + tr = TQRect(4+pr.width(), (ir.height()-tr.height())/2, tr.width(), tr.height()); } // set rects @@ -96,10 +96,10 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) update = (oldstate != m_state); if (p->name() != text() || update) { - setText(QString::null); + setText(TQString::null); setText(p->name()); } - setKey(QString::fromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name())); + setKey(TQString::fromLatin1("%1_%2").arg((p->isSpecial() ? "special" : (p->isClass(false) ? "class" : "printer"))).arg(p->name())); m_isclass = p->isClass(false); } if (mode != m_mode || ((oldstate&0x4) != (m_state&0x4)) || (p && p->pixmap() != m_pixmap)) @@ -108,7 +108,7 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) if (p) m_pixmap = p->pixmap(); m_mode = mode; - if (m_mode == QIconView::Bottom) + if (m_mode == TQIconView::Bottom) setPixmap(DesktopIcon(m_pixmap, 0, iconstate)); else setPixmap(SmallIcon(m_pixmap, 0, iconstate)); @@ -118,19 +118,19 @@ void KMIconViewItem::updatePrinter(KMPrinter *p, int mode) setDiscarded(false); } -KMIconView::KMIconView(QWidget *parent, const char *name) +KMIconView::KMIconView(TQWidget *parent, const char *name) : KIconView(parent,name) { setMode(KIconView::Select); - setSelectionMode(QIconView::Single); + setSelectionMode(TQIconView::Single); setItemsMovable(false); - setResizeMode(QIconView::Adjust); + setResizeMode(TQIconView::Adjust); m_items.setAutoDelete(false); setViewMode(KMIconView::Big); - connect(this,SIGNAL(contextMenuRequested(QIconViewItem*,const QPoint&)),SLOT(slotRightButtonClicked(QIconViewItem*,const QPoint&))); - connect(this,SIGNAL(selectionChanged()),SLOT(slotSelectionChanged())); + connect(this,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); + connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); } KMIconView::~KMIconView() @@ -141,7 +141,7 @@ KMIconViewItem* KMIconView::findItem(KMPrinter *p) { if (p) { - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (;it.current();++it) if (it.current()->text() == p->name() && it.current()->isClass() == p->isClass()) @@ -150,17 +150,17 @@ KMIconViewItem* KMIconView::findItem(KMPrinter *p) return 0; } -void KMIconView::setPrinterList(QPtrList *list) +void KMIconView::setPrinterList(TQPtrList *list) { bool changed(false); - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (;it.current();++it) it.current()->setDiscarded(true); if (list) { - QPtrListIterator it(*list); + TQPtrListIterator it(*list); KMIconViewItem *item(0); for (;it.current();++it) { @@ -195,32 +195,32 @@ void KMIconView::setViewMode(ViewMode m) { m_mode = m; bool big = (m == KMIconView::Big); - int mode = (big ? QIconView::Bottom : QIconView::Right); + int mode = (big ? TQIconView::Bottom : TQIconView::Right); - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (;it.current();++it) it.current()->updatePrinter(0, mode); - setArrangement((big ? QIconView::LeftToRight : QIconView::TopToBottom)); - setItemTextPos((QIconView::ItemTextPos)mode); + setArrangement((big ? TQIconView::LeftToRight : TQIconView::TopToBottom)); + setItemTextPos((TQIconView::ItemTextPos)mode); //setGridX((big ? 60 : -1)); setWordWrapIconText(true); } -void KMIconView::slotRightButtonClicked(QIconViewItem *item, const QPoint& p) +void KMIconView::slotRightButtonClicked(TQIconViewItem *item, const TQPoint& p) { - emit rightButtonClicked(item ? item->text() : QString::null, p); + emit rightButtonClicked(item ? item->text() : TQString::null, p); } void KMIconView::slotSelectionChanged() { KMIconViewItem *item = static_cast(currentItem()); - emit printerSelected((item && !item->isDiscarded() && item->isSelected() ? item->text() : QString::null)); + emit printerSelected((item && !item->isDiscarded() && item->isSelected() ? item->text() : TQString::null)); } -void KMIconView::setPrinter(const QString& prname) +void KMIconView::setPrinter(const TQString& prname) { - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (; it.current(); ++it) if (it.current()->text() == prname) { @@ -231,7 +231,7 @@ void KMIconView::setPrinter(const QString& prname) void KMIconView::setPrinter(KMPrinter *p) { - setPrinter(p ? p->name() : QString::null); + setPrinter(p ? p->name() : TQString::null); } #include "kmiconview.moc" diff --git a/kdeprint/management/kmiconview.h b/kdeprint/management/kmiconview.h index 1cc8daa09..1c3aeb542 100644 --- a/kdeprint/management/kmiconview.h +++ b/kdeprint/management/kmiconview.h @@ -21,22 +21,22 @@ #define KMICONVIEW_H #include -#include +#include #include "kmobject.h" class KMPrinter; -class KMIconViewItem : public QIconViewItem, public KMObject +class KMIconViewItem : public TQIconViewItem, public KMObject { public: - KMIconViewItem(QIconView *parent, KMPrinter *p); - void updatePrinter(KMPrinter *printer = 0, int mode = QIconView::Bottom); + KMIconViewItem(TQIconView *parent, KMPrinter *p); + void updatePrinter(KMPrinter *printer = 0, int mode = TQIconView::Bottom); bool isClass() const { return m_isclass; } protected: - virtual void paintItem(QPainter*, const QColorGroup&); - virtual void calcRect(const QString& text_ = QString::null); + virtual void paintItem(TQPainter*, const TQColorGroup&); + virtual void calcRect(const TQString& text_ = TQString::null); private: int m_mode; @@ -51,27 +51,27 @@ class KMIconView : public KIconView public: enum ViewMode { Big, Small }; - KMIconView(QWidget *parent = 0, const char *name = 0); + KMIconView(TQWidget *parent = 0, const char *name = 0); ~KMIconView(); - void setPrinterList(QPtrList *list); - void setPrinter(const QString&); + void setPrinterList(TQPtrList *list); + void setPrinter(const TQString&); void setPrinter(KMPrinter*); void setViewMode(ViewMode); signals: - void rightButtonClicked(const QString&, const QPoint&); - void printerSelected(const QString&); + void rightButtonClicked(const TQString&, const TQPoint&); + void printerSelected(const TQString&); protected slots: - void slotRightButtonClicked(QIconViewItem*, const QPoint&); + void slotRightButtonClicked(TQIconViewItem*, const TQPoint&); void slotSelectionChanged(); private: KMIconViewItem* findItem(KMPrinter *p); private: - QPtrList m_items; + TQPtrList m_items; ViewMode m_mode; }; diff --git a/kdeprint/management/kminfopage.cpp b/kdeprint/management/kminfopage.cpp index 4366265ab..e06fa3c28 100644 --- a/kdeprint/management/kminfopage.cpp +++ b/kdeprint/management/kminfopage.cpp @@ -20,44 +20,44 @@ #include "kminfopage.h" #include "kmprinter.h" -#include -#include -#include +#include +#include +#include #include #include #include -KMInfoPage::KMInfoPage(QWidget *parent, const char *name) -: QWidget(parent,name) +KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) +: TQWidget(parent,name) { - m_title = new QLabel(this); - m_titlepixmap = new QLabel(this); + m_title = new TQLabel(this); + m_titlepixmap = new TQLabel(this); m_titlepixmap->setAlignment(Qt::AlignCenter); KSeparator* sep = new KSeparator( KSeparator::HLine, this); - m_type = new QLabel(this); - m_description = new QLabel(this); - m_state = new QLabel(this); - m_location = new QLabel(this); - m_model = new QLabel(this); - m_uri = new QLabel(this); - m_device = new QLabel(this); - QLabel *m_loclabel = new QLabel(i18n("Physical Location", "Location:"), this); + m_type = new TQLabel(this); + m_description = new TQLabel(this); + m_state = new TQLabel(this); + m_location = new TQLabel(this); + m_model = new TQLabel(this); + m_uri = new TQLabel(this); + m_device = new TQLabel(this); + QLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this); m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - QLabel *m_desclabel = new QLabel(i18n("Description:"), this); + QLabel *m_desclabel = new TQLabel(i18n("Description:"), this); m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - QLabel *m_typelabel = new QLabel(i18n("Type:"), this); + QLabel *m_typelabel = new TQLabel(i18n("Type:"), this); m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - QLabel *m_statelabel = new QLabel(i18n("Status", "State:"), this); + QLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this); m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - QLabel *m_urilabel = new QLabel(i18n("URI:"), this); + QLabel *m_urilabel = new TQLabel(i18n("URI:"), this); m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - m_devlabel = new QLabel(i18n("Device:"), this); + m_devlabel = new TQLabel(i18n("Device:"), this); m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - QLabel *m_modellabel = new QLabel(i18n("Model:"), this); + QLabel *m_modellabel = new TQLabel(i18n("Model:"), this); m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); - QGridLayout *lay0 = new QGridLayout(this, 11, 2, 0, 5); - QHBoxLayout *lay1 = new QHBoxLayout(0, 0, 10); + QGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5); + QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); lay0->addRowSpacing(7,20); lay0->setRowStretch(7,0); lay0->setRowStretch(10,1); @@ -95,19 +95,19 @@ void KMInfoPage::setPrinter(KMPrinter *p) // clear everything if p == 0 if (!p) { - m_title->setText(QString::null); - m_titlepixmap->setPixmap(QPixmap()); - m_type->setText(QString::null); - m_state->setText(QString::null); - m_location->setText(QString::null); - m_description->setText(QString::null); - m_uri->setText(QString::null); - m_device->setText(QString::null); - m_model->setText(QString::null); + m_title->setText(TQString::null); + m_titlepixmap->setPixmap(TQPixmap()); + m_type->setText(TQString::null); + m_state->setText(TQString::null); + m_location->setText(TQString::null); + m_description->setText(TQString::null); + m_uri->setText(TQString::null); + m_device->setText(TQString::null); + m_model->setText(TQString::null); } else { - m_title->setText(QString::fromLatin1("%1").arg(p->name())); + m_title->setText(TQString::fromLatin1("%1").arg(p->name())); m_titlepixmap->setPixmap(SmallIcon(p->pixmap())); if (p->isImplicit()) m_type->setText(i18n("Implicit class")); else if (p->isClass(false)) @@ -126,7 +126,7 @@ void KMInfoPage::setPrinter(KMPrinter *p) if (p->isClass(false)) { QString s; - for (QStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it) + for (TQStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it) s.append(KURL(*it).prettyURL() + ", "); s.truncate(s.length()-2); m_device->setText(s); diff --git a/kdeprint/management/kminfopage.h b/kdeprint/management/kminfopage.h index a93aa1296..9c1c6ff10 100644 --- a/kdeprint/management/kminfopage.h +++ b/kdeprint/management/kminfopage.h @@ -21,14 +21,14 @@ #define KMINFOPAGE_H #include "kmprinterpage.h" -#include +#include class QLabel; -class KMInfoPage : public QWidget, public KMPrinterPage +class KMInfoPage : public TQWidget, public KMPrinterPage { public: - KMInfoPage(QWidget *parent = 0, const char *name = 0); + KMInfoPage(TQWidget *parent = 0, const char *name = 0); ~KMInfoPage(); void setPrinter(KMPrinter *p); diff --git a/kdeprint/management/kminstancepage.cpp b/kdeprint/management/kminstancepage.cpp index d4bb32687..6e6fcc391 100644 --- a/kdeprint/management/kminstancepage.cpp +++ b/kdeprint/management/kminstancepage.cpp @@ -26,10 +26,10 @@ #include "kprinter.h" #include "kmtimer.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -38,26 +38,26 @@ #include #include -KMInstancePage::KMInstancePage(QWidget *parent, const char *name) -: QWidget(parent,name) +KMInstancePage::KMInstancePage(TQWidget *parent, const char *name) +: TQWidget(parent,name) { m_view = new KListBox(this); m_printer = 0; initActions(); - QHBoxLayout *main_ = new QHBoxLayout(this, 0, 0); + QHBoxLayout *main_ = new TQHBoxLayout(this, 0, 0); main_->addWidget(m_view); - QVBoxLayout *sub_ = new QVBoxLayout(0, 0, 0); + QVBoxLayout *sub_ = new TQVBoxLayout(0, 0, 0); main_->addLayout(sub_); - for (QValueList::Iterator it=m_buttons.begin(); it!=m_buttons.end(); ++it) + for (TQValueList::Iterator it=m_buttons.begin(); it!=m_buttons.end(); ++it) if (*it) sub_->addWidget(*it); else sub_->addSpacing(10); sub_->addStretch(1); - QWhatsThis::add(this, + TQWhatsThis::add(this, i18n("Define/Edit here instances for the current selected " "printer. An instance is a combination of a real " "(physical) printer and a set of predefined options. " @@ -72,26 +72,26 @@ KMInstancePage::~KMInstancePage() { } -void KMInstancePage::addButton(const QString& txt, const QString& pixmap, const char *receiver) +void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, const char *receiver) { - QPushButton *btn = new QPushButton(this, 0L); + QPushButton *btn = new TQPushButton(this, 0L); btn->setText(txt); btn->setIconSet(BarIconSet(pixmap)); btn->setFlat(true); - connect(btn, SIGNAL(clicked()), receiver); + connect(btn, TQT_SIGNAL(clicked()), receiver); m_buttons.append(btn); } void KMInstancePage::initActions() { - addButton(i18n("New..."), "filenew", SLOT(slotNew())); - addButton(i18n("Copy..."), "editcopy", SLOT(slotCopy())); - addButton(i18n("Remove"), "edittrash", SLOT(slotRemove())); + addButton(i18n("New..."), "filenew", TQT_SLOT(slotNew())); + addButton(i18n("Copy..."), "editcopy", TQT_SLOT(slotCopy())); + addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove())); m_buttons.append(0); - addButton(i18n("Set as Default"), "exec", SLOT(slotDefault())); - addButton(i18n("Settings"), "configure", SLOT(slotSettings())); + addButton(i18n("Set as Default"), "exec", TQT_SLOT(slotDefault())); + addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings())); m_buttons.append(0); - addButton(i18n("Test..."), "fileprint", SLOT(slotTest())); + addButton(i18n("Test..."), "fileprint", TQT_SLOT(slotTest())); } void KMInstancePage::setPrinter(KMPrinter *p) @@ -104,18 +104,18 @@ void KMInstancePage::setPrinter(KMPrinter *p) bool ok = (p != 0); if (ok) { - QPtrList list; + TQPtrList list; KMFactory::self()->virtualManager()->virtualList(list,p->name()); - QPtrListIterator it(list); + TQPtrListIterator it(list); for (;it.current();++it) { - QStringList pair = QStringList::split('/',it.current()->name(),false); + QStringList pair = TQStringList::split('/',it.current()->name(),false); m_view->insertItem(SmallIcon((it.current()->isSoftDefault() ? "exec" : "fileprint")),(pair.count() > 1 ? pair[1] : i18n("(Default)"))); } m_view->sort(); } - for (QValueList::ConstIterator it=m_buttons.begin(); it!=m_buttons.end(); ++it) + for (TQValueList::ConstIterator it=m_buttons.begin(); it!=m_buttons.end(); ++it) if (*it) (*it)->setEnabled(ok); @@ -138,12 +138,12 @@ void KMInstancePage::slotNew() i18n("(Default)"),&ok,this); if (ok) { - if (name.find(QRegExp("[/\\s]")) != -1) + if (name.find(TQRegExp("[/\\s]")) != -1) KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes.")); else { if (name == i18n("(Default)")) - name = QString::null; + name = TQString::null; KMFactory::self()->virtualManager()->create(m_printer,name); setPrinter(m_printer); } @@ -158,11 +158,11 @@ void KMInstancePage::slotRemove() bool reload(false); QString src = m_view->currentText(); - QString msg = (src != i18n("(Default)") ? i18n("Do you really want to remove instance %1?") : i18n("You can't remove the default instance. However all settings of %1 will be discarded. Continue?")); - if (!src.isEmpty() && KMessageBox::warningContinueCancel(this,msg.arg(src),QString::null,KStdGuiItem::del()) == KMessageBox::Continue) + TQString msg = (src != i18n("(Default)") ? i18n("Do you really want to remove instance %1?") : i18n("You can't remove the default instance. However all settings of %1 will be discarded. Continue?")); + if (!src.isEmpty() && KMessageBox::warningContinueCancel(this,msg.arg(src),TQString::null,KStdGuiItem::del()) == KMessageBox::Continue) { if (src == i18n("(Default)")) - src = QString::null; + src = TQString::null; reload = KMFactory::self()->virtualManager()->isDefault(m_printer,src); KMFactory::self()->virtualManager()->remove(m_printer,src); setPrinter(m_printer); @@ -183,14 +183,14 @@ void KMInstancePage::slotCopy() i18n("(Default)"),&ok,this); if (ok) { - if (name.find(QRegExp("[/\\s]")) != -1) + if (name.find(TQRegExp("[/\\s]")) != -1) KMessageBox::error(this, i18n("Instance name must not contain any spaces or slashes.")); else { if (src == i18n("(Default)")) - src = QString::null; + src = TQString::null; if (name == i18n("(Default)")) - name = QString::null; + name = TQString::null; KMFactory::self()->virtualManager()->copy(m_printer,src,name); setPrinter(m_printer); } @@ -207,7 +207,7 @@ void KMInstancePage::slotSettings() QString src = m_view->currentText(); if (!src.isEmpty()) { - if (src == i18n("(Default)")) src = QString::null; + if (src == i18n("(Default)")) src = TQString::null; KMPrinter *pr = KMFactory::self()->virtualManager()->findInstance(m_printer,src); if ( !pr ) KMessageBox::error( this, i18n( "Unable to find instance %1." ).arg( m_view->currentText() ) ); @@ -222,7 +222,7 @@ void KMInstancePage::slotSettings() if (pr->isEdited()) { // printer edited, need to save changes pr->setDefaultOptions(pr->editedOptions()); - pr->setEditedOptions(QMap()); + pr->setEditedOptions(TQMap()); pr->setEdited(false); KMFactory::self()->virtualManager()->triggerSave(); } @@ -242,7 +242,7 @@ void KMInstancePage::slotDefault() if (!src.isEmpty()) { if (src == i18n("(Default)")) - src = QString::null; + src = TQString::null; KMFactory::self()->virtualManager()->setAsDefault(m_printer,src); setPrinter(m_printer); } @@ -258,11 +258,11 @@ void KMInstancePage::slotTest() if (!src.isEmpty()) { if (src == i18n("(Default)")) - src = QString::null; + src = TQString::null; KMPrinter *mpr = KMFactory::self()->virtualManager()->findInstance(m_printer,src); if (!mpr) KMessageBox::error(this,i18n("Internal error: printer not found.")); - else if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(mpr->printerName()), QString::null, i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue) + else if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(mpr->printerName()), TQString::null, i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue) { if (!KMFactory::self()->virtualManager()->testInstance(mpr)) KMessageBox::error(this, i18n("Unable to send test page to %1.").arg(mpr->printerName())); diff --git a/kdeprint/management/kminstancepage.h b/kdeprint/management/kminstancepage.h index d85a4bdb9..876c1f030 100644 --- a/kdeprint/management/kminstancepage.h +++ b/kdeprint/management/kminstancepage.h @@ -21,18 +21,18 @@ #define KMINSTANCEPAGE_H #include "kmprinterpage.h" -#include -#include +#include +#include class KListBox; class KMPrinter; class QButton; -class KMInstancePage : public QWidget, public KMPrinterPage +class KMInstancePage : public TQWidget, public KMPrinterPage { Q_OBJECT public: - KMInstancePage(QWidget *parent = 0, const char *name = 0); + KMInstancePage(TQWidget *parent = 0, const char *name = 0); ~KMInstancePage(); void setPrinter(KMPrinter*); @@ -47,11 +47,11 @@ protected slots: protected: void initActions(); - void addButton(const QString& text, const QString& pixmap, const char *receiver); + void addButton(const TQString& text, const TQString& pixmap, const char *receiver); private: KListBox *m_view; - QValueList m_buttons; + TQValueList m_buttons; KMPrinter *m_printer; }; diff --git a/kdeprint/management/kmjobviewer.cpp b/kdeprint/management/kmjobviewer.cpp index bc27d0928..a5e419fc6 100644 --- a/kdeprint/management/kmjobviewer.cpp +++ b/kdeprint/management/kmjobviewer.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include @@ -45,12 +45,12 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include -#include +#include #include #include @@ -60,20 +60,20 @@ class KJobListView : public KListView { public: - KJobListView( QWidget *parent = 0, const char *name = 0 ); + KJobListView( TQWidget *parent = 0, const char *name = 0 ); protected: - bool acceptDrag( QDropEvent* ) const; + bool acceptDrag( TQDropEvent* ) const; }; -KJobListView::KJobListView( QWidget *parent, const char *name ) +KJobListView::KJobListView( TQWidget *parent, const char *name ) : KListView( parent, name ) { setAcceptDrops( true ); setDropVisualizer( false ); } -bool KJobListView::acceptDrag( QDropEvent *e ) const +bool KJobListView::acceptDrag( TQDropEvent *e ) const { if ( KURLDrag::canDecode( e ) ) return true; @@ -81,7 +81,7 @@ bool KJobListView::acceptDrag( QDropEvent *e ) const return KListView::acceptDrag( e ); } -KMJobViewer::KMJobViewer(QWidget *parent, const char *name) +KMJobViewer::KMJobViewer(TQWidget *parent, const char *name) : KMainWindow(parent,name) { m_view = 0; @@ -100,7 +100,7 @@ KMJobViewer::KMJobViewer(QWidget *parent, const char *name) { setCaption(i18n("No Printer")); KConfig *conf = KMFactory::self()->printConfig(); - QSize defSize( 550, 250 ); + TQSize defSize( 550, 250 ); conf->setGroup( "Jobs" ); resize( conf->readSizeEntry( "Size", &defSize ) ); } @@ -121,10 +121,10 @@ KMJobViewer::~KMJobViewer() void KMJobViewer::setPrinter(KMPrinter *p) { - setPrinter((p ? p->printerName() : QString::null)); + setPrinter((p ? p->printerName() : TQString::null)); } -void KMJobViewer::setPrinter(const QString& prname) +void KMJobViewer::setPrinter(const TQString& prname) { // We need to trigger a refresh even if the printer // has not changed, some jobs may have been canceled @@ -177,7 +177,7 @@ void KMJobViewer::addToManager() if (m_prname == i18n("All Printers")) { loadPrinters(); - QPtrListIterator it(m_printers); + TQPtrListIterator it(m_printers); for (; it.current(); ++it) m_manager->addPrinter(it.current()->printerName(), (KMJobManager::JobType)m_type, it.current()->isSpecial()); } @@ -193,7 +193,7 @@ void KMJobViewer::removeFromManager() { if (m_prname == i18n("All Printers")) { - QPtrListIterator it(m_printers); + TQPtrListIterator it(m_printers); for (; it.current(); ++it) m_manager->removePrinter(it.current()->printerName(), (KMJobManager::JobType)m_type); } @@ -206,7 +206,7 @@ void KMJobViewer::removeFromManager() void KMJobViewer::refresh(bool reload) { m_jobs.clear(); - QPtrListIterator it(m_manager->jobList(reload)); + TQPtrListIterator it(m_manager->jobList(reload)); bool all = (m_prname == i18n("All Printers")), active = (m_type == KMJobManager::ActiveJobs); for (; it.current(); ++it) if ((all || it.current()->printer() == m_prname) @@ -239,17 +239,17 @@ void KMJobViewer::init() m_view->addColumn(i18n("Size (KB)")); m_view->addColumn(i18n("Page(s)")); m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter); - connect( m_view, SIGNAL( dropped( QDropEvent*, QListViewItem* ) ), SLOT( slotDropped( QDropEvent*, QListViewItem* ) ) ); + connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); //m_view->addColumn(i18n("Printer")); //m_view->setColumnAlignment(6,Qt::AlignRight|Qt::AlignVCenter); KMFactory::self()->uiManager()->setupJobViewer(m_view); - m_view->setFrameStyle(QFrame::WinPanel|QFrame::Sunken); + m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); m_view->setSorting(0); m_view->setAllColumnsShowFocus(true); - m_view->setSelectionMode(QListView::Extended); - connect(m_view,SIGNAL(selectionChanged()),SLOT(slotSelectionChanged())); - connect(m_view,SIGNAL(rightButtonPressed(QListViewItem*,const QPoint&,int)),SLOT(slotRightClicked(QListViewItem*,const QPoint&,int))); + 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))); setCentralWidget(m_view); } @@ -259,35 +259,35 @@ void KMJobViewer::init() void KMJobViewer::initActions() { // job actions - KAction *hact = new KAction(i18n("&Hold"),"stop",0,this,SLOT(slotHold()),actionCollection(),"job_hold"); - KAction *ract = new KAction(i18n("&Resume"),"run",0,this,SLOT(slotResume()),actionCollection(),"job_resume"); - KAction *dact = new KAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,this,SLOT(slotRemove()),actionCollection(),"job_remove"); - KAction *sact = new KAction(i18n("Res&tart"),"redo",0,this,SLOT(slotRestart()),actionCollection(),"job_restart"); + KAction *hact = new KAction(i18n("&Hold"),"stop",0,this,TQT_SLOT(slotHold()),actionCollection(),"job_hold"); + KAction *ract = new KAction(i18n("&Resume"),"run",0,this,TQT_SLOT(slotResume()),actionCollection(),"job_resume"); + KAction *dact = new KAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,this,TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); + KAction *sact = new KAction(i18n("Res&tart"),"redo",0,this,TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); KActionMenu *mact = new KActionMenu(i18n("&Move to Printer"),"fileprint",actionCollection(),"job_move"); mact->setDelayed(false); - connect(mact->popupMenu(),SIGNAL(activated(int)),SLOT(slotMove(int))); - connect(mact->popupMenu(),SIGNAL(aboutToShow()),KMTimer::self(),SLOT(hold())); - connect(mact->popupMenu(),SIGNAL(aboutToHide()),KMTimer::self(),SLOT(release())); - connect(mact->popupMenu(),SIGNAL(aboutToShow()),SLOT(slotShowMoveMenu())); + 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())); KToggleAction *tact = new KToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed"); tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted); - connect(tact,SIGNAL(toggled(bool)),SLOT(slotShowCompleted(bool))); + connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool))); KToggleAction *uact = new KToggleAction(i18n("Show Only User Jobs"), "personal", 0, actionCollection(), "view_user_jobs"); uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"personal")); - connect(uact, SIGNAL(toggled(bool)), SLOT(slotUserOnly(bool))); - m_userfield = new QLineEdit(0); + connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool))); + m_userfield = new TQLineEdit(0); m_userfield->setText(getenv("USER")); - connect(m_userfield, SIGNAL(returnPressed()), SLOT(slotUserChanged())); - connect(uact, SIGNAL(toggled(bool)), m_userfield, SLOT(setEnabled(bool))); + connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged())); + connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool))); m_userfield->setEnabled(false); - m_userfield->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed)); + m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); KWidgetAction *ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username"); if (!m_pop) { - m_pop = new QPopupMenu(this); - connect(m_pop,SIGNAL(aboutToShow()),KMTimer::self(),SLOT(hold())); - connect(m_pop,SIGNAL(aboutToHide()),KMTimer::self(),SLOT(release())); + 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())); hact->plug(m_pop); ract->plug(m_pop); m_pop->insertSeparator(); @@ -300,10 +300,10 @@ void KMJobViewer::initActions() // Filter actions KActionMenu *fact = new KActionMenu(i18n("&Select Printer"), "kdeprint_printer", actionCollection(), "filter_modify"); fact->setDelayed(false); - connect(fact->popupMenu(),SIGNAL(activated(int)),SLOT(slotPrinterSelected(int))); - connect(fact->popupMenu(),SIGNAL(aboutToShow()),KMTimer::self(),SLOT(hold())); - connect(fact->popupMenu(),SIGNAL(aboutToHide()),KMTimer::self(),SLOT(release())); - connect(fact->popupMenu(),SIGNAL(aboutToShow()),SLOT(slotShowPrinterMenu())); + 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())); if (!m_standalone) { @@ -322,16 +322,16 @@ void KMJobViewer::initActions() } else {// stand-alone application - KStdAction::quit(kapp,SLOT(quit()),actionCollection()); - KStdAction::close(this,SLOT(slotClose()),actionCollection()); - KStdAction::preferences(this, SLOT(slotConfigure()), actionCollection()); + KStdAction::quit(kapp,TQT_SLOT(quit()),actionCollection()); + KStdAction::close(this,TQT_SLOT(slotClose()),actionCollection()); + KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); // refresh action - new KAction(i18n("Refresh"),"reload",0,this,SLOT(slotRefresh()),actionCollection(),"refresh"); + new KAction(i18n("Refresh"),"reload",0,this,TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); // create status bar KStatusBar *statusbar = statusBar(); - m_stickybox = new QCheckBox( i18n( "Keep window permanent" ), statusbar ); + m_stickybox = new TQCheckBox( i18n( "Keep window permanent" ), statusbar ); statusbar->addWidget( m_stickybox, 1, false ); statusbar->insertItem(" " + i18n("Max.: %1").arg(i18n("Unlimited"))+ " ", 0, 0, true); statusbar->setItemFixed(0); @@ -344,12 +344,12 @@ void KMJobViewer::initActions() slotSelectionChanged(); } -void KMJobViewer::buildPrinterMenu(QPopupMenu *menu, bool use_all, bool use_specials) +void KMJobViewer::buildPrinterMenu(TQPopupMenu *menu, bool use_all, bool use_specials) { loadPrinters(); menu->clear(); - QPtrListIterator it(m_printers); + TQPtrListIterator it(m_printers); int i(0); if (use_all) { @@ -379,11 +379,11 @@ void KMJobViewer::slotShowPrinterMenu() void KMJobViewer::updateJobs() { - QPtrListIterator jit(m_items); + TQPtrListIterator jit(m_items); for (;jit.current();++jit) jit.current()->setDiscarded(true); - QPtrListIterator it(m_jobs); + TQPtrListIterator it(m_jobs); for (;it.current();++it) { KMJob *j(it.current()); @@ -407,9 +407,9 @@ void KMJobViewer::updateJobs() slotSelectionChanged(); } -JobItem* KMJobViewer::findItem(const QString& uri) +JobItem* KMJobViewer::findItem(const TQString& uri) { - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (;it.current();++it) if (it.current()->jobUri() == uri) return it.current(); return 0; @@ -422,8 +422,8 @@ void KMJobViewer::slotSelectionChanged() int thread(0); bool completed(true), remote(false); - QPtrListIterator it(m_items); - QPtrList joblist; + TQPtrListIterator it(m_items); + TQPtrList joblist; joblist.setAutoDelete(false); for (;it.current();++it) @@ -459,26 +459,26 @@ void KMJobViewer::slotSelectionChanged() m_manager->validatePluginActions(actionCollection(), joblist); } -void KMJobViewer::jobSelection(QPtrList& l) +void KMJobViewer::jobSelection(TQPtrList& l) { l.setAutoDelete(false); - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (;it.current();++it) if (it.current()->isSelected()) l.append(it.current()->job()); } -void KMJobViewer::send(int cmd, const QString& name, const QString& arg) +void KMJobViewer::send(int cmd, const TQString& name, const TQString& arg) { KMTimer::self()->hold(); - QPtrList l; + TQPtrList l; jobSelection(l); if (!m_manager->sendCommand(l,cmd,arg)) { KMessageBox::error(this,""+i18n("Unable to perform action \"%1\" on selected jobs. Error received from manager:").arg(name)+"

"+KMManager::self()->errorMsg()+"

"); // error reported, clean it - KMManager::self()->setErrorMsg(QString::null); + KMManager::self()->setErrorMsg(TQString::null); } triggerRefresh(); @@ -515,7 +515,7 @@ void KMJobViewer::slotMove(int prID) } } -void KMJobViewer::slotRightClicked(QListViewItem*,const QPoint& p,int) +void KMJobViewer::slotRightClicked(TQListViewItem*,const TQPoint& p,int) { if (m_pop) m_pop->popup(p); } @@ -525,7 +525,7 @@ void KMJobViewer::loadPrinters() m_printers.clear(); // retrieve printer list without reloading it (faster) - QPtrListIterator it(*(KMFactory::self()->manager()->printerList(false))); + TQPtrListIterator it(*(KMFactory::self()->manager()->printerList(false))); for (;it.current();++it) { // keep only real printers (no instance, no implicit) and special printers @@ -594,25 +594,25 @@ void KMJobViewer::loadPluginActions() } } - QValueList acts = m_manager->createPluginActions(actionCollection()); - for (QValueListIterator it=acts.begin(); it!=acts.end(); ++it) + TQValueList acts = m_manager->createPluginActions(actionCollection()); + for (TQValueListIterator it=acts.begin(); it!=acts.end(); ++it) { // connect the action to this - connect((*it), SIGNAL(activated(int)), SLOT(pluginActionActivated(int))); + connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int))); // should add it to the toolbar and menubar (*it)->plug(toolBar(), toolbarindex++); if (m_pop) (*it)->plug(m_pop, mpopindex++); if (menu) - (*it)->plug(static_cast(menu), menuindex++); + (*it)->plug(static_cast(menu), menuindex++); } } void KMJobViewer::removePluginActions() { - QValueList acts = actionCollection()->actions("plugin"); - for (QValueListIterator it=acts.begin(); it!=acts.end(); ++it) + TQValueList acts = actionCollection()->actions("plugin"); + for (TQValueListIterator it=acts.begin(); it!=acts.end(); ++it) { (*it)->unplugAll(); delete (*it); @@ -653,7 +653,7 @@ void KMJobViewer::reload() static_cast(actionCollection()->action("view_completed"))->setChecked(false); } -void KMJobViewer::closeEvent(QCloseEvent *e) +void KMJobViewer::closeEvent(TQCloseEvent *e) { if (m_standalone && !kapp->sessionSaving()) { @@ -668,7 +668,7 @@ void KMJobViewer::pluginActionActivated(int ID) { KMTimer::self()->hold(); - QPtrList joblist; + TQPtrList joblist; jobSelection(joblist); if (!m_manager->doPluginAction(ID, joblist)) KMessageBox::error(this, ""+i18n("Operation failed.")+"

"+KMManager::self()->errorMsg()+"

"); @@ -679,7 +679,7 @@ void KMJobViewer::pluginActionActivated(int ID) void KMJobViewer::slotUserOnly(bool on) { - m_username = (on ? m_userfield->text() : QString::null); + m_username = (on ? m_userfield->text() : TQString::null); refresh(false); } @@ -717,10 +717,10 @@ bool KMJobViewer::isSticky() const return ( m_stickybox ? m_stickybox->isChecked() : false ); } -void KMJobViewer::slotDropped( QDropEvent *e, QListViewItem* ) +void KMJobViewer::slotDropped( TQDropEvent *e, TQListViewItem* ) { - QStringList files; - QString target; + TQStringList files; + TQString target; KURL::List uris; KURLDrag::decode( e, uris ); diff --git a/kdeprint/management/kmjobviewer.h b/kdeprint/management/kmjobviewer.h index 69a3f27d6..9cdf6aceb 100644 --- a/kdeprint/management/kmjobviewer.h +++ b/kdeprint/management/kmjobviewer.h @@ -50,19 +50,19 @@ class KDEPRINT_EXPORT KMJobViewer : public KMainWindow, public KMPrinterPage, pu { Q_OBJECT public: - KMJobViewer(QWidget *parent = 0, const char *name = 0); + KMJobViewer(TQWidget *parent = 0, const char *name = 0); ~KMJobViewer(); - void setPrinter(const QString& prname); + void setPrinter(const TQString& prname); void setPrinter(KMPrinter *p); void refresh(bool reload = false); - QString printer() const; + TQString printer() const; bool isSticky() const; signals: void jobsShown(KMJobViewer*, bool hasJobs); void refreshClicked(); - void printerChanged(KMJobViewer*, const QString& prname); + void printerChanged(KMJobViewer*, const TQString& prname); void viewerDestroyed(KMJobViewer*); public slots: @@ -74,7 +74,7 @@ protected slots: void slotResume(); void slotRemove(); void slotRestart(); - void slotRightClicked(QListViewItem*,const QPoint&,int); + void slotRightClicked(TQListViewItem*,const TQPoint&,int); void slotMove(int prID); void slotPrinterSelected(int); void slotShowCompleted(bool); @@ -85,34 +85,34 @@ protected slots: void slotUserOnly(bool); void slotUserChanged(); void slotConfigure(); - void slotDropped( QDropEvent*, QListViewItem* ); + void slotDropped( TQDropEvent*, TQListViewItem* ); protected: void init(); void updateJobs(); void initActions(); - JobItem* findItem(const QString& uri); - void jobSelection(QPtrList& l); - void send(int cmd, const QString& name, const QString& arg = QString::null); + JobItem* findItem(const TQString& uri); + void jobSelection(TQPtrList& l); + void send(int cmd, const TQString& name, const TQString& arg = TQString::null); void loadPrinters(); void loadPluginActions(); void removePluginActions(); void reload(); //void aboutToReload(); - void closeEvent(QCloseEvent*); + void closeEvent(TQCloseEvent*); void triggerRefresh(); void addToManager(); void removeFromManager(); - void buildPrinterMenu(QPopupMenu *menu, bool use_all = false, bool use_specials = false); + void buildPrinterMenu(TQPopupMenu *menu, bool use_all = false, bool use_specials = false); void updateCaption(); void updateStatusBar(); private: KListView *m_view; - QPtrList m_jobs; - QPtrList m_items; + TQPtrList m_jobs; + TQPtrList m_items; QPopupMenu *m_pop; - QPtrList m_printers; + TQPtrList m_printers; QString m_prname; int m_type; QString m_username; @@ -121,7 +121,7 @@ private: bool m_standalone; }; -inline QString KMJobViewer::printer() const +inline TQString KMJobViewer::printer() const { return m_prname; } #endif diff --git a/kdeprint/management/kmlistview.cpp b/kdeprint/management/kmlistview.cpp index cbb1ca088..e754cfe1d 100644 --- a/kdeprint/management/kmlistview.cpp +++ b/kdeprint/management/kmlistview.cpp @@ -21,20 +21,20 @@ #include "kmprinter.h" #include "kmobject.h" -#include -#include +#include +#include #include #include #include -class KMListViewItem : public QListViewItem, public KMObject +class KMListViewItem : public TQListViewItem, public KMObject { public: - KMListViewItem(QListView *parent, const QString& txt); - KMListViewItem(QListViewItem *parent, const QString& txt); - KMListViewItem(QListViewItem *parent, KMPrinter *p); + KMListViewItem(TQListView *parent, const TQString& txt); + KMListViewItem(TQListViewItem *parent, const TQString& txt); + KMListViewItem(TQListViewItem *parent, KMPrinter *p); - virtual void paintCell(QPainter*, const QColorGroup&, int, int, int); + virtual void paintCell(TQPainter*, const TQColorGroup&, int, int, int); void updatePrinter(KMPrinter *p); bool isClass() const { return m_isclass; } @@ -46,20 +46,20 @@ private: bool m_isclass; }; -KMListViewItem::KMListViewItem(QListView *parent, const QString& txt) -: QListViewItem(parent,txt) +KMListViewItem::KMListViewItem(TQListView *parent, const TQString& txt) +: TQListViewItem(parent,txt) { init(); } -KMListViewItem::KMListViewItem(QListViewItem *parent, const QString& txt) -: QListViewItem(parent,txt) +KMListViewItem::KMListViewItem(TQListViewItem *parent, const TQString& txt) +: TQListViewItem(parent,txt) { init(); } -KMListViewItem::KMListViewItem(QListViewItem *parent, KMPrinter *p) -: QListViewItem(parent) +KMListViewItem::KMListViewItem(TQListViewItem *parent, KMPrinter *p) +: TQListViewItem(parent) { init(p); } @@ -92,7 +92,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p) repaint(); } -void KMListViewItem::paintCell(QPainter *p, const QColorGroup& cg, int c, int w, int a) +void KMListViewItem::paintCell(TQPainter *p, const TQColorGroup& cg, int c, int w, int a) { if (m_state != 0) { @@ -101,26 +101,26 @@ void KMListViewItem::paintCell(QPainter *p, const QColorGroup& cg, int c, int w, if (m_state & 0x2) f.setItalic(true); p->setFont(f); } - QListViewItem::paintCell(p,cg,c,w,a); + TQListViewItem::paintCell(p,cg,c,w,a); } //************************************************************************************************ -KMListView::KMListView(QWidget *parent, const char *name) -: QListView(parent,name) +KMListView::KMListView(TQWidget *parent, const char *name) +: TQListView(parent,name) { m_items.setAutoDelete(false); addColumn(""); header()->hide(); - setFrameStyle(QFrame::WinPanel|QFrame::Sunken); + setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); setLineWidth(1); setSorting(0); - connect(this,SIGNAL(contextMenuRequested(QListViewItem*,const QPoint&,int)),SLOT(slotRightButtonClicked(QListViewItem*,const QPoint&,int))); - connect(this,SIGNAL(selectionChanged()),SLOT(slotSelectionChanged())); - connect(this,SIGNAL(onItem(QListViewItem*)),SLOT(slotOnItem(QListViewItem*))); - connect(this,SIGNAL(onViewport()),SLOT(slotOnViewport())); + 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())); m_root = new KMListViewItem(this,i18n("Print System")); m_root->setPixmap(0,SmallIcon("kdeprint_printer")); @@ -142,16 +142,16 @@ KMListView::~KMListView() { } -void KMListView::slotRightButtonClicked(QListViewItem *item, const QPoint& p, int) +void KMListView::slotRightButtonClicked(TQListViewItem *item, const TQPoint& p, int) { - emit rightButtonClicked(item && item->depth() == 2 ? item->text(0) : QString::null, p); + emit rightButtonClicked(item && item->depth() == 2 ? item->text(0) : TQString::null, p); } KMListViewItem* KMListView::findItem(KMPrinter *p) { if (p) { - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); bool isVirtual(p->isVirtual()), isClass(p->isClass()); for (;it.current();++it) if (isVirtual) @@ -169,26 +169,26 @@ KMListViewItem* KMListView::findItem(KMPrinter *p) return 0; } -KMListViewItem* KMListView::findItem(const QString& prname) +KMListViewItem* KMListView::findItem(const TQString& prname) { - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (; it.current(); ++it) if (it.current()->depth() == 2 && it.current()->text(0) == prname) return it.current(); return 0; } -void KMListView::setPrinterList(QPtrList *list) +void KMListView::setPrinterList(TQPtrList *list) { bool changed(false); - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (;it.current();++it) it.current()->setDiscarded(true); if (list) { - QPtrListIterator it(*list); + TQPtrListIterator it(*list); KMListViewItem *item (0); for (;it.current();++it) { @@ -213,7 +213,7 @@ void KMListView::setPrinterList(QPtrList *list) } } - QPtrList deleteList; + TQPtrList deleteList; deleteList.setAutoDelete(true); for (uint i=0; iisDiscarded()) @@ -237,12 +237,12 @@ void KMListView::setPrinterList(QPtrList *list) void KMListView::slotSelectionChanged() { KMListViewItem *item = static_cast(currentItem()); - emit printerSelected((item && !item->isDiscarded() && item->depth() == 2 ? item->text(0) : QString::null)); + emit printerSelected((item && !item->isDiscarded() && item->depth() == 2 ? item->text(0) : TQString::null)); } -void KMListView::setPrinter(const QString& prname) +void KMListView::setPrinter(const TQString& prname) { - QPtrListIterator it(m_items); + TQPtrListIterator it(m_items); for (;it.current();++it) if (it.current()->text(0) == prname) { @@ -253,10 +253,10 @@ void KMListView::setPrinter(const QString& prname) void KMListView::setPrinter(KMPrinter *p) { - setPrinter(p ? p->name() : QString::null); + setPrinter(p ? p->name() : TQString::null); } -void KMListView::slotOnItem(QListViewItem *) +void KMListView::slotOnItem(TQListViewItem *) { setCursor(KCursor::handCursor()); } diff --git a/kdeprint/management/kmlistview.h b/kdeprint/management/kmlistview.h index 9e5ce6651..e9a6b29e5 100644 --- a/kdeprint/management/kmlistview.h +++ b/kdeprint/management/kmlistview.h @@ -20,8 +20,8 @@ #ifndef KMLISTVIEW_H #define KMLISTVIEW_H -#include -#include +#include +#include class KMListViewItem; class KMPrinter; @@ -30,29 +30,29 @@ class KMListView : public QListView { Q_OBJECT public: - KMListView(QWidget *parent = 0, const char *name = 0); + KMListView(TQWidget *parent = 0, const char *name = 0); ~KMListView(); - void setPrinterList(QPtrList *list); - void setPrinter(const QString&); + void setPrinterList(TQPtrList *list); + void setPrinter(const TQString&); void setPrinter(KMPrinter*); signals: - void rightButtonClicked(const QString&, const QPoint&); - void printerSelected(const QString&); + void rightButtonClicked(const TQString&, const TQPoint&); + void printerSelected(const TQString&); protected slots: - void slotRightButtonClicked(QListViewItem*, const QPoint&, int); + void slotRightButtonClicked(TQListViewItem*, const TQPoint&, int); void slotSelectionChanged(); - void slotOnItem(QListViewItem*); + void slotOnItem(TQListViewItem*); void slotOnViewport(); protected: KMListViewItem* findItem(KMPrinter*); - KMListViewItem* findItem(const QString&); + KMListViewItem* findItem(const TQString&); private: - QPtrList m_items; + TQPtrList m_items; KMListViewItem *m_root, *m_classes, *m_printers, *m_specials; }; diff --git a/kdeprint/management/kmmainview.cpp b/kdeprint/management/kmmainview.cpp index 3bb20a99e..0e53f2757 100644 --- a/kdeprint/management/kmmainview.cpp +++ b/kdeprint/management/kmmainview.cpp @@ -35,13 +35,13 @@ #include "kiconselectaction.h" #include "messagewindow.h" -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -59,7 +59,7 @@ #undef m_manager #define m_manager KMFactory::self()->manager() -int kdeprint_management_add_printer_wizard( QWidget* parent ) +int kdeprint_management_add_printer_wizard( TQWidget* parent ) { KMWizard dlg(parent); int flag(0); @@ -77,8 +77,8 @@ int kdeprint_management_add_printer_wizard( QWidget* parent ) return flag; } -KMMainView::KMMainView(QWidget *parent, const char *name, KActionCollection *coll) -: QWidget(parent, name) +KMMainView::KMMainView(TQWidget *parent, const char *name, KActionCollection *coll) +: TQWidget(parent, name) { m_current = 0; m_first = true; @@ -86,7 +86,7 @@ KMMainView::KMMainView(QWidget *parent, const char *name, KActionCollection *col // create widgets m_printerview = new KMPrinterView(this, "PrinterView"); m_printerpages = new KMPages(this, "PrinterPages"); - m_pop = new QPopupMenu(this); + m_pop = new TQPopupMenu(this); m_toolbar = new KToolBar(this, "ToolBar"); m_toolbar->setMovingEnabled(false); m_plugin = new PluginComboBox(this, "Plugin"); @@ -99,10 +99,10 @@ KMMainView::KMMainView(QWidget *parent, const char *name, KActionCollection *col m_menubar->setMovingEnabled( false ); // layout - QVBoxLayout *m_layout = new QVBoxLayout(this, 0, 0); + QVBoxLayout *m_layout = new TQVBoxLayout(this, 0, 0); m_layout->addWidget(m_toolbar); m_layout->addWidget( m_menubar ); - m_boxlayout = new QBoxLayout(QBoxLayout::TopToBottom, 0, 0); + m_boxlayout = new TQBoxLayout(TQBoxLayout::TopToBottom, 0, 0); m_layout->addLayout(m_boxlayout); m_boxlayout->addWidget(m_printerview); m_boxlayout->addWidget(m_printerpages); @@ -110,12 +110,12 @@ KMMainView::KMMainView(QWidget *parent, const char *name, KActionCollection *col m_layout->addWidget(m_plugin, 0); // connections - connect(KMTimer::self(),SIGNAL(timeout()),SLOT(slotTimer())); - connect(m_printerview,SIGNAL(printerSelected(const QString&)),SLOT(slotPrinterSelected(const QString&))); - connect(m_printerview,SIGNAL(rightButtonClicked(const QString&,const QPoint&)),SLOT(slotRightButtonClicked(const QString&,const QPoint&))); - connect(m_pop,SIGNAL(aboutToShow()),KMTimer::self(),SLOT(hold())); - connect(m_pop,SIGNAL(aboutToHide()),KMTimer::self(),SLOT(release())); - connect( m_manager, SIGNAL( updatePossible( bool ) ), SLOT( slotUpdatePossible( bool ) ) ); + 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 ) ) ); // actions if (coll) @@ -176,64 +176,64 @@ void KMMainView::initActions() KIconSelectAction *vact = new KIconSelectAction(i18n("&View"),0,m_actions,"view_change"); QStringList iconlst; iconlst << "view_icon" << "view_detailed" << "view_tree"; - vact->setItems(QStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst); + vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst); vact->setCurrentItem(0); - connect(vact,SIGNAL(activated(int)),SLOT(slotChangeView(int))); + connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); KActionMenu *stateAct = new KActionMenu(i18n("Start/Stop Printer"), "kdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - stateAct->insert(new KAction(i18n("&Start Printer"),"kdeprint_enableprinter",0,this,SLOT(slotChangePrinterState()),m_actions,"printer_start")); - stateAct->insert(new KAction(i18n("Sto&p Printer"),"kdeprint_stopprinter",0,this,SLOT(slotChangePrinterState()),m_actions,"printer_stop")); + stateAct->insert(new KAction(i18n("&Start Printer"),"kdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new KAction(i18n("Sto&p Printer"),"kdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); stateAct = new KActionMenu(i18n("Enable/Disable Job Spooling"), "kdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"kdeprint_enableprinter",0,this,SLOT(slotChangePrinterState()),m_actions,"printer_enable")); - stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"kdeprint_stopprinter",0,this,SLOT(slotChangePrinterState()),m_actions,"printer_disable")); - - new KAction(i18n("&Remove"),"edittrash",0,this,SLOT(slotRemove()),m_actions,"printer_remove"); - new KAction(i18n("&Configure..."),"configure",0,this,SLOT(slotConfigure()),m_actions,"printer_configure"); - new KAction(i18n("Add &Printer/Class..."),"kdeprint_addprinter",0,this,SLOT(slotAdd()),m_actions,"printer_add"); - new KAction(i18n("Add &Special (pseudo) Printer..."),"kdeprint_addpseudo",0,this,SLOT(slotAddSpecial()),m_actions,"printer_add_special"); - new KAction(i18n("Set as &Local Default"),"kdeprint_defaulthard",0,this,SLOT(slotHardDefault()),m_actions,"printer_hard_default"); - new KAction(i18n("Set as &User Default"),"kdeprint_defaultsoft",0,this,SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); - new KAction(i18n("&Test Printer..."),"kdeprint_testprinter",0,this,SLOT(slotTest()),m_actions,"printer_test"); - new KAction(i18n("Configure &Manager..."),"kdeprint_configmgr",0,this,SLOT(slotManagerConfigure()),m_actions,"manager_configure"); - new KAction(i18n("Initialize Manager/&View"),"reload",0,this,SLOT(slotInit()),m_actions,"view_refresh"); + stateAct->insert(new KAction(i18n("&Enable Job Spooling"),"kdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new KAction(i18n("&Disable Job Spooling"),"kdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + + new KAction(i18n("&Remove"),"edittrash",0,this,TQT_SLOT(slotRemove()),m_actions,"printer_remove"); + new KAction(i18n("&Configure..."),"configure",0,this,TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); + new KAction(i18n("Add &Printer/Class..."),"kdeprint_addprinter",0,this,TQT_SLOT(slotAdd()),m_actions,"printer_add"); + new KAction(i18n("Add &Special (pseudo) Printer..."),"kdeprint_addpseudo",0,this,TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new KAction(i18n("Set as &Local Default"),"kdeprint_defaulthard",0,this,TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new KAction(i18n("Set as &User Default"),"kdeprint_defaultsoft",0,this,TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new KAction(i18n("&Test Printer..."),"kdeprint_testprinter",0,this,TQT_SLOT(slotTest()),m_actions,"printer_test"); + new KAction(i18n("Configure &Manager..."),"kdeprint_configmgr",0,this,TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new KAction(i18n("Initialize Manager/&View"),"reload",0,this,TQT_SLOT(slotInit()),m_actions,"view_refresh"); KIconSelectAction *dact = new KIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); iconlst.clear(); iconlst << "view_top_bottom" << "view_left_right"; - dact->setItems(QStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst); + dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst); dact->setCurrentItem(0); - connect(dact,SIGNAL(activated(int)),SLOT(slotChangeDirection(int))); + connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); - new KAction(i18n("R&estart Server"),"kdeprint_restartsrv",0,this,SLOT(slotServerRestart()),m_actions,"server_restart"); - new KAction(i18n("Configure &Server..."),"kdeprint_configsrv",0,this,SLOT(slotServerConfigure()),m_actions,"server_configure"); - new KAction(i18n("Configure Server Access..."),"kdeprint_configsrv",0,this,SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure"); + new KAction(i18n("R&estart Server"),"kdeprint_restartsrv",0,this,TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); + new KAction(i18n("Configure &Server..."),"kdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new KAction(i18n("Configure Server Access..."),"kdeprint_configsrv",0,this,TQT_SLOT(slotServerAccessConfigure()),m_actions,"server_access_configure"); KToggleAction *tact = new KToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); - connect(tact,SIGNAL(toggled(bool)),SLOT(slotToggleToolBar(bool))); + connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool))); tact = new KToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" ); tact->setCheckedState(i18n("Hide Me&nu Toolbar")); - connect( tact, SIGNAL( toggled( bool ) ), SLOT( slotToggleMenuBar( bool ) ) ); + connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) ); tact = new KToggleAction(i18n("Show Pr&inter Details"),"kdeprint_printer_infos", 0,m_actions,"view_printerinfos"); tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"kdeprint_printer_infos")); tact->setChecked(true); - connect(tact,SIGNAL(toggled(bool)),SLOT(slotShowPrinterInfos(bool))); + connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool))); tact = new KToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter"); tact->setChecked(KMManager::self()->isFilterEnabled()); - connect(tact, SIGNAL(toggled(bool)), SLOT(slotToggleFilter(bool))); + connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); - new KAction( i18n( "%1 &Handbook" ).arg( "KDEPrint" ), "contents", 0, this, SLOT( slotHelp() ), m_actions, "invoke_help" ); - new KAction( i18n( "%1 &Web Site" ).arg( "KDEPrint" ), "network", 0, this, SLOT( slotHelp() ), m_actions, "invoke_web" ); + new KAction( i18n( "%1 &Handbook" ).arg( "KDEPrint" ), "contents", 0, this, TQT_SLOT( slotHelp() ), m_actions, "invoke_help" ); + new KAction( i18n( "%1 &Web Site" ).arg( "KDEPrint" ), "network", 0, this, TQT_SLOT( slotHelp() ), m_actions, "invoke_web" ); KActionMenu *mact = new KActionMenu(i18n("Pri&nter Tools"), "package_utilities", m_actions, "printer_tool"); mact->setDelayed(false); - connect(mact->popupMenu(), SIGNAL(activated(int)), SLOT(slotToolSelected(int))); + connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); QStringList files = KGlobal::dirs()->findAllResources("data", "kdeprint/tools/*.desktop"); - for (QStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) + for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { KSimpleConfig conf(*it); conf.setGroup("Desktop Entry"); @@ -269,13 +269,13 @@ void KMMainView::initActions() m_actions->action("view_pfilter")->plug(m_toolbar); // add actions to the menu bar - QPopupMenu *menu = new QPopupMenu( this ); + TQPopupMenu *menu = new TQPopupMenu( this ); m_actions->action( "printer_add" )->plug( menu ); m_actions->action( "printer_add_special" )->plug( menu ); //m_menubar->insertItem( i18n( "Add" ), menu ); m_menubar->insertButton( "wizard", 0, true, i18n( "Add" ) ); m_menubar->getButton( 0 )->setPopup( menu, true ); - menu = new QPopupMenu( this ); + menu = new TQPopupMenu( this ); m_actions->action("printer_state_change")->plug( menu ); m_actions->action("printer_spool_change")->plug( menu ); menu->insertSeparator(); @@ -290,19 +290,19 @@ void KMMainView::initActions() //m_menubar->insertItem( i18n( "Printer" ), menu ); m_menubar->insertButton( "printer1", 1, true, i18n( "Printer" ) ); m_menubar->getButton( 1 )->setPopup( menu, true ); - menu = new QPopupMenu( this ); + menu = new TQPopupMenu( this ); m_actions->action("server_restart")->plug( menu ); m_actions->action("server_configure")->plug( menu ); //m_menubar->insertItem( i18n( "Server" ), menu ); m_menubar->insertButton( "misc", 2, true, i18n( "Print Server" ) ); m_menubar->getButton( 2 )->setPopup( menu, true ); - menu = new QPopupMenu( this ); + menu = new TQPopupMenu( this ); m_actions->action("manager_configure")->plug( menu ); m_actions->action("view_refresh")->plug( menu ); //m_menubar->insertItem( i18n( "Manager" ), menu ); m_menubar->insertButton( "kdeprint_configmgr", 3, true, i18n( "Print Manager" ) ); m_menubar->getButton( 3 )->setPopup( menu, true ); - menu = new QPopupMenu( this ); + menu = new TQPopupMenu( this ); m_actions->action("view_printerinfos")->plug( menu ); m_actions->action("view_change")->plug( menu ); m_actions->action("orientation_change")->plug( menu ); @@ -314,14 +314,14 @@ void KMMainView::initActions() m_menubar->insertButton( "view_remove", 4, true, i18n( "View" ) ); m_menubar->getButton( 4 )->setPopup( menu, true ); //m_menubar->setMinimumHeight( m_menubar->heightForWidth( 1000 ) ); - menu = new QPopupMenu( this ); + menu = new TQPopupMenu( this ); m_actions->action( "invoke_help" )->plug( menu ); m_actions->action( "invoke_web" )->plug( menu ); m_menubar->insertButton( "help", 5, true, i18n( "Documentation" ) ); m_menubar->getButton( 5 )->setPopup( menu, true ); loadPluginActions(); - slotPrinterSelected(QString::null); + slotPrinterSelected(TQString::null); } void KMMainView::slotRefresh() @@ -332,7 +332,7 @@ void KMMainView::slotRefresh() void KMMainView::slotTimer() { kdDebug() << "KMMainView::slotTimer" << endl; - QPtrList *printerlist = m_manager->printerList(); + TQPtrList *printerlist = m_manager->printerList(); bool ok = m_manager->errorMsg().isEmpty(); m_printerview->setPrinterList(printerlist); if ( m_first ) @@ -346,7 +346,7 @@ void KMMainView::slotTimer() * - hard default printer * - first printer */ - QPtrListIterator it( *printerlist ); + TQPtrListIterator it( *printerlist ); KMPrinter *p1 = 0, *p2 = 0, *p3 = 0; while ( it.current() ) { @@ -371,7 +371,7 @@ void KMMainView::slotTimer() } } -void KMMainView::slotPrinterSelected(const QString& prname) +void KMMainView::slotPrinterSelected(const TQString& prname) { KMPrinter *p = KMManager::self()->findPrinter(prname); m_current = p; @@ -425,7 +425,7 @@ void KMMainView::slotChangeView(int ID) m_printerview->setViewType((KMPrinterView::ViewType)ID); } -void KMMainView::slotRightButtonClicked(const QString& prname, const QPoint& p) +void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p) { KMPrinter *printer = KMManager::self()->findPrinter(prname); // construct popup menu @@ -467,8 +467,8 @@ void KMMainView::slotRightButtonClicked(const QString& prname, const QPoint& p) } if (!printer->isSpecial()) { - QValueList pactions = m_actions->actions("plugin"); - for (QValueList::Iterator it=pactions.begin(); it!=pactions.end(); ++it) + TQValueList pactions = m_actions->actions("plugin"); + for (TQValueList::Iterator it=pactions.begin(); it!=pactions.end(); ++it) (*it)->plug(m_pop); if (pactions.count() > 0) m_pop->insertSeparator(); @@ -608,7 +608,7 @@ void KMMainView::slotSoftDefault() if (m_current) { KMTimer::self()->hold(); - KMFactory::self()->virtualManager()->setAsDefault(m_current,QString::null); + KMFactory::self()->virtualManager()->setAsDefault(m_current,TQString::null); KMTimer::self()->release(true); } } @@ -621,11 +621,11 @@ void KMMainView::setOrientation(int o) } int KMMainView::orientation() const -{ return (m_boxlayout->direction() == QBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); } +{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); } void KMMainView::slotChangeDirection(int d) { - m_boxlayout->setDirection(d == 1 ? QBoxLayout::LeftToRight : QBoxLayout::TopToBottom); + m_boxlayout->setDirection(d == 1 ? TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom); } void KMMainView::slotTest() @@ -633,7 +633,7 @@ void KMMainView::slotTest() if (m_current) { KMTimer::self()->hold(); - if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(m_current->printerName()), QString::null, i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue) + if (KMessageBox::warningContinueCancel(this, i18n("You are about to print a test page on %1. Do you want to continue?").arg(m_current->printerName()), TQString::null, i18n("Print Test Page"), "printTestPage") == KMessageBox::Continue) { if (KMFactory::self()->manager()->testPrinter(m_current)) KMessageBox::information(this,i18n("Test page successfully sent to printer %1.").arg(m_current->printerName())); @@ -644,7 +644,7 @@ void KMMainView::slotTest() } } -void KMMainView::showErrorMsg(const QString& msg, bool usemgr) +void KMMainView::showErrorMsg(const TQString& msg, bool usemgr) { QString s(msg); if (usemgr) @@ -657,7 +657,7 @@ void KMMainView::showErrorMsg(const QString& msg, bool usemgr) else s = s.arg(m_manager->errorMsg()); // clean up error message - m_manager->setErrorMsg(QString::null); + m_manager->setErrorMsg(TQString::null); } s.prepend("").append(""); KMTimer::self()->hold(); @@ -783,7 +783,7 @@ void KMMainView::reload() loadPluginActions(); // redo the connection as the old manager object has been removed - connect( m_manager, SIGNAL( updatePossible( bool ) ), SLOT( slotUpdatePossible( bool ) ) ); + connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); // We must delay the refresh such that all objects has been // correctly reloaded (otherwise, crash in KMJobViewer). @@ -804,11 +804,11 @@ bool KMMainView::printerInfosShown() const void KMMainView::loadPluginActions() { KMFactory::self()->manager()->createPluginActions(m_actions); - QValueList pactions = m_actions->actions("plugin"); + TQValueList pactions = m_actions->actions("plugin"); int index = m_pactionsindex; - //QPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup(); - QPopupMenu *menu = m_menubar->getButton( 1 )->popup(); - for (QValueList::Iterator it=pactions.begin(); it!=pactions.end(); ++it) + //TQPopupMenu *menu = m_menubar->findItem( m_menubar->idAt( 1 ) )->popup(); + TQPopupMenu *menu = m_menubar->getButton( 1 )->popup(); + for (TQValueList::Iterator it=pactions.begin(); it!=pactions.end(); ++it) { (*it)->plug(m_toolbar, index++); ( *it )->plug( menu ); @@ -817,8 +817,8 @@ void KMMainView::loadPluginActions() void KMMainView::removePluginActions() { - QValueList pactions = m_actions->actions("plugin"); - for (QValueList::Iterator it=pactions.begin(); it!=pactions.end(); ++it) + TQValueList pactions = m_actions->actions("plugin"); + for (TQValueList::Iterator it=pactions.begin(); it!=pactions.end(); ++it) { (*it)->unplugAll(); delete (*it); @@ -874,7 +874,7 @@ void KMMainView::slotUpdatePossible( bool flag ) KMTimer::self()->release( true ); } -void KMMainView::createMessageWindow( const QString& txt, int delay ) +void KMMainView::createMessageWindow( const TQString& txt, int delay ) { destroyMessageWindow(); MessageWindow::add( m_printerview, txt, delay ); @@ -890,7 +890,7 @@ void KMMainView::slotInit() reset( i18n( "Initializing manager..." ), true, true ); } -void KMMainView::reset( const QString& msg, bool useDelay, bool holdTimer ) +void KMMainView::reset( const TQString& msg, bool useDelay, bool holdTimer ) { if ( holdTimer ) KMTimer::self()->hold(); @@ -903,12 +903,12 @@ void KMMainView::reset( const QString& msg, bool useDelay, bool holdTimer ) void KMMainView::slotHelp() { - QString s = sender()->name(); + TQString s = sender()->name(); if ( s == "invoke_help" ) - kapp->invokeHelp( QString::null, "kdeprint" ); + kapp->invokeHelp( TQString::null, "kdeprint" ); else if ( s == "invoke_web" ) { - QStringList args; + TQStringList args; args << "exec" << "http://printing.kde.org"; kapp->kdeinitExec( "kfmclient", args ); } diff --git a/kdeprint/management/kmmainview.h b/kdeprint/management/kmmainview.h index 2e521e50f..f8ab6a388 100644 --- a/kdeprint/management/kmmainview.h +++ b/kdeprint/management/kmmainview.h @@ -24,7 +24,7 @@ #warning internal header, do not use except if you are a KDEPrint developer #endif -#include +#include #include #include @@ -50,11 +50,11 @@ class QMenuBar; * if you're a KDEPrint developer. The API might change in the * future and binary compatibility might be broken. */ -class KDEPRINT_EXPORT KMMainView : public QWidget, public KPReloadObject +class KDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject { Q_OBJECT public: - KMMainView(QWidget *parent = 0, const char *name = 0, KActionCollection *coll = 0); + KMMainView(TQWidget *parent = 0, const char *name = 0, KActionCollection *coll = 0); ~KMMainView(); void setOrientation(int); @@ -87,8 +87,8 @@ public slots: void slotHelp(); protected slots: - void slotPrinterSelected(const QString&); - void slotRightButtonClicked(const QString&, const QPoint&); + void slotPrinterSelected(const TQString&); + void slotRightButtonClicked(const TQString&, const TQPoint&); void slotToggleToolBar(bool); void slotToggleMenuBar(bool); void slotChangeView(int); @@ -98,7 +98,7 @@ protected slots: protected: void initActions(); - void showErrorMsg(const QString& msg, bool usemgr = true); + void showErrorMsg(const TQString& msg, bool usemgr = true); void restoreSettings(); void saveSettings(); void loadParameters(); @@ -107,9 +107,9 @@ protected: //void aboutToReload(); void loadPluginActions(); void removePluginActions(); - void createMessageWindow( const QString&, int delay = 500 ); + void createMessageWindow( const TQString&, int delay = 500 ); void destroyMessageWindow(); - void reset( const QString& msg = QString::null, bool useDelay = true, bool holdTimer = true ); + void reset( const TQString& msg = TQString::null, bool useDelay = true, bool holdTimer = true ); private: KMPrinterView *m_printerview; @@ -128,6 +128,6 @@ private: KToolBar *m_menubar; }; -KDEPRINT_EXPORT int kdeprint_management_add_printer_wizard( QWidget* parent ); +KDEPRINT_EXPORT int kdeprint_management_add_printer_wizard( TQWidget* parent ); #endif diff --git a/kdeprint/management/kmpages.cpp b/kdeprint/management/kmpages.cpp index 9387b33a0..be7f2f87a 100644 --- a/kdeprint/management/kmpages.cpp +++ b/kdeprint/management/kmpages.cpp @@ -27,8 +27,8 @@ #include #include -KMPages::KMPages(QWidget *parent, const char *name) -: QTabWidget(parent,name) +KMPages::KMPages(TQWidget *parent, const char *name) +: TQTabWidget(parent,name) { m_pages.setAutoDelete(false); initialize(); @@ -40,7 +40,7 @@ KMPages::~KMPages() void KMPages::setPrinter(KMPrinter *p) { - QPtrListIterator it(m_pages); + TQPtrListIterator it(m_pages); for (int i=0;it.current();++it,i++) it.current()->setPrinter(p); } diff --git a/kdeprint/management/kmpages.h b/kdeprint/management/kmpages.h index 5af1da108..e300aa998 100644 --- a/kdeprint/management/kmpages.h +++ b/kdeprint/management/kmpages.h @@ -20,8 +20,8 @@ #ifndef KMPAGES_H #define KMPAGES_H -#include -#include +#include +#include class KMPrinter; class KMPrinterPage; @@ -29,7 +29,7 @@ class KMPrinterPage; class KMPages : public QTabWidget { public: - KMPages(QWidget *parent = 0, const char *name = 0); + KMPages(TQWidget *parent = 0, const char *name = 0); ~KMPages(); void setPrinter(KMPrinter *p); @@ -38,7 +38,7 @@ protected: void initialize(); private: - QPtrList m_pages; + TQPtrList m_pages; }; #endif diff --git a/kdeprint/management/kmprinterview.cpp b/kdeprint/management/kmprinterview.cpp index 89549ed94..794683f54 100644 --- a/kdeprint/management/kmprinterview.cpp +++ b/kdeprint/management/kmprinterview.cpp @@ -24,37 +24,37 @@ #include "kmtimer.h" #include "kmmanager.h" -#include -#include +#include +#include #include #include -KMPrinterView::KMPrinterView(QWidget *parent, const char *name) -: QWidgetStack(parent,name), m_type(KMPrinterView::Icons) +KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) +: TQWidgetStack(parent,name), m_type(KMPrinterView::Icons) { m_iconview = new KMIconView(this); addWidget(m_iconview,0); m_listview = new KMListView(this); addWidget(m_listview,1); - m_current = QString::null; + m_current = TQString::null; m_listset = false; - connect(m_iconview,SIGNAL(rightButtonClicked(const QString&,const QPoint&)),SIGNAL(rightButtonClicked(const QString&,const QPoint&))); - connect(m_listview,SIGNAL(rightButtonClicked(const QString&,const QPoint&)),SIGNAL(rightButtonClicked(const QString&,const QPoint&))); - connect(m_iconview,SIGNAL(printerSelected(const QString&)),SIGNAL(printerSelected(const QString&))); - connect(m_listview,SIGNAL(printerSelected(const QString&)),SIGNAL(printerSelected(const QString&))); - connect(m_iconview,SIGNAL(printerSelected(const QString&)),SLOT(slotPrinterSelected(const QString&))); - connect(m_listview,SIGNAL(printerSelected(const QString&)),SLOT(slotPrinterSelected(const QString&))); + 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&))); setViewType(m_type); - setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); } KMPrinterView::~KMPrinterView() { } -void KMPrinterView::setPrinterList(QPtrList *list) +void KMPrinterView::setPrinterList(TQPtrList *list) { if (m_type != KMPrinterView::Tree || list == 0) m_iconview->setPrinterList(list); @@ -100,14 +100,14 @@ void KMPrinterView::setViewType(ViewType t) } } -void KMPrinterView::slotPrinterSelected(const QString& p) +void KMPrinterView::slotPrinterSelected(const TQString& p) { m_current = p; } -QSize KMPrinterView::minimumSizeHint() const +TQSize KMPrinterView::minimumSizeHint() const { - return QWidgetStack::minimumSizeHint(); + return TQWidgetStack::minimumSizeHint(); } #include "kmprinterview.moc" diff --git a/kdeprint/management/kmprinterview.h b/kdeprint/management/kmprinterview.h index 394ff7f19..0b8c30c23 100644 --- a/kdeprint/management/kmprinterview.h +++ b/kdeprint/management/kmprinterview.h @@ -20,8 +20,8 @@ #ifndef KMPRINTERVIEW_H #define KMPRINTERVIEW_H -#include -#include +#include +#include class KMIconView; class KMListView; @@ -34,22 +34,22 @@ class KMPrinterView : public QWidgetStack public: enum ViewType { Icons = 0, List, Tree }; - KMPrinterView(QWidget *parent = 0, const char *name = 0); + KMPrinterView(TQWidget *parent = 0, const char *name = 0); ~KMPrinterView(); - void setPrinterList(QPtrList *list); + void setPrinterList(TQPtrList *list); void setPrinter( KMPrinter* ); void setViewType(ViewType t); ViewType viewType() const { return m_type; } - QSize minimumSizeHint() const; + TQSize minimumSizeHint() const; signals: - void printerSelected(const QString&); - void rightButtonClicked(const QString&, const QPoint&); + void printerSelected(const TQString&); + void rightButtonClicked(const TQString&, const TQPoint&); protected slots: - void slotPrinterSelected(const QString&); + void slotPrinterSelected(const TQString&); private: KMIconView *m_iconview; diff --git a/kdeprint/management/kmpropbackend.cpp b/kdeprint/management/kmpropbackend.cpp index bf92e7fdc..ea6434563 100644 --- a/kdeprint/management/kmpropbackend.cpp +++ b/kdeprint/management/kmpropbackend.cpp @@ -21,21 +21,21 @@ #include "kmprinter.h" #include "kmwizard.h" -#include -#include +#include +#include #include -KMPropBackend::KMPropBackend(QWidget *parent, const char *name) +KMPropBackend::KMPropBackend(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { - m_uri = new QLabel("",this); - m_type = new QLabel("",this); + m_uri = new TQLabel("",this); + m_type = new TQLabel("",this); - QLabel *l1 = new QLabel(i18n("Printer type:"), this); - QLabel *l2 = new QLabel(i18n("URI:"), this); + QLabel *l1 = new TQLabel(i18n("Printer type:"), this); + QLabel *l2 = new TQLabel(i18n("URI:"), this); // layout - QGridLayout *main_ = new QGridLayout(this, 3, 2, 10, 7); + QGridLayout *main_ = new TQGridLayout(this, 3, 2, 10, 7); main_->setColStretch(0,0); main_->setColStretch(1,1); main_->setRowStretch(2,1); diff --git a/kdeprint/management/kmpropbackend.h b/kdeprint/management/kmpropbackend.h index fb8c299d8..ffdd15513 100644 --- a/kdeprint/management/kmpropbackend.h +++ b/kdeprint/management/kmpropbackend.h @@ -29,7 +29,7 @@ class QLabel; class KDEPRINT_EXPORT KMPropBackend : public KMPropWidget { public: - KMPropBackend(QWidget *parent = 0, const char *name = 0); + KMPropBackend(TQWidget *parent = 0, const char *name = 0); ~KMPropBackend(); void setPrinter(KMPrinter*); diff --git a/kdeprint/management/kmpropcontainer.cpp b/kdeprint/management/kmpropcontainer.cpp index cc55aa901..90be6da19 100644 --- a/kdeprint/management/kmpropcontainer.cpp +++ b/kdeprint/management/kmpropcontainer.cpp @@ -21,13 +21,13 @@ #include "kmpropwidget.h" #include -#include +#include #include #include #include -KMPropContainer::KMPropContainer(QWidget *parent, const char *name) -: QWidget(parent,name) +KMPropContainer::KMPropContainer(TQWidget *parent, const char *name) +: TQWidget(parent,name) { KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(5); @@ -35,8 +35,8 @@ KMPropContainer::KMPropContainer(QWidget *parent, const char *name) m_button = new KPushButton(KGuiItem(i18n("Change..."), "edit"), this); m_widget = 0; - QVBoxLayout *main_ = new QVBoxLayout(this, 0, 10); - QHBoxLayout *btn_ = new QHBoxLayout(0, 0, 0); + QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); + QHBoxLayout *btn_ = new TQHBoxLayout(0, 0, 0); main_->addWidget(sep,0); main_->addLayout(btn_,0); btn_->addStretch(1); @@ -52,11 +52,11 @@ void KMPropContainer::setWidget(KMPropWidget *w) if (!m_widget) { m_widget = w; - m_widget->reparent(this,QPoint(0,0)); - connect(m_button,SIGNAL(clicked()),m_widget,SLOT(slotChange())); - connect(m_widget,SIGNAL(enable(bool)),SIGNAL(enable(bool))); - connect(m_widget,SIGNAL(enableChange(bool)),SLOT(slotEnableChange(bool))); - QVBoxLayout *lay = dynamic_cast(layout()); + 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))); + QVBoxLayout *lay = dynamic_cast(layout()); if (lay) { lay->insertWidget(0,m_widget,1); diff --git a/kdeprint/management/kmpropcontainer.h b/kdeprint/management/kmpropcontainer.h index 95d7cb57a..00b125067 100644 --- a/kdeprint/management/kmpropcontainer.h +++ b/kdeprint/management/kmpropcontainer.h @@ -20,7 +20,7 @@ #ifndef KMPROPCONTAINER_H #define KMPROPCONTAINER_H -#include +#include class KMPropWidget; class QPushButton; @@ -30,7 +30,7 @@ class KMPropContainer : public QWidget { Q_OBJECT public: - KMPropContainer(QWidget *parent = 0, const char *name = 0); + KMPropContainer(TQWidget *parent = 0, const char *name = 0); ~KMPropContainer(); void setWidget(KMPropWidget*); diff --git a/kdeprint/management/kmpropdriver.cpp b/kdeprint/management/kmpropdriver.cpp index 8298ee8a8..6b88f63ea 100644 --- a/kdeprint/management/kmpropdriver.cpp +++ b/kdeprint/management/kmpropdriver.cpp @@ -21,24 +21,24 @@ #include "kmprinter.h" #include "kmwizard.h" -#include -#include +#include +#include #include -KMPropDriver::KMPropDriver(QWidget *parent, const char *name) +KMPropDriver::KMPropDriver(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { - m_manufacturer = new QLabel("",this); - m_model = new QLabel("",this); - m_driverinfo = new QLabel("",this); + m_manufacturer = new TQLabel("",this); + m_model = new TQLabel("",this); + m_driverinfo = new TQLabel("",this); m_driverinfo->setTextFormat(Qt::RichText); - QLabel *l1 = new QLabel(i18n("Manufacturer:"), this); - QLabel *l2 = new QLabel(i18n("Printer model:"), this); - QLabel *l3 = new QLabel(i18n("Driver info:"), this); + QLabel *l1 = new TQLabel(i18n("Manufacturer:"), this); + QLabel *l2 = new TQLabel(i18n("Printer model:"), this); + QLabel *l3 = new TQLabel(i18n("Driver info:"), this); // layout - QGridLayout *main_ = new QGridLayout(this, 4, 2, 10, 7); + QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7); main_->setColStretch(0,0); main_->setColStretch(1,1); main_->setRowStretch(3,1); diff --git a/kdeprint/management/kmpropdriver.h b/kdeprint/management/kmpropdriver.h index 9c07fe727..40952162c 100644 --- a/kdeprint/management/kmpropdriver.h +++ b/kdeprint/management/kmpropdriver.h @@ -29,7 +29,7 @@ class QLabel; class KDEPRINT_EXPORT KMPropDriver : public KMPropWidget { public: - KMPropDriver(QWidget *parent = 0, const char *name = 0); + KMPropDriver(TQWidget *parent = 0, const char *name = 0); ~KMPropDriver(); void setPrinter(KMPrinter*); diff --git a/kdeprint/management/kmpropertypage.cpp b/kdeprint/management/kmpropertypage.cpp index aa8f61663..19461e258 100644 --- a/kdeprint/management/kmpropertypage.cpp +++ b/kdeprint/management/kmpropertypage.cpp @@ -26,10 +26,10 @@ #include "kmpropgeneral.h" -#include +#include #include -KMPropertyPage::KMPropertyPage(QWidget *parent, const char *name) +KMPropertyPage::KMPropertyPage(TQWidget *parent, const char *name) : CJanusWidget(parent,name) { m_widgets.setAutoDelete(false); @@ -43,7 +43,7 @@ KMPropertyPage::~KMPropertyPage() void KMPropertyPage::setPrinter(KMPrinter *p) { - QPtrListIterator it(m_widgets); + TQPtrListIterator it(m_widgets); for (;it.current();++it) it.current()->setPrinterBase(p); } @@ -55,9 +55,9 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) m_widgets.append(w); KMPropContainer *ctn = new KMPropContainer(this,"Container"); ctn->setWidget(w); - connect(ctn,SIGNAL(enable(bool)),SLOT(slotEnable(bool))); + connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); - QPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), KIcon::NoGroup, KIcon::SizeMedium @@ -68,7 +68,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) void KMPropertyPage::slotEnable(bool on) { - QWidget *w = (QWidget*)(sender()); + QWidget *w = (TQWidget*)(sender()); if (on) enablePage(w); else diff --git a/kdeprint/management/kmpropertypage.h b/kdeprint/management/kmpropertypage.h index 7f2f1c074..5698beff8 100644 --- a/kdeprint/management/kmpropertypage.h +++ b/kdeprint/management/kmpropertypage.h @@ -24,7 +24,7 @@ #include "kmprinterpage.h" #include #include -#include +#include class KMPropWidget; class KMPrinter; @@ -33,7 +33,7 @@ class KDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage { Q_OBJECT public: - KMPropertyPage(QWidget *parent = 0, const char *name = 0); + KMPropertyPage(TQWidget *parent = 0, const char *name = 0); ~KMPropertyPage(); void addPropPage(KMPropWidget*); @@ -47,7 +47,7 @@ protected: void reload(); private: - QPtrList m_widgets; + TQPtrList m_widgets; }; #endif diff --git a/kdeprint/management/kmpropgeneral.cpp b/kdeprint/management/kmpropgeneral.cpp index cea16bd5d..1c9389941 100644 --- a/kdeprint/management/kmpropgeneral.cpp +++ b/kdeprint/management/kmpropgeneral.cpp @@ -23,23 +23,23 @@ #include "kmfactory.h" #include "kmmanager.h" -#include -#include +#include +#include #include -KMPropGeneral::KMPropGeneral(QWidget *parent, const char *name) +KMPropGeneral::KMPropGeneral(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { - m_name = new QLabel("",this); - m_location = new QLabel("",this); - m_description = new QLabel("",this); + m_name = new TQLabel("",this); + m_location = new TQLabel("",this); + m_description = new TQLabel("",this); - QLabel *l1 = new QLabel(i18n("Printer name:"), this); - QLabel *l2 = new QLabel(i18n("Physical Location", "Location:"), this); - QLabel *l3 = new QLabel(i18n("Description:"), this); + QLabel *l1 = new TQLabel(i18n("Printer name:"), this); + QLabel *l2 = new TQLabel(i18n("Physical Location", "Location:"), this); + QLabel *l3 = new TQLabel(i18n("Description:"), this); // layout - QGridLayout *main_ = new QGridLayout(this, 4, 2, 10, 7); + QGridLayout *main_ = new TQGridLayout(this, 4, 2, 10, 7); main_->setColStretch(0,0); main_->setColStretch(1,1); main_->setRowStretch(3,1); diff --git a/kdeprint/management/kmpropgeneral.h b/kdeprint/management/kmpropgeneral.h index 4fad67996..76bdc3171 100644 --- a/kdeprint/management/kmpropgeneral.h +++ b/kdeprint/management/kmpropgeneral.h @@ -27,7 +27,7 @@ class QLabel; class KMPropGeneral : public KMPropWidget { public: - KMPropGeneral(QWidget *parent = 0, const char *name = 0); + KMPropGeneral(TQWidget *parent = 0, const char *name = 0); ~KMPropGeneral(); void setPrinter(KMPrinter*); diff --git a/kdeprint/management/kmpropmembers.cpp b/kdeprint/management/kmpropmembers.cpp index 958ee763b..775c71f89 100644 --- a/kdeprint/management/kmpropmembers.cpp +++ b/kdeprint/management/kmpropmembers.cpp @@ -21,18 +21,18 @@ #include "kmprinter.h" #include "kmwizard.h" -#include -#include +#include +#include #include -KMPropMembers::KMPropMembers(QWidget *parent, const char *name) +KMPropMembers::KMPropMembers(TQWidget *parent, const char *name) : KMPropWidget(parent,name) { - m_members = new QTextView(this); + m_members = new TQTextView(this); m_members->setPaper(colorGroup().background()); - m_members->setFrameStyle(QFrame::NoFrame); + m_members->setFrameStyle(TQFrame::NoFrame); - QVBoxLayout *main_ = new QVBoxLayout(this, 10, 0); + QVBoxLayout *main_ = new TQVBoxLayout(this, 10, 0); main_->addWidget(m_members); m_pixmap = "kdeprint_printer_class"; @@ -50,7 +50,7 @@ void KMPropMembers::setPrinter(KMPrinter *p) { QStringList l = p->members(); QString txt("
    "); - for (QStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) + for (TQStringList::ConstIterator it=l.begin(); it!=l.end(); ++it) txt.append("
  • " + (*it) + "
    • "); txt.append("
"); m_members->setText(txt); diff --git a/kdeprint/management/kmpropmembers.h b/kdeprint/management/kmpropmembers.h index 67f519dc7..c0dda4978 100644 --- a/kdeprint/management/kmpropmembers.h +++ b/kdeprint/management/kmpropmembers.h @@ -27,7 +27,7 @@ class QTextView; class KDEPRINT_EXPORT KMPropMembers : public KMPropWidget { public: - KMPropMembers(QWidget *parent = 0, const char *name = 0); + KMPropMembers(TQWidget *parent = 0, const char *name = 0); ~KMPropMembers(); void setPrinter(KMPrinter*); diff --git a/kdeprint/management/kmpropwidget.cpp b/kdeprint/management/kmpropwidget.cpp index aa93f6a5f..b112c390b 100644 --- a/kdeprint/management/kmpropwidget.cpp +++ b/kdeprint/management/kmpropwidget.cpp @@ -26,15 +26,15 @@ #include #include -KMPropWidget::KMPropWidget(QWidget *parent, const char *name) -: QWidget(parent,name) +KMPropWidget::KMPropWidget(TQWidget *parent, const char *name) +: TQWidget(parent,name) { m_pixmap = "folder"; m_title = m_header = "Title"; m_printer = 0; m_canchange = ((KMFactory::self()->manager()->printerOperationMask() & KMManager::PrinterCreation) && KMFactory::self()->manager()->hasManagement()); - connect(this,SIGNAL(enable(bool)),this,SIGNAL(enableChange(bool))); + connect(this,TQT_SIGNAL(enable(bool)),this,TQT_SIGNAL(enableChange(bool))); } KMPropWidget::~KMPropWidget() @@ -48,7 +48,7 @@ void KMPropWidget::slotChange() if (value == -1) { KMessageBox::error(this, i18n("Unable to change printer properties. Error received from manager:

%1

").arg(KMManager::self()->errorMsg())); - KMManager::self()->setErrorMsg(QString::null); + KMManager::self()->setErrorMsg(TQString::null); } KMTimer::self()->release((value == 1)); } diff --git a/kdeprint/management/kmpropwidget.h b/kdeprint/management/kmpropwidget.h index 43d84d410..f4d3a865b 100644 --- a/kdeprint/management/kmpropwidget.h +++ b/kdeprint/management/kmpropwidget.h @@ -20,7 +20,7 @@ #ifndef KMPROPWIDGET_H #define KMPROPWIDGET_H -#include +#include #include @@ -31,14 +31,14 @@ class KDEPRINT_EXPORT KMPropWidget : public QWidget { Q_OBJECT public: - KMPropWidget(QWidget *parent = 0, const char *name = 0); + KMPropWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KMPropWidget(); virtual void setPrinter(KMPrinter*); void setPrinterBase(KMPrinter*); - QString pixmap() const { return m_pixmap; } - QString title() const { return m_title; } - QString header() const { return m_header; } + TQString pixmap() const { return m_pixmap; } + TQString title() const { return m_title; } + TQString header() const { return m_header; } bool canChange() const { return m_canchange; } signals: diff --git a/kdeprint/management/kmspecialprinterdlg.cpp b/kdeprint/management/kmspecialprinterdlg.cpp index 31728249f..20d8d17b7 100644 --- a/kdeprint/management/kmspecialprinterdlg.cpp +++ b/kdeprint/management/kmspecialprinterdlg.cpp @@ -26,36 +26,36 @@ #include "kxmlcommand.h" #include "driver.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include -KMSpecialPrinterDlg::KMSpecialPrinterDlg(QWidget *parent, const char *name) -: KDialogBase(parent, name, true, QString::null, Ok|Cancel, Ok) +KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) +: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok) { setCaption(i18n("Add Special Printer")); - QWidget *dummy = new QWidget(this); + QWidget *dummy = new TQWidget(this); setMainWidget(dummy); // widget creation - m_name = new QLineEdit(dummy); - connect(m_name, SIGNAL(textChanged ( const QString & )),this,SLOT(slotTextChanged(const QString & ))); - m_description = new QLineEdit(dummy); - m_location = new QLineEdit(dummy); - QLabel *m_namelabel = new QLabel(i18n("&Name:"), dummy); - QLabel *m_desclabel = new QLabel(i18n("&Description:"), dummy); - QLabel *m_loclabel = new QLabel(i18n("&Location:"), dummy); + m_name = new TQLineEdit(dummy); + connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & ))); + m_description = new TQLineEdit(dummy); + m_location = new TQLineEdit(dummy); + QLabel *m_namelabel = new TQLabel(i18n("&Name:"), dummy); + QLabel *m_desclabel = new TQLabel(i18n("&Description:"), dummy); + QLabel *m_loclabel = new TQLabel(i18n("&Location:"), dummy); m_namelabel->setBuddy(m_name); m_desclabel->setBuddy(m_description); m_loclabel->setBuddy(m_location); @@ -63,16 +63,16 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(QWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, dummy); sep->setFixedHeight(10); - QGroupBox *m_gb = new QGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy); + QGroupBox *m_gb = new TQGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy); m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this); - QGroupBox *m_outfile_gb = new QGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy ); + TQGroupBox *m_outfile_gb = new TQGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy ); - m_usefile = new QCheckBox( i18n("&Enable output file"), m_outfile_gb); + m_usefile = new TQCheckBox( i18n("&Enable output file"), m_outfile_gb); - m_mimetype = new QComboBox(m_outfile_gb); + m_mimetype = new TQComboBox(m_outfile_gb); KMimeType::List list = KMimeType::allMimeTypes(); - for (QValueList::ConstIterator it=list.begin(); it!=list.end(); ++it) + for (TQValueList::ConstIterator it=list.begin(); it!=list.end(); ++it) { QString mimetype = (*it)->name(); m_mimelist << mimetype; @@ -80,31 +80,31 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(QWidget *parent, const char *name) m_mimelist.sort(); m_mimetype->insertStringList(m_mimelist); - QLabel *m_mimetypelabel = new QLabel(i18n("&Format:"), m_outfile_gb); + QLabel *m_mimetypelabel = new TQLabel(i18n("&Format:"), m_outfile_gb); m_mimetypelabel->setBuddy (m_mimetype); - m_extension = new QLineEdit(m_outfile_gb); + m_extension = new TQLineEdit(m_outfile_gb); - QLabel *m_extensionlabel = new QLabel(i18n("Filename e&xtension:"), m_outfile_gb); + QLabel *m_extensionlabel = new TQLabel(i18n("Filename e&xtension:"), m_outfile_gb); m_extensionlabel->setBuddy(m_extension); m_icon = new KIconButton(dummy); m_icon->setIcon("fileprint"); - m_icon->setFixedSize(QSize(48,48)); + m_icon->setFixedSize(TQSize(48,48)); - connect( m_usefile, SIGNAL( toggled( bool ) ), m_mimetype, SLOT( setEnabled( bool ) ) ); - connect( m_usefile, SIGNAL( toggled( bool ) ), m_extension, SLOT( setEnabled( bool ) ) ); - connect( m_usefile, SIGNAL( toggled( bool ) ), m_mimetypelabel, SLOT( setEnabled( bool ) ) ); - connect( m_usefile, SIGNAL( toggled( bool ) ), m_extensionlabel, SLOT( setEnabled( bool ) ) ); + 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 ) ) ); m_mimetypelabel->setEnabled( false ); m_mimetype->setEnabled( false ); m_extensionlabel->setEnabled( false ); m_extension->setEnabled( false ); - QWhatsThis::add(m_usefile, + TQWhatsThis::add(m_usefile, i18n("

The command will use an output file. If checked, make sure the " "command contains an output tag.

")); - QWhatsThis::add(m_command, + TQWhatsThis::add(m_command, i18n("

The command to execute when printing on this special printer. Either enter " "the command to execute directly, or associate/create a command object with/for " "this special printer. The command object is the preferred method as it provides " @@ -115,16 +115,16 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(QWidget *parent, const char *name) "

  • %out: the output file (required if using an output file).
    • " "
  • %psl: the paper size in lower case.
    • " "
  • %psu: the paper size with the first letter in upper case.
    • ")); - QString mimetypeWhatsThis = i18n("

    The default mimetype for the output file (e.g. application/postscript).

    "); - QWhatsThis::add(m_mimetypelabel, mimetypeWhatsThis); - QWhatsThis::add(m_mimetype, mimetypeWhatsThis); - QString extensionWhatsThis = i18n("

    The default extension for the output file (e.g. ps, pdf, ps.gz).

    "); - QWhatsThis::add(m_extensionlabel, extensionWhatsThis); - QWhatsThis::add(m_extension, extensionWhatsThis); + TQString mimetypeWhatsThis = i18n("

    The default mimetype for the output file (e.g. application/postscript).

    "); + TQWhatsThis::add(m_mimetypelabel, mimetypeWhatsThis); + TQWhatsThis::add(m_mimetype, mimetypeWhatsThis); + TQString extensionWhatsThis = i18n("

    The default extension for the output file (e.g. ps, pdf, ps.gz).

    "); + TQWhatsThis::add(m_extensionlabel, extensionWhatsThis); + TQWhatsThis::add(m_extension, extensionWhatsThis); // layout creation - QVBoxLayout *l0 = new QVBoxLayout(dummy, 0, 10); - QGridLayout *l1 = new QGridLayout(0, 3, 3, 0, 5); + QVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10); + QGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5); l0->addLayout(l1); l1->setColStretch(2,1); l1->addColSpacing(0,60); @@ -138,7 +138,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(QWidget *parent, const char *name) l0->addWidget(sep); l0->addWidget(m_gb); l0->addWidget(m_outfile_gb); - QGridLayout *l6 = new QGridLayout(m_outfile_gb->layout(), 3, 2, 10); + QGridLayout *l6 = new TQGridLayout(m_outfile_gb->layout(), 3, 2, 10); l6->addMultiCellWidget( m_usefile, 0, 0, 0, 1 ); l6->addWidget(m_mimetypelabel, 1, 0); l6->addWidget(m_mimetype, 1, 1); @@ -151,7 +151,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(QWidget *parent, const char *name) resize(400,100); } -void KMSpecialPrinterDlg::slotTextChanged(const QString & ) +void KMSpecialPrinterDlg::slotTextChanged(const TQString & ) { enableButton(Ok, !m_name->text().isEmpty()); } diff --git a/kdeprint/management/kmspecialprinterdlg.h b/kdeprint/management/kmspecialprinterdlg.h index 2cba217c4..2b440c567 100644 --- a/kdeprint/management/kmspecialprinterdlg.h +++ b/kdeprint/management/kmspecialprinterdlg.h @@ -33,7 +33,7 @@ class KMSpecialPrinterDlg : public KDialogBase { Q_OBJECT public: - KMSpecialPrinterDlg(QWidget *parent = 0, const char *name = 0); + KMSpecialPrinterDlg(TQWidget *parent = 0, const char *name = 0); void setPrinter(KMPrinter*); KMPrinter* printer(); @@ -43,7 +43,7 @@ protected: protected slots: void slotOk(); - void slotTextChanged(const QString &); + void slotTextChanged(const TQString &); private: QLineEdit *m_name, *m_description, *m_location, *m_extension; diff --git a/kdeprint/management/kmtimer.cpp b/kdeprint/management/kmtimer.cpp index ae8725848..099d358f6 100644 --- a/kdeprint/management/kmtimer.cpp +++ b/kdeprint/management/kmtimer.cpp @@ -34,10 +34,10 @@ KMTimer* KMTimer::self() return m_self; } -KMTimer::KMTimer(QObject *parent, const char *name) -: QTimer(parent, name), m_count(0) +KMTimer::KMTimer(TQObject *parent, const char *name) +: TQTimer(parent, name), m_count(0) { - connect(this, SIGNAL(timeout()), SLOT(slotTimeout())); + connect(this, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); } KMTimer::~KMTimer() diff --git a/kdeprint/management/kmtimer.h b/kdeprint/management/kmtimer.h index b4ac49a56..cf5efb719 100644 --- a/kdeprint/management/kmtimer.h +++ b/kdeprint/management/kmtimer.h @@ -24,7 +24,7 @@ #warning internal header, do not use except if you are a KDEPrint developer #endif -#include +#include #include /** @@ -54,7 +54,7 @@ private slots: private: static KMTimer *m_self; int m_count; - KMTimer(QObject *parent = 0, const char *name = 0); + KMTimer(TQObject *parent = 0, const char *name = 0); void releaseTimer(bool do_emit = false); void startTimer(int delay = -1); }; diff --git a/kdeprint/management/kmwbackend.cpp b/kdeprint/management/kmwbackend.cpp index 32f95949d..53803d383 100644 --- a/kdeprint/management/kmwbackend.cpp +++ b/kdeprint/management/kmwbackend.cpp @@ -21,11 +21,11 @@ #include "kmwizard.h" #include "kmprinter.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -36,32 +36,32 @@ class KRadioButton : public QRadioButton { public: - KRadioButton(const QString& txt, QWidget *parent = 0, const char *name = 0); + KRadioButton(const TQString& txt, TQWidget *parent = 0, const char *name = 0); }; -KRadioButton::KRadioButton(const QString& txt, QWidget *parent, const char *name) -: QRadioButton(txt,parent,name) +KRadioButton::KRadioButton(const TQString& txt, TQWidget *parent, const char *name) +: TQRadioButton(txt,parent,name) { setCursor(KCursor::handCursor()); } //******************************************************************************************************** -KMWBackend::KMWBackend(QWidget *parent, const char *name) +KMWBackend::KMWBackend(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::Backend; m_title = i18n("Backend Selection"); - m_buttons = new QButtonGroup(this); + m_buttons = new TQButtonGroup(this); m_buttons->hide(); - m_layout = new QVBoxLayout(this, 0, KDialog::spacingHint()); + m_layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); m_layout->addStretch(1); m_count = 0; } -bool KMWBackend::isValid(QString& msg) +bool KMWBackend::isValid(TQString& msg) { if (!m_buttons->selected()) { @@ -100,9 +100,9 @@ void KMWBackend::updatePrinter(KMPrinter *p) int ID = m_buttons->id(m_buttons->selected()); if (ID == KMWizard::Class) p->setType(KMPrinter::Class); else p->setType(KMPrinter::Printer); - p->setOption("kde-backend",QString::number(ID)); + p->setOption("kde-backend",TQString::number(ID)); QString s = m_buttons->selected()->text(); - s.replace(QRegExp("&(?=\\w)"), QString::fromLatin1("")); + s.replace(TQRegExp("&(?=\\w)"), TQString::fromLatin1("")); p->setOption("kde-backend-description",s); setNextPage((m_map.contains(ID) ? m_map[ID] : KMWizard::Error)); } @@ -142,14 +142,14 @@ void KMWBackend::addBackend( int ID, bool on, int nextpage ) nextpage ); break; case -1: - addBackend( ID, QString::null, on, QString::null, nextpage ); + addBackend( ID, TQString::null, on, TQString::null, nextpage ); break; default: kdError( 500 ) << "Non standard wizard page ID: " << ID << endl; } } -void KMWBackend::addBackend(int ID, const QString& txt, bool on, const QString& whatsThis, int nextpage) +void KMWBackend::addBackend(int ID, const TQString& txt, bool on, const TQString& whatsThis, int nextpage) { if (ID == -1) { @@ -161,7 +161,7 @@ void KMWBackend::addBackend(int ID, const QString& txt, bool on, const QString& KRadioButton *btn = new KRadioButton(txt, this); btn->setEnabled(on); if ( !whatsThis.isEmpty() ) - QWhatsThis::add( btn, whatsThis ); + TQWhatsThis::add( btn, whatsThis ); m_buttons->insert(btn, ID); m_map[ID] = (nextpage == -1 ? ID : nextpage); // use nextpage if specified, default to ID m_layout->insertWidget(m_count, btn); diff --git a/kdeprint/management/kmwbackend.h b/kdeprint/management/kmwbackend.h index 654ec3337..e31136851 100644 --- a/kdeprint/management/kmwbackend.h +++ b/kdeprint/management/kmwbackend.h @@ -22,7 +22,7 @@ #include "kmwizardpage.h" #include -#include +#include class QButtonGroup; class QVBoxLayout; @@ -30,13 +30,13 @@ class QVBoxLayout; class KDEPRINT_EXPORT KMWBackend : public KMWizardPage { public: - KMWBackend(QWidget *parent = 0, const char *name = 0); + KMWBackend(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); - void addBackend(int ID, const QString& txt, bool on = true, const QString& whatsThis = QString::null, int nextpage = -1); + void addBackend(int ID, const TQString& txt, bool on = true, const TQString& whatsThis = TQString::null, int nextpage = -1); void addBackend(int ID = -1, bool on = true, int nextpage = -1); void enableBackend(int ID, bool on = true); @@ -47,7 +47,7 @@ private: // to have different backends switching to the same page (like backends requiring // a password). If the next page is not given when adding the backend, the ID is // used by default. - QMap m_map; + TQMap m_map; int m_count; }; diff --git a/kdeprint/management/kmwclass.cpp b/kdeprint/management/kmwclass.cpp index 6d80a6ff3..d432af8e1 100644 --- a/kdeprint/management/kmwclass.cpp +++ b/kdeprint/management/kmwclass.cpp @@ -23,14 +23,14 @@ #include "kmmanager.h" #include "kmprinter.h" -#include -#include -#include +#include +#include +#include #include #include #include -KMWClass::KMWClass(QWidget *parent, const char *name) +KMWClass::KMWClass(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::Class; @@ -38,23 +38,23 @@ KMWClass::KMWClass(QWidget *parent, const char *name) m_nextpage = KMWizard::Name; m_list1 = new KListBox(this); - m_list1->setSelectionMode(QListBox::Extended); + m_list1->setSelectionMode(TQListBox::Extended); m_list2 = new KListBox(this); - m_list2->setSelectionMode(QListBox::Extended); + m_list2->setSelectionMode(TQListBox::Extended); - QToolButton *add = new QToolButton(this); - QToolButton *remove = new QToolButton(this); + QToolButton *add = new TQToolButton(this); + QToolButton *remove = new TQToolButton(this); add->setIconSet(BarIcon("forward")); remove->setIconSet(BarIcon("back")); - connect(add,SIGNAL(clicked()),SLOT(slotAdd())); - connect(remove,SIGNAL(clicked()),SLOT(slotRemove())); + connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd())); + connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove())); - QLabel *l1 = new QLabel(i18n("Available printers:"), this); - QLabel *l2 = new QLabel(i18n("Class printers:"), this); + QLabel *l1 = new TQLabel(i18n("Available printers:"), this); + QLabel *l2 = new TQLabel(i18n("Class printers:"), this); - QHBoxLayout *lay1 = new QHBoxLayout(this, 0, 15); - QVBoxLayout *lay2 = new QVBoxLayout(0, 0, 20); - QVBoxLayout *lay3 = new QVBoxLayout(0, 0, 0), *lay4 = new QVBoxLayout(0, 0, 0); + QHBoxLayout *lay1 = new TQHBoxLayout(this, 0, 15); + QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 20); + QVBoxLayout *lay3 = new TQVBoxLayout(0, 0, 0), *lay4 = new TQVBoxLayout(0, 0, 0); lay1->addLayout(lay3, 1); lay1->addLayout(lay2, 0); lay1->addLayout(lay4, 1); @@ -72,7 +72,7 @@ KMWClass::~KMWClass() { } -bool KMWClass::isValid(QString& msg) +bool KMWClass::isValid(TQString& msg) { if (m_list2->count() == 0) { @@ -88,11 +88,11 @@ void KMWClass::initPrinter(KMPrinter *p) KMManager *mgr = KMFactory::self()->manager(); // first load available printers - QPtrList *list = mgr->printerList(false); + TQPtrList *list = mgr->printerList(false); m_list1->clear(); if (list) { - QPtrListIterator it(*list); + TQPtrListIterator it(*list); for (;it.current();++it) if (it.current()->instanceName().isEmpty() && !it.current()->isClass(true) && !it.current()->isSpecial() && !members.contains(it.current()->name())) m_list1->insertItem(SmallIcon(it.current()->pixmap()), it.current()->name()); @@ -101,7 +101,7 @@ void KMWClass::initPrinter(KMPrinter *p) // set class printers m_list2->clear(); - for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) + for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it) { KMPrinter *pr = mgr->findPrinter(*it); if (pr) m_list2->insertItem(SmallIcon(pr->pixmap()), *it); diff --git a/kdeprint/management/kmwclass.h b/kdeprint/management/kmwclass.h index 4a4475b7d..1fadf45f4 100644 --- a/kdeprint/management/kmwclass.h +++ b/kdeprint/management/kmwclass.h @@ -28,10 +28,10 @@ class KMWClass : public KMWizardPage { Q_OBJECT public: - KMWClass(QWidget *parent = 0, const char *name = 0); + KMWClass(TQWidget *parent = 0, const char *name = 0); ~KMWClass(); - bool isValid(QString&); + bool isValid(TQString&); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); diff --git a/kdeprint/management/kmwdriver.cpp b/kdeprint/management/kmwdriver.cpp index 66ab87d20..a50454d0b 100644 --- a/kdeprint/management/kmwdriver.cpp +++ b/kdeprint/management/kmwdriver.cpp @@ -23,10 +23,10 @@ #include "kmdriverdbwidget.h" #include "kmdriverdb.h" -#include +#include #include -KMWDriver::KMWDriver(QWidget *parent, const char *name) +KMWDriver::KMWDriver(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::Driver; @@ -35,7 +35,7 @@ KMWDriver::KMWDriver(QWidget *parent, const char *name) m_widget = new KMDriverDbWidget(this); - QVBoxLayout *lay1 = new QVBoxLayout(this, 0, 0); + QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 0); lay1->addWidget(m_widget); } @@ -44,7 +44,7 @@ void KMWDriver::initPrinter(KMPrinter *p) m_widget->init(); if (p) { - QString autoDetect = p->option( "kde-autodetect" ); + TQString autoDetect = p->option( "kde-autodetect" ); if ( !autoDetect.isEmpty() ) { // use auto-detection info instead: split the string @@ -52,7 +52,7 @@ void KMWDriver::initPrinter(KMPrinter *p) int p = autoDetect.find( ' ' ); if ( p != -1 ) { - QString manu = autoDetect.left( p ), model = autoDetect.mid( p+1 ); + TQString manu = autoDetect.left( p ), model = autoDetect.mid( p+1 ); KMDBEntryList *l = KMDriverDB::self()->findPnpEntry( manu, model ); if ( l && l->count() > 0 ) { @@ -69,11 +69,11 @@ void KMWDriver::updatePrinter(KMPrinter *p) { if (p) { - p->setManufacturer(QString::null); - p->setModel(QString::null); + p->setManufacturer(TQString::null); + p->setModel(TQString::null); p->setDbEntry(0); - p->setDriverInfo(QString::null); - p->setOption("kde-driver",QString::null); + p->setDriverInfo(TQString::null); + p->setOption("kde-driver",TQString::null); setNextPage(KMWizard::DriverTest); if (m_widget->isRaw()) { @@ -104,7 +104,7 @@ void KMWDriver::updatePrinter(KMPrinter *p) } } -bool KMWDriver::isValid(QString& msg) +bool KMWDriver::isValid(TQString& msg) { if (m_widget->isRaw() || m_widget->isExternal() || m_widget->drivers()) return true; diff --git a/kdeprint/management/kmwdriver.h b/kdeprint/management/kmwdriver.h index 0961f7a81..cb49246b6 100644 --- a/kdeprint/management/kmwdriver.h +++ b/kdeprint/management/kmwdriver.h @@ -27,9 +27,9 @@ class KMDriverDbWidget; class KMWDriver : public KMWizardPage { public: - KMWDriver(QWidget *parent = 0, const char *name = 0); + KMWDriver(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); void initPrinter(KMPrinter*); diff --git a/kdeprint/management/kmwdriverselect.cpp b/kdeprint/management/kmwdriverselect.cpp index ed97b967c..5ce70016d 100644 --- a/kdeprint/management/kmwdriverselect.cpp +++ b/kdeprint/management/kmwdriverselect.cpp @@ -23,14 +23,14 @@ #include "kmdbentry.h" #include "kmdriverdb.h" -#include -#include +#include +#include #include #include #include #include -KMWDriverSelect::KMWDriverSelect(QWidget *parent, const char *name) +KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::DriverSelect; @@ -39,23 +39,23 @@ KMWDriverSelect::KMWDriverSelect(QWidget *parent, const char *name) m_entries = NULL; m_list = new KListBox(this); - QLabel *l1 = new QLabel(this); + QLabel *l1 = new TQLabel(this); l1->setText(i18n("

    Several drivers have been detected for this model. Select the driver " "you want to use. You will have the opportunity to test it as well as to " "change it if necessary.

    ")); m_drivercomment = new KPushButton(i18n("Driver Information"), this); - connect(m_drivercomment, SIGNAL(clicked()), SLOT(slotDriverComment())); + connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment())); - QVBoxLayout *main_ = new QVBoxLayout(this, 0, 10); + QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(l1,0); main_->addWidget(m_list,1); - QHBoxLayout *lay0 = new QHBoxLayout(0, 0, 0); + QHBoxLayout *lay0 = new TQHBoxLayout(0, 0, 0); main_->addLayout(lay0,0); lay0->addStretch(1); lay0->addWidget(m_drivercomment); } -bool KMWDriverSelect::isValid(QString& msg) +bool KMWDriverSelect::isValid(TQString& msg) { if (m_list->currentItem() == -1) { @@ -100,7 +100,7 @@ void KMWDriverSelect::updatePrinter(KMPrinter *p) else { p->setDbEntry(0); - p->setDriverInfo(QString::null); + p->setDriverInfo(TQString::null); } } @@ -108,7 +108,7 @@ void KMWDriverSelect::slotDriverComment() { int index = m_list->currentItem(); if (m_entries && index >=0 && index < (int)(m_entries->count()) && !m_entries->at(index)->drivercomment.isEmpty()) - KMessageBox::information(this, m_entries->at(index)->drivercomment, QString::null, QString::null, KMessageBox::AllowLink); + KMessageBox::information(this, m_entries->at(index)->drivercomment, TQString::null, TQString::null, KMessageBox::AllowLink); else KMessageBox::error(this, i18n("No information about the selected driver.")); } diff --git a/kdeprint/management/kmwdriverselect.h b/kdeprint/management/kmwdriverselect.h index bf00f2e46..935bb56ca 100644 --- a/kdeprint/management/kmwdriverselect.h +++ b/kdeprint/management/kmwdriverselect.h @@ -30,9 +30,9 @@ class KMWDriverSelect : public KMWizardPage { Q_OBJECT public: - KMWDriverSelect(QWidget *parent = 0, const char *name = 0); + KMWDriverSelect(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); diff --git a/kdeprint/management/kmwdrivertest.cpp b/kdeprint/management/kmwdrivertest.cpp index 5075e2204..4024f110d 100644 --- a/kdeprint/management/kmwdrivertest.cpp +++ b/kdeprint/management/kmwdrivertest.cpp @@ -25,16 +25,16 @@ #include "kmmanager.h" #include "kmdriverdialog.h" -#include +#include #include -#include +#include #include #include #include #include #include -KMWDriverTest::KMWDriverTest(QWidget *parent, const char *name) +KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::DriverTest; @@ -44,26 +44,26 @@ KMWDriverTest::KMWDriverTest(QWidget *parent, const char *name) m_driver = 0; m_printer = 0; - m_manufacturer = new QLabel(this); - m_model = new QLabel(this); - m_driverinfo = new QLabel(this); + m_manufacturer = new TQLabel(this); + m_model = new TQLabel(this); + m_driverinfo = new TQLabel(this); m_driverinfo->setTextFormat(Qt::RichText); - QLabel *l1 = new QLabel(i18n("Manufacturer:"), this); - QLabel *l2 = new QLabel(i18n("Model:"), this); - QLabel *l3 = new QLabel(i18n("Description:"), this); + QLabel *l1 = new TQLabel(i18n("Manufacturer:"), this); + QLabel *l2 = new TQLabel(i18n("Model:"), this); + QLabel *l3 = new TQLabel(i18n("Description:"), this); m_test = new KPushButton(KGuiItem(i18n("&Test"), "kdeprint_testprinter"), this); m_settings = new KPushButton(KGuiItem(i18n("&Settings"), "configure"), this); - QLabel *l0 = new QLabel(this); + QLabel *l0 = new TQLabel(this); l0->setText(i18n("

    Now you can test the printer before finishing installation. " "Use the Settings button to configure the printer driver and " "the Test button to test your configuration. Use the Back " "button to change the driver (your current configuration will be discarded).

    ")); - QVBoxLayout *lay1 = new QVBoxLayout(this, 0, 15); - QGridLayout *lay2 = new QGridLayout(0, 3, 3, 0, 0); - QHBoxLayout *lay3 = new QHBoxLayout(0, 0, 10); + QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15); + QGridLayout *lay2 = new TQGridLayout(0, 3, 3, 0, 0); + QHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); lay1->addWidget(l0,0); lay1->addLayout(lay2,0); lay1->addLayout(lay3,0); @@ -80,8 +80,8 @@ KMWDriverTest::KMWDriverTest(QWidget *parent, const char *name) lay3->addWidget(m_settings,0); lay3->addStretch(1); - connect(m_test,SIGNAL(clicked()),SLOT(slotTest())); - connect(m_settings,SIGNAL(clicked()),SLOT(slotSettings())); + connect(m_test,TQT_SIGNAL(clicked()),TQT_SLOT(slotTest())); + connect(m_settings,TQT_SIGNAL(clicked()),TQT_SLOT(slotSettings())); } KMWDriverTest::~KMWDriverTest() @@ -115,7 +115,7 @@ void KMWDriverTest::initPrinter(KMPrinter *p) if (checkDriver && !m_driver) { KMessageBox::error(this, i18n("Unable to load the requested driver:

    %1

    ").arg(KMManager::self()->errorMsg())); - KMManager::self()->setErrorMsg(QString::null); + KMManager::self()->setErrorMsg(TQString::null); } m_settings->setEnabled((m_driver != 0)); } diff --git a/kdeprint/management/kmwdrivertest.h b/kdeprint/management/kmwdrivertest.h index 8433687dd..5ab716459 100644 --- a/kdeprint/management/kmwdrivertest.h +++ b/kdeprint/management/kmwdrivertest.h @@ -30,7 +30,7 @@ class KMWDriverTest : public KMWizardPage { Q_OBJECT public: - KMWDriverTest(QWidget *parent = 0, const char *name = 0); + KMWDriverTest(TQWidget *parent = 0, const char *name = 0); ~KMWDriverTest(); void initPrinter(KMPrinter*); diff --git a/kdeprint/management/kmwend.cpp b/kdeprint/management/kmwend.cpp index 7386ba7f0..5fd3c7fc0 100644 --- a/kdeprint/management/kmwend.cpp +++ b/kdeprint/management/kmwend.cpp @@ -22,31 +22,31 @@ #include "kmwizard.h" #include "util.h" -#include +#include #include -#include +#include -KMWEnd::KMWEnd(QWidget *parent, const char *name) +KMWEnd::KMWEnd(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::End; m_title = i18n("Confirmation"); m_nextpage = KMWizard::Error; - m_view = new QTextView(this); + m_view = new TQTextView(this); - QVBoxLayout *lay = new QVBoxLayout(this, 0, 0); + QVBoxLayout *lay = new TQVBoxLayout(this, 0, 0); lay->addWidget(m_view,1); } void KMWEnd::initPrinter(KMPrinter *p) { QString txt; - QString s(QString::fromLatin1("
  • %1: %2
    • ")); + QString s(TQString::fromLatin1("
  • %1: %2
    • ")); int ID = p->option("kde-backend").toInt(); // general information - txt.append(QString::fromLatin1("%1
      ").arg(i18n("General"))); + txt.append(TQString::fromLatin1("%1
        ").arg(i18n("General"))); txt.append(s.arg(i18n("Type")).arg(p->option("kde-backend-description"))); txt.append(s.arg(i18n("Name")).arg(p->name())); txt.append(s.arg(i18n("Location")).arg(p->location())); @@ -56,17 +56,17 @@ void KMWEnd::initPrinter(KMPrinter *p) if (ID == KMWizard::Class) { // class members - txt.append(QString::fromLatin1("%1
          ").arg(i18n("Members"))); + txt.append(TQString::fromLatin1("%1
            ").arg(i18n("Members"))); QStringList m(p->members()); - QString s1(QString::fromLatin1("
          • %1
            • ")); - for (QStringList::ConstIterator it=m.begin(); it!=m.end(); ++it) + QString s1(TQString::fromLatin1("
          • %1
            • ")); + for (TQStringList::ConstIterator it=m.begin(); it!=m.end(); ++it) txt.append(s1.arg(*it)); txt.append("

          "); } else { // backend information - txt.append(QString::fromLatin1("%1
            ").arg(i18n("Backend"))); + txt.append(TQString::fromLatin1("%1
              ").arg(i18n("Backend"))); KURL url ( p->device() ); switch (ID) { @@ -101,7 +101,7 @@ void KMWEnd::initPrinter(KMPrinter *p) if (p->option("kde-driver") == "raw" || p->driver()) { // driver information - txt.append(QString::fromLatin1("%1
                ").arg(i18n("Driver"))); + txt.append(TQString::fromLatin1("%1
                  ").arg(i18n("Driver"))); if (p->option("kde-driver") == "raw") txt.append(s.arg(i18n("Type")).arg(i18n("Raw printer"))); else diff --git a/kdeprint/management/kmwend.h b/kdeprint/management/kmwend.h index 4682d831e..d30972361 100644 --- a/kdeprint/management/kmwend.h +++ b/kdeprint/management/kmwend.h @@ -27,7 +27,7 @@ class QTextView; class KMWEnd : public KMWizardPage { public: - KMWEnd(QWidget *parent = 0, const char *name = 0); + KMWEnd(TQWidget *parent = 0, const char *name = 0); void initPrinter(KMPrinter*); diff --git a/kdeprint/management/kmwfile.cpp b/kdeprint/management/kmwfile.cpp index 497b03f27..9daeee77b 100644 --- a/kdeprint/management/kmwfile.cpp +++ b/kdeprint/management/kmwfile.cpp @@ -21,14 +21,14 @@ #include "kmwizard.h" #include "kmprinter.h" -#include -#include +#include +#include #include #include #include -KMWFile::KMWFile(QWidget *parent, const char *name) +KMWFile::KMWFile(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::File; @@ -37,14 +37,14 @@ KMWFile::KMWFile(QWidget *parent, const char *name) m_url = new KURLRequester(this); m_url->setMode((KFile::Mode)(KFile::File|KFile::LocalOnly)); - QLabel *l1 = new QLabel(this); + QLabel *l1 = new TQLabel(this); l1->setText(i18n("

                  The printing will be redirected to a file. Enter here the path " "of the file you want to use for redirection. Use an absolute path or " "the browse button for graphical selection.

                  ")); - QLabel *l2 = new QLabel(i18n("Print to file:"), this); + QLabel *l2 = new TQLabel(i18n("Print to file:"), this); - QVBoxLayout *lay1 = new QVBoxLayout(this, 0, 30); - QVBoxLayout *lay2 = new QVBoxLayout(0, 0, 5); + QVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 30); + QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5); lay1->addWidget(l1); lay1->addLayout(lay2); lay1->addStretch(1); @@ -52,7 +52,7 @@ KMWFile::KMWFile(QWidget *parent, const char *name) lay2->addWidget(m_url); } -bool KMWFile::isValid(QString& msg) +bool KMWFile::isValid(TQString& msg) { QFileInfo fi(m_url->url()); if (fi.fileName().isEmpty()) @@ -72,6 +72,6 @@ bool KMWFile::isValid(QString& msg) void KMWFile::updatePrinter(KMPrinter *p) { - QString dev = QString::fromLatin1("file:%1").arg(m_url->url()); + QString dev = TQString::fromLatin1("file:%1").arg(m_url->url()); p->setDevice(dev); } diff --git a/kdeprint/management/kmwfile.h b/kdeprint/management/kmwfile.h index 7bcd779ed..2e6997372 100644 --- a/kdeprint/management/kmwfile.h +++ b/kdeprint/management/kmwfile.h @@ -27,9 +27,9 @@ class KURLRequester; class KMWFile : public KMWizardPage { public: - KMWFile(QWidget *parent = 0, const char *name = 0); + KMWFile(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); private: diff --git a/kdeprint/management/kmwinfobase.cpp b/kdeprint/management/kmwinfobase.cpp index e58e452bb..aef26049f 100644 --- a/kdeprint/management/kmwinfobase.cpp +++ b/kdeprint/management/kmwinfobase.cpp @@ -19,57 +19,57 @@ #include "kmwinfobase.h" -#include -#include -#include +#include +#include +#include -KMWInfoBase::KMWInfoBase(int n, QWidget *parent, const char *name) +KMWInfoBase::KMWInfoBase(int n, TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_labels.setAutoDelete(false); m_edits.setAutoDelete(false); m_nlines = n; - QGridLayout *lay1 = new QGridLayout(this, m_nlines+3, 2, 0, 10); + QGridLayout *lay1 = new TQGridLayout(this, m_nlines+3, 2, 0, 10); lay1->addRowSpacing(1,10); lay1->setRowStretch(m_nlines+2,1); lay1->setColStretch(1,1); - m_info = new QLabel(this); + m_info = new TQLabel(this); m_info->setTextFormat(Qt::RichText); lay1->addMultiCellWidget(m_info,0,0,0,1); for (int i=0;iaddWidget(m_labels.last(),i+2,0); lay1->addWidget(m_edits.last(),i+2,1); } } -void KMWInfoBase::setInfo(const QString& s) +void KMWInfoBase::setInfo(const TQString& s) { m_info->setText(s); } -void KMWInfoBase::setLabel(int i, const QString& s) +void KMWInfoBase::setLabel(int i, const TQString& s) { if (i >= 0 && i < m_nlines) m_labels.at(i)->setText(s); } -void KMWInfoBase::setText(int i, const QString& s) +void KMWInfoBase::setText(int i, const TQString& s) { if (i >= 0 && i < m_nlines) m_edits.at(i)->setText(s); } -QString KMWInfoBase::text(int i) +TQString KMWInfoBase::text(int i) { if (i >= 0 && i < m_nlines) return m_edits.at(i)->text(); - return QString::null; + return TQString::null; } void KMWInfoBase::setCurrent(int i) @@ -81,7 +81,7 @@ void KMWInfoBase::setCurrent(int i) } } -QLineEdit* KMWInfoBase::lineEdit( int i ) +TQLineEdit* KMWInfoBase::lineEdit( int i ) { if ( i >= 0 && i < m_nlines ) return m_edits.at( i ); diff --git a/kdeprint/management/kmwinfobase.h b/kdeprint/management/kmwinfobase.h index 77f9e976a..1a6576618 100644 --- a/kdeprint/management/kmwinfobase.h +++ b/kdeprint/management/kmwinfobase.h @@ -21,7 +21,7 @@ #define KMWINFOBASE_H #include "kmwizardpage.h" -#include +#include class QLabel; class QLineEdit; @@ -29,21 +29,21 @@ class QLineEdit; class KDEPRINT_EXPORT KMWInfoBase : public KMWizardPage { public: - KMWInfoBase(int n = 1, QWidget *parent = 0, const char *name = 0); + KMWInfoBase(int n = 1, TQWidget *parent = 0, const char *name = 0); - void setInfo(const QString&); - void setLabel(int, const QString&); - void setText(int, const QString&); + void setInfo(const TQString&); + void setLabel(int, const TQString&); + void setText(int, const TQString&); void setCurrent(int); - QString text(int); + TQString text(int); protected: - QLineEdit* lineEdit( int ); + TQLineEdit* lineEdit( int ); private: - QPtrList m_labels; - QPtrList m_edits; + TQPtrList m_labels; + TQPtrList m_edits; QLabel *m_info; int m_nlines; }; diff --git a/kdeprint/management/kmwinfopage.cpp b/kdeprint/management/kmwinfopage.cpp index 43e830a20..092a8669d 100644 --- a/kdeprint/management/kmwinfopage.cpp +++ b/kdeprint/management/kmwinfopage.cpp @@ -20,19 +20,19 @@ #include "kmwinfopage.h" #include "kmwizard.h" -#include -#include +#include +#include #include #include -KMWInfoPage::KMWInfoPage(QWidget *parent, const char *name) +KMWInfoPage::KMWInfoPage(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_ID = KMWizard::Start; m_title = i18n("Introduction"); m_nextpage = KMWizard::Backend; - //QLabel *m_label = new QLabel(this); + //QLabel *m_label = new TQLabel(this); KActiveLabel *m_label = new KActiveLabel(this); m_label->setText(i18n("

                  Welcome,


                  " "

                  This wizard will help to install a new printer on your computer. " @@ -43,6 +43,6 @@ KMWInfoPage::KMWInfoPage(QWidget *parent, const char *name) "

                  " "The KDE printing team.

                  ")); - QVBoxLayout *main_ = new QVBoxLayout(this, 0, 0); + QVBoxLayout *main_ = new TQVBoxLayout(this, 0, 0); main_->addWidget(m_label); } diff --git a/kdeprint/management/kmwinfopage.h b/kdeprint/management/kmwinfopage.h index 76719e0ff..aefa675fe 100644 --- a/kdeprint/management/kmwinfopage.h +++ b/kdeprint/management/kmwinfopage.h @@ -25,7 +25,7 @@ class KMWInfoPage : public KMWizardPage { public: - KMWInfoPage(QWidget *parent = 0, const char *name = 0); + KMWInfoPage(TQWidget *parent = 0, const char *name = 0); }; #endif diff --git a/kdeprint/management/kmwizard.cpp b/kdeprint/management/kmwizard.cpp index d44ac87e8..6a793dd5a 100644 --- a/kdeprint/management/kmwizard.cpp +++ b/kdeprint/management/kmwizard.cpp @@ -24,10 +24,10 @@ #include "kmuimanager.h" #include -#include -#include +#include +#include #include -#include +#include #include #include #include @@ -50,8 +50,8 @@ #include "kmwlocal.h" #include "sidepixmap.h" -KMWizard::KMWizard(QWidget *parent, const char *name) -: QDialog(parent,name,true) +KMWizard::KMWizard(TQWidget *parent, const char *name) +: TQDialog(parent,name,true) { m_start = KMWizard::Start; m_end = KMWizard::End; @@ -60,12 +60,12 @@ KMWizard::KMWizard(QWidget *parent, const char *name) m_pagepool.setAutoDelete(false); - m_stack = new QWidgetStack(this); + m_stack = new TQWidgetStack(this); m_next = new KPushButton(i18n("&Next >"), this); m_next->setDefault(true); m_prev = new KPushButton(i18n("< &Back"), this); QPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this); - m_title = new QLabel(this); + m_title = new TQLabel(this); QFont f(m_title->font()); f.setBold(true); m_title->setFont(f); @@ -74,10 +74,10 @@ KMWizard::KMWizard(QWidget *parent, const char *name) KSeparator* sep2 = new KSeparator( KSeparator::HLine, this); QPushButton *m_help = new KPushButton(KStdGuiItem::help(), this); - connect(m_cancel,SIGNAL(clicked()),SLOT(reject())); - connect(m_next,SIGNAL(clicked()),SLOT(slotNext())); - connect(m_prev,SIGNAL(clicked()),SLOT(slotPrev())); - connect(m_help, SIGNAL(clicked()), SLOT(slotHelp())); + 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())); m_side = new SidePixmap(this); if (!m_side->isValid()) @@ -87,10 +87,10 @@ KMWizard::KMWizard(QWidget *parent, const char *name) } // layout - QVBoxLayout *main0_ = new QVBoxLayout(this, 10, 10); - QVBoxLayout *main_ = new QVBoxLayout(0, 0, 0); - QHBoxLayout *main1_ = new QHBoxLayout(0, 0, 10); - QHBoxLayout *btn_ = new QHBoxLayout(0, 0, 10); + TQVBoxLayout *main0_ = new TQVBoxLayout(this, 10, 10); + QVBoxLayout *main_ = new TQVBoxLayout(0, 0, 0); + TQHBoxLayout *main1_ = new TQHBoxLayout(0, 0, 10); + QHBoxLayout *btn_ = new TQHBoxLayout(0, 0, 10); main0_->addLayout(main1_); if (m_side) main1_->addWidget(m_side); @@ -244,7 +244,7 @@ void KMWizard::slotNext() void KMWizard::slotHelp() { - kapp->invokeHelp(QString::null, "kdeprint"); + kapp->invokeHelp(TQString::null, "kdeprint"); } void KMWizard::enableWizard() diff --git a/kdeprint/management/kmwizard.h b/kdeprint/management/kmwizard.h index 4a52628fb..a6f3d8dfc 100644 --- a/kdeprint/management/kmwizard.h +++ b/kdeprint/management/kmwizard.h @@ -20,9 +20,9 @@ #ifndef KMWIZARD_H #define KMWIZARD_H -#include -#include -#include +#include +#include +#include #include @@ -60,7 +60,7 @@ public: Custom = 100 }; - KMWizard(QWidget *parent = 0, const char *name = 0); + KMWizard(TQWidget *parent = 0, const char *name = 0); ~KMWizard(); void configure(int start, int end, bool inclusive = true); @@ -81,8 +81,8 @@ protected slots: void slotHelp(); private: - QIntDict m_pagepool; - QValueStack m_pagestack; + TQIntDict m_pagepool; + TQValueStack m_pagestack; QWidgetStack *m_stack; QLabel *m_title; diff --git a/kdeprint/management/kmwizardpage.cpp b/kdeprint/management/kmwizardpage.cpp index fe872161e..936a30c87 100644 --- a/kdeprint/management/kmwizardpage.cpp +++ b/kdeprint/management/kmwizardpage.cpp @@ -20,8 +20,8 @@ #include "kmwizardpage.h" #include "kmwizard.h" -KMWizardPage::KMWizardPage(QWidget *parent, const char *name) -: QWidget(parent,name) +KMWizardPage::KMWizardPage(TQWidget *parent, const char *name) +: TQWidget(parent,name) { m_ID = KMWizard::Error; m_title = "KMWizardPage"; @@ -33,7 +33,7 @@ KMWizardPage::~KMWizardPage() { } -bool KMWizardPage::isValid(QString&) +bool KMWizardPage::isValid(TQString&) { return true; } diff --git a/kdeprint/management/kmwizardpage.h b/kdeprint/management/kmwizardpage.h index d0846b57f..d6756ab37 100644 --- a/kdeprint/management/kmwizardpage.h +++ b/kdeprint/management/kmwizardpage.h @@ -20,7 +20,7 @@ #ifndef KMWIZARDPAGE_H #define KMWIZARDPAGE_H -#include +#include #include @@ -30,14 +30,14 @@ class KDEPRINT_EXPORT KMWizardPage : public QWidget { Q_OBJECT public: - KMWizardPage(QWidget *parent = 0, const char *name = 0); + KMWizardPage(TQWidget *parent = 0, const char *name = 0); virtual ~KMWizardPage(); int id() const { return m_ID; } - const QString& title() const { return m_title; } + const TQString& title() const { return m_title; } int nextPage() const { return m_nextpage; } void setNextPage(int p) { m_nextpage = p; } - virtual bool isValid(QString&); + virtual bool isValid(TQString&); virtual void initPrinter(KMPrinter*); virtual void updatePrinter(KMPrinter*); bool needsInitOnBack() { return m_needsinitonback; } diff --git a/kdeprint/management/kmwlocal.cpp b/kdeprint/management/kmwlocal.cpp index 10657f246..1a89babe0 100644 --- a/kdeprint/management/kmwlocal.cpp +++ b/kdeprint/management/kmwlocal.cpp @@ -24,15 +24,15 @@ #include "kmmanager.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -KMWLocal::KMWLocal(QWidget *parent, const char *name) +KMWLocal::KMWLocal(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_title = i18n("Local Port Selection"); @@ -42,28 +42,28 @@ KMWLocal::KMWLocal(QWidget *parent, const char *name) m_block = false; m_ports = new KListView(this); - m_ports->setFrameStyle(QFrame::WinPanel|QFrame::Sunken); + m_ports->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_ports->setLineWidth(1); m_ports->header()->hide(); m_ports->addColumn(""); m_ports->setSorting(-1); - QListViewItem *root = new QListViewItem(m_ports, i18n("Local System")); + QListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); root->setPixmap(0, SmallIcon("kdeprint_computer")); root->setOpen(true); - connect(m_ports, SIGNAL(selectionChanged(QListViewItem*)), SLOT(slotPortSelected(QListViewItem*))); - QLabel *l1 = new QLabel(i18n("URI:"), this); - m_localuri = new QLineEdit(this); - connect( m_localuri, SIGNAL( textChanged( const QString& ) ), SLOT( slotTextChanged( const QString& ) ) ); - m_parents[0] = new QListViewItem(root, i18n("Parallel")); - m_parents[1] = new QListViewItem(root, m_parents[0], i18n("Serial")); - m_parents[2] = new QListViewItem(root, m_parents[1], i18n("USB")); - m_parents[3] = new QListViewItem(root, m_parents[2], i18n("Others")); + connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); + QLabel *l1 = new TQLabel(i18n("URI:"), this); + m_localuri = new TQLineEdit(this); + connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_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")); + m_parents[3] = new TQListViewItem(root, m_parents[2], i18n("Others")); for (int i=0;i<4;i++) m_parents[i]->setPixmap(0, SmallIcon("input_devices_settings")); - QLabel *l2 = new QLabel(i18n("

                  Select a valid detected port, or enter directly the corresponding URI in the bottom edit field.

                  "), this); + QLabel *l2 = new TQLabel(i18n("

                  Select a valid detected port, or enter directly the corresponding URI in the bottom edit field.

                  "), this); - QVBoxLayout *lay0 = new QVBoxLayout(this, 0, 10); - QHBoxLayout *lay1 = new QHBoxLayout(0, 0, 10); + QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); + QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); lay0->addWidget(l2, 0); lay0->addWidget(m_ports, 1); lay0->addLayout(lay1, 0); @@ -71,7 +71,7 @@ KMWLocal::KMWLocal(QWidget *parent, const char *name) lay1->addWidget(m_localuri, 1); } -bool KMWLocal::isValid(QString& msg) +bool KMWLocal::isValid(TQString& msg) { if (m_localuri->text().isEmpty()) { @@ -89,14 +89,14 @@ bool KMWLocal::isValid(QString& msg) return true; } -void KMWLocal::slotPortSelected(QListViewItem *item) +void KMWLocal::slotPortSelected(TQListViewItem *item) { if ( m_block ) return; - QString uri; + TQString uri; if (!item || item->depth() <= 1 || item->depth() > 3) - uri = QString::null; + uri = TQString::null; else if (item->depth() == 3) uri = item->parent()->text( 1 ); else @@ -108,7 +108,7 @@ void KMWLocal::slotPortSelected(QListViewItem *item) void KMWLocal::updatePrinter(KMPrinter *printer) { - QListViewItem *item = m_ports->selectedItem(); + TQListViewItem *item = m_ports->selectedItem(); if ( item && item->depth() == 3 ) printer->setOption( "kde-autodetect", item->text( 0 ) ); printer->setDevice(m_localuri->text()); @@ -125,11 +125,11 @@ void KMWLocal::initPrinter(KMPrinter *printer) } } -QListViewItem* KMWLocal::lookForItem( const QString& uri ) +TQListViewItem* KMWLocal::lookForItem( const TQString& uri ) { for ( int i=0; i<4; i++ ) { - QListViewItem *item = m_parents[ i ]->firstChild(); + TQListViewItem *item = m_parents[ i ]->firstChild(); while ( item ) if ( item->text( 1 ) == uri ) if ( item->firstChild() ) @@ -142,12 +142,12 @@ QListViewItem* KMWLocal::lookForItem( const QString& uri ) return 0; } -void KMWLocal::slotTextChanged( const QString& txt ) +void KMWLocal::slotTextChanged( const TQString& txt ) { if ( m_block ) return; - QListViewItem *item = lookForItem( txt ); + TQListViewItem *item = lookForItem( txt ); if ( item ) { m_block = true; @@ -167,14 +167,14 @@ void KMWLocal::initialize() return; } QListViewItem *last[4] = {0, 0, 0, 0}; - for (QStringList::Iterator it=list.begin(); it!=list.end(); ++it) + for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it) { - QString cl = *it; + TQString cl = *it; ++it; QString uri = *it; int p = uri.find( ':' ); - QString desc = *(++it), prot = ( p != -1 ? uri.left( p ) : QString::null ); + QString desc = *(++it), prot = ( p != -1 ? uri.left( p ) : TQString::null ); QString printer = *(++it); int index(-1); if (desc.isEmpty()) @@ -189,13 +189,13 @@ void KMWLocal::initialize() index = 3; else continue; - last[index] = new QListViewItem(m_parents[index], last[index], desc, uri); + last[index] = new TQListViewItem(m_parents[index], last[index], desc, uri); last[index]->setPixmap(0, SmallIcon("blockdevice")); m_parents[index]->setOpen(true); m_uris << uri; if (!printer.isEmpty()) { - QListViewItem *pItem = new QListViewItem(last[index], printer); + QListViewItem *pItem = new TQListViewItem(last[index], printer); last[index]->setOpen(true); pItem->setPixmap(0, SmallIcon("kdeprint_printer")); } diff --git a/kdeprint/management/kmwlocal.h b/kdeprint/management/kmwlocal.h index 5f99c32e0..2dd770341 100644 --- a/kdeprint/management/kmwlocal.h +++ b/kdeprint/management/kmwlocal.h @@ -22,7 +22,7 @@ #include "kmwizardpage.h" -#include +#include class QLineEdit; class KListView; @@ -32,19 +32,19 @@ class KMWLocal : public KMWizardPage { Q_OBJECT public: - KMWLocal(QWidget *parent = 0, const char *name = 0); + KMWLocal(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); void initPrinter(KMPrinter*); protected slots: - void slotPortSelected(QListViewItem*); - void slotTextChanged( const QString& ); + void slotPortSelected(TQListViewItem*); + void slotTextChanged( const TQString& ); protected: void initialize(); - QListViewItem* lookForItem( const QString& ); + TQListViewItem* lookForItem( const TQString& ); protected: KListView *m_ports; diff --git a/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp index fdb762e7d..c2686b481 100644 --- a/kdeprint/management/kmwlpd.cpp +++ b/kdeprint/management/kmwlpd.cpp @@ -24,9 +24,9 @@ #include #include -#include +#include #include -#include +#include #include #include @@ -34,7 +34,7 @@ static bool checkLpdQueue(const char *host, const char *queue); //******************************************************************************************************** -KMWLpd::KMWLpd(QWidget *parent, const char *name) +KMWLpd::KMWLpd(TQWidget *parent, const char *name) : KMWInfoBase(2,parent,name) { m_ID = KMWizard::LPD; @@ -47,7 +47,7 @@ KMWLpd::KMWLpd(QWidget *parent, const char *name) setLabel(1,i18n("Queue:")); } -bool KMWLpd::isValid(QString& msg) +bool KMWLpd::isValid(TQString& msg) { if (text(0).isEmpty() || text(1).isEmpty()) { @@ -66,7 +66,7 @@ bool KMWLpd::isValid(QString& msg) void KMWLpd::updatePrinter(KMPrinter *p) { - QString dev = QString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); + QString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); p->setDevice(dev); } diff --git a/kdeprint/management/kmwlpd.h b/kdeprint/management/kmwlpd.h index bd4b636f8..16cd70592 100644 --- a/kdeprint/management/kmwlpd.h +++ b/kdeprint/management/kmwlpd.h @@ -25,9 +25,9 @@ class KMWLpd : public KMWInfoBase { public: - KMWLpd(QWidget *parent = 0, const char *name = 0); + KMWLpd(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); }; diff --git a/kdeprint/management/kmwname.cpp b/kdeprint/management/kmwname.cpp index 0cfbfbea9..d46b104a7 100644 --- a/kdeprint/management/kmwname.cpp +++ b/kdeprint/management/kmwname.cpp @@ -21,13 +21,13 @@ #include "kmwizard.h" #include "kmprinter.h" -#include -#include +#include +#include #include #include -#include +#include -KMWName::KMWName(QWidget *parent, const char *name) +KMWName::KMWName(TQWidget *parent, const char *name) : KMWInfoBase(3,parent,name) { m_ID = KMWizard::Name; @@ -41,24 +41,24 @@ KMWName::KMWName(QWidget *parent, const char *name) setLabel(2,i18n("Description:")); } -bool KMWName::isValid(QString& msg) +bool KMWName::isValid(TQString& msg) { if (text(0).isEmpty()) { msg = i18n("You must supply at least a name."); return false; } - else if (text(0).find(QRegExp("\\s")) != -1) + else if (text(0).find(TQRegExp("\\s")) != -1) { QString conv = text(0); - conv.replace(QRegExp("\\s"), ""); + conv.replace(TQRegExp("\\s"), ""); int result = KMessageBox::warningYesNoCancel(this, i18n("It is usually not a good idea to include spaces " "in printer name: it may prevent your printer from " "working correctly. The wizard can strip all spaces " "from the string you entered, resulting in %1; " "what do you want to do?").arg(conv), - QString::null, + TQString::null, i18n("Strip"), i18n("Keep")); switch (result) { diff --git a/kdeprint/management/kmwname.h b/kdeprint/management/kmwname.h index 245b2c985..e3b74f224 100644 --- a/kdeprint/management/kmwname.h +++ b/kdeprint/management/kmwname.h @@ -25,9 +25,9 @@ class KMWName : public KMWInfoBase { public: - KMWName(QWidget *parent = 0, const char *name = 0); + KMWName(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void initPrinter(KMPrinter*); void updatePrinter(KMPrinter*); }; diff --git a/kdeprint/management/kmwpassword.cpp b/kdeprint/management/kmwpassword.cpp index 1b67ac6be..a84b8f904 100644 --- a/kdeprint/management/kmwpassword.cpp +++ b/kdeprint/management/kmwpassword.cpp @@ -21,17 +21,17 @@ #include "kmwizard.h" #include "kmprinter.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -KMWPassword::KMWPassword(QWidget *parent, const char *name) +KMWPassword::KMWPassword(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_title = i18n("User Identification"); @@ -39,20 +39,20 @@ KMWPassword::KMWPassword(QWidget *parent, const char *name) m_nextpage = KMWizard::SMB; // create widgets - QLabel *infotext_ = new QLabel(this); + QLabel *infotext_ = new TQLabel(this); infotext_->setText(i18n("

                  This backend may require a login/password to work properly. " "Select the type of access to use and fill in the login and password entries if needed.

                  ")); - m_login = new QLineEdit(this); - m_login->setText(QString::fromLocal8Bit(getenv("USER"))); - m_password = new QLineEdit(this); - m_password->setEchoMode(QLineEdit::Password); - QLabel *loginlabel_ = new QLabel(i18n("&Login:"),this); - QLabel *passwdlabel_ = new QLabel(i18n("&Password:"),this); - m_btngroup = new QVButtonGroup( this ); - m_btngroup->setFrameStyle( QFrame::NoFrame ); - QRadioButton *btn1 = new QRadioButton( i18n( "&Anonymous (no login/password)" ), m_btngroup ); - QRadioButton *btn2 = new QRadioButton( i18n( "&Guest account (login=\"guest\")" ), m_btngroup ); - QRadioButton *btn3 = new QRadioButton( i18n( "Nor&mal account" ), m_btngroup ); + m_login = new TQLineEdit(this); + m_login->setText(TQString::fromLocal8Bit(getenv("USER"))); + m_password = new TQLineEdit(this); + m_password->setEchoMode(TQLineEdit::Password); + QLabel *loginlabel_ = new TQLabel(i18n("&Login:"),this); + QLabel *passwdlabel_ = new TQLabel(i18n("&Password:"),this); + m_btngroup = new TQVButtonGroup( this ); + m_btngroup->setFrameStyle( TQFrame::NoFrame ); + TQRadioButton *btn1 = new TQRadioButton( i18n( "&Anonymous (no login/password)" ), m_btngroup ); + TQRadioButton *btn2 = new TQRadioButton( i18n( "&Guest account (login=\"guest\")" ), m_btngroup ); + TQRadioButton *btn3 = new TQRadioButton( i18n( "Nor&mal account" ), m_btngroup ); btn1->setCursor( KCursor::handCursor() ); btn2->setCursor( KCursor::handCursor() ); btn3->setCursor( KCursor::handCursor() ); @@ -63,15 +63,15 @@ KMWPassword::KMWPassword(QWidget *parent, const char *name) m_login->setEnabled(false); m_password->setEnabled(false); - connect(btn3,SIGNAL(toggled(bool)),m_login,SLOT(setEnabled(bool))); - connect(btn3,SIGNAL(toggled(bool)),m_password,SLOT(setEnabled(bool))); + connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool))); + connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool))); // layout - QVBoxLayout *main_ = new QVBoxLayout( this, 0, 0 ); + TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 ); main_->addWidget( infotext_ ); main_->addSpacing( 10 ); main_->addWidget( m_btngroup ); - QGridLayout *l1 = new QGridLayout( 0, 2, 3 ); + TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 ); main_->addLayout( l1 ); main_->addStretch( 1 ); l1->setColSpacing( 0, 35 ); @@ -82,7 +82,7 @@ KMWPassword::KMWPassword(QWidget *parent, const char *name) l1->addWidget( m_password, 1, 2 ); } -bool KMWPassword::isValid(QString& msg) +bool KMWPassword::isValid(TQString& msg) { if ( !m_btngroup->selected() ) msg = i18n( "Select one option" ); @@ -117,12 +117,12 @@ void KMWPassword::updatePrinter(KMPrinter *p) switch ( m_btngroup->selectedId() ) { case 0: - p->setOption( "kde-login", QString::null ); - p->setOption( "kde-password", QString::null ); + p->setOption( "kde-login", TQString::null ); + p->setOption( "kde-password", TQString::null ); break; case 1: - p->setOption( "kde-login", QString::fromLatin1( "guest" ) ); - p->setOption( "kde-password", QString::null ); + p->setOption( "kde-login", TQString::fromLatin1( "guest" ) ); + p->setOption( "kde-password", TQString::null ); break; case 2: p->setOption( "kde-login", m_login->text() ); diff --git a/kdeprint/management/kmwpassword.h b/kdeprint/management/kmwpassword.h index 9941376f6..50fb4f42a 100644 --- a/kdeprint/management/kmwpassword.h +++ b/kdeprint/management/kmwpassword.h @@ -28,16 +28,16 @@ class QButtonGroup; class KMWPassword : public KMWizardPage { public: - KMWPassword(QWidget *parent = 0, const char *name = 0); + KMWPassword(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void initPrinter( KMPrinter* ); void updatePrinter(KMPrinter*); private: - QLineEdit *m_login; - QLineEdit *m_password; - QButtonGroup *m_btngroup; + TQLineEdit *m_login; + TQLineEdit *m_password; + TQButtonGroup *m_btngroup; }; #endif diff --git a/kdeprint/management/kmwsmb.cpp b/kdeprint/management/kmwsmb.cpp index bd1372c42..a4d82fba1 100644 --- a/kdeprint/management/kmwsmb.cpp +++ b/kdeprint/management/kmwsmb.cpp @@ -25,11 +25,11 @@ #include #include -#include -#include -#include +#include +#include +#include -KMWSmb::KMWSmb(QWidget *parent, const char *name) +KMWSmb::KMWSmb(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_title = i18n("SMB Printer Settings"); @@ -37,20 +37,20 @@ KMWSmb::KMWSmb(QWidget *parent, const char *name) m_nextpage = KMWizard::Driver; m_view = new SmbView(this,"SmbView"); - m_loginlabel = new QLabel( this ); + m_loginlabel = new TQLabel( this ); QPushButton *m_scan = new KPushButton(KGuiItem(i18n("Scan"), "viewmag"), this); QPushButton *m_abort = new KPushButton(KGuiItem(i18n("Abort"), "stop"), this); m_abort->setEnabled(false); - QLabel *m_worklabel = new QLabel(i18n("Workgroup:"), this); - QLabel *m_serverlabel = new QLabel(i18n("Server:"), this); - QLabel *m_printerlabel = new QLabel(i18n("Printer:"), this); - m_work = new QLineEdit(this); - m_server = new QLineEdit(this); - m_printer = new QLineEdit(this); + QLabel *m_worklabel = new TQLabel(i18n("Workgroup:"), this); + QLabel *m_serverlabel = new TQLabel(i18n("Server:"), this); + QLabel *m_printerlabel = new TQLabel(i18n("Printer:"), this); + m_work = new TQLineEdit(this); + m_server = new TQLineEdit(this); + m_printer = new TQLineEdit(this); - QVBoxLayout *lay0 = new QVBoxLayout(this, 0, 10); - QGridLayout *lay1 = new QGridLayout(0, 3, 2, 0, 10); - QHBoxLayout *lay3 = new QHBoxLayout(0, 0, 10); + QVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); + QGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, 10); + QHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); lay0->addLayout(lay1,0); lay0->addWidget(m_view,1); lay0->addLayout(lay3,0); @@ -67,13 +67,13 @@ KMWSmb::KMWSmb(QWidget *parent, const char *name) lay3->addWidget(m_scan); lay3->addWidget(m_abort); - connect(m_scan,SIGNAL(clicked()),SLOT(slotScan())); - connect(m_abort,SIGNAL(clicked()),SLOT(slotAbort())); - connect(m_view,SIGNAL(printerSelected(const QString&,const QString&,const QString&)),SLOT(slotPrinterSelected(const QString&,const QString&,const QString&))); - connect(m_view,SIGNAL(running(bool)),m_abort,SLOT(setEnabled(bool))); + 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))); } -bool KMWSmb::isValid(QString& msg) +bool KMWSmb::isValid(TQString& msg) { if (m_server->text().isEmpty()) msg = i18n("Empty server name."); @@ -86,7 +86,7 @@ bool KMWSmb::isValid(QString& msg) void KMWSmb::updatePrinter(KMPrinter *printer) { - QString uri = buildSmbURI( m_work->text(), m_server->text(), m_printer->text(), printer->option( "kde-login" ), printer->option( "kde-password" ) ); + TQString uri = buildSmbURI( m_work->text(), m_server->text(), m_printer->text(), printer->option( "kde-login" ), printer->option( "kde-password" ) ); printer->setDevice( uri ); } @@ -94,7 +94,7 @@ void KMWSmb::initPrinter(KMPrinter *printer) { if (printer) { - QString login = printer->option( "kde-login" ); + TQString login = printer->option( "kde-login" ); m_view->setLoginInfos(login,printer->option("kde-password")); m_loginlabel->setText( i18n( "Login: %1" ).arg( login.isEmpty() ? i18n( "" ) : login ) ); } @@ -110,7 +110,7 @@ void KMWSmb::slotAbort() m_view->abort(); } -void KMWSmb::slotPrinterSelected(const QString& work, const QString& server, const QString& printer) +void KMWSmb::slotPrinterSelected(const TQString& work, const TQString& server, const TQString& printer) { m_work->setText(work); m_server->setText(server); diff --git a/kdeprint/management/kmwsmb.h b/kdeprint/management/kmwsmb.h index e76668f74..8c0768287 100644 --- a/kdeprint/management/kmwsmb.h +++ b/kdeprint/management/kmwsmb.h @@ -30,21 +30,21 @@ class KMWSmb : public KMWizardPage { Q_OBJECT public: - KMWSmb(QWidget *parent = 0, const char *name = 0); + KMWSmb(TQWidget *parent = 0, const char *name = 0); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); void initPrinter(KMPrinter*); protected slots: void slotScan(); void slotAbort(); - void slotPrinterSelected(const QString& work, const QString& server, const QString& printer); + void slotPrinterSelected(const TQString& work, const TQString& server, const TQString& printer); protected: SmbView *m_view; QLineEdit *m_work, *m_server, *m_printer; - QLabel *m_loginlabel; + TQLabel *m_loginlabel; }; #endif diff --git a/kdeprint/management/kmwsocket.cpp b/kdeprint/management/kmwsocket.cpp index aa7ebb340..749ab8ea7 100644 --- a/kdeprint/management/kmwsocket.cpp +++ b/kdeprint/management/kmwsocket.cpp @@ -23,16 +23,16 @@ #include "kmprinter.h" #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include -KMWSocket::KMWSocket(QWidget *parent, const char *name) +KMWSocket::KMWSocket(TQWidget *parent, const char *name) : KMWizardPage(parent,name) { m_title = i18n("Network Printer Information"); @@ -42,15 +42,15 @@ KMWSocket::KMWSocket(QWidget *parent, const char *name) m_list = new KListView(this); m_list->addColumn(""); m_list->header()->hide(); - m_list->setFrameStyle(QFrame::WinPanel|QFrame::Sunken); + m_list->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_list->setLineWidth(1); - QLabel *l1 = new QLabel(i18n("&Printer address:"),this); - QLabel *l2 = new QLabel(i18n("P&ort:"),this); + QLabel *l1 = new TQLabel(i18n("&Printer address:"),this); + QLabel *l2 = new TQLabel(i18n("P&ort:"),this); - m_printer = new QLineEdit(this); - m_port = new QLineEdit(this); - m_port->setText(QString("9100")); + m_printer = new TQLineEdit(this); + m_port = new TQLineEdit(this); + m_port->setText(TQString("9100")); l1->setBuddy(m_printer); l2->setBuddy(m_port); @@ -60,15 +60,15 @@ KMWSocket::KMWSocket(QWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(40); - connect(m_list,SIGNAL(selectionChanged(QListViewItem*)),SLOT(slotPrinterSelected(QListViewItem*))); - connect( m_scanner, SIGNAL( scanStarted() ), SLOT( slotScanStarted() ) ); - connect( m_scanner, SIGNAL( scanFinished() ), SLOT( slotScanFinished() ) ); - connect( m_scanner, SIGNAL( scanStarted() ), parent, SLOT( disableWizard() ) ); - connect( m_scanner, SIGNAL( scanFinished() ), parent, SLOT( enableWizard() ) ); + 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() ) ); // layout - QHBoxLayout *lay3 = new QHBoxLayout(this, 0, 10); - QVBoxLayout *lay2 = new QVBoxLayout(0, 0, 0); + QHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); + QVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 0); lay3->addWidget(m_list,1); lay3->addLayout(lay2,1); @@ -88,11 +88,11 @@ KMWSocket::~KMWSocket() void KMWSocket::updatePrinter(KMPrinter *p) { - QString dev = QString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); + QString dev = TQString::fromLatin1("socket://%1:%2").arg(m_printer->text()).arg(m_port->text()); p->setDevice(dev); } -bool KMWSocket::isValid(QString& msg) +bool KMWSocket::isValid(TQString& msg) { if (m_printer->text().isEmpty()) { @@ -127,8 +127,8 @@ void KMWSocket::slotScanStarted() void KMWSocket::slotScanFinished() { - const QPtrList *list = m_scanner->printerList(); - QPtrListIterator it(*list); + const TQPtrList *list = m_scanner->printerList(); + TQPtrListIterator it(*list); for (;it.current();++it) { QString name; @@ -136,12 +136,12 @@ void KMWSocket::slotScanFinished() name = i18n("Unknown host - 1 is the IP", " (%1)").arg(it.current()->IP); else name = it.current()->Name; - QListViewItem *item = new QListViewItem(m_list,name,it.current()->IP,QString::number(it.current()->Port)); + QListViewItem *item = new TQListViewItem(m_list,name,it.current()->IP,TQString::number(it.current()->Port)); item->setPixmap(0,SmallIcon("kdeprint_printer")); } } -void KMWSocket::slotPrinterSelected(QListViewItem *item) +void KMWSocket::slotPrinterSelected(TQListViewItem *item) { if (!item) return; m_printer->setText(item->text(1)); diff --git a/kdeprint/management/kmwsocket.h b/kdeprint/management/kmwsocket.h index f7aeb7157..ca0b506df 100644 --- a/kdeprint/management/kmwsocket.h +++ b/kdeprint/management/kmwsocket.h @@ -31,14 +31,14 @@ class KMWSocket : public KMWizardPage { Q_OBJECT public: - KMWSocket(QWidget *parent = 0, const char *name = 0); + KMWSocket(TQWidget *parent = 0, const char *name = 0); ~KMWSocket(); - bool isValid(QString&); + bool isValid(TQString&); void updatePrinter(KMPrinter*); protected slots: - void slotPrinterSelected(QListViewItem*); + void slotPrinterSelected(TQListViewItem*); void slotScanStarted(); void slotScanFinished(); diff --git a/kdeprint/management/kmwsocketutil.cpp b/kdeprint/management/kmwsocketutil.cpp index f0a6b3bba..d3f838ce7 100644 --- a/kdeprint/management/kmwsocketutil.cpp +++ b/kdeprint/management/kmwsocketutil.cpp @@ -22,14 +22,14 @@ #include "kmwsocketutil.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include @@ -39,30 +39,30 @@ #include -QString localRootIP(); +TQString localRootIP(); //---------------------------------------------------------------------------------------- -SocketConfig::SocketConfig(KMWSocketUtil *util, QWidget *parent, const char *name) -: KDialogBase(parent, name, true, QString::null, Ok|Cancel, Ok, true) +SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *name) +: KDialogBase(parent, name, true, TQString::null, Ok|Cancel, Ok, true) { - QWidget *dummy = new QWidget(this); + QWidget *dummy = new TQWidget(this); setMainWidget(dummy); KIntValidator *val = new KIntValidator( this ); - QLabel *masklabel = new QLabel(i18n("&Subnetwork:"),dummy); - QLabel *portlabel = new QLabel(i18n("&Port:"),dummy); - QLabel *toutlabel = new QLabel(i18n("&Timeout (ms):"),dummy); - QLineEdit *mm = new QLineEdit(dummy); - mm->setText(QString::fromLatin1(".[0-255]")); + QLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy); + QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); + QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); + QLineEdit *mm = new TQLineEdit(dummy); + mm->setText(TQString::fromLatin1(".[0-255]")); mm->setReadOnly(true); mm->setFixedWidth(fontMetrics().width(mm->text())+10); - mask_ = new QLineEdit(dummy); + mask_ = new TQLineEdit(dummy); mask_->setAlignment(Qt::AlignRight); - port_ = new QComboBox(true,dummy); + port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); - tout_ = new QLineEdit(dummy); + tout_ = new TQLineEdit(dummy); tout_->setValidator( val ); masklabel->setBuddy(mask_); @@ -74,11 +74,11 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, QWidget *parent, const char *nam port_->insertItem("9100"); port_->insertItem("9101"); port_->insertItem("9102"); - port_->setEditText(QString::number(util->port_)); - tout_->setText(QString::number(util->timeout_)); + port_->setEditText(TQString::number(util->port_)); + tout_->setText(TQString::number(util->timeout_)); - QGridLayout *main_ = new QGridLayout(dummy, 3, 2, 0, 10); - QHBoxLayout *lay1 = new QHBoxLayout(0, 0, 5); + QGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10); + QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5); main_->addWidget(masklabel, 0, 0); main_->addWidget(portlabel, 1, 0); main_->addWidget(toutlabel, 2, 0); @@ -138,7 +138,7 @@ KMWSocketUtil::KMWSocketUtil() timeout_ = 50; } -bool KMWSocketUtil::checkPrinter(const QString& IPstr, int port, QString* hostname) +bool KMWSocketUtil::checkPrinter(const TQString& IPstr, int port, TQString* hostname) { KExtendedSocket sock(IPstr, port, KExtendedSocket::inetSocket|KExtendedSocket::streamSocket); bool result(false); @@ -156,7 +156,7 @@ bool KMWSocketUtil::checkPrinter(const QString& IPstr, int port, QString* hostna return result; } -bool KMWSocketUtil::scanNetwork(QProgressBar *bar) +bool KMWSocketUtil::scanNetwork(TQProgressBar *bar) { printerlist_.setAutoDelete(true); printerlist_.clear(); @@ -165,7 +165,7 @@ bool KMWSocketUtil::scanNetwork(QProgressBar *bar) bar->setTotalSteps(n); for (int i=0; iexec()) @@ -198,13 +198,13 @@ void KMWSocketUtil::configureScan(QWidget *parent) //---------------------------------------------------------------------------------------- -QString localRootIP() +TQString localRootIP() { char buf[256]; buf[0] = '\0'; if (!gethostname(buf, sizeof(buf))) buf[sizeof(buf)-1] = '\0'; - QPtrList infos = KExtendedSocket::lookup(buf, QString::null); + TQPtrList infos = KExtendedSocket::lookup(buf, TQString::null); infos.setAutoDelete(true); if (infos.count() > 0) { @@ -213,7 +213,7 @@ QString localRootIP() IPstr.truncate(p); return IPstr; } - return QString::null; + return TQString::null; } #include "kmwsocketutil.moc" diff --git a/kdeprint/management/kmwsocketutil.h b/kdeprint/management/kmwsocketutil.h index fa1942ef5..0fd96cc59 100644 --- a/kdeprint/management/kmwsocketutil.h +++ b/kdeprint/management/kmwsocketutil.h @@ -20,8 +20,8 @@ #ifndef KMWSOCKETUTIL_H #define KMWSOCKETUTIL_H -#include -#include +#include +#include #include struct SocketInfo @@ -41,7 +41,7 @@ class SocketConfig : public KDialogBase friend class KMWSocketUtil; Q_OBJECT public: - SocketConfig(KMWSocketUtil *util, QWidget *parent = 0, const char *name = 0); + SocketConfig(KMWSocketUtil *util, TQWidget *parent = 0, const char *name = 0); ~SocketConfig(); protected slots: @@ -59,15 +59,15 @@ class KMWSocketUtil public: KMWSocketUtil(); - bool checkPrinter(const QString& host, int port, QString* hostname = 0); + bool checkPrinter(const TQString& host, int port, TQString* hostname = 0); - const QPtrList* printerList() { return &printerlist_; } - bool scanNetwork(QProgressBar *bar = 0); - void configureScan(QWidget *parent = 0); + const TQPtrList* printerList() { return &printerlist_; } + bool scanNetwork(TQProgressBar *bar = 0); + void configureScan(TQWidget *parent = 0); void setDefaultPort(int p) { port_ = p; } private: - QPtrList printerlist_; + TQPtrList printerlist_; QString root_; int port_; int timeout_; // in milliseconds diff --git a/kdeprint/management/kxmlcommanddlg.cpp b/kdeprint/management/kxmlcommanddlg.cpp index b9610ad13..24e6f4adf 100644 --- a/kdeprint/management/kxmlcommanddlg.cpp +++ b/kdeprint/management/kxmlcommanddlg.cpp @@ -21,21 +21,21 @@ #include "driver.h" #include "kxmlcommand.h" -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include #include @@ -49,14 +49,14 @@ #include #include -QString generateId(const QMap& map) +TQString generateId(const TQMap& map) { int index(-1); - while (map.contains(QString::fromLatin1("item%1").arg(++index))) ; - return QString::fromLatin1("item%1").arg(index); + while (map.contains(TQString::fromLatin1("item%1").arg(++index))) ; + return TQString::fromLatin1("item%1").arg(index); } -QListViewItem* findPrev(QListViewItem *item) +TQListViewItem* findPrev(TQListViewItem *item) { QListViewItem *prev = item->itemAbove(); while (prev && prev->depth() > item->depth()) @@ -67,7 +67,7 @@ QListViewItem* findPrev(QListViewItem *item) return 0; } -QListViewItem* findNext(QListViewItem *item) +TQListViewItem* findNext(TQListViewItem *item) { QListViewItem *next = item->itemBelow(); while (next && next->depth() > item->depth()) @@ -78,63 +78,63 @@ QListViewItem* findNext(QListViewItem *item) return 0; } -KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(QWidget *parent, const char *name) -: QWidget(parent, name) +KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *name) +: TQWidget(parent, name) { m_xmlcmd = 0; - m_command = new QLineEdit(this); + m_command = new TQLineEdit(this); m_view = new KListView(this); m_view->addColumn(""); m_view->header()->hide(); m_view->setSorting(-1); - m_apply = new QToolButton(this); - m_apply->setIconSet( QApplication::reverseLayout()? SmallIconSet( "forward" ) : SmallIconSet("back")); - m_addgrp = new QToolButton(this); + m_apply = new TQToolButton(this); + m_apply->setIconSet( TQApplication::reverseLayout()? SmallIconSet( "forward" ) : SmallIconSet("back")); + m_addgrp = new TQToolButton(this); m_addgrp->setIconSet(SmallIconSet("folder")); - m_addopt = new QToolButton(this); + m_addopt = new TQToolButton(this); m_addopt->setIconSet(SmallIconSet("document")); - m_delopt = new QToolButton(this); + m_delopt = new TQToolButton(this); m_delopt->setIconSet(SmallIconSet("editdelete")); - m_up = new QToolButton(this); + m_up = new TQToolButton(this); m_up->setIconSet(SmallIconSet("up")); - m_down = new QToolButton(this); + m_down = new TQToolButton(this); m_down->setIconSet(SmallIconSet("down")); - m_dummy = new QWidget(this); - m_desc = new QLineEdit(m_dummy); - m_name = new QLineEdit(m_dummy); - m_type = new QComboBox(m_dummy); + m_dummy = new TQWidget(this); + m_desc = new TQLineEdit(m_dummy); + m_name = new TQLineEdit(m_dummy); + m_type = new TQComboBox(m_dummy); m_type->insertItem(i18n("String")); m_type->insertItem(i18n("Integer")); m_type->insertItem(i18n("Float")); m_type->insertItem(i18n("List")); m_type->insertItem(i18n("Boolean")); - m_format = new QLineEdit(m_dummy); - m_default = new QLineEdit(m_dummy); - QLabel *m_namelab = new QLabel(i18n("&Name:"), m_dummy); - QLabel *m_desclab = new QLabel(i18n("&Description:"), m_dummy); - QLabel *m_formatlab = new QLabel(i18n("&Format:"), m_dummy); - QLabel *m_typelab = new QLabel(i18n("&Type:"), m_dummy); - QLabel *m_defaultlab = new QLabel(i18n("Default &value:"), m_dummy); - QLabel *m_commandlab = new QLabel(i18n("Co&mmand:"), this); + m_format = new TQLineEdit(m_dummy); + m_default = new TQLineEdit(m_dummy); + QLabel *m_namelab = new TQLabel(i18n("&Name:"), m_dummy); + QLabel *m_desclab = new TQLabel(i18n("&Description:"), m_dummy); + QLabel *m_formatlab = new TQLabel(i18n("&Format:"), m_dummy); + QLabel *m_typelab = new TQLabel(i18n("&Type:"), m_dummy); + QLabel *m_defaultlab = new TQLabel(i18n("Default &value:"), m_dummy); + QLabel *m_commandlab = new TQLabel(i18n("Co&mmand:"), this); m_namelab->setBuddy(m_name); m_desclab->setBuddy(m_desc); m_formatlab->setBuddy(m_format); m_typelab->setBuddy(m_type); m_defaultlab->setBuddy(m_default); m_commandlab->setBuddy(m_command); - m_persistent = new QCheckBox( i18n( "&Persistent option" ), m_dummy ); + m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy ); - QGroupBox *gb = new QGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy); - m_stack = new QWidgetStack(gb); - QWidget *w1 = new QWidget(m_stack), *w2 = new QWidget(m_stack), *w3 = new QWidget(m_stack); + QGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy); + m_stack = new TQWidgetStack(gb); + QWidget *w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack); m_stack->addWidget(w1, 1); m_stack->addWidget(w2, 2); m_stack->addWidget(w3, 3); - m_edit1 = new QLineEdit(w1); - m_edit2 = new QLineEdit(w1); - QLabel *m_editlab1 = new QLabel(i18n("Minimum v&alue:"), w1); - QLabel *m_editlab2 = new QLabel(i18n("Ma&ximum value:"), w1); + m_edit1 = new TQLineEdit(w1); + m_edit2 = new TQLineEdit(w1); + QLabel *m_editlab1 = new TQLabel(i18n("Minimum v&alue:"), w1); + QLabel *m_editlab2 = new TQLabel(i18n("Ma&ximum value:"), w1); m_editlab1->setBuddy(m_edit1); m_editlab2->setBuddy(m_edit2); m_values = new KListView(w2); @@ -143,46 +143,46 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(QWidget *parent, const char *name m_values->setAllColumnsShowFocus(true); m_values->setSorting(-1); m_values->setMaximumHeight(110); - m_addval = new QToolButton(w2); + m_addval = new TQToolButton(w2); m_addval->setIconSet(SmallIconSet("editcopy")); - m_delval = new QToolButton(w2); + m_delval = new TQToolButton(w2); m_delval->setIconSet(SmallIconSet("editdelete")); - QToolTip::add(m_addval, i18n("Add value")); - QToolTip::add(m_delval, i18n("Delete value")); + TQToolTip::add(m_addval, i18n("Add value")); + TQToolTip::add(m_delval, i18n("Delete value")); - QToolTip::add(m_apply, i18n("Apply changes")); - QToolTip::add(m_addgrp, i18n("Add group")); - QToolTip::add(m_addopt, i18n("Add option")); - QToolTip::add(m_delopt, i18n("Delete item")); - QToolTip::add(m_up, i18n("Move up")); - QToolTip::add(m_down, i18n("Move down")); + TQToolTip::add(m_apply, i18n("Apply changes")); + TQToolTip::add(m_addgrp, i18n("Add group")); + TQToolTip::add(m_addopt, i18n("Add option")); + TQToolTip::add(m_delopt, i18n("Delete item")); + TQToolTip::add(m_up, i18n("Move up")); + TQToolTip::add(m_down, i18n("Move down")); KSeparator *sep1 = new KSeparator(KSeparator::HLine, m_dummy); - QGroupBox *gb_input = new QGroupBox(0, Qt::Horizontal, i18n("&Input From"), this); - QGroupBox *gb_output = new QGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this); - QLabel *m_inputfilelab = new QLabel(i18n("File:"), gb_input); - QLabel *m_inputpipelab = new QLabel(i18n("Pipe:"), gb_input); - QLabel *m_outputfilelab = new QLabel(i18n("File:"), gb_output); - QLabel *m_outputpipelab = new QLabel(i18n("Pipe:"), gb_output); - m_inputfile = new QLineEdit(gb_input); - m_inputpipe = new QLineEdit(gb_input); - m_outputfile = new QLineEdit(gb_output); - m_outputpipe = new QLineEdit(gb_output); + QGroupBox *gb_input = new TQGroupBox(0, Qt::Horizontal, i18n("&Input From"), this); + QGroupBox *gb_output = new TQGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this); + QLabel *m_inputfilelab = new TQLabel(i18n("File:"), gb_input); + QLabel *m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input); + QLabel *m_outputfilelab = new TQLabel(i18n("File:"), gb_output); + QLabel *m_outputpipelab = new TQLabel(i18n("Pipe:"), gb_output); + m_inputfile = new TQLineEdit(gb_input); + m_inputpipe = new TQLineEdit(gb_input); + m_outputfile = new TQLineEdit(gb_output); + m_outputpipe = new TQLineEdit(gb_output); m_comment = new KTextEdit( this ); m_comment->setTextFormat(Qt::RichText ); m_comment->setReadOnly(true); - QLabel *m_commentlab = new QLabel( i18n( "Comment:" ), this ); + TQLabel *m_commentlab = new TQLabel( i18n( "Comment:" ), this ); - QVBoxLayout *l2 = new QVBoxLayout(this, 0, KDialog::spacingHint()); - QHBoxLayout *l3 = new QHBoxLayout(0, 0, KDialog::spacingHint()); - QVBoxLayout *l7 = new QVBoxLayout(0, 0, 0); + QVBoxLayout *l2 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + QHBoxLayout *l3 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); + QVBoxLayout *l7 = new TQVBoxLayout(0, 0, 0); l2->addLayout(l3, 0); l3->addWidget(m_commandlab); l3->addWidget(m_command); - QHBoxLayout *l0 = new QHBoxLayout(0, 0, KDialog::spacingHint()); - QGridLayout *l10 = new QGridLayout(0, 2, 2, 0, KDialog::spacingHint()); + QHBoxLayout *l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); + QGridLayout *l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); l2->addLayout(l0, 1); l0->addLayout(l10); l10->addMultiCellWidget(m_view, 0, 0, 0, 1); @@ -200,7 +200,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(QWidget *parent, const char *name l7->addWidget(m_down); l7->addStretch(1); l0->addWidget(m_dummy, 1); - QGridLayout *l1 = new QGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint()); + QGridLayout *l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint()); l1->addWidget(m_desclab, 0, 0, Qt::AlignRight|Qt::AlignVCenter); l1->addWidget(m_desc, 0, 1); l1->addMultiCellWidget(sep1, 1, 1, 0, 1); @@ -216,23 +216,23 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(QWidget *parent, const char *name l1->addMultiCellWidget(gb, 7, 7, 0, 1); l1->setRowStretch(8, 1); - QHBoxLayout *l4 = new QHBoxLayout(w2, 0, KDialog::spacingHint()); + QHBoxLayout *l4 = new TQHBoxLayout(w2, 0, KDialog::spacingHint()); l4->addWidget(m_values); - QVBoxLayout *l6 = new QVBoxLayout(0, 0, 0); + QVBoxLayout *l6 = new TQVBoxLayout(0, 0, 0); l4->addLayout(l6); l6->addWidget(m_addval); l6->addWidget(m_delval); l6->addStretch(1); - QGridLayout *l5 = new QGridLayout(w1, 3, 2, 0, KDialog::spacingHint()); + QGridLayout *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_edit1, 0, 1); l5->addWidget(m_edit2, 1, 1); - QGridLayout *l8 = new QGridLayout(gb_input->layout(), 2, 2, + QGridLayout *l8 = new TQGridLayout(gb_input->layout(), 2, 2, KDialog::spacingHint()); - QGridLayout *l9 = new QGridLayout(gb_output->layout(), 2, 2, + QGridLayout *l9 = new TQGridLayout(gb_output->layout(), 2, 2, KDialog::spacingHint()); l8->addWidget(m_inputfilelab, 0, 0); l8->addWidget(m_inputpipelab, 1, 0); @@ -243,73 +243,73 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(QWidget *parent, const char *name l9->addWidget(m_outputfile, 0, 1); l9->addWidget(m_outputpipe, 1, 1); - QVBoxLayout *l11 = new QVBoxLayout(gb->layout()); + QVBoxLayout *l11 = new TQVBoxLayout(gb->layout()); l11->addWidget(m_stack); - QVBoxLayout *l12 = new QVBoxLayout( 0, 0, 0 ); + TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); l2->addSpacing( 10 ); l2->addLayout( l12 ); l12->addWidget( m_commentlab ); l12->addWidget( m_comment ); - connect(m_view, SIGNAL(selectionChanged(QListViewItem*)), SLOT(slotSelectionChanged(QListViewItem*))); - connect(m_values, SIGNAL(selectionChanged(QListViewItem*)), SLOT(slotValueSelected(QListViewItem*))); - connect(m_type, SIGNAL(activated(int)), SLOT(slotTypeChanged(int))); - connect(m_addval, SIGNAL(clicked()), SLOT(slotAddValue())); - connect(m_delval, SIGNAL(clicked()), SLOT(slotRemoveValue())); - connect(m_apply, SIGNAL(clicked()), SLOT(slotApplyChanges())); - connect(m_addgrp, SIGNAL(clicked()), SLOT(slotAddGroup())); - connect(m_addopt, SIGNAL(clicked()), SLOT(slotAddOption())); - connect(m_delopt, SIGNAL(clicked()), SLOT(slotRemoveItem())); - connect(m_up, SIGNAL(clicked()), SLOT(slotMoveUp())); - connect(m_down, SIGNAL(clicked()), SLOT(slotMoveDown())); - connect(m_command, SIGNAL(textChanged(const QString&)), SLOT(slotCommandChanged(const QString&))); - connect(m_view, SIGNAL(itemRenamed(QListViewItem*,int)), SLOT(slotOptionRenamed(QListViewItem*,int))); - connect(m_desc, SIGNAL(textChanged(const QString&)), SLOT(slotChanged())); - connect(m_name, SIGNAL(textChanged(const QString&)), SLOT(slotChanged())); - connect(m_format, SIGNAL(textChanged(const QString&)), SLOT(slotChanged())); - connect(m_default, SIGNAL(textChanged(const QString&)), SLOT(slotChanged())); - connect(m_edit1, SIGNAL(textChanged(const QString&)), SLOT(slotChanged())); - connect(m_edit2, SIGNAL(textChanged(const QString&)), SLOT(slotChanged())); - connect(m_type, SIGNAL(activated(int)), SLOT(slotChanged())); - connect(m_addval, SIGNAL(clicked()), SLOT(slotChanged())); - connect(m_delval, SIGNAL(clicked()), SLOT(slotChanged())); - connect( m_persistent, SIGNAL( toggled(bool) ), SLOT( slotChanged() ) ); + 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() ) ); m_dummy->setEnabled(false); viewItem(0); /** * Add some short help for the normal (non expert) user */ - QWhatsThis::add( m_name, i18n( + TQWhatsThis::add( m_name, i18n( "An identification string. Use only alphanumeric characters except spaces. " "The string __root__ is reserved for internal use." ) ); - QWhatsThis::add( m_namelab, QWhatsThis::textFor( m_name ) ); - QWhatsThis::add( m_desc, i18n( + TQWhatsThis::add( m_namelab, TQWhatsThis::textFor( m_name ) ); + TQWhatsThis::add( m_desc, i18n( "A description string. This string is shown in the interface, and should " "be explicit enough about the role of the corresponding option." ) ); - QWhatsThis::add( m_desclab, QWhatsThis::textFor( m_desc ) ); - QWhatsThis::add( m_type, i18n( + TQWhatsThis::add( m_desclab, TQWhatsThis::textFor( m_desc ) ); + TQWhatsThis::add( m_type, i18n( "The type of the option. This determines how the option is presented " "graphically to the user." ) ); - QWhatsThis::add( m_typelab, QWhatsThis::textFor( m_type ) ); - QWhatsThis::add( m_format, i18n( + TQWhatsThis::add( m_typelab, TQWhatsThis::textFor( m_type ) ); + TQWhatsThis::add( m_format, i18n( "The format of the option. This determines how the option is formatted " "for inclusion in the global command line. The tag %value can be used " "to represent the user selection. This tag will be replaced at run-time by a " "string representation of the option value." ) ); - QWhatsThis::add( m_formatlab, QWhatsThis::textFor( m_format ) ); - QWhatsThis::add( m_default, i18n( + TQWhatsThis::add( m_formatlab, TQWhatsThis::textFor( m_format ) ); + TQWhatsThis::add( m_default, i18n( "The default value of the option. For non persistent options, nothing is " "added to the command line if the option has that default value. If this " "value does not correspond to the actual default value of the underlying " "utility, make the option persistent to avoid unwanted effects." ) ); - QWhatsThis::add( m_defaultlab, QWhatsThis::textFor( m_default ) ); - QWhatsThis::add( m_persistent, i18n( + TQWhatsThis::add( m_defaultlab, TQWhatsThis::textFor( m_default ) ); + TQWhatsThis::add( m_persistent, i18n( "Make the option persistent. A persistent option is always written to the " "command line, whatever its value. This is useful when the chosen default " "value does not match with the actual default value of the underlying utility." ) ); - QWhatsThis::add( m_command, i18n( + TQWhatsThis::add( m_command, i18n( "The full command line to execute the associated underlying utility. This " "command line is based on a mechanism of tags that are replaced at run-time. " "The supported tags are:
                    " @@ -318,28 +318,28 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(QWidget *parent, const char *name "
                  • %filteroutput: output specification
                    • " "
                  • %psu: the page size in upper case
                    • " "
                  • %psl: the page size in lower case
                  " ) ); - QWhatsThis::add( m_commandlab, QWhatsThis::textFor( m_command ) ); - QWhatsThis::add( m_inputfile, i18n( + TQWhatsThis::add( m_commandlab, TQWhatsThis::textFor( m_command ) ); + TQWhatsThis::add( m_inputfile, i18n( "Input specification when the underlying utility reads input data from a file. Use " "the tag %in to represent the input filename." ) ); - QWhatsThis::add( m_inputfilelab, QWhatsThis::textFor( m_inputfile ) ); - QWhatsThis::add( m_outputfile, i18n( + TQWhatsThis::add( m_inputfilelab, TQWhatsThis::textFor( m_inputfile ) ); + TQWhatsThis::add( m_outputfile, i18n( "Output specification when the underlying utility writes output data to a file. Use " "the tag %out to represent the output filename." ) ); - QWhatsThis::add( m_outputfilelab, QWhatsThis::textFor( m_outputfile ) ); - QWhatsThis::add( m_inputpipe, i18n( + TQWhatsThis::add( m_outputfilelab, TQWhatsThis::textFor( m_outputfile ) ); + TQWhatsThis::add( m_inputpipe, i18n( "Input specification when the underlying utility reads input data from its " "standard input." ) ); - QWhatsThis::add( m_inputpipelab, QWhatsThis::textFor( m_inputpipe ) ); - QWhatsThis::add( m_outputpipe, i18n( + TQWhatsThis::add( m_inputpipelab, TQWhatsThis::textFor( m_inputpipe ) ); + TQWhatsThis::add( m_outputpipe, i18n( "Output specification when the underlying utility writes output data to its " "standard output." ) ); - QWhatsThis::add( m_outputpipelab, QWhatsThis::textFor( m_outputpipe ) ); - QWhatsThis::add( m_comment, i18n( + TQWhatsThis::add( m_outputpipelab, TQWhatsThis::textFor( m_outputpipe ) ); + TQWhatsThis::add( m_comment, i18n( "A comment about the underlying utility, which can be viewed by the user " "from the interface. This comment string supports basic HTML tags like " "<a>, <b> or <i>." ) ); - QWhatsThis::add( m_commentlab, QWhatsThis::textFor( m_comment ) ); + TQWhatsThis::add( m_commentlab, TQWhatsThis::textFor( m_comment ) ); resize(660, 200); } @@ -349,7 +349,7 @@ KXmlCommandAdvancedDlg::~KXmlCommandAdvancedDlg() if (m_opts.count() > 0) { kdDebug() << "KXmlCommandAdvancedDlg: " << m_opts.count() << " items remaining" << endl; - for (QMap::ConstIterator it=m_opts.begin(); it!=m_opts.end(); ++it) + for (TQMap::ConstIterator it=m_opts.begin(); it!=m_opts.end(); ++it) { //kdDebug() << "Item: name=" << (*it)->name() << endl; delete (*it); @@ -367,7 +367,7 @@ void KXmlCommandAdvancedDlg::setCommand(KXmlCommand *xmlcmd) void KXmlCommandAdvancedDlg::parseXmlCommand(KXmlCommand *xmlcmd) { m_view->clear(); - QListViewItem *root = new QListViewItem(m_view, xmlcmd->name(), xmlcmd->name()); + QListViewItem *root = new TQListViewItem(m_view, xmlcmd->name(), xmlcmd->name()); DrMain *driver = xmlcmd->driver(); root->setPixmap(0, SmallIcon("fileprint")); @@ -393,11 +393,11 @@ void KXmlCommandAdvancedDlg::parseXmlCommand(KXmlCommand *xmlcmd) viewItem(0); } -void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, QListViewItem *parent) +void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent) { QListViewItem *item(0); - QPtrListIterator git(grp->groups()); + TQPtrListIterator git(grp->groups()); for (; git.current(); ++git) { QString namestr = git.current()->name(); @@ -406,7 +406,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, QListViewItem *parent) namestr = "group_"+kapp->randomString(4); } git.current()->setName(namestr); - item = new QListViewItem(parent, item, git.current()->get("text"), git.current()->name()); + item = new TQListViewItem(parent, item, git.current()->get("text"), git.current()->name()); item->setPixmap(0, SmallIcon("folder")); item->setOpen(true); item->setRenameEnabled(0, true); @@ -414,7 +414,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, QListViewItem *parent) m_opts[namestr] = git.current(); } - QPtrListIterator oit(grp->options()); + TQPtrListIterator oit(grp->options()); for (; oit.current(); ++oit) { QString namestr = oit.current()->name().mid(m_xmlcmd->name().length()+6); @@ -423,21 +423,21 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, QListViewItem *parent) namestr = "option_"+kapp->randomString(4); } oit.current()->setName(namestr); - item = new QListViewItem(parent, item, oit.current()->get("text"), namestr); + item = new TQListViewItem(parent, item, oit.current()->get("text"), namestr); item->setPixmap(0, SmallIcon("document")); item->setRenameEnabled(0, true); m_opts[namestr] = oit.current(); } } -void KXmlCommandAdvancedDlg::slotSelectionChanged(QListViewItem *item) +void KXmlCommandAdvancedDlg::slotSelectionChanged(TQListViewItem *item) { if (item && item->depth() == 0) item = 0; viewItem(item); } -void KXmlCommandAdvancedDlg::viewItem(QListViewItem *item) +void KXmlCommandAdvancedDlg::viewItem(TQListViewItem *item) { m_dummy->setEnabled((item != 0)); m_name->setText(""); @@ -480,11 +480,11 @@ void KXmlCommandAdvancedDlg::viewItem(QListViewItem *item) case DrBase::Boolean: case DrBase::List: { - QPtrListIterator it(*(static_cast(opt)->choices())); + TQPtrListIterator it(*(static_cast(opt)->choices())); QListViewItem *item(0); for (; it.current(); ++it) { - item = new QListViewItem(m_values, item, it.current()->name(), it.current()->get("text")); + item = new TQListViewItem(m_values, item, it.current()->name(), it.current()->get("text")); item->setRenameEnabled(0, true); item->setRenameEnabled(1, true); } @@ -542,7 +542,7 @@ void KXmlCommandAdvancedDlg::slotTypeChanged(int ID) void KXmlCommandAdvancedDlg::slotAddValue() { - QListViewItem *item = new QListViewItem(m_values, m_values->lastItem(), i18n("Name"), i18n("Description")); + QListViewItem *item = new TQListViewItem(m_values, m_values->lastItem(), i18n("Name"), i18n("Description")); item->setRenameEnabled(0, true); item->setRenameEnabled(1, true); m_values->ensureItemVisible(item); @@ -649,7 +649,7 @@ void KXmlCommandAdvancedDlg::slotAddGroup() grp->set("text", i18n("New Group")); m_opts[ID] = grp; - QListViewItem *item = new QListViewItem(m_view->currentItem(), i18n("New Group"), ID); + QListViewItem *item = new TQListViewItem(m_view->currentItem(), i18n("New Group"), ID); item->setRenameEnabled(0, true); item->setPixmap(0, SmallIcon("folder")); m_view->ensureItemVisible(item); @@ -668,7 +668,7 @@ void KXmlCommandAdvancedDlg::slotAddOption() opt->set("text", i18n("New Option")); m_opts[ID] = opt; - QListViewItem *item = new QListViewItem(m_view->currentItem(), i18n("New Option"), ID); + QListViewItem *item = new TQListViewItem(m_view->currentItem(), i18n("New Option"), ID); item->setRenameEnabled(0, true); item->setPixmap(0, SmallIcon("document")); m_view->ensureItemVisible(item); @@ -690,7 +690,7 @@ void KXmlCommandAdvancedDlg::slotRemoveItem() } } -void KXmlCommandAdvancedDlg::removeItem(QListViewItem *item) +void KXmlCommandAdvancedDlg::removeItem(TQListViewItem *item) { delete m_opts[item->text(1)]; m_opts.remove(item->text(1)); @@ -733,7 +733,7 @@ void KXmlCommandAdvancedDlg::slotMoveDown() } } -void KXmlCommandAdvancedDlg::slotCommandChanged(const QString& cmd) +void KXmlCommandAdvancedDlg::slotCommandChanged(const TQString& cmd) { m_inputfile->parentWidget()->setEnabled(cmd.find("%filterinput") != -1); m_outputfile->parentWidget()->setEnabled(cmd.find("%filteroutput") != -1); @@ -743,13 +743,13 @@ void KXmlCommandAdvancedDlg::slotCommandChanged(const QString& cmd) m_view->setOpen(m_view->firstChild(), m_view->isEnabled()); } -void KXmlCommandAdvancedDlg::slotValueSelected(QListViewItem *item) +void KXmlCommandAdvancedDlg::slotValueSelected(TQListViewItem *item) { m_addval->setEnabled(m_type->currentItem() != 4 || m_values->childCount() < 2); m_delval->setEnabled(item != 0); } -void KXmlCommandAdvancedDlg::slotOptionRenamed(QListViewItem *item, int) +void KXmlCommandAdvancedDlg::slotOptionRenamed(TQListViewItem *item, int) { if (item && m_opts.contains(item->text(1))) { @@ -759,7 +759,7 @@ void KXmlCommandAdvancedDlg::slotOptionRenamed(QListViewItem *item, int) } } -void KXmlCommandAdvancedDlg::recreateGroup(QListViewItem *item, DrGroup *grp) +void KXmlCommandAdvancedDlg::recreateGroup(TQListViewItem *item, DrGroup *grp) { if (!item) return; @@ -787,7 +787,7 @@ void KXmlCommandAdvancedDlg::recreateGroup(QListViewItem *item, DrGroup *grp) } } -bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, QWidget *parent) +bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, TQWidget *parent) { if (!xmlcmd) return false; @@ -804,7 +804,7 @@ bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, QWidget *parent) xmlcmd->setIo(xmldlg->m_inputpipe->text(), true, true); xmlcmd->setIo(xmldlg->m_outputfile->text(), false, false); xmlcmd->setIo(xmldlg->m_outputpipe->text(), false, true); - xmlcmd->setComment( xmldlg->m_comment->text().replace( QRegExp( "\n" ), " " ) ); + xmlcmd->setComment( xmldlg->m_comment->text().replace( TQRegExp( "\n" ), " " ) ); // need to recreate the driver tree structure DrMain *driver = (xmldlg->m_opts.contains("__root__") ? static_cast(xmldlg->m_opts["__root__"]) : 0); @@ -827,35 +827,35 @@ bool KXmlCommandAdvancedDlg::editCommand(KXmlCommand *xmlcmd, QWidget *parent) //----------------------------------------------------------------------------------------------------- -KXmlCommandDlg::KXmlCommandDlg(QWidget *parent, const char *name) -: KDialogBase(parent, name, true, QString::null, Ok|Cancel|Details, Ok, true) +KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) +: KDialogBase(parent, name, true, TQString::null, Ok|Cancel|Details, Ok, true) { setButtonText(Details, i18n("&Mime Type Settings")); m_cmd = 0; - QWidget *dummy = new QWidget(this, "TopDetail"); - QWidget *topmain = new QWidget(this, "TopMain"); + QWidget *dummy = new TQWidget(this, "TopDetail"); + QWidget *topmain = new TQWidget(this, "TopMain"); - QGroupBox *m_gb1 = new QGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy); - QGroupBox *m_gb2 = new QGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain); + QGroupBox *m_gb1 = new TQGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy); + QGroupBox *m_gb2 = new TQGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain); - m_description = new QLineEdit(topmain); - m_idname = new QLabel(topmain); + m_description = new TQLineEdit(topmain); + m_idname = new TQLabel(topmain); m_requirements = new KListView(m_gb2); m_requirements->addColumn(""); m_requirements->header()->hide(); - m_addreq = new QToolButton(m_gb2); + m_addreq = new TQToolButton(m_gb2); m_addreq->setIconSet(SmallIconSet("filenew")); - m_removereq = new QToolButton(m_gb2); + m_removereq = new TQToolButton(m_gb2); m_removereq->setIconSet(SmallIconSet("editdelete")); QPushButton *m_edit = new KPushButton(KGuiItem(i18n("&Edit Command..."), "edit"), topmain); - m_mimetype = new QComboBox(dummy); + m_mimetype = new TQComboBox(dummy); m_availablemime = new KListBox(m_gb1); m_selectedmime = new KListBox(m_gb1); - m_addmime = new QToolButton(m_gb1); - m_addmime->setIconSet(QApplication::reverseLayout()? SmallIconSet("forward") : SmallIconSet("back")); - m_removemime = new QToolButton(m_gb1); - m_removemime->setIconSet(QApplication::reverseLayout()? SmallIconSet("back" ) : SmallIconSet("forward")); + m_addmime = new TQToolButton(m_gb1); + m_addmime->setIconSet(TQApplication::reverseLayout()? SmallIconSet("forward") : SmallIconSet("back")); + m_removemime = new TQToolButton(m_gb1); + m_removemime->setIconSet(TQApplication::reverseLayout()? SmallIconSet("back" ) : SmallIconSet("forward")); m_gb2->setMinimumWidth(380); m_gb1->setMinimumHeight(180); m_requirements->setMaximumHeight(80); @@ -863,64 +863,64 @@ KXmlCommandDlg::KXmlCommandDlg(QWidget *parent, const char *name) m_addmime->setEnabled(false); m_removemime->setEnabled(false); - QLabel *m_desclab = new QLabel(i18n("&Description:"), topmain); + QLabel *m_desclab = new TQLabel(i18n("&Description:"), topmain); m_desclab->setBuddy(m_description); - QLabel *m_mimetypelab = new QLabel(i18n("Output &format:"), dummy); + QLabel *m_mimetypelab = new TQLabel(i18n("Output &format:"), dummy); m_mimetypelab->setBuddy(m_mimetype); - QLabel *m_idnamelab = new QLabel(i18n("ID name:"), topmain); + QLabel *m_idnamelab = new TQLabel(i18n("ID name:"), topmain); QFont f(m_idname->font()); f.setBold(true); m_idname->setFont(f); - KSeparator *sep1 = new KSeparator(QFrame::HLine, dummy); + KSeparator *sep1 = new KSeparator(TQFrame::HLine, dummy); - QVBoxLayout *l0 = new QVBoxLayout(topmain, 0, 10); - QGridLayout *l5 = new QGridLayout(0, 2, 2, 0, 5); + QVBoxLayout *l0 = new TQVBoxLayout(topmain, 0, 10); + QGridLayout *l5 = new TQGridLayout(0, 2, 2, 0, 5); l0->addLayout(l5); l5->addWidget(m_idnamelab, 0, 0); l5->addWidget(m_idname, 0, 1); l5->addWidget(m_desclab, 1, 0); l5->addWidget(m_description, 1, 1); l0->addWidget(m_gb2); - QHBoxLayout *l3 = new QHBoxLayout(0, 0, 0); + QHBoxLayout *l3 = new TQHBoxLayout(0, 0, 0); l0->addLayout(l3); l3->addWidget(m_edit); l3->addStretch(1); - QVBoxLayout *l7 = new QVBoxLayout(dummy, 0, 10); - QHBoxLayout *l6 = new QHBoxLayout(0, 0, 5); + QVBoxLayout *l7 = new TQVBoxLayout(dummy, 0, 10); + QHBoxLayout *l6 = new TQHBoxLayout(0, 0, 5); l7->addWidget(sep1); l7->addLayout(l6); l6->addWidget(m_mimetypelab, 0); l6->addWidget(m_mimetype, 1); l7->addWidget(m_gb1); - QGridLayout *l2 = new QGridLayout(m_gb1->layout(), 4, 3, 10); + QGridLayout *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); - QHBoxLayout *l4 = new QHBoxLayout(m_gb2->layout(), 10); + QHBoxLayout *l4 = new TQHBoxLayout(m_gb2->layout(), 10); l4->addWidget(m_requirements); - QVBoxLayout *l8 = new QVBoxLayout(0, 0, 0); + QVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); l4->addLayout(l8); l8->addWidget(m_addreq); l8->addWidget(m_removereq); l8->addStretch(1); - connect(m_addmime, SIGNAL(clicked()), SLOT(slotAddMime())); - connect(m_removemime, SIGNAL(clicked()), SLOT(slotRemoveMime())); - connect(m_edit, SIGNAL(clicked()), SLOT(slotEditCommand())); - connect(m_requirements, SIGNAL(selectionChanged(QListViewItem*)), SLOT(slotReqSelected(QListViewItem*))); - connect(m_availablemime, SIGNAL(selectionChanged(QListBoxItem*)), SLOT(slotAvailableSelected(QListBoxItem*))); - connect(m_selectedmime, SIGNAL(selectionChanged(QListBoxItem*)), SLOT(slotSelectedSelected(QListBoxItem*))); - connect(m_addreq, SIGNAL(clicked()), SLOT(slotAddReq())); - connect(m_removereq, SIGNAL(clicked()), SLOT(slotRemoveReq())); + 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())); KMimeType::List list = KMimeType::allMimeTypes(); - for (QValueList::ConstIterator it=list.begin(); it!=list.end(); ++it) + for (TQValueList::ConstIterator it=list.begin(); it!=list.end(); ++it) { QString mimetype = (*it)->name(); m_mimelist << mimetype; @@ -945,9 +945,9 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd) m_requirements->clear(); QStringList list = xmlCmd->requirements(); QListViewItem *item(0); - for (QStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) + for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) { - item = new QListViewItem(m_requirements, item, *it); + item = new TQListViewItem(m_requirements, item, *it); item->setRenameEnabled(0, true); } @@ -961,7 +961,7 @@ void KXmlCommandDlg::setCommand(KXmlCommand *xmlCmd) m_selectedmime->clear(); m_availablemime->clear(); m_availablemime->insertStringList(m_mimelist); - for (QStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) + for (TQStringList::ConstIterator it=list.begin(); it!=list.end(); ++it) { m_selectedmime->insertItem(*it); delete m_availablemime->findItem(*it, Qt::ExactMatch); @@ -972,7 +972,7 @@ void KXmlCommandDlg::slotOk() { if (m_cmd) { - m_cmd->setMimeType((m_mimetype->currentText() == "all/all" ? QString::null : m_mimetype->currentText())); + m_cmd->setMimeType((m_mimetype->currentText() == "all/all" ? TQString::null : m_mimetype->currentText())); m_cmd->setDescription(m_description->text()); QStringList l; QListViewItem *item = m_requirements->firstChild(); @@ -990,7 +990,7 @@ void KXmlCommandDlg::slotOk() KDialogBase::slotOk(); } -bool KXmlCommandDlg::editCommand(KXmlCommand *xmlCmd, QWidget *parent) +bool KXmlCommandDlg::editCommand(KXmlCommand *xmlCmd, TQWidget *parent) { if (!xmlCmd) return false; @@ -1030,7 +1030,7 @@ void KXmlCommandDlg::slotEditCommand() void KXmlCommandDlg::slotAddReq() { - QListViewItem *item = new QListViewItem(m_requirements, m_requirements->lastItem(), i18n("exec:/")); + QListViewItem *item = new TQListViewItem(m_requirements, m_requirements->lastItem(), i18n("exec:/")); item->setRenameEnabled(0, true); m_requirements->ensureItemVisible(item); item->startRename(0); @@ -1041,17 +1041,17 @@ void KXmlCommandDlg::slotRemoveReq() delete m_requirements->currentItem(); } -void KXmlCommandDlg::slotReqSelected(QListViewItem *item) +void KXmlCommandDlg::slotReqSelected(TQListViewItem *item) { m_removereq->setEnabled(item); } -void KXmlCommandDlg::slotAvailableSelected(QListBoxItem *item) +void KXmlCommandDlg::slotAvailableSelected(TQListBoxItem *item) { m_addmime->setEnabled(item); } -void KXmlCommandDlg::slotSelectedSelected(QListBoxItem *item) +void KXmlCommandDlg::slotSelectedSelected(TQListBoxItem *item) { m_removemime->setEnabled(item); } diff --git a/kdeprint/management/kxmlcommanddlg.h b/kdeprint/management/kxmlcommanddlg.h index 54bec2dfc..05dc133c2 100644 --- a/kdeprint/management/kxmlcommanddlg.h +++ b/kdeprint/management/kxmlcommanddlg.h @@ -20,9 +20,9 @@ #ifndef KXMLCOMMANDDLG_H #define KXMLCOMMANDDLG_H -#include -#include -#include +#include +#include +#include #include class KListView; @@ -44,21 +44,21 @@ class KXmlCommandAdvancedDlg : public QWidget { Q_OBJECT public: - KXmlCommandAdvancedDlg(QWidget *parent = 0, const char *name = 0); + KXmlCommandAdvancedDlg(TQWidget *parent = 0, const char *name = 0); ~KXmlCommandAdvancedDlg(); void setCommand(KXmlCommand*); - static bool editCommand(KXmlCommand *xmlcmd, QWidget *parent = 0); + static bool editCommand(KXmlCommand *xmlcmd, TQWidget *parent = 0); protected: - void parseGroupItem(DrGroup*, QListViewItem*); + void parseGroupItem(DrGroup*, TQListViewItem*); void parseXmlCommand(KXmlCommand*); - void viewItem(QListViewItem*); - void removeItem(QListViewItem*); - void recreateGroup(QListViewItem*, DrGroup*); + void viewItem(TQListViewItem*); + void removeItem(TQListViewItem*); + void recreateGroup(TQListViewItem*, DrGroup*); protected slots: - void slotSelectionChanged(QListViewItem*); + void slotSelectionChanged(TQListViewItem*); void slotTypeChanged(int); void slotAddValue(); void slotRemoveValue(); @@ -68,9 +68,9 @@ protected slots: void slotRemoveItem(); void slotMoveUp(); void slotMoveDown(); - void slotCommandChanged(const QString&); - void slotValueSelected(QListViewItem*); - void slotOptionRenamed(QListViewItem*, int); + void slotCommandChanged(const TQString&); + void slotValueSelected(TQListViewItem*); + void slotOptionRenamed(TQListViewItem*, int); void slotChanged(); private: @@ -84,21 +84,21 @@ private: QToolButton *m_apply, *m_addgrp, *m_addopt, *m_delopt, *m_up, *m_down; QLineEdit *m_inputfile, *m_inputpipe, *m_outputfile, *m_outputpipe; QToolButton *m_addval, *m_delval; - QTextEdit *m_comment; - QCheckBox *m_persistent; + TQTextEdit *m_comment; + TQCheckBox *m_persistent; KXmlCommand *m_xmlcmd; - QMap m_opts; + TQMap m_opts; }; class KXmlCommandDlg : public KDialogBase { Q_OBJECT public: - KXmlCommandDlg(QWidget *parent = 0, const char *name = 0); + KXmlCommandDlg(TQWidget *parent = 0, const char *name = 0); void setCommand(KXmlCommand*); - static bool editCommand(KXmlCommand*, QWidget *parent = 0); + static bool editCommand(KXmlCommand*, TQWidget *parent = 0); protected slots: void slotAddMime(); @@ -106,9 +106,9 @@ protected slots: void slotEditCommand(); void slotAddReq(); void slotRemoveReq(); - void slotReqSelected(QListViewItem*); - void slotAvailableSelected(QListBoxItem*); - void slotSelectedSelected(QListBoxItem*); + void slotReqSelected(TQListViewItem*); + void slotAvailableSelected(TQListBoxItem*); + void slotSelectedSelected(TQListBoxItem*); void slotOk(); private: diff --git a/kdeprint/management/kxmlcommandselector.cpp b/kdeprint/management/kxmlcommandselector.cpp index f0363e0b6..4e57b3922 100644 --- a/kdeprint/management/kxmlcommandselector.cpp +++ b/kdeprint/management/kxmlcommandselector.cpp @@ -22,13 +22,13 @@ #include "kxmlcommanddlg.h" #include "kdeprintcheck.h" -#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -40,45 +40,45 @@ #include #include -KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, QWidget *parent, const char *name, KDialogBase *dlg) -: QWidget(parent, name) +KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const char *name, KDialogBase *dlg) +: TQWidget(parent, name) { - m_cmd = new QComboBox(this); - connect(m_cmd, SIGNAL(activated(int)), SLOT(slotCommandSelected(int))); + m_cmd = new TQComboBox(this); + connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int))); QPushButton *m_add = new KPushButton(this); QPushButton *m_edit = new KPushButton(this); m_add->setPixmap(SmallIcon("filenew")); m_edit->setPixmap(SmallIcon("configure")); - connect(m_add, SIGNAL(clicked()), SLOT(slotAddCommand())); - connect(m_edit, SIGNAL(clicked()), SLOT(slotEditCommand())); - QToolTip::add(m_add, i18n("New command")); - QToolTip::add(m_edit, i18n("Edit command")); - m_shortinfo = new QLabel(this); + connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand())); + connect(m_edit, TQT_SIGNAL(clicked()), TQT_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, SIGNAL( clicked() ), SLOT( slotHelpCommand() ) ); - QToolTip::add( m_helpbtn, i18n( "Information" ) ); + connect( m_helpbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHelpCommand() ) ); + TQToolTip::add( m_helpbtn, i18n( "Information" ) ); m_helpbtn->setEnabled( false ); m_line = 0; m_usefilter = 0; QPushButton *m_browse = 0; - QVBoxLayout *l0 = new QVBoxLayout(this, 0, 10); + QVBoxLayout *l0 = new TQVBoxLayout(this, 0, 10); if (canBeNull) { - m_line = new QLineEdit(this); + m_line = new TQLineEdit(this); m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "fileopen"), this); - m_usefilter = new QCheckBox(i18n("Use co&mmand:"), this); - connect(m_browse, SIGNAL(clicked()), SLOT(slotBrowse())); - connect(m_usefilter, SIGNAL(toggled(bool)), m_line, SLOT(setDisabled(bool))); - connect(m_usefilter, SIGNAL(toggled(bool)), m_browse, SLOT(setDisabled(bool))); - connect(m_usefilter, SIGNAL(toggled(bool)), m_cmd, SLOT(setEnabled(bool))); - connect(m_usefilter, SIGNAL(toggled(bool)), m_add, SLOT(setEnabled(bool))); - connect(m_usefilter, SIGNAL(toggled(bool)), m_edit, SLOT(setEnabled(bool))); - connect(m_usefilter, SIGNAL(toggled(bool)), m_shortinfo, SLOT(setEnabled(bool))); - connect( m_usefilter, SIGNAL( toggled( bool ) ), SLOT( slotXmlCommandToggled( bool ) ) ); + 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 ) ) ); m_usefilter->setChecked(true); m_usefilter->setChecked(false); //setFocusProxy(m_line); @@ -86,7 +86,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, QWidget *parent, const setTabOrder(m_cmd, m_add); setTabOrder(m_add, m_edit); - QHBoxLayout *l1 = new QHBoxLayout(0, 0, 10); + QHBoxLayout *l1 = new TQHBoxLayout(0, 0, 10); l0->addLayout(l1); l1->addWidget(m_line); l1->addWidget(m_browse); @@ -97,7 +97,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, QWidget *parent, const else setFocusProxy(m_cmd); - QGridLayout *l2 = new QGridLayout(0, 2, (m_usefilter?3:2), 0, 5); + QGridLayout *l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5); int c(0); l0->addLayout(l2); if (m_usefilter) @@ -105,31 +105,31 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, QWidget *parent, const l2->addWidget(m_usefilter, 0, c++); } l2->addWidget(m_cmd, 0, c); - QHBoxLayout *l4 = new QHBoxLayout( 0, 0, 5 ); + TQHBoxLayout *l4 = new TQHBoxLayout( 0, 0, 5 ); l2->addLayout( l4, 1, c ); l4->addWidget( m_helpbtn, 0 ); l4->addWidget( m_shortinfo, 1 ); - QHBoxLayout *l3 = new QHBoxLayout(0, 0, 0); + QHBoxLayout *l3 = new TQHBoxLayout(0, 0, 0); l2->addLayout(l3, 0, c+1); l3->addWidget(m_add); l3->addWidget(m_edit); if ( dlg ) - connect( this, SIGNAL( commandValid( bool ) ), dlg, SLOT( enableButtonOK( bool ) ) ); + connect( this, TQT_SIGNAL( commandValid( bool ) ), dlg, TQT_SLOT( enableButtonOK( bool ) ) ); loadCommands(); } void KXmlCommandSelector::loadCommands() { - QString thisCmd = (m_cmd->currentItem() != -1 ? m_cmdlist[m_cmd->currentItem()] : QString::null); + QString thisCmd = (m_cmd->currentItem() != -1 ? m_cmdlist[m_cmd->currentItem()] : TQString::null); m_cmd->clear(); m_cmdlist.clear(); QStringList list = KXmlCommandManager::self()->commandListWithDescription(); QStringList desclist; - for (QStringList::Iterator it=list.begin(); it!=list.end(); ++it) + for (TQStringList::Iterator it=list.begin(); it!=list.end(); ++it) { m_cmdlist << (*it); ++it; @@ -144,7 +144,7 @@ void KXmlCommandSelector::loadCommands() slotCommandSelected(m_cmd->currentItem()); } -QString KXmlCommandSelector::command() const +TQString KXmlCommandSelector::command() const { QString cmd; if (m_line && !m_usefilter->isChecked()) @@ -154,14 +154,14 @@ QString KXmlCommandSelector::command() const return cmd; } -void KXmlCommandSelector::setCommand(const QString& cmd) +void KXmlCommandSelector::setCommand(const TQString& cmd) { int index = m_cmdlist.findIndex(cmd); if (m_usefilter) m_usefilter->setChecked(index != -1); if (m_line) - m_line->setText((index == -1 ? cmd : QString::null)); + m_line->setText((index == -1 ? cmd : TQString::null)); if (index != -1) m_cmd->setCurrentItem(index); if (m_cmd->currentItem() != -1 && m_cmd->isEnabled()) @@ -171,7 +171,7 @@ void KXmlCommandSelector::setCommand(const QString& cmd) void KXmlCommandSelector::slotAddCommand() { bool ok(false); - QString cmdId = KInputDialog::getText(i18n("Command Name"), i18n("Enter an identification name for the new command:"), QString::null, &ok, this); + QString cmdId = KInputDialog::getText(i18n("Command Name"), i18n("Enter an identification name for the new command:"), TQString::null, &ok, this); if (ok) { bool added(true); @@ -182,7 +182,7 @@ void KXmlCommandSelector::slotAddCommand() this, i18n("A command named %1 already exists. Do you want " "to continue and edit the existing one?").arg(cmdId), - QString::null, + TQString::null, KStdGuiItem::cont()) == KMessageBox::Cancel) { return; @@ -222,7 +222,7 @@ void KXmlCommandSelector::slotEditCommand() void KXmlCommandSelector::slotBrowse() { - QString filename = KFileDialog::getOpenFileName(QString::null, QString::null, this); + QString filename = KFileDialog::getOpenFileName(TQString::null, TQString::null, this); if (!filename.isEmpty() && m_line) m_line->setText(filename); } @@ -232,10 +232,10 @@ void KXmlCommandSelector::slotCommandSelected(int ID) KXmlCommand *xmlCmd = KXmlCommandManager::self()->loadCommand(m_cmdlist[ID], true); if (xmlCmd) { - QString msg; + TQString msg; if ( xmlCmd->isValid() && KdeprintChecker::check( xmlCmd->requirements() ) ) { - msg = QString::fromLocal8Bit("(ID = %1, %2 = ").arg(xmlCmd->name()).arg(i18n("output")); + msg = TQString::fromLocal8Bit("(ID = %1, %2 = ").arg(xmlCmd->name()).arg(i18n("output")); if (KXmlCommandManager::self()->checkCommand(xmlCmd->name(), KXmlCommandManager::None, KXmlCommandManager::Basic)) { if (xmlCmd->mimeType() == "all/all") @@ -267,7 +267,7 @@ void KXmlCommandSelector::slotXmlCommandToggled( bool on ) else { emit commandValid( true ); - m_shortinfo->setText( QString::null ); + m_shortinfo->setText( TQString::null ); } } @@ -277,7 +277,7 @@ void KXmlCommandSelector::slotHelpCommand() KActiveLabel *lab = new KActiveLabel( m_help, pop ); lab->resize( lab->sizeHint() ); pop->setMainWidget( lab ); - pop->exec( m_helpbtn->mapToGlobal( QPoint( m_helpbtn->width(), 0 ) ) ); + pop->exec( m_helpbtn->mapToGlobal( TQPoint( m_helpbtn->width(), 0 ) ) ); pop->close( 0 ); delete pop; } diff --git a/kdeprint/management/kxmlcommandselector.h b/kdeprint/management/kxmlcommandselector.h index b0d67284e..23ded759b 100644 --- a/kdeprint/management/kxmlcommandselector.h +++ b/kdeprint/management/kxmlcommandselector.h @@ -20,8 +20,8 @@ #ifndef KXMLCOMMANDSELECTOR_H #define KXMLCOMMANDSELECTOR_H -#include -#include +#include +#include #include @@ -36,10 +36,10 @@ class KDEPRINT_EXPORT KXmlCommandSelector : public QWidget { Q_OBJECT public: - KXmlCommandSelector(bool canBeNull = true, QWidget *parent = 0, const char *name = 0, KDialogBase *dlg = 0); + KXmlCommandSelector(bool canBeNull = true, TQWidget *parent = 0, const char *name = 0, KDialogBase *dlg = 0); - void setCommand(const QString&); - QString command() const; + void setCommand(const TQString&); + TQString command() const; protected: void loadCommands(); @@ -61,8 +61,8 @@ private: QCheckBox *m_usefilter; QStringList m_cmdlist; QLabel *m_shortinfo; - QPushButton *m_helpbtn; - QString m_help; + TQPushButton *m_helpbtn; + TQString m_help; }; #endif diff --git a/kdeprint/management/networkscanner.cpp b/kdeprint/management/networkscanner.cpp index ae99c4fa4..41b368ab0 100644 --- a/kdeprint/management/networkscanner.cpp +++ b/kdeprint/management/networkscanner.cpp @@ -21,15 +21,15 @@ #include "networkscanner.h" -#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -41,18 +41,18 @@ class NetworkScanner::NetworkScannerPrivate { public: int port; - QString prefixaddress; + TQString prefixaddress; int currentaddress; int timeout; bool scanning; - QPtrList printers; + TQPtrList printers; - QProgressBar *bar; + TQProgressBar *bar; KPushButton *scan, *settings; - QLabel *subnetlab; - QTimer *timer; + TQLabel *subnetlab; + TQTimer *timer; #ifdef USE_QSOCKET - QSocket *socket; + TQSocket *socket; #else KExtendedSocket *socket; #endif @@ -65,17 +65,17 @@ public: scanning = false; printers.setAutoDelete( true ); } - QString localPrefix(); - QString scanString(); + TQString localPrefix(); + TQString scanString(); }; -QString NetworkScanner::NetworkScannerPrivate::localPrefix() +TQString NetworkScanner::NetworkScannerPrivate::localPrefix() { char buf[256]; buf[0] = '\0'; if (!gethostname(buf, sizeof(buf))) buf[sizeof(buf)-1] = '\0'; - QPtrList infos = KExtendedSocket::lookup(buf, QString::null); + TQPtrList infos = KExtendedSocket::lookup(buf, TQString::null); infos.setAutoDelete(true); if (infos.count() > 0) { @@ -84,49 +84,49 @@ QString NetworkScanner::NetworkScannerPrivate::localPrefix() IPstr.truncate(p); return IPstr; } - return QString::null; + return TQString::null; } -QString NetworkScanner::NetworkScannerPrivate::scanString() +TQString NetworkScanner::NetworkScannerPrivate::scanString() { - QString s = prefixaddress + ".*"; + TQString s = prefixaddress + ".*"; if ( port != -1 ) - s.append( ":" ).append( QString::number( port ) ); + s.append( ":" ).append( TQString::number( port ) ); return s; } -NetworkScanner::NetworkScanner( int port, QWidget *parent, const char *name ) - : QWidget( parent, name ) +NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { d = new NetworkScannerPrivate( port ); - d->bar = new QProgressBar( 256, this ); + d->bar = new TQProgressBar( 256, this ); d->settings = new KPushButton( KGuiItem( i18n( "&Settings" ), "configure" ), this ); d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this ); - d->timer = new QTimer( this ); + d->timer = new TQTimer( this ); #ifdef USE_QSOCKET - d->socket = new QSocket( this ); + d->socket = new TQSocket( this ); #else d->socket = new KExtendedSocket(); #endif - QLabel *label = new QLabel( i18n( "Network scan:" ), this ); - d->subnetlab = new QLabel( i18n( "Subnet: %1" ).arg( d->scanString() ), this ); + TQLabel *label = new TQLabel( i18n( "Network scan:" ), this ); + d->subnetlab = new TQLabel( i18n( "Subnet: %1" ).arg( d->scanString() ), this ); - QGridLayout *l0 = new QGridLayout( this, 4, 2, 0, 10 ); + TQGridLayout *l0 = new TQGridLayout( this, 4, 2, 0, 10 ); l0->addMultiCellWidget( label, 0, 0, 0, 1 ); l0->addMultiCellWidget( d->bar, 1, 1, 0, 1 ); l0->addMultiCellWidget( d->subnetlab, 2, 2, 0, 1 ); l0->addWidget( d->settings, 3, 0 ); l0->addWidget( d->scan, 3, 1 ); - connect( d->timer, SIGNAL( timeout() ), SLOT( slotTimeout() ) ); - connect( d->settings, SIGNAL( clicked() ), SLOT( slotSettingsClicked() ) ); - connect( d->scan, SIGNAL( clicked() ), SLOT( slotScanClicked() ) ); + 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() ) ); #ifdef USE_QSOCKET - connect( d->socket, SIGNAL( connected() ), SLOT( slotConnectionSuccess() ) ); - connect( d->socket, SIGNAL( error( int ) ), SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQT_SIGNAL( error( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); #else - connect( d->socket, SIGNAL( connectionSuccess() ), SLOT( slotConnectionSuccess() ) ); - connect( d->socket, SIGNAL( connectionFailed( int ) ), SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQT_SIGNAL( connectionSuccess() ), TQT_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQT_SIGNAL( connectionFailed( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); #endif } @@ -161,7 +161,7 @@ void NetworkScanner::slotScanClicked() i18n( "You are about to scan a subnet (%1.*) that does not " "correspond to the current subnet of this computer (%2.*). Do you want " "to scan the specified subnet anyway?" ).arg( d->prefixaddress ).arg( d->localPrefix() ), - QString::null, KGuiItem( i18n( "&Scan" ), "viewmag" ), "askForScan" ) == KMessageBox::Continue ) + TQString::null, KGuiItem( i18n( "&Scan" ), "viewmag" ), "askForScan" ) == KMessageBox::Continue ) start(); } else @@ -200,10 +200,10 @@ void NetworkScanner::slotNext() d->timer->stop(); #ifdef USE_QSOCKET - d->socket->connectToHost( d->prefixaddress + "." + QString::number( d->currentaddress ), d->port ); + d->socket->connectToHost( d->prefixaddress + "." + TQString::number( d->currentaddress ), d->port ); kdDebug() << "Address: " << d->socket->peerName() << ", Port: " << d->socket->peerPort() << endl; #else - d->socket->setAddress( d->prefixaddress + "." + QString::number( d->currentaddress ), d->port ); + d->socket->setAddress( d->prefixaddress + "." + TQString::number( d->currentaddress ), d->port ); d->socket->startAsyncLookup(); kdDebug() << "Address: " << d->socket->host() << ", Port: " << d->socket->port() << endl; #endif @@ -219,7 +219,7 @@ void NetworkScanner::next() else { d->bar->setProgress( d->currentaddress ); - QTimer::singleShot( 0, this, SLOT( slotNext() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotNext() ) ); } } @@ -245,7 +245,7 @@ void NetworkScanner::slotConnectionSuccess() #else KSocketAddress *addr = const_cast( d->socket->peerAddress() ); #endif - kdDebug() << "Connection success: " << ( addr ? addr->pretty() : QString( "ERROR" ) ) << endl; + kdDebug() << "Connection success: " << ( addr ? addr->pretty() : TQString( "ERROR" ) ) << endl; kdDebug() << "Socket: " << d->socket->socket() << endl; if ( addr ) { @@ -256,7 +256,7 @@ void NetworkScanner::slotConnectionSuccess() info->IP = d->socket->host(); #endif info->Port = d->port; - QString portname; + TQString portname; KExtendedSocket::resolve( addr, info->Name, portname ); d->printers.append( info ); d->socket->close(); @@ -273,7 +273,7 @@ void NetworkScanner::slotConnectionFailed( int ) next(); } -const QPtrList* NetworkScanner::printerList() +const TQPtrList* NetworkScanner::printerList() { return &( d->printers ); } @@ -288,12 +288,12 @@ void NetworkScanner::setTimeout( int to ) d->timeout = to; } -QString NetworkScanner::subnet() const +TQString NetworkScanner::subnet() const { return d->prefixaddress; } -void NetworkScanner::setSubnet( const QString& sn ) +void NetworkScanner::setSubnet( const TQString& sn ) { d->prefixaddress = sn; d->subnetlab->setText( i18n( "Subnet: %1" ).arg( d->scanString() ) ); @@ -310,10 +310,10 @@ void NetworkScanner::setPort( int p ) d->subnetlab->setText( i18n( "Subnet: %1" ).arg( d->scanString() ) ); } -bool NetworkScanner::checkPrinter( const QString& host, int port ) +bool NetworkScanner::checkPrinter( const TQString& host, int port ) { // try first to find it in the SocketInfo list - QPtrListIterator it( d->printers ); + TQPtrListIterator it( d->printers ); for ( ; it.current(); ++it ) { if ( port == it.current()->Port && ( host == it.current()->IP || @@ -329,26 +329,26 @@ bool NetworkScanner::checkPrinter( const QString& host, int port ) } NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char *name) - : KDialogBase(scanner, name, true, QString::null, Ok|Cancel, Ok, true) + : KDialogBase(scanner, name, true, TQString::null, Ok|Cancel, Ok, true) { scanner_ = scanner; - QWidget *dummy = new QWidget(this); + QWidget *dummy = new TQWidget(this); setMainWidget(dummy); KIntValidator *val = new KIntValidator( this ); - QLabel *masklabel = new QLabel(i18n("&Subnetwork:"),dummy); - QLabel *portlabel = new QLabel(i18n("&Port:"),dummy); - QLabel *toutlabel = new QLabel(i18n("&Timeout (ms):"),dummy); - QLineEdit *mm = new QLineEdit(dummy); - mm->setText(QString::fromLatin1(".[0-255]")); + QLabel *masklabel = new TQLabel(i18n("&Subnetwork:"),dummy); + QLabel *portlabel = new TQLabel(i18n("&Port:"),dummy); + QLabel *toutlabel = new TQLabel(i18n("&Timeout (ms):"),dummy); + QLineEdit *mm = new TQLineEdit(dummy); + mm->setText(TQString::fromLatin1(".[0-255]")); mm->setReadOnly(true); mm->setFixedWidth(fontMetrics().width(mm->text())+10); - mask_ = new QLineEdit(dummy); + mask_ = new TQLineEdit(dummy); mask_->setAlignment(Qt::AlignRight); - port_ = new QComboBox(true,dummy); + port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); - tout_ = new QLineEdit(dummy); + tout_ = new TQLineEdit(dummy); tout_->setValidator( val ); masklabel->setBuddy(mask_); @@ -360,11 +360,11 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char * port_->insertItem("9100"); port_->insertItem("9101"); port_->insertItem("9102"); - port_->setEditText(QString::number(scanner_->port())); - tout_->setText(QString::number(scanner_->timeout())); + port_->setEditText(TQString::number(scanner_->port())); + tout_->setText(TQString::number(scanner_->timeout())); - QGridLayout *main_ = new QGridLayout(dummy, 3, 2, 0, 10); - QHBoxLayout *lay1 = new QHBoxLayout(0, 0, 5); + QGridLayout *main_ = new TQGridLayout(dummy, 3, 2, 0, 10); + QHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 5); main_->addWidget(masklabel, 0, 0); main_->addWidget(portlabel, 1, 0); main_->addWidget(toutlabel, 2, 0); diff --git a/kdeprint/management/networkscanner.h b/kdeprint/management/networkscanner.h index 2877a7596..5919990e4 100644 --- a/kdeprint/management/networkscanner.h +++ b/kdeprint/management/networkscanner.h @@ -20,9 +20,9 @@ #ifndef NETWORKSCANNER_H #define NETWORKSCANNER_H -#include +#include #include -#include +#include class KDEPRINT_EXPORT NetworkScanner : public QWidget @@ -30,25 +30,25 @@ class KDEPRINT_EXPORT NetworkScanner : public QWidget Q_OBJECT public: - NetworkScanner( int port = 9100, QWidget *parent = 0, const char *name = 0 ); + NetworkScanner( int port = 9100, TQWidget *parent = 0, const char *name = 0 ); ~NetworkScanner(); struct SocketInfo { - QString IP; - QString Name; + TQString IP; + TQString Name; int Port; }; - const QPtrList* printerList(); + const TQPtrList* printerList(); int timeout() const; void setTimeout( int to ); - QString subnet() const; - void setSubnet( const QString& ); + TQString subnet() const; + void setSubnet( const TQString& ); int port() const; void setPort( int ); - bool checkPrinter( const QString&, int ); + bool checkPrinter( const TQString&, int ); signals: void scanStarted(); diff --git a/kdeprint/management/pluginaction.cpp b/kdeprint/management/pluginaction.cpp index e03f8c4da..d876601e7 100644 --- a/kdeprint/management/pluginaction.cpp +++ b/kdeprint/management/pluginaction.cpp @@ -20,10 +20,10 @@ #include "pluginaction.h" // automatically connect to "pluginActionActived(int)" in the receiver. -PluginAction::PluginAction(int ID, const QString& txt, const QString& icon, int accel, QObject *parent, const char *name) +PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name) : KAction(txt, icon, accel, parent, name), m_id(ID) { - connect(this, SIGNAL(activated()), SLOT(slotActivated())); + connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated())); } void PluginAction::slotActivated() diff --git a/kdeprint/management/pluginaction.h b/kdeprint/management/pluginaction.h index f0addad4b..c39f5f700 100644 --- a/kdeprint/management/pluginaction.h +++ b/kdeprint/management/pluginaction.h @@ -27,7 +27,7 @@ class KDEPRINT_EXPORT PluginAction : public KAction Q_OBJECT public: - PluginAction(int ID, const QString& txt, const QString& icon, int accel, QObject *parent = 0, const char *name = 0); + PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent = 0, const char *name = 0); signals: void activated(int); diff --git a/kdeprint/management/sidepixmap.cpp b/kdeprint/management/sidepixmap.cpp index 6469b935d..99a1e6198 100644 --- a/kdeprint/management/sidepixmap.cpp +++ b/kdeprint/management/sidepixmap.cpp @@ -19,20 +19,20 @@ #include "sidepixmap.h" -#include +#include #include -SidePixmap::SidePixmap(QWidget *parent, const char *name) -: QFrame(parent, name) +SidePixmap::SidePixmap(TQWidget *parent, const char *name) +: TQFrame(parent, name) { setLineWidth(1); - setFrameStyle(QFrame::WinPanel|QFrame::Sunken); + setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_side.load(locate("data", "kdeprint/side.png")); m_tileup.load(locate("data", "kdeprint/tileup.png")); m_tiledown.load(locate("data", "kdeprint/tiledown.png")); - setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum)); } bool SidePixmap::isValid() @@ -42,12 +42,12 @@ bool SidePixmap::isValid() && (m_side.width() == m_tiledown.width())); } -QSize SidePixmap::sizeHint() const +TQSize SidePixmap::sizeHint() const { - return (QSize(m_side.width()+lineWidth(), 300+lineWidth())); + return (TQSize(m_side.width()+lineWidth(), 300+lineWidth())); } -void SidePixmap::drawContents(QPainter *p) +void SidePixmap::drawContents(TQPainter *p) { QRect r = contentsRect(); if (r.height() <= m_side.height()) diff --git a/kdeprint/management/sidepixmap.h b/kdeprint/management/sidepixmap.h index 48bfebf47..33db2275c 100644 --- a/kdeprint/management/sidepixmap.h +++ b/kdeprint/management/sidepixmap.h @@ -20,20 +20,20 @@ #ifndef SIDEPIXMAP_H #define SIDEPIXMAP_H -#include -#include +#include +#include #include class KDEPRINT_EXPORT SidePixmap : public QFrame { public: - SidePixmap(QWidget *parent = 0, const char *name = 0); - QSize sizeHint() const; + SidePixmap(TQWidget *parent = 0, const char *name = 0); + TQSize sizeHint() const; bool isValid(); protected: - void drawContents(QPainter*); + void drawContents(TQPainter*); private: QPixmap m_side, m_tileup, m_tiledown; diff --git a/kdeprint/management/smbview.cpp b/kdeprint/management/smbview.cpp index 6cf5ee4c8..127a42e76 100644 --- a/kdeprint/management/smbview.cpp +++ b/kdeprint/management/smbview.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -30,19 +30,19 @@ #include #include -#include -#include +#include +#include #include //********************************************************************************************* -SmbView::SmbView(QWidget *parent, const char *name) +SmbView::SmbView(TQWidget *parent, const char *name) : KListView(parent,name) { addColumn(i18n("Printer")); addColumn(i18n("Comment")); - setFrameStyle(QFrame::WinPanel|QFrame::Sunken); + setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); setLineWidth(1); setAllColumnsShowFocus(true); setRootIsDecorated(true); @@ -52,9 +52,9 @@ SmbView::SmbView(QWidget *parent, const char *name) m_proc = new KProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,SIGNAL(processExited(KProcess*)),SLOT(slotProcessExited(KProcess*))); - connect(m_proc,SIGNAL(receivedStdout(KProcess*,char*,int)),SLOT(slotReceivedStdout(KProcess*,char*,int))); - connect(this,SIGNAL(selectionChanged(QListViewItem*)),SLOT(slotSelectionChanged(QListViewItem*))); + connect(m_proc,TQT_SIGNAL(processExited(KProcess*)),TQT_SLOT(slotProcessExited(KProcess*))); + connect(m_proc,TQT_SIGNAL(receivedStdout(KProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(KProcess*,char*,int))); + connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); } SmbView::~SmbView() @@ -63,7 +63,7 @@ SmbView::~SmbView() delete m_passwdFile; } -void SmbView::setLoginInfos(const QString& login, const QString& password) +void SmbView::setLoginInfos(const TQString& login, const TQString& password) { m_login = login; m_password = password; @@ -77,7 +77,7 @@ void SmbView::setLoginInfos(const QString& login, const QString& password) m_passwdFile = new KTempFile; m_passwdFile->setAutoDelete(true); - QTextStream *passwdFile = m_passwdFile->textStream(); + TQTextStream *passwdFile = m_passwdFile->textStream(); if (!passwdFile) return; // Error (*passwdFile) << "username = " << m_login << endl; (*passwdFile) << "password = " << m_password << endl; @@ -88,9 +88,9 @@ void SmbView::setLoginInfos(const QString& login, const QString& password) void SmbView::startProcess(int state) { - m_buffer = QString::null; + m_buffer = TQString::null; m_state = state; - QApplication::setOverrideCursor(KCursor::waitCursor()); + TQApplication::setOverrideCursor(KCursor::waitCursor()); m_proc->start(KProcess::NotifyOnExit,KProcess::Stdout); emit running(true); } @@ -112,7 +112,7 @@ void SmbView::endProcess() break; } m_state = Idle; - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); emit running(false); // clean up for future usage m_proc->clearArguments(); @@ -125,24 +125,24 @@ void SmbView::slotProcessExited(KProcess*) void SmbView::slotReceivedStdout(KProcess*, char *buf, int len) { - m_buffer.append(QString::fromLocal8Bit(buf,len)); + m_buffer.append(TQString::fromLocal8Bit(buf,len)); } void SmbView::init() { // Open Samba configuration file and check if a WINS server is defined - m_wins_server = QString::null; - QString wins_keyword("wins server"); - QFile smb_conf ("/etc/samba/smb.conf"); + m_wins_server = TQString::null; + TQString wins_keyword("wins server"); + TQFile smb_conf ("/etc/samba/smb.conf"); if (smb_conf.exists () && smb_conf.open (IO_ReadOnly)) { - QTextStream smb_stream (&smb_conf); + TQTextStream smb_stream (&smb_conf); while (!smb_stream.atEnd ()) { - QString smb_line = smb_stream.readLine (); + TQString smb_line = smb_stream.readLine (); if (smb_line.contains (wins_keyword, FALSE) > 0) { - QString key = smb_line.section ('=', 0, 0); + TQString key = smb_line.section ('=', 0, 0); key = key.stripWhiteSpace(); if (key.lower() == wins_keyword) { @@ -164,13 +164,13 @@ void SmbView::init() smb_conf.close (); } m_wins_server = m_wins_server.isEmpty ()? " " : " -U " + m_wins_server + " "; - QString cmd ("nmblookup" + m_wins_server + + TQString cmd ("nmblookup" + m_wins_server + "-M -- - | grep '<01>' | awk '{print $1}' | xargs nmblookup -A | grep '<1d>'"); *m_proc << cmd; startProcess(GroupListing); } -void SmbView::setOpen(QListViewItem *item, bool on) +void SmbView::setOpen(TQListViewItem *item, bool on) { if (on && item->childCount() == 0) { @@ -189,7 +189,7 @@ void SmbView::setOpen(QListViewItem *item, bool on) *m_proc << KProcess::quote(item->text(0)); *m_proc << " -W "; *m_proc << KProcess::quote(item->parent()->text(0)); - if (m_login != QString::null) + if (m_login != TQString::null) { *m_proc << " -A "; *m_proc << KProcess::quote(m_passwdFile->name()); @@ -197,19 +197,19 @@ void SmbView::setOpen(QListViewItem *item, bool on) startProcess(ShareListing); } } - QListView::setOpen(item,on); + TQListView::setOpen(item,on); } void SmbView::processGroups() { - QStringList grps = QStringList::split('\n',m_buffer,false); + QStringList grps = TQStringList::split('\n',m_buffer,false); clear(); - for (QStringList::ConstIterator it=grps.begin(); it!=grps.end(); ++it) + for (TQStringList::ConstIterator it=grps.begin(); it!=grps.end(); ++it) { int p = (*it).find("<1d>"); if (p == -1) continue; - QListViewItem *item = new QListViewItem(this,(*it).left(p).stripWhiteSpace()); + QListViewItem *item = new TQListViewItem(this,(*it).left(p).stripWhiteSpace()); item->setExpandable(true); item->setPixmap(0,SmallIcon("network")); } @@ -217,7 +217,7 @@ void SmbView::processGroups() void SmbView::processServers() { - QStringList lines = QStringList::split('\n',m_buffer,true); + QStringList lines = TQStringList::split('\n',m_buffer,true); QString line; uint index(0); while (index < lines.count()) @@ -225,10 +225,10 @@ void SmbView::processServers() line = lines[index++].stripWhiteSpace(); if (line.isEmpty()) break; - QStringList words = QStringList::split(' ',line,false); + QStringList words = TQStringList::split(' ',line,false); if (words[1] != "<00>" || words[3] == "") continue; - QListViewItem *item = new QListViewItem(m_current,words[0]); + QListViewItem *item = new TQListViewItem(m_current,words[0]); item->setExpandable(true); item->setPixmap(0,SmallIcon("kdeprint_computer")); } @@ -236,7 +236,7 @@ void SmbView::processServers() void SmbView::processShares() { - QStringList lines = QStringList::split('\n',m_buffer,true); + QStringList lines = TQStringList::split('\n',m_buffer,true); QString line; uint index(0); for (;index < lines.count();index++) @@ -254,21 +254,21 @@ void SmbView::processShares() break; } QString typestr(line.mid(15, 10).stripWhiteSpace()); - //QStringList words = QStringList::split(' ',line,false); + //QStringList words = TQStringList::split(' ',line,false); //if (words[1] == "Printer") if (typestr == "Printer") { QString comm(line.mid(25).stripWhiteSpace()), sharen(line.mid(0, 15).stripWhiteSpace()); //for (uint i=2; isetPixmap(0,SmallIcon("kdeprint_printer")); } } } -void SmbView::slotSelectionChanged(QListViewItem *item) +void SmbView::slotSelectionChanged(TQListViewItem *item) { if (item && item->depth() == 2) emit printerSelected(item->parent()->parent()->text(0),item->parent()->text(0),item->text(0)); diff --git a/kdeprint/management/smbview.h b/kdeprint/management/smbview.h index 74932a964..e86f3d5ec 100644 --- a/kdeprint/management/smbview.h +++ b/kdeprint/management/smbview.h @@ -29,16 +29,16 @@ class SmbView : public KListView { Q_OBJECT public: - SmbView(QWidget *parent = 0, const char *name = 0); + SmbView(TQWidget *parent = 0, const char *name = 0); ~SmbView(); - void setLoginInfos(const QString& login, const QString& password); - void setOpen(QListViewItem*, bool); + void setLoginInfos(const TQString& login, const TQString& password); + void setOpen(TQListViewItem*, bool); void init(); void abort(); signals: - void printerSelected(const QString& work, const QString& server, const QString& printer); + void printerSelected(const TQString& work, const TQString& server, const TQString& printer); void running(bool); protected: @@ -51,7 +51,7 @@ protected: protected slots: void slotReceivedStdout(KProcess*, char*, int); void slotProcessExited(KProcess*); - void slotSelectionChanged(QListViewItem*); + void slotSelectionChanged(TQListViewItem*); private: enum State { GroupListing, ServerListing, ShareListing, Idle }; -- cgit v1.2.1