summaryrefslogtreecommitdiffstats
path: root/krusader/ActionMan
diff options
context:
space:
mode:
Diffstat (limited to 'krusader/ActionMan')
-rw-r--r--krusader/ActionMan/actionpropertybase.cpp42
-rw-r--r--krusader/ActionMan/actionpropertybase.ui6
-rw-r--r--krusader/ActionMan/addplaceholderpopup.cpp78
-rw-r--r--krusader/ActionMan/useractionpage.cpp10
4 files changed, 68 insertions, 68 deletions
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 @@
</widget>
<widget class="TQLayoutWidget" row="0" column="1" rowspan="2" colspan="3">
<property name="name">
- <cstring>tqlayout3</cstring>
+ <cstring>layout3</cstring>
</property>
<hbox>
<property name="name">
@@ -150,7 +150,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout2</cstring>
+ <cstring>layout2</cstring>
</property>
<vbox>
<property name="name">
@@ -390,7 +390,7 @@ Please consult the handbook to learn more about the syntax.</string>
</spacer>
<widget class="TQLayoutWidget" row="10" column="2" rowspan="1" colspan="2">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
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 );