summaryrefslogtreecommitdiffstats
path: root/kcontrol/screensaver
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/screensaver')
-rw-r--r--kcontrol/screensaver/advanceddialogimpl.ui32
-rw-r--r--kcontrol/screensaver/category_list2
-rw-r--r--kcontrol/screensaver/kswidget.cpp2
-rw-r--r--kcontrol/screensaver/scrnsave.cpp26
4 files changed, 31 insertions, 31 deletions
diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui
index 814a3867c..fda54f257 100644
--- a/kcontrol/screensaver/advanceddialogimpl.ui
+++ b/kcontrol/screensaver/advanceddialogimpl.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>Form1</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -99,7 +99,7 @@
</widget>
<widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout8</cstring>
+ <cstring>tqlayout8</cstring>
</property>
<hbox>
<property name="name">
@@ -107,7 +107,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout1</cstring>
+ <cstring>tqlayout1</cstring>
</property>
<vbox>
<property name="name">
@@ -153,7 +153,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -162,7 +162,7 @@
</spacer>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<vbox>
<property name="name">
@@ -202,7 +202,7 @@
</widget>
<widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>tqlayout9</cstring>
</property>
<hbox>
<property name="name">
@@ -210,7 +210,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<vbox>
<property name="name">
@@ -256,7 +256,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -265,7 +265,7 @@
</spacer>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout2</cstring>
+ <cstring>tqlayout2</cstring>
</property>
<vbox>
<property name="name">
@@ -305,7 +305,7 @@
</widget>
<widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>layout10</cstring>
+ <cstring>tqlayout10</cstring>
</property>
<hbox>
<property name="name">
@@ -321,7 +321,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>20</height>
@@ -346,7 +346,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -365,7 +365,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -382,7 +382,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -393,5 +393,5 @@
</widget>
</grid>
</widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/kcontrol/screensaver/category_list b/kcontrol/screensaver/category_list
index 61115c0dc..c0b1d5687 100644
--- a/kcontrol/screensaver/category_list
+++ b/kcontrol/screensaver/category_list
@@ -1,4 +1,4 @@
-// This list contains all screen saver categories.
+// This list tqcontains 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 d13d131dc..0f799c4a2 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(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
+ Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->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 f80cc19e9..5dd0ca5c3 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -50,7 +50,7 @@
template class TQPtrList<SaverConfig>;
-const uint widgetEventMask = // X event mask
+const uint widgetEventMask = // X event tqmask
(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->layout(),
+ TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(),
KDialog::spacingHint() );
mSaverListView = new TQListView( mSaverGroup );
mSaverListView->setMinimumHeight( 120 );
- mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+ mSaverListView->tqsetSizePolicy(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->layout(),
+ groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(),
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->sizeHint().width() <
- mWaitEdit->sizeHint().width() ) {
- mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
- mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
+ if ( mWaitLockEdit->tqsizeHint().width() <
+ mWaitEdit->tqsizeHint().width() ) {
+ mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() );
+ mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() );
}
else {
- mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
- mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
+ mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() );
+ mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().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->setAlignment( AlignCenter );
+ mMonitorLabel->tqsetAlignment( 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->setSizePolicy( TQSizePolicy(
+ advancedBt->tqsetSizePolicy( 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( topLevelWidget() );
+ KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() );
if ( dlg.exec() ) {
mChanged = true;
emit changed(true);