diff options
Diffstat (limited to 'tdeprint/management')
80 files changed, 349 insertions, 349 deletions
diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp index 5bddffe02..58a051370 100644 --- a/tdeprint/management/cjanuswidget.cpp +++ b/tdeprint/management/cjanuswidget.cpp @@ -74,7 +74,7 @@ void CJanusWidget::CListBoxItem::paint(TQPainter *p) int w1 = (listBox()->contentsWidth()-m_pix.width())/2; p->drawPixmap(w1,5,m_pix); - p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),Qt::AlignHCenter,text()); + p->drawText(0,7+m_pix.height(),listBox()->contentsWidth(),p->fontMetrics().lineSpacing(),TQt::AlignHCenter,text()); } //*********************************************************************************** @@ -143,7 +143,7 @@ CJanusWidget::CJanusWidget(TQWidget *parent, const char *name) f = m_iconlist->font(); f.setBold(true); m_iconlist->setFont(f); - connect(m_iconlist,TQT_SIGNAL(selectionChanged(TQListBoxItem*)),TQT_SLOT(slotSelected(TQListBoxItem*))); + connect(m_iconlist,TQ_SIGNAL(selectionChanged(TQListBoxItem*)),TQ_SLOT(slotSelected(TQListBoxItem*))); m_empty = new TQWidget(this, "Empty"); m_stack->addWidget(m_empty,0); diff --git a/tdeprint/management/cjanuswidget.h b/tdeprint/management/cjanuswidget.h index d33be1499..5b178c824 100644 --- a/tdeprint/management/cjanuswidget.h +++ b/tdeprint/management/cjanuswidget.h @@ -30,7 +30,7 @@ class TQListBoxItem; class CJanusWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: CJanusWidget(TQWidget *parent, const char *name); ~CJanusWidget(); diff --git a/tdeprint/management/jobitem.h b/tdeprint/management/jobitem.h index 580a1b84f..66beeb7d2 100644 --- a/tdeprint/management/jobitem.h +++ b/tdeprint/management/jobitem.h @@ -40,7 +40,7 @@ public: private: KMJob *m_job; int m_ID; - QString m_uri; + TQString m_uri; }; inline int JobItem::jobID() const diff --git a/tdeprint/management/kaddprinterwizard.cpp b/tdeprint/management/kaddprinterwizard.cpp index 466c75853..923890c0e 100644 --- a/tdeprint/management/kaddprinterwizard.cpp +++ b/tdeprint/management/kaddprinterwizard.cpp @@ -12,7 +12,7 @@ static TDECmdLineOptions options[] = TDECmdLineLastOption }; -extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) +extern "C" TDE_EXPORT int kdemain(int argc, char *argv[]) { TDECmdLineArgs::init(argc, argv, "kaddprinterwizard", I18N_NOOP("Start the add printer wizard"), diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp index 984d2c128..132ca990c 100644 --- a/tdeprint/management/kiconselectaction.cpp +++ b/tdeprint/management/kiconselectaction.cpp @@ -76,7 +76,7 @@ void TDEIconSelectAction::setItems(const TQStringList& lst, const TQStringList& int TDEIconSelectAction::plug(TQWidget* widget, int index) { int value(-1); - if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) + if (widget->inherits("TQPopupMenu")) { createPopupMenu(); value = TDESelectAction::plug(widget, index); @@ -94,7 +94,7 @@ int TDEIconSelectAction::plug(TQWidget* widget, int index) bar->getButton(id)->setPopup(d->m_menu, true); bar->setItemEnabled(id, isEnabled()); addContainer(bar, id); - connect(bar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotDestroyed())); + connect(bar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotDestroyed())); value = containerCount()-1; } diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h index 26e703fbf..7403d311a 100644 --- a/tdeprint/management/kiconselectaction.h +++ b/tdeprint/management/kiconselectaction.h @@ -26,7 +26,7 @@ class TDEIconSelectActionPrivate; class TDEIconSelectAction : public TDESelectAction { - Q_OBJECT + TQ_OBJECT public: TDEIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0); virtual ~TDEIconSelectAction(); diff --git a/tdeprint/management/kmconfigcommand.cpp b/tdeprint/management/kmconfigcommand.cpp index 971f8cce5..3c82c8663 100644 --- a/tdeprint/management/kmconfigcommand.cpp +++ b/tdeprint/management/kmconfigcommand.cpp @@ -34,7 +34,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) setPageHeader(i18n("Command Settings")); setPagePixmap("application-x-executable"); - TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Edit/Create Commands"), this); + TQGroupBox *gb = new TQGroupBox(0, TQt::Horizontal, i18n("Edit/Create Commands"), this); TQLabel *lab = new TQLabel(i18n( "<p>Command objects perform a conversion from input to output.<br>" "They are used as the basis to build both print filters " @@ -47,7 +47,7 @@ KMConfigCommand::KMConfigCommand(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(gb); l0->addStretch(1); - TQVBoxLayout *l2 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout()), KDialog::spacingHint()); + TQVBoxLayout *l2 = new TQVBoxLayout(gb->layout(), KDialog::spacingHint()); l2->addWidget(lab); l2->addWidget(sel); } diff --git a/tdeprint/management/kmconfigdialog.h b/tdeprint/management/kmconfigdialog.h index 6a47995cc..30dd2b2ef 100644 --- a/tdeprint/management/kmconfigdialog.h +++ b/tdeprint/management/kmconfigdialog.h @@ -27,7 +27,7 @@ class TDEPRINT_EXPORT KMConfigDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMConfigDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index b7be0a1e6..18354839d 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -41,7 +41,7 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) setPageHeader(i18n("Printer Filtering Settings")); setPagePixmap("filter"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Printer Filter"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Printer Filter"), this); m_list1 = new TDEListBox(box); m_list1->setSelectionMode(TDEListBox::Extended); @@ -63,10 +63,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(lab); TQGridLayout *l2 = new TQGridLayout(0, 4, 3, 0, KDialog::spacingHint()); - l1->addLayout(TQT_TQLAYOUT(l2)); + l1->addLayout(l2); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); l2->setColStretch(0, 1); @@ -80,10 +80,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) l3->addWidget(lab1, 0); l3->addWidget(m_locationre, 1); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); - connect(m_list1, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(m_list2, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked())); + connect(m_list1, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(m_list2, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); m_add->setEnabled(false); m_remove->setEnabled(false); } diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h index 8338ebd6f..1e0f6e2c9 100644 --- a/tdeprint/management/kmconfigfilter.h +++ b/tdeprint/management/kmconfigfilter.h @@ -28,7 +28,7 @@ class TQLineEdit; class KMConfigFilter : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigFilter(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index 4d9854774..7107bc74d 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -43,8 +43,8 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) setPageHeader(i18n("Font Settings")); setPagePixmap("fonts"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Embedding"), this); - TQGroupBox *box2 = new TQGroupBox(0, Qt::Vertical, i18n("Fonts Path"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Embedding"), this); + TQGroupBox *box2 = new TQGroupBox(0, TQt::Vertical, i18n("Fonts Path"), this); m_embedfonts = new TQCheckBox(i18n("&Embed fonts in PostScript data when printing"), box); m_fontpath = new TDEListView(box2); @@ -61,9 +61,9 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) TQLabel *lab0 = new TQLabel(i18n("Additional director&y:"), box2); lab0->setBuddy(m_addpath); - TQVBoxLayout *l0 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l0 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l0->addWidget(m_embedfonts); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box2->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box2->layout(), KDialog::spacingHint()); l1->addWidget(m_fontpath); TQHBoxLayout *l2 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); l1->addLayout(l2); @@ -91,12 +91,12 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) "font path is used, so adding those directories is not needed. The default " "search path should be sufficient in most cases.")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); - connect(m_fontpath, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelected())); - connect(m_addpath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown())); + connect(m_fontpath, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelected())); + connect(m_addpath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged(const TQString&))); m_add->setEnabled(false); m_remove->setEnabled(false); m_up->setEnabled(false); diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h index 8bd285f38..9ac9a43f5 100644 --- a/tdeprint/management/kmconfigfonts.h +++ b/tdeprint/management/kmconfigfonts.h @@ -29,7 +29,7 @@ class TQCheckBox; class KMConfigFonts : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigFonts(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index edf8902bf..1b21dbca6 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -45,7 +45,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) setPageHeader(i18n("General Settings")); setPagePixmap("document-print"); - TQGroupBox *m_timerbox = new TQGroupBox(0, Qt::Vertical, i18n("Refresh Interval"), this); + TQGroupBox *m_timerbox = new TQGroupBox(0, TQt::Vertical, i18n("Refresh Interval"), this); m_timer = new KIntNumInput(m_timerbox,"Timer"); m_timer->setRange(0,30); m_timer->setSuffix( i18n( " sec" ) ); @@ -54,19 +54,19 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) "<b>TDE Print</b> components like the print manager " "and the job viewer.")); - TQGroupBox *m_testpagebox = new TQGroupBox(0, Qt::Vertical, i18n("Test Page"), this); + TQGroupBox *m_testpagebox = new TQGroupBox(0, TQt::Vertical, i18n("Test Page"), this); m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck"); m_testpage = new KURLRequester(m_testpagebox,"TestPage"); m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox); - connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool))); - connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool))); - connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview())); - connect(m_testpage->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(testPageChanged(const TQString & ))); + connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),m_testpage,TQ_SLOT(setEnabled(bool))); + connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabledPreviewButton(bool))); + connect(m_preview,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestPagePreview())); + connect(m_testpage->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(testPageChanged(const TQString & ))); m_testpage->setDisabled(true); m_preview->setDisabled(true); m_defaulttestpage->setCursor(KCursor::handCursor()); - TQGroupBox *m_statusbox = new TQGroupBox(0, Qt::Vertical, i18n("Miscellaneous"), this); + TQGroupBox *m_statusbox = new TQGroupBox(0, TQt::Vertical, i18n("Miscellaneous"), this); m_statusmsg = new TQCheckBox(i18n("Sho&w printing status message box"), m_statusbox); m_uselast = new TQCheckBox(i18n("De&faults to the last printer used in the application"), m_statusbox); @@ -76,10 +76,10 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) lay0->addWidget(m_testpagebox); lay0->addWidget(m_statusbox); lay0->addStretch(1); - TQVBoxLayout *lay1 = new TQVBoxLayout(TQT_TQLAYOUT(m_timerbox->layout()), + TQVBoxLayout *lay1 = new TQVBoxLayout(m_timerbox->layout(), KDialog::spacingHint()); lay1->addWidget(m_timer); - TQVBoxLayout *lay2 = new TQVBoxLayout(TQT_TQLAYOUT(m_testpagebox->layout()), + TQVBoxLayout *lay2 = new TQVBoxLayout(m_testpagebox->layout(), KDialog::spacingHint()); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 0); lay2->addWidget(m_defaulttestpage); @@ -87,7 +87,7 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) lay2->addLayout(lay3); lay3->addStretch(1); lay3->addWidget(m_preview); - TQVBoxLayout *lay4 = new TQVBoxLayout(TQT_TQLAYOUT(m_statusbox->layout()), + TQVBoxLayout *lay4 = new TQVBoxLayout(m_statusbox->layout(), KDialog::spacingHint()); lay4->addWidget(m_statusmsg); lay4->addWidget(m_uselast); diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h index b82a91daa..190b4f38a 100644 --- a/tdeprint/management/kmconfiggeneral.h +++ b/tdeprint/management/kmconfiggeneral.h @@ -28,7 +28,7 @@ class TQCheckBox; class TQPushButton; class KMConfigGeneral : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigGeneral(TQWidget *parent = 0); diff --git a/tdeprint/management/kmconfigjobs.cpp b/tdeprint/management/kmconfigjobs.cpp index 1c712de3d..39b783d48 100644 --- a/tdeprint/management/kmconfigjobs.cpp +++ b/tdeprint/management/kmconfigjobs.cpp @@ -34,7 +34,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) setPageHeader(i18n("Print Job Settings")); setPagePixmap("application-x-executable"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Jobs Shown"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Jobs Shown"), this); m_limit = new KIntNumInput(box); m_limit->setRange(0, 9999, 1, true); @@ -44,7 +44,7 @@ KMConfigJobs::KMConfigJobs(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box, 0); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(m_limit); } diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h index 29818d68a..0edab1056 100644 --- a/tdeprint/management/kmconfigjobs.h +++ b/tdeprint/management/kmconfigjobs.h @@ -26,7 +26,7 @@ class KIntNumInput; class KMConfigJobs : public KMConfigPage { - Q_OBJECT + TQ_OBJECT public: KMConfigJobs(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h index f29b8a23e..533ff80f4 100644 --- a/tdeprint/management/kmconfigpage.h +++ b/tdeprint/management/kmconfigpage.h @@ -28,7 +28,7 @@ class TDEConfig; class TDEPRINT_EXPORT KMConfigPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMConfigPage(TQWidget *parent = 0, const char *name = 0); @@ -45,9 +45,9 @@ protected: void setPagePixmap(const TQString& s) { m_pixmap = s; } protected: - QString m_name; - QString m_header; - QString m_pixmap; + TQString m_name; + TQString m_header; + TQString m_pixmap; }; #endif diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp index 2fdcbcb4b..b3c8aa39e 100644 --- a/tdeprint/management/kmconfigpreview.cpp +++ b/tdeprint/management/kmconfigpreview.cpp @@ -36,7 +36,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) setPageHeader(i18n("Preview Settings")); setPagePixmap("filefind"); - TQGroupBox *box = new TQGroupBox(0, Qt::Vertical, i18n("Preview Program"), this); + TQGroupBox *box = new TQGroupBox(0, TQt::Vertical, i18n("Preview Program"), this); m_useext = new TQCheckBox(i18n("&Use external preview program"), box); m_program = new KURLRequester(box); @@ -50,12 +50,12 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 0, KDialog::spacingHint()); l0->addWidget(box); l0->addStretch(1); - TQVBoxLayout *l1 = new TQVBoxLayout(TQT_TQLAYOUT(box->layout()), KDialog::spacingHint()); + TQVBoxLayout *l1 = new TQVBoxLayout(box->layout(), KDialog::spacingHint()); l1->addWidget(lab); l1->addWidget(m_useext); l1->addWidget(m_program); - connect(m_useext, TQT_SIGNAL(toggled(bool)), m_program, TQT_SLOT(setEnabled(bool))); + connect(m_useext, TQ_SIGNAL(toggled(bool)), m_program, TQ_SLOT(setEnabled(bool))); m_program->setEnabled(false); } diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 6154ebea2..3d0fa8638 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -26,7 +26,7 @@ #include <tqdir.h> #include <tdelocale.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> KMDBCreator::KMDBCreator(TQObject *parent, const char *name) @@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name) m_dlg = 0; m_status = true; - connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*))); } KMDBCreator::~KMDBCreator() @@ -51,7 +51,7 @@ KMDBCreator::~KMDBCreator() bool KMDBCreator::checkDriverDB(const TQString& dirname, const TQDateTime& d) { // don't block GUI - kapp->processEvents(); + tdeApp->processEvents(); // first check current directory TQFileInfo dfi(dirname); @@ -112,7 +112,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true); m_dlg->setLabelText(i18n("Please wait while TDE rebuilds a driver database.")); m_dlg->setCaption(i18n("Driver Database")); - connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled())); + connect(m_dlg,TQ_SIGNAL(canceled()),TQ_SLOT(slotCancelled())); } m_dlg->setMinimumDuration(0); // always show the dialog m_dlg->setProgress(0); // to force showing diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h index 4b1983ae6..156eb81a3 100644 --- a/tdeprint/management/kmdbcreator.h +++ b/tdeprint/management/kmdbcreator.h @@ -23,14 +23,14 @@ #include <tqobject.h> #include <tqstring.h> #include <tqdatetime.h> -#include <kprocess.h> +#include <tdeprocess.h> class TQWidget; class TQProgressDialog; class KMDBCreator : public TQObject { - Q_OBJECT + TQ_OBJECT public: KMDBCreator(TQObject *parent = 0, const char *name = 0); ~KMDBCreator(); diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index 5a172281b..5234dd6d6 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -27,7 +27,7 @@ #include <tqfile.h> #include <tqtextstream.h> #include <tqfileinfo.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdemessagebox.h> @@ -47,7 +47,7 @@ KMDriverDB::KMDriverDB(TQObject *parent, const char *name) : TQObject(parent,name) { m_creator = new KMDBCreator(this,"db-creator"); - connect(m_creator,TQT_SIGNAL(dbCreated()),TQT_SLOT(slotDbCreated())); + connect(m_creator,TQ_SIGNAL(dbCreated()),TQ_SLOT(slotDbCreated())); m_entries.setAutoDelete(true); m_pnpentries.setAutoDelete(true); @@ -177,7 +177,7 @@ void KMDriverDB::insertEntry(KMDBEntry *entry) } // don't block GUI - kapp->processEvents(); + tdeApp->processEvents(); } /* diff --git a/tdeprint/management/kmdriverdb.h b/tdeprint/management/kmdriverdb.h index c5af6d53e..8dec3e8f0 100644 --- a/tdeprint/management/kmdriverdb.h +++ b/tdeprint/management/kmdriverdb.h @@ -31,7 +31,7 @@ class KMDBCreator; class KMDriverDB : public TQObject { - Q_OBJECT + TQ_OBJECT public: static KMDriverDB* self(); diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index 7223dbcd3..c49af544a 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -62,7 +62,7 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); TQGridLayout *sub1_ = new TQGridLayout(0, 2, 3, 0, 0); TQHBoxLayout *sub2_ = new TQHBoxLayout(0, 0, 10); - main_->addLayout(TQT_TQLAYOUT(sub1_)); + main_->addLayout(sub1_); main_->addLayout(sub2_); main_->addWidget(m_raw); sub1_->addWidget(l1,0,0); @@ -74,19 +74,19 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) sub2_->addWidget(m_other,0); // build connections - connect(KMDriverDB::self(),TQT_SIGNAL(dbLoaded(bool)),TQT_SLOT(slotDbLoaded(bool))); - connect(KMDriverDB::self(), TQT_SIGNAL(error(const TQString&)), TQT_SLOT(slotError(const TQString&))); - connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),TQT_SLOT(slotManufacturerSelected(const TQString&))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_postscript,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_raw,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotPostscriptToggled(bool))); - connect(m_other,TQT_SIGNAL(clicked()),TQT_SLOT(slotOtherClicked())); + connect(KMDriverDB::self(),TQ_SIGNAL(dbLoaded(bool)),TQ_SLOT(slotDbLoaded(bool))); + connect(KMDriverDB::self(), TQ_SIGNAL(error(const TQString&)), TQ_SLOT(slotError(const TQString&))); + connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),TQ_SLOT(slotManufacturerSelected(const TQString&))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_postscript,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_raw,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotPostscriptToggled(bool))); + connect(m_other,TQ_SIGNAL(clicked()),TQ_SLOT(slotOtherClicked())); } KMDriverDbWidget::~KMDriverDbWidget() @@ -240,7 +240,7 @@ void KMDriverDbWidget::slotOtherClicked() if (driver) { m_external = filename; - disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); + disconnect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&))); m_manu->clear(); m_model->clear(); TQString s = driver->get("manufacturer"); @@ -264,7 +264,7 @@ void KMDriverDbWidget::slotOtherClicked() else { m_external = TQString::null; - connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); + connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&))); m_other->setText(i18n("Other")); m_desc = TQString::null; slotDbLoaded(true); diff --git a/tdeprint/management/kmdriverdbwidget.h b/tdeprint/management/kmdriverdbwidget.h index 05b50536d..2841fd51f 100644 --- a/tdeprint/management/kmdriverdbwidget.h +++ b/tdeprint/management/kmdriverdbwidget.h @@ -29,7 +29,7 @@ class TQPushButton; class KMDriverDbWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMDriverDbWidget(TQWidget *parent = 0, const char *name = 0); ~KMDriverDbWidget(); diff --git a/tdeprint/management/kmdriverdialog.h b/tdeprint/management/kmdriverdialog.h index 8b7b01c45..3a62619ed 100644 --- a/tdeprint/management/kmdriverdialog.h +++ b/tdeprint/management/kmdriverdialog.h @@ -27,7 +27,7 @@ class DrMain; class KMDriverDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMDriverDialog(TQWidget *parent = 0, const char *name = 0); ~KMDriverDialog(); diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 5cd37c948..bfc34570d 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -129,8 +129,8 @@ KMIconView::KMIconView(TQWidget *parent, const char *name) m_items.setAutoDelete(false); setViewMode(KMIconView::Big); - connect(this,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); - connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); + connect(this,TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); + connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); } KMIconView::~KMIconView() diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h index 1c8cb197e..ba56cabb1 100644 --- a/tdeprint/management/kmiconview.h +++ b/tdeprint/management/kmiconview.h @@ -40,14 +40,14 @@ protected: private: int m_mode; - QString m_pixmap; + TQString m_pixmap; char m_state; bool m_isclass; }; class KMIconView : public TDEIconView { - Q_OBJECT + TQ_OBJECT public: enum ViewMode { Big, Small }; diff --git a/tdeprint/management/kminfopage.cpp b/tdeprint/management/kminfopage.cpp index bae2b6ad6..06b37713d 100644 --- a/tdeprint/management/kminfopage.cpp +++ b/tdeprint/management/kminfopage.cpp @@ -32,7 +32,7 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) { m_title = new TQLabel(this); m_titlepixmap = new TQLabel(this); - m_titlepixmap->setAlignment(Qt::AlignCenter); + m_titlepixmap->setAlignment(TQt::AlignCenter); KSeparator* sep = new KSeparator( KSeparator::HLine, this); m_type = new TQLabel(this); m_description = new TQLabel(this); @@ -42,19 +42,19 @@ KMInfoPage::KMInfoPage(TQWidget *parent, const char *name) m_uri = new TQLabel(this); m_device = new TQLabel(this); TQLabel *m_loclabel = new TQLabel(i18n("Physical Location", "Location:"), this); - m_loclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_loclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_desclabel = new TQLabel(i18n("Description:"), this); - m_desclabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_desclabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_typelabel = new TQLabel(i18n("Type:"), this); - m_typelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_typelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_statelabel = new TQLabel(i18n("Status", "State:"), this); - m_statelabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_statelabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_urilabel = new TQLabel(i18n("URI:"), this); - m_urilabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_urilabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); m_devlabel = new TQLabel(i18n("Device:"), this); - m_devlabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_devlabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQLabel *m_modellabel = new TQLabel(i18n("Model:"), this); - m_modellabel->setAlignment(Qt::AlignRight|Qt::AlignVCenter); + m_modellabel->setAlignment(TQt::AlignRight|TQt::AlignVCenter); TQGridLayout *lay0 = new TQGridLayout(this, 11, 2, 0, 5); TQHBoxLayout *lay1 = new TQHBoxLayout(0, 0, 10); @@ -125,7 +125,7 @@ void KMInfoPage::setPrinter(KMPrinter *p) m_uri->setText(p->uri().prettyURL()); if (p->isClass(false)) { - QString s; + TQString s; for (TQStringList::ConstIterator it=p->members().begin(); it!=p->members().end(); ++it) s.append(KURL(*it).prettyURL() + ", "); s.truncate(s.length()-2); diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index 45030a587..57e5cb445 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -35,7 +35,7 @@ #include <tdelistbox.h> #include <tdelocale.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> KMInstancePage::KMInstancePage(TQWidget *parent, const char *name) @@ -78,20 +78,20 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons btn->setText(txt); btn->setIconSet(BarIconSet(pixmap)); btn->setFlat(true); - connect(btn, TQT_SIGNAL(clicked()), receiver); + connect(btn, TQ_SIGNAL(clicked()), receiver); m_buttons.append(btn); } void KMInstancePage::initActions() { - addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew())); - addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy())); - addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove())); + addButton(i18n("New..."), "document-new", TQ_SLOT(slotNew())); + addButton(i18n("Copy..."), "edit-copy", TQ_SLOT(slotCopy())); + addButton(i18n("Remove"), "edittrash", TQ_SLOT(slotRemove())); m_buttons.append(0); - addButton(i18n("Set as Default"), "application-x-executable", TQT_SLOT(slotDefault())); - addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings())); + addButton(i18n("Set as Default"), "application-x-executable", TQ_SLOT(slotDefault())); + addButton(i18n("Settings"), "configure", TQ_SLOT(slotSettings())); m_buttons.append(0); - addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest())); + addButton(i18n("Test..."), "document-print", TQ_SLOT(slotTest())); } void KMInstancePage::setPrinter(KMPrinter *p) diff --git a/tdeprint/management/kminstancepage.h b/tdeprint/management/kminstancepage.h index 56b045fe2..67bef455e 100644 --- a/tdeprint/management/kminstancepage.h +++ b/tdeprint/management/kminstancepage.h @@ -30,7 +30,7 @@ class TQButton; class KMInstancePage : public TQWidget, public KMPrinterPage { - Q_OBJECT + TQ_OBJECT public: KMInstancePage(TQWidget *parent = 0, const char *name = 0); ~KMInstancePage(); diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index 70a6c6e85..5f0c6756b 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -105,7 +105,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name) resize( conf->readSizeEntry( "Size", &defSize ) ); } - connect(KMFactory::self()->manager(), TQT_SIGNAL(printerListUpdated()),TQT_SLOT(slotPrinterListUpdated())); + connect(KMFactory::self()->manager(), TQ_SIGNAL(printerListUpdated()),TQ_SLOT(slotPrinterListUpdated())); } KMJobViewer::~KMJobViewer() @@ -240,18 +240,18 @@ void KMJobViewer::init() m_view->addColumn(i18n("Status", "State")); m_view->addColumn(i18n("Size (KB)")); m_view->addColumn(i18n("Page(s)")); - m_view->setColumnAlignment(5,Qt::AlignRight|Qt::AlignVCenter); - connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); + m_view->setColumnAlignment(5,TQt::AlignRight|TQt::AlignVCenter); + connect( m_view, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); //m_view->addColumn(i18n("Printer")); - //m_view->setColumnAlignment(6,Qt::AlignRight|Qt::AlignVCenter); + //m_view->setColumnAlignment(6,TQt::AlignRight|TQt::AlignVCenter); KMFactory::self()->uiManager()->setupJobViewer(m_view); m_view->setFrameStyle(TQFrame::WinPanel|TQFrame::Sunken); m_view->setLineWidth(1); m_view->setSorting(0); m_view->setAllColumnsShowFocus(true); m_view->setSelectionMode(TQListView::Extended); - connect(m_view,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); - connect(m_view,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int))); + connect(m_view,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); + connect(m_view,TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int))); setCentralWidget(m_view); } @@ -261,26 +261,26 @@ void KMJobViewer::init() void KMJobViewer::initActions() { // job actions - TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,TQT_TQOBJECT(this),TQT_SLOT(slotHold()),actionCollection(),"job_hold"); - TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,TQT_TQOBJECT(this),TQT_SLOT(slotResume()),actionCollection(),"job_resume"); - TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",Qt::Key_Delete,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); - TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,TQT_TQOBJECT(this),TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); + TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQ_SLOT(slotHold()),actionCollection(),"job_hold"); + TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQ_SLOT(slotResume()),actionCollection(),"job_resume"); + TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQ_SLOT(slotRemove()),actionCollection(),"job_remove"); + TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQ_SLOT(slotRestart()),actionCollection(),"job_restart"); TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move"); mact->setDelayed(false); - connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu())); + connect(mact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotMove(int))); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowMoveMenu())); TDEToggleAction *tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed"); tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowCompleted(bool))); TDEToggleAction *uact = new TDEToggleAction(i18n("Show Only User Jobs"), "preferences-desktop-personal", 0, actionCollection(), "view_user_jobs"); uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"preferences-desktop-personal")); - connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool))); + connect(uact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUserOnly(bool))); m_userfield = new TQLineEdit(0); m_userfield->setText(getenv("USER")); - connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged())); - connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool))); + connect(m_userfield, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotUserChanged())); + connect(uact, TQ_SIGNAL(toggled(bool)), m_userfield, TQ_SLOT(setEnabled(bool))); m_userfield->setEnabled(false); m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); KWidgetAction *ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username"); @@ -288,8 +288,8 @@ void KMJobViewer::initActions() if (!m_pop) { m_pop = new TQPopupMenu(this); - connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); + connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); hact->plug(m_pop); ract->plug(m_pop); m_pop->insertSeparator(); @@ -302,10 +302,10 @@ void KMJobViewer::initActions() // Filter actions TDEActionMenu *fact = new TDEActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify"); fact->setDelayed(false); - connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowPrinterMenu())); + connect(fact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int))); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowPrinterMenu())); if (!m_standalone) { @@ -324,12 +324,12 @@ void KMJobViewer::initActions() } else {// stand-alone application - KStdAction::quit(TQT_TQOBJECT(kapp),TQT_SLOT(quit()),actionCollection()); - KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(slotClose()),actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); + KStdAction::quit(tdeApp,TQ_SLOT(quit()),actionCollection()); + KStdAction::close(this,TQ_SLOT(slotClose()),actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); // refresh action - new TDEAction(i18n("Refresh"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); + new TDEAction(i18n("Refresh"),"reload",0,this,TQ_SLOT(slotRefresh()),actionCollection(),"refresh"); // create status bar KStatusBar *statusbar = statusBar(); @@ -338,7 +338,7 @@ void KMJobViewer::initActions() TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); m_stickybox->setChecked(conf->readBoolEntry("KeepWindow",false)); - connect(m_stickybox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeepWindowChange(bool))); + connect(m_stickybox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeepWindowChange(bool))); statusbar->addWidget( m_stickybox, 1, false ); statusbar->insertItem(" " + i18n("Max.: %1").arg(i18n("Unlimited"))+ " ", 0, 0, true); statusbar->setItemFixed(0); @@ -617,7 +617,7 @@ void KMJobViewer::loadPluginActions() for (TQValueListIterator<TDEAction*> it=acts.begin(); it!=acts.end(); ++it) { // connect the action to this - connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int))); + connect((*it), TQ_SIGNAL(activated(int)), TQ_SLOT(pluginActionActivated(int))); // should add it to the toolbar and menubar (*it)->plug(toolBar(), toolbarindex++); @@ -674,7 +674,7 @@ void KMJobViewer::reload() void KMJobViewer::closeEvent(TQCloseEvent *e) { - if (m_standalone && !kapp->sessionSaving()) + if (m_standalone && !tdeApp->sessionSaving()) { hide(); e->ignore(); diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h index f9e6ffb80..38db6c16c 100644 --- a/tdeprint/management/kmjobviewer.h +++ b/tdeprint/management/kmjobviewer.h @@ -48,7 +48,7 @@ class TQCheckBox; */ class TDEPRINT_EXPORT KMJobViewer : public TDEMainWindow, public KMPrinterPage, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMJobViewer(TQWidget *parent = 0, const char *name = 0); ~KMJobViewer(); diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 806cc0d9f..09c89d915 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -81,7 +81,7 @@ void KMListViewItem::updatePrinter(KMPrinter *p) int st(p->isValid() ? (int)TDEIcon::DefaultState : (int)TDEIcon::LockOverlay); m_state = ((p->isHardDefault() ? 0x1 : 0x0) | (p->ownSoftDefault() ? 0x2 : 0x0) | (p->isValid() ? 0x4 : 0x0)); update = (oldstate != m_state); - QString name = (p->isVirtual() ? p->instanceName() : p->name()); + TQString name = (p->isVirtual() ? p->instanceName() : p->name()); if (name != text(0)) setText(0, name); setPixmap(0, SmallIcon(p->pixmap(), 0, st)); @@ -117,10 +117,10 @@ KMListView::KMListView(TQWidget *parent, const char *name) setLineWidth(1); setSorting(0); - connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int))); - connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); - connect(this,TQT_SIGNAL(onItem(TQListViewItem*)),TQT_SLOT(slotOnItem(TQListViewItem*))); - connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport())); + connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int))); + connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); + connect(this,TQ_SIGNAL(onItem(TQListViewItem*)),TQ_SLOT(slotOnItem(TQListViewItem*))); + connect(this,TQ_SIGNAL(onViewport()),TQ_SLOT(slotOnViewport())); m_root = new KMListViewItem(this,i18n("Print System")); m_root->setPixmap(0,SmallIcon("tdeprint_printer")); diff --git a/tdeprint/management/kmlistview.h b/tdeprint/management/kmlistview.h index 20ddc5731..472f0d2cc 100644 --- a/tdeprint/management/kmlistview.h +++ b/tdeprint/management/kmlistview.h @@ -28,7 +28,7 @@ class KMPrinter; class KMListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: KMListView(TQWidget *parent = 0, const char *name = 0); ~KMListView(); diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index ce3f356d8..ee2802a57 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -52,10 +52,10 @@ #include <tdepopupmenu.h> #include <klibloader.h> #include <kdialogbase.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> -#include <kprocess.h> +#include <tdeprocess.h> #undef m_manager #define m_manager KMFactory::self()->manager() @@ -111,12 +111,12 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection * m_layout->addWidget(m_plugin, 0); // connections - connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer())); - connect(m_printerview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); - connect(m_printerview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&))); - connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect(KMTimer::self(),TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer())); + connect(m_printerview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); + connect(m_printerview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&))); + connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); // actions if (coll) @@ -148,7 +148,7 @@ void KMMainView::restoreSettings() TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("General"); setViewType((KMPrinterView::ViewType)conf->readNumEntry("ViewType",KMPrinterView::Icons)); - setOrientation(conf->readNumEntry("Orientation", Qt::Vertical)); + setOrientation(conf->readNumEntry("Orientation", TQt::Vertical)); bool view = conf->readBoolEntry("ViewToolBar",false); slotToggleToolBar(view); ((TDEToggleAction*)m_actions->action("view_toolbar"))->setChecked(view); @@ -179,61 +179,61 @@ void KMMainView::initActions() iconlst << "view_icon" << "view_detailed" << "view_tree"; vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst); vact->setCurrentItem(0); - connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); + connect(vact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeView(int))); TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); - stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); + stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); - stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); - - new TDEAction(i18n("&Remove"),"edittrash",0,TQT_TQOBJECT(this),TQT_SLOT(slotRemove()),m_actions,"printer_remove"); - new TDEAction(i18n("&Configure..."),"configure",0,TQT_TQOBJECT(this),TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); - new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotAdd()),m_actions,"printer_add"); - new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,TQT_TQOBJECT(this),TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); - new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,TQT_TQOBJECT(this),TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); - new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,TQT_TQOBJECT(this),TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); - new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,TQT_TQOBJECT(this),TQT_SLOT(slotTest()),m_actions,"printer_test"); - new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,TQT_TQOBJECT(this),TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); - new TDEAction(i18n("Initialize Manager/&View"),"reload",0,TQT_TQOBJECT(this),TQT_SLOT(slotInit()),m_actions,"view_refresh"); + stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + + new TDEAction(i18n("&Remove"),"edittrash",0,this,TQ_SLOT(slotRemove()),m_actions,"printer_remove"); + new TDEAction(i18n("&Configure..."),"configure",0,this,TQ_SLOT(slotConfigure()),m_actions,"printer_configure"); + new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQ_SLOT(slotAdd()),m_actions,"printer_add"); + new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQ_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQ_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQ_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQ_SLOT(slotTest()),m_actions,"printer_test"); + new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQ_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQ_SLOT(slotInit()),m_actions,"view_refresh"); TDEIconSelectAction *dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); iconlst.clear(); iconlst << "view_top_bottom" << "view_left_right"; dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst); dact->setCurrentItem(0); - connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); + connect(dact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeDirection(int))); - new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); - new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); - new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,TQT_TQOBJECT(this),TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); + new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQ_SLOT(slotServerRestart()),m_actions,"server_restart"); + new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotToggleToolBar(bool))); tact = new TDEToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" ); tact->setCheckedState(i18n("Hide Me&nu Toolbar")); - connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) ); + connect( tact, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotToggleMenuBar( bool ) ) ); tact = new TDEToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos"); tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos")); tact->setChecked(true); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowPrinterInfos(bool))); tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter"); tact->setChecked(KMManager::self()->isFilterEnabled()); - connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); + connect(tact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool))); TDEActionMenu *mact = new TDEActionMenu(i18n("Pri&nter Tools"), "applications-utilities", m_actions, "printer_tool"); mact->setDelayed(false); - connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); + connect(mact->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotToolSelected(int))); TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { - KSimpleConfig conf(*it); + TDESimpleConfig conf(*it); conf.setGroup("Desktop Entry"); mact->popupMenu()->insertItem(conf.readEntry("Name", "Unnamed"), mact->popupMenu()->count()); m_toollist << conf.readEntry("X-TDE-Library"); @@ -493,7 +493,7 @@ void KMMainView::slotRightButtonClicked(const TQString& prname, const TQPoint& p void KMMainView::slotChangePrinterState() { - TQString opname = TQT_TQOBJECT_CONST(sender())->name(); + TQString opname = sender()->name(); if (m_current && opname.startsWith("printer_")) { opname = opname.mid(8); @@ -608,13 +608,13 @@ void KMMainView::slotSoftDefault() void KMMainView::setOrientation(int o) { - int ID = (o == Qt::Horizontal ? 1 : 0); + int ID = (o == TQt::Horizontal ? 1 : 0); ((TDESelectAction*)m_actions->action("orientation_change"))->setCurrentItem(ID); slotChangeDirection(ID); } int KMMainView::orientation() const -{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? Qt::Horizontal : Qt::Vertical); } +{ return (m_boxlayout->direction() == TQBoxLayout::LeftToRight ? TQt::Horizontal : TQt::Vertical); } void KMMainView::slotChangeDirection(int d) { @@ -776,7 +776,7 @@ void KMMainView::reload() loadPluginActions(); // redo the connection as the old manager object has been removed - connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); // We must delay the refresh such that all objects has been // correctly reloaded (otherwise, crash in KMJobViewer). @@ -831,7 +831,7 @@ void KMMainView::slotToolSelected(int ID) { TQStringList args; args << m_current->device() << m_current->printerName(); - KDialogBase *dlg = static_cast<KDialogBase*>(TQT_TQWIDGET(factory->create(TQT_TQOBJECT(this), "Tool", 0, args))); + KDialogBase *dlg = static_cast<KDialogBase*>(factory->create(this, "Tool", 0, args)); if (dlg) dlg->exec(); delete dlg; diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h index b35e7ef0f..9c55fe433 100644 --- a/tdeprint/management/kmmainview.h +++ b/tdeprint/management/kmmainview.h @@ -52,7 +52,7 @@ class TQMenuBar; */ class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMMainView(TQWidget *parent = 0, const char *name = 0, TDEActionCollection *coll = 0); ~KMMainView(); diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp index d311f75c3..c937d3875 100644 --- a/tdeprint/management/kmprinterview.cpp +++ b/tdeprint/management/kmprinterview.cpp @@ -39,12 +39,12 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) m_current = TQString(); m_listset = false; - connect(m_iconview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); - connect(m_listview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); - connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&))); - connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&))); - connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); - connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); + connect(m_iconview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); + connect(m_listview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); + connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&))); + connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&))); + connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); + connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); setViewType(m_type); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); @@ -85,7 +85,7 @@ void KMPrinterView::setViewType(ViewType t) default: break; } - QString oldcurrent = m_current; + TQString oldcurrent = m_current; if ( m_listset ) setPrinterList(KMManager::self()->printerList(false)); if (m_type == KMPrinterView::Tree) diff --git a/tdeprint/management/kmprinterview.h b/tdeprint/management/kmprinterview.h index 14354a3b5..b73bc46da 100644 --- a/tdeprint/management/kmprinterview.h +++ b/tdeprint/management/kmprinterview.h @@ -30,7 +30,7 @@ class TQIconViewItem; class KMPrinterView : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: enum ViewType { Icons = 0, List, Tree }; @@ -55,7 +55,7 @@ private: KMIconView *m_iconview; KMListView *m_listview; ViewType m_type; - QString m_current; + TQString m_current; bool m_listset; }; diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp index c94838098..b1a993893 100644 --- a/tdeprint/management/kmpropcontainer.cpp +++ b/tdeprint/management/kmpropcontainer.cpp @@ -53,9 +53,9 @@ void KMPropContainer::setWidget(KMPropWidget *w) { m_widget = w; m_widget->reparent(this,TQPoint(0,0)); - connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange())); - connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool))); - connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool))); + connect(m_button,TQ_SIGNAL(clicked()),m_widget,TQ_SLOT(slotChange())); + connect(m_widget,TQ_SIGNAL(enable(bool)),TQ_SIGNAL(enable(bool))); + connect(m_widget,TQ_SIGNAL(enableChange(bool)),TQ_SLOT(slotEnableChange(bool))); TQVBoxLayout *lay = dynamic_cast<TQVBoxLayout*>(layout()); if (lay) { diff --git a/tdeprint/management/kmpropcontainer.h b/tdeprint/management/kmpropcontainer.h index d191dfeb6..eadcde1e3 100644 --- a/tdeprint/management/kmpropcontainer.h +++ b/tdeprint/management/kmpropcontainer.h @@ -28,7 +28,7 @@ class KMPrinter; class KMPropContainer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMPropContainer(TQWidget *parent = 0, const char *name = 0); ~KMPropContainer(); diff --git a/tdeprint/management/kmpropdriver.cpp b/tdeprint/management/kmpropdriver.cpp index 6f20494fc..7fc31d977 100644 --- a/tdeprint/management/kmpropdriver.cpp +++ b/tdeprint/management/kmpropdriver.cpp @@ -44,7 +44,7 @@ KMPropDriver::KMPropDriver(TQWidget *parent, const char *name) main_->setRowStretch(3,1); main_->addWidget(l1,0,0); main_->addWidget(l2,1,0); - main_->addWidget(l3,2,0,Qt::AlignTop|Qt::AlignLeft); + main_->addWidget(l3,2,0,TQt::AlignTop|TQt::AlignLeft); main_->addWidget(m_manufacturer,0,1); main_->addWidget(m_model,1,1); main_->addWidget(m_driverinfo,2,1); diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index c38b399c6..eefa38372 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -55,7 +55,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) m_widgets.append(w); KMPropContainer *ctn = new KMPropContainer(this,"Container"); ctn->setWidget(w); - connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); + connect(ctn,TQ_SIGNAL(enable(bool)),TQ_SLOT(slotEnable(bool))); TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h index 5acee87fd..c54011d25 100644 --- a/tdeprint/management/kmpropertypage.h +++ b/tdeprint/management/kmpropertypage.h @@ -31,7 +31,7 @@ class KMPrinter; class TDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject { - Q_OBJECT + TQ_OBJECT public: KMPropertyPage(TQWidget *parent = 0, const char *name = 0); ~KMPropertyPage(); diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp index 50c1a75e8..c38b4c186 100644 --- a/tdeprint/management/kmpropwidget.cpp +++ b/tdeprint/management/kmpropwidget.cpp @@ -34,7 +34,7 @@ KMPropWidget::KMPropWidget(TQWidget *parent, const char *name) m_printer = 0; m_canchange = ((KMFactory::self()->manager()->printerOperationMask() & KMManager::PrinterCreation) && KMFactory::self()->manager()->hasManagement()); - connect(this,TQT_SIGNAL(enable(bool)),this,TQT_SIGNAL(enableChange(bool))); + connect(this,TQ_SIGNAL(enable(bool)),this,TQ_SIGNAL(enableChange(bool))); } KMPropWidget::~KMPropWidget() diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h index 9d418066a..3c8d0050d 100644 --- a/tdeprint/management/kmpropwidget.h +++ b/tdeprint/management/kmpropwidget.h @@ -29,7 +29,7 @@ class KMWizard; class TDEPRINT_EXPORT KMPropWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMPropWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KMPropWidget(); @@ -53,9 +53,9 @@ protected: virtual void configureWizard(KMWizard*); protected: - QString m_pixmap; - QString m_title; - QString m_header; + TQString m_pixmap; + TQString m_title; + TQString m_header; KMPrinter *m_printer; bool m_canchange; }; diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp index db6dc1486..3f2a22a75 100644 --- a/tdeprint/management/kmspecialprinterdlg.cpp +++ b/tdeprint/management/kmspecialprinterdlg.cpp @@ -50,7 +50,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) // widget creation m_name = new TQLineEdit(dummy); - connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & ))); + connect(m_name, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotTextChanged(const TQString & ))); m_description = new TQLineEdit(dummy); m_location = new TQLineEdit(dummy); TQLabel *m_namelabel = new TQLabel(i18n("&Name:"), dummy); @@ -63,10 +63,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, dummy); sep->setFixedHeight(10); - TQGroupBox *m_gb = new TQGroupBox(1, Qt::Horizontal, i18n("Command &Settings"), dummy); + TQGroupBox *m_gb = new TQGroupBox(1, TQt::Horizontal, i18n("Command &Settings"), dummy); m_command = new KXmlCommandSelector(true, m_gb, "CommandSelector", this); - TQGroupBox *m_outfile_gb = new TQGroupBox( 0, Qt::Horizontal, i18n( "Outp&ut File" ), dummy ); + TQGroupBox *m_outfile_gb = new TQGroupBox( 0, TQt::Horizontal, i18n( "Outp&ut File" ), dummy ); m_usefile = new TQCheckBox( i18n("&Enable output file"), m_outfile_gb); @@ -92,10 +92,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) m_icon->setIcon("document-print"); m_icon->setFixedSize(TQSize(48,48)); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extension, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extensionlabel, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetype, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extension, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extensionlabel, TQ_SLOT( setEnabled( bool ) ) ); m_mimetypelabel->setEnabled( false ); m_mimetype->setEnabled( false ); m_extensionlabel->setEnabled( false ); @@ -125,10 +125,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) // layout creation TQVBoxLayout *l0 = new TQVBoxLayout(dummy, 0, 10); TQGridLayout *l1 = new TQGridLayout(0, 3, 3, 0, 5); - l0->addLayout(TQT_TQLAYOUT(l1)); + l0->addLayout(l1); l1->setColStretch(2,1); l1->addColSpacing(0,60); - l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, Qt::AlignCenter); + l1->addMultiCellWidget(m_icon, 0, 2, 0, 0, TQt::AlignCenter); l1->addWidget(m_namelabel, 0, 1); l1->addWidget(m_desclabel, 1, 1); l1->addWidget(m_loclabel, 2, 1); diff --git a/tdeprint/management/kmspecialprinterdlg.h b/tdeprint/management/kmspecialprinterdlg.h index 3d334c7fd..efa927474 100644 --- a/tdeprint/management/kmspecialprinterdlg.h +++ b/tdeprint/management/kmspecialprinterdlg.h @@ -31,7 +31,7 @@ class KXmlCommandSelector; class KMSpecialPrinterDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KMSpecialPrinterDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp index a0b1aa78d..a8ef55ee0 100644 --- a/tdeprint/management/kmtimer.cpp +++ b/tdeprint/management/kmtimer.cpp @@ -37,7 +37,7 @@ KMTimer* KMTimer::self() KMTimer::KMTimer(TQObject *parent, const char *name) : TQTimer(parent, name), m_count(0) { - connect(this, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(this, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); } KMTimer::~KMTimer() diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h index 0c2e0169a..d64c9c091 100644 --- a/tdeprint/management/kmtimer.h +++ b/tdeprint/management/kmtimer.h @@ -36,7 +36,7 @@ */ class TDEPRINT_EXPORT KMTimer : public TQTimer { - Q_OBJECT + TQ_OBJECT public: void delay(int t); ~KMTimer(); diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp index e04467632..e7ff0faff 100644 --- a/tdeprint/management/kmwclass.cpp +++ b/tdeprint/management/kmwclass.cpp @@ -46,8 +46,8 @@ KMWClass::KMWClass(TQWidget *parent, const char *name) TQToolButton *remove = new TQToolButton(this); add->setIconSet(BarIcon("forward")); remove->setIconSet(BarIcon("back")); - connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd())); - connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove())); + connect(add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAdd())); + connect(remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemove())); TQLabel *l1 = new TQLabel(i18n("Available printers:"), this); TQLabel *l2 = new TQLabel(i18n("Class printers:"), this); diff --git a/tdeprint/management/kmwclass.h b/tdeprint/management/kmwclass.h index a74f20117..286f930e7 100644 --- a/tdeprint/management/kmwclass.h +++ b/tdeprint/management/kmwclass.h @@ -26,7 +26,7 @@ class TDEListBox; class KMWClass : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWClass(TQWidget *parent = 0, const char *name = 0); ~KMWClass(); diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index cc52f1015..8d4e1e802 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -44,7 +44,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name) "you want to use. You will have the opportunity to test it as well as to " "change it if necessary.</p>")); m_drivercomment = new KPushButton(i18n("Driver Information"), this); - connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment())); + connect(m_drivercomment, TQ_SIGNAL(clicked()), TQ_SLOT(slotDriverComment())); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(l1,0); diff --git a/tdeprint/management/kmwdriverselect.h b/tdeprint/management/kmwdriverselect.h index 9c78008c1..6419232dd 100644 --- a/tdeprint/management/kmwdriverselect.h +++ b/tdeprint/management/kmwdriverselect.h @@ -28,7 +28,7 @@ class TQPushButton; class KMWDriverSelect : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWDriverSelect(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index 73871988a..dcc83d661 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -65,14 +65,14 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) TQGridLayout *lay2 = new TQGridLayout(0, 3, 3, 0, 0); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); lay1->addWidget(l0,0); - lay1->addLayout(TQT_TQLAYOUT(lay2),0); + lay1->addLayout(lay2,0); lay1->addLayout(lay3,0); lay1->addStretch(1); lay2->setColStretch(2,1); lay2->addColSpacing(1,10); lay2->addWidget(l1,0,0); lay2->addWidget(l2,1,0); - lay2->addWidget(l3,2,0,Qt::AlignLeft|Qt::AlignTop); + lay2->addWidget(l3,2,0,TQt::AlignLeft|TQt::AlignTop); lay2->addWidget(m_manufacturer,0,2); lay2->addWidget(m_model,1,2); lay2->addWidget(m_driverinfo,2,2); @@ -80,8 +80,8 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) lay3->addWidget(m_settings,0); lay3->addStretch(1); - connect(m_test,TQT_SIGNAL(clicked()),TQT_SLOT(slotTest())); - connect(m_settings,TQT_SIGNAL(clicked()),TQT_SLOT(slotSettings())); + connect(m_test,TQ_SIGNAL(clicked()),TQ_SLOT(slotTest())); + connect(m_settings,TQ_SIGNAL(clicked()),TQ_SLOT(slotSettings())); } KMWDriverTest::~KMWDriverTest() diff --git a/tdeprint/management/kmwdrivertest.h b/tdeprint/management/kmwdrivertest.h index 5c1aefaee..4bf68f06a 100644 --- a/tdeprint/management/kmwdrivertest.h +++ b/tdeprint/management/kmwdrivertest.h @@ -28,7 +28,7 @@ class DrMain; class KMWDriverTest : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWDriverTest(TQWidget *parent = 0, const char *name = 0); ~KMWDriverTest(); diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp index bc894c478..6d7b20399 100644 --- a/tdeprint/management/kmwizard.cpp +++ b/tdeprint/management/kmwizard.cpp @@ -74,10 +74,10 @@ KMWizard::KMWizard(TQWidget *parent, const char *name) KSeparator* sep2 = new KSeparator( KSeparator::HLine, this); TQPushButton *m_help = new KPushButton(KStdGuiItem::help(), this); - connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject())); - connect(m_next,TQT_SIGNAL(clicked()),TQT_SLOT(slotNext())); - connect(m_prev,TQT_SIGNAL(clicked()),TQT_SLOT(slotPrev())); - connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp())); + connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject())); + connect(m_next,TQ_SIGNAL(clicked()),TQ_SLOT(slotNext())); + connect(m_prev,TQ_SIGNAL(clicked()),TQ_SLOT(slotPrev())); + connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp())); m_side = new SidePixmap(this); if (!m_side->isValid()) @@ -244,7 +244,7 @@ void KMWizard::slotNext() void KMWizard::slotHelp() { - kapp->invokeHelp(TQString::null, "tdeprint"); + tdeApp->invokeHelp(TQString::null, "tdeprint"); } void KMWizard::enableWizard() diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h index 171158b37..63849c5bb 100644 --- a/tdeprint/management/kmwizard.h +++ b/tdeprint/management/kmwizard.h @@ -36,7 +36,7 @@ class SidePixmap; class TDEPRINT_EXPORT KMWizard : public TQDialog { - Q_OBJECT + TQ_OBJECT public: enum PageType { Start = 0, diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h index b02dbe9fe..f2a2565d6 100644 --- a/tdeprint/management/kmwizardpage.h +++ b/tdeprint/management/kmwizardpage.h @@ -28,7 +28,7 @@ class KMPrinter; class TDEPRINT_EXPORT KMWizardPage : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KMWizardPage(TQWidget *parent = 0, const char *name = 0); virtual ~KMWizardPage(); @@ -43,7 +43,7 @@ public: bool needsInitOnBack() { return m_needsinitonback; } protected: - QString m_title; + TQString m_title; int m_ID; int m_nextpage; bool m_needsinitonback; diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp index a3180000f..dce5fef41 100644 --- a/tdeprint/management/kmwlocal.cpp +++ b/tdeprint/management/kmwlocal.cpp @@ -50,10 +50,10 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name) TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); root->setPixmap(0, SmallIcon("tdeprint_computer")); root->setOpen(true); - connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); + connect(m_ports, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotPortSelected(TQListViewItem*))); TQLabel *l1 = new TQLabel(i18n("URI:"), this); m_localuri = new TQLineEdit(this); - connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_localuri, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotTextChanged( const TQString& ) ) ); m_parents[0] = new TQListViewItem(root, i18n("Parallel")); m_parents[1] = new TQListViewItem(root, m_parents[0], i18n("Serial")); m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB")); diff --git a/tdeprint/management/kmwlocal.h b/tdeprint/management/kmwlocal.h index e65128747..0216fae8f 100644 --- a/tdeprint/management/kmwlocal.h +++ b/tdeprint/management/kmwlocal.h @@ -30,7 +30,7 @@ class TQListViewItem; class KMWLocal : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWLocal(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwlpd.cpp b/tdeprint/management/kmwlpd.cpp index 3c4794ad1..631d4253b 100644 --- a/tdeprint/management/kmwlpd.cpp +++ b/tdeprint/management/kmwlpd.cpp @@ -66,7 +66,7 @@ bool KMWLpd::isValid(TQString& msg) void KMWLpd::updatePrinter(KMPrinter *p) { - QString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); + TQString dev = TQString::fromLatin1("lpd://%1/%2").arg(text(0)).arg(text(1)); p->setDevice(dev); } @@ -81,12 +81,12 @@ bool checkLpdQueue(const char *host, const char *queue) char res[64] = {0}; snprintf(res,64,"%c%s\n",(char)4,queue); - if (sock.tqwriteBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) + if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res))) return false; char buf[1024] = {0}; int n, tot(1); - while ((n = sock.tqreadBlock(res, 63)) > 0) + while ((n = sock.readBlock(res, 63)) > 0) { res[n] = 0; tot += n; diff --git a/tdeprint/management/kmwname.cpp b/tdeprint/management/kmwname.cpp index e8378371a..88f8fb416 100644 --- a/tdeprint/management/kmwname.cpp +++ b/tdeprint/management/kmwname.cpp @@ -50,7 +50,7 @@ bool KMWName::isValid(TQString& msg) } else if (text(0).find(TQRegExp("\\s")) != -1) { - QString conv = text(0); + TQString conv = text(0); conv.replace(TQRegExp("\\s"), ""); int result = KMessageBox::warningYesNoCancel(this, i18n("It is usually not a good idea to include spaces " diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp index 3cd71aadd..f7340b71b 100644 --- a/tdeprint/management/kmwpassword.cpp +++ b/tdeprint/management/kmwpassword.cpp @@ -63,8 +63,8 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name) m_login->setEnabled(false); m_password->setEnabled(false); - connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool))); - connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool))); + connect(btn3,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setEnabled(bool))); + connect(btn3,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setEnabled(bool))); // layout TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 ); @@ -72,7 +72,7 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name) main_->addSpacing( 10 ); main_->addWidget( m_btngroup ); TQGridLayout *l1 = new TQGridLayout( 0, 2, 3 ); - main_->addLayout( TQT_TQLAYOUT(l1) ); + main_->addLayout( l1 ); main_->addStretch( 1 ); l1->setColSpacing( 0, 35 ); l1->setColStretch( 2, 1 ); diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp index 44b2f493c..94bffc2b8 100644 --- a/tdeprint/management/kmwsmb.cpp +++ b/tdeprint/management/kmwsmb.cpp @@ -51,7 +51,7 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name) TQVBoxLayout *lay0 = new TQVBoxLayout(this, 0, 10); TQGridLayout *lay1 = new TQGridLayout(0, 3, 2, 0, 10); TQHBoxLayout *lay3 = new TQHBoxLayout(0, 0, 10); - lay0->addLayout(TQT_TQLAYOUT(lay1),0); + lay0->addLayout(lay1,0); lay0->addWidget(m_view,1); lay0->addLayout(lay3,0); lay0->addSpacing(10); @@ -67,10 +67,10 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name) lay3->addWidget(m_scan); lay3->addWidget(m_abort); - connect(m_scan,TQT_SIGNAL(clicked()),TQT_SLOT(slotScan())); - connect(m_abort,TQT_SIGNAL(clicked()),TQT_SLOT(slotAbort())); - connect(m_view,TQT_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&))); - connect(m_view,TQT_SIGNAL(running(bool)),m_abort,TQT_SLOT(setEnabled(bool))); + connect(m_scan,TQ_SIGNAL(clicked()),TQ_SLOT(slotScan())); + connect(m_abort,TQ_SIGNAL(clicked()),TQ_SLOT(slotAbort())); + connect(m_view,TQ_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&))); + connect(m_view,TQ_SIGNAL(running(bool)),m_abort,TQ_SLOT(setEnabled(bool))); } bool KMWSmb::isValid(TQString& msg) diff --git a/tdeprint/management/kmwsmb.h b/tdeprint/management/kmwsmb.h index 695379a79..e8c5361ec 100644 --- a/tdeprint/management/kmwsmb.h +++ b/tdeprint/management/kmwsmb.h @@ -28,7 +28,7 @@ class TQLabel; class KMWSmb : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWSmb(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp index a3fb71b3d..6692d8785 100644 --- a/tdeprint/management/kmwsocket.cpp +++ b/tdeprint/management/kmwsocket.cpp @@ -60,11 +60,11 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(40); - connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) ); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); + connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) ); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) ); // layout TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); diff --git a/tdeprint/management/kmwsocket.h b/tdeprint/management/kmwsocket.h index 7489d6ec7..b765c594d 100644 --- a/tdeprint/management/kmwsocket.h +++ b/tdeprint/management/kmwsocket.h @@ -29,7 +29,7 @@ class NetworkScanner; class KMWSocket : public KMWizardPage { - Q_OBJECT + TQ_OBJECT public: KMWSocket(TQWidget *parent = 0, const char *name = 0); ~KMWSocket(); diff --git a/tdeprint/management/kmwsocketutil.cpp b/tdeprint/management/kmwsocketutil.cpp index 02b0a6b69..7467440e8 100644 --- a/tdeprint/management/kmwsocketutil.cpp +++ b/tdeprint/management/kmwsocketutil.cpp @@ -58,7 +58,7 @@ SocketConfig::SocketConfig(KMWSocketUtil *util, TQWidget *parent, const char *na mm->setFixedWidth(fontMetrics().width(mm->text())+10); mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + mask_->setAlignment(TQt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); @@ -178,7 +178,7 @@ bool KMWSocketUtil::scanNetwork(TQProgressBar *bar) if (bar) { bar->setProgress(i); - kapp->flushX(); + tdeApp->flushX(); } } return true; diff --git a/tdeprint/management/kmwsocketutil.h b/tdeprint/management/kmwsocketutil.h index dfb9f490e..a0194e5c9 100644 --- a/tdeprint/management/kmwsocketutil.h +++ b/tdeprint/management/kmwsocketutil.h @@ -26,8 +26,8 @@ struct SocketInfo { - QString IP; - QString Name; + TQString IP; + TQString Name; int Port; }; @@ -39,7 +39,7 @@ class KMWSocketUtil; class SocketConfig : public KDialogBase { friend class KMWSocketUtil; - Q_OBJECT + TQ_OBJECT public: SocketConfig(KMWSocketUtil *util, TQWidget *parent = 0, const char *name = 0); ~SocketConfig(); diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index 1fe9a51f2..a052c69d8 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -125,7 +125,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam m_commandlab->setBuddy(m_command); m_persistent = new TQCheckBox( i18n( "&Persistent option" ), m_dummy ); - TQGroupBox *gb = new TQGroupBox(0, Qt::Horizontal, i18n("Va&lues"), m_dummy); + TQGroupBox *gb = new TQGroupBox(0, TQt::Horizontal, i18n("Va&lues"), m_dummy); m_stack = new TQWidgetStack(gb); TQWidget *w1 = new TQWidget(m_stack), *w2 = new TQWidget(m_stack), *w3 = new TQWidget(m_stack); m_stack->addWidget(w1, 1); @@ -159,8 +159,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam KSeparator *sep1 = new KSeparator(KSeparator::HLine, m_dummy); - TQGroupBox *gb_input = new TQGroupBox(0, Qt::Horizontal, i18n("&Input From"), this); - TQGroupBox *gb_output = new TQGroupBox(0, Qt::Horizontal, i18n("O&utput To"), this); + TQGroupBox *gb_input = new TQGroupBox(0, TQt::Horizontal, i18n("&Input From"), this); + TQGroupBox *gb_output = new TQGroupBox(0, TQt::Horizontal, i18n("O&utput To"), this); TQLabel *m_inputfilelab = new TQLabel(i18n("File:"), gb_input); TQLabel *m_inputpipelab = new TQLabel(i18n("Pipe:"), gb_input); TQLabel *m_outputfilelab = new TQLabel(i18n("File:"), gb_output); @@ -184,7 +184,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam TQHBoxLayout *l0 = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQGridLayout *l10 = new TQGridLayout(0, 2, 2, 0, KDialog::spacingHint()); l2->addLayout(l0, 1); - l0->addLayout(TQT_TQLAYOUT(l10)); + l0->addLayout(l10); l10->addMultiCellWidget(m_view, 0, 0, 0, 1); l10->addWidget(gb_input, 1, 0); l10->addWidget(gb_output, 1, 1); @@ -201,16 +201,16 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l7->addStretch(1); l0->addWidget(m_dummy, 1); TQGridLayout *l1 = new TQGridLayout(m_dummy, 9, 2, 0, KDialog::spacingHint()); - l1->addWidget(m_desclab, 0, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_desclab, 0, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_desc, 0, 1); l1->addMultiCellWidget(sep1, 1, 1, 0, 1); - l1->addWidget(m_namelab, 2, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_namelab, 2, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_name, 2, 1); - l1->addWidget(m_typelab, 3, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_typelab, 3, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_type, 3, 1); - l1->addWidget(m_formatlab, 4, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_formatlab, 4, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_format, 4, 1); - l1->addWidget(m_defaultlab, 5, 0, Qt::AlignRight|Qt::AlignVCenter); + l1->addWidget(m_defaultlab, 5, 0, TQt::AlignRight|TQt::AlignVCenter); l1->addWidget(m_default, 5, 1); l1->addWidget( m_persistent, 6, 1 ); l1->addMultiCellWidget(gb, 7, 7, 0, 1); @@ -225,8 +225,8 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l6->addStretch(1); TQGridLayout *l5 = new TQGridLayout(w1, 3, 2, 0, KDialog::spacingHint()); l5->setRowStretch(2, 1); - l5->addWidget(m_editlab1, 0, 0, Qt::AlignRight|Qt::AlignVCenter); - l5->addWidget(m_editlab2, 1, 0, Qt::AlignRight|Qt::AlignVCenter); + l5->addWidget(m_editlab1, 0, 0, TQt::AlignRight|TQt::AlignVCenter); + l5->addWidget(m_editlab2, 1, 0, TQt::AlignRight|TQt::AlignVCenter); l5->addWidget(m_edit1, 0, 1); l5->addWidget(m_edit2, 1, 1); @@ -243,7 +243,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l9->addWidget(m_outputfile, 0, 1); l9->addWidget(m_outputpipe, 1, 1); - TQVBoxLayout *l11 = new TQVBoxLayout(TQT_TQLAYOUT(gb->layout())); + TQVBoxLayout *l11 = new TQVBoxLayout(gb->layout()); l11->addWidget(m_stack); TQVBoxLayout *l12 = new TQVBoxLayout( 0, 0, 0 ); @@ -252,29 +252,29 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l12->addWidget( m_commentlab ); l12->addWidget( m_comment ); - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelectionChanged(TQListViewItem*))); - connect(m_values, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotValueSelected(TQListViewItem*))); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddValue())); - connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveValue())); - connect(m_apply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyChanges())); - connect(m_addgrp, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddGroup())); - connect(m_addopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddOption())); - connect(m_delopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveItem())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); - connect(m_command, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotCommandChanged(const TQString&))); - connect(m_view, TQT_SIGNAL(itemRenamed(TQListViewItem*,int)), TQT_SLOT(slotOptionRenamed(TQListViewItem*,int))); - connect(m_desc, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_format, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_default, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_edit1, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_edit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect( m_persistent, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_values, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotValueSelected(TQListViewItem*))); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); + connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddValue())); + connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveValue())); + connect(m_apply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyChanges())); + connect(m_addgrp, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddGroup())); + connect(m_addopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddOption())); + connect(m_delopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveItem())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown())); + connect(m_command, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotCommandChanged(const TQString&))); + connect(m_view, TQ_SIGNAL(itemRenamed(TQListViewItem*,int)), TQ_SLOT(slotOptionRenamed(TQListViewItem*,int))); + connect(m_desc, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_format, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_default, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_edit1, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_edit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect( m_persistent, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); m_dummy->setEnabled(false); viewItem(0); @@ -403,7 +403,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent TQString namestr = git.current()->name(); if (namestr.isEmpty()) { - namestr = "group_"+kapp->randomString(4); + namestr = "group_"+tdeApp->randomString(4); } git.current()->setName(namestr); item = new TQListViewItem(parent, item, git.current()->get("text"), git.current()->name()); @@ -420,7 +420,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent TQString namestr = oit.current()->name().mid(m_xmlcmd->name().length()+6); if (namestr.isEmpty()) { - namestr = "option_"+kapp->randomString(4); + namestr = "option_"+tdeApp->randomString(4); } oit.current()->setName(namestr); item = new TQListViewItem(parent, item, oit.current()->get("text"), namestr); @@ -836,8 +836,8 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) TQWidget *dummy = new TQWidget(this, "TopDetail"); TQWidget *topmain = new TQWidget(this, "TopMain"); - TQGroupBox *m_gb1 = new TQGroupBox(0, Qt::Horizontal, i18n("Supported &Input Formats"), dummy); - TQGroupBox *m_gb2 = new TQGroupBox(0, Qt::Horizontal, i18n("Requirements"), topmain); + TQGroupBox *m_gb1 = new TQGroupBox(0, TQt::Horizontal, i18n("Supported &Input Formats"), dummy); + TQGroupBox *m_gb2 = new TQGroupBox(0, TQt::Horizontal, i18n("Requirements"), topmain); m_description = new TQLineEdit(topmain); m_idname = new TQLabel(topmain); @@ -877,7 +877,7 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(topmain, 0, 10); TQGridLayout *l5 = new TQGridLayout(0, 2, 2, 0, 5); - l0->addLayout(TQT_TQLAYOUT(l5)); + l0->addLayout(l5); l5->addWidget(m_idnamelab, 0, 0); l5->addWidget(m_idname, 0, 1); l5->addWidget(m_desclab, 1, 0); @@ -895,14 +895,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l6->addWidget(m_mimetypelab, 0); l6->addWidget(m_mimetype, 1); l7->addWidget(m_gb1); - TQGridLayout *l2 = new TQGridLayout(TQT_TQLAYOUT(m_gb1->layout()), 4, 3, 10); + TQGridLayout *l2 = new TQGridLayout(m_gb1->layout(), 4, 3, 10); l2->addMultiCellWidget(m_availablemime, 0, 3, 2, 2); l2->addMultiCellWidget(m_selectedmime, 0, 3, 0, 0); l2->addWidget(m_addmime, 1, 1); l2->addWidget(m_removemime, 2, 1); l2->setRowStretch(0, 1); l2->setRowStretch(3, 1); - TQHBoxLayout *l4 = new TQHBoxLayout(TQT_TQLAYOUT(m_gb2->layout()), 10); + TQHBoxLayout *l4 = new TQHBoxLayout(m_gb2->layout(), 10); l4->addWidget(m_requirements); TQVBoxLayout *l8 = new TQVBoxLayout(0, 0, 0); l4->addLayout(l8); @@ -910,14 +910,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l8->addWidget(m_removereq); l8->addStretch(1); - connect(m_addmime, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddMime())); - connect(m_removemime, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveMime())); - connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); - connect(m_requirements, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotReqSelected(TQListViewItem*))); - connect(m_availablemime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotAvailableSelected(TQListBoxItem*))); - connect(m_selectedmime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotSelectedSelected(TQListBoxItem*))); - connect(m_addreq, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddReq())); - connect(m_removereq, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveReq())); + connect(m_addmime, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddMime())); + connect(m_removemime, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveMime())); + connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand())); + connect(m_requirements, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotReqSelected(TQListViewItem*))); + connect(m_availablemime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotAvailableSelected(TQListBoxItem*))); + connect(m_selectedmime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotSelectedSelected(TQListBoxItem*))); + connect(m_addreq, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddReq())); + connect(m_removereq, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveReq())); KMimeType::List list = KMimeType::allMimeTypes(); for (TQValueList<KMimeType::Ptr>::ConstIterator it=list.begin(); it!=list.end(); ++it) diff --git a/tdeprint/management/kxmlcommanddlg.h b/tdeprint/management/kxmlcommanddlg.h index d69c19e62..d4c574514 100644 --- a/tdeprint/management/kxmlcommanddlg.h +++ b/tdeprint/management/kxmlcommanddlg.h @@ -42,7 +42,7 @@ class KXmlCommand; class KXmlCommandAdvancedDlg : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KXmlCommandAdvancedDlg(TQWidget *parent = 0, const char *name = 0); ~KXmlCommandAdvancedDlg(); @@ -93,7 +93,7 @@ private: class KXmlCommandDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KXmlCommandDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index 95f2b94a7..71ae148c3 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/management/kxmlcommandselector.cpp @@ -44,19 +44,19 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const : TQWidget(parent, name) { m_cmd = new TQComboBox(this); - connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int))); + connect(m_cmd, TQ_SIGNAL(activated(int)), TQ_SLOT(slotCommandSelected(int))); TQPushButton *m_add = new KPushButton(this); TQPushButton *m_edit = new KPushButton(this); m_add->setPixmap(SmallIcon("document-new")); m_edit->setPixmap(SmallIcon("configure")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand())); - connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddCommand())); + connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand())); TQToolTip::add(m_add, i18n("New command")); TQToolTip::add(m_edit, i18n("Edit command")); m_shortinfo = new TQLabel(this); m_helpbtn = new KPushButton( this ); m_helpbtn->setIconSet( SmallIconSet( "help" ) ); - connect( m_helpbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHelpCommand() ) ); + connect( m_helpbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHelpCommand() ) ); TQToolTip::add( m_helpbtn, i18n( "Information" ) ); m_helpbtn->setEnabled( false ); @@ -71,14 +71,14 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const m_line = new TQLineEdit(this); m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this); m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this); - connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_browse, TQT_SLOT(setDisabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_cmd, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_add, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_edit, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_shortinfo, TQT_SLOT(setEnabled(bool))); - connect( m_usefilter, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotXmlCommandToggled( bool ) ) ); + connect(m_browse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse())); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_line, TQ_SLOT(setDisabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_browse, TQ_SLOT(setDisabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_cmd, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_add, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_edit, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_shortinfo, TQ_SLOT(setEnabled(bool))); + connect( m_usefilter, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotXmlCommandToggled( bool ) ) ); m_usefilter->setChecked(true); m_usefilter->setChecked(false); //setFocusProxy(m_line); @@ -91,7 +91,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const l1->addWidget(m_line); l1->addWidget(m_browse); - KSeparator *sep = new KSeparator(Qt::Horizontal, this); + KSeparator *sep = new KSeparator(TQt::Horizontal, this); l0->addWidget(sep); } else @@ -99,7 +99,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const TQGridLayout *l2 = new TQGridLayout(0, 2, (m_usefilter?3:2), 0, 5); int c(0); - l0->addLayout(TQT_TQLAYOUT(l2)); + l0->addLayout(l2); if (m_usefilter) { l2->addWidget(m_usefilter, 0, c++); @@ -115,7 +115,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const l3->addWidget(m_edit); if ( dlg ) - connect( this, TQT_SIGNAL( commandValid( bool ) ), dlg, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( this, TQ_SIGNAL( commandValid( bool ) ), dlg, TQ_SLOT( enableButtonOK( bool ) ) ); loadCommands(); } diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h index 5b2d109ea..40b8f4bd3 100644 --- a/tdeprint/management/kxmlcommandselector.h +++ b/tdeprint/management/kxmlcommandselector.h @@ -34,7 +34,7 @@ class KDialogBase; class TDEPRINT_EXPORT KXmlCommandSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KXmlCommandSelector(bool canBeNull = true, TQWidget *parent = 0, const char *name = 0, KDialogBase *dlg = 0); diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp index ec859dc63..f9d7e585f 100644 --- a/tdeprint/management/networkscanner.cpp +++ b/tdeprint/management/networkscanner.cpp @@ -104,7 +104,7 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) d->scan = new KPushButton( KGuiItem( i18n( "Sc&an" ), "viewmag" ), this ); d->timer = new TQTimer( this ); #ifdef USE_QSOCKET - d->socket = new TQSocket( TQT_TQOBJECT(this) ); + d->socket = new TQSocket( this ); #else d->socket = new KExtendedSocket(); #endif @@ -118,15 +118,15 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) l0->addWidget( d->settings, 3, 0 ); l0->addWidget( d->scan, 3, 1 ); - connect( d->timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) ); - connect( d->settings, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSettingsClicked() ) ); - connect( d->scan, TQT_SIGNAL( clicked() ), TQT_SLOT( slotScanClicked() ) ); + connect( d->timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) ); + connect( d->settings, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSettingsClicked() ) ); + connect( d->scan, TQ_SIGNAL( clicked() ), TQ_SLOT( slotScanClicked() ) ); #ifdef USE_QSOCKET - connect( d->socket, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnectionSuccess() ) ); - connect( d->socket, TQT_SIGNAL( error( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQ_SIGNAL( error( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); #else - connect( d->socket, TQT_SIGNAL( connectionSuccess() ), TQT_SLOT( slotConnectionSuccess() ) ); - connect( d->socket, TQT_SIGNAL( connectionFailed( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQ_SIGNAL( connectionSuccess() ), TQ_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQ_SIGNAL( connectionFailed( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); #endif } @@ -219,7 +219,7 @@ void NetworkScanner::next() else { d->bar->setProgress( d->currentaddress ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotNext() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotNext() ) ); } } @@ -344,7 +344,7 @@ NetworkScannerConfig::NetworkScannerConfig(NetworkScanner *scanner, const char * mm->setFixedWidth(fontMetrics().width(mm->text())+10); mask_ = new TQLineEdit(dummy); - mask_->setAlignment(Qt::AlignRight); + mask_->setAlignment(TQt::AlignRight); port_ = new TQComboBox(true,dummy); if ( port_->lineEdit() ) port_->lineEdit()->setValidator( val ); diff --git a/tdeprint/management/networkscanner.h b/tdeprint/management/networkscanner.h index 80a017676..7218472a5 100644 --- a/tdeprint/management/networkscanner.h +++ b/tdeprint/management/networkscanner.h @@ -27,7 +27,7 @@ class TDEPRINT_EXPORT NetworkScanner : public TQWidget { - Q_OBJECT + TQ_OBJECT public: NetworkScanner( int port = 9100, TQWidget *parent = 0, const char *name = 0 ); @@ -77,7 +77,7 @@ class TQComboBox; class NetworkScannerConfig : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NetworkScannerConfig(NetworkScanner *scanner, const char *name = 0); diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp index 377a28217..3a19b6262 100644 --- a/tdeprint/management/pluginaction.cpp +++ b/tdeprint/management/pluginaction.cpp @@ -23,7 +23,7 @@ PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name) : TDEAction(txt, icon, accel, parent, name), m_id(ID) { - connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated())); + connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActivated())); } void PluginAction::slotActivated() diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h index 0f87460fd..d8aa98ca6 100644 --- a/tdeprint/management/pluginaction.h +++ b/tdeprint/management/pluginaction.h @@ -24,7 +24,7 @@ class TDEPRINT_EXPORT PluginAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent = 0, const char *name = 0); diff --git a/tdeprint/management/sidepixmap.cpp b/tdeprint/management/sidepixmap.cpp index a0be8f8b8..f047b7c11 100644 --- a/tdeprint/management/sidepixmap.cpp +++ b/tdeprint/management/sidepixmap.cpp @@ -20,7 +20,7 @@ #include "sidepixmap.h" #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> SidePixmap::SidePixmap(TQWidget *parent, const char *name) : TQFrame(parent, name) diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index f5977bfb0..6f4db992a 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -19,7 +19,7 @@ #include "smbview.h" -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <tqheader.h> #include <tqapplication.h> @@ -52,9 +52,9 @@ SmbView::SmbView(TQWidget *parent, const char *name) m_proc = new TDEProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotSelectionChanged(TQListViewItem*))); } SmbView::~SmbView() @@ -140,7 +140,7 @@ void SmbView::init() while (!smb_stream.atEnd ()) { TQString smb_line = smb_stream.readLine (); - if (smb_line.contains (wins_keyword, FALSE) > 0) + if (smb_line.contains (wins_keyword, false) > 0) { TQString key = smb_line.section ('=', 0, 0); key = key.stripWhiteSpace(); diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h index 51193254e..7eb7623cb 100644 --- a/tdeprint/management/smbview.h +++ b/tdeprint/management/smbview.h @@ -27,7 +27,7 @@ class KTempFile; class SmbView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: SmbView(TQWidget *parent = 0, const char *name = 0); ~SmbView(); |