From e295fa9ed9bf0a1ce153cd3e92a6fc24b9316933 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: [PATCH] rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kbarcode@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- fileplugin/kfile_kbarcode.cpp | 4 ++-- fileplugin/kfile_kbarcode.h | 2 +- kbarcode/barcodecombo.cpp | 12 +++++----- kbarcode/barcodecombo.h | 6 ++--- kbarcode/barcodedialog.cpp | 4 ++-- kbarcode/barcodedialog.h | 2 +- kbarcode/barcodedialogs.cpp | 28 ++++++++++++------------ kbarcode/barcodedialogs.h | 14 ++++++------ kbarcode/barcodeprinterdlg.cpp | 4 ++-- kbarcode/barcodeprinterdlg.h | 2 +- kbarcode/batchprinter.cpp | 12 +++++----- kbarcode/batchprinter.h | 4 ++-- kbarcode/batchwizard.cpp | 8 +++---- kbarcode/batchwizard.h | 2 +- kbarcode/configdialog.cpp | 4 ++-- kbarcode/configdialog.h | 2 +- kbarcode/confwizard.cpp | 4 ++-- kbarcode/confwizard.h | 2 +- kbarcode/csvimportdlg.cpp | 4 ++-- kbarcode/csvimportdlg.h | 2 +- kbarcode/databasebrowser.cpp | 4 ++-- kbarcode/databasebrowser.h | 2 +- kbarcode/definition.cpp | 16 +++++++------- kbarcode/definition.h | 8 +++---- kbarcode/definitiondialog.cpp | 8 +++---- kbarcode/definitiondialog.h | 4 ++-- kbarcode/documentitemdlg.cpp | 4 ++-- kbarcode/documentitemdlg.h | 2 +- kbarcode/dsmainwindow.cpp | 4 ++-- kbarcode/dsmainwindow.h | 2 +- kbarcode/dstextedit.cpp | 4 ++-- kbarcode/dstextedit.h | 2 +- kbarcode/encodingcombo.cpp | 4 ++-- kbarcode/encodingcombo.h | 2 +- kbarcode/kactionmap.cpp | 12 +++++----- kbarcode/kactionmap.h | 6 ++--- kbarcode/kbarcode.cpp | 4 ++-- kbarcode/kbarcode.h | 2 +- kbarcode/labeleditor.cpp | 4 ++-- kbarcode/labeleditor.h | 2 +- kbarcode/multilineeditdlg.cpp | 4 ++-- kbarcode/multilineeditdlg.h | 2 +- kbarcode/mycanvasview.cpp | 8 +++---- kbarcode/mycanvasview.h | 4 ++-- kbarcode/mydatatable.cpp | 4 ++-- kbarcode/mydatatable.h | 2 +- kbarcode/newlabel.cpp | 4 ++-- kbarcode/newlabel.h | 2 +- kbarcode/previewdialog.cpp | 4 ++-- kbarcode/previewdialog.h | 2 +- kbarcode/printersettings.cpp | 4 ++-- kbarcode/printersettings.h | 2 +- kbarcode/printlabeldlg.cpp | 4 ++-- kbarcode/printlabeldlg.h | 2 +- kbarcode/propertywidget.cpp | 40 +++++++++++++++++----------------- kbarcode/propertywidget.h | 20 ++++++++--------- kbarcode/rectsettingsdlg.cpp | 8 +++---- kbarcode/rectsettingsdlg.h | 4 ++-- kbarcode/smalldialogs.cpp | 12 +++++----- kbarcode/smalldialogs.h | 6 ++--- kbarcode/sqltables.cpp | 8 +++---- kbarcode/sqltables.h | 4 ++-- kbarcode/textlineedit.cpp | 4 ++-- kbarcode/textlineedit.h | 2 +- kbarcode/tokendialog.cpp | 4 ++-- kbarcode/tokendialog.h | 2 +- 66 files changed, 190 insertions(+), 190 deletions(-) diff --git a/fileplugin/kfile_kbarcode.cpp b/fileplugin/kfile_kbarcode.cpp index 465cae7..dbb9aac 100644 --- a/fileplugin/kfile_kbarcode.cpp +++ b/fileplugin/kfile_kbarcode.cpp @@ -12,10 +12,10 @@ K_EXPORT_COMPONENT_FACTORY(kfile_kbarcode, KGenericFactory( "kfile_kbarcode" )); -KBarcodePlugin::KBarcodePlugin(TQObject *tqparent, const char *name, +KBarcodePlugin::KBarcodePlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/kbarcode-label" ); diff --git a/fileplugin/kfile_kbarcode.h b/fileplugin/kfile_kbarcode.h index 419af16..7a8c7b4 100644 --- a/fileplugin/kfile_kbarcode.h +++ b/fileplugin/kfile_kbarcode.h @@ -15,7 +15,7 @@ class KBarcodePlugin: public KFilePlugin TQ_OBJECT public: - KBarcodePlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KBarcodePlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint ); }; diff --git a/kbarcode/barcodecombo.cpp b/kbarcode/barcodecombo.cpp index 2f3dbdd..9bc571a 100644 --- a/kbarcode/barcodecombo.cpp +++ b/kbarcode/barcodecombo.cpp @@ -37,8 +37,8 @@ #include #include -BarcodeValidator::BarcodeValidator( TQObject* tqparent, const char* name ) - : TQValidator( tqparent, name ) +BarcodeValidator::BarcodeValidator( TQObject* parent, const char* name ) + : TQValidator( parent, name ) { m_valid = NULL; m_notValid = NULL; @@ -84,8 +84,8 @@ TQValidator::State BarcodeValidator::validate( TQString & input, int & pos ) con return Acceptable; } -BarcodeCombo::BarcodeCombo(TQWidget *tqparent, const char *name ) - : KComboBox( false, tqparent, name ) +BarcodeCombo::BarcodeCombo(TQWidget *parent, const char *name ) + : KComboBox( false, parent, name ) { this->insertStringList( *Barkode::encodingTypes() ); @@ -111,8 +111,8 @@ void BarcodeCombo::setEncodingType( const TQString & type ) } } -BarcodeWidget::BarcodeWidget(TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), m_validator( TQT_TQOBJECT(this) ) +BarcodeWidget::BarcodeWidget(TQWidget *parent, const char *name ) + : TQWidget( parent, name ), m_validator( TQT_TQOBJECT(this) ) { m_token = NULL; diff --git a/kbarcode/barcodecombo.h b/kbarcode/barcodecombo.h index 32ba567..f6b9d68 100644 --- a/kbarcode/barcodecombo.h +++ b/kbarcode/barcodecombo.h @@ -29,7 +29,7 @@ */ class BarcodeValidator : public TQValidator { public: - BarcodeValidator( TQObject* tqparent = 0, const char* name = 0 ); + BarcodeValidator( TQObject* parent = 0, const char* name = 0 ); TQValidator::State validate( TQString & input, int & pos ) const; @@ -57,7 +57,7 @@ class BarcodeCombo : public KComboBox { Q_OBJECT TQ_OBJECT public: - BarcodeCombo(TQWidget *tqparent=0, const char *name=0); + BarcodeCombo(TQWidget *parent=0, const char *name=0); ~BarcodeCombo(); const char* getEncodingType(); @@ -83,7 +83,7 @@ class BarcodeWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - BarcodeWidget(TQWidget *tqparent=0, const char *name=0); + BarcodeWidget(TQWidget *parent=0, const char *name=0); ~BarcodeWidget() { } void getData( Barkode & barkode ); diff --git a/kbarcode/barcodedialog.cpp b/kbarcode/barcodedialog.cpp index 506b05a..2bdb1d9 100644 --- a/kbarcode/barcodedialog.cpp +++ b/kbarcode/barcodedialog.cpp @@ -40,8 +40,8 @@ #include #include -BarCodeDialog::BarCodeDialog( TQWidget* tqparent, const char* name ) - : TQDialog( tqparent, name, false) +BarCodeDialog::BarCodeDialog( TQWidget* parent, const char* name ) + : TQDialog( parent, name, false) { setCaption( i18n( "Barcode Generator" ) ); diff --git a/kbarcode/barcodedialog.h b/kbarcode/barcodedialog.h index 6e861be..845ef29 100644 --- a/kbarcode/barcodedialog.h +++ b/kbarcode/barcodedialog.h @@ -51,7 +51,7 @@ class BarCodeDialog : public TQDialog TQ_OBJECT public: - BarCodeDialog( TQWidget* tqparent = 0, const char* name = 0 ); + BarCodeDialog( TQWidget* parent = 0, const char* name = 0 ); ~BarCodeDialog(); private: diff --git a/kbarcode/barcodedialogs.cpp b/kbarcode/barcodedialogs.cpp index 676265c..9856689 100644 --- a/kbarcode/barcodedialogs.cpp +++ b/kbarcode/barcodedialogs.cpp @@ -39,9 +39,9 @@ #include -AdvancedBarcodeDialog::AdvancedBarcodeDialog( TQString type, TQWidget* tqparent, const char* name ) +AdvancedBarcodeDialog::AdvancedBarcodeDialog( TQString type, TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Tabbed, i18n("Barcode Settings"), - KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent,name) + KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name) { list.setAutoDelete( false ); @@ -100,8 +100,8 @@ void AdvancedBarcodeDialog::getData( Barkode* b ) } } -TBarcodeDlg::TBarcodeDlg(TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +TBarcodeDlg::TBarcodeDlg(TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 ); @@ -250,8 +250,8 @@ void TBarcodeDlg::getData( Barkode* b ) const } } -PDF417BarcodeDlg::PDF417BarcodeDlg(TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +PDF417BarcodeDlg::PDF417BarcodeDlg(TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 ); @@ -304,8 +304,8 @@ void PDF417BarcodeDlg::getData( Barkode* b ) const } } -DataMatrixDlg::DataMatrixDlg(TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +DataMatrixDlg::DataMatrixDlg(TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQHBoxLayout* datamLayout = new TQHBoxLayout( this, 6, 6 ); @@ -358,8 +358,8 @@ void DataMatrixDlg::getData( Barkode* b ) const b->setDatamatrixSize( comboDataMatrix->currentItem() ); } -SequenceDlg::SequenceDlg( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +SequenceDlg::SequenceDlg( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout* main = new TQVBoxLayout( this, 6, 6 ); @@ -438,8 +438,8 @@ void SequenceDlg::enableControls() spinStart->setEnabled( checkSequence->isChecked() && radioNumbers->isChecked() ); } -ColorDlg::ColorDlg(TQWidget *tqparent, const char *name) - : TQVBox( tqparent, name ) +ColorDlg::ColorDlg(TQWidget *parent, const char *name) + : TQVBox( parent, name ) { TQGroupBox* gb = new TQGroupBox( i18n("Colors"), this ); gb->setColumnLayout(0, Qt::Vertical ); @@ -474,8 +474,8 @@ void ColorDlg::getData( Barkode* b ) const b->setTextColor( buttonTextColor->color() ); } -PurePostscriptDlg::PurePostscriptDlg(TQWidget *tqparent, const char *name) - : TQVBox( tqparent, name ) +PurePostscriptDlg::PurePostscriptDlg(TQWidget *parent, const char *name) + : TQVBox( parent, name ) { TQVGroupBox* gb = new TQVGroupBox( i18n("Barcode Writer in Pure Postscript"), this ); gb->setEnabled( Barkode::havePurePostscriptBarcode() ); diff --git a/kbarcode/barcodedialogs.h b/kbarcode/barcodedialogs.h index abaee68..19eb456 100644 --- a/kbarcode/barcodedialogs.h +++ b/kbarcode/barcodedialogs.h @@ -58,7 +58,7 @@ class AdvancedBarcodeDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - AdvancedBarcodeDialog( TQString type, TQWidget* tqparent = 0, const char* name = 0 ); + AdvancedBarcodeDialog( TQString type, TQWidget* parent = 0, const char* name = 0 ); ~AdvancedBarcodeDialog(); void setData( Barkode* b ); @@ -75,7 +75,7 @@ class TBarcodeDlg : public TQWidget, public BarcodeDlgBase { Q_OBJECT TQ_OBJECT public: - TBarcodeDlg(TQWidget *tqparent=0, const char *name=0); + TBarcodeDlg(TQWidget *parent=0, const char *name=0); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -98,7 +98,7 @@ class PDF417BarcodeDlg : public TQWidget, public BarcodeDlgBase { Q_OBJECT TQ_OBJECT public: - PDF417BarcodeDlg(TQWidget *tqparent=0, const char *name=0); + PDF417BarcodeDlg(TQWidget *parent=0, const char *name=0); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -116,7 +116,7 @@ class DataMatrixDlg : public TQWidget, public BarcodeDlgBase { Q_OBJECT TQ_OBJECT public: - DataMatrixDlg(TQWidget *tqparent=0, const char *name=0); + DataMatrixDlg(TQWidget *parent=0, const char *name=0); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -132,7 +132,7 @@ class SequenceDlg : public TQWidget, public BarcodeDlgBase { Q_OBJECT TQ_OBJECT public: - SequenceDlg(TQWidget *tqparent=0, const char *name=0); + SequenceDlg(TQWidget *parent=0, const char *name=0); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -157,7 +157,7 @@ class ColorDlg : public TQVBox, public BarcodeDlgBase { Q_OBJECT TQ_OBJECT public: - ColorDlg(TQWidget *tqparent=0, const char *name=0); + ColorDlg(TQWidget *parent=0, const char *name=0); void setData( Barkode* b ); void getData( Barkode* b ) const; @@ -175,7 +175,7 @@ class PurePostscriptDlg : public TQVBox, public BarcodeDlgBase { Q_OBJECT TQ_OBJECT public: - PurePostscriptDlg(TQWidget *tqparent=0, const char *name=0); + PurePostscriptDlg(TQWidget *parent=0, const char *name=0); void setData( Barkode* b ); void getData( Barkode* b ) const; diff --git a/kbarcode/barcodeprinterdlg.cpp b/kbarcode/barcodeprinterdlg.cpp index e565bd2..4a76091 100644 --- a/kbarcode/barcodeprinterdlg.cpp +++ b/kbarcode/barcodeprinterdlg.cpp @@ -27,9 +27,9 @@ #include #include -BarcodePrinterDlg::BarcodePrinterDlg(TQWidget *tqparent, const char *name) +BarcodePrinterDlg::BarcodePrinterDlg(TQWidget *parent, const char *name) : KDialogBase( KDialogBase::Plain, i18n("Barcode Printer"), - KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent,name) + KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name) { TQGridLayout* tqlayout = new TQGridLayout( plainPage(), 6, 6 ); diff --git a/kbarcode/barcodeprinterdlg.h b/kbarcode/barcodeprinterdlg.h index 1d7a54b..5680113 100644 --- a/kbarcode/barcodeprinterdlg.h +++ b/kbarcode/barcodeprinterdlg.h @@ -32,7 +32,7 @@ class BarcodePrinterDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - BarcodePrinterDlg(TQWidget *tqparent = 0, const char *name = 0); + BarcodePrinterDlg(TQWidget *parent = 0, const char *name = 0); ~BarcodePrinterDlg(); int outputFormat() const; diff --git a/kbarcode/batchprinter.cpp b/kbarcode/batchprinter.cpp index 8ef28cb..9bc1409 100644 --- a/kbarcode/batchprinter.cpp +++ b/kbarcode/batchprinter.cpp @@ -47,7 +47,7 @@ #define MAXDATASIZE 32550 BatchPrinter::BatchPrinter( KPrinter* p, TQWidget* _parent ) - : printer( p ), tqparent( _parent ) + : printer( p ), parent( _parent ) { m_events = true; m_data = NULL; @@ -60,7 +60,7 @@ BatchPrinter::BatchPrinter( KPrinter* p, TQWidget* _parent ) } BatchPrinter::BatchPrinter( const TQString & path, TQWidget* p ) - : m_path( path ), tqparent( p ) + : m_path( path ), parent( p ) { m_data = NULL; m_vardata = NULL; @@ -74,7 +74,7 @@ BatchPrinter::BatchPrinter( const TQString & path, TQWidget* p ) } BatchPrinter::BatchPrinter( const TQString & path, int format, TQWidget* _parent ) - : m_path( path ), m_bcp_format( format ), tqparent( _parent ) + : m_path( path ), m_bcp_format( format ), parent( _parent ) { m_data = NULL; m_vardata = NULL; @@ -278,7 +278,7 @@ void BatchPrinter::startImages() Measurements measure = def->getMeasurements(); Label* l = NULL; painter = new TQPainter(); - TQPixmap pixmap( (int)measure.width( TQT_TQPAINTDEVICE(tqparent) ), (int)measure.height( TQT_TQPAINTDEVICE(tqparent) ) ); + TQPixmap pixmap( (int)measure.width( TQT_TQPAINTDEVICE(parent) ), (int)measure.height( TQT_TQPAINTDEVICE(parent) ) ); while( (l = initLabel( &number ) ) != NULL ) { for( int i = 0; i < number; i++ ) @@ -334,7 +334,7 @@ void BatchPrinter::startBCP() TQFile file( m_path ); if( !file.open( IO_WriteOnly ) ) // | IO_Raw ) ) { - KMessageBox::error( tqparent, TQString( i18n("Can't open the file or device %1.") ).tqarg( m_path ) ); + KMessageBox::error( parent, TQString( i18n("Can't open the file or device %1.") ).tqarg( m_path ) ); return; } @@ -502,7 +502,7 @@ void BatchPrinter::moveLabels() TQProgressDialog* BatchPrinter::createProgressDialog( const TQString & caption ) { - TQProgressDialog* progress = new TQProgressDialog( caption, i18n("&Cancel"), m_labels+1, tqparent ); + TQProgressDialog* progress = new TQProgressDialog( caption, i18n("&Cancel"), m_labels+1, parent ); progress->setProgress( 0 ); progress->show(); return progress; diff --git a/kbarcode/batchprinter.h b/kbarcode/batchprinter.h index ed06a9e..782b89e 100644 --- a/kbarcode/batchprinter.h +++ b/kbarcode/batchprinter.h @@ -204,9 +204,9 @@ class BatchPrinter TQBuffer* buffer; KPrinter* printer; TQPainter* painter; - /** tqparent for dialogs + /** parent for dialogs */ - TQWidget* tqparent; + TQWidget* parent; }; #endif diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp index 153aa81..ef1db26 100644 --- a/kbarcode/batchwizard.cpp +++ b/kbarcode/batchwizard.cpp @@ -68,8 +68,8 @@ class AddressListViewItem : public KListViewItem { public: - AddressListViewItem(TQListView *tqparent, KABC::Addressee & addr ) - : KListViewItem( tqparent ), m_address( addr ) + AddressListViewItem(TQListView *parent, KABC::Addressee & addr ) + : KListViewItem( parent ), m_address( addr ) { this->setText( 0, m_address.givenName() ); this->setText( 1, m_address.familyName() ); @@ -85,9 +85,9 @@ private: }; -BatchWizard::BatchWizard( TQWidget* tqparent, const char* name ) +BatchWizard::BatchWizard( TQWidget* parent, const char* name ) : DCOPObject("BatchPrinting"), - KWizard( tqparent, name ) + KWizard( parent, name ) { setupPage1(); setupPage2(); diff --git a/kbarcode/batchwizard.h b/kbarcode/batchwizard.h index 9bdb2a5..c0d6094 100644 --- a/kbarcode/batchwizard.h +++ b/kbarcode/batchwizard.h @@ -45,7 +45,7 @@ class BatchWizard : public KWizard, public BatchIface { Q_OBJECT TQ_OBJECT public: - BatchWizard( TQWidget* tqparent = NULL, const char* name = NULL ); + BatchWizard( TQWidget* parent = NULL, const char* name = NULL ); ~BatchWizard(); /** reimplemented DCOP method from BatchIface diff --git a/kbarcode/configdialog.cpp b/kbarcode/configdialog.cpp index 3a9b320..139c2ec 100644 --- a/kbarcode/configdialog.cpp +++ b/kbarcode/configdialog.cpp @@ -46,9 +46,9 @@ const TQString cached = I18N_NOOP("There are currently %1 cached barcodes."); using namespace KABC; -ConfigDialog::ConfigDialog( TQWidget* tqparent ) +ConfigDialog::ConfigDialog( TQWidget* parent ) : KDialogBase( IconList, i18n("Configure KBarcode"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, tqparent, "", true, true ) + KDialogBase::Ok, parent, "", true, true ) { setupTab2(); // Printer setupTab1(); // SQL diff --git a/kbarcode/configdialog.h b/kbarcode/configdialog.h index 02b31a7..151c86f 100644 --- a/kbarcode/configdialog.h +++ b/kbarcode/configdialog.h @@ -41,7 +41,7 @@ class ConfigDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - ConfigDialog( TQWidget* tqparent ); + ConfigDialog( TQWidget* parent ); ~ConfigDialog(); KLineEdit* comment; diff --git a/kbarcode/confwizard.cpp b/kbarcode/confwizard.cpp index fff2fb1..76e31bd 100644 --- a/kbarcode/confwizard.cpp +++ b/kbarcode/confwizard.cpp @@ -53,8 +53,8 @@ const char* description = I18N_NOOP( "replacement for the creation of barcodes. All major types of barcodes " "like EAN, UPC, CODE39 and ISBN are supported." ); -ConfWizard::ConfWizard( TQWidget* tqparent, const char* name, bool modal ) - : KWizard( tqparent, name, modal ) +ConfWizard::ConfWizard( TQWidget* parent, const char* name, bool modal ) + : KWizard( parent, name, modal ) { setCaption( i18n( "Configure KBarcode" ) ); diff --git a/kbarcode/confwizard.h b/kbarcode/confwizard.h index 9df4a13..d6a39a1 100644 --- a/kbarcode/confwizard.h +++ b/kbarcode/confwizard.h @@ -41,7 +41,7 @@ class ConfWizard : public KWizard TQ_OBJECT public: - ConfWizard( TQWidget* tqparent = 0, const char* name = 0, bool modal = true ); + ConfWizard( TQWidget* parent = 0, const char* name = 0, bool modal = true ); ~ConfWizard(); void showPage( TQWidget* page ); diff --git a/kbarcode/csvimportdlg.cpp b/kbarcode/csvimportdlg.cpp index 767cb59..875549d 100644 --- a/kbarcode/csvimportdlg.cpp +++ b/kbarcode/csvimportdlg.cpp @@ -54,9 +54,9 @@ extern TQString removeQuote( TQString text, TQString quote ); const char* NOFIELD = ""; -CSVImportDlg::CSVImportDlg(TQWidget *tqparent, const char *name ) +CSVImportDlg::CSVImportDlg(TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Tabbed, i18n("Import"), - KDialogBase::Ok | KDialogBase::Close, KDialogBase::Ok, tqparent,name,false,true) + KDialogBase::Ok | KDialogBase::Close, KDialogBase::Ok, parent,name,false,true) { setButtonOKText( i18n("&Import"), i18n("Import the selected file into your tables.") ); diff --git a/kbarcode/csvimportdlg.h b/kbarcode/csvimportdlg.h index 254ded9..675da4a 100644 --- a/kbarcode/csvimportdlg.h +++ b/kbarcode/csvimportdlg.h @@ -48,7 +48,7 @@ class CSVImportDlg : public KDialogBase { Q_OBJECT TQ_OBJECT public: - CSVImportDlg(TQWidget *tqparent=0, const char *name=0); + CSVImportDlg(TQWidget *parent=0, const char *name=0); ~CSVImportDlg(); private slots: diff --git a/kbarcode/databasebrowser.cpp b/kbarcode/databasebrowser.cpp index ecbae53..1490cc5 100644 --- a/kbarcode/databasebrowser.cpp +++ b/kbarcode/databasebrowser.cpp @@ -35,8 +35,8 @@ #define CUR_TABLE_ID 6666 -DatabaseBrowser::DatabaseBrowser( TQString _database, TQWidget *tqparent, const char *name ) - : DSMainWindow(tqparent,name) +DatabaseBrowser::DatabaseBrowser( TQString _database, TQWidget *parent, const char *name ) + : DSMainWindow(parent,name) { m_direction = m_case = false; diff --git a/kbarcode/databasebrowser.h b/kbarcode/databasebrowser.h index 28afc0b..af6ce19 100644 --- a/kbarcode/databasebrowser.h +++ b/kbarcode/databasebrowser.h @@ -34,7 +34,7 @@ class DatabaseBrowser : public DSMainWindow{ Q_OBJECT TQ_OBJECT public: - DatabaseBrowser( TQString _database, TQWidget *tqparent=0, const char *name=0); + DatabaseBrowser( TQString _database, TQWidget *parent=0, const char *name=0); ~DatabaseBrowser(); private: diff --git a/kbarcode/definition.cpp b/kbarcode/definition.cpp index 5f849f9..666abb6 100644 --- a/kbarcode/definition.cpp +++ b/kbarcode/definition.cpp @@ -127,26 +127,26 @@ TQString PrivateParser::removeQuote( const TQString & q ) /***************************************************************************/ -Definition::Definition( TQWidget* tqparent ) - : m_parent( tqparent ) +Definition::Definition( TQWidget* parent ) + : m_parent( parent ) { id = -1; } -Definition::Definition( int label_def_id, TQWidget* tqparent ) - : m_parent( tqparent ) +Definition::Definition( int label_def_id, TQWidget* parent ) + : m_parent( parent ) { init( TQString("%1").tqarg( label_def_id ) ); } -Definition::Definition( const TQString & label_def_id, TQWidget* tqparent ) - : m_parent( tqparent ) +Definition::Definition( const TQString & label_def_id, TQWidget* parent ) + : m_parent( parent ) { init( label_def_id ); } -Definition::Definition( const TQString & producer, const TQString & type, TQWidget* tqparent ) - : m_parent( tqparent ) +Definition::Definition( const TQString & producer, const TQString & type, TQWidget* parent ) + : m_parent( parent ) { if( SqlTables::isConnected() ) { TQSqlQuery query( diff --git a/kbarcode/definition.h b/kbarcode/definition.h index 4074a63..b68a32c 100644 --- a/kbarcode/definition.h +++ b/kbarcode/definition.h @@ -46,10 +46,10 @@ class TQProgressDialog; */ class Definition : private LabelUtils { public: - Definition( TQWidget* tqparent = 0 ); - Definition( int label_def_id, TQWidget* tqparent = 0 ); - Definition( const TQString & label_def_id, TQWidget* tqparent = 0 ); - Definition( const TQString & producer, const TQString & type, TQWidget* tqparent = 0 ); + Definition( TQWidget* parent = 0 ); + Definition( int label_def_id, TQWidget* parent = 0 ); + Definition( const TQString & label_def_id, TQWidget* parent = 0 ); + Definition( const TQString & producer, const TQString & type, TQWidget* parent = 0 ); ~Definition(); void setId( const TQString & label_def_id ); diff --git a/kbarcode/definitiondialog.cpp b/kbarcode/definitiondialog.cpp index 253c9a2..64da5c5 100644 --- a/kbarcode/definitiondialog.cpp +++ b/kbarcode/definitiondialog.cpp @@ -30,8 +30,8 @@ // KDE includes #include -LabelPreview::LabelPreview( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name) +LabelPreview::LabelPreview( TQWidget* parent, const char* name ) + : TQWidget( parent, name) { // For old DIN A4 preview PrinterSettings* ps = PrinterSettings::getInstance(); @@ -75,8 +75,8 @@ void LabelPreview::paintEvent( TQPaintEvent* ) } /*****************************************/ -DefinitionDialog::DefinitionDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ) +DefinitionDialog::DefinitionDialog( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { resize( 465, 345 ); setCaption( i18n( "Add Label Definition" ) ); diff --git a/kbarcode/definitiondialog.h b/kbarcode/definitiondialog.h index 10ff3d8..ff81102 100644 --- a/kbarcode/definitiondialog.h +++ b/kbarcode/definitiondialog.h @@ -23,7 +23,7 @@ class LabelPreview : public TQWidget { Q_OBJECT TQ_OBJECT public: - LabelPreview( TQWidget* tqparent = 0, const char* name = 0 ); + LabelPreview( TQWidget* parent = 0, const char* name = 0 ); ~LabelPreview(); void setRect( TQRect label ) { size = label; } @@ -48,7 +48,7 @@ class DefinitionDialog : public TQDialog TQ_OBJECT public: - DefinitionDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 ); + DefinitionDialog( TQWidget* parent = 0, const char* name = 0, bool modal = true, WFlags fl = 0 ); ~DefinitionDialog(); private: const Measurements getCurrentMeasure(); diff --git a/kbarcode/documentitemdlg.cpp b/kbarcode/documentitemdlg.cpp index 28313a0..7e93012 100644 --- a/kbarcode/documentitemdlg.cpp +++ b/kbarcode/documentitemdlg.cpp @@ -23,9 +23,9 @@ #include #include -DocumentItemDlg::DocumentItemDlg( TokenProvider* token, DocumentItem* item, KCommandHistory* history, TQWidget* tqparent ) +DocumentItemDlg::DocumentItemDlg( TokenProvider* token, DocumentItem* item, KCommandHistory* history, TQWidget* parent ) : KDialogBase( Tabbed, i18n("Properties"), KDialogBase::Ok|KDialogBase::Cancel, - KDialogBase::Ok, tqparent, 0, true, true ) + KDialogBase::Ok, parent, 0, true, true ) { m_item = item; m_history = history; diff --git a/kbarcode/documentitemdlg.h b/kbarcode/documentitemdlg.h index 4035847..35abed0 100644 --- a/kbarcode/documentitemdlg.h +++ b/kbarcode/documentitemdlg.h @@ -30,7 +30,7 @@ class DocumentItemDlg : public KDialogBase Q_OBJECT TQ_OBJECT public: - DocumentItemDlg( TokenProvider* token, DocumentItem* item, KCommandHistory* history, TQWidget* tqparent ); + DocumentItemDlg( TokenProvider* token, DocumentItem* item, KCommandHistory* history, TQWidget* parent ); ~DocumentItemDlg(); void addPage( PropertyWidget* widget ); diff --git a/kbarcode/dsmainwindow.cpp b/kbarcode/dsmainwindow.cpp index 36ec1a9..6005d45 100644 --- a/kbarcode/dsmainwindow.cpp +++ b/kbarcode/dsmainwindow.cpp @@ -43,8 +43,8 @@ bool DSMainWindow::autoconnect = true; bool DSMainWindow::startwizard = true; -DSMainWindow::DSMainWindow(TQWidget *tqparent, const char *name, WFlags f) - : KMainWindow(tqparent,name,f) +DSMainWindow::DSMainWindow(TQWidget *parent, const char *name, WFlags f) + : KMainWindow(parent,name,f) { connectAct = 0; first = false; diff --git a/kbarcode/dsmainwindow.h b/kbarcode/dsmainwindow.h index 7e049ac..698e237 100644 --- a/kbarcode/dsmainwindow.h +++ b/kbarcode/dsmainwindow.h @@ -34,7 +34,7 @@ class DSMainWindow : public KMainWindow { Q_OBJECT TQ_OBJECT public: - DSMainWindow(TQWidget *tqparent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose ); + DSMainWindow(TQWidget *parent=0, const char *name=0, WFlags f = WType_TopLevel | WDestructiveClose ); ~DSMainWindow(); /** Is this the first start of KBarcode ? diff --git a/kbarcode/dstextedit.cpp b/kbarcode/dstextedit.cpp index 13d9e07..8965756 100644 --- a/kbarcode/dstextedit.cpp +++ b/kbarcode/dstextedit.cpp @@ -19,8 +19,8 @@ #include "dstextedit.moc" #include -DSTextEdit::DSTextEdit( TQWidget* tqparent, const char* name ) - : TextEditBase( tqparent, name ) +DSTextEdit::DSTextEdit( TQWidget* parent, const char* name ) + : TextEditBase( parent, name ) { connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( fixParagraphs() ) ); } diff --git a/kbarcode/dstextedit.h b/kbarcode/dstextedit.h index 8169dc7..6044e31 100644 --- a/kbarcode/dstextedit.h +++ b/kbarcode/dstextedit.h @@ -30,7 +30,7 @@ class DSTextEdit : public TextEditBase { TQ_OBJECT public: - DSTextEdit( TQWidget* tqparent, const char* name = 0 ); + DSTextEdit( TQWidget* parent, const char* name = 0 ); //virtual void moveCursor( CursorAction action, bool select ); private slots: diff --git a/kbarcode/encodingcombo.cpp b/kbarcode/encodingcombo.cpp index 6cfa6ff..0904df8 100644 --- a/kbarcode/encodingcombo.cpp +++ b/kbarcode/encodingcombo.cpp @@ -22,8 +22,8 @@ #include #include -EncodingCombo::EncodingCombo( TQWidget* tqparent ) - : KComboBox( tqparent ) +EncodingCombo::EncodingCombo( TQWidget* parent ) + : KComboBox( parent ) { TQString sEncoding = TQString( KGlobal::locale()->encoding() ); TQStringList encodings (KGlobal::charsets()->availableEncodingNames()); diff --git a/kbarcode/encodingcombo.h b/kbarcode/encodingcombo.h index 589df7a..290521b 100644 --- a/kbarcode/encodingcombo.h +++ b/kbarcode/encodingcombo.h @@ -24,7 +24,7 @@ class EncodingCombo : public KComboBox { Q_OBJECT TQ_OBJECT public: - EncodingCombo( TQWidget* tqparent ); + EncodingCombo( TQWidget* parent ); ~EncodingCombo(); diff --git a/kbarcode/kactionmap.cpp b/kbarcode/kactionmap.cpp index 7ece029..7196084 100644 --- a/kbarcode/kactionmap.cpp +++ b/kbarcode/kactionmap.cpp @@ -37,8 +37,8 @@ class KListViewActionItem : public KListViewItem { public: - KListViewActionItem( KListView* tqparent, KAction* action ) - : KListViewItem( tqparent ), m_action( action ) + KListViewActionItem( KListView* parent, KAction* action ) + : KListViewItem( parent ), m_action( action ) { TQPixmap pix; TQSize size = TQIconSet::iconSize( TQIconSet::Large ); @@ -87,8 +87,8 @@ private: KAction* m_action; }; -KActionMapDlg::KActionMapDlg( KActionCollection* actions, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, false, i18n("Action Map"), KDialogBase::Close, KDialogBase::Close ) +KActionMapDlg::KActionMapDlg( KActionCollection* actions, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, false, i18n("Action Map"), KDialogBase::Close, KDialogBase::Close ) { TQVBox *page = makeVBoxMainWidget(); @@ -103,8 +103,8 @@ void KActionMapDlg::updateEnabledState() m_map->updateEnabledState(); } -KActionMap::KActionMap( KActionCollection* actions, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), m_actions( actions ), m_showMenuTree( true ), m_grayOutItems( false ) +KActionMap::KActionMap( KActionCollection* actions, TQWidget* parent, const char* name ) + : TQWidget( parent, name ), m_actions( actions ), m_showMenuTree( true ), m_grayOutItems( false ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); diff --git a/kbarcode/kactionmap.h b/kbarcode/kactionmap.h index 7245237..7bec683 100644 --- a/kbarcode/kactionmap.h +++ b/kbarcode/kactionmap.h @@ -34,7 +34,7 @@ class TQListViewItem; */ class KActionMapDlg : public KDialogBase { public: - KActionMapDlg( KActionCollection* actions, TQWidget* tqparent = NULL, const char* name = NULL ); + KActionMapDlg( KActionCollection* actions, TQWidget* parent = NULL, const char* name = NULL ); /** Call this function whenever you changed the enabled/disalbed state of an action * in your application. @@ -72,10 +72,10 @@ class KActionMap : public TQWidget { public: /** Creates a new KActionMap widget * @param action all actions from this KActionCollection are displayed. - * @param tqparent the tqparent + * @param parent the parent * @param name the name */ - KActionMap( KActionCollection* actions, TQWidget* tqparent = NULL, const char* name = NULL ); + KActionMap( KActionCollection* actions, TQWidget* parent = NULL, const char* name = NULL ); ~KActionMap(); public slots: diff --git a/kbarcode/kbarcode.cpp b/kbarcode/kbarcode.cpp index c6167f2..32f3559 100644 --- a/kbarcode/kbarcode.cpp +++ b/kbarcode/kbarcode.cpp @@ -39,9 +39,9 @@ #include #include -KBarcode::KBarcode( TQWidget *tqparent, const char *name, WFlags f) +KBarcode::KBarcode( TQWidget *parent, const char *name, WFlags f) : DCOPObject("KBarcode"), - DSMainWindow( tqparent, name, f ) + DSMainWindow( parent, name, f ) { TQGroupBox* w = new TQGroupBox( this ); w->setColumnLayout(0, Qt::Vertical ); diff --git a/kbarcode/kbarcode.h b/kbarcode/kbarcode.h index d501ac8..255e4a4 100644 --- a/kbarcode/kbarcode.h +++ b/kbarcode/kbarcode.h @@ -46,7 +46,7 @@ class KBarcode: public DSMainWindow, public KBarcodeIface { Q_OBJECT TQ_OBJECT public: - KBarcode( TQWidget *tqparent=0, const char *name="kbarcode", WFlags f = WType_TopLevel | WDestructiveClose ); + KBarcode( TQWidget *parent=0, const char *name="kbarcode", WFlags f = WType_TopLevel | WDestructiveClose ); ~KBarcode(); /** Parse all commandline options and start batchprinting diff --git a/kbarcode/labeleditor.cpp b/kbarcode/labeleditor.cpp index 582b9e5..0e887f5 100644 --- a/kbarcode/labeleditor.cpp +++ b/kbarcode/labeleditor.cpp @@ -121,9 +121,9 @@ using namespace KABC; -LabelEditor::LabelEditor( TQWidget *tqparent, TQString _filename, const char *name, WFlags f ) +LabelEditor::LabelEditor( TQWidget *parent, TQString _filename, const char *name, WFlags f ) : DCOPObject( "LabelEditor" ), - DSMainWindow( tqparent, name, f ) + DSMainWindow( parent, name, f ) { undoAct = redoAct = NULL; diff --git a/kbarcode/labeleditor.h b/kbarcode/labeleditor.h index 1321323..a0fc113 100644 --- a/kbarcode/labeleditor.h +++ b/kbarcode/labeleditor.h @@ -88,7 +88,7 @@ class LabelEditor : public DSMainWindow, public EditorIface, private LabelUtils, eLoadLabel }; - LabelEditor( TQWidget *tqparent=0, TQString _filename = TQString(), + LabelEditor( TQWidget *parent=0, TQString _filename = TQString(), const char *name="labeleditor", WFlags f = WType_TopLevel | WDestructiveClose ); ~LabelEditor(); bool startupDlg( ELabelEditorMode mode, TQString f = TQString() ); diff --git a/kbarcode/multilineeditdlg.cpp b/kbarcode/multilineeditdlg.cpp index 9fd2e11..f0d4bef 100644 --- a/kbarcode/multilineeditdlg.cpp +++ b/kbarcode/multilineeditdlg.cpp @@ -33,8 +33,8 @@ #include #include -MultiLineEditor::MultiLineEditor( TokenProvider* token, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), m_token( token ) +MultiLineEditor::MultiLineEditor( TokenProvider* token, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), m_token( token ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 ); diff --git a/kbarcode/multilineeditdlg.h b/kbarcode/multilineeditdlg.h index 9ab5813..f965bc8 100644 --- a/kbarcode/multilineeditdlg.h +++ b/kbarcode/multilineeditdlg.h @@ -35,7 +35,7 @@ class MultiLineEditor : public TQWidget { Q_OBJECT TQ_OBJECT public: - MultiLineEditor( TokenProvider* token, TQWidget *tqparent=0, const char *name=0); + MultiLineEditor( TokenProvider* token, TQWidget *parent=0, const char *name=0); ~MultiLineEditor(); TQString text(); void setText( const TQString & t ); diff --git a/kbarcode/mycanvasview.cpp b/kbarcode/mycanvasview.cpp index 6de0e58..f2b7596 100644 --- a/kbarcode/mycanvasview.cpp +++ b/kbarcode/mycanvasview.cpp @@ -30,8 +30,8 @@ #include #include -MyCanvas::MyCanvas( TQObject* tqparent, const char* name ) - : TQCanvas( tqparent, name ) +MyCanvas::MyCanvas( TQObject* parent, const char* name ) + : TQCanvas( parent, name ) { m_grid = false; @@ -74,8 +74,8 @@ void MyCanvas::drawBackground( TQPainter & painter, const TQRect & clip ) } } -MyCanvasView::MyCanvasView( Definition* d, MyCanvas* c, TQWidget* tqparent, const char* name, WFlags f) - : TQCanvasView(c,tqparent,name,f) +MyCanvasView::MyCanvasView( Definition* d, MyCanvas* c, TQWidget* parent, const char* name, WFlags f) + : TQCanvasView(c,parent,name,f) { statusbar = 0; m_commov = 0; diff --git a/kbarcode/mycanvasview.h b/kbarcode/mycanvasview.h index c8c0e6c..5f15eda 100644 --- a/kbarcode/mycanvasview.h +++ b/kbarcode/mycanvasview.h @@ -34,7 +34,7 @@ class MyCanvas : public TQCanvas { TQ_OBJECT public: - MyCanvas( TQObject* tqparent, const char* name = 0 ); + MyCanvas( TQObject* parent, const char* name = 0 ); ~MyCanvas(); void setRect( TQRect r ) { @@ -87,7 +87,7 @@ class MyCanvasView : public TQCanvasView }; public: - MyCanvasView( Definition* d, MyCanvas *c, TQWidget* tqparent=0, const char* name=0, WFlags f=0); + MyCanvasView( Definition* d, MyCanvas *c, TQWidget* parent=0, const char* name=0, WFlags f=0); ~MyCanvasView(); /** return a list of all DocumentItems on the canvas diff --git a/kbarcode/mydatatable.cpp b/kbarcode/mydatatable.cpp index 88f149b..56a4669 100644 --- a/kbarcode/mydatatable.cpp +++ b/kbarcode/mydatatable.cpp @@ -17,8 +17,8 @@ #include "mydatatable.h" -MyDataTable::MyDataTable(TQWidget *tqparent, const char *name ) - : TQDataTable(tqparent,name) +MyDataTable::MyDataTable(TQWidget *parent, const char *name ) + : TQDataTable(parent,name) { } MyDataTable::~MyDataTable() diff --git a/kbarcode/mydatatable.h b/kbarcode/mydatatable.h index ec8087f..6952273 100644 --- a/kbarcode/mydatatable.h +++ b/kbarcode/mydatatable.h @@ -27,7 +27,7 @@ class MyDataTable : public TQDataTable { Q_OBJECT TQ_OBJECT public: - MyDataTable(TQWidget *tqparent=0, const char *name=0); + MyDataTable(TQWidget *parent=0, const char *name=0); ~MyDataTable(); bool update(); diff --git a/kbarcode/newlabel.cpp b/kbarcode/newlabel.cpp index ea6c14f..9d636ce 100644 --- a/kbarcode/newlabel.cpp +++ b/kbarcode/newlabel.cpp @@ -35,8 +35,8 @@ #define I2S(x) TQString("%1").tqarg(x) #endif // I2S -NewLabel::NewLabel( TQWidget* tqparent, const char* name, bool change, WFlags fl ) - : TQDialog( tqparent, name, true, fl ) +NewLabel::NewLabel( TQWidget* parent, const char* name, bool change, WFlags fl ) + : TQDialog( parent, name, true, fl ) { setCaption( i18n( "New Label" ) ); curid = 0; diff --git a/kbarcode/newlabel.h b/kbarcode/newlabel.h index aa480e5..ddaa8d2 100644 --- a/kbarcode/newlabel.h +++ b/kbarcode/newlabel.h @@ -38,7 +38,7 @@ class NewLabel : public TQDialog Q_OBJECT TQ_OBJECT public: - NewLabel( TQWidget* tqparent = 0, const char* name = 0, bool change = FALSE, WFlags fl = 0 ); + NewLabel( TQWidget* parent = 0, const char* name = 0, bool change = FALSE, WFlags fl = 0 ); ~NewLabel(); int labelId() const { return curid; } diff --git a/kbarcode/previewdialog.cpp b/kbarcode/previewdialog.cpp index 1524973..1e3a2d5 100644 --- a/kbarcode/previewdialog.cpp +++ b/kbarcode/previewdialog.cpp @@ -45,8 +45,8 @@ int PreviewDialog::m_index = 1; TQString PreviewDialog::group = ""; TQString PreviewDialog::article = ""; -PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filename, TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name, true, WDestructiveClose ) +PreviewDialog::PreviewDialog( TQIODevice* device, Definition* d, TQString filename, TQWidget *parent, const char *name ) + : TQDialog( parent, name, true, WDestructiveClose ) { file = device; def = d; diff --git a/kbarcode/previewdialog.h b/kbarcode/previewdialog.h index a7e2419..6585d32 100644 --- a/kbarcode/previewdialog.h +++ b/kbarcode/previewdialog.h @@ -33,7 +33,7 @@ class PreviewDialog : public TQDialog { Q_OBJECT TQ_OBJECT public: - PreviewDialog( TQIODevice* device, Definition* d, TQString filename, TQWidget *tqparent=0, const char *name=0); + PreviewDialog( TQIODevice* device, Definition* d, TQString filename, TQWidget *parent=0, const char *name=0); ~PreviewDialog(); private slots: diff --git a/kbarcode/printersettings.cpp b/kbarcode/printersettings.cpp index 908f74f..e4d8db0 100644 --- a/kbarcode/printersettings.cpp +++ b/kbarcode/printersettings.cpp @@ -157,7 +157,7 @@ int PrinterSettings::getQuality() const return lpdata->quality == Middle || lpdata->quality == VeryHigh? High : lpdata->quality; }; -KPrinter* PrinterSettings::setupPrinter( const KURL & url, TQWidget* tqparent, bool immediately, const TQString & prn ) +KPrinter* PrinterSettings::setupPrinter( const KURL & url, TQWidget* parent, bool immediately, const TQString & prn ) { KPrinter* printer = new KPrinter( true, (enum TQPrinter::PrinterMode)getQuality() ); if( getData()->quality == Middle ) @@ -167,7 +167,7 @@ KPrinter* PrinterSettings::setupPrinter( const KURL & url, TQWidget* tqparent, b printer->setFullPage( true ); // don't use build in margin system - if( !immediately && !printer->setup( tqparent ) ) + if( !immediately && !printer->setup( parent ) ) return 0; if( immediately && !prn.isEmpty() ) diff --git a/kbarcode/printersettings.h b/kbarcode/printersettings.h index e248237..12fd47f 100644 --- a/kbarcode/printersettings.h +++ b/kbarcode/printersettings.h @@ -81,7 +81,7 @@ class PrinterSettings: public TQObject { static PrinterSettings* getInstance(); // don't forget to delete printer - KPrinter* setupPrinter( const KURL & url, TQWidget* tqparent, bool immediately = false, const TQString & prn = TQString() ); + KPrinter* setupPrinter( const KURL & url, TQWidget* parent, bool immediately = false, const TQString & prn = TQString() ); public slots: void loadConfig(); diff --git a/kbarcode/printlabeldlg.cpp b/kbarcode/printlabeldlg.cpp index 7aa10d8..13d6eaa 100644 --- a/kbarcode/printlabeldlg.cpp +++ b/kbarcode/printlabeldlg.cpp @@ -26,9 +26,9 @@ #include #include -PrintLabelDlg::PrintLabelDlg(TQWidget *tqparent, const char *name ) +PrintLabelDlg::PrintLabelDlg(TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Print"), - KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent,name) + KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name) { TQVBoxLayout* box = new TQVBoxLayout( plainPage() ); diff --git a/kbarcode/printlabeldlg.h b/kbarcode/printlabeldlg.h index 4e272ee..0b513f4 100644 --- a/kbarcode/printlabeldlg.h +++ b/kbarcode/printlabeldlg.h @@ -35,7 +35,7 @@ class PrintLabelDlg : public KDialogBase { Q_OBJECT TQ_OBJECT public: - PrintLabelDlg(TQWidget *tqparent=0, const char *name=0); + PrintLabelDlg(TQWidget *parent=0, const char *name=0); ~PrintLabelDlg(); /** diff --git a/kbarcode/propertywidget.cpp b/kbarcode/propertywidget.cpp index 9528a19..16cf783 100644 --- a/kbarcode/propertywidget.cpp +++ b/kbarcode/propertywidget.cpp @@ -77,14 +77,14 @@ void FillLineCombo( KComboBox* box ) } } -PropertyWidget::PropertyWidget(TQWidget* tqparent ) - : TQWidget( tqparent, 0 ) +PropertyWidget::PropertyWidget(TQWidget* parent ) + : TQWidget( parent, 0 ) { grid = new TQGridLayout( this, 2, 2 ); } -PropertyBorder::PropertyBorder( TQWidget* tqparent ) - : PropertyWidget( tqparent ) +PropertyBorder::PropertyBorder( TQWidget* parent ) + : PropertyWidget( parent ) { checkBorder = new TQCheckBox( this ); checkBorder->setText( i18n("&Border Visible") ); @@ -134,8 +134,8 @@ void PropertyBorder::enableControls() } -PropertyRotation::PropertyRotation( TQWidget* tqparent ) - : PropertyWidget( tqparent ) +PropertyRotation::PropertyRotation( TQWidget* parent ) + : PropertyWidget( parent ) { TQLabel* label = new TQLabel( i18n("&Rotation:"), this ); comboRotation = new KComboBox( FALSE, this ); @@ -182,8 +182,8 @@ void PropertyRotation::initSettings( DocumentItem* item ) comboRotation->setCurrentItem( 3 ); } -PropertyFill::PropertyFill( TQWidget* tqparent ) - : PropertyWidget( tqparent ) +PropertyFill::PropertyFill( TQWidget* parent ) + : PropertyWidget( parent ) { buttonColor = new KColorButton( this ); @@ -205,8 +205,8 @@ void PropertyFill::initSettings( DocumentItem* item ) buttonColor->setColor( rect->color() ); } -PropertyBarcode::PropertyBarcode( TokenProvider* token, TQWidget* tqparent ) - : PropertyWidget( tqparent ) +PropertyBarcode::PropertyBarcode( TokenProvider* token, TQWidget* parent ) + : PropertyWidget( parent ) { TQLabel* TextLabel1 = new TQLabel( this, "TextLabel1" ); TextLabel1->setText( i18n( "Barcode Settings:" ) ); @@ -287,8 +287,8 @@ void PropertyBarcode::initSettings( DocumentItem* item ) changedCombo(); } -PropertyText::PropertyText( TokenProvider* token, TQWidget* tqparent ) - : PropertyWidget( tqparent ) +PropertyText::PropertyText( TokenProvider* token, TQWidget* parent ) + : PropertyWidget( parent ) { m_editor = new MultiLineEditor( token, this, "m_editor" ); grid->addWidget( m_editor, 0, 0 ); @@ -310,8 +310,8 @@ void PropertyText::initSettings( DocumentItem* item ) } //NY21 -PropertyTextLine::PropertyTextLine( TokenProvider* token, TQWidget* tqparent ) - : PropertyWidget( tqparent ) +PropertyTextLine::PropertyTextLine( TokenProvider* token, TQWidget* parent ) + : PropertyWidget( parent ) { m_editor = new TextLineEditor( token, this ); grid->addWidget( m_editor, 0, 0 ); @@ -336,8 +336,8 @@ void PropertyTextLine::initSettings( DocumentItem* item ) } //NY21 -PropertySize::PropertySize( TQWidget* tqparent ) - : PropertyWidget( tqparent ) +PropertySize::PropertySize( TQWidget* parent ) + : PropertyWidget( parent ) { const double low = -1000.0; const double max = 1000.0; @@ -460,8 +460,8 @@ void PropertySize::initSettings( DocumentItem* item ) enableControls(); } -PropertyImage::PropertyImage( TokenProvider* token, TQWidget* tqparent ) - : PropertyWidget( tqparent ), m_token( token ) +PropertyImage::PropertyImage( TokenProvider* token, TQWidget* parent ) + : PropertyWidget( parent ), m_token( token ) { TQLabel* label = new TQLabel( i18n("&Rotation:"), this ); comboRotation = new KComboBox( FALSE, this ); @@ -605,8 +605,8 @@ void PropertyImage::slotTokens() imgExpression->insert( tokendlg.token() ); } -PropertyVisible::PropertyVisible( TQWidget* tqparent ) - : PropertyWidget( tqparent ) +PropertyVisible::PropertyVisible( TQWidget* parent ) + : PropertyWidget( parent ) { TQLabel* label = new TQLabel( i18n("Evaluate JavsScript code to define the visibility of this item:"), this ); m_script = new KTextEdit( this ); diff --git a/kbarcode/propertywidget.h b/kbarcode/propertywidget.h index 2d59ea4..7398964 100644 --- a/kbarcode/propertywidget.h +++ b/kbarcode/propertywidget.h @@ -51,7 +51,7 @@ class PropertyWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - PropertyWidget( TQWidget* tqparent ); + PropertyWidget( TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ) = 0; virtual void initSettings( DocumentItem* item ) = 0; @@ -64,7 +64,7 @@ class PropertyBorder : public PropertyWidget { Q_OBJECT TQ_OBJECT public: - PropertyBorder( TQWidget* tqparent ); + PropertyBorder( TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); @@ -83,7 +83,7 @@ class PropertyRotation : public PropertyWidget { Q_OBJECT TQ_OBJECT public: - PropertyRotation( TQWidget* tqparent ); + PropertyRotation( TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); @@ -96,7 +96,7 @@ class PropertyFill : public PropertyWidget { Q_OBJECT TQ_OBJECT public: - PropertyFill( TQWidget* tqparent ); + PropertyFill( TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); @@ -109,7 +109,7 @@ class PropertyBarcode : public PropertyWidget, private LabelUtils { Q_OBJECT TQ_OBJECT public: - PropertyBarcode( TokenProvider* token, TQWidget* tqparent ); + PropertyBarcode( TokenProvider* token, TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); @@ -126,7 +126,7 @@ class PropertyText : public PropertyWidget, private LabelUtils { Q_OBJECT TQ_OBJECT public: - PropertyText( TokenProvider* token, TQWidget* tqparent ); + PropertyText( TokenProvider* token, TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); @@ -140,7 +140,7 @@ class PropertyTextLine : public PropertyWidget, private LabelUtils { Q_OBJECT TQ_OBJECT public: - PropertyTextLine( TokenProvider* token, TQWidget* tqparent ); + PropertyTextLine( TokenProvider* token, TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); @@ -154,7 +154,7 @@ class PropertySize : public PropertyWidget, private LabelUtils { Q_OBJECT TQ_OBJECT public: - PropertySize( TQWidget* tqparent ); + PropertySize( TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); @@ -174,7 +174,7 @@ class PropertyImage : public PropertyWidget { Q_OBJECT TQ_OBJECT public: - PropertyImage( TokenProvider* token, TQWidget* tqparent ); + PropertyImage( TokenProvider* token, TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); @@ -208,7 +208,7 @@ class PropertyVisible : public PropertyWidget { Q_OBJECT TQ_OBJECT public: - PropertyVisible( TQWidget* tqparent ); + PropertyVisible( TQWidget* parent ); virtual void applySettings( DocumentItem* item, KMacroCommand* command ); virtual void initSettings( DocumentItem* item ); diff --git a/kbarcode/rectsettingsdlg.cpp b/kbarcode/rectsettingsdlg.cpp index 9f5fa45..be348f2 100644 --- a/kbarcode/rectsettingsdlg.cpp +++ b/kbarcode/rectsettingsdlg.cpp @@ -50,9 +50,9 @@ void fillLineCombo( KComboBox* box ) } } -RectSettingsDlg::RectSettingsDlg(TQWidget *tqparent, const char *name ) +RectSettingsDlg::RectSettingsDlg(TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Settings"), - KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent,name) + KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name) { TQFrame* frame = plainPage(); TQGridLayout* grid = new TQGridLayout( frame, 6, 6 ); @@ -141,9 +141,9 @@ int RectSettingsDlg::penStyle() const return checkBorder->isChecked() ? comboLine->currentItem() + 1 : 0; } -LineSettingsDlg::LineSettingsDlg(TQWidget *tqparent, const char *name ) +LineSettingsDlg::LineSettingsDlg(TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Settings"), - KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent,name) + KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name) { TQFrame* frame = plainPage(); TQGridLayout* grid = new TQGridLayout( frame, 6, 6 ); diff --git a/kbarcode/rectsettingsdlg.h b/kbarcode/rectsettingsdlg.h index 6a005b7..3e1ea13 100644 --- a/kbarcode/rectsettingsdlg.h +++ b/kbarcode/rectsettingsdlg.h @@ -28,7 +28,7 @@ class RectSettingsDlg : public KDialogBase { Q_OBJECT TQ_OBJECT public: - RectSettingsDlg(TQWidget *tqparent=0, const char *name=0); + RectSettingsDlg(TQWidget *parent=0, const char *name=0); ~RectSettingsDlg(); void setBorderColor( const TQColor & c ); @@ -59,7 +59,7 @@ class LineSettingsDlg : public KDialogBase { Q_OBJECT TQ_OBJECT public: - LineSettingsDlg(TQWidget *tqparent=0, const char *name=0); + LineSettingsDlg(TQWidget *parent=0, const char *name=0); ~LineSettingsDlg(); void setPen( const TQPen p ); diff --git a/kbarcode/smalldialogs.cpp b/kbarcode/smalldialogs.cpp index 45feabc..6c1a873 100644 --- a/kbarcode/smalldialogs.cpp +++ b/kbarcode/smalldialogs.cpp @@ -31,9 +31,9 @@ using namespace DSSmallDialogs; -AddAllDialog::AddAllDialog(TQWidget *tqparent, const char *name ) +AddAllDialog::AddAllDialog(TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Add Barcode_basic"), - KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent,name) + KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent,name) { TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 6, 6 ); @@ -57,16 +57,16 @@ int AddAllDialog::numberLabels() const return number->value(); } -AddItemsDialog::AddItemsDialog(TQWidget *tqparent, const char *name ) +AddItemsDialog::AddItemsDialog(TQWidget *parent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n("Add Items"), - KDialogBase::User1 | KDialogBase::Close, KDialogBase::User1, tqparent,name) + KDialogBase::User1 | KDialogBase::Close, KDialogBase::User1, parent,name) { init(); } -AddItemsDialog::AddItemsDialog( const TQString & a, const TQString & g, int c, TQWidget* tqparent, const char* name ) +AddItemsDialog::AddItemsDialog( const TQString & a, const TQString & g, int c, TQWidget* parent, const char* name ) : KDialogBase( KDialogBase::Plain, i18n("Edit Item"), - KDialogBase::Ok| KDialogBase::Close, KDialogBase::Ok, tqparent,name) + KDialogBase::Ok| KDialogBase::Close, KDialogBase::Ok, parent,name) { init(); article->setText( a ); diff --git a/kbarcode/smalldialogs.h b/kbarcode/smalldialogs.h index 228450c..3805231 100644 --- a/kbarcode/smalldialogs.h +++ b/kbarcode/smalldialogs.h @@ -31,7 +31,7 @@ namespace DSSmallDialogs { Q_OBJECT TQ_OBJECT public: - AddAllDialog(TQWidget *tqparent=0, const char *name=0); + AddAllDialog(TQWidget *parent=0, const char *name=0); TQString groupName() const; int numberLabels() const; @@ -45,8 +45,8 @@ namespace DSSmallDialogs { Q_OBJECT TQ_OBJECT public: - AddItemsDialog( TQWidget* tqparent = 0, const char* name = 0 ); - AddItemsDialog( const TQString & a, const TQString & g, int c, TQWidget* tqparent = 0, const char* name = 0 ); + AddItemsDialog( TQWidget* parent = 0, const char* name = 0 ); + AddItemsDialog( const TQString & a, const TQString & g, int c, TQWidget* parent = 0, const char* name = 0 ); void setGroupCompletion( KCompletion* c ); diff --git a/kbarcode/sqltables.cpp b/kbarcode/sqltables.cpp index 1d8d8c3..4423e65 100644 --- a/kbarcode/sqltables.cpp +++ b/kbarcode/sqltables.cpp @@ -70,8 +70,8 @@ class STQLiteDescription : public SqlDescription { virtual const TQString showColumns( const TQString & table ) const { return "SHOW COLUMNS FROM " + table; } }; -SqlTables::SqlTables( TQObject* tqparent ) - : TQObject( tqparent, "sqltables" ) +SqlTables::SqlTables( TQObject* parent ) + : TQObject( parent, "sqltables" ) { drivers.insert( "TQMYSQL3", new MySqlDescription() ); drivers.insert( "TQPSQL7", new PostgreSTQLDescription() ); @@ -508,8 +508,8 @@ const TQString SqlTables::getBarcodeMaxLength( const TQString & name ) return "1234567"; } -SqlWidget::SqlWidget( bool showlabel, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +SqlWidget::SqlWidget( bool showlabel, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); diff --git a/kbarcode/sqltables.h b/kbarcode/sqltables.h index f665583..def102b 100644 --- a/kbarcode/sqltables.h +++ b/kbarcode/sqltables.h @@ -148,7 +148,7 @@ class SqlTables : public TQObject { void connectedSQL(); private: - SqlTables( TQObject* tqparent = 0 ); + SqlTables( TQObject* parent = 0 ); ~SqlTables(); void exec( TQSqlQuery* query, const TQString & text ); @@ -183,7 +183,7 @@ class SqlWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - SqlWidget( bool showlabel, TQWidget* tqparent = 0, const char* name = 0 ); + SqlWidget( bool showlabel, TQWidget* parent = 0, const char* name = 0 ); ~SqlWidget(); const TQString username() const; diff --git a/kbarcode/textlineedit.cpp b/kbarcode/textlineedit.cpp index e9b4142..1fcc54f 100644 --- a/kbarcode/textlineedit.cpp +++ b/kbarcode/textlineedit.cpp @@ -30,8 +30,8 @@ #include #include -TextLineEditor::TextLineEditor( TokenProvider* token, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), m_token( token ) +TextLineEditor::TextLineEditor( TokenProvider* token, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), m_token( token ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 6, 6 ); diff --git a/kbarcode/textlineedit.h b/kbarcode/textlineedit.h index 9dca741..aa88825 100644 --- a/kbarcode/textlineedit.h +++ b/kbarcode/textlineedit.h @@ -32,7 +32,7 @@ class TextLineEditor : public TQWidget { Q_OBJECT TQ_OBJECT public: - TextLineEditor( TokenProvider* token, TQWidget *tqparent=0, const char *name=0); + TextLineEditor( TokenProvider* token, TQWidget *parent=0, const char *name=0); ~TextLineEditor(); TQString text(); KIntNumInput* mag_vert; diff --git a/kbarcode/tokendialog.cpp b/kbarcode/tokendialog.cpp index e9e36eb..dcda408 100644 --- a/kbarcode/tokendialog.cpp +++ b/kbarcode/tokendialog.cpp @@ -39,8 +39,8 @@ #include #include -TokenDialog::TokenDialog(TokenProvider* token ,TQWidget *tqparent, const char *name) - : KWizard( tqparent, name ), m_token( token ) +TokenDialog::TokenDialog(TokenProvider* token ,TQWidget *parent, const char *name) + : KWizard( parent, name ), m_token( token ) { m_custom_tokens = m_token->listUserVars(); diff --git a/kbarcode/tokendialog.h b/kbarcode/tokendialog.h index e86d5cc..017004c 100644 --- a/kbarcode/tokendialog.h +++ b/kbarcode/tokendialog.h @@ -43,7 +43,7 @@ class TokenDialog : public KWizard { TQ_OBJECT public: - TokenDialog( TokenProvider* token, TQWidget *tqparent = 0, const char *name = 0 ); + TokenDialog( TokenProvider* token, TQWidget *parent = 0, const char *name = 0 ); inline const TQString & token() const { return m_result; }