diff options
Diffstat (limited to 'tdeprint/tdeprintfax/faxctrl.cpp')
| -rw-r--r-- | tdeprint/tdeprintfax/faxctrl.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index 5ea6a65a2..5c4c349bc 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -35,13 +35,13 @@ #include <tqvaluestack.h> #include <tqstylesheet.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeglobal.h> #include <tdeconfig.h> #include <tdelocale.h> #include <kdialogbase.h> #include <kmimetype.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <twin.h> #include <tdeemailsettings.h> @@ -356,10 +356,10 @@ FaxCtrl::FaxCtrl(TQWidget *parent, const char *name) { m_process = new TDEProcess(); m_process->setUseShell(true); - connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(this, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(cleanTempFiles())); + connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(this, TQ_SIGNAL(faxSent(bool)), TQ_SLOT(cleanTempFiles())); m_logview = 0; } @@ -486,7 +486,7 @@ void FaxCtrl::filter() } else { - TQString tmp = locateLocal("tmp","tdeprintfax_") + kapp->randomString(8); + TQString tmp = locateLocal("tmp","tdeprintfax_") + tdeApp->randomString(8); m_filteredfiles.prepend(tmp); m_tempfiles.append(tmp); m_process->clearArguments(); @@ -522,7 +522,7 @@ void FaxCtrl::viewLog(TQWidget *) m_logview = new KTextEdit(topView); m_logview->setTextFormat( TQt::LogText ); m_logview->setWordWrap( TQTextEdit::WidgetWidth ); - m_logview->setPaper( Qt::white ); + m_logview->setPaper( TQt::white ); //m_logview->setReadOnly(true); //m_logview->setWordWrap(TQTextEdit::NoWrap); TQPushButton *m_clear = new KPushButton(KStdGuiItem::clear(), topView); @@ -530,11 +530,11 @@ void FaxCtrl::viewLog(TQWidget *) TQPushButton *m_print = new KPushButton( KStdGuiItem::print(), topView ); TQPushButton *m_save = new KPushButton( KStdGuiItem::saveAs(), topView ); m_close->setDefault(true); - connect(m_clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearLog())); - connect(m_close, TQT_SIGNAL(clicked()), TQT_SLOT(slotCloseLog())); - connect(m_logview, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCloseLog())); - connect( m_print, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPrintLog() ) ); - connect( m_save, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSaveLog() ) ); + connect(m_clear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearLog())); + connect(m_close, TQ_SIGNAL(clicked()), TQ_SLOT(slotCloseLog())); + connect(m_logview, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCloseLog())); + connect( m_print, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPrintLog() ) ); + connect( m_save, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSaveLog() ) ); TQVBoxLayout *l0 = new TQVBoxLayout(topView, 10, 10); l0->addWidget(m_logview); @@ -599,12 +599,12 @@ void FaxCtrl::slotClearLog() void FaxCtrl::slotCloseLog() { - const TQObject *obj = TQT_TQOBJECT_CONST(sender()); + const TQObject *obj = sender(); if (m_logview) { TQTextEdit *view = m_logview; m_logview = 0; - if (obj && obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (obj && obj->inherits("TQPushButton")) delete view->parentWidget(); kdDebug() << "slotClose()" << endl; } |