From c9f922159a1ce0496d3bbe743d590221f00148f8 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/soundkonverter@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/cdopener.cpp | 4 +-- src/cdopener.h | 4 +-- src/combobutton.cpp | 4 +-- src/combobutton.h | 4 +-- src/configbackendspage.cpp | 8 +++--- src/configbackendspage.h | 2 +- src/configdialog.cpp | 4 +-- src/configdialog.h | 2 +- src/configenvironmentpage.cpp | 28 +++++++++---------- src/configenvironmentpage.h | 2 +- src/configgeneralpage.cpp | 48 ++++++++++++++++---------------- src/configgeneralpage.h | 2 +- src/configpagebase.cpp | 4 +-- src/configpagebase.h | 2 +- src/configpluginspage.cpp | 30 ++++++++++---------- src/configpluginspage.h | 2 +- src/cuesheeteditor.cpp | 4 +-- src/cuesheeteditor.h | 2 +- src/dirdialog.cpp | 4 +-- src/dirdialog.h | 2 +- src/filelist.cpp | 12 ++++---- src/filelist.h | 12 ++++---- src/logviewer.cpp | 34 +++++++++++----------- src/logviewer.h | 14 +++++----- src/metadata/m4a/mp4propsproxy.h | 2 +- src/options.cpp | 4 +-- src/options.h | 2 +- src/optionsdetailed.cpp | 4 +-- src/optionsdetailed.h | 2 +- src/optionseditor.cpp | 4 +-- src/optionseditor.h | 2 +- src/optionsrequester.cpp | 4 +-- src/optionsrequester.h | 2 +- src/optionssimple.cpp | 4 +-- src/optionssimple.h | 2 +- src/outputdirectory.cpp | 4 +-- src/outputdirectory.h | 2 +- src/progressindicator.cpp | 4 +-- src/progressindicator.h | 2 +- src/replaygainfilelist.cpp | 42 ++++++++++++++-------------- src/replaygainfilelist.h | 18 ++++++------ src/replaygainscanner.cpp | 4 +-- src/replaygainscanner.h | 2 +- 43 files changed, 172 insertions(+), 172 deletions(-) diff --git a/src/cdopener.cpp b/src/cdopener.cpp index 1518e2b..12779be 100755 --- a/src/cdopener.cpp +++ b/src/cdopener.cpp @@ -27,8 +27,8 @@ // ### soundkonverter 0.4: implement cd info text -CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngine, const TQString& _device, TQWidget* tqparent, const char* name, /*Mode default_mode, const TQString& default_text,*/ bool modal, WFlags f ) - : KDialog( tqparent, name, modal, f ) +CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngine, const TQString& _device, TQWidget* parent, const char* name, /*Mode default_mode, const TQString& default_text,*/ bool modal, WFlags f ) + : KDialog( parent, name, modal, f ) { cdManager = _cdManager; tagEngine = _tagEngine; diff --git a/src/cdopener.h b/src/cdopener.h index 2730cd0..7a676b9 100755 --- a/src/cdopener.h +++ b/src/cdopener.h @@ -36,12 +36,12 @@ public: /** * Constructor - * @param tqparent The tqparent widget + * @param parent The parent widget * @param name The name of the file list * @p modal Sets whether the dialog is modal or not * @p f Some flags */ - CDOpener( Config*, CDManager*, TagEngine*, const TQString &device, TQWidget *tqparent = 0, const char *name = 0, /*Mode default_mode = all_tracks, const TQString& default_text = "",*/ bool modal = true, WFlags f = 0 ); + CDOpener( Config*, CDManager*, TagEngine*, const TQString &device, TQWidget *parent = 0, const char *name = 0, /*Mode default_mode = all_tracks, const TQString& default_text = "",*/ bool modal = true, WFlags f = 0 ); /** * Destructor diff --git a/src/combobutton.cpp b/src/combobutton.cpp index 64a84d7..9b71947 100755 --- a/src/combobutton.cpp +++ b/src/combobutton.cpp @@ -8,8 +8,8 @@ #include #include -ComboButton::ComboButton( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +ComboButton::ComboButton( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { m_increaseHeight = 0; diff --git a/src/combobutton.h b/src/combobutton.h index 73d87d3..d96daaa 100755 --- a/src/combobutton.h +++ b/src/combobutton.h @@ -26,10 +26,10 @@ public: /** * Constructor - * @param tqparent The tqparent widget + * @param parent The parent widget * @param name The name of the file list */ - ComboButton( TQWidget *tqparent, const char *name = 0 ); + ComboButton( TQWidget *parent, const char *name = 0 ); /** * Destructor diff --git a/src/configbackendspage.cpp b/src/configbackendspage.cpp index ace3e06..7a5f16a 100755 --- a/src/configbackendspage.cpp +++ b/src/configbackendspage.cpp @@ -20,14 +20,14 @@ #include -ConfigBackendsPage::ConfigBackendsPage( Config* _config, TQMap* _binaries, TQWidget* tqparent, const char *name ) - : ConfigPageBase( tqparent, name ) +ConfigBackendsPage::ConfigBackendsPage( Config* _config, TQMap* _binaries, TQWidget* parent, const char *name ) + : ConfigPageBase( parent, name ) { config = _config; binaries = _binaries; - grid = new TQGridLayout( tqparent ); - scrollView = new KScrollView( tqparent, "scrollView" ); + grid = new TQGridLayout( parent ); + scrollView = new KScrollView( parent, "scrollView" ); scrollView->setResizePolicy( TQScrollView::AutoOneFit ); grid->addWidget( scrollView, 0, 0 ); box = new TQVBox( scrollView->viewport() ); diff --git a/src/configbackendspage.h b/src/configbackendspage.h index a8cef3c..8165139 100755 --- a/src/configbackendspage.h +++ b/src/configbackendspage.h @@ -30,7 +30,7 @@ public: /** * Default Constructor */ - ConfigBackendsPage( Config*, TQMap*, TQWidget *tqparent=0, const char *name=0 ); + ConfigBackendsPage( Config*, TQMap*, TQWidget *parent=0, const char *name=0 ); /** * Default Destructor diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 9b05254..f53844f 100755 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -25,13 +25,13 @@ #include #include -ConfigDialog::ConfigDialog( Config* _config, TQWidget *tqparent, const char *name, Page startPage ) +ConfigDialog::ConfigDialog( Config* _config, TQWidget *parent, const char *name, Page startPage ) : KDialogBase( IconList, i18n("Settings"), Apply | Cancel | Default | Help | Ok, Ok, // default button - tqparent, + parent, name, true, // modal true // separator diff --git a/src/configdialog.h b/src/configdialog.h index 594567c..bcb9c70 100755 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -34,7 +34,7 @@ public: /** * Constructor */ - ConfigDialog( Config*, TQWidget *tqparent = 0, const char *name = 0, Page startPage = GeneralPage ); + ConfigDialog( Config*, TQWidget *parent = 0, const char *name = 0, Page startPage = GeneralPage ); /** * Destructor diff --git a/src/configenvironmentpage.cpp b/src/configenvironmentpage.cpp index ebe7487..3c4b776 100755 --- a/src/configenvironmentpage.cpp +++ b/src/configenvironmentpage.cpp @@ -18,8 +18,8 @@ #include -ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap* _binaries, TQWidget *tqparent, const char *name ) - : ConfigPageBase( tqparent, name ) +ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMap* _binaries, TQWidget *parent, const char *name ) + : ConfigPageBase( parent, name ) { config = _config; binaries = _binaries; @@ -27,16 +27,16 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMapaddWidget( lDirectoriesLabel ); -// KEditListBox* eDirectories = new KEditListBox( tqparent, "eDirectories" ); +// KEditListBox* eDirectories = new KEditListBox( parent, "eDirectories" ); // box->addWidget( eDirectories ); TQHBoxLayout* directoriesBox = new TQHBoxLayout( box ); - lDirectories = new KListBox( tqparent, "lDirectories" ); + lDirectories = new KListBox( parent, "lDirectories" ); lDirectories->insertStringList( config->data.environment.directories ); directoriesBox->addWidget( lDirectories ); connect( lDirectories, TQT_SIGNAL(highlighted(int)), @@ -44,7 +44,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMapsetPixmap( iconLoader->loadIcon("up",KIcon::Toolbar) ); pDirUp->setEnabled( false ); TQToolTip::add( pDirUp, i18n("Move selected directory one position up.\nThis effects which backend will be chosen, if there are several versions.") ); @@ -54,7 +54,7 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMapaddStretch(); - pDirDown = new KPushButton( "", tqparent, "pDirDown" ); + pDirDown = new KPushButton( "", parent, "pDirDown" ); pDirDown->setPixmap( iconLoader->loadIcon("down",KIcon::Toolbar) ); pDirDown->setEnabled( false ); TQToolTip::add( pDirDown, i18n("Move selected directory one position down.\nThis effects which backend will be chosen, if there are several versions.") ); @@ -64,13 +64,13 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMaploadIcon("add",KIcon::Small), i18n("Add ..."), tqparent, "pAddDirectory" ); + pAddDirectory = new KPushButton( iconLoader->loadIcon("add",KIcon::Small), i18n("Add ..."), parent, "pAddDirectory" ); directoriesRightBox->addWidget( pAddDirectory ); connect( pAddDirectory, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDirectory()) ); - pRemoveDirectory = new KPushButton( iconLoader->loadIcon("remove",KIcon::Small), i18n("Remove"), tqparent, "pRemoveDirectory" ); + pRemoveDirectory = new KPushButton( iconLoader->loadIcon("remove",KIcon::Small), i18n("Remove"), parent, "pRemoveDirectory" ); directoriesRightBox->addWidget( pRemoveDirectory ); pRemoveDirectory->setEnabled( false ); connect( pRemoveDirectory, TQT_SIGNAL(clicked()), @@ -84,18 +84,18 @@ ConfigEnvironmentPage::ConfigEnvironmentPage( Config* _config, TQMapaddWidget( lFoundProgramsLabel ); - lFoundPrograms = new KListBox( tqparent, "lFoundPrograms" ); + lFoundPrograms = new KListBox( parent, "lFoundPrograms" ); lFoundPrograms->setSelectionMode( TQListBox::NoSelection ); foundProgramsBox->addWidget( lFoundPrograms ); //connect(lPrograms,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(programsSelectionChanged(int))); programsBox->setStretchFactor( foundProgramsBox, 3 ); TQVBoxLayout* notFoundProgramsBox = new TQVBoxLayout( programsBox ); - TQLabel* lNotFoundProgramsLabel = new TQLabel( i18n("Programs not found")+":", tqparent, "lNotFoundProgramsLabel" ); + TQLabel* lNotFoundProgramsLabel = new TQLabel( i18n("Programs not found")+":", parent, "lNotFoundProgramsLabel" ); notFoundProgramsBox->addWidget( lNotFoundProgramsLabel ); - lNotFoundPrograms = new KListBox( tqparent, "lNotFoundPrograms" ); + lNotFoundPrograms = new KListBox( parent, "lNotFoundPrograms" ); lNotFoundPrograms->setSelectionMode( TQListBox::NoSelection ); notFoundProgramsBox->addWidget( lNotFoundPrograms ); //connect(lPrograms,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(programsSelectionChanged(int))); diff --git a/src/configenvironmentpage.h b/src/configenvironmentpage.h index 6165799..c92e7a1 100755 --- a/src/configenvironmentpage.h +++ b/src/configenvironmentpage.h @@ -22,7 +22,7 @@ public: /** * Default Constructor */ - ConfigEnvironmentPage( Config*, TQMap*, TQWidget *tqparent=0, const char *name=0 ); + ConfigEnvironmentPage( Config*, TQMap*, TQWidget *parent=0, const char *name=0 ); /** * Default Destructor diff --git a/src/configgeneralpage.cpp b/src/configgeneralpage.cpp index 337b099..6edca91 100755 --- a/src/configgeneralpage.cpp +++ b/src/configgeneralpage.cpp @@ -20,20 +20,20 @@ // ### soundkonverter 0.4: add an option to use vfat save names when the output device is vfat -ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const char *name ) - : ConfigPageBase( tqparent, name ) +ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *parent, const char *name ) + : ConfigPageBase( parent, name ) { config = _config; // create an icon loader object for loading icons KIconLoader* iconLoader = new KIconLoader(); - TQVBoxLayout* box = new TQVBoxLayout( tqparent, 0, 6 ); + TQVBoxLayout* box = new TQVBoxLayout( parent, 0, 6 ); TQHBoxLayout* startTabBox = new TQHBoxLayout( box, 6 ); - TQLabel* lStartTab = new TQLabel( i18n("Start in Mode")+":", tqparent, "lStartTab" ); + TQLabel* lStartTab = new TQLabel( i18n("Start in Mode")+":", parent, "lStartTab" ); startTabBox->addWidget( lStartTab ); - cStartTab = new KComboBox( tqparent, "cStartTab" ); + cStartTab = new KComboBox( parent, "cStartTab" ); cStartTab->insertItem( i18n("Last used") ); cStartTab->insertItem( i18n("Simple") ); cStartTab->insertItem( i18n("Detailed") ); @@ -46,9 +46,9 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const box->addSpacing( 5 ); TQHBoxLayout* defaultProfileBox = new TQHBoxLayout( box, 6 ); - TQLabel* lDefaultProfile = new TQLabel( i18n("Default profile")+":", tqparent, "lDefaultProfile" ); + TQLabel* lDefaultProfile = new TQLabel( i18n("Default profile")+":", parent, "lDefaultProfile" ); defaultProfileBox->addWidget( lDefaultProfile ); - cDefaultProfile = new KComboBox( tqparent, "cDefaultProfile" ); + cDefaultProfile = new KComboBox( parent, "cDefaultProfile" ); sDefaultProfile += i18n("Very low"); sDefaultProfile += i18n("Low"); sDefaultProfile += i18n("Medium"); @@ -69,9 +69,9 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const connect( cDefaultProfile, TQT_SIGNAL(activated(int)), this, TQT_SLOT(cfgChanged()) ); - TQLabel* lDefaultFormat = new TQLabel( i18n("Default format")+":", tqparent, "lDefaultFormat" ); + TQLabel* lDefaultFormat = new TQLabel( i18n("Default format")+":", parent, "lDefaultFormat" ); defaultProfileBox->addWidget( lDefaultFormat ); - cDefaultFormat = new KComboBox( tqparent, "cDefaultFormat" ); + cDefaultFormat = new KComboBox( parent, "cDefaultFormat" ); defaultProfileBox->addWidget( cDefaultFormat ); connect( cDefaultFormat, TQT_SIGNAL(activated(int)), this, TQT_SLOT(cfgChanged()) @@ -81,22 +81,22 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const box->addSpacing( 5 ); /* TQHBoxLayout* defaultDirBox = new TQHBoxLayout( box, 6 ); - TQLabel* lDefaultDir = new TQLabel( i18n("Default output directory")+":", tqparent, "lDefaultDir" ); + TQLabel* lDefaultDir = new TQLabel( i18n("Default output directory")+":", parent, "lDefaultDir" ); defaultDirBox->addWidget( lDefaultDir ); - lDir = new KLineEdit( tqparent, "lDir" ); + lDir = new KLineEdit( parent, "lDir" ); lDir->setText( config->data.general.defaultOutputDirectory ); TQToolTip::add( lDir, i18n("

The following strings are space holders, that will be replaced by the information in the meta data:

%a - Artist
%b - Album
%c - Comment
%d - Disc number
%g - Genre
%n - Track number
%p - Composer
%t - Title
%y - Year
%f - Original file name

") ); defaultDirBox->addWidget( lDir ); connect( lDir, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(cfgChanged()) );*/ - /*pDirInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), "", tqparent, "pDirInfo" ); + /*pDirInfo = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), "", parent, "pDirInfo" ); TQToolTip::add( pDirInfo, i18n("Information about the wildcards.") ); defaultDirBox->addWidget( pDirInfo ); connect( pDirInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(dirInfo()) );*/ -// pDirSelect = new KPushButton( iconLoader->loadIcon("folder",KIcon::Small), "", tqparent, "pDirSelect" ); +// pDirSelect = new KPushButton( iconLoader->loadIcon("folder",KIcon::Small), "", parent, "pDirSelect" ); // TQToolTip::add( pDirSelect, i18n("Choose an output directory") ); // defaultDirBox->addWidget( pDirSelect ); // connect( pDirSelect, TQT_SIGNAL(clicked()), @@ -104,9 +104,9 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const // ); TQHBoxLayout* priorityBox = new TQHBoxLayout( box, 6 ); - TQLabel* lPriority = new TQLabel( i18n("Process priority of the backends")+":", tqparent, "lPriority" ); + TQLabel* lPriority = new TQLabel( i18n("Process priority of the backends")+":", parent, "lPriority" ); priorityBox->addWidget( lPriority ); - cPriority = new KComboBox( tqparent, "cPriority" ); + cPriority = new KComboBox( parent, "cPriority" ); sPriority += i18n("Normal"); sPriority += i18n("Low"); cPriority->insertStringList( sPriority ); @@ -119,7 +119,7 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const box->addSpacing( 5 ); TQHBoxLayout* useVFATNamesBox = new TQHBoxLayout( box, 6 ); - cUseVFATNames = new TQCheckBox( i18n("Use FAT compatible output file names"), tqparent, "cUseVFATNames" ); + cUseVFATNames = new TQCheckBox( i18n("Use FAT compatible output file names"), parent, "cUseVFATNames" ); TQToolTip::add( cUseVFATNames, i18n("Replaces some special characters like \'?\' by \'_\'.") ); cUseVFATNames->setChecked( config->data.general.useVFATNames ); useVFATNamesBox->addWidget( cUseVFATNames ); @@ -130,9 +130,9 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const box->addSpacing( 5 ); TQHBoxLayout* conflictHandlingBox = new TQHBoxLayout( box, 6 ); - TQLabel* lConflictHandling = new TQLabel( i18n("Conflict handling")+":", tqparent, "lConflictHandling" ); + TQLabel* lConflictHandling = new TQLabel( i18n("Conflict handling")+":", parent, "lConflictHandling" ); conflictHandlingBox->addWidget( lConflictHandling ); - cConflictHandling = new KComboBox( tqparent, "cConflictHandling" ); + cConflictHandling = new KComboBox( parent, "cConflictHandling" ); TQToolTip::add( cConflictHandling, i18n("Do that if the output file already exists") ); sConflictHandling += i18n("Generate new file name"); sConflictHandling += i18n("Skip file"); @@ -146,9 +146,9 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const box->addSpacing( 5 ); TQHBoxLayout* numFilesBox = new TQHBoxLayout( box, 6 ); - TQLabel* lNumFiles = new TQLabel( i18n("Number of files to convert at once")+":", tqparent, "lNumFiles" ); + TQLabel* lNumFiles = new TQLabel( i18n("Number of files to convert at once")+":", parent, "lNumFiles" ); numFilesBox->addWidget( lNumFiles ); - iNumFiles = new KIntSpinBox( 1, 100, 1, config->data.general.numFiles, 10, tqparent, "iNumFiles" ); + iNumFiles = new KIntSpinBox( 1, 100, 1, config->data.general.numFiles, 10, parent, "iNumFiles" ); numFilesBox->addWidget( iNumFiles ); connect( iNumFiles, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(cfgChanged()) @@ -157,9 +157,9 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const box->addSpacing( 5 ); TQHBoxLayout* updateDelayBox = new TQHBoxLayout( box, 6 ); - TQLabel* lUpdateDelay = new TQLabel( i18n("tqStatus update delay (time in msec.)")+":", tqparent, "lUpdateDelay" ); + TQLabel* lUpdateDelay = new TQLabel( i18n("tqStatus update delay (time in msec.)")+":", parent, "lUpdateDelay" ); updateDelayBox->addWidget( lUpdateDelay ); - iUpdateDelay = new KIntSpinBox( 100, 5000, 100, config->data.general.updateDelay, 10, tqparent, "iUpdateDelay" ); + iUpdateDelay = new KIntSpinBox( 100, 5000, 100, config->data.general.updateDelay, 10, parent, "iUpdateDelay" ); TQToolTip::add( iUpdateDelay, i18n("Update the progress bar in this interval (time in milliseconds)") ); updateDelayBox->addWidget( iUpdateDelay ); connect( iUpdateDelay, TQT_SIGNAL(valueChanged(int)), @@ -169,7 +169,7 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const box->addSpacing( 5 ); TQHBoxLayout* askForNewOptionsBox = new TQHBoxLayout( box, 6 ); - cAskForNewOptions = new TQCheckBox( i18n("Ask for new options, when adding files from external program"), tqparent, "cAskForNewOptions" ); + cAskForNewOptions = new TQCheckBox( i18n("Ask for new options, when adding files from external program"), parent, "cAskForNewOptions" ); TQToolTip::add( cAskForNewOptions, i18n("If you open a file with soundKonverter and soundKonverter is already running,\nyou can either be asked to define new converting options\nor the current settings from the soundKonverter main window are used.") ); cAskForNewOptions->setChecked( config->data.general.askForNewOptions ); askForNewOptionsBox->addWidget( cAskForNewOptions ); @@ -180,7 +180,7 @@ ConfigGeneralPage::ConfigGeneralPage( Config* _config, TQWidget *tqparent, const box->addSpacing( 5 ); TQHBoxLayout* executeUserScriptBox = new TQHBoxLayout( box, 6 ); - cExecuteUserScript = new TQCheckBox( i18n("Execute user script (for advanced users)"), tqparent, "cAskForNewOptions" ); + cExecuteUserScript = new TQCheckBox( i18n("Execute user script (for advanced users)"), parent, "cAskForNewOptions" ); TQToolTip::add( cExecuteUserScript, i18n("Executes a script after every finished conversion. Have a look at $KDEDIR/soundkonverter/userscript.sh") ); cExecuteUserScript->setChecked( config->data.general.executeUserScript ); executeUserScriptBox->addWidget( cExecuteUserScript ); diff --git a/src/configgeneralpage.h b/src/configgeneralpage.h index f8d912e..35cfa5d 100755 --- a/src/configgeneralpage.h +++ b/src/configgeneralpage.h @@ -25,7 +25,7 @@ public: /** * Default Constructor */ - ConfigGeneralPage( Config*, TQWidget *tqparent=0, const char *name=0 ); + ConfigGeneralPage( Config*, TQWidget *parent=0, const char *name=0 ); /** * Default Destructor diff --git a/src/configpagebase.cpp b/src/configpagebase.cpp index f904de3..f2bb3c6 100755 --- a/src/configpagebase.cpp +++ b/src/configpagebase.cpp @@ -1,8 +1,8 @@ #include "configpagebase.h" -ConfigPageBase::ConfigPageBase( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +ConfigPageBase::ConfigPageBase( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) {} ConfigPageBase::~ConfigPageBase() diff --git a/src/configpagebase.h b/src/configpagebase.h index 23aad2b..07bffde 100755 --- a/src/configpagebase.h +++ b/src/configpagebase.h @@ -18,7 +18,7 @@ public: /** * Constructor */ - ConfigPageBase( TQWidget *tqparent=0, const char *name=0 ); + ConfigPageBase( TQWidget *parent=0, const char *name=0 ); /** * Destructor diff --git a/src/configpluginspage.cpp b/src/configpluginspage.cpp index 99eb7b1..5502ea6 100755 --- a/src/configpluginspage.cpp +++ b/src/configpluginspage.cpp @@ -26,20 +26,20 @@ #include //#include -ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* tqparent, const char* name ) - : ConfigPageBase( tqparent, name ) +ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* parent, const char* name ) + : ConfigPageBase( parent, name ) { config = _config; // create an icon loader object for loading icons KIconLoader* iconLoader = new KIconLoader(); - TQVBoxLayout* box = new TQVBoxLayout( tqparent, 0, 6 ); + TQVBoxLayout* box = new TQVBoxLayout( parent, 0, 6 ); - TQLabel* lPluginsLabel = new TQLabel( i18n("Installed plugins")+":", tqparent, "lPluginsLabel" ); + TQLabel* lPluginsLabel = new TQLabel( i18n("Installed plugins")+":", parent, "lPluginsLabel" ); box->addWidget( lPluginsLabel ); TQHBoxLayout* pluginsBox = new TQHBoxLayout( box ); - lPlugins = new KListBox( tqparent, "lPlugins" ); + lPlugins = new KListBox( parent, "lPlugins" ); pluginsBox->addWidget(lPlugins); connect( lPlugins, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(pluginsSelectionChanged(int)) @@ -47,19 +47,19 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* tqparent, const refreshPlugins(); TQVBoxLayout* pluginsRightBox = new TQVBoxLayout( pluginsBox ); - pAddPlugin = new KPushButton( iconLoader->loadIcon("add",KIcon::Small), i18n("Add ..."), tqparent, "pAddPlugin" ); + pAddPlugin = new KPushButton( iconLoader->loadIcon("add",KIcon::Small), i18n("Add ..."), parent, "pAddPlugin" ); pluginsRightBox->addWidget( pAddPlugin ); connect( pAddPlugin, TQT_SIGNAL(clicked()), this, TQT_SLOT(getPlugin()) ); - pRemovePlugin = new KPushButton( iconLoader->loadIcon("remove",KIcon::Small), i18n("Remove"), tqparent, "pRemovePlugin" ); + pRemovePlugin = new KPushButton( iconLoader->loadIcon("remove",KIcon::Small), i18n("Remove"), parent, "pRemovePlugin" ); pRemovePlugin->setEnabled( false ); pluginsRightBox->addWidget( pRemovePlugin ); connect( pRemovePlugin, TQT_SIGNAL(clicked()), this, TQT_SLOT(removePlugin()) ); pluginsRightBox->addStretch(); - pAboutPlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("About"), tqparent, "pAboutPlugin" ); + pAboutPlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("About"), parent, "pAboutPlugin" ); pAboutPlugin->setEnabled( false ); pluginsRightBox->addWidget( pAboutPlugin ); connect( pAboutPlugin, TQT_SIGNAL(clicked()), @@ -68,42 +68,42 @@ ConfigPluginsPage::ConfigPluginsPage( Config* _config, TQWidget* tqparent, const /* NOTE kaligames.de is down box->addSpacing( 5 ); - TQLabel* lOnlinePluginsLabel = new TQLabel( i18n("Available plugins")+":", tqparent, "lOnlinePluginsLabel" ); + TQLabel* lOnlinePluginsLabel = new TQLabel( i18n("Available plugins")+":", parent, "lOnlinePluginsLabel" ); box->addWidget( lOnlinePluginsLabel ); TQHBoxLayout* onlinePluginsBox = new TQHBoxLayout( box ); - lOnlinePlugins = new KListBox( tqparent, "lOnlinePlugins" ); + lOnlinePlugins = new KListBox( parent, "lOnlinePlugins" ); onlinePluginsBox->addWidget( lOnlinePlugins ); connect( lOnlinePlugins, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(onlinePluginsSelectionChanged(int)) ); TQVBoxLayout* onlinePluginsRightBox = new TQVBoxLayout( onlinePluginsBox ); - pRefreshOnlinePlugins = new KPushButton( iconLoader->loadIcon("reload",KIcon::Small), i18n("Refresh"), tqparent, "pRefreshOnlinePlugins" ); + pRefreshOnlinePlugins = new KPushButton( iconLoader->loadIcon("reload",KIcon::Small), i18n("Refresh"), parent, "pRefreshOnlinePlugins" ); TQToolTip::add( pRefreshOnlinePlugins, i18n("Download the latest list of available plugins.") ); onlinePluginsRightBox->addWidget( pRefreshOnlinePlugins ); connect( pRefreshOnlinePlugins, TQT_SIGNAL(clicked()), this, TQT_SLOT(refreshOnlinePlugins()) ); // TODO upgrade button -// pUpgradeOnlinePlugins = new KPushButton( iconLoader->loadIcon("filesave",KIcon::Small), i18n("Upgrade"), tqparent, "pUpgradeOnlinePlugins" ); +// pUpgradeOnlinePlugins = new KPushButton( iconLoader->loadIcon("filesave",KIcon::Small), i18n("Upgrade"), parent, "pUpgradeOnlinePlugins" ); // pUpgradeOnlinePlugins->setEnabled( false ); // TQToolTip::add( pUpgradeOnlinePlugins, i18n("Download all plugins and install them into the soundKonverter directory.") ); // onlinePluginsRightBox->addWidget( pUpgradeOnlinePlugins ); // connect(pInstallAllOnlinePlugins,TQT_SIGNAL(clicked()),this,TQT_SLOT(upgradeOnlinePlugins())); onlinePluginsRightBox->addStretch(); - pInstallOnlinePlugin = new KPushButton( iconLoader->loadIcon("filesave",KIcon::Small), i18n("Install"), tqparent, "pInstallOnlinePlugin" ); + pInstallOnlinePlugin = new KPushButton( iconLoader->loadIcon("filesave",KIcon::Small), i18n("Install"), parent, "pInstallOnlinePlugin" ); pInstallOnlinePlugin->setEnabled( false ); TQToolTip::add( pInstallOnlinePlugin, i18n("Download the selected plugin and install it into the soundKonverter directory.") ); onlinePluginsRightBox->addWidget( pInstallOnlinePlugin ); connect( pInstallOnlinePlugin, TQT_SIGNAL(clicked()), this, TQT_SLOT(getOnlinePlugin()) ); - pAboutOnlinePlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("About"), tqparent, "pAboutOnlinePlugin" ); + pAboutOnlinePlugin = new KPushButton( iconLoader->loadIcon("messagebox_info",KIcon::Small), i18n("About"), parent, "pAboutOnlinePlugin" ); pAboutOnlinePlugin->setEnabled( false ); onlinePluginsRightBox->addWidget( pAboutOnlinePlugin ); connect( pAboutOnlinePlugin, TQT_SIGNAL(clicked()), this, TQT_SLOT(aboutOnlinePlugin()) ); - cCheckOnlinePlugins = new TQCheckBox( i18n("Check for new plugins on every startup"), tqparent, "cCheckOnlinePlugins" ); + cCheckOnlinePlugins = new TQCheckBox( i18n("Check for new plugins on every startup"), parent, "cCheckOnlinePlugins" ); cCheckOnlinePlugins->setChecked( config->data.plugins.checkForUpdates ); box->addWidget( cCheckOnlinePlugins ); connect( cCheckOnlinePlugins, TQT_SIGNAL(toggled(bool)), diff --git a/src/configpluginspage.h b/src/configpluginspage.h index 245f69c..9525faf 100755 --- a/src/configpluginspage.h +++ b/src/configpluginspage.h @@ -24,7 +24,7 @@ public: /** * Default Constructor */ - ConfigPluginsPage( Config*, TQWidget *tqparent=0, const char *name=0 ); + ConfigPluginsPage( Config*, TQWidget *parent=0, const char *name=0 ); /** * Default Destructor diff --git a/src/cuesheeteditor.cpp b/src/cuesheeteditor.cpp index ca1b7c5..812e916 100755 --- a/src/cuesheeteditor.cpp +++ b/src/cuesheeteditor.cpp @@ -18,8 +18,8 @@ // ### soundkonverter 0.4: import/export flac cuesheet -CuesheetEditor::CuesheetEditor( TQWidget *tqparent, const char *name, bool modal, WFlags f ) - : KDialog( tqparent, name, modal, f ) +CuesheetEditor::CuesheetEditor( TQWidget *parent, const char *name, bool modal, WFlags f ) + : KDialog( parent, name, modal, f ) { // TODO can the cuesheet editor be extendet by more tags (composer), etc. diff --git a/src/cuesheeteditor.h b/src/cuesheeteditor.h index 7d1e663..58fed4e 100755 --- a/src/cuesheeteditor.h +++ b/src/cuesheeteditor.h @@ -23,7 +23,7 @@ public: /** * Default Constructor */ - CuesheetEditor( TQWidget* tqparent=0, const char* name=0, bool modal=true, WFlags f=0 ); + CuesheetEditor( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); /** * Default Destructor diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp index a585296..b76d148 100755 --- a/src/dirdialog.cpp +++ b/src/dirdialog.cpp @@ -15,8 +15,8 @@ #include #include -DirDialog::DirDialog( Config* config, Mode mode, TQWidget *tqparent, const char *name, bool modal, WFlags f ) - : KDialog( tqparent, name, modal, f ) +DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *name, bool modal, WFlags f ) + : KDialog( parent, name, modal, f ) { // create an icon loader object for loading icons KIconLoader* iconLoader = new KIconLoader(); diff --git a/src/dirdialog.h b/src/dirdialog.h index 4272fed..97ff028 100755 --- a/src/dirdialog.h +++ b/src/dirdialog.h @@ -31,7 +31,7 @@ public: /** * Constructor */ - DirDialog( Config*, Mode, TQWidget* tqparent=0, const char* name=0, bool modal=true, WFlags f=0 ); + DirDialog( Config*, Mode, TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); /** * Destructor diff --git a/src/filelist.cpp b/src/filelist.cpp index 9cd560f..f01ba80 100755 --- a/src/filelist.cpp +++ b/src/filelist.cpp @@ -38,8 +38,8 @@ // ### soundkonverter 0.4: draw tooltip like bubble info box -FileListItem::FileListItem( KListView* tqparent, FileListItem* after ) - : KListViewItem( tqparent, after ) +FileListItem::FileListItem( KListView* parent, FileListItem* after ) + : KListViewItem( parent, after ) { tags = 0; converting = false; @@ -47,8 +47,8 @@ FileListItem::FileListItem( KListView* tqparent, FileListItem* after ) ripping = false; } -FileListItem::FileListItem( KListView* tqparent ) - : KListViewItem( tqparent ) +FileListItem::FileListItem( KListView* parent ) + : KListViewItem( parent ) { tags = 0; converting = false; @@ -117,8 +117,8 @@ void FileListItem::updateOptionsCell() setText( ((FileList*)listView())->columnByName(i18n("Quality")), ((FileList*)listView())->config->getProfileName(options) ); }*/ -FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _config, Options* _options, Logger* _logger, TQWidget* tqparent, const char* name ) - : KListView( tqparent, name ) +FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _config, Options* _options, Logger* _logger, TQWidget* parent, const char* name ) + : KListView( parent, name ) { cdManager = _cdManager; tagEngine = _tagEngine; diff --git a/src/filelist.h b/src/filelist.h index c2e39a6..e34dcf2 100755 --- a/src/filelist.h +++ b/src/filelist.h @@ -34,16 +34,16 @@ class FileListItem : public KListViewItem public: /** * Constructor - * @param tqparent The tqparent list view + * @param parent The parent list view */ - FileListItem( KListView* tqparent ); + FileListItem( KListView* parent ); /** * Constructor - * @param tqparent The tqparent list view + * @param parent The parent list view * @param after The item, the new item should be placed after */ - FileListItem( KListView* tqparent, FileListItem* after ); + FileListItem( KListView* parent, FileListItem* after ); /** * Destructor @@ -90,10 +90,10 @@ class FileList : public KListView public: /** * Constructor - * @param tqparent The tqparent widget + * @param parent The parent widget * @param name The name of the file list */ - FileList( CDManager*, TagEngine*, Config*, Options*, Logger*, TQWidget *tqparent = 0, const char* name = 0 ); + FileList( CDManager*, TagEngine*, Config*, Options*, Logger*, TQWidget *parent = 0, const char* name = 0 ); /** * Destructor diff --git a/src/logviewer.cpp b/src/logviewer.cpp index 97720d9..5017a02 100755 --- a/src/logviewer.cpp +++ b/src/logviewer.cpp @@ -16,14 +16,14 @@ // ### soundkonverter 0.4: make sub items for the output -LogViewerItem::LogViewerItem( KListView* tqparent, LogViewerItem* after, TQString label1 ) - : KListViewItem( tqparent, after, label1 ) +LogViewerItem::LogViewerItem( KListView* parent, LogViewerItem* after, TQString label1 ) + : KListViewItem( parent, after, label1 ) { converting = false; } -LogViewerItem::LogViewerItem( LogViewerItem* tqparent, LogViewerItem* after, TQString label1 ) - : KListViewItem( tqparent, after, label1 ) +LogViewerItem::LogViewerItem( LogViewerItem* parent, LogViewerItem* after, TQString label1 ) + : KListViewItem( parent, after, label1 ) { converting = false; } @@ -58,16 +58,16 @@ void LogViewerItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, } -LogViewerList::LogViewerList( TQWidget* tqparent, const char* name ) - : KListView( tqparent, name ) +LogViewerList::LogViewerList( TQWidget* parent, const char* name ) + : KListView( parent, name ) {} LogViewerList::~LogViewerList() {} -LogViewer::LogViewer( Logger* _logger, TQWidget *tqparent, const char *name, bool modal, WFlags f ) - : KDialog( tqparent, name, modal, f ) +LogViewer::LogViewer( Logger* _logger, TQWidget *parent, const char *name, bool modal, WFlags f ) + : KDialog( parent, name, modal, f ) { logger = _logger; connect( logger, TQT_SIGNAL(removedProcess(int)), @@ -125,17 +125,17 @@ LogViewer::~LogViewer() void LogViewer::refillLogs() { - LogViewerItem *tqparent = 0, *last = 0; + LogViewerItem *parent = 0, *last = 0; lLogs->clear(); TQValueList logs = logger->getLogs(); for( TQValueList::Iterator a = logs.begin(); a != logs.end(); ++a ) { - tqparent = new LogViewerItem( lLogs, tqparent, KURL::decode_string((*a)->filename).replace("%2f","/").replace("%%","%") + " - " + TQString::number((*a)->id) ); - tqparent->converting = !(*a)->completed; - //tqparent->setOpen( true ); + parent = new LogViewerItem( lLogs, parent, KURL::decode_string((*a)->filename).replace("%2f","/").replace("%%","%") + " - " + TQString::number((*a)->id) ); + parent->converting = !(*a)->completed; + //parent->setOpen( true ); last = 0; for( TQStringList::Iterator b = (*a)->data.begin(); b != (*a)->data.end(); ++b ) { - last = new LogViewerItem( tqparent, last, *b ); + last = new LogViewerItem( parent, last, *b ); last->setMultiLinesEnabled( true ); last->converting = !(*a)->completed; } @@ -185,18 +185,18 @@ void LogViewer::updateProcess( int id ) it = it->nextSibling(); } - LogViewerItem *tqparent = 0; + LogViewerItem *parent = 0; // get the last list view item for( TQListViewItem* it = lLogs->firstChild(); it != 0; it = it->nextSibling() ) { lastItem = (LogViewerItem*)it; } - tqparent = new LogViewerItem( lLogs, lastItem, KURL::decode_string(item->filename).replace("%2f","/").replace("%%","%") + " - " + TQString::number(item->id) ); - tqparent->converting = !item->completed; + parent = new LogViewerItem( lLogs, lastItem, KURL::decode_string(item->filename).replace("%2f","/").replace("%%","%") + " - " + TQString::number(item->id) ); + parent->converting = !item->completed; LogViewerItem* last = 0; for( TQStringList::Iterator b = item->data.begin(); b != item->data.end(); ++b ) { - last = new LogViewerItem( tqparent, last, *b ); + last = new LogViewerItem( parent, last, *b ); last->setMultiLinesEnabled( true ); } } diff --git a/src/logviewer.h b/src/logviewer.h index 094a1ff..d58c51f 100755 --- a/src/logviewer.h +++ b/src/logviewer.h @@ -20,19 +20,19 @@ class LogViewerItem : public KListViewItem public: /** * Constructor - * @param tqparent The tqparent list view + * @param parent The parent list view * @param after The item, the new item should be placed after * @param label1 The text for the first column */ - LogViewerItem( KListView* tqparent, LogViewerItem* after, TQString label1 ); + LogViewerItem( KListView* parent, LogViewerItem* after, TQString label1 ); /** * Constructor - * @param tqparent The tqparent list view item + * @param parent The parent list view item * @param after The item, the new item should be placed after * @param label1 The text for the first column */ - LogViewerItem( LogViewerItem* tqparent, LogViewerItem* after, TQString label1 ); + LogViewerItem( LogViewerItem* parent, LogViewerItem* after, TQString label1 ); /** * Destructor @@ -60,10 +60,10 @@ class LogViewerList : public KListView public: /** * Constructor - * @param tqparent The tqparent widget + * @param parent The parent widget * @param name The name of the file list */ - LogViewerList( TQWidget * tqparent = 0, const char* name = 0 ); + LogViewerList( TQWidget * parent = 0, const char* name = 0 ); /** * Destructor @@ -87,7 +87,7 @@ public: /** * Default Constructor */ - LogViewer( Logger* _logger, TQWidget* tqparent=0, const char* name = 0, bool modal = true, WFlags f = 0 ); + LogViewer( Logger* _logger, TQWidget* parent=0, const char* name = 0, bool modal = true, WFlags f = 0 ); /** * Default Destructor diff --git a/src/metadata/m4a/mp4propsproxy.h b/src/metadata/m4a/mp4propsproxy.h index c6b6f9d..0ea29e2 100644 --- a/src/metadata/m4a/mp4propsproxy.h +++ b/src/metadata/m4a/mp4propsproxy.h @@ -29,7 +29,7 @@ namespace TagLib namespace MP4 { //! Mp4PropsProxy is used to access the stsd box and mvhd box directly - /*! this class works as a shortcut to avoid stepping through all tqparent boxes + /*! this class works as a shortcut to avoid stepping through all parent boxes * to access the boxes in question */ class Mp4PropsProxy diff --git a/src/options.cpp b/src/options.cpp index 961dfa7..4f9e881 100755 --- a/src/options.cpp +++ b/src/options.cpp @@ -18,8 +18,8 @@ // FIXME prevent converting wav files to wav -Options::Options( Config* _config, const TQString &text, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Options::Options( Config* _config, const TQString &text, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { config = _config; connect( config, TQT_SIGNAL(configChanged()), diff --git a/src/options.h b/src/options.h index 65c566b..d3e96f7 100755 --- a/src/options.h +++ b/src/options.h @@ -51,7 +51,7 @@ public: /** * Constructor */ - Options( Config*, const TQString &text, TQWidget* tqparent = 0, const char* name = 0 ); + Options( Config*, const TQString &text, TQWidget* parent = 0, const char* name = 0 ); /** * Destructor diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp index 7f36a8f..7072474 100755 --- a/src/optionsdetailed.cpp +++ b/src/optionsdetailed.cpp @@ -26,8 +26,8 @@ // FIXME refill the formats box, when the configuration changed -OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { config = _config; diff --git a/src/optionsdetailed.h b/src/optionsdetailed.h index 5ab6b2e..cdab64c 100755 --- a/src/optionsdetailed.h +++ b/src/optionsdetailed.h @@ -32,7 +32,7 @@ public: /** * Constructor */ - OptionsDetailed( Config*, TQWidget* tqparent=0, const char* name=0 ); + OptionsDetailed( Config*, TQWidget* parent=0, const char* name=0 ); /** * Destructor diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp index 3975bcf..740f8dd 100755 --- a/src/optionseditor.cpp +++ b/src/optionseditor.cpp @@ -22,13 +22,13 @@ // TODO add warning, when editing tags and converting to an unsupported file format -OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* _fileList, TQWidget* tqparent, const char* name, Page startPage ) +OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList* _fileList, TQWidget* parent, const char* name, Page startPage ) : KDialogBase( IconList, i18n("Options Editor"), /*User2 | User1 |*/ Ok, Ok, // default button - tqparent, + parent, name, false, // modal true/*, // separator diff --git a/src/optionseditor.h b/src/optionseditor.h index 87b5d50..678b444 100755 --- a/src/optionseditor.h +++ b/src/optionseditor.h @@ -37,7 +37,7 @@ public: /** * Constructor */ - OptionsEditor( TagEngine*, Config*, FileList* _fileList, TQWidget* tqparent = 0, const char* name=0, Page startPage = OptionsPage ); + OptionsEditor( TagEngine*, Config*, FileList* _fileList, TQWidget* parent = 0, const char* name=0, Page startPage = OptionsPage ); /** * Destructor diff --git a/src/optionsrequester.cpp b/src/optionsrequester.cpp index 6370749..ec547ee 100755 --- a/src/optionsrequester.cpp +++ b/src/optionsrequester.cpp @@ -12,8 +12,8 @@ #include -OptionsRequester::OptionsRequester( Config* config, TQStringList list, TQWidget *tqparent, const char *name, bool modal, WFlags f ) - : KDialog( tqparent, name, modal, f ) +OptionsRequester::OptionsRequester( Config* config, TQStringList list, TQWidget *parent, const char *name, bool modal, WFlags f ) + : KDialog( parent, name, modal, f ) { setCaption( i18n("Choose output options") ); diff --git a/src/optionsrequester.h b/src/optionsrequester.h index 60bd6f1..80f8aaa 100755 --- a/src/optionsrequester.h +++ b/src/optionsrequester.h @@ -25,7 +25,7 @@ public: /** * Default Constructor */ - OptionsRequester( Config*, TQStringList list, TQWidget *tqparent=0, const char *name=0, bool modal=true, WFlags f=0 ); + OptionsRequester( Config*, TQStringList list, TQWidget *parent=0, const char *name=0, bool modal=true, WFlags f=0 ); /** * Default Destructor diff --git a/src/optionssimple.cpp b/src/optionssimple.cpp index 844db2a..cfc4a55 100755 --- a/src/optionssimple.cpp +++ b/src/optionssimple.cpp @@ -21,8 +21,8 @@ // FIXME when changing the output directory, check if the profile is a user defined and set it to 'User defined', if it is // TODO hide lossless/hybrid/etc. when not available -OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed, const TQString &text, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +OptionsSimple::OptionsSimple( Config* _config, OptionsDetailed* _optionsDetailed, const TQString &text, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { config = _config; optionsDetailed = _optionsDetailed; diff --git a/src/optionssimple.h b/src/optionssimple.h index ff9f41b..94d17d7 100755 --- a/src/optionssimple.h +++ b/src/optionssimple.h @@ -29,7 +29,7 @@ public: /** * Constructor */ - OptionsSimple( Config*, OptionsDetailed*, const TQString &text, TQWidget* tqparent=0, const char* name=0 ); + OptionsSimple( Config*, OptionsDetailed*, const TQString &text, TQWidget* parent=0, const char* name=0 ); /** * Detructor diff --git a/src/outputdirectory.cpp b/src/outputdirectory.cpp index df92c36..8c5479e 100755 --- a/src/outputdirectory.cpp +++ b/src/outputdirectory.cpp @@ -25,8 +25,8 @@ #include -OutputDirectory::OutputDirectory( Config* _config, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +OutputDirectory::OutputDirectory( Config* _config, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { config = _config; diff --git a/src/outputdirectory.h b/src/outputdirectory.h index 329f2b8..677427e 100755 --- a/src/outputdirectory.h +++ b/src/outputdirectory.h @@ -34,7 +34,7 @@ public: /** * Constructor */ - OutputDirectory( Config*, TQWidget* tqparent = 0, const char* name = 0 ); + OutputDirectory( Config*, TQWidget* parent = 0, const char* name = 0 ); Mode mode(); void setMode( Mode ); diff --git a/src/progressindicator.cpp b/src/progressindicator.cpp index bc8ec76..e2255a3 100755 --- a/src/progressindicator.cpp +++ b/src/progressindicator.cpp @@ -13,8 +13,8 @@ // #include -ProgressIndicator::ProgressIndicator( KSystemTray* _systemTray, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +ProgressIndicator::ProgressIndicator( KSystemTray* _systemTray, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { systemTray = _systemTray; diff --git a/src/progressindicator.h b/src/progressindicator.h index 5bf4d3d..b879136 100755 --- a/src/progressindicator.h +++ b/src/progressindicator.h @@ -23,7 +23,7 @@ public: /** * Constructor */ - ProgressIndicator( KSystemTray* _systemTray, TQWidget* tqparent = 0, const char* name = 0 ); + ProgressIndicator( KSystemTray* _systemTray, TQWidget* parent = 0, const char* name = 0 ); /** * Destructor diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp index 51154cf..076766c 100755 --- a/src/replaygainfilelist.cpp +++ b/src/replaygainfilelist.cpp @@ -33,8 +33,8 @@ // ### soundkonverter 0.4: give the 'track' and 'album' column a minimum width and fill the rest of the space with the 'file' column - make some margins, too -ReplayGainFileListItem::ReplayGainFileListItem( TQListView* tqparent ) - : KListViewItem( tqparent ) +ReplayGainFileListItem::ReplayGainFileListItem( TQListView* parent ) + : KListViewItem( parent ) { m_type = File; mimeType = "application/octet-stream"; @@ -42,8 +42,8 @@ ReplayGainFileListItem::ReplayGainFileListItem( TQListView* tqparent ) queued = false; } -// ReplayGainFileListItem::ReplayGainFileListItem( TQListView* tqparent, TQListViewItem* after ) -// : KListViewItem( tqparent, after ) +// ReplayGainFileListItem::ReplayGainFileListItem( TQListView* parent, TQListViewItem* after ) +// : KListViewItem( parent, after ) // { // m_type = File; // mimeType = "application/octet-stream"; @@ -51,8 +51,8 @@ ReplayGainFileListItem::ReplayGainFileListItem( TQListView* tqparent ) // queued = false; // } -ReplayGainFileListItem::ReplayGainFileListItem( ReplayGainFileListItem* tqparent ) - : KListViewItem( tqparent ) +ReplayGainFileListItem::ReplayGainFileListItem( ReplayGainFileListItem* parent ) + : KListViewItem( parent ) { m_type = File; mimeType = "application/octet-stream"; @@ -160,8 +160,8 @@ int ReplayGainFileListItem::compare( TQListViewItem* item, int column, bool asce else return KListViewItem::compare( item, column, ascending ); } -ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config, Logger* _logger, TQWidget *tqparent, const char *name ) - : KListView( tqparent, name ) +ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config, Logger* _logger, TQWidget *parent, const char *name ) + : KListView( parent, name ) { tagEngine = _tagEngine; config = _config; @@ -382,12 +382,12 @@ void ReplayGainFileList::contentsDropEvent( TQDropEvent *e ) TQPoint vp = contentsToViewport( e->pos() ); ReplayGainFileListItem* newParent = itemAt( vp ); - // if the item is a 'file', use the tqparent item + // if the item is a 'file', use the parent item if( newParent && newParent->type() != ReplayGainFileListItem::Album ) { - newParent = newParent->tqparent(); + newParent = newParent->parent(); } - // TODO if the mouse is on the left side under the tqparent but not under the sibling item, use the tqparent + // TODO if the mouse is on the left side under the parent but not under the sibling item, use the parent /* if( newParent == 0 && vp.x() >= 2*treeStepSize() ) { TQPoint p = vp; int height = 0; @@ -397,7 +397,7 @@ void ReplayGainFileList::contentsDropEvent( TQDropEvent *e ) p.setY( p.y() - height ); ReplayGainFileListItem* it = itemAt( p ); if( it && it->type() != ReplayGainFileListItem::Album ) { - newParent = it->tqparent(); + newParent = it->parent(); } else if( it ) { newParent = it; @@ -711,13 +711,13 @@ void ReplayGainFileList::addFile( const TQString& file ) } // | } // | if( tags ) { // <--' - ReplayGainFileListItem* tqparent = new ReplayGainFileListItem( this ); - //tqparent->setText( 0, tags->artist+" - "+tags->album ); - tqparent->setText( columnByName(i18n("File")), tags->album ); - tqparent->setType( ReplayGainFileListItem::Album ); - tqparent->mimeType = mimeType; - tqparent->fileFormat = fileFormat; - ReplayGainFileListItem* item = new ReplayGainFileListItem( tqparent ); + ReplayGainFileListItem* parent = new ReplayGainFileListItem( this ); + //parent->setText( 0, tags->artist+" - "+tags->album ); + parent->setText( columnByName(i18n("File")), tags->album ); + parent->setType( ReplayGainFileListItem::Album ); + parent->mimeType = mimeType; + parent->fileFormat = fileFormat; + ReplayGainFileListItem* item = new ReplayGainFileListItem( parent ); item->originalFileFormat = filePathName.right( filePathName.length() - filePathName.findRev(".") - 1 ); item->filePathName = filePathName; item->mimeType = mimeType; @@ -1074,9 +1074,9 @@ void ReplayGainFileList::processNextFile() ReplayGainFileListItem* currentSubItem = 0; if( !currentItem ) { currentItem = firstChild(); } - else if( currentItem->type() == ReplayGainFileListItem::File && currentItem->tqparent() == 0 ) { currentItem = currentItem->nextSibling(); } + else if( currentItem->type() == ReplayGainFileListItem::File && currentItem->parent() == 0 ) { currentItem = currentItem->nextSibling(); } else if( currentItem->type() == ReplayGainFileListItem::Album ) { currentItem = currentItem->nextSibling(); } - else { currentSubItem = currentItem->nextSibling(); currentItem = currentItem->tqparent(); if( !currentSubItem ) { currentItem = currentItem->nextSibling(); } } + else { currentSubItem = currentItem->nextSibling(); currentItem = currentItem->parent(); if( !currentSubItem ) { currentItem = currentItem->nextSibling(); } } for( ReplayGainFileListItem* item = currentItem; item != 0; item = item->nextSibling() ) { if( item->type() == ReplayGainFileListItem::File ) { diff --git a/src/replaygainfilelist.h b/src/replaygainfilelist.h index 1228aea..6cd882c 100755 --- a/src/replaygainfilelist.h +++ b/src/replaygainfilelist.h @@ -44,22 +44,22 @@ public: /** * Constructor - * @param tqparent The tqparent list view + * @param parent The parent list view */ - ReplayGainFileListItem( TQListView* tqparent ); + ReplayGainFileListItem( TQListView* parent ); /* * Constructor - * @param tqparent The tqparent list view + * @param parent The parent list view * @param after The item, the new item should be placed after */ - //ReplayGainFileListItem( TQListView* tqparent, TQListViewItem* after ); + //ReplayGainFileListItem( TQListView* parent, TQListViewItem* after ); /** * Constructor - * @param tqparent The tqparent list view item + * @param parent The parent list view item */ - ReplayGainFileListItem( ReplayGainFileListItem* tqparent ); + ReplayGainFileListItem( ReplayGainFileListItem* parent ); /** * Destructor @@ -75,7 +75,7 @@ public: ReplayGainFileListItem* firstChild() const { return static_cast( KListViewItem::firstChild() ); } ReplayGainFileListItem* nextSibling() const { return static_cast( KListViewItem::nextSibling() ); } //ReplayGainFileListItem* itemBelow() { return static_cast( KListViewItem::itemBelow() ); } - ReplayGainFileListItem* tqparent() const { return static_cast( KListViewItem::tqparent() ); } + ReplayGainFileListItem* parent() const { return static_cast( KListViewItem::parent() ); } Type type() { return m_type; } void setType( Type ); @@ -113,10 +113,10 @@ class ReplayGainFileList : public KListView public: /** * Constructor - * @param tqparent The tqparent widget + * @param parent The parent widget * @param name The name of the file list */ - ReplayGainFileList( TagEngine*, Config*, Logger*, TQWidget *tqparent=0, const char *name=0 ); + ReplayGainFileList( TagEngine*, Config*, Logger*, TQWidget *parent=0, const char *name=0 ); /** * Destructor diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp index 2303e18..2bafc9e 100755 --- a/src/replaygainscanner.cpp +++ b/src/replaygainscanner.cpp @@ -20,8 +20,8 @@ // FIXME file name encoding !!! -ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Logger* _logger, TQWidget *tqparent, const char *name, bool modal, WFlags f ) - : KDialog( tqparent, name, modal, f ) +ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Logger* _logger, TQWidget *parent, const char *name, bool modal, WFlags f ) + : KDialog( parent, name, modal, f ) { tagEngine = _tagEngine; config = _config; diff --git a/src/replaygainscanner.h b/src/replaygainscanner.h index 8c10770..b032411 100755 --- a/src/replaygainscanner.h +++ b/src/replaygainscanner.h @@ -30,7 +30,7 @@ public: /** * Constructor */ - ReplayGainScanner( TagEngine*, Config*, Logger*, TQWidget* tqparent=0, const char* name=0, bool modal=true, WFlags f=0 ); + ReplayGainScanner( TagEngine*, Config*, Logger*, TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); /** * Destructor