diff options
Diffstat (limited to 'tdeprint/tdeprintfax')
| -rw-r--r-- | tdeprint/tdeprintfax/conffilters.cpp | 16 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/conffilters.h | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/confgeneral.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/confsystem.cpp | 6 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/confsystem.h | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/defcmds.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/faxab.cpp | 8 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/faxab.h | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/faxctrl.cpp | 30 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/faxctrl.h | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/filterdlg.cpp | 4 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/filterdlg.h | 2 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/tdeprintfax.cpp | 56 | ||||
| -rw-r--r-- | tdeprint/tdeprintfax/tdeprintfax.h | 2 | 
14 files changed, 68 insertions, 68 deletions
diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp index 7fdb4fec1..9af40d224 100644 --- a/tdeprint/tdeprintfax/conffilters.cpp +++ b/tdeprint/tdeprintfax/conffilters.cpp @@ -32,7 +32,7 @@  #include <tdelocale.h>  #include <tdelistview.h>  #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h>  #include <tdemessagebox.h>  ConfFilters::ConfFilters(TQWidget *parent, const char *name) @@ -45,7 +45,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)  	m_filters->setLineWidth(1);  	m_filters->setSorting(-1);  	m_filters->header()->setStretchEnabled(true, 1); -	connect(m_filters, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(slotChange())); +	connect(m_filters, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(slotChange()));  	m_add = new TQPushButton(this);  	m_add->setPixmap(BarIcon("document-new")); @@ -57,11 +57,11 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)  	m_up->setIconSet(BarIconSet("go-up"));  	m_down = new TQPushButton(this);  	m_down->setIconSet(BarIconSet("go-down")); -	connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); -	connect(m_change, TQT_SIGNAL(clicked()), TQT_SLOT(slotChange())); -	connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); -	connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); -	connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); +	connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); +	connect(m_change, TQ_SIGNAL(clicked()), TQ_SLOT(slotChange())); +	connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); +	connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); +	connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown()));  	TQToolTip::add(m_add, i18n("Add filter"));  	TQToolTip::add(m_change, i18n("Modify filter"));  	TQToolTip::add(m_remove, i18n("Remove filter")); @@ -80,7 +80,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name)  	l1->addWidget(m_down);  	l1->addStretch(1);  	updateButton(); -	connect(m_filters, TQT_SIGNAL(selectionChanged ()),TQT_SLOT(updateButton())); +	connect(m_filters, TQ_SIGNAL(selectionChanged ()),TQ_SLOT(updateButton()));  }  void ConfFilters::load() diff --git a/tdeprint/tdeprintfax/conffilters.h b/tdeprint/tdeprintfax/conffilters.h index ca796b934..e40c7e89a 100644 --- a/tdeprint/tdeprintfax/conffilters.h +++ b/tdeprint/tdeprintfax/conffilters.h @@ -27,7 +27,7 @@ class TDEListView;  class ConfFilters : public TQWidget  { -	Q_OBJECT +	TQ_OBJECT  public:  	ConfFilters(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp index ad7512d8d..b79e2f52b 100644 --- a/tdeprint/tdeprintfax/confgeneral.cpp +++ b/tdeprint/tdeprintfax/confgeneral.cpp @@ -49,7 +49,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)  	m_replace_int_char_val = new TQLineEdit( this );  	m_replace_int_char_val->setEnabled( false ); -	connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) ); +	connect( m_replace_int_char, TQ_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQ_SLOT( setEnabled( bool ) ) );  	TQGridLayout	*l0 = new TQGridLayout(this, 6, 2, 10, 10);  	l0->setColStretch(1, 1); diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp index fbb27aac9..bfb201691 100644 --- a/tdeprint/tdeprintfax/confsystem.cpp +++ b/tdeprint/tdeprintfax/confsystem.cpp @@ -51,7 +51,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)  	TQLabel	*cmdlabel = new TQLabel(i18n("Co&mmand:"), this);  	syslabel->setBuddy(m_system);  	cmdlabel->setBuddy(m_command); -	connect(m_system, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSystemChanged(int))); +	connect(m_system, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSystemChanged(int)));  	m_current = 0;  	m_system->setCurrentItem(m_current); @@ -66,7 +66,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)  	for (int i=0; i<10; i++)  		m_device->insertItem(TQString(i18n("Serial Port #%1").arg(i)));  	m_device->insertItem( i18n( "Other" ) ); -	connect( m_device, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotDeviceChanged( int ) ) ); +	connect( m_device, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotDeviceChanged( int ) ) );  	m_device_edit = new TQLineEdit( m_dummy2 );  	slotDeviceChanged( 0 ); @@ -75,7 +75,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name)  	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10);  	TQGridLayout	*l1 = new TQGridLayout(0, 2, 2, 0, 10); -	l0->addLayout(TQT_TQLAYOUT(l1)); +	l0->addLayout(l1);  	l1->setColStretch(1, 1);  	l1->addWidget(syslabel, 0, 0);  	l1->addWidget(cmdlabel, 1, 0); diff --git a/tdeprint/tdeprintfax/confsystem.h b/tdeprint/tdeprintfax/confsystem.h index 0ce8971f0..01170f387 100644 --- a/tdeprint/tdeprintfax/confsystem.h +++ b/tdeprint/tdeprintfax/confsystem.h @@ -29,7 +29,7 @@ class TQComboBox;  class ConfSystem : public TQWidget  { -	Q_OBJECT +	TQ_OBJECT  public:  	ConfSystem(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/tdeprintfax/defcmds.cpp b/tdeprint/tdeprintfax/defcmds.cpp index 9529c757d..d785d06f6 100644 --- a/tdeprint/tdeprintfax/defcmds.cpp +++ b/tdeprint/tdeprintfax/defcmds.cpp @@ -20,7 +20,7 @@  #include "defcmds.h"  #include <tqregexp.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h>  TQString defaultCommand(const TQString& cmd)  { diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index 1b3eb6131..f9f16c4aa 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/tdeprint/tdeprintfax/faxab.cpp @@ -45,9 +45,9 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)  	m_ok = new KPushButton(KStdGuiItem::ok(), this);  	TQPushButton	*m_cancel = new KPushButton(KStdGuiItem::cancel(), this);  	TQPushButton	*m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this); -	connect(m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); -	connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); -	connect(m_ab, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditAb())); +	connect(m_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); +	connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); +	connect(m_ab, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditAb()));  	m_ok->setDefault(true);  	TQVBoxLayout	*l0 = new TQVBoxLayout(this, 10, 10); @@ -66,7 +66,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name)  	resize( conf->readSizeEntry( "ABSize", &defsize ) );  	initialize(); -	connect(TDEABC::StdAddressBook::self(), TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(slotAbChanged(AddressBook*))); +	connect(TDEABC::StdAddressBook::self(), TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT(slotAbChanged(AddressBook*)));  }  FaxAB::~FaxAB() diff --git a/tdeprint/tdeprintfax/faxab.h b/tdeprint/tdeprintfax/faxab.h index da38fb9d8..ac2098cc0 100644 --- a/tdeprint/tdeprintfax/faxab.h +++ b/tdeprint/tdeprintfax/faxab.h @@ -32,7 +32,7 @@ class TQPushButton;  class FaxAB : public KDialog  { -	Q_OBJECT +	TQ_OBJECT  public:  	FaxAB(TQWidget *parent = 0, const char *name = 0);  	~FaxAB(); 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;  	} diff --git a/tdeprint/tdeprintfax/faxctrl.h b/tdeprint/tdeprintfax/faxctrl.h index 9135b7cc6..5a11e37d9 100644 --- a/tdeprint/tdeprintfax/faxctrl.h +++ b/tdeprint/tdeprintfax/faxctrl.h @@ -32,7 +32,7 @@ class TQTextEdit;  class FaxCtrl : public TQObject  { -	Q_OBJECT +	TQ_OBJECT  public:  	FaxCtrl(TQWidget *parent = 0, const char *name = 0);  	~FaxCtrl(); diff --git a/tdeprint/tdeprintfax/filterdlg.cpp b/tdeprint/tdeprintfax/filterdlg.cpp index 141e7138a..fa3eed829 100644 --- a/tdeprint/tdeprintfax/filterdlg.cpp +++ b/tdeprint/tdeprintfax/filterdlg.cpp @@ -47,8 +47,8 @@ FilterDlg::FilterDlg(TQWidget *parent, const char *name)  	setMainWidget(w);  	m_mime->setFocus();  	resize(300, 100); -	connect(m_mime, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged())); -        connect(m_cmd, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged())); +	connect(m_mime, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(slotTextFilterChanged())); +        connect(m_cmd, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(slotTextFilterChanged()));          slotTextFilterChanged();  } diff --git a/tdeprint/tdeprintfax/filterdlg.h b/tdeprint/tdeprintfax/filterdlg.h index ab4fd0406..26dbc729c 100644 --- a/tdeprint/tdeprintfax/filterdlg.h +++ b/tdeprint/tdeprintfax/filterdlg.h @@ -27,7 +27,7 @@ class TQLineEdit;  class FilterDlg : public KDialogBase  { -  	Q_OBJECT +  	TQ_OBJECT  public:  	FilterDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 2927d4e88..3511b2bae 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -62,22 +62,22 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)  {  	m_faxctrl = new FaxCtrl(this);  	m_quitAfterSend = false; -	connect(m_faxctrl, TQT_SIGNAL(message(const TQString&)), TQT_SLOT(slotMessage(const TQString&))); -	connect(m_faxctrl, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(slotFaxSent(bool))); +	connect(m_faxctrl, TQ_SIGNAL(message(const TQString&)), TQ_SLOT(slotMessage(const TQString&))); +	connect(m_faxctrl, TQ_SIGNAL(faxSent(bool)), TQ_SLOT(slotFaxSent(bool)));  	TQWidget	*mainw = new TQWidget(this);  	setCentralWidget(mainw);  	m_files = new TDEListBox(mainw); -	connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) ); +	connect( m_files, TQ_SIGNAL( currentChanged( TQListBoxItem* ) ), TQ_SLOT( slotCurrentChanged() ) );  	m_upbtn = new KPushButton( mainw );  	m_upbtn->setIconSet( SmallIconSet( "go-up" ) );  	TQToolTip::add( m_upbtn, i18n( "Move up" ) ); -	connect( m_upbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) ); +	connect( m_upbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveUp() ) );  	m_upbtn->setEnabled( false );  	m_downbtn = new KPushButton( mainw );  	m_downbtn->setIconSet( SmallIconSet( "go-down" ) );  	TQToolTip::add( m_downbtn, i18n( "Move down" ) ); -	connect( m_downbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) ); +	connect( m_downbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveDown() ) );  	m_downbtn->setEnabled( false );  	TQLabel	*m_filelabel = new TQLabel(i18n("F&iles:"), mainw);          m_filelabel->setBuddy(m_files); @@ -89,21 +89,21 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)  	m_numbers->addColumn( i18n("Enterprise") );  	m_numbers->header()->setStretchEnabled( true );  	m_numbers->setSelectionMode( TQListView::Extended ); -	connect( m_numbers, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotFaxSelectionChanged() ) ); -	connect( m_numbers, TQT_SIGNAL( executed( TQListViewItem* ) ), TQT_SLOT( slotFaxExecuted( TQListViewItem* ) ) ); +	connect( m_numbers, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotFaxSelectionChanged() ) ); +	connect( m_numbers, TQ_SIGNAL( executed( TQListViewItem* ) ), TQ_SLOT( slotFaxExecuted( TQListViewItem* ) ) );  	m_newbtn = new KPushButton( mainw );  	m_newbtn->setPixmap( SmallIcon( "edit" ) );  	TQToolTip::add( m_newbtn, i18n( "Add fax number" ) ); -	connect( m_newbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxAdd() ) ); +	connect( m_newbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotFaxAdd() ) );  	m_abbtn = new KPushButton( mainw );  	m_abbtn->setPixmap( SmallIcon( "kaddressbook" ) );  	TQToolTip::add( m_abbtn, i18n( "Add fax number from addressbook" ) ); -	connect( m_abbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotKab() ) ); +	connect( m_abbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotKab() ) );  	m_delbtn = new KPushButton( mainw );  	m_delbtn->setIconSet( SmallIconSet( "edittrash" ) );  	TQToolTip::add( m_delbtn, i18n( "Remove fax number" ) );  	m_delbtn->setEnabled( false ); -	connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) ); +	connect( m_delbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotFaxRemove() ) );  	TQLabel	*m_commentlabel = new TQLabel(i18n("&Comment:"), mainw);  	KSystemTray	*m_tray = new KSystemTray(this);  	m_tray->setPixmap(SmallIcon("tdeprintfax")); @@ -124,16 +124,16 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)  	m_time = new TQTimeEdit(mainw);  	m_time->setTime(TQTime::currentTime());  	m_time->setEnabled(false); -	connect(m_timecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeComboActivated(int))); +	connect(m_timecombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeComboActivated(int)));  	m_cover = new TQCheckBox(i18n("Send Co&ver Sheet"), mainw); -	connect(m_cover, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCoverToggled(bool))); +	connect(m_cover, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCoverToggled(bool)));  	m_subject = new TQLineEdit( mainw );  	TQLabel *m_subjectlabel = new TQLabel( i18n( "Su&bject:" ), mainw );  	m_subjectlabel->setBuddy( m_subject );  	TQGridLayout	*l0 = new TQGridLayout(mainw, 10, 2, 10, 5);  	l0->setColStretch(1,1); -	l0->addWidget(m_filelabel, 0, 0, Qt::AlignLeft|Qt::AlignTop); +	l0->addWidget(m_filelabel, 0, 0, TQt::AlignLeft|TQt::AlignTop);  	TQHBoxLayout *l2 = new TQHBoxLayout( 0, 0, 10 );  	TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 5 );  	l0->addLayout( l2, 0, 1 ); @@ -159,7 +159,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)  	l0->addWidget( m_cover, 6, 1 );  	l0->addWidget( m_subjectlabel, 7, 0 );  	l0->addWidget( m_subject, 7, 1 ); -	l0->addWidget(m_commentlabel, 8, 0, Qt::AlignTop|Qt::AlignLeft); +	l0->addWidget(m_commentlabel, 8, 0, TQt::AlignTop|TQt::AlignLeft);  	l0->addWidget(m_comment, 8, 1);  	l0->addWidget(m_timelabel, 9, 0);  	TQHBoxLayout	*l1 = new TQHBoxLayout(0, 0, 5); @@ -178,7 +178,7 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name)  	updateState();  	resize(550,500); -	TQWidget	*d = TQT_TQWIDGET(kapp->desktop()); +	TQWidget	*d = tdeApp->desktop();  	move((d->width()-width())/2, (d->height()-height())/2);  } @@ -188,23 +188,23 @@ KdeprintFax::~KdeprintFax()  void KdeprintFax::initActions()  { -	new TDEAction(i18n("&Add File..."), "document-new", Qt::Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "file_add"); -	new TDEAction(i18n("&Remove File"), "remove", Qt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "file_remove"); -	new TDEAction(i18n("&Send Fax"), "connect_established", Qt::Key_Return, TQT_TQOBJECT(this), TQT_SLOT(slotFax()), actionCollection(), "fax_send"); -	new TDEAction(i18n("A&bort"), "process-stop", Qt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbort()), actionCollection(), "fax_stop"); -	new TDEAction(i18n("A&ddress Book"), "kaddressbook", Qt::CTRL+Qt::Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotKab()), actionCollection(), "fax_ab"); -	new TDEAction(i18n("V&iew Log"), "contents", Qt::CTRL+Qt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewLog()), actionCollection(), "fax_log"); -	new TDEAction(i18n("Vi&ew File"), "filefind", Qt::CTRL+Qt::Key_O, TQT_TQOBJECT(this), TQT_SLOT(slotView()), actionCollection(), "file_view"); -	new TDEAction( i18n( "&New Fax Recipient..." ), "edit", Qt::CTRL+Qt::Key_N, TQT_TQOBJECT(this), TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" ); +	new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, this, TQ_SLOT(slotAdd()), actionCollection(), "file_add"); +	new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, this, TQ_SLOT(slotRemove()), actionCollection(), "file_remove"); +	new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, this, TQ_SLOT(slotFax()), actionCollection(), "fax_send"); +	new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(slotAbort()), actionCollection(), "fax_stop"); +	new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, this, TQ_SLOT(slotKab()), actionCollection(), "fax_ab"); +	new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, this, TQ_SLOT(slotViewLog()), actionCollection(), "fax_log"); +	new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, this, TQ_SLOT(slotView()), actionCollection(), "file_view"); +	new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, this, TQ_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" ); -	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); +	KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection());  	setStandardToolBarMenuEnabled(true); -	KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenuBar()), actionCollection()); -	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); -        KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()),  +	KStdAction::showMenubar(this, TQ_SLOT(slotToggleMenuBar()), actionCollection()); +	KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); +        KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()),   actionCollection());  	actionCollection()->action("fax_stop")->setEnabled(false); -	connect(actionCollection()->action("file_remove"), TQT_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQT_SLOT(setEnabled(bool))); +	connect(actionCollection()->action("file_remove"), TQ_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQ_SLOT(setEnabled(bool)));  	actionCollection()->action("file_remove")->setEnabled(false);  	createGUI(); diff --git a/tdeprint/tdeprintfax/tdeprintfax.h b/tdeprint/tdeprintfax/tdeprintfax.h index 783593c3b..9981ba72a 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.h +++ b/tdeprint/tdeprintfax/tdeprintfax.h @@ -38,7 +38,7 @@ class TQListViewItem;  class KdeprintFax : public TDEMainWindow  { -	Q_OBJECT +	TQ_OBJECT  public:  	struct FaxItem  	{  | 
