diff options
Diffstat (limited to 'krusader')
179 files changed, 629 insertions, 629 deletions
diff --git a/krusader/ActionMan/actionman.cpp b/krusader/ActionMan/actionman.cpp index 560c68c..9d33750 100644 --- a/krusader/ActionMan/actionman.cpp +++ b/krusader/ActionMan/actionman.cpp @@ -20,8 +20,8 @@ #include "../UserAction/useraction.h" -ActionMan::ActionMan( TQWidget * tqparent ) - : KDialogBase( tqparent, "ActionMan", true /*modal*/, "ActionMan - Manage your useractions", KDialogBase::Apply | KDialogBase::Close ) +ActionMan::ActionMan( TQWidget * parent ) + : KDialogBase( parent, "ActionMan", true /*modal*/, "ActionMan - Manage your useractions", KDialogBase::Apply | KDialogBase::Close ) { setPlainCaption(i18n("ActionMan - Manage Your Useractions")); diff --git a/krusader/ActionMan/actionman.h b/krusader/ActionMan/actionman.h index d78b9a4..4c4abbf 100644 --- a/krusader/ActionMan/actionman.h +++ b/krusader/ActionMan/actionman.h @@ -21,7 +21,7 @@ class ActionMan : public KDialogBase { Q_OBJECT TQ_OBJECT public: - ActionMan( TQWidget* tqparent=0 ); + ActionMan( TQWidget* parent=0 ); ~ActionMan(); protected slots: diff --git a/krusader/ActionMan/actionproperty.cpp b/krusader/ActionMan/actionproperty.cpp index a17f5d1..10d7555 100644 --- a/krusader/ActionMan/actionproperty.cpp +++ b/krusader/ActionMan/actionproperty.cpp @@ -35,8 +35,8 @@ #define ICON(N) KGlobal::iconLoader()->loadIcon(N, KIcon::Small) -ActionProperty::ActionProperty( TQWidget *tqparent, const char *name, KrAction *action ) - : ActionPropertyBase( tqparent, name ), _modified(false) +ActionProperty::ActionProperty( TQWidget *parent, const char *name, KrAction *action ) + : ActionPropertyBase( parent, name ), _modified(false) { if ( action ) { _action = action; diff --git a/krusader/ActionMan/actionproperty.h b/krusader/ActionMan/actionproperty.h index 7c3d695..cc310fa 100644 --- a/krusader/ActionMan/actionproperty.h +++ b/krusader/ActionMan/actionproperty.h @@ -26,7 +26,7 @@ class ActionProperty : public ActionPropertyBase { Q_OBJECT TQ_OBJECT public: - ActionProperty( TQWidget *tqparent=0, const char *name=0, KrAction *action=0 ); + ActionProperty( TQWidget *parent=0, const char *name=0, KrAction *action=0 ); ~ActionProperty(); /** diff --git a/krusader/ActionMan/actionpropertybase.cpp b/krusader/ActionMan/actionpropertybase.cpp index 114370a..9a53e76 100644 --- a/krusader/ActionMan/actionpropertybase.cpp +++ b/krusader/ActionMan/actionpropertybase.cpp @@ -37,11 +37,11 @@ #include "klistbox.h" /* - * Constructs a ActionPropertyBase as a child of 'tqparent', with the + * Constructs a ActionPropertyBase as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -ActionPropertyBase::ActionPropertyBase( TQWidget* tqparent, const char* name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "ActionPropertyBase" ); diff --git a/krusader/ActionMan/addplaceholderpopup.cpp b/krusader/ActionMan/addplaceholderpopup.cpp index aad8694..983c39e 100644 --- a/krusader/ActionMan/addplaceholderpopup.cpp +++ b/krusader/ActionMan/addplaceholderpopup.cpp @@ -44,7 +44,7 @@ #define EXECUTABLE_ID 0xFFFF -AddPlaceholderPopup::AddPlaceholderPopup( TQWidget *tqparent ) : KPopupMenu( tqparent ) { +AddPlaceholderPopup::AddPlaceholderPopup( TQWidget *parent ) : KPopupMenu( parent ) { _activeSub = new KPopupMenu( this ); _otherSub = new KPopupMenu( this ); @@ -132,7 +132,7 @@ TQString AddPlaceholderPopup::getPlaceholder( const TQPoint& pos ) { /////////////////////////////// ParameterDialog //////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////// -ParameterDialog::ParameterDialog( const exp_placeholder* currentPlaceholder, TQWidget *tqparent ) : KDialogBase( Plain, i18n("User Action Parameter Dialog"), Default | Ok, Ok, tqparent ) { +ParameterDialog::ParameterDialog( const exp_placeholder* currentPlaceholder, TQWidget *parent ) : KDialogBase( Plain, i18n("User Action Parameter Dialog"), Default | Ok, Ok, parent ) { _parameter.clear(); _parameterCount = currentPlaceholder->parameterCount(); @@ -219,7 +219,7 @@ void ParameterDialog::slotOk() { } ///////////// ParameterText -ParameterText::ParameterText( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterText::ParameterText( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -246,7 +246,7 @@ bool ParameterText::valid() { } ///////////// ParameterPlaceholder -ParameterPlaceholder::ParameterPlaceholder( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterPlaceholder::ParameterPlaceholder( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -283,7 +283,7 @@ void ParameterPlaceholder::addPlaceholder() { } ///////////// ParameterYes -ParameterYes::ParameterYes( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterYes::ParameterYes( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -309,7 +309,7 @@ bool ParameterYes::valid() { } ///////////// ParameterNo -ParameterNo::ParameterNo( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterNo::ParameterNo( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -335,7 +335,7 @@ bool ParameterNo::valid() { } ///////////// ParameterFile -ParameterFile::ParameterFile( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterFile::ParameterFile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -371,7 +371,7 @@ void ParameterFile::addFile() { } ///////////// ParameterChoose -ParameterChoose::ParameterChoose( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterChoose::ParameterChoose( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -395,7 +395,7 @@ bool ParameterChoose::valid() { } ///////////// ParameterSelect -ParameterSelect::ParameterSelect( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterSelect::ParameterSelect( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -427,7 +427,7 @@ bool ParameterSelect::valid() { } ///////////// ParameterGoto -ParameterGoto::ParameterGoto( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterGoto::ParameterGoto( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -473,7 +473,7 @@ void ParameterGoto::addPlaceholder() { } ///////////// ParameterSyncprofile -ParameterSyncprofile::ParameterSyncprofile( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterSyncprofile::ParameterSyncprofile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -498,7 +498,7 @@ bool ParameterSyncprofile::valid() { } ///////////// ParameterSearch -ParameterSearch::ParameterSearch( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterSearch::ParameterSearch( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -523,7 +523,7 @@ bool ParameterSearch::valid() { } ///////////// ParameterPanelprofile -ParameterPanelprofile::ParameterPanelprofile( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterPanelprofile::ParameterPanelprofile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); @@ -548,7 +548,7 @@ bool ParameterPanelprofile::valid() { } ///////////// ParameterInt -ParameterInt::ParameterInt( const exp_parameter& parameter, TQWidget* tqparent ) : ParameterBase( parameter, tqparent ) { +ParameterInt::ParameterInt( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); tqlayout->setAutoAdd( true ); tqlayout->setSpacing( 6 ); diff --git a/krusader/ActionMan/addplaceholderpopup.h b/krusader/ActionMan/addplaceholderpopup.h index 5120294..77f23b6 100644 --- a/krusader/ActionMan/addplaceholderpopup.h +++ b/krusader/ActionMan/addplaceholderpopup.h @@ -34,7 +34,7 @@ class KIntSpinBox; class AddPlaceholderPopup : public KPopupMenu { public: - AddPlaceholderPopup( TQWidget *tqparent ); + AddPlaceholderPopup( TQWidget *parent ); /** * Use this to exec the popup. @@ -66,7 +66,7 @@ private: */ class ParameterBase : public TQWidget { public: - inline ParameterBase( const exp_parameter& parameter, TQWidget* tqparent ) : TQWidget( tqparent ) { _nessesary = parameter.nessesary(); } + inline ParameterBase( const exp_parameter& parameter, TQWidget* parent ) : TQWidget( parent ) { _nessesary = parameter.nessesary(); } /** * @return the text for the parameter */ @@ -97,7 +97,7 @@ private: */ class ParameterText : public ParameterBase { public: - ParameterText( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterText( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -115,7 +115,7 @@ class ParameterPlaceholder : public ParameterBase { Q_OBJECT TQ_OBJECT public: - ParameterPlaceholder( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterPlaceholder( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -133,7 +133,7 @@ private slots: */ class ParameterYes : public ParameterBase { public: - ParameterYes( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterYes( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -148,7 +148,7 @@ private: */ class ParameterNo : public ParameterBase { public: - ParameterNo( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterNo( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -165,7 +165,7 @@ class ParameterFile : public ParameterBase { Q_OBJECT TQ_OBJECT public: - ParameterFile( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterFile( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -183,7 +183,7 @@ private slots: */ class ParameterChoose : public ParameterBase { public: - ParameterChoose( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterChoose( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -198,7 +198,7 @@ private: */ class ParameterSelect : public ParameterBase { public: - ParameterSelect( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterSelect( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -215,7 +215,7 @@ class ParameterGoto : public ParameterBase { Q_OBJECT TQ_OBJECT public: - ParameterGoto( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterGoto( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -234,7 +234,7 @@ private slots: */ class ParameterSyncprofile : public ParameterBase { public: - ParameterSyncprofile( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterSyncprofile( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -249,7 +249,7 @@ private: */ class ParameterPanelprofile : public ParameterBase { public: - ParameterPanelprofile( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterPanelprofile( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -264,7 +264,7 @@ private: */ class ParameterSearch : public ParameterBase { public: - ParameterSearch( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterSearch( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -279,7 +279,7 @@ private: */ class ParameterInt : public ParameterBase { public: - ParameterInt( const exp_parameter& parameter, TQWidget* tqparent ); + ParameterInt( const exp_parameter& parameter, TQWidget* parent ); TQString text(); TQString preset(); void reset(); @@ -301,7 +301,7 @@ class ParameterDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - ParameterDialog( const exp_placeholder* currentPlaceholder, TQWidget *tqparent ); + ParameterDialog( const exp_placeholder* currentPlaceholder, TQWidget *parent ); /** * Use this to execute the dialog. diff --git a/krusader/ActionMan/useractionlistview.cpp b/krusader/ActionMan/useractionlistview.cpp index 2e11528..aa910e8 100644 --- a/krusader/ActionMan/useractionlistview.cpp +++ b/krusader/ActionMan/useractionlistview.cpp @@ -28,8 +28,8 @@ ///////////////////////////// UserActionListView ///////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////// -UserActionListView::UserActionListView( TQWidget * tqparent, const char * name ) - : KListView( tqparent, name ) +UserActionListView::UserActionListView( TQWidget * parent, const char * name ) + : KListView( parent, name ) { addColumn( i18n("Title") ); //addColumn( i18n("Identifier") ); @@ -190,7 +190,7 @@ UserActionListViewItem::UserActionListViewItem( TQListViewItem* item, KrAction * UserActionListViewItem::~UserActionListViewItem() { /* // remove category-item if the last member ofthiscategory disappears - if ( TQListViewItem* item = dynamic_cast<TQListViewItem*>( tqparent() ) ) { + if ( TQListViewItem* item = dynamic_cast<TQListViewItem*>( parent() ) ) { if ( item->childCount() <= 1 ) item->deleteLater(); // not possible since not inherited from TQObject }*/ diff --git a/krusader/ActionMan/useractionlistview.h b/krusader/ActionMan/useractionlistview.h index 924fb58..e05e42e 100644 --- a/krusader/ActionMan/useractionlistview.h +++ b/krusader/ActionMan/useractionlistview.h @@ -24,7 +24,7 @@ class TQDomDocument; */ class UserActionListView : public KListView { public: - UserActionListView( TQWidget* tqparent = 0, const char* name = 0 ); + UserActionListView( TQWidget* parent = 0, const char* name = 0 ); ~UserActionListView(); virtual TQSize tqsizeHint() const; diff --git a/krusader/ActionMan/useractionpage.cpp b/krusader/ActionMan/useractionpage.cpp index 95b38c4..86c49f7 100644 --- a/krusader/ActionMan/useractionpage.cpp +++ b/krusader/ActionMan/useractionpage.cpp @@ -34,8 +34,8 @@ static const char* FILE_FILTER = I18N_NOOP("*.xml|xml-files\n*|all files"); -UserActionPage::UserActionPage( TQWidget* tqparent ) - : TQWidget( tqparent, "UserActionPage" ) +UserActionPage::UserActionPage( TQWidget* parent ) + : TQWidget( parent, "UserActionPage" ) { TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, 6, "UserActionPageLayout" ); // 0px margin, 6px item-spacing @@ -83,7 +83,7 @@ UserActionPage::UserActionPage( TQWidget* tqparent ) // ======== pseudo-toolbar end ======== /* This seems obsolete now! // Display some help - KMessageBox::information( this, // tqparent + KMessageBox::information( this, // parent i18n( "When you apply changes to an action, the modifications " "become available in the current session immediately.\n" "When closing ActionMan, you will be asked to save the changes permanently." @@ -199,7 +199,7 @@ void UserActionPage::slotRemoveAction() { if ( ! dynamic_cast<UserActionListViewItem*>( actionTree->currentItem() ) ) return; - int messageDelete = KMessageBox::warningContinueCancel ( this, //tqparent + int messageDelete = KMessageBox::warningContinueCancel ( this, //parent i18n("Are you sure that you want to remove all selected actions?"), //text i18n("Remove selected actions?"), //caption i18n("Remove"), //Label for the continue-button @@ -242,7 +242,7 @@ void UserActionPage::slotExport() { int answer = 0; if( file.open( IO_ReadOnly ) ) { // getting here, means the file already exists an can be read if( doc.setContent( &file ) ) // getting here means the file exists and already contains an UserAction-XML-tree - answer = KMessageBox::warningYesNoCancel( this, //tqparent + answer = KMessageBox::warningYesNoCancel( this, //parent i18n("This file already contains some useractions.\nDo you want to overwrite it or should it be merged with the selected actions?"), //text i18n("Overwrite or merge?"), //caption i18n("Overwrite"), //label for Yes-Button @@ -251,7 +251,7 @@ void UserActionPage::slotExport() { file.close(); } if ( answer == 0 && file.exists() ) - answer = KMessageBox::warningContinueCancel( this, //tqparent + answer = KMessageBox::warningContinueCancel( this, //parent i18n("This file already exists. Do you want to overwrite it?"), //text i18n("Overwrite existing file?"), //caption i18n("Overwrite") //label for Continue-Button diff --git a/krusader/ActionMan/useractionpage.h b/krusader/ActionMan/useractionpage.h index a26a641..2f8f282 100644 --- a/krusader/ActionMan/useractionpage.h +++ b/krusader/ActionMan/useractionpage.h @@ -25,7 +25,7 @@ class UserActionPage : public TQWidget { Q_OBJECT TQ_OBJECT public: - UserActionPage( TQWidget* tqparent ); + UserActionPage( TQWidget* parent ); ~UserActionPage(); /** diff --git a/krusader/BookMan/kraddbookmarkdlg.cpp b/krusader/BookMan/kraddbookmarkdlg.cpp index a84fecf..e6f5032 100644 --- a/krusader/BookMan/kraddbookmarkdlg.cpp +++ b/krusader/BookMan/kraddbookmarkdlg.cpp @@ -9,9 +9,9 @@ #include <kiconloader.h> #include <kdebug.h> -KrAddBookmarkDlg::KrAddBookmarkDlg(TQWidget *tqparent, KURL url): +KrAddBookmarkDlg::KrAddBookmarkDlg(TQWidget *parent, KURL url): KDialogBase(KDialogBase::Swallow, i18n("Add Bookmark"), - KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent) { + KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent) { // create the 'new folder' button setButtonText(KDialogBase::User1, i18n("New Folder")); showButton(KDialogBase::User1, false); // hide it until _createIn is shown @@ -87,10 +87,10 @@ void KrAddBookmarkDlg::createInSelection(TQListViewItem *item) { } } -void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *tqparent) { +void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *parent) { for (KrBookmark *bm = root->tqchildren().first(); bm; bm = root->tqchildren().next()) { if (bm->isFolder()) { - KListViewItem *item = new KListViewItem(tqparent, bm->text()); + KListViewItem *item = new KListViewItem(parent, bm->text()); item->setOpen(true); _xr[item] = bm; populateCreateInWidget(bm, item); diff --git a/krusader/BookMan/kraddbookmarkdlg.h b/krusader/BookMan/kraddbookmarkdlg.h index 24ec677..1b36814 100644 --- a/krusader/BookMan/kraddbookmarkdlg.h +++ b/krusader/BookMan/kraddbookmarkdlg.h @@ -14,14 +14,14 @@ class KrAddBookmarkDlg: public KDialogBase { Q_OBJECT TQ_OBJECT public: - KrAddBookmarkDlg(TQWidget *tqparent, KURL url = 0); + KrAddBookmarkDlg(TQWidget *parent, KURL url = 0); KURL url() const { return vfs::fromPathOrURL(_url->text()); } TQString name() const { return _name->text(); } KrBookmark *folder() const { return _xr[static_cast<KListViewItem*>(_createIn->selectedItem())]; } protected: TQWidget *createInWidget(); - void populateCreateInWidget(KrBookmark *root, KListViewItem *tqparent); + void populateCreateInWidget(KrBookmark *root, KListViewItem *parent); protected slots: void toggleCreateIn(bool show); diff --git a/krusader/BookMan/krbookmark.cpp b/krusader/BookMan/krbookmark.cpp index f3dac9b..4b664c7 100644 --- a/krusader/BookMan/krbookmark.cpp +++ b/krusader/BookMan/krbookmark.cpp @@ -16,8 +16,8 @@ static const char* NAME_DEVICES = I18N_NOOP("Devices"); static const char* NAME_VIRTUAL = I18N_NOOP("Virtual Filesystem"); static const char* NAME_LAN = I18N_NOOP("Local Network"); -KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *tqparent, TQString icon, TQString actionName ): - KAction(name, 0, 0, 0, tqparent, actionName.isNull() ? BM_NAME(name).latin1() : BM_NAME(actionName).latin1()), +KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *parent, TQString icon, TQString actionName ): + KAction(name, 0, 0, 0, parent, actionName.isNull() ? BM_NAME(name).latin1() : BM_NAME(actionName).latin1()), _url(url), _folder(false), _separator(false) { connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activatedProxy())); // do we have an icon? diff --git a/krusader/BookMan/krbookmark.h b/krusader/BookMan/krbookmark.h index e07e6aa..5f27094 100644 --- a/krusader/BookMan/krbookmark.h +++ b/krusader/BookMan/krbookmark.h @@ -11,7 +11,7 @@ class KrBookmark: public KAction { Q_OBJECT TQ_OBJECT public: - KrBookmark(TQString name, KURL url, KActionCollection *tqparent, TQString icon = "", TQString actionName = TQString() ); + KrBookmark(TQString name, KURL url, KActionCollection *parent, TQString icon = "", TQString actionName = TQString() ); KrBookmark(TQString name, TQString icon = ""); // creates a folder // text() and setText() to change the name of the bookmark // icon() and setIcon() to change icons (by name) diff --git a/krusader/BookMan/krbookmarkbutton.cpp b/krusader/BookMan/krbookmarkbutton.cpp index 4acbffd..913cf85 100644 --- a/krusader/BookMan/krbookmarkbutton.cpp +++ b/krusader/BookMan/krbookmarkbutton.cpp @@ -8,7 +8,7 @@ #include <kpopupmenu.h> #include <kdebug.h> -KrBookmarkButton::KrBookmarkButton(TQWidget *tqparent): TQToolButton(tqparent) { +KrBookmarkButton::KrBookmarkButton(TQWidget *parent): TQToolButton(parent) { TQPixmap icon = krLoader->loadIcon("bookmark", KIcon::Toolbar, 16); setFixedSize(icon.width() + 4, icon.height() + 4); setPixmap(icon); diff --git a/krusader/BookMan/krbookmarkbutton.h b/krusader/BookMan/krbookmarkbutton.h index 950f6c7..b1b8a30 100644 --- a/krusader/BookMan/krbookmarkbutton.h +++ b/krusader/BookMan/krbookmarkbutton.h @@ -8,7 +8,7 @@ class KrBookmarkButton: public TQToolButton { Q_OBJECT TQ_OBJECT public: - KrBookmarkButton(TQWidget *tqparent); + KrBookmarkButton(TQWidget *parent); void openPopup(); signals: diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp index 551f283..6aba681 100644 --- a/krusader/BookMan/krbookmarkhandler.cpp +++ b/krusader/BookMan/krbookmarkhandler.cpp @@ -22,7 +22,7 @@ #define CONNECT_BM(X) { disconnect(X, TQT_SIGNAL(activated(const KURL&)), 0, 0); connect(X, TQT_SIGNAL(activated(const KURL&)), this, TQT_SLOT(slotActivated(const KURL&))); } KrBookmarkHandler::KrBookmarkHandler(): TQObject(0), _middleClick(false), _mainBookmarkPopup( 0 ), _specialBookmarkIDs(), _bookmarkIDTable() { - // create our own action collection and make the shortcuts apply only to tqparent + // create our own action collection and make the shortcuts apply only to parent _privateCollection = new KActionCollection(krApp, "private collection"); _collection = krApp->actionCollection(); @@ -116,18 +116,18 @@ void KrBookmarkHandler::exportToFileBookmark(TQDomDocument &doc, TQDomElement &w } } -void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &tqparent, KrBookmark *folder) { +void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &parent, KrBookmark *folder) { for (KrBookmark *bm = folder->tqchildren().first(); bm; bm = folder->tqchildren().next()) { if (bm->isFolder()) { TQDomElement newFolder = doc.createElement("folder"); newFolder.setAttribute("icon", bm->icon()); - tqparent.appendChild(newFolder); + parent.appendChild(newFolder); TQDomElement title = doc.createElement("title"); title.appendChild(doc.createTextNode(bm->text())); newFolder.appendChild(title); exportToFileFolder(doc, newFolder, bm); } else { - exportToFileBookmark(doc, tqparent, bm); + exportToFileBookmark(doc, parent, bm); } } } @@ -173,7 +173,7 @@ void KrBookmarkHandler::exportToFile() { } } -bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *tqparent, TQString path, TQString *errorMsg) { +bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *parent, TQString path, TQString *errorMsg) { TQString url, name, icon; // verify tag if (e.tagName() != "bookmark") { @@ -199,19 +199,19 @@ bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *tqpa KrBookmark *bm = KrBookmark::getExistingBookmark(path+name, _collection); if (!bm) { bm = new KrBookmark(name, vfs::fromPathOrURL( url ), _collection, icon, path+name); - tqparent->tqchildren().append(bm); + parent->tqchildren().append(bm); } return true; } -bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *tqparent, TQString path, TQString *errorMsg) { +bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *parent, TQString path, TQString *errorMsg) { TQString name; TQDomNode n = first; while (!n.isNull()) { TQDomElement e = n.toElement(); if (e.tagName() == "bookmark") { - if (!importFromFileBookmark(e, tqparent, path, errorMsg)) + if (!importFromFileBookmark(e, parent, path, errorMsg)) return false; } else if (e.tagName() == "folder") { TQString iconName = ""; @@ -223,13 +223,13 @@ bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *tqpar return false; } else name = tmp.text(); KrBookmark *folder = new KrBookmark(name, iconName); - tqparent->tqchildren().append(folder); + parent->tqchildren().append(folder); TQDomNode nextOne = tmp.nextSibling(); if (!importFromFileFolder(nextOne, folder, path + name + "/", errorMsg)) return false; } else if (e.tagName() == "separator") { - tqparent->tqchildren().append(KrBookmark::separator()); + parent->tqchildren().append(KrBookmark::separator()); } n = n.nextSibling(); } @@ -279,12 +279,12 @@ void KrBookmarkHandler::populate(KPopupMenu *menu) { buildMenu(_root, menu); } -void KrBookmarkHandler::buildMenu(KrBookmark *tqparent, KPopupMenu *menu) { +void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) { static int inSecondaryMenu = 0; // used to know if we're on the top menu // run the loop twice, in order to put the folders on top. stupid but easy :-) // note: this code drops the separators put there by the user - for (KrBookmark *bm = tqparent->tqchildren().first(); bm; bm = tqparent->tqchildren().next()) { + for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) { if (!bm->isFolder()) continue; KPopupMenu *newMenu = new KPopupMenu(menu); int id = menu->insertItem(TQIconSet(krLoader->loadIcon(bm->icon(), KIcon::Small)), @@ -298,7 +298,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *tqparent, KPopupMenu *menu) { buildMenu(bm, newMenu); --inSecondaryMenu; } - for (KrBookmark *bm = tqparent->tqchildren().first(); bm; bm = tqparent->tqchildren().next()) { + for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) { if (bm->isFolder()) continue; if (bm->isSeparator() ) { menu->insertSeparator(); diff --git a/krusader/BookMan/krbookmarkhandler.h b/krusader/BookMan/krbookmarkhandler.h index 4d032d9..b4b058d 100644 --- a/krusader/BookMan/krbookmarkhandler.h +++ b/krusader/BookMan/krbookmarkhandler.h @@ -23,19 +23,19 @@ public: KrBookmarkHandler(); ~KrBookmarkHandler(); void populate(KPopupMenu *menu); - void addBookmark(KrBookmark *bm, KrBookmark *tqparent = 0); + void addBookmark(KrBookmark *bm, KrBookmark *parent = 0); void bookmarkCurrent(KURL url); protected: void deleteBookmark(KrBookmark *bm); void importFromFile(); - bool importFromFileBookmark(TQDomElement &e, KrBookmark *tqparent, TQString path, TQString *errorMsg); - bool importFromFileFolder(TQDomNode &first, KrBookmark *tqparent, TQString path, TQString *errorMsg); + bool importFromFileBookmark(TQDomElement &e, KrBookmark *parent, TQString path, TQString *errorMsg); + bool importFromFileFolder(TQDomNode &first, KrBookmark *parent, TQString path, TQString *errorMsg); void exportToFile(); - void exportToFileFolder(TQDomDocument &doc, TQDomElement &tqparent, KrBookmark *folder); + void exportToFileFolder(TQDomDocument &doc, TQDomElement &parent, KrBookmark *folder); void exportToFileBookmark(TQDomDocument &doc, TQDomElement &where, KrBookmark *bm); void clearBookmarks(KrBookmark *root); - void buildMenu(KrBookmark *tqparent, KPopupMenu *menu); + void buildMenu(KrBookmark *parent, KPopupMenu *menu); bool eventFilter( TQObject *obj, TQEvent *ev ); diff --git a/krusader/Dialogs/krdialogs.cpp b/krusader/Dialogs/krdialogs.cpp index 56d60b2..037b354 100644 --- a/krusader/Dialogs/krdialogs.cpp +++ b/krusader/Dialogs/krdialogs.cpp @@ -130,9 +130,9 @@ KURL KChooseDir::getDir(TQString text,const KURL& url, const KURL& cwd, bool &pr return u; } -KURLRequesterDlgForCopy::KURLRequesterDlgForCopy( const TQString& urlName, const TQString& _text, bool presAttrs, TQWidget *tqparent, +KURLRequesterDlgForCopy::KURLRequesterDlgForCopy( const TQString& urlName, const TQString& _text, bool presAttrs, TQWidget *parent, const char *name, bool modal, KURL baseURL ) - : KDialogBase( Plain, TQString(), Ok|Cancel|User1, Ok, tqparent, name, modal, true, KStdGuiItem::clear() ), + : KDialogBase( Plain, TQString(), Ok|Cancel|User1, Ok, parent, name, modal, true, KStdGuiItem::clear() ), baseUrlCombo( 0 ), copyDirStructureCB( 0 ) { TQVBoxLayout * topLayout = new TQVBoxLayout( plainPage(), 0, spacingHint() ); @@ -228,7 +228,7 @@ KURL KURLRequesterDlgForCopy::baseURL() const { return vfs::fromPathOrURL( baseUrlCombo->currentText() ); } -KRGetDate::KRGetDate(TQDate date, TQWidget *tqparent, const char *name) : KDialog(tqparent, name,true,WStyle_DialogBorder) { +KRGetDate::KRGetDate(TQDate date, TQWidget *parent, const char *name) : KDialog(parent, name,true,WStyle_DialogBorder) { dateWidget = new KDatePicker(this, date); dateWidget->resize(dateWidget->tqsizeHint()); setMinimumSize(dateWidget->tqsizeHint()); diff --git a/krusader/Dialogs/krdialogs.h b/krusader/Dialogs/krdialogs.h index ae33575..f250744 100644 --- a/krusader/Dialogs/krdialogs.h +++ b/krusader/Dialogs/krdialogs.h @@ -79,7 +79,7 @@ class KURLRequesterDlgForCopy : public KDialogBase { TQ_OBJECT public: KURLRequesterDlgForCopy( const TQString& url, const TQString& text, bool presAttrs, - TQWidget *tqparent, const char *name, bool modal=true, KURL baseURL = KURL() ); + TQWidget *parent, const char *name, bool modal=true, KURL baseURL = KURL() ); KURLRequesterDlgForCopy(); KURL selectedURL() const; @@ -103,7 +103,7 @@ class KRGetDate : public KDialog { Q_OBJECT TQ_OBJECT public: - KRGetDate(TQDate date=TQDate::tqcurrentDate(), TQWidget *tqparent = 0, const char *name = 0); + KRGetDate(TQDate date=TQDate::tqcurrentDate(), TQWidget *parent = 0, const char *name = 0); TQDate getDate(); private slots: diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp index e52e52b..0adaf7b 100644 --- a/krusader/Dialogs/krkeydialog.cpp +++ b/krusader/Dialogs/krkeydialog.cpp @@ -29,13 +29,13 @@ static const char* FILE_FILTER = I18N_NOOP("*.keymap|Krusader keymaps\n*|all files"); -KrKeyDialog::KrKeyDialog( TQWidget * tqparent ) : KKeyDialog( false /* allow letter shortcuts */, tqparent ) { +KrKeyDialog::KrKeyDialog( TQWidget * parent ) : KKeyDialog( false /* allow letter shortcuts */, parent ) { insert( krApp->actionCollection() ); // HACK This fetches the tqlayout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API // None the less it's quite save to use since this implementation hasn't changed since KDE-3.3 (I haven't looked at earlier // versions since we don't support them) and now all work is done in KDE-4. - TQWidget* buttonBox = TQT_TQWIDGET( actionButton(KDialogBase::Ok)->tqparent() ); + TQWidget* buttonBox = TQT_TQWIDGET( actionButton(KDialogBase::Ok)->parent() ); TQBoxLayout* buttonBoxLayout = static_cast<TQBoxLayout*>( buttonBox->tqlayout() ); KPushButton* importButton = new KPushButton( i18n("Import shortcuts"), buttonBox ); @@ -67,7 +67,7 @@ void KrKeyDialog::slotImportShortcuts() { KConfig conf( filename, true /*read only*/, false /*no KDEGlobal*/ ); if ( ! conf.hasGroup("Shortcuts") ) { - int answer = KMessageBox::warningContinueCancel( this, //tqparent + int answer = KMessageBox::warningContinueCancel( this, //parent i18n("This file does not seem to be a valid keymap.\n" "It may be a keymap using a legacy format. The import can't be undone!"), //text i18n("Try to import legacy format?"), //caption @@ -118,7 +118,7 @@ void KrKeyDialog::importLegacyShortcuts( const TQString& file ) { } f.close(); - KMessageBox::information( this, // tqparent + KMessageBox::information( this, // parent i18n("Please restart this dialog in order to see the changes"), // text i18n("Legacy import completed") // caption ); diff --git a/krusader/Dialogs/krkeydialog.h b/krusader/Dialogs/krkeydialog.h index a07d9af..5bcdef8 100644 --- a/krusader/Dialogs/krkeydialog.h +++ b/krusader/Dialogs/krkeydialog.h @@ -23,7 +23,7 @@ class KrKeyDialog : protected KKeyDialog Q_OBJECT TQ_OBJECT public: - KrKeyDialog( TQWidget* tqparent = 0 ); + KrKeyDialog( TQWidget* parent = 0 ); ~KrKeyDialog(); private slots: diff --git a/krusader/Dialogs/krmaskchoice.cpp b/krusader/Dialogs/krmaskchoice.cpp index 4fb6d94..261366e 100644 --- a/krusader/Dialogs/krmaskchoice.cpp +++ b/krusader/Dialogs/krmaskchoice.cpp @@ -43,14 +43,14 @@ #include <tqlineedit.h> /* - * Constructs a KRMaskChoice which is a child of 'tqparent', with the + * Constructs a KRMaskChoice which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -KRMaskChoice::KRMaskChoice( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ) +KRMaskChoice::KRMaskChoice( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "KRMaskChoice" ); @@ -94,7 +94,7 @@ KRMaskChoice::KRMaskChoice( TQWidget* tqparent, const char* name, bool modal, W preSelections = new TQListBox( Layout6, "preSelections" ); preSelections->setVScrollBarMode( TQListBox::AlwaysOn ); - TQWhatsThis::add( preSelections, i18n( "A predefined selection is a file-tqmask which you use often.\nSome examples are: \"*.c, *.h\", \"*.c, *.o\", etc.\nYou can add these masks to the list by typing them and pressing the Add button.\nDelete removes a predefined selection and Clear removes all of them.\nNotice that the line in which you edit the tqmask has it's own history, you can scroll it, if needed." ) ); + TQWhatsThis::add( preSelections, i18n( "A predefined selection is a file-mask which you use often.\nSome examples are: \"*.c, *.h\", \"*.c, *.o\", etc.\nYou can add these masks to the list by typing them and pressing the Add button.\nDelete removes a predefined selection and Clear removes all of them.\nNotice that the line in which you edit the mask has it's own history, you can scroll it, if needed." ) ); hbox_2->addWidget( preSelections ); vbox = new TQVBoxLayout; diff --git a/krusader/Dialogs/krmaskchoice.h b/krusader/Dialogs/krmaskchoice.h index c783c5c..0284734 100644 --- a/krusader/Dialogs/krmaskchoice.h +++ b/krusader/Dialogs/krmaskchoice.h @@ -47,7 +47,7 @@ class KRMaskChoice : public TQDialog TQ_OBJECT public: - KRMaskChoice( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KRMaskChoice( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~KRMaskChoice(); TQComboBox* selection; diff --git a/krusader/Dialogs/krspecialwidgets.cpp b/krusader/Dialogs/krspecialwidgets.cpp index 0da9f91..63f2d74 100644 --- a/krusader/Dialogs/krspecialwidgets.cpp +++ b/krusader/Dialogs/krspecialwidgets.cpp @@ -64,8 +64,8 @@ TQColor KRPie::colors[ 12 ] = {TQt::red, TQt::blue, TQt::green, TQt::cyan, TQt:: /////////////// KRFSDisplay - Filesystem / Freespace Display ///////////////// ////////////////////////////////////////////////////////////////////////////// // This is the full constructor: use it for a mounted filesystem -KRFSDisplay::KRFSDisplay( TQWidget *tqparent, TQString _alias, TQString _realName, - KIO::filesize_t _total, KIO::filesize_t _free ) : TQWidget( tqparent ), totalSpace( _total ), +KRFSDisplay::KRFSDisplay( TQWidget *parent, TQString _alias, TQString _realName, + KIO::filesize_t _total, KIO::filesize_t _free ) : TQWidget( parent ), totalSpace( _total ), freeSpace( _free ), alias( _alias ), realName( _realName ), mounted( true ), empty( false ), supermount( false ) { resize( 150, 200 ); @@ -73,8 +73,8 @@ empty( false ), supermount( false ) { } // Use this one for an unmounted filesystem -KRFSDisplay::KRFSDisplay( TQWidget *tqparent, TQString _alias, TQString _realName, bool sm ) : - TQWidget( tqparent ), alias( _alias ), realName( _realName ), mounted( false ), +KRFSDisplay::KRFSDisplay( TQWidget *parent, TQString _alias, TQString _realName, bool sm ) : + TQWidget( parent ), alias( _alias ), realName( _realName ), mounted( false ), empty( false ), supermount( sm ) { resize( 150, 200 ); show(); @@ -82,7 +82,7 @@ empty( false ), supermount( sm ) { // This is used only when an empty widget needs to be displayed (for example: // when filesystem statistics haven't been calculated yet) -KRFSDisplay::KRFSDisplay( TQWidget *tqparent ) : TQWidget( tqparent ), empty( true ) { +KRFSDisplay::KRFSDisplay( TQWidget *parent ) : TQWidget( parent ), empty( true ) { resize( 150, 200 ); show(); } @@ -146,7 +146,7 @@ void KRFSDisplay::paintEvent( TQPaintEvent * ) { } //////////////////////////////////////////////////////////////////////////////// -KRPie::KRPie( KIO::filesize_t _totalSize, TQWidget *tqparent ) : TQWidget( tqparent, 0 ), totalSize( _totalSize ) { +KRPie::KRPie( KIO::filesize_t _totalSize, TQWidget *parent ) : TQWidget( parent, 0 ), totalSize( _totalSize ) { slices.setAutoDelete( true ); // kill items when they are removed slices.append( new KRPieSlice( 100, TQt::yellow, "DEFAULT" ) ); sizeLeft = totalSize; @@ -204,7 +204,7 @@ void KRPie::addSlice( KIO::filesize_t size, TQString label ) { //////////////////////////////////////////////////// /////////////////// KrQuickSearch ///////////////// //////////////////////////////////////////////////// -KrQuickSearch::KrQuickSearch( TQWidget *tqparent, const char * name ) : KLineEdit( tqparent, name ) {} +KrQuickSearch::KrQuickSearch( TQWidget *parent, const char * name ) : KLineEdit( parent, name ) {} void KrQuickSearch::myKeyPressEvent( TQKeyEvent *e ) { switch ( e->key() ) { diff --git a/krusader/Dialogs/krspecialwidgets.h b/krusader/Dialogs/krspecialwidgets.h index 3952a89..66b6efb 100644 --- a/krusader/Dialogs/krspecialwidgets.h +++ b/krusader/Dialogs/krspecialwidgets.h @@ -46,7 +46,7 @@ class KRPie : public TQWidget { Q_OBJECT TQ_OBJECT public: - KRPie( KIO::filesize_t _totalSize, TQWidget *tqparent = 0 ); + KRPie( KIO::filesize_t _totalSize, TQWidget *parent = 0 ); void addSlice( KIO::filesize_t size, TQString label ); protected: @@ -63,12 +63,12 @@ class KRFSDisplay : public TQWidget { TQ_OBJECT public: // this constructor is used for a mounted filesystem - KRFSDisplay( TQWidget *tqparent, TQString _alias, TQString _realName, + KRFSDisplay( TQWidget *parent, TQString _alias, TQString _realName, KIO::filesize_t _total, KIO::filesize_t _free ); // this one is for an unmounted/supermount file system - KRFSDisplay( TQWidget *tqparent, TQString _alias, TQString _realName, bool sm = false ); + KRFSDisplay( TQWidget *parent, TQString _alias, TQString _realName, bool sm = false ); // the last one is used inside MountMan(R), when no filesystem is selected - KRFSDisplay( TQWidget *tqparent ); + KRFSDisplay( TQWidget *parent ); inline void setTotalSpace( KIO::filesize_t t ) { totalSpace = t; } inline void setFreeSpace( KIO::filesize_t t ) { freeSpace = t; } inline void setAlias( TQString a ) { alias = a; } @@ -106,7 +106,7 @@ class KrQuickSearch: public KLineEdit { Q_OBJECT TQ_OBJECT public: - KrQuickSearch(TQWidget *tqparent, const char * name = 0); + KrQuickSearch(TQWidget *parent, const char * name = 0); void addText(const TQString &str) { setText(text()+str); } void myKeyPressEvent(TQKeyEvent *e); void myIMStartEvent(TQIMEvent* e) { diff --git a/krusader/Dialogs/krspwidgets.cpp b/krusader/Dialogs/krspwidgets.cpp index a4890b0..8fb19ba 100644 --- a/krusader/Dialogs/krspwidgets.cpp +++ b/krusader/Dialogs/krspwidgets.cpp @@ -229,11 +229,11 @@ void KRMaskChoiceSub::acceptFromList(TQListBoxItem *i) { ////////////////////////// QuickNavLineEdit //////////////////// -QuickNavLineEdit::QuickNavLineEdit(const TQString &string, TQWidget *tqparent, const char *name): - KLineEdit(string, tqparent, name) { init(); } +QuickNavLineEdit::QuickNavLineEdit(const TQString &string, TQWidget *parent, const char *name): + KLineEdit(string, parent, name) { init(); } -QuickNavLineEdit::QuickNavLineEdit(TQWidget *tqparent, const char *name): - KLineEdit(tqparent, name) { init(); } +QuickNavLineEdit::QuickNavLineEdit(TQWidget *parent, const char *name): + KLineEdit(parent, name) { init(); } int QuickNavLineEdit::findCharFromPos(const TQString & str, const TQFontMetrics & metrics, int pos) { diff --git a/krusader/Dialogs/krspwidgets.h b/krusader/Dialogs/krspwidgets.h index 69adc03..13098dc 100644 --- a/krusader/Dialogs/krspwidgets.h +++ b/krusader/Dialogs/krspwidgets.h @@ -48,7 +48,7 @@ class KRSpWidgets { public: KRSpWidgets(); - static KRQuery getMask( TQString caption, bool nameOnly=false ); // get file-tqmask for (un)selecting files + static KRQuery getMask( TQString caption, bool nameOnly=false ); // get file-mask for (un)selecting files static KURL newFTP(); private: @@ -89,8 +89,8 @@ protected: class QuickNavLineEdit: public KLineEdit { public: - QuickNavLineEdit(const TQString &string, TQWidget *tqparent, const char *name=0); - QuickNavLineEdit(TQWidget *tqparent=0, const char *name=0); + QuickNavLineEdit(const TQString &string, TQWidget *parent, const char *name=0); + QuickNavLineEdit(TQWidget *parent=0, const char *name=0); virtual ~QuickNavLineEdit() {} static int findCharFromPos(const TQString &, const TQFontMetrics &, int pos); protected: diff --git a/krusader/Dialogs/krsqueezedtextlabel.cpp b/krusader/Dialogs/krsqueezedtextlabel.cpp index 6ec6b61..7a5ef8d 100644 --- a/krusader/Dialogs/krsqueezedtextlabel.cpp +++ b/krusader/Dialogs/krsqueezedtextlabel.cpp @@ -3,8 +3,8 @@ #include <kurldrag.h> #include <tqtooltip.h> -KrSqueezedTextLabel::KrSqueezedTextLabel(TQWidget *tqparent, const char *name): - KSqueezedTextLabel(tqparent, name), acceptDrops( false ), _index(-1), _length(-1) { +KrSqueezedTextLabel::KrSqueezedTextLabel(TQWidget *parent, const char *name): + KSqueezedTextLabel(parent, name), acceptDrops( false ), _index(-1), _length(-1) { } diff --git a/krusader/Dialogs/krsqueezedtextlabel.h b/krusader/Dialogs/krsqueezedtextlabel.h index f75309f..0fd1b3a 100644 --- a/krusader/Dialogs/krsqueezedtextlabel.h +++ b/krusader/Dialogs/krsqueezedtextlabel.h @@ -18,7 +18,7 @@ class KrSqueezedTextLabel : public KSqueezedTextLabel { Q_OBJECT TQ_OBJECT public: - KrSqueezedTextLabel(TQWidget *tqparent = 0, const char *name = 0); + KrSqueezedTextLabel(TQWidget *parent = 0, const char *name = 0); ~KrSqueezedTextLabel(); void enableDrops( bool flag ); diff --git a/krusader/Dialogs/kurllistrequester.cpp b/krusader/Dialogs/kurllistrequester.cpp index 32f1cda..7e3cf1c 100644 --- a/krusader/Dialogs/kurllistrequester.cpp +++ b/krusader/Dialogs/kurllistrequester.cpp @@ -41,7 +41,7 @@ #define DELETE_ITEM_ID 100 -KURLListRequester::KURLListRequester( TQWidget *tqparent, const char * name ) : TQWidget( tqparent, name ) +KURLListRequester::KURLListRequester( TQWidget *parent, const char * name ) : TQWidget( parent, name ) { KIconLoader *iconLoader = new KIconLoader(); TQPixmap imageAdd = iconLoader->loadIcon( "1downarrow", KIcon::Panel, 16 ); diff --git a/krusader/Dialogs/kurllistrequester.h b/krusader/Dialogs/kurllistrequester.h index 60891b1..2dd8e67 100644 --- a/krusader/Dialogs/kurllistrequester.h +++ b/krusader/Dialogs/kurllistrequester.h @@ -44,7 +44,7 @@ class KURLListRequester : public TQWidget TQ_OBJECT public: - KURLListRequester( TQWidget *tqparent = 0, const char * name = 0 ); + KURLListRequester( TQWidget *parent = 0, const char * name = 0 ); KURL::List urlList(); void setUrlList( KURL::List ); diff --git a/krusader/Dialogs/newftpgui.cpp b/krusader/Dialogs/newftpgui.cpp index 56e63b1..d121e03 100644 --- a/krusader/Dialogs/newftpgui.cpp +++ b/krusader/Dialogs/newftpgui.cpp @@ -28,7 +28,7 @@ /* - * Constructs a newFTPGUI which is a child of 'tqparent', with the + * Constructs a newFTPGUI which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to @@ -37,8 +37,8 @@ #define SIZE_MINIMUM TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0 ) -newFTPGUI::newFTPGUI( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ){ +newFTPGUI::newFTPGUI( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ){ TQVBoxLayout * tqlayout = new TQVBoxLayout( this, 11, 6, "newFTPGUI_layout" ); tqlayout->setAutoAdd(true); diff --git a/krusader/Dialogs/newftpgui.h b/krusader/Dialogs/newftpgui.h index 6fc5621..6e1f84b 100644 --- a/krusader/Dialogs/newftpgui.h +++ b/krusader/Dialogs/newftpgui.h @@ -25,7 +25,7 @@ class newFTPGUI : public TQDialog { Q_OBJECT TQ_OBJECT public: - newFTPGUI( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + newFTPGUI( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~newFTPGUI(); TQLabel* TextLabel1; diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp index 71c507f..34e888b 100644 --- a/krusader/Dialogs/packguibase.cpp +++ b/krusader/Dialogs/packguibase.cpp @@ -53,14 +53,14 @@ #include "../krusader.h" /* - * Constructs a PackGUIBase which is a child of 'tqparent', with the + * Constructs a PackGUIBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -PackGUIBase::PackGUIBase( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ), expanded( false ) +PackGUIBase::PackGUIBase( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ), expanded( false ) { if ( !name ) setName( "PackGUIBase" ); diff --git a/krusader/Dialogs/packguibase.h b/krusader/Dialogs/packguibase.h index 5d0a829..abad2ab 100644 --- a/krusader/Dialogs/packguibase.h +++ b/krusader/Dialogs/packguibase.h @@ -54,7 +54,7 @@ class PackGUIBase : public TQDialog TQ_OBJECT public: - PackGUIBase( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + PackGUIBase( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~PackGUIBase(); TQLabel* TextLabel3; diff --git a/krusader/Dialogs/percentalsplitter.cpp b/krusader/Dialogs/percentalsplitter.cpp index d73b61d..27c2267 100644 --- a/krusader/Dialogs/percentalsplitter.cpp +++ b/krusader/Dialogs/percentalsplitter.cpp @@ -35,7 +35,7 @@ class PercentalSplitterToolTip : public TQToolTip { public: - PercentalSplitterToolTip( TQWidget * tqparent ) : TQToolTip( tqparent ) { + PercentalSplitterToolTip( TQWidget * parent ) : TQToolTip( parent ) { } virtual ~PercentalSplitterToolTip() { @@ -63,7 +63,7 @@ public: } }; -PercentalSplitter::PercentalSplitter( TQWidget * tqparent, const char * name ) : TQSplitter( tqparent, name ), label( 0 ), opaqueOldPos( -1 ) { +PercentalSplitter::PercentalSplitter( TQWidget * parent, const char * name ) : TQSplitter( parent, name ), label( 0 ), opaqueOldPos( -1 ) { toolTip = new PercentalSplitterToolTip( this ); } diff --git a/krusader/Dialogs/percentalsplitter.h b/krusader/Dialogs/percentalsplitter.h index b35d3aa..c1d4166 100644 --- a/krusader/Dialogs/percentalsplitter.h +++ b/krusader/Dialogs/percentalsplitter.h @@ -41,7 +41,7 @@ class PercentalSplitter : public TQSplitter { TQ_OBJECT public: - PercentalSplitter( TQWidget * tqparent = 0, const char * name = 0 ); + PercentalSplitter( TQWidget * parent = 0, const char * name = 0 ); virtual ~PercentalSplitter(); TQString toolTipString( int p = -1 ); diff --git a/krusader/Dialogs/popularurls.cpp b/krusader/Dialogs/popularurls.cpp index a6c4759..a6ae087 100644 --- a/krusader/Dialogs/popularurls.cpp +++ b/krusader/Dialogs/popularurls.cpp @@ -16,7 +16,7 @@ #define INCREASE 2 #define DECREASE 1 -PopularUrls::PopularUrls(TQObject *tqparent, const char *name) : TQObject(tqparent, name), +PopularUrls::PopularUrls(TQObject *parent, const char *name) : TQObject(parent, name), head(0), tail(0), count(0) { dlg = new PopularUrlsDlg(); } diff --git a/krusader/Dialogs/popularurls.h b/krusader/Dialogs/popularurls.h index 98dab8a..e41d573 100644 --- a/krusader/Dialogs/popularurls.h +++ b/krusader/Dialogs/popularurls.h @@ -30,7 +30,7 @@ class PopularUrls : public TQObject { Q_OBJECT TQ_OBJECT public: - PopularUrls(TQObject *tqparent = 0, const char *name = 0); + PopularUrls(TQObject *parent = 0, const char *name = 0); ~PopularUrls(); void save(); void load(); diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp index a64448b..b9088da 100644 --- a/krusader/DiskUsage/diskusage.cpp +++ b/krusader/DiskUsage/diskusage.cpp @@ -76,10 +76,10 @@ #define MAX_FILENUM 100 -LoaderWidget::LoaderWidget( TQWidget *tqparent, const char *name ) : TQScrollView( tqparent, name ), cancelled( false ) +LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView( parent, name ), cancelled( false ) { viewport()->setEraseColor( TQt::white ); - widget = new TQWidget( tqparent ); + widget = new TQWidget( parent ); TQGridLayout *loaderLayout = new TQGridLayout( widget ); loaderLayout->setSpacing( 0 ); @@ -196,7 +196,7 @@ void LoaderWidget::slotCancelled() cancelled = true; } -DiskUsage::DiskUsage( TQString confGroup, TQWidget *tqparent, char *name ) : TQWidgetStack( tqparent, name ), +DiskUsage::DiskUsage( TQString confGroup, TQWidget *parent, char *name ) : TQWidgetStack( parent, name ), currentDirectory( 0 ), root( 0 ), configGroup( confGroup ), loading( false ), abortLoading( false ), clearAfterAbort( false ), deleting( false ), searchVfs( 0 ) { @@ -402,13 +402,13 @@ void DiskUsage::dirUp() { if( currentDirectory != 0 ) { - if ( currentDirectory->tqparent() != 0 ) - changeDirectory( (Directory *)(currentDirectory->tqparent()) ); + if ( currentDirectory->parent() != 0 ) + changeDirectory( (Directory *)(currentDirectory->parent()) ); else { KURL up = baseURL.upURL(); - if( KMessageBox::questionYesNo( this, i18n( "Stepping into the tqparent directory requires " + if( KMessageBox::questionYesNo( this, i18n( "Stepping into the parent directory requires " "loading the content of the \"%1\" URL. Do you wish " "to continue?" ) .tqarg( vfs::pathOrURL( up ) ), @@ -623,7 +623,7 @@ int DiskUsage::del( File *file, bool calcPercents, int depth ) deleteNr += del( *it, false, depth + 1 ); TQString path; - for( const Directory *d = (Directory*)file; d != root && d && d->tqparent() != 0; d = d->tqparent() ) + for( const Directory *d = (Directory*)file; d != root && d && d->parent() != 0; d = d->parent() ) { if( !path.isEmpty() ) path = "/" + path; @@ -664,7 +664,7 @@ int DiskUsage::del( File *file, bool calcPercents, int depth ) releaseKeyboard(); deleting = false; - ((Directory *)(file->tqparent()))->remove( file ); + ((Directory *)(file->parent()))->remove( file ); delete file; if( depth == 0 ) diff --git a/krusader/DiskUsage/diskusage.h b/krusader/DiskUsage/diskusage.h index b769fcd..b256d9c 100644 --- a/krusader/DiskUsage/diskusage.h +++ b/krusader/DiskUsage/diskusage.h @@ -66,7 +66,7 @@ class DiskUsage : public TQWidgetStack TQ_OBJECT public: - DiskUsage( TQString confGroup, TQWidget *tqparent = 0, char *name = 0); + DiskUsage( TQString confGroup, TQWidget *parent = 0, char *name = 0); ~DiskUsage(); void load( KURL dirName ); @@ -180,7 +180,7 @@ class LoaderWidget : public TQScrollView TQ_OBJECT public: - LoaderWidget( TQWidget *tqparent = 0, const char *name = 0 ); + LoaderWidget( TQWidget *parent = 0, const char *name = 0 ); void init(); void setCurrentURL( KURL url ); diff --git a/krusader/DiskUsage/diskusagegui.cpp b/krusader/DiskUsage/diskusagegui.cpp index 21843ad..e2c7e3e 100644 --- a/krusader/DiskUsage/diskusagegui.cpp +++ b/krusader/DiskUsage/diskusagegui.cpp @@ -39,8 +39,8 @@ #include <klocale.h> #include <tqtooltip.h> -DiskUsageGUI::DiskUsageGUI( KURL openDir, TQWidget* tqparent, const char *name ) - : TQDialog( tqparent, name, false, 0 ), exitAtFailure( true ) +DiskUsageGUI::DiskUsageGUI( KURL openDir, TQWidget* parent, const char *name ) + : TQDialog( parent, name, false, 0 ), exitAtFailure( true ) { setCaption( i18n("Krusader::Disk Usage") ); diff --git a/krusader/DiskUsage/diskusagegui.h b/krusader/DiskUsage/diskusagegui.h index c6310f6..319cc88 100644 --- a/krusader/DiskUsage/diskusagegui.h +++ b/krusader/DiskUsage/diskusagegui.h @@ -45,7 +45,7 @@ class DiskUsageGUI : public TQDialog TQ_OBJECT public: - DiskUsageGUI( KURL openDir, TQWidget* tqparent=0, const char *name = 0 ); + DiskUsageGUI( KURL openDir, TQWidget* parent=0, const char *name = 0 ); ~DiskUsageGUI(); diff --git a/krusader/DiskUsage/dulines.cpp b/krusader/DiskUsage/dulines.cpp index 922bc37..f7a87da 100644 --- a/krusader/DiskUsage/dulines.cpp +++ b/krusader/DiskUsage/dulines.cpp @@ -44,11 +44,11 @@ class DULinesItem : public TQListViewItem { public: - DULinesItem( DiskUsage *diskUsageIn, File *fileItem, TQListView * tqparent, TQString label1, - TQString label2, TQString label3, unsigned int italicPos ) : TQListViewItem( tqparent, label1, label2, label3 ), + DULinesItem( DiskUsage *diskUsageIn, File *fileItem, TQListView * parent, TQString label1, + TQString label2, TQString label3, unsigned int italicPos ) : TQListViewItem( parent, label1, label2, label3 ), diskUsage( diskUsageIn ), file( fileItem ), isTruncated( false ), italicTextPos( italicPos ) {} - DULinesItem( DiskUsage *diskUsageIn, File *fileItem, TQListView * tqparent, TQListViewItem * after, - TQString label1, TQString label2, TQString label3, unsigned int italicPos ) : TQListViewItem( tqparent, after, label1, + DULinesItem( DiskUsage *diskUsageIn, File *fileItem, TQListView * parent, TQListViewItem * after, + TQString label1, TQString label2, TQString label3, unsigned int italicPos ) : TQListViewItem( parent, after, label1, label2, label3 ), diskUsage( diskUsageIn ), file( fileItem ), isTruncated( false ), italicTextPos( italicPos ) {} virtual int compare ( TQListViewItem * i, int col, bool ascending ) const @@ -176,7 +176,7 @@ private: class DULinesToolTip : public TQToolTip { public: - DULinesToolTip( DiskUsage *usage, TQWidget *tqparent, TQListView *lv ); + DULinesToolTip( DiskUsage *usage, TQWidget *parent, TQListView *lv ); void maybeTip( const TQPoint &pos ); virtual ~DULinesToolTip() {} @@ -185,8 +185,8 @@ private: DiskUsage *diskUsage; }; -DULinesToolTip::DULinesToolTip( DiskUsage *usage, TQWidget *tqparent, TQListView *lv ) - : TQToolTip( tqparent ), view( lv ), diskUsage( usage ) +DULinesToolTip::DULinesToolTip( DiskUsage *usage, TQWidget *parent, TQListView *lv ) + : TQToolTip( parent ), view( lv ), diskUsage( usage ) { } @@ -276,7 +276,7 @@ void DULines::slotDirChanged( Directory *dirEntry ) TQListViewItem * lastItem = 0; - if( ! ( dirEntry->tqparent() == 0 ) ) + if( ! ( dirEntry->parent() == 0 ) ) { lastItem = new TQListViewItem( this, ".." ); lastItem->setPixmap( 0, FL_LOADICON( "up" ) ); @@ -398,7 +398,7 @@ bool DULines::doubleClicked( TQListViewItem * item ) } else { - Directory *upDir = (Directory *)diskUsage->getCurrentDir()->tqparent(); + Directory *upDir = (Directory *)diskUsage->getCurrentDir()->parent(); if( upDir ) diskUsage->changeDirectory( upDir ); diff --git a/krusader/DiskUsage/dulistview.cpp b/krusader/DiskUsage/dulistview.cpp index 1fbffe3..e418d41 100644 --- a/krusader/DiskUsage/dulistview.cpp +++ b/krusader/DiskUsage/dulistview.cpp @@ -111,11 +111,11 @@ DUListView::~ DUListView() krConfig->writeEntry("D Group Width", columnWidth( 8 ) ); } -void DUListView::addDirectory( Directory *dirEntry, TQListViewItem *tqparent ) +void DUListView::addDirectory( Directory *dirEntry, TQListViewItem *parent ) { TQListViewItem * lastItem = 0; - if( tqparent == 0 && ! ( dirEntry->tqparent() == 0 ) ) + if( parent == 0 && ! ( dirEntry->parent() == 0 ) ) { lastItem = new TQListViewItem( this, ".." ); lastItem->setPixmap( 0, FL_LOADICON( "up" ) ); @@ -138,17 +138,17 @@ void DUListView::addDirectory( Directory *dirEntry, TQListViewItem *tqparent ) TQString ownSize = KRpermHandler::parseSize( item->ownSize() ) + " "; TQString percent = item->percent(); - if( lastItem == 0 && tqparent == 0 ) + if( lastItem == 0 && parent == 0 ) lastItem = new DUListViewItem( diskUsage, item, this, item->name(), percent, totalSize, ownSize, mime, date, item->perm(), item->owner(), item->group() ); else if ( lastItem == 0 ) - lastItem = new DUListViewItem( diskUsage, item, tqparent, item->name(), percent, totalSize, ownSize, + lastItem = new DUListViewItem( diskUsage, item, parent, item->name(), percent, totalSize, ownSize, mime, date, item->perm(), item->owner(), item->group() ); - else if ( tqparent == 0 ) + else if ( parent == 0 ) lastItem = new DUListViewItem( diskUsage, item, this, lastItem, item->name(), percent, totalSize, ownSize, mime, date, item->perm(), item->owner(), item->group() ); else - lastItem = new DUListViewItem( diskUsage, item, tqparent, lastItem, item->name(), percent, totalSize, + lastItem = new DUListViewItem( diskUsage, item, parent, lastItem, item->name(), percent, totalSize, ownSize, mime, date, item->perm(), item->owner(), item->group() ); if( item->isExcluded() ) @@ -227,7 +227,7 @@ bool DUListView::doubleClicked( TQListViewItem * item ) } else { - Directory *upDir = (Directory *)diskUsage->getCurrentDir()->tqparent(); + Directory *upDir = (Directory *)diskUsage->getCurrentDir()->parent(); if( upDir ) diskUsage->changeDirectory( upDir ); diff --git a/krusader/DiskUsage/dulistview.h b/krusader/DiskUsage/dulistview.h index de3725a..0184974 100644 --- a/krusader/DiskUsage/dulistview.h +++ b/krusader/DiskUsage/dulistview.h @@ -37,37 +37,37 @@ class DUListViewItem : public TQListViewItem { public: - DUListViewItem( DiskUsage *diskUsageIn, File *fileIn, TQListView * tqparent, TQString label1, + DUListViewItem( DiskUsage *diskUsageIn, File *fileIn, TQListView * parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8, TQString label9 ) - : TQListViewItem( tqparent, label1, label2, label3, label4, label5, label6, label7, label8), + : TQListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8), diskUsage( diskUsageIn ), file( fileIn ) { setText( 8, label9 ); diskUsage->addProperty( file, "ListView-Ref", this ); } - DUListViewItem( DiskUsage *diskUsageIn, File *fileIn, TQListViewItem * tqparent, TQString label1, + DUListViewItem( DiskUsage *diskUsageIn, File *fileIn, TQListViewItem * parent, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8, TQString label9 ) - : TQListViewItem( tqparent, label1, label2, label3, label4, label5, label6, label7, label8), + : TQListViewItem( parent, label1, label2, label3, label4, label5, label6, label7, label8), diskUsage( diskUsageIn ), file( fileIn ) { setText( 8, label9 ); diskUsage->addProperty( file, "ListView-Ref", this ); } - DUListViewItem( DiskUsage *diskUsageIn, File *fileIn, TQListView * tqparent, TQListViewItem * after, + DUListViewItem( DiskUsage *diskUsageIn, File *fileIn, TQListView * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8, TQString label9 ) - : TQListViewItem( tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8), + : TQListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7, label8), diskUsage( diskUsageIn ), file( fileIn ) { setText( 8, label9 ); diskUsage->addProperty( file, "ListView-Ref", this ); } - DUListViewItem( DiskUsage *diskUsageIn, File *fileIn, TQListViewItem * tqparent, TQListViewItem * after, + DUListViewItem( DiskUsage *diskUsageIn, File *fileIn, TQListViewItem * parent, TQListViewItem * after, TQString label1, TQString label2, TQString label3, TQString label4, TQString label5, TQString label6, TQString label7, TQString label8, TQString label9 ) - : TQListViewItem( tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8), + : TQListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7, label8), diskUsage( diskUsageIn ), file( fileIn ) { setText( 8, label9 ); @@ -137,7 +137,7 @@ protected: virtual void keyPressEvent( TQKeyEvent *e ); private: - void addDirectory( Directory *dirEntry, TQListViewItem *tqparent ); + void addDirectory( Directory *dirEntry, TQListViewItem *parent ); bool doubleClicked( TQListViewItem * item ); }; diff --git a/krusader/DiskUsage/filelightParts/fileTree.cpp b/krusader/DiskUsage/filelightParts/fileTree.cpp index b5136f8..0a1e972 100644 --- a/krusader/DiskUsage/filelightParts/fileTree.cpp +++ b/krusader/DiskUsage/filelightParts/fileTree.cpp @@ -19,7 +19,7 @@ File::fullPath( const Directory *root /*= 0*/ ) const const File *d; - for( d = this; d != root && d && d->tqparent() != 0; d = d->tqparent() ) + for( d = this; d != root && d && d->parent() != 0; d = d->parent() ) { if( !path.isEmpty() ) path = "/" + path; @@ -29,8 +29,8 @@ File::fullPath( const Directory *root /*= 0*/ ) const if( d ) { - while( d->tqparent() ) - d = d->tqparent(); + while( d->parent() ) + d = d->parent(); if( d->directory().endsWith( "/" ) ) return d->directory() + path; diff --git a/krusader/DiskUsage/filelightParts/fileTree.h b/krusader/DiskUsage/filelightParts/fileTree.h index 4cd9376..c70df1a 100644 --- a/krusader/DiskUsage/filelightParts/fileTree.h +++ b/krusader/DiskUsage/filelightParts/fileTree.h @@ -212,7 +212,7 @@ public: buf.sprintf( "%d.%02d%%", m_percent / 100, m_percent % 100 ); return buf;} inline void setPercent( int p ) {m_percent = p;} - inline const Directory* tqparent() const {return m_parent;} + inline const Directory* parent() const {return m_parent;} inline void setSizes( KIO::filesize_t totalSize, KIO::filesize_t ownSize ) { @@ -257,11 +257,11 @@ public: { ++m_fileCount; - Directory *tqparent = m_parent; - while( tqparent ) + Directory *parent = m_parent; + while( parent ) { - tqparent->m_fileCount++; - tqparent = tqparent->m_parent; + parent->m_fileCount++; + parent = parent->m_parent; } Chain<File>::append( p ); @@ -275,11 +275,11 @@ public: { --m_fileCount; - Directory *tqparent = m_parent; - while( tqparent ) + Directory *parent = m_parent; + while( parent ) { - tqparent->m_fileCount--; - tqparent = tqparent->m_parent; + parent->m_fileCount--; + parent = parent->m_parent; } it.remove(); diff --git a/krusader/DiskUsage/radialMap/labels.cpp b/krusader/DiskUsage/radialMap/labels.cpp index 90c0ab8..5d61b7a 100644 --- a/krusader/DiskUsage/radialMap/labels.cpp +++ b/krusader/DiskUsage/radialMap/labels.cpp @@ -81,7 +81,7 @@ RadialMap::Widget::paintExplodedLabels( TQPainter &paint ) const p != m_tree; ++startLevel ) //startLevel is the level above whatever m_focus is in { - p = p->tqparent(); + p = p->parent(); } //range=2 means 2 levels to draw labels for diff --git a/krusader/DiskUsage/radialMap/widget.cpp b/krusader/DiskUsage/radialMap/widget.cpp index e0cf336..96b94c0 100644 --- a/krusader/DiskUsage/radialMap/widget.cpp +++ b/krusader/DiskUsage/radialMap/widget.cpp @@ -17,8 +17,8 @@ -RadialMap::Widget::Widget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WNoAutoErase ) +RadialMap::Widget::Widget( TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WNoAutoErase ) , m_tree( 0 ) , m_focus( 0 ) , m_tip( KCursor::handCursor().bitmap()->height() ) //needs to know cursor height diff --git a/krusader/DiskUsage/radialMap/widgetEvents.cpp b/krusader/DiskUsage/radialMap/widgetEvents.cpp index 2666d89..4f39232 100644 --- a/krusader/DiskUsage/radialMap/widgetEvents.cpp +++ b/krusader/DiskUsage/radialMap/widgetEvents.cpp @@ -126,7 +126,7 @@ RadialMap::Widget::mouseMoveEvent( TQMouseEvent *e ) tqrepaint( false ); } - m_tip.moveto( e->globalPos(), *this, ( p.y() < 0 ) ); //updates tooltip psuedo-trantqparent background + m_tip.moveto( e->globalPos(), *this, ( p.y() < 0 ) ); //updates tooltip psuedo-tranparent background } else if( oldFocus && oldFocus->file() != m_tree ) { diff --git a/krusader/Filter/advancedfilter.cpp b/krusader/Filter/advancedfilter.cpp index e421bd2..116269f 100644 --- a/krusader/Filter/advancedfilter.cpp +++ b/krusader/Filter/advancedfilter.cpp @@ -46,7 +46,7 @@ #define USERSFILE TQString("/etc/passwd") #define GROUPSFILE TQString("/etc/group") -AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), fltTabs( tabs ) +AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char *name ) : TQWidget( parent, name ), fltTabs( tabs ) { TQGridLayout *filterLayout = new TQGridLayout( this ); filterLayout->setSpacing( 6 ); diff --git a/krusader/Filter/advancedfilter.h b/krusader/Filter/advancedfilter.h index 1dc9033..208e837 100644 --- a/krusader/Filter/advancedfilter.h +++ b/krusader/Filter/advancedfilter.h @@ -47,7 +47,7 @@ class AdvancedFilter : public TQWidget, public FilterBase TQ_OBJECT public: - AdvancedFilter( FilterTabs *tabs, TQWidget *tqparent = 0, const char *name = 0 ); + AdvancedFilter( FilterTabs *tabs, TQWidget *parent = 0, const char *name = 0 ); virtual void queryAccepted() {} virtual bool fillQuery( KRQuery *query ); diff --git a/krusader/Filter/filterdialog.cpp b/krusader/Filter/filterdialog.cpp index fecce72..d308e02 100644 --- a/krusader/Filter/filterdialog.cpp +++ b/krusader/Filter/filterdialog.cpp @@ -34,8 +34,8 @@ #include <klocale.h> -FilterDialog::FilterDialog( TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, true, i18n("Krusader::Choose Files"), Ok|Cancel ) +FilterDialog::FilterDialog( TQWidget *parent, const char *name ) + : KDialogBase( parent, name, true, i18n("Krusader::Choose Files"), Ok|Cancel ) { TQGridLayout *filterGrid = new TQGridLayout( this->tqlayout() ); filterGrid->setSpacing( 6 ); diff --git a/krusader/Filter/filterdialog.h b/krusader/Filter/filterdialog.h index c41a284..ceeb391 100644 --- a/krusader/Filter/filterdialog.h +++ b/krusader/Filter/filterdialog.h @@ -43,7 +43,7 @@ class FilterDialog : public KDialogBase TQ_OBJECT public: - FilterDialog( TQWidget *tqparent = 0, const char *name = 0 ); + FilterDialog( TQWidget *parent = 0, const char *name = 0 ); KRQuery getQuery(); public slots: diff --git a/krusader/Filter/filtertabs.cpp b/krusader/Filter/filtertabs.cpp index 25154dc..10ea72b 100644 --- a/krusader/Filter/filtertabs.cpp +++ b/krusader/Filter/filtertabs.cpp @@ -35,8 +35,8 @@ #include <klocale.h> -FilterTabs::FilterTabs( int properties, TQTabWidget *tabWidget, TQObject *tqparent ) : - TQObject( tqparent, 0 ) +FilterTabs::FilterTabs( int properties, TQTabWidget *tabWidget, TQObject *parent ) : + TQObject( parent, 0 ) { this->tabWidget = tabWidget; @@ -123,9 +123,9 @@ FilterBase * FilterTabs::get( TQString name ) return 0; } -KRQuery FilterTabs::getQuery( TQWidget *tqparent, const char *name ) +KRQuery FilterTabs::getQuery( TQWidget *parent, const char *name ) { - FilterDialog dialog( tqparent, name ); + FilterDialog dialog( parent, name ); return dialog.getQuery(); } diff --git a/krusader/Filter/filtertabs.h b/krusader/Filter/filtertabs.h index 5e5774d..117af40 100644 --- a/krusader/Filter/filtertabs.h +++ b/krusader/Filter/filtertabs.h @@ -55,7 +55,7 @@ class FilterTabs : public TQObject }; static FilterTabs * addTo( TQTabWidget *tabWidget, int props = FilterTabs::Default ); - static KRQuery getQuery( TQWidget *tqparent = 0, const char *name = 0 ); + static KRQuery getQuery( TQWidget *parent = 0, const char *name = 0 ); FilterBase *get( TQString name ); @@ -69,7 +69,7 @@ class FilterTabs : public TQObject void closeRequest( bool accept = true ); private: - FilterTabs( int properties, TQTabWidget *tabWidget, TQObject *tqparent ); + FilterTabs( int properties, TQTabWidget *tabWidget, TQObject *parent ); void acceptQuery(); TQPtrList<FilterBase> filterList; diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp index e12eaaf..c3303b1 100644 --- a/krusader/Filter/generalfilter.cpp +++ b/krusader/Filter/generalfilter.cpp @@ -40,7 +40,7 @@ #include <tqwhatsthis.h> #include <tqpushbutton.h> -GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), +GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent, const char *name ) : TQWidget( parent, name ), profileManager( 0 ), fltTabs( tabs ) { TQGridLayout *filterLayout = new TQGridLayout( this ); diff --git a/krusader/Filter/generalfilter.h b/krusader/Filter/generalfilter.h index 807785a..18742f6 100644 --- a/krusader/Filter/generalfilter.h +++ b/krusader/Filter/generalfilter.h @@ -51,7 +51,7 @@ class GeneralFilter : public TQWidget, public FilterBase TQ_OBJECT public: - GeneralFilter( FilterTabs *tabs, int properties, TQWidget *tqparent = 0, const char *name = 0 ); + GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent = 0, const char *name = 0 ); ~GeneralFilter(); virtual bool fillQuery( KRQuery *query ); diff --git a/krusader/GUI/dirhistorybutton.cpp b/krusader/GUI/dirhistorybutton.cpp index de3c744..d6f2387 100644 --- a/krusader/GUI/dirhistorybutton.cpp +++ b/krusader/GUI/dirhistorybutton.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> -DirHistoryButton::DirHistoryButton( DirHistoryQueue* hQ, TQWidget *tqparent, const char *name ) : TQToolButton( tqparent, name ) { +DirHistoryButton::DirHistoryButton( DirHistoryQueue* hQ, TQWidget *parent, const char *name ) : TQToolButton( parent, name ) { KIconLoader * iconLoader = new KIconLoader(); TQPixmap icon = iconLoader->loadIcon( "history", KIcon::Toolbar, 16 ); diff --git a/krusader/GUI/dirhistorybutton.h b/krusader/GUI/dirhistorybutton.h index 50bdbf0..79f003a 100644 --- a/krusader/GUI/dirhistorybutton.h +++ b/krusader/GUI/dirhistorybutton.h @@ -33,7 +33,7 @@ class DirHistoryButton : public TQToolButton { Q_OBJECT TQ_OBJECT public: - DirHistoryButton(DirHistoryQueue* hQ, TQWidget *tqparent=0, const char *name=0); + DirHistoryButton(DirHistoryQueue* hQ, TQWidget *parent=0, const char *name=0); ~DirHistoryButton(); void openPopup(); diff --git a/krusader/GUI/kcmdline.cpp b/krusader/GUI/kcmdline.cpp index caa31bd..e29f3a6 100644 --- a/krusader/GUI/kcmdline.cpp +++ b/krusader/GUI/kcmdline.cpp @@ -57,7 +57,7 @@ #include <tqsizepolicy.h> #include <ktempfile.h> -KCMDLine::KCMDLine( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ) { +KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { TQGridLayout * tqlayout = new TQGridLayout( this, 1, 4 ); path = new TQLabel( this ); TQWhatsThis::add diff --git a/krusader/GUI/kcmdline.h b/krusader/GUI/kcmdline.h index 392d6ae..adc22f5 100644 --- a/krusader/GUI/kcmdline.h +++ b/krusader/GUI/kcmdline.h @@ -53,7 +53,7 @@ class KrHistoryCombo: public KHistoryCombo { TQ_OBJECT public: - KrHistoryCombo(TQWidget *tqparent): KHistoryCombo(tqparent) {} + KrHistoryCombo(TQWidget *parent): KHistoryCombo(parent) {} protected: void keyPressEvent( TQKeyEvent *e ); @@ -66,7 +66,7 @@ class KCMDLine : public TQWidget, KrActionBase { Q_OBJECT TQ_OBJECT public: - KCMDLine( TQWidget *tqparent = 0, const char *name = 0 ); + KCMDLine( TQWidget *parent = 0, const char *name = 0 ); ~KCMDLine(); void setCurrent( const TQString & ); //virtual methods from KrActionBase diff --git a/krusader/GUI/kcmdmodebutton.cpp b/krusader/GUI/kcmdmodebutton.cpp index 5e84d1c..e8ad0a2 100644 --- a/krusader/GUI/kcmdmodebutton.cpp +++ b/krusader/GUI/kcmdmodebutton.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> -KCMDModeButton::KCMDModeButton( TQWidget *tqparent, const char *name ) : TQToolButton( tqparent, name ) { +KCMDModeButton::KCMDModeButton( TQWidget *parent, const char *name ) : TQToolButton( parent, name ) { setFixedSize( 22, 20 ); /* // from the old terminal-button: setTextLabel( i18n( "If pressed, Krusader executes command line in a terminal." ) ); diff --git a/krusader/GUI/kcmdmodebutton.h b/krusader/GUI/kcmdmodebutton.h index 9c30c2e..99e4431 100644 --- a/krusader/GUI/kcmdmodebutton.h +++ b/krusader/GUI/kcmdmodebutton.h @@ -39,7 +39,7 @@ class KCMDModeButton : public TQToolButton { TQ_OBJECT public: /** Constructor. Sets up the menu, and the icon */ - KCMDModeButton(TQWidget *tqparent=0, const char *name=0); + KCMDModeButton(TQWidget *parent=0, const char *name=0); ~KCMDModeButton(); /** Shows the popup menu. Called when clicked to the button */ diff --git a/krusader/GUI/kfnkeys.cpp b/krusader/GUI/kfnkeys.cpp index 96fa6a3..554630b 100644 --- a/krusader/GUI/kfnkeys.cpp +++ b/krusader/GUI/kfnkeys.cpp @@ -38,7 +38,7 @@ #include "../defaults.h" #include "../krslots.h" -KFnKeys::KFnKeys(TQWidget *tqparent, char *name): TQWidget(tqparent,name) { +KFnKeys::KFnKeys(TQWidget *parent, char *name): TQWidget(parent,name) { krConfig->setGroup("Look&Feel"); //////////////////////////////// #define SETUP(TARGET) {\ diff --git a/krusader/GUI/kfnkeys.h b/krusader/GUI/kfnkeys.h index 955387c..5613b64 100644 --- a/krusader/GUI/kfnkeys.h +++ b/krusader/GUI/kfnkeys.h @@ -44,7 +44,7 @@ class KFnKeys : public TQWidget { public: // constructor - KFnKeys(TQWidget *tqparent, char *name=0); + KFnKeys(TQWidget *parent, char *name=0); void updateShortcuts(); private: diff --git a/krusader/GUI/krremoteencodingmenu.cpp b/krusader/GUI/krremoteencodingmenu.cpp index dd60dac..5f3ec0d 100644 --- a/krusader/GUI/krremoteencodingmenu.cpp +++ b/krusader/GUI/krremoteencodingmenu.cpp @@ -43,8 +43,8 @@ #define DATA_KEY TQString::tqfromLatin1("Charset") -KrRemoteEncodingMenu::KrRemoteEncodingMenu(const TQString &text, const TQString &icon, TQObject *tqparent, const char *name) : - KActionMenu( text, icon, tqparent, name ), settingsLoaded( false ) +KrRemoteEncodingMenu::KrRemoteEncodingMenu(const TQString &text, const TQString &icon, TQObject *parent, const char *name) : + KActionMenu( text, icon, parent, name ), settingsLoaded( false ) { connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow())); } diff --git a/krusader/GUI/krremoteencodingmenu.h b/krusader/GUI/krremoteencodingmenu.h index 8b7f04b..de4d5be 100644 --- a/krusader/GUI/krremoteencodingmenu.h +++ b/krusader/GUI/krremoteencodingmenu.h @@ -42,7 +42,7 @@ class KrRemoteEncodingMenu: public KActionMenu Q_OBJECT TQ_OBJECT public: - KrRemoteEncodingMenu (const TQString &text, const TQString &icon, TQObject *tqparent=0, const char *name=0); + KrRemoteEncodingMenu (const TQString &text, const TQString &icon, TQObject *parent=0, const char *name=0); virtual int plug( TQWidget *widget, int index = -1); diff --git a/krusader/GUI/krusaderstatus.cpp b/krusader/GUI/krusaderstatus.cpp index 51c3340..dbca240 100644 --- a/krusader/GUI/krusaderstatus.cpp +++ b/krusader/GUI/krusaderstatus.cpp @@ -34,8 +34,8 @@ #include "../resources.h" -KrusadertqStatus::KrusadertqStatus(TQWidget *tqparent, const char *name ): - KStatusBar(tqparent,name){ +KrusadertqStatus::KrusadertqStatus(TQWidget *parent, const char *name ): + KStatusBar(parent,name){ insertItem(i18n("Ready."), S_READY_ID); setMaximumHeight(TQFontMetrics(font()).height()+2); } diff --git a/krusader/GUI/krusaderstatus.h b/krusader/GUI/krusaderstatus.h index bbfaa49..95da4dd 100644 --- a/krusader/GUI/krusaderstatus.h +++ b/krusader/GUI/krusaderstatus.h @@ -46,7 +46,7 @@ class KrusadertqStatus : public KStatusBar { Q_OBJECT TQ_OBJECT public: - KrusadertqStatus(TQWidget *tqparent=0, const char *name=0); + KrusadertqStatus(TQWidget *parent=0, const char *name=0); ~KrusadertqStatus(); private: diff --git a/krusader/GUI/mediabutton.cpp b/krusader/GUI/mediabutton.cpp index fe96692..52daed3 100644 --- a/krusader/GUI/mediabutton.cpp +++ b/krusader/GUI/mediabutton.cpp @@ -70,7 +70,7 @@ -MediaButton::MediaButton( TQWidget *tqparent, const char *name ) : TQToolButton( tqparent, name ), +MediaButton::MediaButton( TQWidget *parent, const char *name ) : TQToolButton( parent, name ), popupMenu( 0 ), rightMenu( 0 ), hasMedia( false ), waitingForMount( -1 ), mountCheckerTimer() { KIconLoader * iconLoader = new KIconLoader(); diff --git a/krusader/GUI/mediabutton.h b/krusader/GUI/mediabutton.h index b57ea1b..2ffe1de 100644 --- a/krusader/GUI/mediabutton.h +++ b/krusader/GUI/mediabutton.h @@ -50,7 +50,7 @@ class MediaButton : public TQToolButton { Q_OBJECT TQ_OBJECT public: - MediaButton(TQWidget *tqparent=0, const char *name=0); + MediaButton(TQWidget *parent=0, const char *name=0); ~MediaButton(); TQString detectType( KMountPoint *mp ); diff --git a/krusader/GUI/profilemanager.cpp b/krusader/GUI/profilemanager.cpp index 432c38a..37f633b 100644 --- a/krusader/GUI/profilemanager.cpp +++ b/krusader/GUI/profilemanager.cpp @@ -38,8 +38,8 @@ #include <kinputdialog.h> #include <kiconloader.h> -ProfileManager::ProfileManager( TQString profileType, TQWidget * tqparent, const char * name ) - : TQPushButton( tqparent, name ) +ProfileManager::ProfileManager( TQString profileType, TQWidget * parent, const char * name ) + : TQPushButton( parent, name ) { setText( "" ); KIconLoader *iconLoader = new KIconLoader(); diff --git a/krusader/GUI/profilemanager.h b/krusader/GUI/profilemanager.h index e4d3641..521a787 100644 --- a/krusader/GUI/profilemanager.h +++ b/krusader/GUI/profilemanager.h @@ -40,7 +40,7 @@ class ProfileManager : public TQPushButton TQ_OBJECT public: - ProfileManager( TQString profileType, TQWidget * tqparent = 0, const char * name = 0 ); + ProfileManager( TQString profileType, TQWidget * parent = 0, const char * name = 0 ); /** * @param profileType Type of the profile (sync, search, ...) diff --git a/krusader/GUI/syncbrowsebutton.cpp b/krusader/GUI/syncbrowsebutton.cpp index d59f927..bcd2b91 100644 --- a/krusader/GUI/syncbrowsebutton.cpp +++ b/krusader/GUI/syncbrowsebutton.cpp @@ -32,7 +32,7 @@ The current version only manages sync-browse and got no mode-switch options. //#include <kdebug.h> -SyncBrowseButton::SyncBrowseButton(TQWidget *tqparent, const char *name) : TQToolButton(tqparent,name) +SyncBrowseButton::SyncBrowseButton(TQWidget *parent, const char *name) : TQToolButton(parent,name) { KIconLoader *iconLoader = new KIconLoader(); _icon_on = iconLoader->loadIcon( "kr_syncbrowse_on", KIcon::Toolbar, 16 ); diff --git a/krusader/GUI/syncbrowsebutton.h b/krusader/GUI/syncbrowsebutton.h index f22de5d..076c2af 100644 --- a/krusader/GUI/syncbrowsebutton.h +++ b/krusader/GUI/syncbrowsebutton.h @@ -50,7 +50,7 @@ class SyncBrowseButton : public TQToolButton { Q_OBJECT TQ_OBJECT public: - SyncBrowseButton(TQWidget *tqparent=0, const char *name=0); + SyncBrowseButton(TQWidget *parent=0, const char *name=0); ~SyncBrowseButton(); int state(); diff --git a/krusader/KViewer/diskusageviewer.cpp b/krusader/KViewer/diskusageviewer.cpp index 9512bb5..ebaf6bd 100644 --- a/krusader/KViewer/diskusageviewer.cpp +++ b/krusader/KViewer/diskusageviewer.cpp @@ -34,8 +34,8 @@ #include "../Panel/panelfunc.h" #include "diskusageviewer.h" -DiskUsageViewer::DiskUsageViewer( TQWidget *tqparent, char *name ) - : TQWidget( tqparent, name ), diskUsage( 0 ), statusLabel( 0 ) +DiskUsageViewer::DiskUsageViewer( TQWidget *parent, char *name ) + : TQWidget( parent, name ), diskUsage( 0 ), statusLabel( 0 ) { tqlayout = new TQGridLayout( this, 1, 1 ); } diff --git a/krusader/KViewer/diskusageviewer.h b/krusader/KViewer/diskusageviewer.h index d393869..b7ef603 100644 --- a/krusader/KViewer/diskusageviewer.h +++ b/krusader/KViewer/diskusageviewer.h @@ -42,7 +42,7 @@ class DiskUsageViewer : public TQWidget TQ_OBJECT public: - DiskUsageViewer( TQWidget *tqparent = 0, char *name = 0 ); + DiskUsageViewer( TQWidget *parent = 0, char *name = 0 ); ~DiskUsageViewer(); void openURL( KURL url ); diff --git a/krusader/KViewer/kimagefilepreview.cpp b/krusader/KViewer/kimagefilepreview.cpp index dce4fc4..302e8c2 100644 --- a/krusader/KViewer/kimagefilepreview.cpp +++ b/krusader/KViewer/kimagefilepreview.cpp @@ -29,8 +29,8 @@ /**** KrusaderImageFilePreview ****/ -KrusaderImageFilePreview::KrusaderImageFilePreview( TQWidget *tqparent ) - : KPreviewWidgetBase( tqparent ), +KrusaderImageFilePreview::KrusaderImageFilePreview( TQWidget *parent ) + : KPreviewWidgetBase( parent ), m_job( 0L ) { TQVBoxLayout *vb = new TQVBoxLayout( this, KDialog::marginHint() ); diff --git a/krusader/KViewer/kimagefilepreview.h b/krusader/KViewer/kimagefilepreview.h index 8966c5f..23cce72 100644 --- a/krusader/KViewer/kimagefilepreview.h +++ b/krusader/KViewer/kimagefilepreview.h @@ -31,7 +31,7 @@ class KrusaderImageFilePreview : public KPreviewWidgetBase { TQ_OBJECT public: - KrusaderImageFilePreview( TQWidget *tqparent ); + KrusaderImageFilePreview( TQWidget *parent ); ~KrusaderImageFilePreview(); virtual TQSize tqsizeHint() const; diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp index a44520e..9362910 100644 --- a/krusader/KViewer/krviewer.cpp +++ b/krusader/KViewer/krviewer.cpp @@ -52,8 +52,8 @@ TQPtrList<KrViewer> KrViewer::viewers; -KrViewer::KrViewer( TQWidget *tqparent, const char *name ) : -KParts::MainWindow( tqparent, name ), manager( this, TQT_TQOBJECT(this) ), tabBar( this ), returnFocusTo( 0 ), returnFocusTab( 0 ), +KrViewer::KrViewer( TQWidget *parent, const char *name ) : +KParts::MainWindow( parent, name ), manager( this, TQT_TQOBJECT(this) ), tabBar( this ), returnFocusTo( 0 ), returnFocusTab( 0 ), reservedKeys(), reservedKeyIDs() { //setWFlags(WType_TopLevel | WDestructiveClose); @@ -235,7 +235,7 @@ KrViewer* KrViewer::getViewer(bool new_window){ } } -void KrViewer::view( KURL url, TQWidget * tqparent ) { +void KrViewer::view( KURL url, TQWidget * parent ) { Mode defaultMode = Generic; bool defaultWindow = false; @@ -248,25 +248,25 @@ void KrViewer::view( KURL url, TQWidget * tqparent ) { else if( modeString == "text" ) defaultMode = Text; else if( modeString == "hex" ) defaultMode = Hex; - view(url,defaultMode,defaultWindow, tqparent ); + view(url,defaultMode,defaultWindow, parent ); } -void KrViewer::view( KURL url, Mode mode, bool new_window, TQWidget * tqparent ) { +void KrViewer::view( KURL url, Mode mode, bool new_window, TQWidget * parent ) { KrViewer* viewer = getViewer(new_window); PanelViewerBase* viewWidget = new PanelViewer(&viewer->tabBar); KParts::Part* part = viewWidget->openURL(url,mode); viewer->addTab(viewWidget,i18n( "Viewing" ),VIEW_ICON,part); - viewer->returnFocusTo = tqparent; + viewer->returnFocusTo = parent; viewer->returnFocusTab = viewWidget; } -void KrViewer::edit( KURL url, TQWidget * tqparent ) { - edit( url, Text, -1, tqparent ); +void KrViewer::edit( KURL url, TQWidget * parent ) { + edit( url, Text, -1, parent ); } -void KrViewer::edit( KURL url, Mode mode, int new_window, TQWidget * tqparent ) { +void KrViewer::edit( KURL url, Mode mode, int new_window, TQWidget * parent ) { krConfig->setGroup( "General" ); TQString edit = krConfig->readEntry( "Editor", _Editor ); @@ -291,7 +291,7 @@ void KrViewer::edit( KURL url, Mode mode, int new_window, TQWidget * tqparent ) KParts::Part* part = editWidget->openURL(url,mode); viewer->addTab(editWidget,i18n("Editing"),EDIT_ICON,part); - viewer->returnFocusTo = tqparent; + viewer->returnFocusTo = parent; viewer->returnFocusTab = editWidget; } diff --git a/krusader/KViewer/krviewer.h b/krusader/KViewer/krviewer.h index 4ebde12..2d47783 100644 --- a/krusader/KViewer/krviewer.h +++ b/krusader/KViewer/krviewer.h @@ -45,10 +45,10 @@ public: enum Mode{Generic,Text,Hex}; - static void view( KURL url, TQWidget * tqparent = krApp ); - static void view( KURL url, Mode mode, bool new_window, TQWidget * tqparent = krApp ); - static void edit( KURL url, TQWidget * tqparent ); - static void edit( KURL url, Mode mode=Text, int new_window=-1, TQWidget * tqparent = krApp ); + static void view( KURL url, TQWidget * parent = krApp ); + static void view( KURL url, Mode mode, bool new_window, TQWidget * parent = krApp ); + static void edit( KURL url, TQWidget * parent ); + static void edit( KURL url, Mode mode=Text, int new_window=-1, TQWidget * parent = krApp ); virtual bool eventFilter ( TQObject * watched, TQEvent * e ); @@ -83,7 +83,7 @@ protected: virtual void focusInEvent( TQFocusEvent * ){ if( viewers.remove( this ) ) viewers.prepend( this ); } // move to first private: - KrViewer( TQWidget *tqparent = 0, const char *name = 0 ); + KrViewer( TQWidget *parent = 0, const char *name = 0 ); void addTab(PanelViewerBase* pvb, TQString msg,TQString iconName, KParts::Part* part); PanelViewerBase * getPanelViewerBase( KParts::Part* part); void updateActions( PanelViewerBase * base ); diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp index 7b9c07b..d2205fa 100644 --- a/krusader/KViewer/panelviewer.cpp +++ b/krusader/KViewer/panelviewer.cpp @@ -23,8 +23,8 @@ /* ----==={ PanelViewerBase }===---- */ -PanelViewerBase::PanelViewerBase( TQWidget *tqparent ) : -TQWidgetStack( tqparent ), mimes( 0 ), cpart( 0 ) { +PanelViewerBase::PanelViewerBase( TQWidget *parent ) : +TQWidgetStack( parent ), mimes( 0 ), cpart( 0 ) { tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored ) ); mimes = new TQDict<KParts::ReadOnlyPart>( DICTSIZE, false ); @@ -46,8 +46,8 @@ PanelViewerBase::~PanelViewerBase() { /* ----==={ PanelViewer }===---- */ -PanelViewer::PanelViewer( TQWidget *tqparent ) : -PanelViewerBase( tqparent ) { +PanelViewer::PanelViewer( TQWidget *parent ) : +PanelViewerBase( parent ) { } PanelViewer::~PanelViewer() { @@ -196,8 +196,8 @@ void PanelViewer::oldHexViewer(KTempFile& tmpFile) { /* ----==={ PanelEditor }===---- */ -PanelEditor::PanelEditor( TQWidget *tqparent ) : -PanelViewerBase( tqparent ) { +PanelEditor::PanelEditor( TQWidget *parent ) : +PanelViewerBase( parent ) { } PanelEditor::~PanelEditor() { diff --git a/krusader/KViewer/panelviewer.h b/krusader/KViewer/panelviewer.h index 0105a55..e44f4f3 100644 --- a/krusader/KViewer/panelviewer.h +++ b/krusader/KViewer/panelviewer.h @@ -18,7 +18,7 @@ class PanelViewerBase: public TQWidgetStack { TQ_OBJECT public: - PanelViewerBase( TQWidget *tqparent = 0 ); + PanelViewerBase( TQWidget *parent = 0 ); virtual ~PanelViewerBase(); inline KURL url() const { return curl; } inline void setUrl( KURL url ) { emit urlChanged( this, url ); curl = url; } @@ -53,7 +53,7 @@ public slots: bool closeURL(); public: - PanelViewer( TQWidget *tqparent = 0 ); + PanelViewer( TQWidget *parent = 0 ); ~PanelViewer(); virtual bool isEditor() { return false; } @@ -78,7 +78,7 @@ public slots: void slotStatResult( KIO::Job* job ); public: - PanelEditor( TQWidget *tqparent = 0 ); + PanelEditor( TQWidget *parent = 0 ); ~PanelEditor(); protected: diff --git a/krusader/Konfigurator/kgadvanced.cpp b/krusader/Konfigurator/kgadvanced.cpp index 4e7d749..e930248 100644 --- a/krusader/Konfigurator/kgadvanced.cpp +++ b/krusader/Konfigurator/kgadvanced.cpp @@ -37,15 +37,15 @@ #include <kdeversion.h> #include <kprotocolinfo.h> -KgAdvanced::KgAdvanced( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ) +KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ) { - TQGridLayout *kgAdvancedLayout = new TQGridLayout( tqparent ); + TQGridLayout *kgAdvancedLayout = new TQGridLayout( parent ); kgAdvancedLayout->setSpacing( 6 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- - TQGroupBox *generalGrp = createFrame( i18n( "General" ), tqparent, "kgAdvGeneralGrp" ); + TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgAdvGeneralGrp" ); TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); #if KDE_IS_VERSION( 3,5,1 ) @@ -85,7 +85,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* tqparent, const char* name ) : // ----------------------- CONFIRMATIONS GROUPBOX ------------------------------- - TQGroupBox *confirmGrp = createFrame( i18n( "Confirmations" ), tqparent, "confirmGrp" ); + TQGroupBox *confirmGrp = createFrame( i18n( "Confirmations" ), parent, "confirmGrp" ); TQGridLayout *confirmGrid = createGridLayout( confirmGrp->tqlayout() ); addLabel( confirmGrid, 0, 0, "\n"+i18n( "Request user confirmation for the following operations:" )+"\n", @@ -109,7 +109,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* tqparent, const char* name ) : // ------------------------ FINE-TUNING GROUPBOX -------------------------------- - TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), tqparent, "kgFineTuneGrp" ); + TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "kgFineTuneGrp" ); TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() ); fineTuneGrid->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop ); diff --git a/krusader/Konfigurator/kgadvanced.h b/krusader/Konfigurator/kgadvanced.h index e96ac5a..162e6df 100644 --- a/krusader/Konfigurator/kgadvanced.h +++ b/krusader/Konfigurator/kgadvanced.h @@ -39,7 +39,7 @@ class KgAdvanced : public KonfiguratorPage TQ_OBJECT public: - KgAdvanced( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgAdvanced( bool first, TQWidget* parent=0, const char* name=0 ); }; #endif /* __KGADVANCED_H__ */ diff --git a/krusader/Konfigurator/kgarchives.cpp b/krusader/Konfigurator/kgarchives.cpp index 6e770b3..5ab4424 100644 --- a/krusader/Konfigurator/kgarchives.cpp +++ b/krusader/Konfigurator/kgarchives.cpp @@ -40,15 +40,15 @@ #include "../krusader.h" #include "../VFS/krarchandler.h" -KgArchives::KgArchives( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ) +KgArchives::KgArchives( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ) { - TQGridLayout *kgArchivesLayout = new TQGridLayout( tqparent ); + TQGridLayout *kgArchivesLayout = new TQGridLayout( parent ); kgArchivesLayout->setSpacing( 6 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- - TQGroupBox *generalGrp = createFrame( i18n( "General" ), tqparent, "generalGrp" ); + TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "generalGrp" ); TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); addLabel( generalGrid, 0, 0, i18n( "Krusader transparently handles the following types of archives:" ), @@ -86,7 +86,7 @@ KgArchives::KgArchives( bool first, TQWidget* tqparent, const char* name ) : // ------------------------ FINE-TUNING GROUPBOX -------------------------------- - TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), tqparent, "fineTuneGrp" ); + TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "fineTuneGrp" ); TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() ); KONFIGURATOR_CHECKBOX_PARAM finetuners[] = diff --git a/krusader/Konfigurator/kgarchives.h b/krusader/Konfigurator/kgarchives.h index d848f65..30d7ae8 100644 --- a/krusader/Konfigurator/kgarchives.h +++ b/krusader/Konfigurator/kgarchives.h @@ -39,7 +39,7 @@ class KgArchives : public KonfiguratorPage TQ_OBJECT public: - KgArchives( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgArchives( bool first, TQWidget* parent=0, const char* name=0 ); virtual bool apply(); virtual void setDefaults(); diff --git a/krusader/Konfigurator/kgcolors.cpp b/krusader/Konfigurator/kgcolors.cpp index 8e90bdb..21498a2 100644 --- a/krusader/Konfigurator/kgcolors.cpp +++ b/krusader/Konfigurator/kgcolors.cpp @@ -40,15 +40,15 @@ #include <tqheader.h> #include <tqtabwidget.h> -KgColors::KgColors( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ), offset( 0 ) +KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ), offset( 0 ) { - TQGridLayout *kgColorsLayout = new TQGridLayout( tqparent ); + TQGridLayout *kgColorsLayout = new TQGridLayout( parent ); kgColorsLayout->setSpacing( 6 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- - TQGroupBox *generalGrp = createFrame( i18n( "General" ), tqparent, "kgColorsGeneralGrp" ); + TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgColorsGeneralGrp" ); TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); generalGrid->setSpacing( 0 ); @@ -72,7 +72,7 @@ KgColors::KgColors( bool first, TQWidget* tqparent, const char* name ) : connect( generals->find( "Dim Inactive Colors" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotDisable() ) ); kgColorsLayout->addMultiCellWidget( generalGrp, 0 ,0, 0, 2 ); - TQHBox *hbox = new TQHBox( tqparent ); + TQHBox *hbox = new TQHBox( parent ); // -------------------------- COLORS GROUPBOX ---------------------------------- @@ -225,11 +225,11 @@ KgColors::KgColors( bool first, TQWidget* tqparent, const char* name ) : kgColorsLayout->addMultiCellWidget( hbox, 1 ,1, 0, 2 ); - importBtn = new KPushButton(i18n("Import color-scheme"),tqparent); + importBtn = new KPushButton(i18n("Import color-scheme"),parent); kgColorsLayout->addWidget(importBtn,2,0); - exportBtn = new KPushButton(i18n("Export color-scheme"),tqparent); + exportBtn = new KPushButton(i18n("Export color-scheme"),parent); kgColorsLayout->addWidget(exportBtn,2,1); - kgColorsLayout->addWidget(createSpacer(tqparent, ""), 2,2); + kgColorsLayout->addWidget(createSpacer(parent, ""), 2,2); connect(importBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotImportColors())); connect(exportBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExportColors())); diff --git a/krusader/Konfigurator/kgcolors.h b/krusader/Konfigurator/kgcolors.h index 1034dac..cc68362 100644 --- a/krusader/Konfigurator/kgcolors.h +++ b/krusader/Konfigurator/kgcolors.h @@ -43,7 +43,7 @@ class KgColors : public KonfiguratorPage TQ_OBJECT public: - KgColors( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgColors( bool first, TQWidget* parent=0, const char* name=0 ); bool apply(); @@ -109,7 +109,7 @@ private: TQString label; public: - PreviewItem( TQListView * tqparent, TQString name ) : TQListViewItem( tqparent, name ) + PreviewItem( TQListView * parent, TQString name ) : TQListViewItem( parent, name ) { defaultBackground = TQColor( 255, 255, 255 ); defaultForeground = TQColor( 0, 0, 0 ); diff --git a/krusader/Konfigurator/kgdependencies.cpp b/krusader/Konfigurator/kgdependencies.cpp index 9b6607f..4c56fb8 100644 --- a/krusader/Konfigurator/kgdependencies.cpp +++ b/krusader/Konfigurator/kgdependencies.cpp @@ -40,14 +40,14 @@ #define PAGE_PACKERS 1 #define PAGE_CHECKSUM 2 -KgDependencies::KgDependencies( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ) +KgDependencies::KgDependencies( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ) { - TQGridLayout *kgDependenciesLayout = new TQGridLayout( tqparent ); + TQGridLayout *kgDependenciesLayout = new TQGridLayout( parent ); kgDependenciesLayout->setSpacing( 6 ); // ---------------------------- GENERAL TAB ------------------------------------- - tabWidget = new TQTabWidget( tqparent, "tabWidget" ); + tabWidget = new TQTabWidget( parent, "tabWidget" ); TQWidget *general_tab = new TQWidget( tabWidget, "tab" ); tabWidget->insertTab( general_tab, i18n( "General" ) ); @@ -119,7 +119,7 @@ KgDependencies::KgDependencies( bool first, TQWidget* tqparent, const char* nam kgDependenciesLayout->addWidget( tabWidget, 0, 0 ); } -void KgDependencies::addApplication( TQString name, TQGridLayout *grid, int row, TQWidget *tqparent, int page, TQString additionalList ) +void KgDependencies::addApplication( TQString name, TQGridLayout *grid, int row, TQWidget *parent, int page, TQString additionalList ) { TQString dflt = KrServices::fullPathName( name ); /* try to autodetect the full path name */ @@ -132,9 +132,9 @@ void KgDependencies::addApplication( TQString name, TQGridLayout *grid, int row, } } - addLabel( grid, row, 0, name, tqparent, (TQString( "label:" )+name).ascii() ); + addLabel( grid, row, 0, name, parent, (TQString( "label:" )+name).ascii() ); - KonfiguratorURLRequester *fullPath = createURLRequester( "Dependencies", name, dflt, tqparent, false, page ); + KonfiguratorURLRequester *fullPath = createURLRequester( "Dependencies", name, dflt, parent, false, page ); connect( fullPath->extension(), TQT_SIGNAL( applyManually( TQObject *, TQString, TQString ) ), this, TQT_SLOT( slotApply( TQObject *, TQString, TQString ) ) ); grid->addWidget( fullPath, row, 1 ); diff --git a/krusader/Konfigurator/kgdependencies.h b/krusader/Konfigurator/kgdependencies.h index 9a44c52..7d47974 100644 --- a/krusader/Konfigurator/kgdependencies.h +++ b/krusader/Konfigurator/kgdependencies.h @@ -42,12 +42,12 @@ class KgDependencies : public KonfiguratorPage TQ_OBJECT public: - KgDependencies( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgDependencies( bool first, TQWidget* parent=0, const char* name=0 ); virtual int activeSubPage(); private: - void addApplication( TQString name, TQGridLayout *grid, int row, TQWidget *tqparent, int page, TQString additionalList=TQString() ); + void addApplication( TQString name, TQGridLayout *grid, int row, TQWidget *parent, int page, TQString additionalList=TQString() ); public slots: void slotApply( TQObject *obj, TQString cls, TQString name ); diff --git a/krusader/Konfigurator/kggeneral.cpp b/krusader/Konfigurator/kggeneral.cpp index 44e3d55..3f9923e 100644 --- a/krusader/Konfigurator/kggeneral.cpp +++ b/krusader/Konfigurator/kggeneral.cpp @@ -41,18 +41,18 @@ #include "../krusader.h" #include "../kicons.h" -KgGeneral::KgGeneral( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ) +KgGeneral::KgGeneral( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ) { if( first ) slotFindTools(); - TQGridLayout *kgGeneralLayout = new TQGridLayout( tqparent ); + TQGridLayout *kgGeneralLayout = new TQGridLayout( parent ); kgGeneralLayout->setSpacing( 6 ); // -------------------------- GENERAL GROUPBOX ---------------------------------- - TQGroupBox *generalGrp = createFrame( i18n( "General" ), tqparent, "kgGenGeneralGrp" ); + TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgGenGeneralGrp" ); TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); KONFIGURATOR_NAME_VALUE_TIP deleteMode[] = diff --git a/krusader/Konfigurator/kggeneral.h b/krusader/Konfigurator/kggeneral.h index 8987f24..7bbbb67 100644 --- a/krusader/Konfigurator/kggeneral.h +++ b/krusader/Konfigurator/kggeneral.h @@ -39,7 +39,7 @@ class KgGeneral : public KonfiguratorPage TQ_OBJECT public: - KgGeneral( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgGeneral( bool first, TQWidget* parent=0, const char* name=0 ); public slots: void applyTempDir(TQObject *,TQString, TQString); diff --git a/krusader/Konfigurator/kglookfeel.cpp b/krusader/Konfigurator/kglookfeel.cpp index 44df748..e2f542b 100644 --- a/krusader/Konfigurator/kglookfeel.cpp +++ b/krusader/Konfigurator/kglookfeel.cpp @@ -49,13 +49,13 @@ #define PAGE_PANELTOOLBAR 2 #define PAGE_MOUSE 3 -KgLookFeel::KgLookFeel( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ) +KgLookFeel::KgLookFeel( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ) { - TQGridLayout *kgLookAndFeelLayout = new TQGridLayout( tqparent ); + TQGridLayout *kgLookAndFeelLayout = new TQGridLayout( parent ); kgLookAndFeelLayout->setSpacing( 6 ); - tabWidget = new TQTabWidget( tqparent, "tabWidget" ); + tabWidget = new TQTabWidget( parent, "tabWidget" ); setupOperationTab(); setupPanelTab(); @@ -208,7 +208,7 @@ void KgLookFeel::setupPanelToolbarTab() { {"Look&Feel", "Clear Location Bar Visible", _ClearLocation, i18n( "Clear location bar button" ), true , i18n( "Clears the location bar" ) }, {"Look&Feel", "Open Button Visible", _Open, i18n( "Open button" ), true , i18n( "Opens the directory browser." ) }, {"Look&Feel", "Equal Button Visible", _cdOther, i18n( "Equal button (=)" ),true , i18n( "Changes the panel directory to the other panel directory." ) }, - {"Look&Feel", "Up Button Visible", _cdUp, i18n( "Up button (..)" ), true , i18n( "Changes the panel directory to the tqparent directory." ) }, + {"Look&Feel", "Up Button Visible", _cdUp, i18n( "Up button (..)" ), true , i18n( "Changes the panel directory to the parent directory." ) }, {"Look&Feel", "Home Button Visible", _cdHome, i18n( "Home button (~)" ), true , i18n( "Changes the panel directory to the home directory." ) }, {"Look&Feel", "Root Button Visible", _cdRoot, i18n( "Root button (/)" ), true , i18n( "Changes the panel directory to the root directory." ) }, {"Look&Feel", "SyncBrowse Button Visible", _syncBrowseButton, i18n( "Toggle-button for sync-browsing" ), true , i18n( "Each directory change in the panel is also performed in the other panel." ) }, diff --git a/krusader/Konfigurator/kglookfeel.h b/krusader/Konfigurator/kglookfeel.h index eeb174b..d1df953 100644 --- a/krusader/Konfigurator/kglookfeel.h +++ b/krusader/Konfigurator/kglookfeel.h @@ -41,7 +41,7 @@ class KgLookFeel : public KonfiguratorPage TQ_OBJECT public: - KgLookFeel( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgLookFeel( bool first, TQWidget* parent=0, const char* name=0 ); virtual int activeSubPage(); diff --git a/krusader/Konfigurator/kgprotocols.cpp b/krusader/Konfigurator/kgprotocols.cpp index b1912fc..a6ea11f 100644 --- a/krusader/Konfigurator/kgprotocols.cpp +++ b/krusader/Konfigurator/kgprotocols.cpp @@ -56,15 +56,15 @@ TQString KgProtocols::defaultTarMimes = "application/x-tar,application/x-tarz, "application/x-compressed-tar," "application/x-tbz,application/x-tgz"; -KgProtocols::KgProtocols( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ) +KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ) { - TQGridLayout *KgProtocolsLayout = new TQGridLayout( tqparent ); + TQGridLayout *KgProtocolsLayout = new TQGridLayout( parent ); KgProtocolsLayout->setSpacing( 6 ); // -------------------------- LINK VIEW ---------------------------------- - TQGroupBox *linkGrp = createFrame( i18n( "Links" ), tqparent, "linkGrp" ); + TQGroupBox *linkGrp = createFrame( i18n( "Links" ), parent, "linkGrp" ); TQGridLayout *linkGrid = createGridLayout( linkGrp->tqlayout() ); linkList = new TQListView( linkGrp, "linkList" ); @@ -77,7 +77,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* tqparent, const char* name ) : // -------------------------- BUTTONS ---------------------------------- - TQVBox *vbox1 = new TQVBox( tqparent, "vbox1" ) ; + TQVBox *vbox1 = new TQVBox( parent, "vbox1" ) ; addSpacer( vbox1 ); btnAddProtocol = new TQPushButton( vbox1, "btnAddProtocolButton" ); @@ -90,7 +90,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* tqparent, const char* name ) : KgProtocolsLayout->addWidget( vbox1, 0 ,1 ); - TQVBox *vbox2 = new TQVBox( tqparent, "vbox2" ) ; + TQVBox *vbox2 = new TQVBox( parent, "vbox2" ) ; addSpacer( vbox2 ); btnAddMime = new TQPushButton( vbox2, "btnAddMimeButton" ); @@ -105,7 +105,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* tqparent, const char* name ) : // -------------------------- PROTOCOLS LISTBOX ---------------------------------- - TQGroupBox *protocolGrp = createFrame( i18n( "Protocols" ), tqparent, "protocolGrp" ); + TQGroupBox *protocolGrp = createFrame( i18n( "Protocols" ), parent, "protocolGrp" ); TQGridLayout *protocolGrid = createGridLayout( protocolGrp->tqlayout() ); protocolList = new TQListBox( protocolGrp, "protocolList" ); @@ -116,7 +116,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* tqparent, const char* name ) : // -------------------------- MIMES LISTBOX ---------------------------------- - TQGroupBox *mimeGrp = createFrame( i18n( "Mimes" ), tqparent, "mimeGrp" ); + TQGroupBox *mimeGrp = createFrame( i18n( "Mimes" ), parent, "mimeGrp" ); TQGridLayout *mimeGrid = createGridLayout( mimeGrp->tqlayout() ); mimeList = new TQListBox( mimeGrp, "protocolList" ); @@ -140,9 +140,9 @@ KgProtocols::KgProtocols( bool first, TQWidget* tqparent, const char* name ) : slotDisableButtons(); } -TQWidget* KgProtocols::addSpacer( TQWidget *tqparent, const char *widgetName ) +TQWidget* KgProtocols::addSpacer( TQWidget *parent, const char *widgetName ) { - TQWidget *widget = new TQWidget( tqparent, widgetName ); + TQWidget *widget = new TQWidget( parent, widgetName ); TQVBoxLayout *vboxtqlayout = new TQVBoxLayout( widget ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); vboxtqlayout->addItem( spacer ); @@ -180,10 +180,10 @@ void KgProtocols::slotDisableButtons() { btnAddProtocol->setEnabled( protocolList->selectedItem() != 0 ); TQListViewItem *listViewItem = linkList->currentItem(); - bool isProtocolSelected = ( listViewItem == 0 ? false : listViewItem->tqparent() == 0 ); + bool isProtocolSelected = ( listViewItem == 0 ? false : listViewItem->parent() == 0 ); btnRemoveProtocol->setEnabled( isProtocolSelected ); btnAddMime->setEnabled( listViewItem != 0 && mimeList->selectedItem() != 0 ); - btnRemoveMime->setEnabled( listViewItem == 0 ? false : listViewItem->tqparent() != 0 ); + btnRemoveMime->setEnabled( listViewItem == 0 ? false : listViewItem->parent() != 0 ); if( linkList->currentItem() == 0 && linkList->firstChild() != 0 ) linkList->setCurrentItem( linkList->firstChild() ); @@ -247,8 +247,8 @@ void KgProtocols::slotAddMime() if( item && linkList->currentItem() != 0 ) { TQListViewItem *itemToAdd = linkList->currentItem(); - if( itemToAdd->tqparent() ) - itemToAdd = itemToAdd->tqparent(); + if( itemToAdd->parent() ) + itemToAdd = itemToAdd->parent(); addMime( item->text(), itemToAdd->text( 0 ) ); slotDisableButtons(); @@ -261,7 +261,7 @@ void KgProtocols::addMime( TQString name, TQString protocol ) TQListBoxItem *item = mimeList->findItem( name, ExactMatch ); TQListViewItem *currentListItem = linkList->findItem( protocol, 0 ); - if( item && currentListItem && currentListItem->tqparent() == 0 ) + if( item && currentListItem && currentListItem->parent() == 0 ) { mimeList->removeItem( mimeList->index( item ) ); TQListViewItem *listViewItem = new TQListViewItem( currentListItem, name ); @@ -285,11 +285,11 @@ void KgProtocols::removeMime( TQString name ) { TQListViewItem *currentMimeItem = linkList->findItem( name, 0 ); - if( currentMimeItem && currentMimeItem->tqparent() != 0 ) + if( currentMimeItem && currentMimeItem->parent() != 0 ) { mimeList->insertItem( currentMimeItem->text( 0 ) ); mimeList->sort(); - currentMimeItem->tqparent()->takeItem( currentMimeItem ); + currentMimeItem->parent()->takeItem( currentMimeItem ); } } diff --git a/krusader/Konfigurator/kgprotocols.h b/krusader/Konfigurator/kgprotocols.h index 45dc5f1..0c7f95b 100644 --- a/krusader/Konfigurator/kgprotocols.h +++ b/krusader/Konfigurator/kgprotocols.h @@ -42,7 +42,7 @@ class KgProtocols : public KonfiguratorPage TQ_OBJECT public: - KgProtocols( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgProtocols( bool first, TQWidget* parent=0, const char* name=0 ); virtual void loadInitialValues(); virtual void setDefaults(); @@ -61,7 +61,7 @@ public slots: protected: void loadListCapableProtocols(); void loadMimes(); - TQWidget* addSpacer( TQWidget *tqparent, const char *widgetName = 0); + TQWidget* addSpacer( TQWidget *parent, const char *widgetName = 0); void addProtocol( TQString name, bool changeCurrent = false ); void removeProtocol( TQString name ); diff --git a/krusader/Konfigurator/kgstartup.cpp b/krusader/Konfigurator/kgstartup.cpp index 4b8325d..6201039 100644 --- a/krusader/Konfigurator/kgstartup.cpp +++ b/krusader/Konfigurator/kgstartup.cpp @@ -36,15 +36,15 @@ #include <klineedit.h> #include <tqwhatsthis.h> -KgStartup::KgStartup( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ), profileCombo( 0 ) +KgStartup::KgStartup( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ), profileCombo( 0 ) { - TQGridLayout *kgStartupLayout = new TQGridLayout( tqparent ); + TQGridLayout *kgStartupLayout = new TQGridLayout( parent ); kgStartupLayout->setSpacing( 6 ); // --------------------------- PANELS GROUPBOX ---------------------------------- - TQGroupBox *panelsGrp = createFrame( i18n( "General" ), tqparent, "panelsGrp" ); + TQGroupBox *panelsGrp = createFrame( i18n( "General" ), parent, "panelsGrp" ); TQGridLayout *panelsGrid = createGridLayout( panelsGrp->tqlayout() ); TQString s = "<p><img src='toolbar|kr_profile'></p>" + i18n( "Defines the panel profile used at startup. A panel profile contains:<ul><li>all the tabs paths</li><li>the current tab</li><li>the active panel</li></ul><b><Last session></b> is a special panel profile which is saved automatically when Krusader is closed."); @@ -80,7 +80,7 @@ KgStartup::KgStartup( bool first, TQWidget* tqparent, const char* name ) : // ------------------------ USERINTERFACE GROUPBOX ------------------------------ - TQGroupBox *uiGrp = createFrame( i18n( "User Interface" ), tqparent, "uiGrp" ); + TQGroupBox *uiGrp = createFrame( i18n( "User Interface" ), parent, "uiGrp" ); TQGridLayout *uiGrid = createGridLayout( uiGrp->tqlayout() ); KONFIGURATOR_CHECKBOX_PARAM uiCheckBoxes[] = diff --git a/krusader/Konfigurator/kgstartup.h b/krusader/Konfigurator/kgstartup.h index 1de8d68..d60f207 100644 --- a/krusader/Konfigurator/kgstartup.h +++ b/krusader/Konfigurator/kgstartup.h @@ -39,7 +39,7 @@ class KgStartup : public KonfiguratorPage TQ_OBJECT public: - KgStartup( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgStartup( bool first, TQWidget* parent=0, const char* name=0 ); public slots: void slotDisable(); diff --git a/krusader/Konfigurator/kguseractions.cpp b/krusader/Konfigurator/kguseractions.cpp index 704576b..9a8a938 100644 --- a/krusader/Konfigurator/kguseractions.cpp +++ b/krusader/Konfigurator/kguseractions.cpp @@ -38,14 +38,14 @@ #include <kdebug.h> -KgUserActions::KgUserActions( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ) +KgUserActions::KgUserActions( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ) { - TQGridLayout *kgUserActionLayout = new TQGridLayout( tqparent, 2, 1, + TQGridLayout *kgUserActionLayout = new TQGridLayout( parent, 2, 1, 0 /* margin */, 6 /* spacing */, "kgUserActionLayout" ); // ============= Info Group ============= - TQGroupBox *InfoGroup = createFrame( i18n( "Information" ), tqparent, "kgUserActionInfoGroup" ); + TQGroupBox *InfoGroup = createFrame( i18n( "Information" ), parent, "kgUserActionInfoGroup" ); TQGridLayout *InfoGrid = createGridLayout( InfoGroup->tqlayout() ); // terminal for the UserActions @@ -61,7 +61,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* tqparent, const char* name kgUserActionLayout->addWidget( InfoGroup, 0 ,0 ); // ============= Terminal Group ============= - TQGroupBox *terminalGroup = createFrame( i18n( "Terminal execution" ), tqparent, "kgUserActionTerminalGroup" ); + TQGroupBox *terminalGroup = createFrame( i18n( "Terminal execution" ), parent, "kgUserActionTerminalGroup" ); TQGridLayout *terminalGrid = createGridLayout( terminalGroup->tqlayout() ); // terminal for the UserActions @@ -75,7 +75,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* tqparent, const char* name kgUserActionLayout->addWidget( terminalGroup, 1 ,0 ); // ============= Outputcollection Group ============= - TQGroupBox *outputGroup = createFrame( i18n( "Output collection" ), tqparent, "kgUserActionOutputGroup" ); + TQGroupBox *outputGroup = createFrame( i18n( "Output collection" ), parent, "kgUserActionOutputGroup" ); TQGridLayout *outputGrid = createGridLayout( outputGroup->tqlayout() ); TQHBox *hbox; @@ -99,7 +99,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* tqparent, const char* name } void KgUserActions::startActionMan() { - ActionMan actionMan( TQT_TQWIDGET(tqparent()) ); + ActionMan actionMan( TQT_TQWIDGET(parent()) ); } diff --git a/krusader/Konfigurator/kguseractions.h b/krusader/Konfigurator/kguseractions.h index e6e396c..7a247ca 100644 --- a/krusader/Konfigurator/kguseractions.h +++ b/krusader/Konfigurator/kguseractions.h @@ -43,7 +43,7 @@ class KgUserActions : public KonfiguratorPage TQ_OBJECT public: - KgUserActions( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgUserActions( bool first, TQWidget* parent=0, const char* name=0 ); public slots: void startActionMan(); diff --git a/krusader/Konfigurator/kgwelcome.cpp b/krusader/Konfigurator/kgwelcome.cpp index 07ee63b..15ae7a6 100644 --- a/krusader/Konfigurator/kgwelcome.cpp +++ b/krusader/Konfigurator/kgwelcome.cpp @@ -31,16 +31,16 @@ #include "kgwelcome.h" #include <kstandarddirs.h> -KgWelcome::KgWelcome( bool first, TQWidget* tqparent, const char* name ) : - KonfiguratorPage( first, tqparent, name ) +KgWelcome::KgWelcome( bool first, TQWidget* parent, const char* name ) : + KonfiguratorPage( first, parent, name ) { - TQGridLayout *kgWelcomeLayout = new TQGridLayout( tqparent ); + TQGridLayout *kgWelcomeLayout = new TQGridLayout( parent ); kgWelcomeLayout->setSpacing( 6 ); TQString pix=KGlobal::dirs()->findResource("appdata","konfig_small.jpg"); TQPixmap image0( pix ); - TQLabel *pixmapLabel = new TQLabel( tqparent, "pixmapLabel" ); + TQLabel *pixmapLabel = new TQLabel( parent, "pixmapLabel" ); pixmapLabel->setPixmap( image0 ); pixmapLabel->setScaledContents( TRUE ); diff --git a/krusader/Konfigurator/kgwelcome.h b/krusader/Konfigurator/kgwelcome.h index 204037d..7117797 100644 --- a/krusader/Konfigurator/kgwelcome.h +++ b/krusader/Konfigurator/kgwelcome.h @@ -39,7 +39,7 @@ class KgWelcome : public KonfiguratorPage TQ_OBJECT public: - KgWelcome( bool first, TQWidget* tqparent=0, const char* name=0 ); + KgWelcome( bool first, TQWidget* parent=0, const char* name=0 ); }; #endif /* __KGWELCOME_H__ */ diff --git a/krusader/Konfigurator/konfiguratoritems.cpp b/krusader/Konfigurator/konfiguratoritems.cpp index 4e2d5c4..0fd922d 100644 --- a/krusader/Konfigurator/konfiguratoritems.cpp +++ b/krusader/Konfigurator/konfiguratoritems.cpp @@ -92,7 +92,7 @@ bool KonfiguratorExtension::isChanged() /////////////////////////////// KonfiguratorCheckBox::KonfiguratorCheckBox( TQString cls, TQString name, bool dflt, TQString text, - TQWidget *tqparent, const char *widgetName, bool rst, int pg ) : TQCheckBox( text, tqparent, widgetName ), + TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQCheckBox( text, parent, widgetName ), defaultValue( dflt ) { ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); @@ -132,7 +132,7 @@ void KonfiguratorCheckBox::slotSetDefaults(TQObject *) /////////////////////////////// KonfiguratorSpinBox::KonfiguratorSpinBox( TQString cls, TQString name, int dflt, int min, int max, - TQWidget *tqparent, const char *widgetName, bool rst, int pg ) : TQSpinBox( tqparent, widgetName ), + TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQSpinBox( parent, widgetName ), defaultValue( dflt ) { ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); @@ -204,8 +204,8 @@ KonfiguratorCheckBox * KonfiguratorCheckBoxGroup::find( TQString name ) /////////////////////////////// KonfiguratorRadioButtons::KonfiguratorRadioButtons( TQString cls, TQString name, - TQString dflt, TQWidget *tqparent, const char *widgetName, bool rst, int pg ) : - TQButtonGroup( tqparent, widgetName ), defaultValue( dflt ) + TQString dflt, TQWidget *parent, const char *widgetName, bool rst, int pg ) : + TQButtonGroup( parent, widgetName ), defaultValue( dflt ) { ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); connect( ext, TQT_SIGNAL( applyAuto(TQObject *,TQString, TQString) ), TQT_TQOBJECT(this), TQT_SLOT( slotApply(TQObject *,TQString, TQString) ) ); @@ -299,7 +299,7 @@ void KonfiguratorRadioButtons::slotSetDefaults(TQObject *) /////////////////////////////// KonfiguratorEditBox::KonfiguratorEditBox( TQString cls, TQString name, TQString dflt, - TQWidget *tqparent, const char *widgetName, bool rst, int pg ) : TQLineEdit( tqparent, widgetName ), + TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQLineEdit( parent, widgetName ), defaultValue( dflt ) { ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); @@ -341,7 +341,7 @@ void KonfiguratorEditBox::slotSetDefaults(TQObject *) /////////////////////////////// KonfiguratorURLRequester::KonfiguratorURLRequester( TQString cls, TQString name, TQString dflt, - TQWidget *tqparent, const char *widgetName, bool rst, int pg ) : KURLRequester( tqparent, widgetName ), + TQWidget *parent, const char *widgetName, bool rst, int pg ) : KURLRequester( parent, widgetName ), defaultValue( dflt ) { ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); @@ -383,7 +383,7 @@ void KonfiguratorURLRequester::slotSetDefaults(TQObject *) /////////////////////////////// KonfiguratorFontChooser::KonfiguratorFontChooser( TQString cls, TQString name, TQFont *dflt, - TQWidget *tqparent, const char *widgetName, bool rst, int pg ) : TQHBox ( tqparent, widgetName ), + TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQHBox ( parent, widgetName ), defaultValue( dflt ) { ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); @@ -446,8 +446,8 @@ void KonfiguratorFontChooser::slotBrowseFont() /////////////////////////////// KonfiguratorComboBox::KonfiguratorComboBox( TQString cls, TQString name, TQString dflt, - KONFIGURATOR_NAME_VALUE_PAIR *listIn, int listInLen, TQWidget *tqparent, - const char *widgetName, bool rst, bool editable, int pg ) : TQComboBox ( tqparent, widgetName ), + KONFIGURATOR_NAME_VALUE_PAIR *listIn, int listInLen, TQWidget *parent, + const char *widgetName, bool rst, bool editable, int pg ) : TQComboBox ( parent, widgetName ), defaultValue( dflt ), listLen( listInLen ) { list = new KONFIGURATOR_NAME_VALUE_PAIR[ listInLen ]; @@ -525,8 +525,8 @@ void KonfiguratorComboBox::slotSetDefaults(TQObject *) /////////////////////////////// KonfiguratorColorChooser::KonfiguratorColorChooser( TQString cls, TQString name, TQColor dflt, - TQWidget *tqparent, const char *widgetName, bool rst, ADDITIONAL_COLOR *addColPtr, - int addColNum, int pg ) : TQComboBox ( tqparent, widgetName ), + TQWidget *parent, const char *widgetName, bool rst, ADDITIONAL_COLOR *addColPtr, + int addColNum, int pg ) : TQComboBox ( parent, widgetName ), defaultValue( dflt ), disableColorChooser( true ) { ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); @@ -739,7 +739,7 @@ TQColor KonfiguratorColorChooser::getColor() /////////////////////////////// KonfiguratorListBox::KonfiguratorListBox( TQString cls, TQString name, TQStringList dflt, - TQWidget *tqparent, const char *widgetName, bool rst, int pg ) : TQListBox( tqparent, widgetName ), + TQWidget *parent, const char *widgetName, bool rst, int pg ) : TQListBox( parent, widgetName ), defaultValue( dflt ) { ext = new KonfiguratorExtension( TQT_TQOBJECT(this), cls, name, rst, pg ); diff --git a/krusader/Konfigurator/konfiguratoritems.h b/krusader/Konfigurator/konfiguratoritems.h index 83d2812..d34614a 100644 --- a/krusader/Konfigurator/konfiguratoritems.h +++ b/krusader/Konfigurator/konfiguratoritems.h @@ -110,7 +110,7 @@ class KonfiguratorCheckBox : public TQCheckBox public: KonfiguratorCheckBox( TQString cls, TQString name, bool dflt, TQString text, - TQWidget *tqparent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); + TQWidget *parent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); ~KonfiguratorCheckBox(); inline KonfiguratorExtension *extension() {return ext;} @@ -135,7 +135,7 @@ class KonfiguratorSpinBox : public TQSpinBox public: KonfiguratorSpinBox( TQString cls, TQString name, int dflt, int min, int max, - TQWidget *tqparent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); + TQWidget *parent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); ~KonfiguratorSpinBox(); inline KonfiguratorExtension *extension() {return ext;} @@ -156,8 +156,8 @@ protected: class KonfiguratorCheckBoxGroup : public TQWidget { public: - KonfiguratorCheckBoxGroup( TQWidget * tqparent = 0, const char * name = 0 ) : - TQWidget( tqparent, name ) {}; + KonfiguratorCheckBoxGroup( TQWidget * parent = 0, const char * name = 0 ) : + TQWidget( parent, name ) {}; void add( KonfiguratorCheckBox * ); KonfiguratorCheckBox * find( int index ); @@ -176,7 +176,7 @@ class KonfiguratorRadioButtons : public TQButtonGroup TQ_OBJECT public: - KonfiguratorRadioButtons( TQString cls, TQString name, TQString dflt, TQWidget *tqparent=0, + KonfiguratorRadioButtons( TQString cls, TQString name, TQString dflt, TQWidget *parent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); ~KonfiguratorRadioButtons(); @@ -214,7 +214,7 @@ class KonfiguratorEditBox : public TQLineEdit TQ_OBJECT public: - KonfiguratorEditBox( TQString cls, TQString name, TQString dflt, TQWidget *tqparent=0, + KonfiguratorEditBox( TQString cls, TQString name, TQString dflt, TQWidget *parent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); ~KonfiguratorEditBox(); @@ -240,7 +240,7 @@ class KonfiguratorURLRequester : public KURLRequester TQ_OBJECT public: - KonfiguratorURLRequester( TQString cls, TQString name, TQString dflt, TQWidget *tqparent=0, + KonfiguratorURLRequester( TQString cls, TQString name, TQString dflt, TQWidget *parent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); ~KonfiguratorURLRequester(); @@ -265,7 +265,7 @@ class KonfiguratorFontChooser : public TQHBox TQ_OBJECT public: - KonfiguratorFontChooser( TQString cls, TQString name, TQFont *dflt, TQWidget *tqparent=0, + KonfiguratorFontChooser( TQString cls, TQString name, TQFont *dflt, TQWidget *parent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); ~KonfiguratorFontChooser(); @@ -318,7 +318,7 @@ class KonfiguratorComboBox : public TQComboBox public: KonfiguratorComboBox( TQString cls, TQString name, TQString dflt, KONFIGURATOR_NAME_VALUE_PAIR *listIn, int listInLen, - TQWidget *tqparent=0, const char *widgetName=0, + TQWidget *parent=0, const char *widgetName=0, bool rst=false, bool editable=false, int pg=FIRST_PAGE ); ~KonfiguratorComboBox(); @@ -356,7 +356,7 @@ class KonfiguratorColorChooser : public TQComboBox public: KonfiguratorColorChooser( TQString cls, TQString name, TQColor dflt, - TQWidget *tqparent=0, const char *widgetName=0, bool rst=false, + TQWidget *parent=0, const char *widgetName=0, bool rst=false, ADDITIONAL_COLOR *addColPtr = 0, int addColNum = 0, int pg=FIRST_PAGE ); ~KonfiguratorColorChooser(); @@ -402,7 +402,7 @@ class KonfiguratorListBox : public TQListBox public: KonfiguratorListBox( TQString cls, TQString name, TQStringList dflt, - TQWidget *tqparent=0, const char *widgetName=0, + TQWidget *parent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); ~KonfiguratorListBox(); diff --git a/krusader/Konfigurator/konfiguratorpage.cpp b/krusader/Konfigurator/konfiguratorpage.cpp index c081e3e..0ae9e3d 100644 --- a/krusader/Konfigurator/konfiguratorpage.cpp +++ b/krusader/Konfigurator/konfiguratorpage.cpp @@ -33,8 +33,8 @@ #include "../krusader.h" #include <tqwhatsthis.h> -KonfiguratorPage::KonfiguratorPage( bool firstTime, TQWidget* tqparent, const char* name ) : - TQFrame( tqparent, name ), firstCall( firstTime ) +KonfiguratorPage::KonfiguratorPage( bool firstTime, TQWidget* parent, const char* name ) : + TQFrame( parent, name ), firstCall( firstTime ) { } @@ -96,10 +96,10 @@ bool KonfiguratorPage::isChanged() } KonfiguratorCheckBox* KonfiguratorPage::createCheckBox( TQString cls, TQString name, - bool dflt, TQString text, TQWidget *tqparent, bool rst, TQString toolTip, int pg ) + bool dflt, TQString text, TQWidget *parent, bool rst, TQString toolTip, int pg ) { KonfiguratorCheckBox *checkBox = new KonfiguratorCheckBox( cls, name, dflt, text, - tqparent, TQString(cls + "/" + name).ascii(), rst, pg ); + parent, TQString(cls + "/" + name).ascii(), rst, pg ); if( !toolTip.isEmpty() ) TQWhatsThis::add( checkBox, toolTip ); @@ -108,19 +108,19 @@ KonfiguratorCheckBox* KonfiguratorPage::createCheckBox( TQString cls, TQString n } KonfiguratorSpinBox* KonfiguratorPage::createSpinBox( TQString cls, TQString name, - int dflt, int min, int max, TQWidget *tqparent, bool rst, int pg ) + int dflt, int min, int max, TQWidget *parent, bool rst, int pg ) { KonfiguratorSpinBox *spinBox = new KonfiguratorSpinBox( cls, name, dflt, min, max, - tqparent, TQString(cls + "/" + name).ascii(), rst, pg ); + parent, TQString(cls + "/" + name).ascii(), rst, pg ); registerObject( spinBox->extension() ); return spinBox; } KonfiguratorEditBox* KonfiguratorPage::createEditBox( TQString cls, TQString name, - TQString dflt, TQWidget *tqparent, bool rst, int pg ) + TQString dflt, TQWidget *parent, bool rst, int pg ) { - KonfiguratorEditBox *editBox = new KonfiguratorEditBox( cls, name, dflt, tqparent, + KonfiguratorEditBox *editBox = new KonfiguratorEditBox( cls, name, dflt, parent, TQString(cls + "/" + name).ascii(), rst, pg ); registerObject( editBox->extension() ); @@ -128,9 +128,9 @@ KonfiguratorEditBox* KonfiguratorPage::createEditBox( TQString cls, TQString na } KonfiguratorListBox* KonfiguratorPage::createListBox( TQString cls, TQString name, - TQStringList dflt, TQWidget *tqparent, bool rst, int pg ) + TQStringList dflt, TQWidget *parent, bool rst, int pg ) { - KonfiguratorListBox *listBox = new KonfiguratorListBox( cls, name, dflt, tqparent, + KonfiguratorListBox *listBox = new KonfiguratorListBox( cls, name, dflt, parent, TQString(cls + "/" + name).ascii(), rst, pg ); registerObject( listBox->extension() ); @@ -138,19 +138,19 @@ KonfiguratorListBox* KonfiguratorPage::createListBox( TQString cls, TQString na } KonfiguratorURLRequester* KonfiguratorPage::createURLRequester( TQString cls, TQString name, - TQString dflt, TQWidget *tqparent, bool rst, int pg ) + TQString dflt, TQWidget *parent, bool rst, int pg ) { KonfiguratorURLRequester *urlRequester = new KonfiguratorURLRequester( cls, name, dflt, - tqparent, TQString(cls + "/" + name).ascii(), rst, pg ); + parent, TQString(cls + "/" + name).ascii(), rst, pg ); registerObject( urlRequester->extension() ); return urlRequester; } -TQGroupBox* KonfiguratorPage::createFrame( TQString text, TQWidget *tqparent, +TQGroupBox* KonfiguratorPage::createFrame( TQString text, TQWidget *parent, const char *widgetName ) { - TQGroupBox *groupBox = new TQGroupBox( tqparent, widgetName ); + TQGroupBox *groupBox = new TQGroupBox( parent, widgetName ); groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); if( !text.isNull() ) @@ -161,9 +161,9 @@ TQGroupBox* KonfiguratorPage::createFrame( TQString text, TQWidget *tqparent, return groupBox; } -TQGridLayout* KonfiguratorPage::createGridLayout( TQLayout *tqparent ) +TQGridLayout* KonfiguratorPage::createGridLayout( TQLayout *parent ) { - TQGridLayout *gridLayout = new TQGridLayout( tqparent ); + TQGridLayout *gridLayout = new TQGridLayout( parent ); gridLayout->tqsetAlignment( TQt::AlignTop ); gridLayout->setSpacing( 6 ); gridLayout->setMargin( 11 ); @@ -171,16 +171,16 @@ TQGridLayout* KonfiguratorPage::createGridLayout( TQLayout *tqparent ) } TQLabel* KonfiguratorPage::addLabel( TQGridLayout *tqlayout, int x, int y, TQString label, - TQWidget *tqparent, const char *widgetName ) + TQWidget *parent, const char *widgetName ) { - TQLabel *lbl = new TQLabel( label, tqparent, widgetName ); + TQLabel *lbl = new TQLabel( label, parent, widgetName ); tqlayout->addWidget( lbl, x, y ); return lbl; } -TQWidget* KonfiguratorPage::createSpacer( TQWidget *tqparent, const char *widgetName ) +TQWidget* KonfiguratorPage::createSpacer( TQWidget *parent, const char *widgetName ) { - TQWidget *widget = new TQWidget( tqparent, widgetName ); + TQWidget *widget = new TQWidget( parent, widgetName ); TQHBoxLayout *hboxtqlayout = new TQHBoxLayout( widget ); TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); hboxtqlayout->addItem( spacer ); @@ -188,10 +188,10 @@ TQWidget* KonfiguratorPage::createSpacer( TQWidget *tqparent, const char *widget } KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup( int sizex, int sizey, - KONFIGURATOR_CHECKBOX_PARAM *params, int paramNum, TQWidget *tqparent, + KONFIGURATOR_CHECKBOX_PARAM *params, int paramNum, TQWidget *parent, const char *widgetName, int pg ) { - KonfiguratorCheckBoxGroup *groupWidget = new KonfiguratorCheckBoxGroup( tqparent, widgetName ); + KonfiguratorCheckBoxGroup *groupWidget = new KonfiguratorCheckBoxGroup( parent, widgetName ); TQGridLayout *tqlayout = new TQGridLayout( groupWidget ); tqlayout->setSpacing( 6 ); tqlayout->setMargin( 0 ); @@ -224,9 +224,9 @@ KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup( int sizex, int KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls, TQString name, TQString dflt, int sizex, int sizey, KONFIGURATOR_NAME_VALUE_TIP *params, - int paramNum, TQWidget *tqparent, const char *widgetName, bool rst, int pg ) + int paramNum, TQWidget *parent, const char *widgetName, bool rst, int pg ) { - KonfiguratorRadioButtons *radioWidget = new KonfiguratorRadioButtons( cls, name, dflt, tqparent, widgetName, rst, pg ); + KonfiguratorRadioButtons *radioWidget = new KonfiguratorRadioButtons( cls, name, dflt, parent, widgetName, rst, pg ); radioWidget->setFrameShape( TQButtonGroup::NoFrame ); radioWidget->setFrameShadow( TQButtonGroup::Sunken ); radioWidget->setTitle( "" ); @@ -271,9 +271,9 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls } KonfiguratorFontChooser *KonfiguratorPage::createFontChooser( TQString cls, TQString name, - TQFont *dflt, TQWidget *tqparent, bool rst, int pg ) + TQFont *dflt, TQWidget *parent, bool rst, int pg ) { - KonfiguratorFontChooser *fontChooser = new KonfiguratorFontChooser( cls, name, dflt, tqparent, + KonfiguratorFontChooser *fontChooser = new KonfiguratorFontChooser( cls, name, dflt, parent, TQString(cls + "/" + name).ascii(), rst, pg ); registerObject( fontChooser->extension() ); @@ -281,19 +281,19 @@ KonfiguratorFontChooser *KonfiguratorPage::createFontChooser( TQString cls, TQSt } KonfiguratorComboBox *KonfiguratorPage::createComboBox( TQString cls, TQString name, TQString dflt, - KONFIGURATOR_NAME_VALUE_PAIR *params, int paramNum, TQWidget *tqparent, bool rst, bool editable, int pg ) + KONFIGURATOR_NAME_VALUE_PAIR *params, int paramNum, TQWidget *parent, bool rst, bool editable, int pg ) { KonfiguratorComboBox *comboBox = new KonfiguratorComboBox( cls, name, dflt, params, - paramNum, tqparent, TQString(cls + "/" + name).ascii(), + paramNum, parent, TQString(cls + "/" + name).ascii(), rst, editable, pg ); registerObject( comboBox->extension() ); return comboBox; } -TQFrame* KonfiguratorPage::createLine( TQWidget *tqparent, const char *widgetName, bool vertical ) +TQFrame* KonfiguratorPage::createLine( TQWidget *parent, const char *widgetName, bool vertical ) { - TQFrame *line = new TQFrame( tqparent, widgetName ); + TQFrame *line = new TQFrame( parent, widgetName ); line->setFrameStyle( ( vertical ? TQFrame::VLine : TQFrame::HLine ) | TQFrame::Sunken ); return line; } @@ -321,10 +321,10 @@ void KonfiguratorPage::removeObject( KonfiguratorExtension *item ) } KonfiguratorColorChooser *KonfiguratorPage::createColorChooser( TQString cls, TQString name, TQColor dflt, - TQWidget *tqparent, bool rst, + TQWidget *parent, bool rst, ADDITIONAL_COLOR *addColPtr, int addColNum, int pg ) { - KonfiguratorColorChooser *colorChooser = new KonfiguratorColorChooser( cls, name, dflt, tqparent, + KonfiguratorColorChooser *colorChooser = new KonfiguratorColorChooser( cls, name, dflt, parent, TQString(cls + "/" + name).ascii(), rst, addColPtr, addColNum, pg ); registerObject( colorChooser->extension() ); diff --git a/krusader/Konfigurator/konfiguratorpage.h b/krusader/Konfigurator/konfiguratorpage.h index 7486e88..5717acb 100644 --- a/krusader/Konfigurator/konfiguratorpage.h +++ b/krusader/Konfigurator/konfiguratorpage.h @@ -58,10 +58,10 @@ public: * The constructor of the KonfiguratorPage class. * * @param firstTime this parameter is true if it is the first call of Konfigurator - * @param tqparent reference to the tqparent widget + * @param parent reference to the parent widget * @param name name of the newly generated Konfigurator page widget */ - KonfiguratorPage( bool firstTime, TQWidget* tqparent, const char* name ); + KonfiguratorPage( bool firstTime, TQWidget* parent, const char* name ); /** * Applies the changes in the Konfigurator page. @@ -127,7 +127,7 @@ public: * @param name The item name used in KConfig (ex. "Do Tar") * @param dflt The default value of the checkbox * @param text The text field of the checkbox - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param rst The change of this parameter requires Krusader restart * @param toolTip Tooltip used for this checkbox * @param pg The subpage of a Konfigurator page (because of setDefaults) @@ -135,7 +135,7 @@ public: * @return reference to the newly created checkbox */ KonfiguratorCheckBox *createCheckBox( TQString cls, TQString name, bool dflt, - TQString text, TQWidget *tqparent=0, bool rst=false, + TQString text, TQWidget *parent=0, bool rst=false, TQString toolTip = TQString(), int pg=FIRST_PAGE ); /** @@ -151,14 +151,14 @@ public: * @param dflt The default value of the spinbox * @param min The minimum value of the spinbox * @param max The maximum value of the spinbox - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param rst The change of this parameter requires Krusader restart * @param pg The subpage of a Konfigurator page (because of setDefaults) * * @return reference to the newly created spinbox */ KonfiguratorSpinBox *createSpinBox( TQString cls, TQString name, int dflt, int min, - int max, TQWidget *tqparent = 0, bool rst = false, int pg=FIRST_PAGE ); + int max, TQWidget *parent = 0, bool rst = false, int pg=FIRST_PAGE ); /** * Adds a new editbox item to the page. @@ -171,14 +171,14 @@ public: * @param cls The class name used in KConfig (ex. "Archives") * @param name The itemname used in KConfig (ex. "Do Tar") * @param dflt The default value of the editbox - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param rst The change of this parameter requires Krusader restart * @param pg The subpage of a Konfigurator page (because of setDefaults) * * @return reference to the newly created editbox */ KonfiguratorEditBox *createEditBox( TQString cls, TQString name, TQString dflt, - TQWidget *tqparent=0, bool rst=false, int pg=FIRST_PAGE ); + TQWidget *parent=0, bool rst=false, int pg=FIRST_PAGE ); /** * Adds a new listbox item to the page. @@ -193,14 +193,14 @@ public: * @param cls The class name used in KConfig (ex. "Archives") * @param name The itemname used in KConfig (ex. "Do Tar") * @param dflt The default value of the listbox - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param rst The change of this parameter requires Krusader restart * @param pg The subpage of a Konfigurator page (because of setDefaults) * * @return reference to the newly created editbox */ KonfiguratorListBox *createListBox( TQString cls, TQString name, TQStringList dflt, - TQWidget *tqparent=0, bool rst=false, int pg=FIRST_PAGE ); + TQWidget *parent=0, bool rst=false, int pg=FIRST_PAGE ); /** * Adds a new URL requester item to the page. @@ -214,14 +214,14 @@ public: * @param name The itemname used in KConfig (ex. "Do Tar") * @param dflt The default value of the URL requester * @param text The text field of the URL requester - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param rst The change of this parameter requires Krusader restart * @param pg The subpage of a Konfigurator page (because of setDefaults) * * @return reference to the newly created URL requester */ KonfiguratorURLRequester *createURLRequester( TQString cls, TQString name, - TQString dflt, TQWidget *tqparent, bool rst, int pg=FIRST_PAGE ); + TQString dflt, TQWidget *parent, bool rst, int pg=FIRST_PAGE ); /** * Adds a new font chooser item to the page. @@ -234,14 +234,14 @@ public: * @param cls The class name used in KConfig (ex. "Archives") * @param name The item name used in KConfig (ex. "Do Tar") * @param dflt The default value of the font chooser - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param rst The change of this parameter requires Krusader restart * @param pg The subpage of a Konfigurator page (because of setDefaults) * * @return reference to the newly created font chooser */ KonfiguratorFontChooser *createFontChooser( TQString cls, TQString name, TQFont *dflt, - TQWidget *tqparent=0, bool rst=false, int pg=FIRST_PAGE ); + TQWidget *parent=0, bool rst=false, int pg=FIRST_PAGE ); /** * Adds a new combobox item to the page. @@ -261,7 +261,7 @@ public: * @param params Pointer to the name-value pair array (combo elements) * @param paramNum Number of the combobox elements * @param text The text field of the combobox - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param rst The change of this parameter requires Krusader restart * @param editable Flag indicates that the combo can be edited * @param pg The subpage of a Konfigurator page (because of setDefaults) @@ -270,7 +270,7 @@ public: */ KonfiguratorComboBox *createComboBox( TQString cls, TQString name, TQString dflt, KONFIGURATOR_NAME_VALUE_PAIR *params, int paramNum, - TQWidget *tqparent=0, bool rst=false, bool editable=false, int pg=FIRST_PAGE ); + TQWidget *parent=0, bool rst=false, bool editable=false, int pg=FIRST_PAGE ); /** * Creates a frame on the page. @@ -280,12 +280,12 @@ public: * myLayout->addWidget( myGroup, 0, 0 ); * * @param text The text written out onto the frame - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param widgetName The name of the widget * * @return reference to the newly created frame */ - TQGroupBox *createFrame( TQString text = TQString(), TQWidget *tqparent=0, + TQGroupBox *createFrame( TQString text = TQString(), TQWidget *parent=0, const char *widgetName=0 ); /** @@ -296,11 +296,11 @@ public: * TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );<br> * myLayout->addWidget( myGroup, 0, 0 ); * - * @param tqparent Reference to the tqparent tqlayout + * @param parent Reference to the parent tqlayout * * @return reference to the newly created TQGridLayout */ - TQGridLayout *createGridLayout( TQLayout *tqparent ); + TQGridLayout *createGridLayout( TQLayout *parent ); /** * Adds a new label to a grid tqlayout. @@ -315,13 +315,13 @@ public: * @param x the column to which the label will be placed * @param y the row to which the label will be placed * @param label the text of the label - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param widgetName The name of the newly generated label widget * * @return reference to the newly created label */ TQLabel *addLabel( TQGridLayout *tqlayout, int x, int y, TQString label, - TQWidget *tqparent=0, const char *widgetName=0 ); + TQWidget *parent=0, const char *widgetName=0 ); /** * Creates a spacer object (for justifying in TQHBox). @@ -332,12 +332,12 @@ public: * createSpacer( hbox, "mySpacer" );<br> * myLayout->addWidget( hbox, 0, 0 ); * - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param widgetName The name of the newly generated label widget * * @return reference to the newly created spacer widget */ - TQWidget *createSpacer( TQWidget *tqparent=0, const char *widgetName=0 ); + TQWidget *createSpacer( TQWidget *parent=0, const char *widgetName=0 ); /** * Creates a separator line. @@ -346,13 +346,13 @@ public: * TQFrame *myLine = createLine( myParent, "myLine" );<br> * myLayout->addWidget( myLine, 1, 0 );<br> * - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param widgetName The name of the newly generated label widget * @param vertical Means vertical line * * @return reference to the newly created spacer widget */ - TQFrame *createLine( TQWidget *tqparent=0, const char *widgetName=0, bool vertical = false ); + TQFrame *createLine( TQWidget *parent=0, const char *widgetName=0, bool vertical = false ); /** * Creates a checkbox group. A checkbox group contains a lot of checkboxes. @@ -378,7 +378,7 @@ public: * @param sizey the maximum row number at vertical placing * @param params pointer to the checkbox array * @param paramNum number of the checkbox elements - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param widgetName The name of the newly created checkbox group widget * @param pg The subpage of a Konfigurator page (because of setDefaults) * @@ -386,7 +386,7 @@ public: */ KonfiguratorCheckBoxGroup *createCheckBoxGroup( int sizex, int sizey, KONFIGURATOR_CHECKBOX_PARAM *params, int paramNum, - TQWidget *tqparent=0, const char *widgetName=0, int pg=FIRST_PAGE ); + TQWidget *parent=0, const char *widgetName=0, int pg=FIRST_PAGE ); /** * Creates a radio button group. A radio button group contains a lot of radio buttons. * The grouped buttons are embedded into one widget, which can be placed anywhere @@ -414,7 +414,7 @@ public: * @param sizey the maximum row number at vertical placing * @param params pointer to the checkbox array * @param paramNum number of the checkbox elements - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param widgetName The name of the newly created button group widget * @param rst The change of this parameter requires Krusader restart * @param pg The subpage of a Konfigurator page (because of setDefaults) @@ -424,7 +424,7 @@ public: KonfiguratorRadioButtons *createRadioButtonGroup( TQString cls, TQString name, TQString dflt, int sizex, int sizey, KONFIGURATOR_NAME_VALUE_TIP *params, int paramNum, - TQWidget *tqparent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); + TQWidget *parent=0, const char *widgetName=0, bool rst=false, int pg=FIRST_PAGE ); /** * This function is used to insert new, unknown items into KonfiguratorPage. The @@ -463,7 +463,7 @@ public: * @param cls The class name used in KConfig (ex. "Archives") * @param name The item name used in KConfig (ex. "Do Tar") * @param dflt The default value of the color chooser - * @param tqparent Reference to the tqparent widget + * @param parent Reference to the parent widget * @param rst The change of this parameter requires Krusader restart * @param addColPtr The additional color values * @param rst Number of additional colors @@ -472,7 +472,7 @@ public: * @return reference to the newly created combobox */ KonfiguratorColorChooser *createColorChooser( TQString cls, TQString name, TQColor dflt, - TQWidget *tqparent=0, bool rst=false, + TQWidget *parent=0, bool rst=false, ADDITIONAL_COLOR *addColPtr = 0, int addColNum = 0, int pg=FIRST_PAGE ); signals: /** diff --git a/krusader/Konfigurator/krresulttable.cpp b/krusader/Konfigurator/krresulttable.cpp index fb7d765..ff46a7f 100644 --- a/krusader/Konfigurator/krresulttable.cpp +++ b/krusader/Konfigurator/krresulttable.cpp @@ -34,8 +34,8 @@ using namespace std; #define PS(x) _supported.contains(x)>0 -KrResultTable::KrResultTable(TQWidget* tqparent) - : TQWidget(tqparent), +KrResultTable::KrResultTable(TQWidget* parent) + : TQWidget(parent), _numRows(1) { } @@ -94,8 +94,8 @@ void KrResultTable::adjustRow(TQGridLayout* grid) // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -KrArchiverResultTable::KrArchiverResultTable(TQWidget* tqparent) - : KrResultTable(tqparent) +KrArchiverResultTable::KrArchiverResultTable(TQWidget* parent) + : KrResultTable(parent) { _supported = KRarcHandler::supportedPackers(); // get list of available packers @@ -241,8 +241,8 @@ void KrArchiverResultTable::website(const TQString& url) // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -KrToolResultTable::KrToolResultTable(TQWidget* tqparent) - : KrResultTable(tqparent) +KrToolResultTable::KrToolResultTable(TQWidget* parent) + : KrResultTable(parent) { _supported = Krusader::supportedTools(); // get list of available tools diff --git a/krusader/Konfigurator/krresulttable.h b/krusader/Konfigurator/krresulttable.h index c149a67..0e6729f 100644 --- a/krusader/Konfigurator/krresulttable.h +++ b/krusader/Konfigurator/krresulttable.h @@ -59,7 +59,7 @@ class KrResultTable : public TQWidget { public: - KrResultTable(TQWidget* tqparent); + KrResultTable(TQWidget* parent); virtual ~KrResultTable(); /** @@ -107,7 +107,7 @@ class KrArchiverResultTable : public KrResultTable Q_OBJECT TQ_OBJECT public: - KrArchiverResultTable(TQWidget* tqparent); + KrArchiverResultTable(TQWidget* parent); virtual ~KrArchiverResultTable(); bool addRow(SearchObject* search, TQGridLayout* grid); @@ -127,7 +127,7 @@ class KrToolResultTable : public KrResultTable Q_OBJECT TQ_OBJECT public: - KrToolResultTable(TQWidget* tqparent); + KrToolResultTable(TQWidget* parent); virtual ~KrToolResultTable(); bool addRow(SearchObject* search, TQGridLayout* grid); diff --git a/krusader/Konfigurator/krresulttabledialog.cpp b/krusader/Konfigurator/krresulttabledialog.cpp index f118ce7..179099a 100644 --- a/krusader/Konfigurator/krresulttabledialog.cpp +++ b/krusader/Konfigurator/krresulttabledialog.cpp @@ -30,10 +30,10 @@ #include "krresulttabledialog.h" -KrResultTableDialog::KrResultTableDialog( TQWidget *tqparent, DialogType type, +KrResultTableDialog::KrResultTableDialog( TQWidget *parent, DialogType type, const TQString& caption, const TQString& heading, const TQString& headerIcon, const TQString& hint) - : KDialogBase( tqparent, "KrSearchResultDialog", true, caption, KDialogBase::Help|KDialogBase::Ok, + : KDialogBase( parent, "KrSearchResultDialog", true, caption, KDialogBase::Help|KDialogBase::Ok, KDialogBase::Ok, false ) { diff --git a/krusader/Konfigurator/krresulttabledialog.h b/krusader/Konfigurator/krresulttabledialog.h index 1014282..28bbe65 100644 --- a/krusader/Konfigurator/krresulttabledialog.h +++ b/krusader/Konfigurator/krresulttabledialog.h @@ -60,7 +60,7 @@ public: Tool = 2 }; - KrResultTableDialog(TQWidget *tqparent, DialogType type, const TQString& caption, const TQString& heading, const TQString& headerIcon=TQString(), const TQString& hint=TQString()); + KrResultTableDialog(TQWidget *parent, DialogType type, const TQString& caption, const TQString& heading, const TQString& headerIcon=TQString(), const TQString& hint=TQString()); virtual ~KrResultTableDialog(); const TQString& getHeading() const { return _heading; } diff --git a/krusader/KrJS/krjs.cpp b/krusader/KrJS/krjs.cpp index bf69a34..cfb2326 100644 --- a/krusader/KrJS/krjs.cpp +++ b/krusader/KrJS/krjs.cpp @@ -60,7 +60,7 @@ bool KrJS::runFile(const TQString & filename) { krOut << "JavaScript: Uncaught " << type << " exception at line " << line << " in " << filename << endl; krOut << message << endl; - KMessageBox::error ( 0, //tqparent + KMessageBox::error ( 0, //parent ( line < 0 ? TQString( i18n("In %1:\nUncaught JavaScript exception '%2'\n%3") ).tqarg(filename).tqarg(type).tqarg(message) : TQString( i18n("In %1:\nUncaught JavaScript exception '%2' at line %3\n%4") ).tqarg(filename).tqarg(type).tqarg(line).tqarg(message) @@ -68,7 +68,7 @@ bool KrJS::runFile(const TQString & filename) { i18n("JavaScript error"), //caption KMessageBox::Dangerous) ; #else - KMessageBox::error ( 0, //tqparent + KMessageBox::error ( 0, //parent TQString(i18n("In %1:\nThere is an error in the JavaScript")).tqarg(filename), //text i18n("JavaScript error"), //caption KMessageBox::Dangerous) ; diff --git a/krusader/Locate/locate.cpp b/krusader/Locate/locate.cpp index b90b828..d4cc981 100755 --- a/krusader/Locate/locate.cpp +++ b/krusader/Locate/locate.cpp @@ -68,7 +68,7 @@ class LocateListView : public KListView { public: - LocateListView( TQWidget * tqparent, const char * name = 0 ) : KListView( tqparent, name ) + LocateListView( TQWidget * parent, const char * name = 0 ) : KListView( parent, name ) { } diff --git a/krusader/MountMan/kdiskfreesp.cpp b/krusader/MountMan/kdiskfreesp.cpp index 6648cd0..25de916 100644 --- a/krusader/MountMan/kdiskfreesp.cpp +++ b/krusader/MountMan/kdiskfreesp.cpp @@ -42,8 +42,8 @@ /*************************************************************************** * constructor **/ -KDiskFreeSp::KDiskFreeSp(TQObject *tqparent, const char *name) - : TQObject(tqparent,name) +KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) + : TQObject(parent,name) { dfProc = new KProcess(); Q_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); diff --git a/krusader/MountMan/kdiskfreesp.h b/krusader/MountMan/kdiskfreesp.h index f588aab..9a08997 100644 --- a/krusader/MountMan/kdiskfreesp.h +++ b/krusader/MountMan/kdiskfreesp.h @@ -40,7 +40,7 @@ class KDiskFreeSp : public TQObject { Q_OBJECT TQ_OBJECT public: - KDiskFreeSp( TQObject *tqparent=0, const char *name=0 ); + KDiskFreeSp( TQObject *parent=0, const char *name=0 ); /** * Destructor - this object autodeletes itself when it's done */ diff --git a/krusader/Panel/krbriefview.cpp b/krusader/Panel/krbriefview.cpp index 87d8005..3dd1743 100644 --- a/krusader/Panel/krbriefview.cpp +++ b/krusader/Panel/krbriefview.cpp @@ -50,7 +50,7 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD class KrBriefViewToolTip : public TQToolTip { public: - KrBriefViewToolTip( KrBriefView *view, TQWidget *tqparent ); + KrBriefViewToolTip( KrBriefView *view, TQWidget *parent ); void maybeTip( const TQPoint &pos ); virtual ~KrBriefViewToolTip() {} @@ -58,8 +58,8 @@ private: KrBriefView *view; }; -KrBriefViewToolTip::KrBriefViewToolTip( KrBriefView *lv, TQWidget *tqparent ) - : TQToolTip( tqparent ), view( lv ) +KrBriefViewToolTip::KrBriefViewToolTip( KrBriefView *lv, TQWidget *parent ) + : TQToolTip( parent ), view( lv ) { } @@ -79,8 +79,8 @@ void KrBriefViewToolTip::maybeTip( const TQPoint &pos ) } -KrBriefView::KrBriefView( TQHeader * headerIn, TQWidget *tqparent, bool &left, KConfig *cfg, const char *name ): - KIconView(tqparent, name), KrView( cfg ), header( headerIn ), _currDragItem( 0 ), +KrBriefView::KrBriefView( TQHeader * headerIn, TQWidget *parent, bool &left, KConfig *cfg, const char *name ): + KIconView(parent, name), KrView( cfg ), header( headerIn ), _currDragItem( 0 ), currentlyRenamedItem( 0 ), pressedItem( 0 ), mouseEvent( 0 ) { setWidget( this ); _nameInKConfig = TQString( "KrBriefView" ) + TQString( ( left ? "Left" : "Right" ) ); diff --git a/krusader/Panel/krbriefview.h b/krusader/Panel/krbriefview.h index b6cc745..3a1dc66 100644 --- a/krusader/Panel/krbriefview.h +++ b/krusader/Panel/krbriefview.h @@ -58,7 +58,7 @@ class KrBriefView: public KIconView, public KrView { Q_OBJECT TQ_OBJECT public: - KrBriefView( TQHeader *header, TQWidget *tqparent, bool &left, KConfig *cfg = krConfig, const char *name = 0 ); + KrBriefView( TQHeader *header, TQWidget *parent, bool &left, KConfig *cfg = krConfig, const char *name = 0 ); virtual ~KrBriefView(); virtual inline KrViewItem *getFirst() { return dynamic_cast<KrViewItem*>( firstItem() ); } virtual inline KrViewItem *getLast() { return dynamic_cast<KrViewItem*>( lastItem() ); } diff --git a/krusader/Panel/krbriefviewitem.cpp b/krusader/Panel/krbriefviewitem.cpp index fcb624d..6626ffe 100644 --- a/krusader/Panel/krbriefviewitem.cpp +++ b/krusader/Panel/krbriefviewitem.cpp @@ -17,8 +17,8 @@ int KrBriefViewItem::expHeight = 0; #endif // FASTER -KrBriefViewItem::KrBriefViewItem(KrBriefView *tqparent, TQIconViewItem *after, vfile *vf): - KIconViewItem(tqparent, after), KrViewItem(vf, tqparent->properties()) { +KrBriefViewItem::KrBriefViewItem(KrBriefView *parent, TQIconViewItem *after, vfile *vf): + KIconViewItem(parent, after), KrViewItem(vf, parent->properties()) { #ifdef FASTER initiated = false; // get the expected height of an item - should be done only once diff --git a/krusader/Panel/krbriefviewitem.h b/krusader/Panel/krbriefviewitem.h index 7455718..fd2f03a 100644 --- a/krusader/Panel/krbriefviewitem.h +++ b/krusader/Panel/krbriefviewitem.h @@ -46,7 +46,7 @@ class KrBriefViewItem : public KIconViewItem, public KrViewItem { friend class KrBriefView; friend class KrCalcSpaceDialog; public: - KrBriefViewItem(KrBriefView *tqparent, TQIconViewItem *after, vfile *vf); + KrBriefViewItem(KrBriefView *parent, TQIconViewItem *after, vfile *vf); inline bool isSelected() const { return KIconViewItem::isSelected(); } inline void setSelected(bool s) { KIconViewItem::setSelected(s); } inline void cancelRename() { removeRenameBox(); } diff --git a/krusader/Panel/krcalcspacedialog.cpp b/krusader/Panel/krcalcspacedialog.cpp index 56330b8..d8d3976 100644 --- a/krusader/Panel/krcalcspacedialog.cpp +++ b/krusader/Panel/krcalcspacedialog.cpp @@ -44,9 +44,9 @@ A #include "../VFS/krpermhandler.h" /* --=={ Patch by Heiner <[email protected]> }==-- */ -KrCalcSpaceDialog::CalcThread::CalcThread(KrCalcSpaceDialog * tqparent, ListPanel * panel, const TQStringList & items) +KrCalcSpaceDialog::CalcThread::CalcThread(KrCalcSpaceDialog * parent, ListPanel * panel, const TQStringList & items) : m_totalSize(0), m_currentSize(0), m_totalFiles(0), m_totalDirs(0), m_items(items), m_files(panel->func->files()), - m_view(panel->view), m_parent(tqparent), m_threadInUse(true), m_stop(false) {} + m_view(panel->view), m_parent(parent), m_threadInUse(true), m_stop(false) {} void KrCalcSpaceDialog::CalcThread::cleanUp(){ if (m_threadInUse || !finished()) @@ -91,8 +91,8 @@ void KrCalcSpaceDialog::CalcThread::stop(){ m_stop = true; } -KrCalcSpaceDialog::KrCalcSpaceDialog(TQWidget *tqparent, ListPanel * files, const TQStringList & items, bool autoclose) : - KDialogBase(tqparent, "KrCalcSpaceDialog", true, i18n("Calculate Occupied Space"), Ok|Cancel), +KrCalcSpaceDialog::KrCalcSpaceDialog(TQWidget *parent, ListPanel * files, const TQStringList & items, bool autoclose) : + KDialogBase(parent, "KrCalcSpaceDialog", true, i18n("Calculate Occupied Space"), Ok|Cancel), m_autoClose(autoclose), m_canceled(false), m_timerCounter(0){ // the dialog: The Ok button is hidden until it is needed showButtonOK(false); diff --git a/krusader/Panel/krcalcspacedialog.h b/krusader/Panel/krcalcspacedialog.h index 6410247..e1363d8 100644 --- a/krusader/Panel/krcalcspacedialog.h +++ b/krusader/Panel/krcalcspacedialog.h @@ -74,7 +74,7 @@ class KrCalcSpaceDialog : public KDialogBase{ unsigned long getTotalFiles() const {return m_totalFiles;} // the result unsigned long getTotalDirs() const {return m_totalDirs;} // the result const TQStringList & getItems() const {return m_items;} // list of directories to calculate - CalcThread(KrCalcSpaceDialog * tqparent, ListPanel * panel, const TQStringList & items); + CalcThread(KrCalcSpaceDialog * parent, ListPanel * panel, const TQStringList & items); void deleteInstance(); // thread is no longer needed. void run(); // start calculation void stop(); // stop it. Thread continues until vfs_calcSpace returns @@ -93,7 +93,7 @@ protected slots: void slotCancel(); // cancel was pressed public: // autoclose: wait 3 sec. before showing the dialog. Close it, when done - KrCalcSpaceDialog(TQWidget *tqparent, ListPanel * panel, const TQStringList & items, bool autoclose); + KrCalcSpaceDialog(TQWidget *parent, ListPanel * panel, const TQStringList & items, bool autoclose); ~KrCalcSpaceDialog(); KIO::filesize_t getTotalSize() const {return m_thread->getTotalSize();} // the result unsigned long getTotalFiles() const {return m_thread->getTotalFiles();} // the result diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp index 19b7080..cf0886f 100644 --- a/krusader/Panel/krdetailedview.cpp +++ b/krusader/Panel/krdetailedview.cpp @@ -87,8 +87,8 @@ YP YD 88 YD ~Y8888P' `8888Y' YP YP Y8888D' Y88888P 88 YD TQString KrDetailedView::ColumnName[ KrDetailedViewProperties::MAX_COLUMNS ]; -KrDetailedView::KrDetailedView( TQWidget *tqparent, bool &left, KConfig *cfg, const char *name ) : - KListView( tqparent, name ), KrView( cfg ), _currDragItem( 0L ), currentlyRenamedItem( 0 ), +KrDetailedView::KrDetailedView( TQWidget *parent, bool &left, KConfig *cfg, const char *name ) : + KListView( parent, name ), KrView( cfg ), _currDragItem( 0L ), currentlyRenamedItem( 0 ), pressedItem( 0 ) { setWidget( this ); _nameInKConfig=TQString( "KrDetailedView" ) + TQString( ( left ? "Left" : "Right" ) ) ; diff --git a/krusader/Panel/krdetailedview.h b/krusader/Panel/krdetailedview.h index 79b6f7c..531cdf3 100644 --- a/krusader/Panel/krdetailedview.h +++ b/krusader/Panel/krdetailedview.h @@ -75,7 +75,7 @@ class KrDetailedView : public KListView, public KrView { friend class KrDetailedViewItem; public: - KrDetailedView( TQWidget *tqparent, bool &left, KConfig *cfg = krConfig, const char *name = 0 ); + KrDetailedView( TQWidget *parent, bool &left, KConfig *cfg = krConfig, const char *name = 0 ); virtual ~KrDetailedView(); virtual int column( KrDetailedViewProperties::ColumnType type ); virtual inline KrViewItem *getFirst() { return dynamic_cast<KrViewItem*>( firstChild() ); } diff --git a/krusader/Panel/krdetailedviewitem.cpp b/krusader/Panel/krdetailedviewitem.cpp index 79be3e5..2a0da8e 100644 --- a/krusader/Panel/krdetailedviewitem.cpp +++ b/krusader/Panel/krdetailedviewitem.cpp @@ -57,8 +57,8 @@ int KrDetailedViewItem::expHeight = 0; #endif // FASTER -KrDetailedViewItem::KrDetailedViewItem(KrDetailedView *tqparent, TQListViewItem *after, vfile *vf): - KListViewItem(tqparent, after), KrViewItem(vf, tqparent->properties()) { +KrDetailedViewItem::KrDetailedViewItem(KrDetailedView *parent, TQListViewItem *after, vfile *vf): + KListViewItem(parent, after), KrViewItem(vf, parent->properties()) { #ifdef FASTER initiated = false; // get the expected height of an item - should be done only once diff --git a/krusader/Panel/krdetailedviewitem.h b/krusader/Panel/krdetailedviewitem.h index fe1bdad..07ee45b 100644 --- a/krusader/Panel/krdetailedviewitem.h +++ b/krusader/Panel/krdetailedviewitem.h @@ -46,7 +46,7 @@ class KrDetailedViewItem : public KListViewItem, public KrViewItem { friend class KrDetailedView; friend class KrCalcSpaceDialog; public: - KrDetailedViewItem(KrDetailedView *tqparent, TQListViewItem *after, vfile *vf); + KrDetailedViewItem(KrDetailedView *parent, TQListViewItem *after, vfile *vf); inline bool isSelected() const { return KListViewItem::isSelected(); } inline void setSelected(bool s) { KListViewItem::setSelected(s); } int compare(TQListViewItem *i,int col,bool ascending ) const; diff --git a/krusader/Panel/krpopupmenu.cpp b/krusader/Panel/krpopupmenu.cpp index 50a2a9c..13bbd57 100644 --- a/krusader/Panel/krpopupmenu.cpp +++ b/krusader/Panel/krpopupmenu.cpp @@ -38,7 +38,7 @@ void KrPopupMenu::run(const TQPoint &pos, ListPanel *panel) { menu.performAction(result); } -KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *tqparent) : KPopupMenu(tqparent), panel(thePanel), empty(false), +KrPopupMenu::KrPopupMenu(ListPanel *thePanel, TQWidget *parent) : KPopupMenu(parent), panel(thePanel), empty(false), multipleSelections(false),actions(0) { #ifdef __LIBKONTQ__ konqMenu = 0; diff --git a/krusader/Panel/krpopupmenu.h b/krusader/Panel/krpopupmenu.h index 8274a11..b2f3db4 100644 --- a/krusader/Panel/krpopupmenu.h +++ b/krusader/Panel/krpopupmenu.h @@ -20,7 +20,7 @@ public: static void run(const TQPoint &pos, ListPanel *panel); protected: - KrPopupMenu(ListPanel *thePanel, TQWidget *tqparent=0); + KrPopupMenu(ListPanel *thePanel, TQWidget *parent=0); ~KrPopupMenu(); void performAction(int id); void addEmptyMenuEntries(); // adds the choices for a menu without selected items diff --git a/krusader/Panel/krview.cpp b/krusader/Panel/krview.cpp index a997963..eab999c 100644 --- a/krusader/Panel/krview.cpp +++ b/krusader/Panel/krview.cpp @@ -119,10 +119,10 @@ TQPixmap KrView::getIcon( vfile *vf /*, KRListItem::cmpColor color*/ ) { * this function ADDs a list of selected item names into 'names'. * it assumes the list is ready and doesn't initialize it, or clears it */ -void KrView::getItemsByMask( TQString tqmask, TQStringList* names, bool dirs, bool files ) { +void KrView::getItemsByMask( TQString mask, TQStringList* names, bool dirs, bool files ) { for ( KrViewItem * it = getFirst(); it != 0; it = getNext( it ) ) { - if ( ( it->name() == ".." ) || !TQDir::match( tqmask, it->name() ) ) continue; - // if we got here, than the item fits the tqmask + if ( ( it->name() == ".." ) || !TQDir::match( mask, it->name() ) ) continue; + // if we got here, than the item fits the mask if ( it->getVfile()->vfile_isDir() && !dirs ) continue; // do we need to skip folders? if ( !it->getVfile()->vfile_isDir() && !files ) continue; // do we need to skip files names->append( it->name() ); diff --git a/krusader/Panel/krview.h b/krusader/Panel/krview.h index eb8b398..107a69e 100644 --- a/krusader/Panel/krview.h +++ b/krusader/Panel/krview.h @@ -192,7 +192,7 @@ public: virtual uint count() const { return _count; } virtual KIO::filesize_t countSize() const { return _countSize; } virtual void getSelectedItems(TQStringList* names); - virtual void getItemsByMask(TQString tqmask, TQStringList* names, bool dirs = true, bool files = true); + virtual void getItemsByMask(TQString mask, TQStringList* names, bool dirs = true, bool files = true); virtual void getSelectedKrViewItems(KrViewItemList *items); virtual void selectAllIncludingDirs() { changeSelection( KRQuery( "*" ), true, true); } virtual void select( const KRQuery& filter = KRQuery( "*" ) ) { changeSelection(filter, true); } @@ -215,7 +215,7 @@ public: virtual KrViewProperties::SortSpec sortMode() const { return _properties->sortMode; } virtual void setFilter(KrViewProperties::FilterSpec filter) { _properties->filter = filter; } virtual KrViewProperties::FilterSpec filter() const { return _properties->filter; } - virtual void setFilterMask( KRQuery tqmask ) { _properties->filterMask = tqmask; } + virtual void setFilterMask( KRQuery mask ) { _properties->filterMask = mask; } virtual const KRQuery& filterMask() const { return _properties->filterMask; } inline TQWidget *widget() { return _widget; } inline void setWidget(TQWidget *w) { _widget = w; } diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp index c5d5c9d..75faf64 100644 --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -107,8 +107,8 @@ typedef TQValueList<KServiceOffer> OfferList; ///////////////////////////////////////////////////// // The list panel constructor // ///////////////////////////////////////////////////// -ListPanel::ListPanel( TQString typeIn, TQWidget *tqparent, bool &left, const char *name ) : - TQWidget( tqparent, name ), panelType( typeIn ), colorMask( 255 ), compareMode( false ), currDragItem( 0 ), statsAgent( 0 ), +ListPanel::ListPanel( TQString typeIn, TQWidget *parent, bool &left, const char *name ) : + TQWidget( parent, name ), panelType( typeIn ), colorMask( 255 ), compareMode( false ), currDragItem( 0 ), statsAgent( 0 ), quickSearch( 0 ), cdRootButton( 0 ), cdUpButton( 0 ), popupBtn(0), popup(0),inlineRefreshJob(0), _left( left ) { func = new ListPanelFunc( this ); @@ -405,11 +405,11 @@ bool ListPanel::eventFilter ( TQObject * watched, TQEvent * e ) { void ListPanel::togglePanelPopup() { if (popup->isHidden()) { if (popupSizes.count() > 0) { - dynamic_cast<TQSplitter*>(popup->tqparent())->setSizes(popupSizes); + dynamic_cast<TQSplitter*>(popup->parent())->setSizes(popupSizes); } else { // on the first time, resize to 50% TQValueList<int> lst; lst << height()/2 << height()/2; - dynamic_cast<TQSplitter*>(popup->tqparent())->setSizes(lst); + dynamic_cast<TQSplitter*>(popup->parent())->setSizes(lst); } popup->show(); @@ -417,14 +417,14 @@ void ListPanel::togglePanelPopup() { TQToolTip::add( popupBtn, i18n( "Close the popup panel" ) ); } else { popupSizes.clear(); - popupSizes = dynamic_cast<TQSplitter*>(popup->tqparent())->sizes(); + popupSizes = dynamic_cast<TQSplitter*>(popup->parent())->sizes(); popup->hide(); popupBtn->setPixmap(krLoader->loadIcon("1uparrow", KIcon::Toolbar, 16)); TQToolTip::add( popupBtn, i18n( "Open the popup panel" ) ); TQValueList<int> lst; lst << height() << 0; - dynamic_cast<TQSplitter*>(popup->tqparent())->setSizes(lst); + dynamic_cast<TQSplitter*>(popup->parent())->setSizes(lst); if( ACTIVE_PANEL ) ACTIVE_PANEL->slotFocusOnMe(); } diff --git a/krusader/Panel/listpanel.h b/krusader/Panel/listpanel.h index 763074b..9d5c313 100644 --- a/krusader/Panel/listpanel.h +++ b/krusader/Panel/listpanel.h @@ -84,7 +84,7 @@ public: #define ITEM2VFILE(PANEL_PTR, KRVIEWITEM) PANEL_PTR->func->files()->vfs_search(KRVIEWITEM->name()) #define NAME2VFILE(PANEL_PTR, STRING_NAME) PANEL_PTR->func->files()->vfs_search(STRING_NAME) // constructor create the panel, but DOESN'T fill it with data, use start() - ListPanel( TQString panelType, TQWidget *tqparent, bool &left, const char *name = 0 ); + ListPanel( TQString panelType, TQWidget *parent, bool &left, const char *name = 0 ); ~ListPanel(); void start( KURL url = KURL(), bool immediate = false ); diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp index 6d15b96..ea0c19e 100755 --- a/krusader/Panel/panelfunc.cpp +++ b/krusader/Panel/panelfunc.cpp @@ -84,8 +84,8 @@ A ////// ---------- List Panel ------------- //////// ////////////////////////////////////////////////////////// -ListPanelFunc::ListPanelFunc( ListPanel *tqparent ) : -panel( tqparent ), inRefresh( false ), vfsP( 0 ) { +ListPanelFunc::ListPanelFunc( ListPanel *parent ) : +panel( parent ), inRefresh( false ), vfsP( 0 ) { urlStack.push( "file:/" ); connect( &delayTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doOpenUrl() ) ); } diff --git a/krusader/Panel/panelfunc.h b/krusader/Panel/panelfunc.h index e27040e..914e04b 100644 --- a/krusader/Panel/panelfunc.h +++ b/krusader/Panel/panelfunc.h @@ -54,7 +54,7 @@ public slots: void rename(const TQString &oldname, const TQString &newname); public: - ListPanelFunc(class ListPanel *tqparent); + ListPanelFunc(class ListPanel *parent); ~ListPanelFunc(); vfs* files(); // return a pointer to the vfs diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp index 6d4f30c..45ff3d9 100644 --- a/krusader/Panel/panelpopup.cpp +++ b/krusader/Panel/panelpopup.cpp @@ -22,9 +22,9 @@ #include "../KViewer/panelviewer.h" #include "../KViewer/diskusageviewer.h" -PanelPopup::PanelPopup( TQSplitter *tqparent, bool left ) : TQWidget( tqparent ), +PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), _left( left ), _hidden(true), stack( 0 ), viewer( 0 ), pjob( 0 ), splitterSizes() { - splitter = tqparent; + splitter = parent; TQGridLayout * tqlayout = new TQGridLayout(this, 1, 1); // loading the splitter sizes @@ -353,8 +353,8 @@ void PanelPopup::quickSelect() { SLOTS->markGroup(quickSelectCombo->currentText(), true); } -void PanelPopup::quickSelect(const TQString &tqmask) { - SLOTS->markGroup(tqmask, true); +void PanelPopup::quickSelect(const TQString &mask) { + SLOTS->markGroup(mask, true); } void PanelPopup::quickSelectStore() { @@ -367,7 +367,7 @@ void PanelPopup::quickSelectStore() { void PanelPopup::slotDroppedOnTree(TQWidget *widget, TQDropEvent *e, KURL::List &lst, KURL &) { // KFileTreeView is buggy: when dropped, it might not give us the correct - // destination, but actually, it's tqparent. workaround: don't use + // destination, but actually, it's parent. workaround: don't use // the destination in the signal, but take the current item KURL dest = tree->currentURL(); diff --git a/krusader/RemoteMan/remoteman.cpp b/krusader/RemoteMan/remoteman.cpp index 06c1638..a9b27f6 100644 --- a/krusader/RemoteMan/remoteman.cpp +++ b/krusader/RemoteMan/remoteman.cpp @@ -97,8 +97,8 @@ void remoteMan::addSession() { TQListViewItem *i=0,*current; current=sessions->currentItem(); // if we are pointing to a session, then the new session will be - // created under the current session's tqparent group - if (current->text(1)=="SESSION") current=current->tqparent(); + // created under the current session's parent group + if (current->text(1)=="SESSION") current=current->parent(); // create a new item and give it the appropriate pixmap i=new TQListViewItem(current,i18n("New session"),"SESSION"); i->setPixmap(0,LOADICON("kr_ftp_new")); @@ -120,7 +120,7 @@ void remoteMan::refreshData() { // we have to check if there's another brother-session with // the same name, if so, we add a <2> to it TQListViewItem *i; - if (currentItem->tqparent()) i=currentItem->tqparent()->firstChild(); + if (currentItem->parent()) i=currentItem->parent()->firstChild(); else i=sessions->firstChild(); while (i) { if (i->text(0)==currentItem->text(0) && i!=currentItem) { @@ -133,7 +133,7 @@ void remoteMan::refreshData() { temp=currentItem->text(0).replace(currentItem->text(0).length()-4,4,temp); currentItem->setText(0,temp); } else currentItem->setText(0,currentItem->text(0)+"<02>"); - i=currentItem->tqparent()->firstChild(); + i=currentItem->parent()->firstChild(); } else i=i->nextSibling(); } } @@ -204,7 +204,7 @@ void remoteMan::updateConnect(const TQString &) { // path of folders to the item, seperated by the ` character TQString item2connection(TQListViewItem *item) { TQString con=item->text(0); - TQListViewItem *iterator=item->tqparent(); + TQListViewItem *iterator=item->parent(); while (iterator!=0) { //////////////////////// explanation: /////////////////////////// // since the` char is special to us, we use it to seperate items @@ -217,7 +217,7 @@ TQString item2connection(TQListViewItem *item) { i=temp.find('`'); } con=temp+'`'+con; - iterator=iterator->tqparent(); + iterator=iterator->parent(); } return con; } diff --git a/krusader/RemoteMan/remotemanbase.cpp b/krusader/RemoteMan/remotemanbase.cpp index e0033d0..104ed0a 100644 --- a/krusader/RemoteMan/remotemanbase.cpp +++ b/krusader/RemoteMan/remotemanbase.cpp @@ -26,14 +26,14 @@ /* - * Constructs a remoteManBase which is a child of 'tqparent', with the + * Constructs a remoteManBase which is a child of 'parent', with the * name 'name' and widget flags set to 'f' * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -remoteManBase::remoteManBase( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ) +remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "remoteManBase" ); diff --git a/krusader/RemoteMan/remotemanbase.h b/krusader/RemoteMan/remotemanbase.h index 527cd7c..db35324 100644 --- a/krusader/RemoteMan/remotemanbase.h +++ b/krusader/RemoteMan/remotemanbase.h @@ -30,7 +30,7 @@ class remoteManBase : public TQDialog TQ_OBJECT public: - remoteManBase( TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + remoteManBase( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~remoteManBase(); TQLabel* TextLabel1; diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp index 54c2c72..9032edc 100644 --- a/krusader/Search/krsearchdialog.cpp +++ b/krusader/Search/krsearchdialog.cpp @@ -55,7 +55,7 @@ class SearchListView : public TQListView { public: - SearchListView( TQWidget * tqparent, const char * name ) : TQListView( tqparent, name ) + SearchListView( TQWidget * parent, const char * name ) : TQListView( parent, name ) { } @@ -99,8 +99,8 @@ bool KrSearchDialog::lastSearchInArchives = false; bool KrSearchDialog::lastFollowSymLinks = false; // class starts here ///////////////////////////////////////// -KrSearchDialog::KrSearchDialog( TQString profile, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ), query(0), searcher(0) +KrSearchDialog::KrSearchDialog( TQString profile, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ), query(0), searcher(0) { setCaption( i18n( "Krusader::Search" ) ); diff --git a/krusader/Search/krsearchdialog.h b/krusader/Search/krsearchdialog.h index dbe14f3..26d6d68 100644 --- a/krusader/Search/krsearchdialog.h +++ b/krusader/Search/krsearchdialog.h @@ -56,7 +56,7 @@ class KrSearchDialog : public TQDialog { Q_OBJECT TQ_OBJECT public: - KrSearchDialog(TQString profile = 0, TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); + KrSearchDialog(TQString profile = 0, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); void prepareGUI(); diff --git a/krusader/Splitter/combiner.cpp b/krusader/Splitter/combiner.cpp index a4aa23c..37e7504 100644 --- a/krusader/Splitter/combiner.cpp +++ b/krusader/Splitter/combiner.cpp @@ -36,8 +36,8 @@ #include <kio/job.h> #include <tqfileinfo.h> -Combiner::Combiner( TQWidget* tqparent, KURL baseURLIn, KURL destinationURLIn, bool unixNamingIn ) : - TQProgressDialog( tqparent, "Krusader::Combiner", true, 0 ), baseURL( baseURLIn ), destinationURL( destinationURLIn ), +Combiner::Combiner( TQWidget* parent, KURL baseURLIn, KURL destinationURLIn, bool unixNamingIn ) : + TQProgressDialog( parent, "Krusader::Combiner", true, 0 ), baseURL( baseURLIn ), destinationURL( destinationURLIn ), hasValidSplitFile( false ), fileCounter ( 0 ), permissions( -1 ), receivedSize( 0 ), combineReadJob( 0 ), combineWriteJob( 0 ), unixNaming( unixNamingIn ) { diff --git a/krusader/Splitter/combiner.h b/krusader/Splitter/combiner.h index a50573a..de6f5de 100644 --- a/krusader/Splitter/combiner.h +++ b/krusader/Splitter/combiner.h @@ -71,7 +71,7 @@ private: bool unixNaming; public: - Combiner( TQWidget* tqparent, KURL baseURLIn, KURL destinationURLIn, bool unixNamingIn=false ); + Combiner( TQWidget* parent, KURL baseURLIn, KURL destinationURLIn, bool unixNamingIn=false ); ~Combiner(); void combine(); diff --git a/krusader/Splitter/splitter.cpp b/krusader/Splitter/splitter.cpp index 141fc17..8426c14 100644 --- a/krusader/Splitter/splitter.cpp +++ b/krusader/Splitter/splitter.cpp @@ -37,8 +37,8 @@ #include <kfileitem.h> #include <tqfileinfo.h> -Splitter::Splitter( TQWidget* tqparent, KURL fileNameIn, KURL destinationDirIn ) : - TQProgressDialog( tqparent, "Krusader::Splitter", true, 0 ), splitSize( 0 ) +Splitter::Splitter( TQWidget* parent, KURL fileNameIn, KURL destinationDirIn ) : + TQProgressDialog( parent, "Krusader::Splitter", true, 0 ), splitSize( 0 ) { fileName = fileNameIn; diff --git a/krusader/Splitter/splitter.h b/krusader/Splitter/splitter.h index 01dd94a..a1d64d0 100644 --- a/krusader/Splitter/splitter.h +++ b/krusader/Splitter/splitter.h @@ -62,7 +62,7 @@ private: KIO::TransferJob *splitWriteJob; public: - Splitter( TQWidget* tqparent, KURL fileNameIn, KURL destinationDirIn ); + Splitter( TQWidget* parent, KURL fileNameIn, KURL destinationDirIn ); ~Splitter(); void split( KIO::filesize_t splitSizeIn ); diff --git a/krusader/Splitter/splittergui.cpp b/krusader/Splitter/splittergui.cpp index a2e122b..2c575bc 100644 --- a/krusader/Splitter/splittergui.cpp +++ b/krusader/Splitter/splittergui.cpp @@ -46,8 +46,8 @@ PredefinedDevice SplitterGUI::predefinedDevices[] = { {i18n( "700 MB (CD-R)" ), 700*0x100000} }; -SplitterGUI::SplitterGUI( TQWidget* tqparent, KURL fileURL, KURL defaultDir ) : - TQDialog( tqparent, "Krusader::SplitterGUI", true, 0 ), +SplitterGUI::SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ) : + TQDialog( parent, "Krusader::SplitterGUI", true, 0 ), userDefinedSize ( 0x100000 ), lastSelectedDevice( 0 ), resultCode( TQDialog::Rejected ) { predefinedDeviceNum = sizeof( predefinedDevices ) / sizeof( PredefinedDevice ); diff --git a/krusader/Splitter/splittergui.h b/krusader/Splitter/splittergui.h index 23822b6..b83e757 100644 --- a/krusader/Splitter/splittergui.h +++ b/krusader/Splitter/splittergui.h @@ -56,7 +56,7 @@ struct PredefinedDevice KIO::filesize_t value; public: - SplitterSpinBox ( TQWidget * tqparent = 0, const char * name = 0 ) : TQSpinBox( tqparent, name ), division( 1 ), value( 1 ) + SplitterSpinBox ( TQWidget * parent = 0, const char * name = 0 ) : TQSpinBox( parent, name ), division( 1 ), value( 1 ) { setMaxValue( 0x7FFFFFFF ); /* setting the minimum and maximum values */ setMinValue( 1 ); @@ -159,7 +159,7 @@ private: KURLRequester *urlReq; public: - SplitterGUI( TQWidget* tqparent, KURL fileURL, KURL defaultDir ); + SplitterGUI( TQWidget* parent, KURL fileURL, KURL defaultDir ); KURL getDestinationDir() {return vfs::fromPathOrURL( urlReq->url() );} KIO::filesize_t getSplitSize() {return spinBox->longValue();} diff --git a/krusader/Synchronizer/feedtolistboxdialog.cpp b/krusader/Synchronizer/feedtolistboxdialog.cpp index 1bb1452..7436c93 100644 --- a/krusader/Synchronizer/feedtolistboxdialog.cpp +++ b/krusader/Synchronizer/feedtolistboxdialog.cpp @@ -50,8 +50,8 @@ #define S_RIGHT 1 #define S_BOTH 2 -FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *tqparent, const char *name, Synchronizer *sync, - TQListView *syncL, bool equOK) : KDialogBase( tqparent, name, true, i18n( "Krusader::Feed to listbox" ), +FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *parent, const char *name, Synchronizer *sync, + TQListView *syncL, bool equOK) : KDialogBase( parent, name, true, i18n( "Krusader::Feed to listbox" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1, Ok, true, KStdGuiItem::clear() ), synchronizer( sync ), syncList( syncL ), equalAllowed( equOK ), accepted( false ) { @@ -84,7 +84,7 @@ FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *tqparent, const char *name, if( itemNum == 0 ) { hide(); - KMessageBox::error( tqparent, i18n( "No elements to feed!" ) ); + KMessageBox::error( parent, i18n( "No elements to feed!" ) ); return; } diff --git a/krusader/Synchronizer/synchronizedialog.cpp b/krusader/Synchronizer/synchronizedialog.cpp index aa98c34..01e8ee0 100755 --- a/krusader/Synchronizer/synchronizedialog.cpp +++ b/krusader/Synchronizer/synchronizedialog.cpp @@ -36,10 +36,10 @@ #include <tqhbox.h> #include <klocale.h> -SynchronizeDialog::SynchronizeDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl, +SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool modal, WFlags fl, Synchronizer *sync, int pleftCopyNr, KIO::filesize_t pleftCopySize, int prightCopyNr, KIO::filesize_t prightCopySize, int pdeleteNr, - KIO::filesize_t pdeleteSize, int parThreads ) : TQDialog( tqparent, name, modal, fl ), + KIO::filesize_t pdeleteSize, int parThreads ) : TQDialog( parent, name, modal, fl ), synchronizer( sync ), leftCopyNr ( pleftCopyNr ), leftCopySize( pleftCopySize ), rightCopyNr ( prightCopyNr ), rightCopySize( prightCopySize ), deleteNr( pdeleteNr ), diff --git a/krusader/Synchronizer/synchronizer.cpp b/krusader/Synchronizer/synchronizer.cpp index 5c01383..62b19c0 100755 --- a/krusader/Synchronizer/synchronizer.cpp +++ b/krusader/Synchronizer/synchronizer.cpp @@ -170,10 +170,10 @@ void Synchronizer::compareLoop() { if( entry->state() == ST_STATE_READY ) { CompareTask *ctentry = (CompareTask *) entry; if( ctentry->isDuplicate() ) - compareDirectory( ctentry->tqparent(), ctentry->leftDirList(), ctentry->rightDirList(), + compareDirectory( ctentry->parent(), ctentry->leftDirList(), ctentry->rightDirList(), ctentry->leftDir(), ctentry->rightDir() ); else - addSingleDirectory( ctentry->tqparent(), ctentry->dirList(), ctentry->dir(), + addSingleDirectory( ctentry->parent(), ctentry->dirList(), ctentry->dir(), ctentry->isLeft() ); } if( entry->state() == ST_STATE_READY || entry->state() == ST_STATE_ERROR ) @@ -198,7 +198,7 @@ void Synchronizer::compareLoop() { stack.clear(); } -void Synchronizer::compareDirectory( SynchronizerFileItem *tqparent, SynchronizerDirList * left_directory, +void Synchronizer::compareDirectory( SynchronizerFileItem *parent, SynchronizerDirList * left_directory, SynchronizerDirList * right_directory, const TQString &leftDir, const TQString &rightDir ) { @@ -229,7 +229,7 @@ void Synchronizer::compareDirectory( SynchronizerFileItem *tqparent, Synchronize continue; if( (right_file = right_directory->search( file_name, ignoreCase )) == 0 ) - addLeftOnlyItem( tqparent, file_name, leftDir, left_file->vfile_getSize(), left_file->vfile_getTime_t(), + addLeftOnlyItem( parent, file_name, leftDir, left_file->vfile_getSize(), left_file->vfile_getTime_t(), readLink( left_file ), left_file->vfile_getOwner(), left_file->vfile_getGroup(), left_file->vfile_getMode(), left_file->vfile_getACL() ); else @@ -237,7 +237,7 @@ void Synchronizer::compareDirectory( SynchronizerFileItem *tqparent, Synchronize if( isDir( right_file ) ) continue; - addDuplicateItem( tqparent, file_name, right_file->vfile_getName(), leftDir, rightDir, left_file->vfile_getSize(), right_file->vfile_getSize(), + addDuplicateItem( parent, file_name, right_file->vfile_getName(), leftDir, rightDir, left_file->vfile_getSize(), right_file->vfile_getSize(), left_file->vfile_getTime_t(), right_file->vfile_getTime_t(), readLink( left_file ), readLink( right_file ), left_file->vfile_getOwner(), right_file->vfile_getOwner(), left_file->vfile_getGroup(), right_file->vfile_getGroup(), @@ -262,7 +262,7 @@ void Synchronizer::compareDirectory( SynchronizerFileItem *tqparent, Synchronize continue; if( left_directory->search( file_name, ignoreCase ) == 0 ) - addRightOnlyItem( tqparent, file_name, rightDir, right_file->vfile_getSize(), right_file->vfile_getTime_t(), + addRightOnlyItem( parent, file_name, rightDir, right_file->vfile_getSize(), right_file->vfile_getTime_t(), readLink( right_file ), right_file->vfile_getOwner(), right_file->vfile_getGroup(), right_file->vfile_getMode(), right_file->vfile_getACL() ); } @@ -288,7 +288,7 @@ void Synchronizer::compareDirectory( SynchronizerFileItem *tqparent, Synchronize if( (right_file = right_directory->search( left_file_name, ignoreCase )) == 0 ) { - SynchronizerFileItem *me = addLeftOnlyItem( tqparent, left_file_name, leftDir, 0, + SynchronizerFileItem *me = addLeftOnlyItem( parent, left_file_name, leftDir, 0, left_file->vfile_getTime_t(), readLink( left_file ), left_file->vfile_getOwner(), left_file->vfile_getGroup(), left_file->vfile_getMode(), left_file->vfile_getACL(), @@ -297,7 +297,7 @@ void Synchronizer::compareDirectory( SynchronizerFileItem *tqparent, Synchronize leftDir.isEmpty() ? left_file_name : leftDir+"/"+left_file_name, true, ignoreHidden ) ); } else { TQString right_file_name = right_file->vfile_getName(); - SynchronizerFileItem *me = addDuplicateItem( tqparent, left_file_name, right_file_name, + SynchronizerFileItem *me = addDuplicateItem( parent, left_file_name, right_file_name, leftDir, rightDir, 0, 0, left_file->vfile_getTime_t(), right_file->vfile_getTime_t(), readLink( left_file ), readLink( right_file ), @@ -332,7 +332,7 @@ void Synchronizer::compareDirectory( SynchronizerFileItem *tqparent, Synchronize if( left_directory->search( file_name, ignoreCase ) == 0 ) { - SynchronizerFileItem *me = addRightOnlyItem( tqparent, file_name, rightDir, 0, + SynchronizerFileItem *me = addRightOnlyItem( parent, file_name, rightDir, 0, right_file->vfile_getTime_t(), readLink( right_file ), right_file->vfile_getOwner(), right_file->vfile_getGroup(), right_file->vfile_getMode(), right_file->vfile_getACL(), @@ -352,7 +352,7 @@ TQString Synchronizer::getTaskTypeName( TaskType taskType ) return names[taskType]; } -SynchronizerFileItem * Synchronizer::addItem( SynchronizerFileItem *tqparent, const TQString &leftFile, +SynchronizerFileItem * Synchronizer::addItem( SynchronizerFileItem *parent, const TQString &leftFile, const TQString &rightFile, const TQString &leftDir, const TQString &rightDir, bool existsLeft, bool existsRight, KIO::filesize_t leftSize, KIO::filesize_t rightSize, @@ -367,12 +367,12 @@ SynchronizerFileItem * Synchronizer::addItem( SynchronizerFileItem *tqparent, co SynchronizerFileItem *item = new SynchronizerFileItem( leftFile, rightFile, leftDir, rightDir, marked, existsLeft, existsRight, leftSize, rightSize, leftDate, rightDate, leftLink, rightLink, leftOwner, rightOwner, leftGroup, rightGroup, leftMode, rightMode, leftACL, rightACL, tsk, isDir, - isTemp, tqparent ); + isTemp, parent ); if( !isTemp ) { - while( tqparent && tqparent->isTemporary() ) - setPermanent( tqparent ); + while( parent && parent->isTemporary() ) + setPermanent( parent ); bool doRefresh = false; @@ -411,37 +411,37 @@ void Synchronizer::compareContentResult( SynchronizerFileItem * item, bool res ) void Synchronizer::setPermanent( SynchronizerFileItem *item ) { - if( item->tqparent() && item->tqparent()->isTemporary() ) - setPermanent( item->tqparent() ); + if( item->parent() && item->parent()->isTemporary() ) + setPermanent( item->parent() ); item->setPermanent(); resultList.append( item ); emit comparedFileData( item ); } -SynchronizerFileItem * Synchronizer::addLeftOnlyItem( SynchronizerFileItem *tqparent, +SynchronizerFileItem * Synchronizer::addLeftOnlyItem( SynchronizerFileItem *parent, const TQString &file_name, const TQString &dir, KIO::filesize_t size, time_t date, const TQString &link, const TQString &owner, const TQString &group, mode_t mode, const TQString &acl, bool isDir, bool isTemp ) { - return addItem( tqparent, file_name, file_name, dir, dir, true, false, size, 0, date, 0, link, TQString(), + return addItem( parent, file_name, file_name, dir, dir, true, false, size, 0, date, 0, link, TQString(), owner, TQString(), group, TQString(), mode, (mode_t)-1, acl, TQString(), asymmetric ? TT_DELETE : TT_COPY_TO_RIGHT, isDir, isTemp ); } -SynchronizerFileItem * Synchronizer::addRightOnlyItem( SynchronizerFileItem *tqparent, +SynchronizerFileItem * Synchronizer::addRightOnlyItem( SynchronizerFileItem *parent, const TQString &file_name, const TQString &dir, KIO::filesize_t size, time_t date, const TQString &link, const TQString &owner, const TQString &group, mode_t mode, const TQString &acl, bool isDir, bool isTemp ) { - return addItem( tqparent, file_name, file_name, dir, dir, false, true, 0, size, 0, date, TQString(), link, + return addItem( parent, file_name, file_name, dir, dir, false, true, 0, size, 0, date, TQString(), link, TQString(), owner, TQString(), group, (mode_t)-1, mode, TQString(), acl, TT_COPY_TO_LEFT, isDir, isTemp ); } -SynchronizerFileItem * Synchronizer::addDuplicateItem( SynchronizerFileItem *tqparent, +SynchronizerFileItem * Synchronizer::addDuplicateItem( SynchronizerFileItem *parent, const TQString &leftName, const TQString &rightName, const TQString &leftDir, const TQString &rightDir, KIO::filesize_t leftSize, KIO::filesize_t rightSize, time_t leftDate, time_t rightDate, @@ -499,7 +499,7 @@ SynchronizerFileItem * Synchronizer::addDuplicateItem( SynchronizerFileItem *tqp }while( false ); - SynchronizerFileItem * item = addItem( tqparent, leftName, rightName, leftDir, rightDir, true, true, + SynchronizerFileItem * item = addItem( parent, leftName, rightName, leftDir, rightDir, true, true, leftSize, rightSize, leftDate, rightDate, leftLink, rightLink, leftOwner, rightOwner, leftGroup, rightGroup, leftMode, rightMode, leftACL, rightACL, @@ -514,7 +514,7 @@ SynchronizerFileItem * Synchronizer::addDuplicateItem( SynchronizerFileItem *tqp return item; } -void Synchronizer::addSingleDirectory( SynchronizerFileItem *tqparent, SynchronizerDirList *directory, +void Synchronizer::addSingleDirectory( SynchronizerFileItem *parent, SynchronizerDirList *directory, const TQString &dirName, bool isLeft ) { const TQString &url = directory->url(); @@ -533,10 +533,10 @@ void Synchronizer::addSingleDirectory( SynchronizerFileItem *tqparent, Synchroni continue; if( isLeft ) - addLeftOnlyItem( tqparent, file_name, dirName, file->vfile_getSize(), file->vfile_getTime_t(), readLink( file ), + addLeftOnlyItem( parent, file_name, dirName, file->vfile_getSize(), file->vfile_getTime_t(), readLink( file ), file->vfile_getOwner(), file->vfile_getGroup(), file->vfile_getMode(), file->vfile_getACL() ); else - addRightOnlyItem( tqparent, file_name, dirName, file->vfile_getSize(), file->vfile_getTime_t(), readLink( file ), + addRightOnlyItem( parent, file_name, dirName, file->vfile_getSize(), file->vfile_getTime_t(), readLink( file ), file->vfile_getOwner(), file->vfile_getGroup(), file->vfile_getMode(), file->vfile_getACL() ); } @@ -556,11 +556,11 @@ void Synchronizer::addSingleDirectory( SynchronizerFileItem *tqparent, Synchroni SynchronizerFileItem *me; if( isLeft ) - me = addLeftOnlyItem( tqparent, file_name, dirName, 0, file->vfile_getTime_t(), readLink( file ), + me = addLeftOnlyItem( parent, file_name, dirName, 0, file->vfile_getTime_t(), readLink( file ), file->vfile_getOwner(), file->vfile_getGroup(), file->vfile_getMode(), file->vfile_getACL(), true, !query->match( file ) ); else - me = addRightOnlyItem( tqparent, file_name, dirName, 0, file->vfile_getTime_t(), readLink( file ), + me = addRightOnlyItem( parent, file_name, dirName, 0, file->vfile_getTime_t(), readLink( file ), file->vfile_getOwner(), file->vfile_getGroup(), file->vfile_getMode(), file->vfile_getACL(), true, !query->match( file ) ); stack.append( new CompareTask( me, url+file_name+"/", @@ -605,15 +605,15 @@ bool Synchronizer::isMarked( TaskType task, bool isDuplicate ) bool Synchronizer::markParentDirectories( SynchronizerFileItem *item ) { - if( item->tqparent() == 0 || item->tqparent()->isMarked() ) + if( item->parent() == 0 || item->parent()->isMarked() ) return false; - markParentDirectories( item->tqparent() ); + markParentDirectories( item->parent() ); - item->tqparent()->setMarked( true ); + item->parent()->setMarked( true ); fileCount++; - emit markChanged( item->tqparent(), false ); + emit markChanged( item->parent(), false ); return true; } @@ -681,8 +681,8 @@ void Synchronizer::excludeOperation( SynchronizerFileItem *item ) void Synchronizer::exclude( SynchronizerFileItem *item ) { - if( !item->tqparent() || item->tqparent()->task() != TT_DELETE ) - operate( item, excludeOperation ); /* exclude only if the tqparent task is not DEL */ + if( !item->parent() || item->parent()->task() != TT_DELETE ) + operate( item, excludeOperation ); /* exclude only if the parent task is not DEL */ } void Synchronizer::restoreOperation( SynchronizerFileItem *item ) @@ -694,12 +694,12 @@ void Synchronizer::restore( SynchronizerFileItem *item ) { operate( item, restoreOperation ); - while( ( item = item->tqparent() ) != 0 ) /* in case of restore, the tqparent directories */ + while( ( item = item->parent() ) != 0 ) /* in case of restore, the parent directories */ { /* must be changed for being consistent */ if( item->task() != TT_DIFFERS ) break; - if( item->originalTask() == TT_DELETE ) /* if the tqparent original task is delete */ + if( item->originalTask() == TT_DELETE ) /* if the parent original task is delete */ break; /* don't touch it */ item->restoreOriginalTask(); /* restore */ @@ -753,7 +753,7 @@ void Synchronizer::copyToLeft( SynchronizerFileItem *item ) { operate( item, copyToLeftOperation ); - while( ( item = item->tqparent() ) != 0 ) + while( ( item = item->parent() ) != 0 ) { if( item->task() != TT_DIFFERS ) break; @@ -785,7 +785,7 @@ void Synchronizer::copyToRight( SynchronizerFileItem *item ) { operate( item, copyToRightOperation ); - while( ( item = item->tqparent() ) != 0 ) + while( ( item = item->parent() ) != 0 ) { if( item->task() != TT_DIFFERS && item->task() != TT_DELETE ) break; @@ -1325,9 +1325,9 @@ TQString Synchronizer::rightBaseDirectory() class KgetProgressDialog : public KDialogBase { public: - KgetProgressDialog( TQWidget *tqparent=0, const char *name=0, const TQString &caption=TQString(), + KgetProgressDialog( TQWidget *parent=0, const char *name=0, const TQString &caption=TQString(), const TQString &text=TQString(), bool modal=false) : KDialogBase( KDialogBase::Plain, - caption, KDialogBase::User1 | KDialogBase::Cancel, KDialogBase::Cancel, tqparent, name, modal ) + caption, KDialogBase::User1 | KDialogBase::Cancel, KDialogBase::Cancel, parent, name, modal ) { showButton(KDialogBase::Close, false); diff --git a/krusader/Synchronizer/synchronizer.h b/krusader/Synchronizer/synchronizer.h index 0f67b8b..ce1c7a4 100755 --- a/krusader/Synchronizer/synchronizer.h +++ b/krusader/Synchronizer/synchronizer.h @@ -198,7 +198,7 @@ class Synchronizer : public TQObject int inTaskFinished; // counter of quasy 'threads' in slotTaskFinished TQStringList selectedFiles; // the selected files to compare - TQWidget *parentWidget; // the tqparent widget + TQWidget *parentWidget; // the parent widget TQWidget *syncDlgWidget; // the synchronizer dialog widget }; diff --git a/krusader/Synchronizer/synchronizerfileitem.h b/krusader/Synchronizer/synchronizerfileitem.h index 9846ac3..33dbd50 100644 --- a/krusader/Synchronizer/synchronizerfileitem.h +++ b/krusader/Synchronizer/synchronizerfileitem.h @@ -87,7 +87,7 @@ class SynchronizerFileItem TQString m_rightACL; // ACL of the right file TaskType m_task; // the task with the file bool m_isDir; // flag, indicates that the file is a directory - SynchronizerFileItem *m_parent; // pointer to the tqparent directory item or 0 + SynchronizerFileItem *m_parent; // pointer to the parent directory item or 0 void *m_userData; // user data bool m_overWrite; // overwrite flag TQString m_destination; // the destination URL at rename @@ -101,14 +101,14 @@ class SynchronizerFileItem const TQString &leftLink, const TQString &rightLink, const TQString &leftOwner, const TQString &rightOwner, const TQString &leftGroup, const TQString &rightGroup, mode_t leftMode, mode_t rightMode, const TQString &leftACL, const TQString &rightACL, - TaskType tsk, bool isDir, bool tmp, SynchronizerFileItem *tqparent ) : + TaskType tsk, bool isDir, bool tmp, SynchronizerFileItem *parent ) : m_leftName( leftNam ), m_rightName( rightNam ), m_leftDirectory( leftDir ), m_rightDirectory( rightDir ), m_marked( mark ), m_existsLeft( exL ), m_existsRight( exR ), m_leftSize( leftSize ), m_rightSize( rightSize ), m_leftDate( leftDate ), m_rightDate( rightDate ), m_leftLink( leftLink ), m_rightLink( rightLink ), m_leftOwner( leftOwner ), m_rightOwner( rightOwner ), m_leftGroup( leftGroup ), m_rightGroup( rightGroup ), m_leftMode( leftMode ), m_rightMode( rightMode ), m_leftACL( leftACL ), - m_rightACL( rightACL ), m_task( tsk ), m_isDir( isDir ), m_parent(tqparent), + m_rightACL( rightACL ), m_task( tsk ), m_isDir( isDir ), m_parent(parent), m_userData( 0 ), m_overWrite( false ), m_destination( TQString() ), m_temporary( tmp ), m_originalTask( tsk ) {} @@ -143,7 +143,7 @@ class SynchronizerFileItem m_task = m_originalTask = (TaskType)(m_originalTask - TT_UNKNOWN); } inline bool isDir() {return m_isDir;} - inline SynchronizerFileItem * tqparent() {return m_parent;} + inline SynchronizerFileItem * parent() {return m_parent;} inline void * userData() {return m_userData;} inline void setUserData( void *ud) {m_userData = ud;} inline void setOverWrite() {m_overWrite = true;} diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp index 3444ec8..cd52b55 100755 --- a/krusader/Synchronizer/synchronizergui.cpp +++ b/krusader/Synchronizer/synchronizergui.cpp @@ -1017,7 +1017,7 @@ private: bool isLeft; public: - SynchronizerListView( Synchronizer * sync, TQWidget * tqparent ) : TQListView( tqparent ), synchronizer( sync ) + SynchronizerListView( Synchronizer * sync, TQWidget * parent ) : TQListView( parent ), synchronizer( sync ) { } @@ -1067,17 +1067,17 @@ public: } }; -SynchronizerGUI::SynchronizerGUI(TQWidget* tqparent, KURL leftURL, KURL rightURL, TQStringList selList ) : - TQDialog( tqparent, "Krusader::SynchronizerGUI", false, 0 ) { - initGUI( tqparent, TQString(), leftURL, rightURL, selList ); +SynchronizerGUI::SynchronizerGUI(TQWidget* parent, KURL leftURL, KURL rightURL, TQStringList selList ) : + TQDialog( parent, "Krusader::SynchronizerGUI", false, 0 ) { + initGUI( parent, TQString(), leftURL, rightURL, selList ); } -SynchronizerGUI::SynchronizerGUI(TQWidget* tqparent, TQString profile ) : - TQDialog( tqparent, "Krusader::SynchronizerGUI", false, 0 ) { - initGUI( tqparent, profile, KURL(), KURL(), TQStringList() ); +SynchronizerGUI::SynchronizerGUI(TQWidget* parent, TQString profile ) : + TQDialog( parent, "Krusader::SynchronizerGUI", false, 0 ) { + initGUI( parent, profile, KURL(), KURL(), TQStringList() ); } -void SynchronizerGUI::initGUI(TQWidget* /* tqparent */, TQString profileName, KURL leftURL, KURL rightURL, TQStringList selList) { +void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL leftURL, KURL rightURL, TQStringList selList) { selectedFiles = selList; isComparing = wasClosed = wasSync = false; firstResize = true; @@ -1993,7 +1993,7 @@ void SynchronizerGUI::addFile( SynchronizerFileItem *item ) SyncViewItem *listItem = 0; SyncViewItem *dirItem; - if( item->tqparent() == 0 ) + if( item->parent() == 0 ) { listItem = new SyncViewItem(item, textColor, baseColor, syncList, lastItem, leftName, leftSize, leftDate, Synchronizer::getTaskTypeName( item->task() ), rightDate, @@ -2002,7 +2002,7 @@ void SynchronizerGUI::addFile( SynchronizerFileItem *item ) } else { - dirItem = (SyncViewItem *)item->tqparent()->userData(); + dirItem = (SyncViewItem *)item->parent()->userData(); if( dirItem ) { dirItem->setOpen( true ); diff --git a/krusader/Synchronizer/synchronizergui.h b/krusader/Synchronizer/synchronizergui.h index 46e7bb4..8aff3dc 100755 --- a/krusader/Synchronizer/synchronizergui.h +++ b/krusader/Synchronizer/synchronizergui.h @@ -61,22 +61,22 @@ public: TQColor baseColor; public: - SyncViewItem( SynchronizerFileItem *item, TQColor txt, TQColor base, TQListView * tqparent, TQListViewItem *after, TQString label1, + SyncViewItem( SynchronizerFileItem *item, TQColor txt, TQColor base, TQListView * parent, TQListViewItem *after, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() ) : - TQListViewItem( tqparent, after, label1, label2, label3, label4, label5, label6, + TQListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 ), syncItemRef( item ), lastItemRef( 0 ), textColor( txt ), baseColor( base ) { item->setUserData( (void *)this ); setDragEnabled( true ); } - SyncViewItem( SynchronizerFileItem *item, TQColor txt, TQColor base, TQListViewItem * tqparent, TQListViewItem *after, TQString label1, + SyncViewItem( SynchronizerFileItem *item, TQColor txt, TQColor base, TQListViewItem * parent, TQListViewItem *after, TQString label1, TQString label2 = TQString(), TQString label3 = TQString(), TQString label4 = TQString(), TQString label5 = TQString(), TQString label6 = TQString(), TQString label7 = TQString(), TQString label8 = TQString() ) : - TQListViewItem( tqparent, after, label1, label2, label3, label4, label5, label6, + TQListViewItem( parent, after, label1, label2, label3, label4, label5, label6, label7, label8 ), syncItemRef( item ), lastItemRef( 0 ), textColor( txt ), baseColor( base ) { item->setUserData( (void *)this ); @@ -110,8 +110,8 @@ public: public: // if rightDirectory is null, leftDirectory is actually the profile name to load - SynchronizerGUI(TQWidget* tqparent, KURL leftDirectory, KURL rightDirectory = TQString(), TQStringList selList = TQStringList() ); - SynchronizerGUI(TQWidget* tqparent, TQString profile ); + SynchronizerGUI(TQWidget* parent, KURL leftDirectory, KURL rightDirectory = TQString(), TQStringList selList = TQStringList() ); + SynchronizerGUI(TQWidget* parent, TQString profile ); ~SynchronizerGUI(); inline bool wasSynchronization() {return wasSync;} @@ -142,7 +142,7 @@ protected slots: void connectFilters( const TQString & ); private: - void initGUI(TQWidget* tqparent, TQString profile, KURL leftURL, KURL rightURL, TQStringList selList); + void initGUI(TQWidget* parent, TQString profile, KURL leftURL, KURL rightURL, TQStringList selList); TQString convertTime(time_t time) const; void setMarkFlags(); diff --git a/krusader/Synchronizer/synchronizertask.h b/krusader/Synchronizer/synchronizertask.h index 0f798a0..eae82cd 100644 --- a/krusader/Synchronizer/synchronizertask.h +++ b/krusader/Synchronizer/synchronizertask.h @@ -101,7 +101,7 @@ public: inline const TQString & rightDir() { return m_otherDir; } inline const TQString & url() { return m_url; } inline const TQString & dir() { return m_dir; } - inline SynchronizerFileItem * tqparent() { return m_parent; } + inline SynchronizerFileItem * parent() { return m_parent; } inline SynchronizerDirList * leftDirList() { return m_dirList; } inline SynchronizerDirList * rightDirList() { return m_otherDirList; } inline SynchronizerDirList * dirList() { return m_dirList; } diff --git a/krusader/UserAction/expander.cpp b/krusader/UserAction/expander.cpp index 0fb8d99..139b00c 100644 --- a/krusader/UserAction/expander.cpp +++ b/krusader/UserAction/expander.cpp @@ -57,15 +57,15 @@ void exp_placeholder::panelMissingError(const TQString &s, Expander& exp) exp.setError( Error(Error::S_FATAL,Error::C_ARGUMENT,i18n("Needed panel specification missing in expander %1").tqarg(s)) ); } -TQStringList exp_placeholder::fileList(const ListPanel* const panel,const TQString& type,const TQString& tqmask,const bool ommitPath,const bool useUrl,Expander& exp,const TQString& error) +TQStringList exp_placeholder::fileList(const ListPanel* const panel,const TQString& type,const TQString& mask,const bool ommitPath,const bool useUrl,Expander& exp,const TQString& error) { TQStringList items; if ( type.isEmpty() || type == "all" ) - panel->view->getItemsByMask( tqmask, &items ); + panel->view->getItemsByMask( mask, &items ); else if ( type == "files" ) - panel->view->getItemsByMask( tqmask, &items, false, true ); + panel->view->getItemsByMask( mask, &items, false, true ); else if ( type == "dirs" ) - panel->view->getItemsByMask( tqmask, &items, true, false ); + panel->view->getItemsByMask( mask, &items, true, false ); else if ( type == "selected" ) panel->view->getSelectedItems( &items ); else { @@ -176,7 +176,7 @@ public: }; /** - * This selects all items by the tqmask given with the first Parameter + * This selects all items by the mask given with the first Parameter */ class exp_Select : public exp_simpleplaceholder { static const exp_Select instance; @@ -462,17 +462,17 @@ TagString exp_List::expFunc( const ListPanel* panel, const TQStringList& paramet // get selected items from view TQStringList items; - TQString tqmask; + TQString mask; if ( parameter.count() <= 3 || parameter[3].isEmpty() ) - tqmask = "*"; + mask = "*"; else - tqmask = parameter[3]; + mask = parameter[3]; return separateAndQuote( fileList(panel, parameter.empty() ? TQString() : parameter[0].lower(), - tqmask, parameter.count() > 2 ? parameter[2].lower()=="yes" : false, + mask, parameter.count() > 2 ? parameter[2].lower()=="yes" : false, useUrl, exp, "List"), parameter.count() > 1 ? parameter[1] : " ", parameter.count() > 4 ? parameter[4].lower()=="yes" : true); @@ -494,12 +494,12 @@ TagString exp_ListFile::expFunc( const ListPanel* panel, const TQStringList& par // get selected items from view TQStringList items; - TQString tqmask; + TQString mask; if ( parameter.count() <= 3 || parameter[3].isEmpty() ) - tqmask = "*"; + mask = "*"; else - tqmask = parameter[3]; + mask = parameter[3]; KTempFile tmpFile( locateLocal("tmp", "krusader"), ".itemlist" ); if ( tmpFile.status() != 0 ) { @@ -511,7 +511,7 @@ TagString exp_ListFile::expFunc( const ListPanel* panel, const TQStringList& par stream << separateAndQuote( fileList(panel, parameter.empty() ? TQString() : parameter[0].lower(), - tqmask, parameter.count()>2 ? parameter[2].lower()=="yes" : false, + mask, parameter.count()>2 ? parameter[2].lower()=="yes" : false, useUrl, exp, "ListFile"), parameter.count() > 1 ? parameter[1] : "\n", parameter.count() > 4 ? parameter[4].lower()=="yes" : true) @@ -526,25 +526,25 @@ exp_Select::exp_Select() { _description = i18n("Manipulate the Selection..."); _needPanel = true; - addParameter( exp_parameter( i18n("Selection tqmask:"), "__select", true ) ); + addParameter( exp_parameter( i18n("Selection mask:"), "__select", true ) ); addParameter( exp_parameter( i18n("Manipulate in which way:"), "__choose:Set;Add;Remove", false ) ); } TagString exp_Select::expFunc( const ListPanel* panel, const TQStringList& parameter, const bool& , Expander& exp) const { NEED_PANEL - KRQuery tqmask; + KRQuery mask; if ( parameter.count() <= 0 || parameter[0].isEmpty() ) - tqmask = KRQuery( "*" ); + mask = KRQuery( "*" ); else - tqmask = KRQuery( parameter[0] ); + mask = KRQuery( parameter[0] ); if ( parameter[1].lower() == "add") - panel->view->select( tqmask ); + panel->view->select( mask ); else if ( parameter[1].lower() == "remove") - panel->view->unselect( tqmask ); + panel->view->unselect( mask ); else { // parameter[1].lower() == "set" or isEmpty() or whatever panel->view->unselect( KRQuery( "*" ) ); - panel->view->select( tqmask ); + panel->view->select( mask ); } return TQString(); // this doesn't return anything, that's normal! @@ -779,16 +779,16 @@ exp_Each::exp_Each() { TagString exp_Each::expFunc( const ListPanel* panel, const TQStringList& parameter, const bool& useUrl, Expander& exp ) const { NEED_PANEL - TQString tqmask; + TQString mask; if ( parameter.count() <= 2 || parameter[2].isEmpty() ) - tqmask = "*"; + mask = "*"; else - tqmask = parameter[2]; + mask = parameter[2]; TagString ret; TQStringList l = fileList(panel, parameter.empty() ? TQString() : parameter[0].lower(), - tqmask, parameter.count() > 1 && parameter[1].lower()=="yes", + mask, parameter.count() > 1 && parameter[1].lower()=="yes", useUrl, exp, "Each"); if(!(parameter.count()<=3 || parameter[3].lower()!="yes")) diff --git a/krusader/UserAction/expander.h b/krusader/UserAction/expander.h index a8b3156..3232e16 100644 --- a/krusader/UserAction/expander.h +++ b/krusader/UserAction/expander.h @@ -77,7 +77,7 @@ protected: static void setError(Expander& exp,const Error& e) ; static void panelMissingError(const TQString &s, Expander& exp); static TQStringList splitEach(const TagString& s); - static TQStringList fileList(const ListPanel* const panel,const TQString& type,const TQString& tqmask,const bool ommitPath,const bool useUrl,Expander&,const TQString&); + static TQStringList fileList(const ListPanel* const panel,const TQString& type,const TQString& mask,const bool ommitPath,const bool useUrl,Expander&,const TQString&); exp_placeholder(); exp_placeholder(const exp_placeholder& p); ~exp_placeholder() { } @@ -120,7 +120,7 @@ protected: * - @em Count is replaced by a nomber of * -# Either "All", "Files", "Dirs", "Selected" * . - * - @em Filter is preplaced by the panels filter-tqmask (ex: "*.cpp *.h") + * - @em Filter is preplaced by the panels filter-mask (ex: "*.cpp *.h") * - @em Current is replaced by the current item or, in case of onmultiple="call_each", by each selected item. * -# If "yes", only the filename (without path) is returned * . @@ -128,12 +128,12 @@ protected: * -# Either "All", "Files", "Dirs", "Selected" * -# A seperator between the items (default: " " [one space]) * -# If "yes", only the filename (without path) is returned - * -# (for all but "Selected") a filter-tqmask (default: "*") + * -# (for all but "Selected") a filter-mask (default: "*") * . * . * - Access to panel-dependent, krusader-internal, parameter-needed functions (panel-indicator has to be 'a', 'o', 'r' or 'l') * - @em Select manipulates the selection of the panel - * -# A filter-tqmask (nessesary) + * -# A filter-mask (nessesary) * -# Either "Add", "Remove", "Set" (default) * . * - @em Bookmark manipulates the selection of the panel diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index 7db7173..2267b7d 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -42,8 +42,8 @@ ////////////////////////////////// KrActionProcDlg ///////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////// #include <tqlayout.h> -KrActionProcDlg::KrActionProcDlg( TQString caption, bool enableStderr, TQWidget *tqparent ) : -KDialogBase( tqparent, 0, false, caption, KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Cancel ), +KrActionProcDlg::KrActionProcDlg( TQString caption, bool enableStderr, TQWidget *parent ) : +KDialogBase( parent, 0, false, caption, KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Cancel ), _stdout(0), _stderr(0), _currentTextEdit(0) { setButtonOK( i18n( "Close" ) ); @@ -93,7 +93,7 @@ _stdout(0), _stderr(0), _currentTextEdit(0) { // HACK This fetches the tqlayout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API // None the less it's quite save to use since this implementation hasn't changed since KDE-3.3 (I haven't looked at earlier // versions since we don't support them) and now all work is done in KDE-4. - TQWidget* buttonBox = TQT_TQWIDGET( actionButton(KDialogBase::Ok)->tqparent() ); + TQWidget* buttonBox = TQT_TQWIDGET( actionButton(KDialogBase::Ok)->parent() ); TQBoxLayout* buttonBoxLayout = static_cast<TQBoxLayout*>( buttonBox->tqlayout() ); TQCheckBox* useFixedFont = new TQCheckBox( i18n("Use font with fixed width"), buttonBox ); buttonBoxLayout->insertWidget( 0, useFixedFont ); @@ -135,7 +135,7 @@ void KrActionProcDlg::slotUser1() { TQFile file( filename ); int answer = KMessageBox::Yes; if ( file.exists() ) - answer = KMessageBox::warningYesNoCancel( this, //tqparent + answer = KMessageBox::warningYesNoCancel( this, //parent i18n("This file already exists.\nDo you want to overwrite it or append the output?"), //text i18n("Overwrite or append?"), //caption i18n("Overwrite"), //label for Yes-Button @@ -280,7 +280,7 @@ void KrActionProc::processExited( KProcess * ) { /////////////////////////////////////// KrAction /////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////// -KrAction::KrAction( KActionCollection *tqparent, const char* name ) : KAction( tqparent, name ) { +KrAction::KrAction( KActionCollection *parent, const char* name ) : KAction( parent, name ) { connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(exec()) ); } diff --git a/krusader/UserAction/kraction.h b/krusader/UserAction/kraction.h index dec91e1..a7f649d 100644 --- a/krusader/UserAction/kraction.h +++ b/krusader/UserAction/kraction.h @@ -32,7 +32,7 @@ class KrAction: public KAction, public KrActionBase { Q_OBJECT TQ_OBJECT public: - KrAction( KActionCollection *tqparent, const char* name ); + KrAction( KActionCollection *parent, const char* name ); ~KrAction(); /** @@ -124,7 +124,7 @@ class KrActionProcDlg: public KDialogBase { Q_OBJECT TQ_OBJECT public: - KrActionProcDlg( TQString caption, bool enableStderr = false, TQWidget *tqparent = 0 ); + KrActionProcDlg( TQString caption, bool enableStderr = false, TQWidget *parent = 0 ); protected slots: void addStderr( KProcess *proc, char *buffer, int buflen ); diff --git a/krusader/UserAction/useractionpopupmenu.cpp b/krusader/UserAction/useractionpopupmenu.cpp index 4339e78..46c7688 100644 --- a/krusader/UserAction/useractionpopupmenu.cpp +++ b/krusader/UserAction/useractionpopupmenu.cpp @@ -18,7 +18,7 @@ #include "useraction.h" #include "kraction.h" -UserActionPopupMenu::UserActionPopupMenu( KURL currentURL, TQWidget *tqparent ) : KPopupMenu( tqparent, "useraction popupmenu" ) { +UserActionPopupMenu::UserActionPopupMenu( KURL currentURL, TQWidget *parent ) : KPopupMenu( parent, "useraction popupmenu" ) { UserAction::KrActionList list = krUserAction->actionList(); for ( KrAction* action = list.first(); action; action = list.next() ) if ( action->isAvailable( currentURL ) ) diff --git a/krusader/UserAction/useractionpopupmenu.h b/krusader/UserAction/useractionpopupmenu.h index 4453dfd..8410ca0 100644 --- a/krusader/UserAction/useractionpopupmenu.h +++ b/krusader/UserAction/useractionpopupmenu.h @@ -19,7 +19,7 @@ class KURL; class UserActionPopupMenu : public KPopupMenu { public: - UserActionPopupMenu( KURL currentURL, TQWidget *tqparent = 0 ); + UserActionPopupMenu( KURL currentURL, TQWidget *parent = 0 ); }; #endif // ifndef USERACTIONPOPUPMENU_H diff --git a/krusader/UserMenu/usermenu.cpp b/krusader/UserMenu/usermenu.cpp index 8d1f3bf..1ae7f4b 100644 --- a/krusader/UserMenu/usermenu.cpp +++ b/krusader/UserMenu/usermenu.cpp @@ -29,7 +29,7 @@ void UserMenu::exec() { _popup->run(); } -UserMenu::UserMenu( TQWidget * tqparent, const char * name ) : TQWidget( tqparent, name ) { +UserMenu::UserMenu( TQWidget * parent, const char * name ) : TQWidget( parent, name ) { _popup = new UserMenuGui(this); } @@ -41,7 +41,7 @@ void UserMenu::update() { ////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////// -UserMenuGui::UserMenuGui( UserMenu *, TQWidget * tqparent ) : KPopupMenu( tqparent ) { +UserMenuGui::UserMenuGui( UserMenu *, TQWidget * parent ) : KPopupMenu( parent ) { createMenu(); } diff --git a/krusader/UserMenu/usermenu.h b/krusader/UserMenu/usermenu.h index 29af08e..755f468 100644 --- a/krusader/UserMenu/usermenu.h +++ b/krusader/UserMenu/usermenu.h @@ -25,7 +25,7 @@ class UserMenu; class UserMenuGui: public KPopupMenu { public: - UserMenuGui( UserMenu* menu, TQWidget *tqparent = 0 ); + UserMenuGui( UserMenu* menu, TQWidget *parent = 0 ); void run(); void createMenu(); @@ -35,7 +35,7 @@ class UserMenuGui: public KPopupMenu { class UserMenu : public TQWidget { public: - UserMenu( TQWidget *tqparent = 0, const char *name = 0 ); + UserMenu( TQWidget *parent = 0, const char *name = 0 ); void exec(); void update(); diff --git a/krusader/VFS/krquery.h b/krusader/VFS/krquery.h index e7bb86f..100039b 100644 --- a/krusader/VFS/krquery.h +++ b/krusader/VFS/krquery.h @@ -66,7 +66,7 @@ public: // sets the text for name filtering void setNameFilter( const TQString &text, bool cs=true ); - // returns the current filter tqmask + // returns the current filter mask const TQString& nameFilter() const { return origFilter; } // returns whether the filter is case sensitive bool isCaseSensitive() { return matchesCaseSensitive; } diff --git a/krusader/VFS/krvfshandler.cpp b/krusader/VFS/krvfshandler.cpp index 72a436d..553c55d 100644 --- a/krusader/VFS/krvfshandler.cpp +++ b/krusader/VFS/krvfshandler.cpp @@ -48,7 +48,7 @@ vfs::VFS_TYPE KrVfsHandler::getVfsType(const KURL& url){ return vfs::ERROR; } -vfs* KrVfsHandler::getVfs(const KURL& url,TQObject* tqparent,vfs* oldVfs){ +vfs* KrVfsHandler::getVfs(const KURL& url,TQObject* parent,vfs* oldVfs){ vfs::VFS_TYPE newType,oldType = vfs::ERROR; if(oldVfs) oldType = oldVfs->vfs_getType(); @@ -59,10 +59,10 @@ vfs* KrVfsHandler::getVfs(const KURL& url,TQObject* tqparent,vfs* oldVfs){ if( oldType != newType ){ switch( newType ){ - case (vfs::NORMAL) : newVfs = new normal_vfs(tqparent); break; - case (vfs::FTP ) : newVfs = new ftp_vfs(tqparent) ; break; - case (vfs::TEMP ) : newVfs = 0/*new temp_vfs(tqparent)*/ ; break; - case (vfs::VIRT ) : newVfs = new virt_vfs(tqparent) ; break; + case (vfs::NORMAL) : newVfs = new normal_vfs(parent); break; + case (vfs::FTP ) : newVfs = new ftp_vfs(parent) ; break; + case (vfs::TEMP ) : newVfs = 0/*new temp_vfs(parent)*/ ; break; + case (vfs::VIRT ) : newVfs = new virt_vfs(parent) ; break; case (vfs::ERROR ) : newVfs = 0 ; break; } } diff --git a/krusader/VFS/krvfshandler.h b/krusader/VFS/krvfshandler.h index 900af8a..b061b53 100644 --- a/krusader/VFS/krvfshandler.h +++ b/krusader/VFS/krvfshandler.h @@ -34,7 +34,7 @@ public: ~KrVfsHandler(); static vfs::VFS_TYPE getVfsType(const KURL& url); - static vfs* getVfs(const KURL& url,TQObject* tqparent=0,vfs* oldVfs=0); + static vfs* getVfs(const KURL& url,TQObject* parent=0,vfs* oldVfs=0); }; #endif diff --git a/krusader/VFS/preservingcopyjob.cpp b/krusader/VFS/preservingcopyjob.cpp index 23d62e1..d374004 100644 --- a/krusader/VFS/preservingcopyjob.cpp +++ b/krusader/VFS/preservingcopyjob.cpp @@ -232,7 +232,7 @@ void PreservingCopyJob::slotCopyingDone( KIO::Job *, const KURL &from, const KUR unsigned i=0; TQString path = to.path( -1 ); - for( ; i != directoriesToStamp.count(); i++ ) // sort the URL-s to avoid tqparent time stamp modification + for( ; i != directoriesToStamp.count(); i++ ) // sort the URL-s to avoid parent time stamp modification if( path >= directoriesToStamp[ i ].path( -1 ) ) break; diff --git a/krusader/krservices.cpp b/krusader/krservices.cpp index e3af5c7..a26620e 100644 --- a/krusader/krservices.cpp +++ b/krusader/krservices.cpp @@ -192,7 +192,7 @@ TQString KrServices::escape( TQString name ) { // ------- KEasyProcess -KEasyProcess::KEasyProcess(TQObject *tqparent, const char *name): KProcess(tqparent, name) { +KEasyProcess::KEasyProcess(TQObject *parent, const char *name): KProcess(parent, name) { init(); } diff --git a/krusader/krservices.h b/krusader/krservices.h index 9d348c2..8383786 100644 --- a/krusader/krservices.h +++ b/krusader/krservices.h @@ -60,7 +60,7 @@ class KEasyProcess: public KProcess { Q_OBJECT TQ_OBJECT public: - KEasyProcess(TQObject *tqparent, const char *name=0); + KEasyProcess(TQObject *parent, const char *name=0); KEasyProcess(); virtual ~KEasyProcess() {} diff --git a/krusader/krslots.cpp b/krusader/krslots.cpp index f4efc56..fcd7ade 100644 --- a/krusader/krslots.cpp +++ b/krusader/krslots.cpp @@ -313,7 +313,7 @@ void KRslots::customFilter() { ACTIVE_PANEL->setFilter(KrViewProperties::Custom void KRslots::markAll() { ACTIVE_PANEL->select(true,true); } void KRslots::unmarkAll() { ACTIVE_PANEL->select(false,true); } void KRslots::markGroup() { ACTIVE_PANEL->select(true,false); } -void KRslots::markGroup(const TQString& tqmask, bool select) { ACTIVE_PANEL->select( KRQuery( tqmask ), select); } +void KRslots::markGroup(const TQString& mask, bool select) { ACTIVE_PANEL->select( KRQuery( mask ), select); } void KRslots::unmarkGroup() { ACTIVE_PANEL->select(false,false); } void KRslots::invert() { ACTIVE_PANEL->invertSelection(); } diff --git a/krusader/krslots.h b/krusader/krslots.h index f48292a..c3e39e5 100644 --- a/krusader/krslots.h +++ b/krusader/krslots.h @@ -54,7 +54,7 @@ class KRslots : public TQObject { public: enum compareMode { full } ; - KRslots(TQObject *tqparent): TQObject(tqparent, "KRslots") {} + KRslots(TQObject *parent): TQObject(parent, "KRslots") {} ~KRslots() {} public slots: diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp index 42e258f..c8fb622 100644 --- a/krusader/krusaderview.cpp +++ b/krusader/krusaderview.cpp @@ -50,7 +50,7 @@ #include "krservices.h" #include <tqclipboard.h> -KrusaderView::KrusaderView( TQWidget *tqparent ) : TQWidget( tqparent, "KrusaderView" ), activePanel(0), +KrusaderView::KrusaderView( TQWidget *parent ) : TQWidget( parent, "KrusaderView" ), activePanel(0), konsole_part( 0L ) {} void KrusaderView::start( TQStringList leftTabs, TQStringList leftTypes, TQValueList<int> leftProps, int leftActiveTab, diff --git a/krusader/krusaderview.h b/krusader/krusaderview.h index ff8d8cc..fa22032 100644 --- a/krusader/krusaderview.h +++ b/krusader/krusaderview.h @@ -59,7 +59,7 @@ class KrusaderView : public TQWidget { TQ_OBJECT public: - KrusaderView(TQWidget *tqparent=0); + KrusaderView(TQWidget *parent=0); virtual ~KrusaderView(){} void start(TQStringList leftTabs, TQStringList leftTypes, TQValueList<int> leftProps, int leftActiveTab, TQStringList rightTabs, TQStringList rightTypes, TQValueList<int> rightProps, int rightActiveTab, diff --git a/krusader/panelmanager.cpp b/krusader/panelmanager.cpp index e19a9d9..10fa058 100644 --- a/krusader/panelmanager.cpp +++ b/krusader/panelmanager.cpp @@ -19,8 +19,8 @@ #define _self (*_selfPtr) #define _other (*_otherPtr) -PanelManager::PanelManager( TQWidget *tqparent, bool left ) : -TQWidget( tqparent, "PanelManager" ), _layout( 0 ), _left( left ), +PanelManager::PanelManager( TQWidget *parent, bool left ) : +TQWidget( parent, "PanelManager" ), _layout( 0 ), _left( left ), _selfPtr( _left ? &MAIN_VIEW->left : &MAIN_VIEW->right ), _otherPtr( _left ? &MAIN_VIEW->right : &MAIN_VIEW->left ) { _layout = new TQGridLayout( this, 1, 1 ); diff --git a/krusader/panelmanager.h b/krusader/panelmanager.h index 4a2b8fe..87324bb 100644 --- a/krusader/panelmanager.h +++ b/krusader/panelmanager.h @@ -23,7 +23,7 @@ class PanelManager: public TQWidget { * (self, other, active), which enables it to manage pointers held by the panels transparently. * It also receives a bool (left) which is true if the manager is the left one, or false otherwise. */ - PanelManager( TQWidget *tqparent, bool left ); + PanelManager( TQWidget *parent, bool left ); /** * Called once by KrusaderView to create the first panel. Subsequent called are done internally * Note: only creates the panel, but doesn't start the VFS inside it. Use startPanel() for that. diff --git a/krusader/paneltabbar.cpp b/krusader/paneltabbar.cpp index d8f7b63..f691dc6 100644 --- a/krusader/paneltabbar.cpp +++ b/krusader/paneltabbar.cpp @@ -31,7 +31,7 @@ #define DISPLAY(X) (X.isLocalFile() ? X.path() : X.prettyURL()) -PanelTabBar::PanelTabBar(TQWidget *tqparent): TQTabBar(tqparent), _maxTabLength(0) { +PanelTabBar::PanelTabBar(TQWidget *parent): TQTabBar(parent), _maxTabLength(0) { _panelActionMenu = new KActionMenu( i18n("Panel"), TQT_TQOBJECT(this) ); setAcceptDrops(true); @@ -172,7 +172,7 @@ TQString PanelTabBar::squeeze(TQString text, int index) { TQFontMetrics fm(fontMetrics()); // set the real max length - _maxTabLength = (TQT_TQWIDGET(tqparent())->width()-(6*fm.width("W")))/fm.width("W"); + _maxTabLength = (TQT_TQWIDGET(parent())->width()-(6*fm.width("W")))/fm.width("W"); // each tab gets a fair share of the max tab length int _effectiveTabLength = _maxTabLength / (count() == 0 ? 1 : count()); diff --git a/krusader/paneltabbar.h b/krusader/paneltabbar.h index 598e3ed..6da084d 100644 --- a/krusader/paneltabbar.h +++ b/krusader/paneltabbar.h @@ -46,7 +46,7 @@ class PanelTabBar : public TQTabBar { Q_OBJECT TQ_OBJECT public: - PanelTabBar( TQWidget *tqparent ); + PanelTabBar( TQWidget *parent ); public slots: /** |