diff options
Diffstat (limited to 'tdeprint/tools/escputil/escpwidget.cpp')
| -rw-r--r-- | tdeprint/tools/escputil/escpwidget.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index 901d509c9..232d10740 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -24,10 +24,10 @@ #include <tqlabel.h> #include <tqcheckbox.h> #include <tqaccel.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <kdialogbase.h> #include <klibloader.h> @@ -39,23 +39,23 @@ class EscpFactory : public KLibFactory public: EscpFactory(TQObject *parent = 0, const char *name = 0) : KLibFactory(parent, name) {} protected: - TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = TQOBJECT_OBJECT_NAME_STRING, const TQStringList& args = TQStringList()) + TQObject* createObject(TQObject *parent = 0, const char *name = 0, const char * className = "TQObject", const TQStringList& args = TQStringList()) { Q_UNUSED(className); - KDialogBase *dlg = new KDialogBase(TQT_TQWIDGET(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); + KDialogBase *dlg = new KDialogBase(static_cast<TQWidget*>(parent), name, true, i18n("EPSON InkJet Printer Utilities"), KDialogBase::Close); EscpWidget *w = new EscpWidget(dlg); if (args.count() > 0) w->setDevice(args[0]); if (args.count() > 1) w->setPrinterName(args[1]); dlg->setMainWidget(w); - return TQT_TQOBJECT(dlg); + return dlg; } }; extern "C" { - void* init_tdeprint_tool_escputil() KDE_EXPORT; + void* init_tdeprint_tool_escputil() TDE_EXPORT; void* init_tdeprint_tool_escputil() { return new EscpFactory; @@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) { m_hasoutput = false; - connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); TQPushButton *cleanbtn = new TQPushButton(this, "-c"); cleanbtn->setPixmap(DesktopIcon("application-x-executable")); @@ -90,11 +90,11 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) m_device->setFont(f); m_useraw = new TQCheckBox(i18n("&Use direct connection (might need root permissions)"), this); - connect(cleanbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(nozzlebtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(alignbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); + connect(cleanbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(nozzlebtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(alignbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(inkbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(identbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); TQLabel *printerlab = new TQLabel(i18n("Printer:"), this); printerlab->setAlignment(AlignRight|AlignVCenter); @@ -243,7 +243,7 @@ void EscpWidget::slotReceivedStderr(TDEProcess*, char *buf, int len) void EscpWidget::slotButtonClicked() { - TQString arg = TQT_TQOBJECT_CONST(sender())->name(); + TQString arg = sender()->name(); startCommand(arg); } |