From fd3a982e26813f5bcc82c7e89ce6fa2ad44432bf Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 04:10:07 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/screensaver/advanceddialogimpl.ui | 32 +++++++++++++++--------------- kcontrol/screensaver/category_list | 2 +- kcontrol/screensaver/kswidget.cpp | 2 +- kcontrol/screensaver/scrnsave.cpp | 26 ++++++++++++------------ 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'kcontrol/screensaver') diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui index fda54f257..814a3867c 100644 --- a/kcontrol/screensaver/advanceddialogimpl.ui +++ b/kcontrol/screensaver/advanceddialogimpl.ui @@ -4,7 +4,7 @@ Form1 - + 0 0 @@ -69,7 +69,7 @@ Expanding - + 31 20 @@ -99,7 +99,7 @@ - tqlayout8 + layout8 @@ -107,7 +107,7 @@ - tqlayout1 + layout1 @@ -153,7 +153,7 @@ Expanding - + 41 20 @@ -162,7 +162,7 @@ - tqlayout3 + layout3 @@ -202,7 +202,7 @@ - tqlayout9 + layout9 @@ -210,7 +210,7 @@ - tqlayout4 + layout4 @@ -256,7 +256,7 @@ Expanding - + 20 20 @@ -265,7 +265,7 @@ - tqlayout2 + layout2 @@ -305,7 +305,7 @@ - tqlayout10 + layout10 @@ -321,7 +321,7 @@ Expanding - + 21 20 @@ -346,7 +346,7 @@ Expanding - + 31 20 @@ -365,7 +365,7 @@ Expanding - + 20 20 @@ -382,7 +382,7 @@ Expanding - + 20 20 @@ -393,5 +393,5 @@ - + diff --git a/kcontrol/screensaver/category_list b/kcontrol/screensaver/category_list index c0b1d5687..61115c0dc 100644 --- a/kcontrol/screensaver/category_list +++ b/kcontrol/screensaver/category_list @@ -1,4 +1,4 @@ -// This list tqcontains all screen saver categories. +// This list contains all screen saver categories. // The categories are extracted for translation (see Makefile.am). // To show a screen saver in the list under a category, add the diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index 0f799c4a2..d13d131dc 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -54,7 +54,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) } } } - Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->winId() : RootWindow( x11Display(), x11Screen()), + Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()), x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs ); create( w ); #endif diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 5dd0ca5c3..f80cc19e9 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -50,7 +50,7 @@ template class TQPtrList; -const uint widgetEventMask = // X event tqmask +const uint widgetEventMask = // X event mask (uint)( ExposureMask | PropertyChangeMask | @@ -133,12 +133,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSaverGroup->setColumnLayout( 0, Qt::Horizontal ); vLayout->addWidget(mSaverGroup); vLayout->setStretchFactor( mSaverGroup, 10 ); - TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(), + TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(), KDialog::spacingHint() ); mSaverListView = new TQListView( mSaverGroup ); mSaverListView->setMinimumHeight( 120 ); - mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); + mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); mSaverListView->addColumn(""); mSaverListView->header()->hide(); mSelected = -1; @@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSettingsGroup = new TQGroupBox( i18n("Settings"), this ); mSettingsGroup->setColumnLayout( 0, Qt::Vertical ); leftColumnLayout->addWidget( mSettingsGroup ); - groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(), + groupLayout = new TQVBoxLayout( mSettingsGroup->layout(), KDialog::spacingHint() ); mEnabledCheckBox = new TQCheckBox(i18n( @@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitLockEdit->setSuffix(i18n(" sec")); mWaitLockEdit->setValue(mLockTimeout/1000); mWaitLockEdit->setEnabled(mEnabled && mLock); - if ( mWaitLockEdit->tqsizeHint().width() < - mWaitEdit->tqsizeHint().width() ) { - mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); - mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() ); + if ( mWaitLockEdit->sizeHint().width() < + mWaitEdit->sizeHint().width() ) { + mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() ); } else { - mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); - mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() ); + mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); + mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); } connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int))); @@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis new TQVBoxLayout(topLayout, KDialog::spacingHint()); mMonitorLabel = new TQLabel( this ); - mMonitorLabel->tqsetAlignment( AlignCenter ); + mMonitorLabel->setAlignment( AlignCenter ); mMonitorLabel->setPixmap( TQPixmap(locate("data", "kcontrol/pics/monitor.png"))); rightColumnLayout->addWidget(mMonitorLabel, 0); @@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis advancedLayout->addWidget( new TQWidget( this ) ); TQPushButton* advancedBt = new TQPushButton( i18n( "Advanced &Options" ), this, "advancedBtn" ); - advancedBt->tqsetSizePolicy( TQSizePolicy( + advancedBt->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); connect( advancedBt, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); @@ -739,7 +739,7 @@ void KScreenSaver::slotSetup() // void KScreenSaver::slotAdvanced() { - KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() ); + KScreenSaverAdvancedDialog dlg( topLevelWidget() ); if ( dlg.exec() ) { mChanged = true; emit changed(true); -- cgit v1.2.1