From 24e8639baba48189daf979443a263a2c74560c89 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 21 Dec 2011 14:05:56 -0600 Subject: Rename obsolete tq methods to standard names (cherry picked from commit 843b060e709db05ef75abc3495400e5f159fb4b2) --- iso/kiso.cpp | 4 +- krusader/ActionMan/actionpropertybase.cpp | 42 +++++++------- krusader/ActionMan/actionpropertybase.ui | 6 +- krusader/ActionMan/addplaceholderpopup.cpp | 78 ++++++++++++------------- krusader/ActionMan/useractionpage.cpp | 10 ++-- krusader/BookMan/kraddbookmarkdlg.cpp | 16 ++--- krusader/Dialogs/checksumdlg.cpp | 84 +++++++++++++-------------- krusader/Dialogs/krkeydialog.cpp | 4 +- krusader/Dialogs/newftpgui.cpp | 4 +- krusader/Dialogs/packguibase.cpp | 2 +- krusader/Dialogs/popularurls.cpp | 10 ++-- krusader/DiskUsage/diskusage.cpp | 8 +-- krusader/DiskUsage/diskusagegui.cpp | 4 +- krusader/DiskUsage/radialMap/map.cpp | 2 +- krusader/Filter/advancedfilter.cpp | 18 +++--- krusader/Filter/filterdialog.cpp | 2 +- krusader/Filter/generalfilter.cpp | 30 +++++----- krusader/GUI/kcmdline.cpp | 12 ++-- krusader/GUI/kfnkeys.cpp | 22 +++---- krusader/GUI/kfnkeys.h | 2 +- krusader/KViewer/diskusageviewer.cpp | 4 +- krusader/KViewer/diskusageviewer.h | 2 +- krusader/Konfigurator/kgadvanced.cpp | 6 +- krusader/Konfigurator/kgarchives.cpp | 4 +- krusader/Konfigurator/kgcolors.cpp | 8 +-- krusader/Konfigurator/kggeneral.cpp | 2 +- krusader/Konfigurator/kglookfeel.cpp | 18 +++--- krusader/Konfigurator/kgprotocols.cpp | 10 ++-- krusader/Konfigurator/kgstartup.cpp | 4 +- krusader/Konfigurator/kguseractions.cpp | 6 +- krusader/Konfigurator/konfiguratorpage.cpp | 30 +++++----- krusader/Konfigurator/konfiguratorpage.h | 12 ++-- krusader/Konfigurator/krresulttable.h | 6 +- krusader/Locate/locate.cpp | 4 +- krusader/MountMan/kmountmangui.cpp | 6 +- krusader/MountMan/kmountmangui.h | 2 +- krusader/Panel/krbriefview.cpp | 4 +- krusader/Panel/krdetailedview.cpp | 6 +- krusader/Panel/listpanel.cpp | 24 ++++---- krusader/Panel/listpanel.h | 2 +- krusader/Panel/panelfunc.cpp | 4 +- krusader/Panel/panelpopup.cpp | 30 +++++----- krusader/RemoteMan/remotemanbase.cpp | 16 ++--- krusader/RemoteMan/remotemanbase.h | 2 +- krusader/Search/krsearchdialog.cpp | 10 ++-- krusader/Synchronizer/feedtolistboxdialog.cpp | 8 +-- krusader/Synchronizer/synchronizedialog.cpp | 22 +++---- krusader/Synchronizer/synchronizer.cpp | 6 +- krusader/Synchronizer/synchronizergui.cpp | 20 +++---- krusader/UserAction/expander.cpp | 8 +-- krusader/UserAction/kraction.cpp | 4 +- krusader/calc.ui | 2 +- krusader/krusaderview.cpp | 4 +- 53 files changed, 328 insertions(+), 328 deletions(-) diff --git a/iso/kiso.cpp b/iso/kiso.cpp index 61baaf4..45dde07 100644 --- a/iso/kiso.cpp +++ b/iso/kiso.cpp @@ -55,7 +55,7 @@ //////////////////////////////////////////////////////////////////////// /** - * puts the track tqlayout of the device 'fname' into 'tracks' + * puts the track layout of the device 'fname' into 'tracks' * tracks structure: start sector, track number, ... * tracks should be 100*2 entry long (this is the maximum in the CD-ROM standard) * currently it's linux only, porters are welcome @@ -359,7 +359,7 @@ bool KIso::openArchive( int mode ) memset(&buf,0,sizeof(struct stat)); buf.st_mode=0777; } else { - /* If it's a block device, try to query the track tqlayout (for multisession) */ + /* If it's a block device, try to query the track layout (for multisession) */ if (m_startsec == -1 && S_ISBLK(buf.st_mode)) trackno=getTracks(m_filename.latin1(),(int*) &tracks); } diff --git a/krusader/ActionMan/actionpropertybase.cpp b/krusader/ActionMan/actionpropertybase.cpp index e4238e1..a73ee37 100644 --- a/krusader/ActionMan/actionpropertybase.cpp +++ b/krusader/ActionMan/actionpropertybase.cpp @@ -64,9 +64,9 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla bgAccept = new TQButtonGroup( tab, "bgAccept" ); bgAccept->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgAccept->sizePolicy().hasHeightForWidth() ) ); bgAccept->setColumnLayout(0, Qt::Vertical ); - bgAccept->tqlayout()->setSpacing( 6 ); - bgAccept->tqlayout()->setMargin( 11 ); - bgAcceptLayout = new TQGridLayout( bgAccept->tqlayout() ); + bgAccept->layout()->setSpacing( 6 ); + bgAccept->layout()->setMargin( 11 ); + bgAcceptLayout = new TQGridLayout( bgAccept->layout() ); bgAcceptLayout->setAlignment( TQt::AlignTop ); radioLocal = new TQRadioButton( bgAccept, "radioLocal" ); @@ -89,25 +89,25 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla tabLayout->addWidget( LabelTitle, 2, 0 ); - tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); + layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); - tqlayout2 = new TQVBoxLayout( 0, 0, 6, "tqlayout2"); + layout2 = new TQVBoxLayout( 0, 0, 6, "layout2"); leDistinctName = new KLineEdit( tab, "leDistinctName" ); - tqlayout2->addWidget( leDistinctName ); + layout2->addWidget( leDistinctName ); cbCategory = new KComboBox( FALSE, tab, "cbCategory" ); cbCategory->setEditable( TRUE ); - tqlayout2->addWidget( cbCategory ); - tqlayout3->addLayout( tqlayout2 ); + layout2->addWidget( cbCategory ); + layout3->addLayout( layout2 ); ButtonIcon = new KIconButton( tab, "ButtonIcon" ); ButtonIcon->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, ButtonIcon->sizePolicy().hasHeightForWidth() ) ); ButtonIcon->setMinimumSize( TQSize( 50, 50 ) ); ButtonIcon->setMaximumSize( TQSize( 50, 50 ) ); - tqlayout3->addWidget( ButtonIcon ); + layout3->addWidget( ButtonIcon ); - tabLayout->addMultiCellLayout( tqlayout3, 0, 1, 1, 3 ); + tabLayout->addMultiCellLayout( layout3, 0, 1, 1, 3 ); LabelDistinctName = new TQLabel( tab, "LabelDistinctName" ); LabelDistinctName->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, LabelDistinctName->sizePolicy().hasHeightForWidth() ) ); @@ -159,24 +159,24 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla spacer = new TQSpacerItem( 80, 19, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); tabLayout->addItem( spacer, 6, 0 ); - tqlayout4 = new TQHBoxLayout( 0, 0, 6, "tqlayout4"); + layout4 = new TQHBoxLayout( 0, 0, 6, "layout4"); LabelShortcut = new TQLabel( tab, "LabelShortcut" ); - tqlayout4->addWidget( LabelShortcut ); + layout4->addWidget( LabelShortcut ); spacer6_2 = new TQSpacerItem( 161, 21, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - tqlayout4->addItem( spacer6_2 ); + layout4->addItem( spacer6_2 ); KeyButtonShortcut = new KKeyButton( tab, "KeyButtonShortcut" ); - tqlayout4->addWidget( KeyButtonShortcut ); + layout4->addWidget( KeyButtonShortcut ); - tabLayout->addMultiCellLayout( tqlayout4, 10, 10, 2, 3 ); + tabLayout->addMultiCellLayout( layout4, 10, 10, 2, 3 ); bgExecType = new TQButtonGroup( tab, "bgExecType" ); bgExecType->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, 0, 0, bgExecType->sizePolicy().hasHeightForWidth() ) ); bgExecType->setColumnLayout(0, Qt::Vertical ); - bgExecType->tqlayout()->setSpacing( 6 ); - bgExecType->tqlayout()->setMargin( 11 ); - bgExecTypeLayout = new TQGridLayout( bgExecType->tqlayout() ); + bgExecType->layout()->setSpacing( 6 ); + bgExecType->layout()->setMargin( 11 ); + bgExecTypeLayout = new TQGridLayout( bgExecType->layout() ); bgExecTypeLayout->setAlignment( TQt::AlignTop ); radioCollectOutput = new TQRadioButton( bgExecType, "radioCollectOutput" ); @@ -206,9 +206,9 @@ ActionPropertyBase::ActionPropertyBase( TQWidget* parent, const char* name, WFla gbShowonly = new TQGroupBox( tab_2, "gbShowonly" ); gbShowonly->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, gbShowonly->sizePolicy().hasHeightForWidth() ) ); gbShowonly->setColumnLayout(0, Qt::Vertical ); - gbShowonly->tqlayout()->setSpacing( 6 ); - gbShowonly->tqlayout()->setMargin( 11 ); - gbShowonlyLayout = new TQGridLayout( gbShowonly->tqlayout() ); + gbShowonly->layout()->setSpacing( 6 ); + gbShowonly->layout()->setMargin( 11 ); + gbShowonlyLayout = new TQGridLayout( gbShowonly->layout() ); gbShowonlyLayout->setAlignment( TQt::AlignTop ); tabShowonly = new TQTabWidget( gbShowonly, "tabShowonly" ); diff --git a/krusader/ActionMan/actionpropertybase.ui b/krusader/ActionMan/actionpropertybase.ui index 7415e58..9ecfd94 100644 --- a/krusader/ActionMan/actionpropertybase.ui +++ b/krusader/ActionMan/actionpropertybase.ui @@ -142,7 +142,7 @@ - tqlayout3 + layout3 @@ -150,7 +150,7 @@ - tqlayout2 + layout2 @@ -390,7 +390,7 @@ Please consult the handbook to learn more about the syntax. - tqlayout4 + layout4 diff --git a/krusader/ActionMan/addplaceholderpopup.cpp b/krusader/ActionMan/addplaceholderpopup.cpp index d15459f..664b32b 100644 --- a/krusader/ActionMan/addplaceholderpopup.cpp +++ b/krusader/ActionMan/addplaceholderpopup.cpp @@ -136,9 +136,9 @@ ParameterDialog::ParameterDialog( const exp_placeholder* currentPlaceholder, TQW _parameter.clear(); _parameterCount = currentPlaceholder->parameterCount(); - TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage() ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 11 ); + TQVBoxLayout* layout = new TQVBoxLayout( plainPage() ); + layout->setAutoAdd( true ); + layout->setSpacing( 11 ); new TQLabel( i18n("This placeholder allows some parameter:"), plainPage(), "intro" ); @@ -220,9 +220,9 @@ void ParameterDialog::slotOk() { ///////////// ParameterText ParameterText::ParameterText( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _lineEdit = new KLineEdit( parameter.preset(), this ); @@ -247,9 +247,9 @@ bool ParameterText::valid() { ///////////// ParameterPlaceholder ParameterPlaceholder::ParameterPlaceholder( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); TQHBox * hbox = new TQHBox( this ); @@ -284,9 +284,9 @@ void ParameterPlaceholder::addPlaceholder() { ///////////// ParameterYes ParameterYes::ParameterYes( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); _checkBox = new TQCheckBox( i18n( parameter.description().utf8() ), this ); _checkBox->setChecked( true ); @@ -310,9 +310,9 @@ bool ParameterYes::valid() { ///////////// ParameterNo ParameterNo::ParameterNo( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); _checkBox = new TQCheckBox( i18n( parameter.description().utf8() ), this ); _checkBox->setChecked( false ); @@ -336,9 +336,9 @@ bool ParameterNo::valid() { ///////////// ParameterFile ParameterFile::ParameterFile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); TQHBox * hbox = new TQHBox( this ); @@ -372,9 +372,9 @@ void ParameterFile::addFile() { ///////////// ParameterChoose ParameterChoose::ParameterChoose( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -396,9 +396,9 @@ bool ParameterChoose::valid() { ///////////// ParameterSelect ParameterSelect::ParameterSelect( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -428,9 +428,9 @@ bool ParameterSelect::valid() { ///////////// ParameterGoto ParameterGoto::ParameterGoto( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); TQHBox * hbox = new TQHBox( this ); @@ -474,9 +474,9 @@ void ParameterGoto::addPlaceholder() { ///////////// ParameterSyncprofile ParameterSyncprofile::ParameterSyncprofile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -499,9 +499,9 @@ bool ParameterSyncprofile::valid() { ///////////// ParameterSearch ParameterSearch::ParameterSearch( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -524,9 +524,9 @@ bool ParameterSearch::valid() { ///////////// ParameterPanelprofile ParameterPanelprofile::ParameterPanelprofile( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _combobox = new KComboBox( this ); @@ -549,9 +549,9 @@ bool ParameterPanelprofile::valid() { ///////////// ParameterInt ParameterInt::ParameterInt( const exp_parameter& parameter, TQWidget* parent ) : ParameterBase( parameter, parent ) { - TQHBoxLayout* tqlayout = new TQHBoxLayout( this ); - tqlayout->setAutoAdd( true ); - tqlayout->setSpacing( 6 ); + TQHBoxLayout* layout = new TQHBoxLayout( this ); + layout->setAutoAdd( true ); + layout->setSpacing( 6 ); new TQLabel( i18n( parameter.description().utf8() ), this ); _spinbox = new KIntSpinBox( this ); diff --git a/krusader/ActionMan/useractionpage.cpp b/krusader/ActionMan/useractionpage.cpp index 99d9b08..5a57420 100644 --- a/krusader/ActionMan/useractionpage.cpp +++ b/krusader/ActionMan/useractionpage.cpp @@ -37,10 +37,10 @@ static const char* FILE_FILTER = I18N_NOOP("*.xml|xml-files\n*|all files"); UserActionPage::UserActionPage( TQWidget* parent ) : TQWidget( parent, "UserActionPage" ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 0, 6, "UserActionPageLayout" ); // 0px margin, 6px item-spacing + TQVBoxLayout* layout = new TQVBoxLayout( this, 0, 6, "UserActionPageLayout" ); // 0px margin, 6px item-spacing // ======== pseudo-toolbar start ======== - TQHBoxLayout* toolbarLayout = new TQHBoxLayout( tqlayout, 0, 0 ); // neither margin nor spacing for the toolbar with autoRaise + TQHBoxLayout* toolbarLayout = new TQHBoxLayout( layout, 0, 0 ); // neither margin nor spacing for the toolbar with autoRaise newButton = new TQToolButton( this, "newButton" ); newButton->setPixmap( ICON("filenew") ); @@ -93,7 +93,7 @@ UserActionPage::UserActionPage( TQWidget* parent ) ); */ TQSplitter *split = new TQSplitter( this, "useractionpage splitter"); - tqlayout->addWidget( split, 1000 ); // again a very large stretch-factor to fix the height of the toolbar + layout->addWidget( split, 1000 ); // again a very large stretch-factor to fix the height of the toolbar actionTree = new UserActionListView( split, "actionTree" ); actionProperties = new ActionProperty( split, "actionProperties" ); @@ -278,12 +278,12 @@ void UserActionPage::slotToClip() { return; TQDomDocument doc = actionTree->dumpSelectedActions(); - KApplication::tqclipboard()->setText( doc.toString() ); + KApplication::clipboard()->setText( doc.toString() ); } void UserActionPage::slotFromClip() { TQDomDocument doc( ACTION_DOCTYPE ); - if ( doc.setContent( KApplication::tqclipboard()->text() ) ) { + if ( doc.setContent( KApplication::clipboard()->text() ) ) { TQDomElement root = doc.documentElement(); UserAction::KrActionList newActions; krUserAction->readFromElement( root, UserAction::renameDoublicated, &newActions ); diff --git a/krusader/BookMan/kraddbookmarkdlg.cpp b/krusader/BookMan/kraddbookmarkdlg.cpp index 3c9d3ac..47ac377 100644 --- a/krusader/BookMan/kraddbookmarkdlg.cpp +++ b/krusader/BookMan/kraddbookmarkdlg.cpp @@ -21,33 +21,33 @@ KrAddBookmarkDlg::KrAddBookmarkDlg(TQWidget *parent, KURL url): TQWidget *page = new TQWidget(this); setMainWidget(page); - TQGridLayout *tqlayout = new TQGridLayout(page, 1, 1, 0, spacingHint()); // expanding + TQGridLayout *layout = new TQGridLayout(page, 1, 1, 0, spacingHint()); // expanding // name and url TQLabel *lb1 = new TQLabel(i18n("Name:"), page); _name = new KLineEdit(page); _name->setText(url.prettyURL()); // default name is the url _name->selectAll(); // make the text selected - tqlayout->addWidget(lb1, 0, 0); - tqlayout->addWidget(_name, 0, 1); + layout->addWidget(lb1, 0, 0); + layout->addWidget(_name, 0, 1); TQLabel *lb2 = new TQLabel(i18n("URL:"), page); _url = new KLineEdit(page); - tqlayout->addWidget(lb2, 1, 0); - tqlayout->addWidget(_url, 1, 1); + layout->addWidget(lb2, 1, 0); + layout->addWidget(_url, 1, 1); _url->setText(url.prettyURL()); // set the url in the field // create in linedit and button TQLabel *lb3 = new TQLabel(i18n("Create in:"), page); _folder = new KLineEdit(page); - tqlayout->addWidget(lb3, 2, 0); - tqlayout->addWidget(_folder, 2, 1); + layout->addWidget(lb3, 2, 0); + layout->addWidget(_folder, 2, 1); _folder->setReadOnly(true); _createInBtn = new TQToolButton(page); _createInBtn->setPixmap(krLoader->loadIcon("down", KIcon::Small)); _createInBtn->setToggleButton(true); connect(_createInBtn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleCreateIn(bool ))); - tqlayout->addWidget(_createInBtn, 2, 2); + layout->addWidget(_createInBtn, 2, 2); setDetailsWidget(createInWidget()); diff --git a/krusader/Dialogs/checksumdlg.cpp b/krusader/Dialogs/checksumdlg.cpp index d6c3907..63ee9bf 100644 --- a/krusader/Dialogs/checksumdlg.cpp +++ b/krusader/Dialogs/checksumdlg.cpp @@ -222,40 +222,40 @@ CreateChecksumDlg::CreateChecksumDlg(const TQStringList& files, bool containFold return; } - TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 1, 1, + TQGridLayout *layout = new TQGridLayout( plainPage(), 1, 1, KDialogBase::marginHint(), KDialogBase::spacingHint()); int row=0; // title (icon+text) - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); TQLabel *p = new TQLabel(plainPage()); p->setPixmap(krLoader->loadIcon("binary", KIcon::Desktop, 32)); - htqlayout->addWidget(p); + hlayout->addWidget(p); TQLabel *l1 = new TQLabel(i18n("About to calculate checksum for the following files") + (containFolders ? i18n(" and folders:") : ":"), plainPage()); - htqlayout->addWidget(l1); - tqlayout->addMultiCellLayout(htqlayout, row, row, 0, 1, TQt::AlignLeft); + hlayout->addWidget(l1); + layout->addMultiCellLayout(hlayout, row, row, 0, 1, TQt::AlignLeft); ++row; // file list KListBox *lb = new KListBox(plainPage()); lb->insertStringList(files); - tqlayout->addMultiCellWidget(lb, row, row, 0, 1); + layout->addMultiCellWidget(lb, row, row, 0, 1); ++row; // checksum method - TQHBoxLayout *htqlayout2 = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout2 = new TQHBoxLayout(layout, KDialogBase::spacingHint()); TQLabel *l2 = new TQLabel(i18n("Select the checksum method:"), plainPage()); - htqlayout2->addWidget(l2); + hlayout2->addWidget(l2); KComboBox *method = new KComboBox(plainPage()); // -- fill the combo with available methods uint i; for ( i=0; iinsertItem( cs_typeToText[tools.at(i)->type], i); method->setFocus(); - htqlayout2->addWidget(method); - tqlayout->addMultiCellLayout(htqlayout2, row, row, 0, 1, TQt::AlignLeft); + hlayout2->addWidget(method); + layout->addMultiCellLayout(hlayout2, row, row, 0, 1, TQt::AlignLeft); ++row; if (exec() != Accepted) return; @@ -323,39 +323,39 @@ MatchChecksumDlg::MatchChecksumDlg(const TQStringList& files, bool containFolder return; } - TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 1, 1, + TQGridLayout *layout = new TQGridLayout( plainPage(), 1, 1, KDialogBase::marginHint(), KDialogBase::spacingHint()); int row=0; // title (icon+text) - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); TQLabel *p = new TQLabel(plainPage()); p->setPixmap(krLoader->loadIcon("binary", KIcon::Desktop, 32)); - htqlayout->addWidget(p); + hlayout->addWidget(p); TQLabel *l1 = new TQLabel(i18n("About to verify checksum for the following files") + (containFolders ? i18n(" and folders:") : ":"), plainPage()); - htqlayout->addWidget(l1); - tqlayout->addMultiCellLayout(htqlayout, row, row, 0, 1, TQt::AlignLeft); + hlayout->addWidget(l1); + layout->addMultiCellLayout(hlayout, row, row, 0, 1, TQt::AlignLeft); ++row; // file list KListBox *lb = new KListBox(plainPage()); lb->insertStringList(files); - tqlayout->addMultiCellWidget(lb, row, row, 0, 1); + layout->addMultiCellWidget(lb, row, row, 0, 1); ++row; // checksum file - TQHBoxLayout *htqlayout2 = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout2 = new TQHBoxLayout(layout, KDialogBase::spacingHint()); TQLabel *l2 = new TQLabel(i18n("Checksum file:"), plainPage()); - htqlayout2->addWidget(l2); + hlayout2->addWidget(l2); KURLRequester *checksumFileReq = new KURLRequester( plainPage() ); if (!checksumFile.isEmpty()) checksumFileReq->setURL(checksumFile); checksumFileReq->fileDialog()->setURL(path); checksumFileReq->setFocus(); - htqlayout2->addWidget(checksumFileReq); - tqlayout->addMultiCellLayout(htqlayout2, row, row, 0, 1, TQt::AlignLeft); + hlayout2->addWidget(checksumFileReq); + layout->addMultiCellLayout(hlayout2, row, row, 0, 1, TQt::AlignLeft); if (exec() != Accepted) return; TQString file = checksumFileReq->url(); @@ -428,31 +428,31 @@ bool MatchChecksumDlg::verifyChecksumFile(TQString path, TQString& extension) { // ------------- VerifyResultDlg VerifyResultDlg::VerifyResultDlg(const TQStringList& failed): KDialogBase(Plain, i18n("Verify Checksum"), Close, Close, krApp) { - TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 1, 1, + TQGridLayout *layout = new TQGridLayout( plainPage(), 1, 1, KDialogBase::marginHint(), KDialogBase::spacingHint()); bool errors = failed.size()>0; int row = 0; // create the icon and title - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); TQLabel p(plainPage()); p.setPixmap(krLoader->loadIcon(errors ? "messagebox_critical" : "messagebox_info", KIcon::Desktop, 32)); - htqlayout->addWidget(&p); + hlayout->addWidget(&p); TQLabel *l1 = new TQLabel((errors ? i18n("Errors were detected while verifying the checksums") : i18n("Checksums were verified successfully")), plainPage()); - htqlayout->addWidget(l1); - tqlayout->addMultiCellLayout(htqlayout,row,row,0,1, TQt::AlignLeft); + hlayout->addWidget(l1); + layout->addMultiCellLayout(hlayout,row,row,0,1, TQt::AlignLeft); ++row; if (errors) { TQLabel *l3 = new TQLabel(i18n("The following files have failed:"), plainPage()); - tqlayout->addMultiCellWidget(l3, row, row, 0, 1); + layout->addMultiCellWidget(l3, row, row, 0, 1); ++row; KListBox *lb2 = new KListBox(plainPage()); lb2->insertStringList(failed); - tqlayout->addMultiCellWidget(lb2, row, row, 0, 1); + layout->addMultiCellWidget(lb2, row, row, 0, 1); ++row; } @@ -464,7 +464,7 @@ VerifyResultDlg::VerifyResultDlg(const TQStringList& failed): ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStringList& stdErr, const TQString& suggestedFilename, const TQString& binary, const TQString& /* type */, bool standardFormat): KDialogBase(Plain, i18n("Create Checksum"), Ok | Cancel, Ok, krApp), _binary(binary) { - TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 1, 1, + TQGridLayout *layout = new TQGridLayout( plainPage(), 1, 1, KDialogBase::marginHint(), KDialogBase::spacingHint()); // md5 tools display errors into stderr, so we'll use that to determine the result of the job @@ -473,21 +473,21 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin int row = 0; // create the icon and title - TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint()); TQLabel p(plainPage()); p.setPixmap(krLoader->loadIcon(errors ? "messagebox_critical" : "messagebox_info", KIcon::Desktop, 32)); - htqlayout->addWidget(&p); + hlayout->addWidget(&p); TQLabel *l1 = new TQLabel((errors ? i18n("Errors were detected while creating the checksums") : i18n("Checksums were created successfully")), plainPage()); - htqlayout->addWidget(l1); - tqlayout->addMultiCellLayout(htqlayout,row,row,0,1, TQt::AlignLeft); + hlayout->addWidget(l1); + layout->addMultiCellLayout(hlayout,row,row,0,1, TQt::AlignLeft); ++row; if (successes) { if (errors) { TQLabel *l2 = new TQLabel(i18n("Here are the calculated checksums:"), plainPage()); - tqlayout->addMultiCellWidget(l2, row, row, 0, 1); + layout->addMultiCellWidget(l2, row, row, 0, 1); ++row; } KListView *lv = new KListView(plainPage()); @@ -507,7 +507,7 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin new KListViewItem(lv, line); } } - tqlayout->addMultiCellWidget(lv, row, row, 0, 1); + layout->addMultiCellWidget(lv, row, row, 0, 1); ++row; } @@ -516,15 +516,15 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin line1->setGeometry( TQRect( 60, 210, 501, 20 ) ); line1->setFrameShape( TQFrame::HLine ); line1->setFrameShadow( TQFrame::Sunken ); - tqlayout->addMultiCellWidget(line1, row, row, 0, 1); + layout->addMultiCellWidget(line1, row, row, 0, 1); ++row; TQLabel *l3 = new TQLabel(i18n("Here are the errors received:"), plainPage()); - tqlayout->addMultiCellWidget(l3, row, row, 0, 1); + layout->addMultiCellWidget(l3, row, row, 0, 1); ++row; KListBox *lb = new KListBox(plainPage()); lb->insertStringList(stdErr); - tqlayout->addMultiCellWidget(lb, row, row, 0, 1); + layout->addMultiCellWidget(lb, row, row, 0, 1); ++row; } @@ -532,14 +532,14 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin KURLRequester *checksumFile=0; TQCheckBox *saveFileCb=0; if (successes) { - TQHBoxLayout *htqlayout2 = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint()); + TQHBoxLayout *hlayout2 = new TQHBoxLayout(layout, KDialogBase::spacingHint()); saveFileCb = new TQCheckBox(i18n("Save checksum to file:"), plainPage()); saveFileCb->setChecked(true); - htqlayout2->addWidget(saveFileCb); + hlayout2->addWidget(saveFileCb); checksumFile = new KURLRequester( suggestedFilename, plainPage() ); - htqlayout2->addWidget(checksumFile, TQt::AlignLeft); - tqlayout->addMultiCellLayout(htqlayout2, row, row,0,1, TQt::AlignLeft); + hlayout2->addWidget(checksumFile, TQt::AlignLeft); + layout->addMultiCellLayout(hlayout2, row, row,0,1, TQt::AlignLeft); ++row; connect(saveFileCb, TQT_SIGNAL(toggled(bool)), checksumFile, TQT_SLOT(setEnabled(bool))); checksumFile->setFocus(); @@ -553,7 +553,7 @@ ChecksumResultsDlg::ChecksumResultsDlg(const TQStringList& stdOut, const TQStrin connect(onePerFile, TQT_SIGNAL(toggled(bool)), saveFileCb, TQT_SLOT(toggle())); connect(onePerFile, TQT_SIGNAL(toggled(bool)), saveFileCb, TQT_SLOT(setDisabled(bool))); connect(onePerFile, TQT_SIGNAL(toggled(bool)), checksumFile, TQT_SLOT(setDisabled(bool))); - tqlayout->addMultiCellWidget(onePerFile, row, row,0,1, TQt::AlignLeft); + layout->addMultiCellWidget(onePerFile, row, row,0,1, TQt::AlignLeft); ++row; } diff --git a/krusader/Dialogs/krkeydialog.cpp b/krusader/Dialogs/krkeydialog.cpp index d301e9a..2ce3d8f 100644 --- a/krusader/Dialogs/krkeydialog.cpp +++ b/krusader/Dialogs/krkeydialog.cpp @@ -32,11 +32,11 @@ static const char* FILE_FILTER = I18N_NOOP("*.keymap|Krusader keymaps\n*|all fil 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 + // HACK This fetches the layout 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)->parent() ); - TQBoxLayout* buttonBoxLayout = static_cast( buttonBox->tqlayout() ); + TQBoxLayout* buttonBoxLayout = static_cast( buttonBox->layout() ); KPushButton* importButton = new KPushButton( i18n("Import shortcuts"), buttonBox ); TQWhatsThis::add( importButton, i18n( "Load a keybinding profile, e.g., total_commander.keymap" ) ); diff --git a/krusader/Dialogs/newftpgui.cpp b/krusader/Dialogs/newftpgui.cpp index 95f8a25..7dadc7f 100644 --- a/krusader/Dialogs/newftpgui.cpp +++ b/krusader/Dialogs/newftpgui.cpp @@ -40,8 +40,8 @@ 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); + TQVBoxLayout * layout = new TQVBoxLayout( this, 11, 6, "newFTPGUI_layout" ); + layout->setAutoAdd(true); if ( !name ) setName( "newFTPGUI" ); diff --git a/krusader/Dialogs/packguibase.cpp b/krusader/Dialogs/packguibase.cpp index 4e06682..fd6289d 100644 --- a/krusader/Dialogs/packguibase.cpp +++ b/krusader/Dialogs/packguibase.cpp @@ -320,7 +320,7 @@ void PackGUIBase::expand() { advancedWidget->show(); else { advancedWidget->hide(); - tqlayout()->activate(); + layout()->activate(); TQSize minSize = minimumSize(); resize( width(), minSize.height() ); } diff --git a/krusader/Dialogs/popularurls.cpp b/krusader/Dialogs/popularurls.cpp index d19147d..6930fbc 100644 --- a/krusader/Dialogs/popularurls.cpp +++ b/krusader/Dialogs/popularurls.cpp @@ -228,7 +228,7 @@ void PopularUrls::showDialog() { // ===================================== PopularUrlsDlg ====================================== PopularUrlsDlg::PopularUrlsDlg(): KDialogBase(Plain, i18n("Popular Urls"), Close, KDialogBase::NoDefault, krApp) { - TQGridLayout *tqlayout = new TQGridLayout( plainPage(), 0, KDialog::spacingHint() ); + TQGridLayout *layout = new TQGridLayout( plainPage(), 0, KDialog::spacingHint() ); // listview to contain the urls urls = new KListView(plainPage()); @@ -244,10 +244,10 @@ PopularUrlsDlg::PopularUrlsDlg(): search->setTrapReturnKey(true); TQLabel *lbl = new TQLabel(search, i18n(" &Search: "), plainPage()); - tqlayout->addWidget(btn,0,0); - tqlayout->addWidget(lbl,0,1); - tqlayout->addWidget(search,0,2); - tqlayout->addMultiCellWidget(urls,1,1,0,2); + layout->addWidget(btn,0,0); + layout->addWidget(lbl,0,1); + layout->addWidget(search,0,2); + layout->addMultiCellWidget(urls,1,1,0,2); setMaximumSize(600, 500); setTabOrder(search, urls); diff --git a/krusader/DiskUsage/diskusage.cpp b/krusader/DiskUsage/diskusage.cpp index 5a71959..99c5a19 100644 --- a/krusader/DiskUsage/diskusage.cpp +++ b/krusader/DiskUsage/diskusage.cpp @@ -89,13 +89,13 @@ LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView( loaderBox->setFrameShape( TQGroupBox::Box ); loaderBox->setFrameShadow( TQGroupBox::Sunken ); loaderBox->setColumnLayout(0, Qt::Vertical ); - loaderBox->tqlayout()->setSpacing( 0 ); - loaderBox->tqlayout()->setMargin( 0 ); + loaderBox->layout()->setSpacing( 0 ); + loaderBox->layout()->setMargin( 0 ); loaderBox->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); loaderBox->setFrameStyle( TQFrame::Panel + TQFrame::Raised ); loaderBox->setLineWidth( 2 ); - TQGridLayout *synchGrid = new TQGridLayout( loaderBox->tqlayout() ); + TQGridLayout *synchGrid = new TQGridLayout( loaderBox->layout() ); synchGrid->setSpacing( 6 ); synchGrid->setMargin( 11 ); @@ -150,7 +150,7 @@ LoaderWidget::LoaderWidget( TQWidget *parent, const char *name ) : TQScrollView( TQHBox *hbox = new TQHBox( loaderBox, "hbox" ); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - hbox->tqlayout()->addItem( spacer ); + hbox->layout()->addItem( spacer ); TQPushButton *cancelButton = new TQPushButton( hbox, "cancelButton" ); cancelButton->setText( i18n( "Cancel" ) ); synchGrid->addWidget( hbox, 6, 1 ); diff --git a/krusader/DiskUsage/diskusagegui.cpp b/krusader/DiskUsage/diskusagegui.cpp index ed01a0b..accd9f4 100644 --- a/krusader/DiskUsage/diskusagegui.cpp +++ b/krusader/DiskUsage/diskusagegui.cpp @@ -86,9 +86,9 @@ DiskUsageGUI::DiskUsageGUI( KURL openDir, TQWidget* parent, const char *name ) TQToolTip::add( btnFilelight, i18n( "Filelight view" ) ); TQWidget *spacerWidget = new TQWidget( duTools, "spacerWidget" ); - TQHBoxLayout *hboxtqlayout = new TQHBoxLayout( spacerWidget ); + TQHBoxLayout *hboxlayout = new TQHBoxLayout( spacerWidget ); TQSpacerItem* spacer = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - hboxtqlayout->addItem( spacer ); + hboxlayout->addItem( spacer ); duGrid->addWidget( duTools, 0, 0 ); diff --git a/krusader/DiskUsage/radialMap/map.cpp b/krusader/DiskUsage/radialMap/map.cpp index 5910ce8..c1c7faf 100644 --- a/krusader/DiskUsage/radialMap/map.cpp +++ b/krusader/DiskUsage/radialMap/map.cpp @@ -173,7 +173,7 @@ RadialMap::Map::colorise() case 2000: //HACK for summary view if( (*it)->file()->name() == "Used" ) { - cb = TQApplication::tqpalette().active().color( TQColorGroup::Highlight ); + cb = TQApplication::palette().active().color( TQColorGroup::Highlight ); cb.hsv( &h, &s1, &v1 ); if( s1 > 80 ) diff --git a/krusader/Filter/advancedfilter.cpp b/krusader/Filter/advancedfilter.cpp index 28c7012..a9853c1 100644 --- a/krusader/Filter/advancedfilter.cpp +++ b/krusader/Filter/advancedfilter.cpp @@ -58,9 +58,9 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * sizeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)1, sizeGroup->sizePolicy().hasHeightForWidth() ) ); sizeGroup->setTitle( i18n( "Size" ) ); sizeGroup->setColumnLayout(0, Qt::Vertical ); - sizeGroup->tqlayout()->setSpacing( 0 ); - sizeGroup->tqlayout()->setMargin( 0 ); - TQGridLayout *sizeLayout = new TQGridLayout( sizeGroup->tqlayout() ); + sizeGroup->layout()->setSpacing( 0 ); + sizeGroup->layout()->setMargin( 0 ); + TQGridLayout *sizeLayout = new TQGridLayout( sizeGroup->layout() ); sizeLayout->setAlignment( TQt::AlignTop ); sizeLayout->setSpacing( 6 ); sizeLayout->setMargin( 11 ); @@ -113,9 +113,9 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * dateGroup->setTitle( i18n( "Date" ) ); dateGroup->setExclusive( true ); dateGroup->setColumnLayout(0, Qt::Vertical ); - dateGroup->tqlayout()->setSpacing( 0 ); - dateGroup->tqlayout()->setMargin( 0 ); - TQGridLayout *dateLayout = new TQGridLayout( dateGroup->tqlayout() ); + dateGroup->layout()->setSpacing( 0 ); + dateGroup->layout()->setMargin( 0 ); + TQGridLayout *dateLayout = new TQGridLayout( dateGroup->layout() ); dateLayout->setAlignment( TQt::AlignTop ); dateLayout->setSpacing( 6 ); dateLayout->setMargin( 11 ); @@ -212,9 +212,9 @@ AdvancedFilter::AdvancedFilter( FilterTabs *tabs, TQWidget *parent, const char * TQGroupBox *ownershipGroup = new TQGroupBox( this, "ownershipGroup" ); ownershipGroup->setTitle( i18n( "Ownership" ) ); ownershipGroup->setColumnLayout(0, Qt::Vertical ); - ownershipGroup->tqlayout()->setSpacing( 0 ); - ownershipGroup->tqlayout()->setMargin( 0 ); - TQGridLayout *ownershipLayout = new TQGridLayout( ownershipGroup->tqlayout() ); + ownershipGroup->layout()->setSpacing( 0 ); + ownershipGroup->layout()->setMargin( 0 ); + TQGridLayout *ownershipLayout = new TQGridLayout( ownershipGroup->layout() ); ownershipLayout->setAlignment( TQt::AlignTop ); ownershipLayout->setSpacing( 6 ); ownershipLayout->setMargin( 11 ); diff --git a/krusader/Filter/filterdialog.cpp b/krusader/Filter/filterdialog.cpp index d308e02..10c43c8 100644 --- a/krusader/Filter/filterdialog.cpp +++ b/krusader/Filter/filterdialog.cpp @@ -37,7 +37,7 @@ FilterDialog::FilterDialog( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n("Krusader::Choose Files"), Ok|Cancel ) { - TQGridLayout *filterGrid = new TQGridLayout( this->tqlayout() ); + TQGridLayout *filterGrid = new TQGridLayout( this->layout() ); filterGrid->setSpacing( 6 ); filterGrid->setMargin( 11 ); diff --git a/krusader/Filter/generalfilter.cpp b/krusader/Filter/generalfilter.cpp index f745a92..9d6ff81 100644 --- a/krusader/Filter/generalfilter.cpp +++ b/krusader/Filter/generalfilter.cpp @@ -54,9 +54,9 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *nameGroup = new TQGroupBox( this, "nameGroup" ); nameGroup->setTitle( i18n( "File name" ) ); nameGroup->setColumnLayout(0, Qt::Vertical ); - nameGroup->tqlayout()->setSpacing( 0 ); - nameGroup->tqlayout()->setMargin( 0 ); - TQGridLayout *nameGroupLayout = new TQGridLayout( nameGroup->tqlayout() ); + nameGroup->layout()->setSpacing( 0 ); + nameGroup->layout()->setMargin( 0 ); + TQGridLayout *nameGroupLayout = new TQGridLayout( nameGroup->layout() ); nameGroupLayout->setAlignment( TQt::AlignTop ); nameGroupLayout->setSpacing( 6 ); nameGroupLayout->setMargin( 11 ); @@ -114,9 +114,9 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *profileHandler = new TQGroupBox( this, "profileHandler" ); profileHandler->setTitle( i18n( "&Profile handler" ) ); profileHandler->setColumnLayout(0, Qt::Vertical ); - profileHandler->tqlayout()->setSpacing( 0 ); - profileHandler->tqlayout()->setMargin( 0 ); - TQGridLayout *profileLayout = new TQGridLayout( profileHandler->tqlayout() ); + profileHandler->layout()->setSpacing( 0 ); + profileHandler->layout()->setMargin( 0 ); + TQGridLayout *profileLayout = new TQGridLayout( profileHandler->layout() ); profileLayout->setAlignment( TQt::AlignTop ); profileLayout->setSpacing( 6 ); profileLayout->setMargin( 11 ); @@ -154,9 +154,9 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *searchInGroup = new TQGroupBox( this, "searchInGroup" ); searchInGroup->setTitle( i18n( "&Search in" ) ); searchInGroup->setColumnLayout(0, Qt::Vertical ); - searchInGroup->tqlayout()->setSpacing( 0 ); - searchInGroup->tqlayout()->setMargin( 0 ); - TQGridLayout *searchInLayout = new TQGridLayout( searchInGroup->tqlayout() ); + searchInGroup->layout()->setSpacing( 0 ); + searchInGroup->layout()->setMargin( 0 ); + TQGridLayout *searchInLayout = new TQGridLayout( searchInGroup->layout() ); searchInLayout->setAlignment( TQt::AlignTop ); searchInLayout->setSpacing( 6 ); searchInLayout->setMargin( 11 ); @@ -174,9 +174,9 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *dontSearchInGroup = new TQGroupBox( this, "dontSearchInGroup" ); dontSearchInGroup->setTitle( i18n( "&Don't search in" ) ); dontSearchInGroup->setColumnLayout(0, Qt::Vertical ); - dontSearchInGroup->tqlayout()->setSpacing( 0 ); - dontSearchInGroup->tqlayout()->setMargin( 0 ); - TQGridLayout *dontSearchInLayout = new TQGridLayout( dontSearchInGroup->tqlayout() ); + dontSearchInGroup->layout()->setSpacing( 0 ); + dontSearchInGroup->layout()->setMargin( 0 ); + TQGridLayout *dontSearchInLayout = new TQGridLayout( dontSearchInGroup->layout() ); dontSearchInLayout->setAlignment( TQt::AlignTop ); dontSearchInLayout->setSpacing( 6 ); dontSearchInLayout->setMargin( 11 ); @@ -194,9 +194,9 @@ GeneralFilter::GeneralFilter( FilterTabs *tabs, int properties, TQWidget *parent TQGroupBox *containsGroup = new TQGroupBox( this, "containsGroup" ); containsGroup->setTitle( i18n( "Containing text" ) ); containsGroup->setColumnLayout(0, Qt::Vertical ); - containsGroup->tqlayout()->setSpacing( 0 ); - containsGroup->tqlayout()->setMargin( 0 ); - TQGridLayout *containsLayout = new TQGridLayout( containsGroup->tqlayout() ); + containsGroup->layout()->setSpacing( 0 ); + containsGroup->layout()->setMargin( 0 ); + TQGridLayout *containsLayout = new TQGridLayout( containsGroup->layout() ); containsLayout->setAlignment( TQt::AlignTop ); containsLayout->setSpacing( 6 ); containsLayout->setMargin( 11 ); diff --git a/krusader/GUI/kcmdline.cpp b/krusader/GUI/kcmdline.cpp index 7e10d82..541da91 100644 --- a/krusader/GUI/kcmdline.cpp +++ b/krusader/GUI/kcmdline.cpp @@ -58,7 +58,7 @@ #include KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - TQGridLayout * tqlayout = new TQGridLayout( this, 1, 4 ); + TQGridLayout * layout = new TQGridLayout( this, 1, 4 ); path = new TQLabel( this ); TQWhatsThis::add ( path, i18n( "Name of directory where command will be processed." ) ); @@ -70,7 +70,7 @@ KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, nam height = height + 5*(height > 14) + 6; path->setMaximumHeight( height ); path->setSizePolicy(TQSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::Preferred)); - tqlayout->addWidget( path, 0, 0 ); + layout->addWidget( path, 0, 0 ); // and editable command line completion.setMode( KURLCompletion::FileCompletion ); @@ -92,7 +92,7 @@ KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, nam TQWhatsThis::add ( cmdLine, i18n( "

Well, it's actually quite simple: You type your command here and Krusader obeys.

Tip: Move within command line history with <Up> and <Down> arrows.

" ) ); - tqlayout->addWidget( cmdLine, 0, 1 ); + layout->addWidget( cmdLine, 0, 1 ); buttonAddPlaceholder = new TQToolButton( this, "ButtonAddPlaceholder" ); buttonAddPlaceholder->setFixedSize(22,20); @@ -101,13 +101,13 @@ KCMDLine::KCMDLine( TQWidget *parent, const char *name ) : TQWidget( parent, nam connect( buttonAddPlaceholder, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addPlaceholder() ) ); TQWhatsThis::add( buttonAddPlaceholder, i18n( "Add Placeholders for the selected files in the panel." ) ); - tqlayout->addWidget( buttonAddPlaceholder, 0, 2 ); + layout->addWidget( buttonAddPlaceholder, 0, 2 ); // a run in terminal button terminal = new KCMDModeButton( this ); - tqlayout->addWidget( terminal, 0, 3 ); + layout->addWidget( terminal, 0, 3 ); - tqlayout->activate(); + layout->activate(); } void KCMDLine::addPlaceholder() { diff --git a/krusader/GUI/kfnkeys.cpp b/krusader/GUI/kfnkeys.cpp index 554630b..6129f40 100644 --- a/krusader/GUI/kfnkeys.cpp +++ b/krusader/GUI/kfnkeys.cpp @@ -46,7 +46,7 @@ KFnKeys::KFnKeys(TQWidget *parent, char *name): TQWidget(parent,name) { } setFont( KGlobalSettings::generalFont() ); - tqlayout=new TQGridLayout(this,1,9); // 9 keys + layout=new TQGridLayout(this,1,9); // 9 keys F2=new TQPushButton( i18n("F2 Term ") ,this); TQToolTip::add( F2, "" + i18n( "

Open terminal in current directory.

" "

The terminal can be defined in Konfigurator, " @@ -104,17 +104,17 @@ KFnKeys::KFnKeys(TQWidget *parent, char *name): TQWidget(parent,name) { F8->setMaximumHeight(h); F9->setMaximumHeight(h); F10->setMaximumHeight(h); - tqlayout->addWidget(F2,0,0); - tqlayout->addWidget(F3,0,1); - tqlayout->addWidget(F4,0,2); - tqlayout->addWidget(F5,0,3); - tqlayout->addWidget(F6,0,4); - tqlayout->addWidget(F7,0,5); - tqlayout->addWidget(F8,0,6); - tqlayout->addWidget(F9,0,7); - tqlayout->addWidget(F10,0,8); + layout->addWidget(F2,0,0); + layout->addWidget(F3,0,1); + layout->addWidget(F4,0,2); + layout->addWidget(F5,0,3); + layout->addWidget(F6,0,4); + layout->addWidget(F7,0,5); + layout->addWidget(F8,0,6); + layout->addWidget(F9,0,7); + layout->addWidget(F10,0,8); - tqlayout->activate(); + layout->activate(); } void KFnKeys::updateShortcuts() { diff --git a/krusader/GUI/kfnkeys.h b/krusader/GUI/kfnkeys.h index 5613b64..31e0bf6 100644 --- a/krusader/GUI/kfnkeys.h +++ b/krusader/GUI/kfnkeys.h @@ -49,7 +49,7 @@ public: private: TQPushButton *F2 ,*F3,*F4,*F5,*F6,*F7,*F8,*F9,*F10; - TQGridLayout *tqlayout; + TQGridLayout *layout; }; #endif diff --git a/krusader/KViewer/diskusageviewer.cpp b/krusader/KViewer/diskusageviewer.cpp index bdc2bbb..8f07159 100644 --- a/krusader/KViewer/diskusageviewer.cpp +++ b/krusader/KViewer/diskusageviewer.cpp @@ -37,7 +37,7 @@ DiskUsageViewer::DiskUsageViewer( TQWidget *parent, char *name ) : TQWidget( parent, name ), diskUsage( 0 ), statusLabel( 0 ) { - tqlayout = new TQGridLayout( this, 1, 1 ); + layout = new TQGridLayout( this, 1, 1 ); } DiskUsageViewer::~ DiskUsageViewer() @@ -59,7 +59,7 @@ void DiskUsageViewer::openURL( KURL url ) connect( diskUsage, TQT_SIGNAL( enteringDirectory( Directory * ) ), this, TQT_SLOT( slotUpdateStatus() ) ); connect( diskUsage, TQT_SIGNAL( status( TQString ) ), this, TQT_SLOT( slotUpdateStatus( TQString ) ) ); connect( diskUsage, TQT_SIGNAL( newSearch() ), this, TQT_SLOT( slotNewSearch() ) ); - tqlayout->addWidget( diskUsage, 0, 0 ); + layout->addWidget( diskUsage, 0, 0 ); this->show(); diskUsage->show(); diff --git a/krusader/KViewer/diskusageviewer.h b/krusader/KViewer/diskusageviewer.h index f38100d..58ec67b 100644 --- a/krusader/KViewer/diskusageviewer.h +++ b/krusader/KViewer/diskusageviewer.h @@ -60,7 +60,7 @@ protected slots: protected: DiskUsage *diskUsage; - TQGridLayout *tqlayout; + TQGridLayout *layout; TQLabel *statusLabel; TQString prefix; diff --git a/krusader/Konfigurator/kgadvanced.cpp b/krusader/Konfigurator/kgadvanced.cpp index a90d90a..4e7f93c 100644 --- a/krusader/Konfigurator/kgadvanced.cpp +++ b/krusader/Konfigurator/kgadvanced.cpp @@ -46,7 +46,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : // -------------------------- GENERAL GROUPBOX ---------------------------------- TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgAdvGeneralGrp" ); - TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); + TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); #if KDE_IS_VERSION( 3,5,1 ) bool dontUseMedia = false; @@ -86,7 +86,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : // ----------------------- CONFIRMATIONS GROUPBOX ------------------------------- TQGroupBox *confirmGrp = createFrame( i18n( "Confirmations" ), parent, "confirmGrp" ); - TQGridLayout *confirmGrid = createGridLayout( confirmGrp->tqlayout() ); + TQGridLayout *confirmGrid = createGridLayout( confirmGrp->layout() ); addLabel( confirmGrid, 0, 0, "\n"+i18n( "Request user confirmation for the following operations:" )+"\n", confirmGrp, "KgAdvLabel1" ); @@ -110,7 +110,7 @@ KgAdvanced::KgAdvanced( bool first, TQWidget* parent, const char* name ) : // ------------------------ FINE-TUNING GROUPBOX -------------------------------- TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "kgFineTuneGrp" ); - TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() ); + TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->layout() ); fineTuneGrid->setAlignment( TQt::AlignLeft | TQt::AlignTop ); TQLabel *label = new TQLabel( i18n( "Icon cache size (KB):" ), fineTuneGrp, "iconCacheLabel" ); diff --git a/krusader/Konfigurator/kgarchives.cpp b/krusader/Konfigurator/kgarchives.cpp index 5ab4424..a4ea958 100644 --- a/krusader/Konfigurator/kgarchives.cpp +++ b/krusader/Konfigurator/kgarchives.cpp @@ -49,7 +49,7 @@ KgArchives::KgArchives( bool first, TQWidget* parent, const char* name ) : // -------------------------- GENERAL GROUPBOX ---------------------------------- TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "generalGrp" ); - TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); + TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); addLabel( generalGrid, 0, 0, i18n( "Krusader transparently handles the following types of archives:" ), generalGrp, "KgLabel1" ); @@ -87,7 +87,7 @@ KgArchives::KgArchives( bool first, TQWidget* parent, const char* name ) : // ------------------------ FINE-TUNING GROUPBOX -------------------------------- TQGroupBox *fineTuneGrp = createFrame( i18n( "Fine-Tuning" ), parent, "fineTuneGrp" ); - TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->tqlayout() ); + TQGridLayout *fineTuneGrid = createGridLayout( fineTuneGrp->layout() ); KONFIGURATOR_CHECKBOX_PARAM finetuners[] = // cfg_class cfg_name default text restart ToolTip diff --git a/krusader/Konfigurator/kgcolors.cpp b/krusader/Konfigurator/kgcolors.cpp index 5577d71..12c4a7d 100644 --- a/krusader/Konfigurator/kgcolors.cpp +++ b/krusader/Konfigurator/kgcolors.cpp @@ -49,7 +49,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : // -------------------------- GENERAL GROUPBOX ---------------------------------- TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgColorsGeneralGrp" ); - TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); + TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); generalGrid->setSpacing( 0 ); generalGrid->setMargin( 5 ); @@ -64,7 +64,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : generals = createCheckBoxGroup( 0, 2, generalSettings, sizeof(generalSettings)/sizeof(generalSettings[0]), generalGrp ); generalGrid->addWidget( generals, 1, 0 ); - generals->tqlayout()->setSpacing( 5 ); + generals->layout()->setSpacing( 5 ); connect( generals->find( "KDE Default" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotDisable() ) ); connect( generals->find( "Enable Alternate Background" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( generatePreview() ) ); @@ -77,7 +77,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : // -------------------------- COLORS GROUPBOX ---------------------------------- TQGroupBox *colorsFrameGrp = createFrame( i18n( "Colors" ), hbox, "kgColorsColorsGrp" ); - TQGridLayout *colorsFrameGrid = createGridLayout( colorsFrameGrp->tqlayout() ); + TQGridLayout *colorsFrameGrid = createGridLayout( colorsFrameGrp->layout() ); colorsFrameGrid->setSpacing( 0 ); colorsFrameGrid->setMargin( 3 ); @@ -210,7 +210,7 @@ KgColors::KgColors( bool first, TQWidget* parent, const char* name ) : // -------------------------- PREVIEW GROUPBOX ---------------------------------- previewGrp = createFrame( i18n( "Preview" ), hbox, "kgColorsPreviewGrp" ); - previewGrid = createGridLayout( previewGrp->tqlayout() ); + previewGrid = createGridLayout( previewGrp->layout() ); preview = new TQListView( previewGrp, "colorPreView" ); diff --git a/krusader/Konfigurator/kggeneral.cpp b/krusader/Konfigurator/kggeneral.cpp index 3f9923e..5087580 100644 --- a/krusader/Konfigurator/kggeneral.cpp +++ b/krusader/Konfigurator/kggeneral.cpp @@ -53,7 +53,7 @@ if( first ) // -------------------------- GENERAL GROUPBOX ---------------------------------- TQGroupBox *generalGrp = createFrame( i18n( "General" ), parent, "kgGenGeneralGrp" ); - TQGridLayout *generalGrid = createGridLayout( generalGrp->tqlayout() ); + TQGridLayout *generalGrid = createGridLayout( generalGrp->layout() ); KONFIGURATOR_NAME_VALUE_TIP deleteMode[] = // name value tooltip diff --git a/krusader/Konfigurator/kglookfeel.cpp b/krusader/Konfigurator/kglookfeel.cpp index e2f542b..8d33893 100644 --- a/krusader/Konfigurator/kglookfeel.cpp +++ b/krusader/Konfigurator/kglookfeel.cpp @@ -78,7 +78,7 @@ void KgLookFeel::setupOperationTab() { // -------------- General ----------------- TQGroupBox *lookFeelGrp = createFrame( i18n( "Look && Feel" ), tab, "kgLookAndFeelGrp" ); - TQGridLayout *lookFeelGrid = createGridLayout( lookFeelGrp->tqlayout() ); + TQGridLayout *lookFeelGrid = createGridLayout( lookFeelGrp->layout() ); KONFIGURATOR_CHECKBOX_PARAM settings[] = { // cfg_class cfg_name default text restart tooltip @@ -97,7 +97,7 @@ void KgLookFeel::setupOperationTab() { // -------------- Quicksearch ----------------- TQGroupBox *quicksearchGroup = createFrame( i18n( "Quicksearch" ), tab, "kgQuicksearchGrp" ); - TQGridLayout *quicksearchGrid = createGridLayout( quicksearchGroup->tqlayout() ); + TQGridLayout *quicksearchGrid = createGridLayout( quicksearchGroup->layout() ); KONFIGURATOR_CHECKBOX_PARAM quicksearch[] = { // cfg_class cfg_name default text restart tooltip @@ -124,7 +124,7 @@ void KgLookFeel::setupPanelTab() { panelLayout->setSpacing( 6 ); panelLayout->setMargin( 11 ); TQGroupBox *panelGrp = createFrame( i18n( "Panel settings" ), tab_panel, "kgPanelGrp" ); - TQGridLayout *panelGrid = createGridLayout( panelGrp->tqlayout() ); + TQGridLayout *panelGrid = createGridLayout( panelGrp->layout() ); TQHBox *hbox = new TQHBox( panelGrp, "lookAndFeelHBox1" ); new TQLabel( i18n( "Panel font:" ), hbox, "lookAndFeelLabel" ); @@ -200,7 +200,7 @@ void KgLookFeel::setupPanelToolbarTab() { connect( panelToolbarActive->find( "Panel Toolbar visible" ), TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotEnablePanelToolbar() ) ); TQGroupBox * panelToolbarGrp = createFrame( i18n( "Visible Panel Toolbar buttons" ), tab_4, "panelToolbarGrp"); - TQGridLayout * panelToolbarGrid = createGridLayout( panelToolbarGrp->tqlayout() ); + TQGridLayout * panelToolbarGrid = createGridLayout( panelToolbarGrp->layout() ); KONFIGURATOR_CHECKBOX_PARAM panelToolbarCheckboxes[] = { @@ -238,7 +238,7 @@ void KgLookFeel::setupMouseModeTab() { // -------------- General ----------------- TQGroupBox *mouseGeneralGroup = createFrame( i18n( "General" ), tab_mouse, "mouseGeneralGroup" ); - TQGridLayout *mouseGeneralGrid = createGridLayout( mouseGeneralGroup->tqlayout() ); + TQGridLayout *mouseGeneralGrid = createGridLayout( mouseGeneralGroup->layout() ); mouseGeneralGrid->setSpacing( 0 ); mouseGeneralGrid->setMargin( 5 ); @@ -251,7 +251,7 @@ void KgLookFeel::setupMouseModeTab() { { i18n( "Custom Selection Mode" ), "3", i18n( "Design your own selection mode!" ) } }; mouseRadio = createRadioButtonGroup( "Look&Feel", "Mouse Selection", "0", 2, 2, mouseSelection, 4, mouseGeneralGroup, "myLook&FeelRadio", true, PAGE_MOUSE ); - mouseRadio->tqlayout()->setMargin( 0 ); + mouseRadio->layout()->setMargin( 0 ); mouseGeneralGrid->addWidget( mouseRadio, 0, 0 ); connect( mouseRadio, TQT_SIGNAL( clicked(int) ), TQT_SLOT( slotSelectionModeChanged() ) ); @@ -259,7 +259,7 @@ void KgLookFeel::setupMouseModeTab() { // -------------- Details ----------------- TQGroupBox *mouseDetailGroup = createFrame( i18n( "Details" ), tab_mouse, "mouseDetailGroup" ); - TQGridLayout *mouseDetailGrid = createGridLayout( mouseDetailGroup->tqlayout() ); + TQGridLayout *mouseDetailGrid = createGridLayout( mouseDetailGroup->layout() ); mouseDetailGrid->setSpacing( 0 ); mouseDetailGrid->setMargin( 5 ); @@ -270,7 +270,7 @@ void KgLookFeel::setupMouseModeTab() { { i18n( "Obey KDE's global selection policy" ), "1", i18n( "

Use KDE's global setting:

KDE Control Center -> Peripherals -> Mouse

" ) } }; KonfiguratorRadioButtons *clickRadio = createRadioButtonGroup( "Look&Feel", "Single Click Selects", "0", 1, 0, singleOrDoubleClick, 2, mouseDetailGroup, "myLook&FeelRadio0", true, PAGE_MOUSE ); - clickRadio->tqlayout()->setMargin( 0 ); + clickRadio->layout()->setMargin( 0 ); mouseDetailGrid->addWidget( clickRadio, 0, 0 ); KONFIGURATOR_CHECKBOX_PARAM mouseCheckboxesParam[] = @@ -324,7 +324,7 @@ void KgLookFeel::setupMouseModeTab() { // -------------- Preview ----------------- TQGroupBox *mousePreviewGroup = createFrame( i18n( "Preview" ), tab_mouse, "mousePreviewGroup" ); - TQGridLayout *mousePreviewGrid = createGridLayout( mousePreviewGroup->tqlayout() ); + TQGridLayout *mousePreviewGrid = createGridLayout( mousePreviewGroup->layout() ); // TODO preview mousePreview = new TQListView( mousePreviewGroup, "mousePreview" ); mousePreviewGrid->addWidget( mousePreview, 0 ,0 ); diff --git a/krusader/Konfigurator/kgprotocols.cpp b/krusader/Konfigurator/kgprotocols.cpp index d86d8de..08b613a 100644 --- a/krusader/Konfigurator/kgprotocols.cpp +++ b/krusader/Konfigurator/kgprotocols.cpp @@ -65,7 +65,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : // -------------------------- LINK VIEW ---------------------------------- TQGroupBox *linkGrp = createFrame( i18n( "Links" ), parent, "linkGrp" ); - TQGridLayout *linkGrid = createGridLayout( linkGrp->tqlayout() ); + TQGridLayout *linkGrid = createGridLayout( linkGrp->layout() ); linkList = new TQListView( linkGrp, "linkList" ); linkList->addColumn( i18n( "Defined Links" ) ); @@ -106,7 +106,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : // -------------------------- PROTOCOLS LISTBOX ---------------------------------- TQGroupBox *protocolGrp = createFrame( i18n( "Protocols" ), parent, "protocolGrp" ); - TQGridLayout *protocolGrid = createGridLayout( protocolGrp->tqlayout() ); + TQGridLayout *protocolGrid = createGridLayout( protocolGrp->layout() ); protocolList = new TQListBox( protocolGrp, "protocolList" ); loadListCapableProtocols(); @@ -117,7 +117,7 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : // -------------------------- MIMES LISTBOX ---------------------------------- TQGroupBox *mimeGrp = createFrame( i18n( "Mimes" ), parent, "mimeGrp" ); - TQGridLayout *mimeGrid = createGridLayout( mimeGrp->tqlayout() ); + TQGridLayout *mimeGrid = createGridLayout( mimeGrp->layout() ); mimeList = new TQListBox( mimeGrp, "protocolList" ); loadMimes(); @@ -143,9 +143,9 @@ KgProtocols::KgProtocols( bool first, TQWidget* parent, const char* name ) : TQWidget* KgProtocols::addSpacer( TQWidget *parent, const char *widgetName ) { TQWidget *widget = new TQWidget( parent, widgetName ); - TQVBoxLayout *vboxtqlayout = new TQVBoxLayout( widget ); + TQVBoxLayout *vboxlayout = new TQVBoxLayout( widget ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - vboxtqlayout->addItem( spacer ); + vboxlayout->addItem( spacer ); return widget; } diff --git a/krusader/Konfigurator/kgstartup.cpp b/krusader/Konfigurator/kgstartup.cpp index 2698ae4..6af61bc 100644 --- a/krusader/Konfigurator/kgstartup.cpp +++ b/krusader/Konfigurator/kgstartup.cpp @@ -45,7 +45,7 @@ KgStartup::KgStartup( bool first, TQWidget* parent, const char* name ) : // --------------------------- PANELS GROUPBOX ---------------------------------- TQGroupBox *panelsGrp = createFrame( i18n( "General" ), parent, "panelsGrp" ); - TQGridLayout *panelsGrid = createGridLayout( panelsGrp->tqlayout() ); + TQGridLayout *panelsGrid = createGridLayout( panelsGrp->layout() ); TQString s = "

" + i18n( "Defines the panel profile used at startup. A panel profile contains:
  • all the tabs paths
  • the current tab
  • the active panel
<Last session> is a special panel profile which is saved automatically when Krusader is closed."); TQLabel *label = addLabel( panelsGrid, 0, 0, i18n( "Startup profile:" ), panelsGrp, "Startup session" ); @@ -81,7 +81,7 @@ KgStartup::KgStartup( bool first, TQWidget* parent, const char* name ) : // ------------------------ USERINTERFACE GROUPBOX ------------------------------ TQGroupBox *uiGrp = createFrame( i18n( "User Interface" ), parent, "uiGrp" ); - TQGridLayout *uiGrid = createGridLayout( uiGrp->tqlayout() ); + TQGridLayout *uiGrid = createGridLayout( uiGrp->layout() ); KONFIGURATOR_CHECKBOX_PARAM uiCheckBoxes[] = { // cfg_class cfg_name default text restart ToolTip diff --git a/krusader/Konfigurator/kguseractions.cpp b/krusader/Konfigurator/kguseractions.cpp index 9a8a938..ebb18fd 100644 --- a/krusader/Konfigurator/kguseractions.cpp +++ b/krusader/Konfigurator/kguseractions.cpp @@ -46,7 +46,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent, const char* name ) // ============= Info Group ============= TQGroupBox *InfoGroup = createFrame( i18n( "Information" ), parent, "kgUserActionInfoGroup" ); - TQGridLayout *InfoGrid = createGridLayout( InfoGroup->tqlayout() ); + TQGridLayout *InfoGrid = createGridLayout( InfoGroup->layout() ); // terminal for the UserActions TQLabel *labelInfo = new TQLabel( i18n( @@ -62,7 +62,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent, const char* name ) // ============= Terminal Group ============= TQGroupBox *terminalGroup = createFrame( i18n( "Terminal execution" ), parent, "kgUserActionTerminalGroup" ); - TQGridLayout *terminalGrid = createGridLayout( terminalGroup->tqlayout() ); + TQGridLayout *terminalGrid = createGridLayout( terminalGroup->layout() ); // terminal for the UserActions TQLabel *labelTerminal = new TQLabel( i18n( "Terminal for UserActions:" ), @@ -76,7 +76,7 @@ KgUserActions::KgUserActions( bool first, TQWidget* parent, const char* name ) // ============= Outputcollection Group ============= TQGroupBox *outputGroup = createFrame( i18n( "Output collection" ), parent, "kgUserActionOutputGroup" ); - TQGridLayout *outputGrid = createGridLayout( outputGroup->tqlayout() ); + TQGridLayout *outputGrid = createGridLayout( outputGroup->layout() ); TQHBox *hbox; hbox = new TQHBox( outputGroup, "HBoxNormalFont" ); diff --git a/krusader/Konfigurator/konfiguratorpage.cpp b/krusader/Konfigurator/konfiguratorpage.cpp index 0f924bb..1bd1e5f 100644 --- a/krusader/Konfigurator/konfiguratorpage.cpp +++ b/krusader/Konfigurator/konfiguratorpage.cpp @@ -156,8 +156,8 @@ TQGroupBox* KonfiguratorPage::createFrame( TQString text, TQWidget *parent, if( !text.isNull() ) groupBox->setTitle( text ); groupBox->setColumnLayout(0, Qt::Vertical ); - groupBox->tqlayout()->setSpacing( 0 ); - groupBox->tqlayout()->setMargin( 0 ); + groupBox->layout()->setSpacing( 0 ); + groupBox->layout()->setMargin( 0 ); return groupBox; } @@ -170,20 +170,20 @@ TQGridLayout* KonfiguratorPage::createGridLayout( TQLayout *parent ) return gridLayout; } -TQLabel* KonfiguratorPage::addLabel( TQGridLayout *tqlayout, int x, int y, TQString label, +TQLabel* KonfiguratorPage::addLabel( TQGridLayout *layout, int x, int y, TQString label, TQWidget *parent, const char *widgetName ) { TQLabel *lbl = new TQLabel( label, parent, widgetName ); - tqlayout->addWidget( lbl, x, y ); + layout->addWidget( lbl, x, y ); return lbl; } TQWidget* KonfiguratorPage::createSpacer( TQWidget *parent, const char *widgetName ) { TQWidget *widget = new TQWidget( parent, widgetName ); - TQHBoxLayout *hboxtqlayout = new TQHBoxLayout( widget ); + TQHBoxLayout *hboxlayout = new TQHBoxLayout( widget ); TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - hboxtqlayout->addItem( spacer ); + hboxlayout->addItem( spacer ); return widget; } @@ -192,9 +192,9 @@ KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup( int sizex, int const char *widgetName, int pg ) { KonfiguratorCheckBoxGroup *groupWidget = new KonfiguratorCheckBoxGroup( parent, widgetName ); - TQGridLayout *tqlayout = new TQGridLayout( groupWidget ); - tqlayout->setSpacing( 6 ); - tqlayout->setMargin( 0 ); + TQGridLayout *layout = new TQGridLayout( groupWidget ); + layout->setSpacing( 6 ); + layout->setMargin( 0 ); int x = 0, y = 0; @@ -205,7 +205,7 @@ KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup( int sizex, int params[i].restart, params[i].toolTip, pg ); groupWidget->add( checkBox ); - tqlayout->addWidget( checkBox, y, x ); + layout->addWidget( checkBox, y, x ); if( sizex ) { @@ -234,10 +234,10 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls radioWidget->setRadioButtonExclusive( true ); radioWidget->setColumnLayout(0, Qt::Vertical ); - TQGridLayout *tqlayout = new TQGridLayout( radioWidget->tqlayout() ); - tqlayout->setAlignment( TQt::AlignTop ); - tqlayout->setSpacing( 6 ); - tqlayout->setMargin( 0 ); + TQGridLayout *layout = new TQGridLayout( radioWidget->layout() ); + layout->setAlignment( TQt::AlignTop ); + layout->setSpacing( 6 ); + layout->setMargin( 0 ); int x = 0, y = 0; @@ -249,7 +249,7 @@ KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup( TQString cls if( !params[i].tooltip.isEmpty() ) TQWhatsThis::add( radBtn, params[i].tooltip ); - tqlayout->addWidget( radBtn, y, x ); + layout->addWidget( radBtn, y, x ); radioWidget->addRadioButton( radBtn, params[i].text, params[i].value ); diff --git a/krusader/Konfigurator/konfiguratorpage.h b/krusader/Konfigurator/konfiguratorpage.h index 5717acb..afcc897 100644 --- a/krusader/Konfigurator/konfiguratorpage.h +++ b/krusader/Konfigurator/konfiguratorpage.h @@ -293,25 +293,25 @@ public: * * Sample:

* TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );
- * TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );
+ * TQGridLayout *myLayout = createGridLayout( myGroup->layout() );
* myLayout->addWidget( myGroup, 0, 0 ); * - * @param parent Reference to the parent tqlayout + * @param parent Reference to the parent layout * * @return reference to the newly created TQGridLayout */ TQGridLayout *createGridLayout( TQLayout *parent ); /** - * Adds a new label to a grid tqlayout. + * Adds a new label to a grid layout. * * Sample:

* TQGroupBox *myGroup = createFrame( i18n( "MyFrameName" ), parentWidget, "frameName" );
- * TQGridLayout *myLayout = createGridLayout( myGroup->tqlayout() );
+ * TQGridLayout *myLayout = createGridLayout( myGroup->layout() );
* addLabel( myLayout, 0, 0, i18n( "Hello world!" ), myGroup, "myLabel" );
* mainLayout->addWidget( myGroup, 0, 0 ); * - * @param tqlayout The grid tqlayout on which the item will be placed + * @param layout The grid layout on which the item will be placed * @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 @@ -320,7 +320,7 @@ public: * * @return reference to the newly created label */ - TQLabel *addLabel( TQGridLayout *tqlayout, int x, int y, TQString label, + TQLabel *addLabel( TQGridLayout *layout, int x, int y, TQString label, TQWidget *parent=0, const char *widgetName=0 ); /** diff --git a/krusader/Konfigurator/krresulttable.h b/krusader/Konfigurator/krresulttable.h index 0e6729f..6275853 100644 --- a/krusader/Konfigurator/krresulttable.h +++ b/krusader/Konfigurator/krresulttable.h @@ -84,14 +84,14 @@ protected: TQLabel* _label; // generic label /** - * Creates the main grid tqlayout and attaches the table header + * Creates the main grid layout and attaches the table header * - * @return bool Pointer to the main grid tqlayout + * @return bool Pointer to the main grid layout */ TQGridLayout* initTable(); /** - * Applies settings to each cell of the grid tqlayout + * Applies settings to each cell of the grid layout * Supposed to be run after a row was added * * @param const TQGridLayout* grid The GridLayout diff --git a/krusader/Locate/locate.cpp b/krusader/Locate/locate.cpp index 5748ac3..4d9bcce 100755 --- a/krusader/Locate/locate.cpp +++ b/krusader/Locate/locate.cpp @@ -124,7 +124,7 @@ LocateDlg::LocateDlg() : KDialogBase(0,0,false,"Locate", KDialogBase::User1 | KD TQHBox *hbox2 = new TQHBox( widget, "locateHBox" ); TQSpacerItem* spacer = new TQSpacerItem( 40, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - hbox2->tqlayout()->addItem( spacer ); + hbox2->layout()->addItem( spacer ); dontSearchInPath = new TQCheckBox( i18n( "Don't search in path" ), hbox2, "dontSearchInPath" ); dontSearchInPath->setChecked( krConfig->readBoolEntry("Dont Search In Path") ); existingFiles = new TQCheckBox( i18n( "Show only the existing files" ), hbox2, "existingFiles" ); @@ -527,7 +527,7 @@ void LocateDlg::operate( TQListViewItem *item, int task ) KURLDrag *d = new KURLDrag(urls, this); d->setPixmap( FL_LOADICON( "file" ), TQPoint( -7, 0 ) ); - TQApplication::tqclipboard()->setData( d ); + TQApplication::clipboard()->setData( d ); } break; } diff --git a/krusader/MountMan/kmountmangui.cpp b/krusader/MountMan/kmountmangui.cpp index bf2a03f..963cde3 100644 --- a/krusader/MountMan/kmountmangui.cpp +++ b/krusader/MountMan/kmountmangui.cpp @@ -111,7 +111,7 @@ void KMountManGUI::createMainPage() { mountList = 0; } // clean up is finished... - TQGridLayout *tqlayout = new TQGridLayout( mainPage, 1, 1 ); + TQGridLayout *layout = new TQGridLayout( mainPage, 1, 1 ); mountList = new TQListView( mainPage ); // create the main container krConfig->setGroup( "Look&Feel" ); mountList->setFont( krConfig->readFontEntry( "Filelist Font", _FilelistFont ) ); @@ -142,8 +142,8 @@ void KMountManGUI::createMainPage() { box->setAlignment( TQt::AlignHCenter ); info = new KRFSDisplay( box ); info->resize( info->width(), height() ); - tqlayout->addWidget( box, 0, 0 ); - tqlayout->addWidget( mountList, 0, 1 ); + layout->addWidget( box, 0, 0 ); + layout->addWidget( mountList, 0, 1 ); } void KMountManGUI::getSpaceData() { diff --git a/krusader/MountMan/kmountmangui.h b/krusader/MountMan/kmountmangui.h index 86cd9dc..b982356 100644 --- a/krusader/MountMan/kmountmangui.h +++ b/krusader/MountMan/kmountmangui.h @@ -64,7 +64,7 @@ class KMountManGUI : public KDialogBase { public: KMountManGUI(); ~KMountManGUI(); - void createLayout(); // calls the various tab tqlayout-creators + void createLayout(); // calls the various tab layout-creators void createMainPage(); // creator of the main page - filesystems protected slots: diff --git a/krusader/Panel/krbriefview.cpp b/krusader/Panel/krbriefview.cpp index 03b7853..1c27c41 100644 --- a/krusader/Panel/krbriefview.cpp +++ b/krusader/Panel/krbriefview.cpp @@ -803,7 +803,7 @@ void KrBriefView::imStartEvent(TQIMEvent* e) // item is "below" the quick search window, as the icon view will // realize its new size after the key processing. The following line // will resize the icon view immediately. - ACTIVE_PANEL->tqlayout->activate(); + ACTIVE_PANEL->layout->activate(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } @@ -1109,7 +1109,7 @@ void KrBriefView::keyPressEvent( TQKeyEvent * e ) { // item is "below" the quick search window, as the icon view will // realize its new size after the key processing. The following line // will resize the icon view immediately. - ACTIVE_PANEL->tqlayout->activate(); + ACTIVE_PANEL->layout->activate(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } diff --git a/krusader/Panel/krdetailedview.cpp b/krusader/Panel/krdetailedview.cpp index d9cf60e..84c0190 100644 --- a/krusader/Panel/krdetailedview.cpp +++ b/krusader/Panel/krdetailedview.cpp @@ -835,7 +835,7 @@ TQRect KrDetailedView::drawItemHighlighter(TQPainter *painter, TQListViewItem *i r = itemRect(item); if (painter) - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), + style().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, r, colorGroup(), TQStyle::Style_FocusAtBorder, colorGroup().highlight()); } return r; @@ -873,7 +873,7 @@ void KrDetailedView::imStartEvent(TQIMEvent* e) // item is "below" the quick search window, as the list view will // realize its new size after the key processing. The following line // will resize the list view immediately. - ACTIVE_PANEL->tqlayout->activate(); + ACTIVE_PANEL->layout->activate(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } @@ -1146,7 +1146,7 @@ mark: if (KrSelectionMode::getSelectionHandler()->spaceMovesDown()) // item is "below" the quick search window, as the list view will // realize its new size after the key processing. The following line // will resize the list view immediately. - ACTIVE_PANEL->tqlayout->activate(); + ACTIVE_PANEL->layout->activate(); // second, we need to disable the dirup action - hack! krDirUp->setEnabled( false ); } diff --git a/krusader/Panel/listpanel.cpp b/krusader/Panel/listpanel.cpp index b15e0c5..21f098d 100644 --- a/krusader/Panel/listpanel.cpp +++ b/krusader/Panel/listpanel.cpp @@ -113,7 +113,7 @@ ListPanel::ListPanel( TQString typeIn, TQWidget *parent, bool &left, const char func = new ListPanelFunc( this ); setAcceptDrops( true ); - tqlayout = new TQGridLayout( this, 3, 3 ); + layout = new TQGridLayout( this, 3, 3 ); mediaButton = new MediaButton( this, "mediaButton" ); connect( mediaButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotFocusOnMe() ) ); @@ -274,17 +274,17 @@ ListPanel::ListPanel( TQString typeIn, TQWidget *parent, bool &left, const char connect(popup, TQT_SIGNAL(hideMe()), this, TQT_SLOT(togglePanelPopup())); popup->hide(); - // finish the tqlayout - tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); - tqlayout->addWidget( mediaButton, 1, 0 ); - tqlayout->addWidget( status, 1, 1 ); - tqlayout->addWidget( historyButton, 1, 2 ); - tqlayout->addWidget( bookmarksButton, 1, 3 ); - tqlayout->addMultiCellWidget( header, 2, 2, 0, 3 ); - tqlayout->addMultiCellWidget( splt, 3, 3, 0, 3 ); - tqlayout->addMultiCellWidget( quickSearch, 4, 4, 0, 3 ); + // finish the layout + layout->addMultiCellWidget( hbox, 0, 0, 0, 3 ); + layout->addWidget( mediaButton, 1, 0 ); + layout->addWidget( status, 1, 1 ); + layout->addWidget( historyButton, 1, 2 ); + layout->addWidget( bookmarksButton, 1, 3 ); + layout->addMultiCellWidget( header, 2, 2, 0, 3 ); + layout->addMultiCellWidget( splt, 3, 3, 0, 3 ); + layout->addMultiCellWidget( quickSearch, 4, 4, 0, 3 ); quickSearch->hide(); - tqlayout->addMultiCellLayout( totalsLayout, 5, 5, 0, 3 ); + layout->addMultiCellLayout( totalsLayout, 5, 5, 0, 3 ); //filter = ALL; } @@ -370,7 +370,7 @@ ListPanel::~ListPanel() { delete cdUpButton; delete cdOtherButton; delete syncBrowseButton; - delete tqlayout; + delete layout; } int ListPanel::getProperties() diff --git a/krusader/Panel/listpanel.h b/krusader/Panel/listpanel.h index 3107325..64654c2 100644 --- a/krusader/Panel/listpanel.h +++ b/krusader/Panel/listpanel.h @@ -181,7 +181,7 @@ public: KrSqueezedTextLabel *status, *totals; KrQuickSearch *quickSearch; KURLRequester *origin; - TQGridLayout *tqlayout; + TQGridLayout *layout; TQToolButton *cdRootButton; TQToolButton *cdHomeButton; TQToolButton *cdUpButton; diff --git a/krusader/Panel/panelfunc.cpp b/krusader/Panel/panelfunc.cpp index 452ab34..c1fb987 100755 --- a/krusader/Panel/panelfunc.cpp +++ b/krusader/Panel/panelfunc.cpp @@ -1159,7 +1159,7 @@ void ListPanelFunc::copyToClipboard( bool move ) { KURL::List* fileUrls = files() ->vfs_getFiles( &fileNames ); if ( fileUrls ) { KRDrag * urlData = KRDrag::newDrag( *fileUrls, move, krApp->mainView, "krusader" ); - TQApplication::tqclipboard() ->setData( urlData ); + TQApplication::clipboard() ->setData( urlData ); if( move && files()->vfs_getType() == vfs::VIRT ) ( static_cast( files() ) )->vfs_removeFiles( &fileNames ); @@ -1169,7 +1169,7 @@ void ListPanelFunc::copyToClipboard( bool move ) { } void ListPanelFunc::pasteFromClipboard() { - TQClipboard * cb = TQApplication::tqclipboard(); + TQClipboard * cb = TQApplication::clipboard(); TQMimeSource * data = cb->data(); KURL::List urls; if ( KURLDrag::canDecode( data ) ) { diff --git a/krusader/Panel/panelpopup.cpp b/krusader/Panel/panelpopup.cpp index 3234d9b..6ae2810 100644 --- a/krusader/Panel/panelpopup.cpp +++ b/krusader/Panel/panelpopup.cpp @@ -25,7 +25,7 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), _left( left ), _hidden(true), stack( 0 ), viewer( 0 ), pjob( 0 ), splitterSizes() { splitter = parent; - TQGridLayout * tqlayout = new TQGridLayout(this, 1, 1); + TQGridLayout * layout = new TQGridLayout(this, 1, 1); // loading the splitter sizes krConfig->setGroup( "Private" ); @@ -98,12 +98,12 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), duBtn->setToggleButton(true); btns->insert(duBtn, DskUsage); - tqlayout->addWidget(dataLine,0,0); - tqlayout->addWidget(treeBtn,0,1); - tqlayout->addWidget(previewBtn,0,2); - tqlayout->addWidget(quickBtn,0,3); - tqlayout->addWidget(viewerBtn,0,4); - tqlayout->addWidget(duBtn,0,5); + layout->addWidget(dataLine,0,0); + layout->addWidget(treeBtn,0,1); + layout->addWidget(previewBtn,0,2); + layout->addWidget(quickBtn,0,3); + layout->addWidget(viewerBtn,0,4); + layout->addWidget(duBtn,0,5); // create a widget stack on which to put the parts stack = new TQWidgetStack( this ); @@ -151,7 +151,7 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), // create the quick-panel part ---- TQWidget *quickPanel = new TQWidget(stack); - TQGridLayout *qtqlayout = new TQGridLayout(quickPanel); + TQGridLayout *qlayout = new TQGridLayout(quickPanel); // --- quick select TQLabel *selectLabel = new TQLabel(i18n("Quick Select"), quickPanel); quickSelectCombo = new KComboBox( quickPanel ); @@ -185,15 +185,15 @@ PanelPopup::PanelPopup( TQSplitter *parent, bool left ) : TQWidget( parent ), TQToolTip::add( qsettingsBtn, i18n("select group dialog") ); connect(qsettingsBtn, TQT_SIGNAL(clicked()), krSelect, TQT_SLOT(activate())); - qtqlayout->addWidget(selectLabel,0,0); - qtqlayout->addWidget(quickSelectCombo,0,1); - qtqlayout->addWidget(qselectBtn,0,2); - qtqlayout->addWidget(qstoreBtn,0,3); - qtqlayout->addWidget(qsettingsBtn,0,4); + qlayout->addWidget(selectLabel,0,0); + qlayout->addWidget(quickSelectCombo,0,1); + qlayout->addWidget(qselectBtn,0,2); + qlayout->addWidget(qstoreBtn,0,3); + qlayout->addWidget(qsettingsBtn,0,4); stack->addWidget(quickPanel, QuickPanel); - // -------- finish the tqlayout (General one) - tqlayout->addMultiCellWidget(stack,1,1,0,5); + // -------- finish the layout (General one) + layout->addMultiCellWidget(stack,1,1,0,5); // set the wanted widget // ugly: are we left or right? diff --git a/krusader/RemoteMan/remotemanbase.cpp b/krusader/RemoteMan/remotemanbase.cpp index 4f5864f..259001e 100644 --- a/krusader/RemoteMan/remotemanbase.cpp +++ b/krusader/RemoteMan/remotemanbase.cpp @@ -147,23 +147,23 @@ remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, W remoteManBaseLayout->addLayout( Layout27, 5, 1 ); - tqlayout = new TQGridLayout; - tqlayout->setSpacing( 6 ); - tqlayout->setMargin( 0 ); + layout = new TQGridLayout; + layout->setSpacing( 6 ); + layout->setMargin( 0 ); removeBtn = new TQPushButton( this, "removeBtn" ); removeBtn->setText( i18n( "&Remove" ) ); removeBtn->setAutoDefault( FALSE ); removeBtn->setDefault( FALSE ); - tqlayout->addWidget( removeBtn, 0, 2 ); + layout->addWidget( removeBtn, 0, 2 ); connectBtn = new TQPushButton( this, "connectBtn" ); connectBtn->setText( i18n( "Co&nnect" ) ); connectBtn->setAutoDefault( FALSE ); connectBtn->setDefault( FALSE ); - tqlayout->addMultiCellWidget( connectBtn, 1, 1, 0, 2 ); + layout->addMultiCellWidget( connectBtn, 1, 1, 0, 2 ); newGroupBtn = new TQPushButton( this, "newGroupBtn" ); newGroupBtn->setEnabled( TRUE ); @@ -172,7 +172,7 @@ remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, W newGroupBtn->setDefault( FALSE ); newGroupBtn->setFlat( FALSE ); - tqlayout->addWidget( newGroupBtn, 0, 0 ); + layout->addWidget( newGroupBtn, 0, 0 ); addBtn = new TQPushButton( this, "addBtn" ); addBtn->setEnabled( TRUE ); @@ -181,9 +181,9 @@ remoteManBase::remoteManBase( TQWidget* parent, const char* name, bool modal, W addBtn->setDefault( FALSE ); addBtn->setFlat( FALSE ); - tqlayout->addWidget( addBtn, 0, 1 ); + layout->addWidget( addBtn, 0, 1 ); - remoteManBaseLayout->addLayout( tqlayout, 6, 1 ); + remoteManBaseLayout->addLayout( layout, 6, 1 ); Layout11 = new TQGridLayout; Layout11->setSpacing( 6 ); diff --git a/krusader/RemoteMan/remotemanbase.h b/krusader/RemoteMan/remotemanbase.h index db35324..f9f4aba 100644 --- a/krusader/RemoteMan/remotemanbase.h +++ b/krusader/RemoteMan/remotemanbase.h @@ -75,7 +75,7 @@ protected: TQGridLayout* Layout10; TQVBoxLayout* Layout26; TQVBoxLayout* Layout27; - TQGridLayout* tqlayout; + TQGridLayout* layout; TQGridLayout* Layout11; bool event( TQEvent* ); }; diff --git a/krusader/Search/krsearchdialog.cpp b/krusader/Search/krsearchdialog.cpp index 6bdb3c1..35fccfa 100644 --- a/krusader/Search/krsearchdialog.cpp +++ b/krusader/Search/krsearchdialog.cpp @@ -476,15 +476,15 @@ void KrSearchDialog::keyPressEvent(TQKeyEvent *e) { if( e->key() == Key_F4 ) { - if (!generalFilter->containsText->currentText().isEmpty() && TQApplication::tqclipboard()->text() != generalFilter->containsText->currentText()) - TQApplication::tqclipboard()->setText(generalFilter->containsText->currentText()); + if (!generalFilter->containsText->currentText().isEmpty() && TQApplication::clipboard()->text() != generalFilter->containsText->currentText()) + TQApplication::clipboard()->setText(generalFilter->containsText->currentText()); editCurrent(); return; } else if( e->key() == Key_F3 ) { - if (!generalFilter->containsText->currentText().isEmpty() && TQApplication::tqclipboard()->text() != generalFilter->containsText->currentText()) - TQApplication::tqclipboard()->setText(generalFilter->containsText->currentText()); + if (!generalFilter->containsText->currentText().isEmpty() && TQApplication::clipboard()->text() != generalFilter->containsText->currentText()) + TQApplication::clipboard()->setText(generalFilter->containsText->currentText()); viewCurrent(); return; } @@ -622,7 +622,7 @@ void KrSearchDialog::copyToClipBoard() KURLDrag *d = new KURLDrag(urls, this); d->setPixmap( FL_LOADICON( "file" ), TQPoint( -7, 0 ) ); - TQApplication::tqclipboard()->setData( d ); + TQApplication::clipboard()->setData( d ); } #include "krsearchdialog.moc" diff --git a/krusader/Synchronizer/feedtolistboxdialog.cpp b/krusader/Synchronizer/feedtolistboxdialog.cpp index 70121ed..4472fb6 100644 --- a/krusader/Synchronizer/feedtolistboxdialog.cpp +++ b/krusader/Synchronizer/feedtolistboxdialog.cpp @@ -105,15 +105,15 @@ FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *parent, const char *name, Sy // creating the widget TQWidget *widget=new TQWidget(this, "feedToListBoxMainWidget"); - TQVBoxLayout *tqlayout = new TQVBoxLayout( widget, 0, 10, "FeedToListBoxDialogLayout" ); + TQVBoxLayout *layout = new TQVBoxLayout( widget, 0, 10, "FeedToListBoxDialogLayout" ); TQLabel *label = new TQLabel( i18n("Here you can name the file collection"), widget, "fbLabel" ); - tqlayout->addWidget( label ); + layout->addWidget( label ); lineEdit = new TQLineEdit( widget, "fbLineEdit" ); lineEdit->setText( queryName ); lineEdit->selectAll(); - tqlayout->addWidget( lineEdit ); + layout->addWidget( lineEdit ); TQHBox *hbox = new TQHBox( widget, "fbHBox" ); @@ -143,7 +143,7 @@ FeedToListBoxDialog::FeedToListBoxDialog(TQWidget *parent, const char *name, Sy cbSelected->setEnabled( selectedNum != 0 ); cbSelected->setChecked( selectedNum != 0 ); - tqlayout->addWidget( hbox ); + layout->addWidget( hbox ); setMainWidget(widget); diff --git a/krusader/Synchronizer/synchronizedialog.cpp b/krusader/Synchronizer/synchronizedialog.cpp index 0c90456..2009a40 100755 --- a/krusader/Synchronizer/synchronizedialog.cpp +++ b/krusader/Synchronizer/synchronizedialog.cpp @@ -48,52 +48,52 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool { setCaption( i18n("Krusader::Synchronize") ); - TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 11, 6, "SynchronizeDialogLayout" ); + TQVBoxLayout *layout = new TQVBoxLayout( this, 11, 6, "SynchronizeDialogLayout" ); cbRightToLeft = new TQCheckBox( i18n( "Right to left: Copy 1 file", "Right to left: Copy %n files", leftCopyNr) + " " + i18n( "(1 byte)", "(%n bytes)", KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace().toInt() ), this, "labelRightToLeft" ); cbRightToLeft->setChecked( leftCopyNr != 0 ); cbRightToLeft->setEnabled( leftCopyNr != 0 ); - tqlayout->addWidget( cbRightToLeft ); + layout->addWidget( cbRightToLeft ); lbRightToLeft = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", leftCopyNr).arg( 0 ) .arg( 0 ).arg( KRpermHandler::parseSize( leftCopySize ).stripWhiteSpace() ), this, "lbRightToLeft" ); lbRightToLeft->setEnabled( leftCopyNr != 0 ); - tqlayout->addWidget( lbRightToLeft ); + layout->addWidget( lbRightToLeft ); cbLeftToRight = new TQCheckBox( i18n( "Left to right: Copy 1 file", "Left to right: Copy %n files", rightCopyNr) + " " + i18n( "(1 byte)", "(%n bytes)", KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace().toInt() ), this, "cbLeftToRight" ); cbLeftToRight->setChecked( rightCopyNr != 0 ); cbLeftToRight->setEnabled( rightCopyNr != 0 ); - tqlayout->addWidget( cbLeftToRight ); + layout->addWidget( cbLeftToRight ); lbLeftToRight = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", rightCopyNr ).arg( 0 ) .arg( 0 ).arg( KRpermHandler::parseSize( rightCopySize ).stripWhiteSpace() ), this, "lbLeftToRight" ); lbLeftToRight->setEnabled( rightCopyNr != 0 ); - tqlayout->addWidget( lbLeftToRight ); + layout->addWidget( lbLeftToRight ); cbDeletable = new TQCheckBox( i18n( "Left: Delete 1 file", "Left: Delete %n files", deleteNr) + " " + i18n( "(1 byte)", "(%n bytes)", KRpermHandler::parseSize( deleteSize ).stripWhiteSpace().toInt() ), this, "cbDeletable" ); cbDeletable->setChecked( deleteNr != 0 ); cbDeletable->setEnabled( deleteNr != 0 ); - tqlayout->addWidget( cbDeletable ); + layout->addWidget( cbDeletable ); lbDeletable = new TQLabel( "\t" + i18n( "Ready: %1/1 file, %3/%4", "Ready: %1/%n files, %3/%4", deleteNr ).arg( 0 ) .arg( 0 ).arg( KRpermHandler::parseSize( deleteSize ).stripWhiteSpace() ), this, "lbDeletable" ); lbDeletable->setEnabled( deleteNr != 0 ); - tqlayout->addWidget( lbDeletable ); + layout->addWidget( lbDeletable ); progress = new TQProgressBar(1000, this); progress->setCenterIndicator(true); progress->setProgress( 0 ); progress->setMinimumWidth( 400 ); - tqlayout->addWidget( progress ); + layout->addWidget( progress ); TQHBox *hbox = new TQHBox( this, "SynchronizeDialogHBox" ); hbox->setSpacing( 6 ); @@ -101,10 +101,10 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool cbOverwrite = new TQCheckBox( i18n( "Confirm overwrites" ), this, "cbOverWrite" ); krConfig->setGroup("Synchronize"); cbOverwrite->setChecked( krConfig->readBoolEntry( "Confirm overwrites", _ConfirmOverWrites ) ); - tqlayout->addWidget( cbOverwrite ); + layout->addWidget( cbOverwrite ); TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - hbox->tqlayout()->addItem( spacer ); + hbox->layout()->addItem( spacer ); btnStart = new TQPushButton( hbox, "btnStart" ); btnStart->setText( i18n( "&Start" ) ); @@ -116,7 +116,7 @@ SynchronizeDialog::SynchronizeDialog( TQWidget* parent, const char* name, bool TQPushButton *btnClose = new TQPushButton( hbox, "btnClose" ); btnClose->setText( i18n( "&Close" ) ); - tqlayout->addWidget( hbox ); + layout->addWidget( hbox ); connect( btnStart, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startSynchronization() ) ); connect( btnPause, TQT_SIGNAL( clicked() ), this, TQT_SLOT( pauseOrResume() ) ); diff --git a/krusader/Synchronizer/synchronizer.cpp b/krusader/Synchronizer/synchronizer.cpp index 78cd7fb..50e47ed 100755 --- a/krusader/Synchronizer/synchronizer.cpp +++ b/krusader/Synchronizer/synchronizer.cpp @@ -1332,13 +1332,13 @@ public: showButton(KDialogBase::Close, false); TQFrame* mainWidget = plainPage(); - TQVBoxLayout* tqlayout = new TQVBoxLayout(mainWidget, 10); + TQVBoxLayout* layout = new TQVBoxLayout(mainWidget, 10); TQLabel *mLabel = new TQLabel(text, mainWidget); - tqlayout->addWidget(mLabel); + layout->addWidget(mLabel); mProgressBar = new KProgress(mainWidget); - tqlayout->addWidget(mProgressBar); + layout->addWidget(mProgressBar); setButtonText( KDialogBase::User1, i18n( "Pause" ) ); diff --git a/krusader/Synchronizer/synchronizergui.cpp b/krusader/Synchronizer/synchronizergui.cpp index 0526a38..acb4c12 100755 --- a/krusader/Synchronizer/synchronizergui.cpp +++ b/krusader/Synchronizer/synchronizergui.cpp @@ -1111,10 +1111,10 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL compareDirs->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed); compareDirs->setTitle( i18n( "Directory Comparison" ) ); compareDirs->setColumnLayout(0, Qt::Vertical ); - compareDirs->tqlayout()->setSpacing( 0 ); - compareDirs->tqlayout()->setMargin( 0 ); + compareDirs->layout()->setSpacing( 0 ); + compareDirs->layout()->setMargin( 0 ); - TQGridLayout *grid = new TQGridLayout( compareDirs->tqlayout() ); + TQGridLayout *grid = new TQGridLayout( compareDirs->layout() ); grid->setSpacing( 6 ); grid->setMargin( 11 ); @@ -1211,9 +1211,9 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL showOptions->setTitle( i18n( "S&how options" ) ); showOptions->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed); showOptions->setColumnLayout(0, Qt::Vertical ); - showOptions->tqlayout()->setSpacing( 0 ); - showOptions->tqlayout()->setMargin( 0 ); - TQGridLayout *showOptionsLayout = new TQGridLayout( showOptions->tqlayout() ); + showOptions->layout()->setSpacing( 0 ); + showOptions->layout()->setMargin( 0 ); + TQGridLayout *showOptionsLayout = new TQGridLayout( showOptions->layout() ); showOptionsLayout->setSpacing( 6 ); showOptionsLayout->setMargin( 11 ); @@ -1354,9 +1354,9 @@ void SynchronizerGUI::initGUI(TQWidget* /* parent */, TQString profileName, KURL TQGroupBox *optionsGroup = new TQGroupBox( generalFilter, "options" ); optionsGroup->setTitle( i18n( "&Options" ) ); optionsGroup->setColumnLayout(0, Qt::Vertical ); - optionsGroup->tqlayout()->setSpacing( 0 ); - optionsGroup->tqlayout()->setMargin( 0 ); - TQGridLayout *optionsLayout = new TQGridLayout( optionsGroup->tqlayout() ); + optionsGroup->layout()->setSpacing( 0 ); + optionsGroup->layout()->setMargin( 0 ); + TQGridLayout *optionsLayout = new TQGridLayout( optionsGroup->layout() ); optionsLayout->setAlignment( TQt::AlignTop ); optionsLayout->setSpacing( 6 ); optionsLayout->setMargin( 11 ); @@ -2472,7 +2472,7 @@ void SynchronizerGUI::copyToClipboard( bool isLeft ) KURLDrag *d = new KURLDrag(urls, this); d->setPixmap( FL_LOADICON( isLeft ? "2leftarrow" : "2rightarrow" ), TQPoint( -7, 0 ) ); - TQApplication::tqclipboard()->setData( d ); + TQApplication::clipboard()->setData( d ); } #include "synchronizergui.moc" diff --git a/krusader/UserAction/expander.cpp b/krusader/UserAction/expander.cpp index d7825d2..8b22b4f 100644 --- a/krusader/UserAction/expander.cpp +++ b/krusader/UserAction/expander.cpp @@ -635,16 +635,16 @@ exp_Clipboard::exp_Clipboard() { addParameter( exp_parameter( i18n("Append to current clipboard content with this separator (optional):"), "", false ) ); } TagString exp_Clipboard::expFunc( const ListPanel*, const TagStringList& parameter, const bool&, Expander& exp ) const { -// kdDebug() << "Expander::exp_Clipboard, parameter[0]: '" << parameter[0] << "', Clipboard: " << KApplication::tqclipboard()->text() << endl; +// kdDebug() << "Expander::exp_Clipboard, parameter[0]: '" << parameter[0] << "', Clipboard: " << KApplication::clipboard()->text() << endl; TQStringList lst=splitEach(parameter[0]); if(!parameter[1].isSimple()) { setError(exp,Error(Error::S_FATAL,Error::C_SYNTAX,i18n("Expander: %Each% may not be in the second argument of %Clipboard%"))); return TQString(); } - if ( parameter.count() <= 1 || parameter[1].string().isEmpty() || KApplication::tqclipboard()->text().isEmpty() ) - KApplication::tqclipboard()->setText( lst.join("\n") ); + if ( parameter.count() <= 1 || parameter[1].string().isEmpty() || KApplication::clipboard()->text().isEmpty() ) + KApplication::clipboard()->setText( lst.join("\n") ); else - KApplication::tqclipboard()->setText( KApplication::tqclipboard()->text() + parameter[1].string() + lst.join("\n") ); + KApplication::clipboard()->setText( KApplication::clipboard()->text() + parameter[1].string() + lst.join("\n") ); return TQString(); // this doesn't return anything, that's normal! } diff --git a/krusader/UserAction/kraction.cpp b/krusader/UserAction/kraction.cpp index 1c2ac4b..7262c83 100644 --- a/krusader/UserAction/kraction.cpp +++ b/krusader/UserAction/kraction.cpp @@ -90,11 +90,11 @@ _stdout(0), _stderr(0), _currentTextEdit(0) { bool startupState = krConfig->readBoolEntry( "Use Fixed Font", _UserActions_UseFixedFont ); toggleFixedFont( startupState ); - // HACK This fetches the tqlayout of the buttonbox from KDialogBase, although it is not accessable with KDialogBase's API + // HACK This fetches the layout 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)->parent() ); - TQBoxLayout* buttonBoxLayout = static_cast( buttonBox->tqlayout() ); + TQBoxLayout* buttonBoxLayout = static_cast( buttonBox->layout() ); TQCheckBox* useFixedFont = new TQCheckBox( i18n("Use font with fixed width"), buttonBox ); buttonBoxLayout->insertWidget( 0, useFixedFont ); useFixedFont->setChecked( startupState ); diff --git a/krusader/calc.ui b/krusader/calc.ui index 4fae667..27a32ef 100644 --- a/krusader/calc.ui +++ b/krusader/calc.ui @@ -29,7 +29,7 @@ - tqlayout2 + layout2 diff --git a/krusader/krusaderview.cpp b/krusader/krusaderview.cpp index 1abe99e..65f5e7e 100644 --- a/krusader/krusaderview.cpp +++ b/krusader/krusaderview.cpp @@ -88,7 +88,7 @@ void KrusaderView::start( TQStringList leftTabs, TQStringList leftTypes, TQValue ( fnKeys, i18n( "Function keys allow performing fast " "operations on files." ) ); - // and insert the whole thing into the main tqlayout... at last + // and insert the whole thing into the main layout... at last mainLayout->addWidget( vert_splitter, 0, 0 ); //<> mainLayout->addWidget( cmdLine, 1, 0 ); mainLayout->addWidget( fnKeys, 2, 0 ); @@ -339,7 +339,7 @@ bool KrusaderView::eventFilter ( TQObject * watched, TQEvent * e ) { ACTIVE_PANEL->slotFocusOnMe(); return true; } else if( Krusader::actPaste->shortcut().contains( pressedKey ) ) { - TQString text = TQApplication::tqclipboard()->text(); + TQString text = TQApplication::clipboard()->text(); if ( ! text.isEmpty() ) { text.replace("\n", "\r"); -- cgit v1.2.3