From 8155225c9be993acc0512956416d195edfef4eb9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 19 Jan 2011 01:42:14 +0000 Subject: Enable compilation with TQt for Qt4 3.4.0 TP2 This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kcontrol/screensaver/advanceddialogimpl.ui | 56 +++++++++++++++--------------- kcontrol/screensaver/kswidget.cpp | 4 +-- kcontrol/screensaver/saverconfig.cpp | 2 +- kcontrol/screensaver/scrnsave.cpp | 34 +++++++++--------- kcontrol/screensaver/scrnsave.h | 2 +- kcontrol/screensaver/testwin.cpp | 2 +- 6 files changed, 50 insertions(+), 50 deletions(-) (limited to 'kcontrol/screensaver') diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui index 814a3867c..6f03509b9 100644 --- a/kcontrol/screensaver/advanceddialogimpl.ui +++ b/kcontrol/screensaver/advanceddialogimpl.ui @@ -1,6 +1,6 @@ AdvancedDialogImpl - + Form1 @@ -19,7 +19,7 @@ 0 - + qgbPriority @@ -36,7 +36,7 @@ unnamed - + Low @@ -69,7 +69,7 @@ Expanding - + 31 20 @@ -78,7 +78,7 @@ - + groupBox1 @@ -89,7 +89,7 @@ unnamed - + qlMonitorLabel @@ -97,7 +97,7 @@ - + layout8 @@ -105,7 +105,7 @@ unnamed - + layout1 @@ -113,7 +113,7 @@ unnamed - + qlTopLeft @@ -121,7 +121,7 @@ Top left: - + No Action @@ -153,14 +153,14 @@ Expanding - + 41 20 - + layout3 @@ -168,7 +168,7 @@ unnamed - + qlTopRight @@ -176,7 +176,7 @@ Top right: - + No Action @@ -200,7 +200,7 @@ - + layout9 @@ -208,7 +208,7 @@ unnamed - + layout4 @@ -216,7 +216,7 @@ unnamed - + qlBottomLeft @@ -224,7 +224,7 @@ Bottom left: - + No Action @@ -256,14 +256,14 @@ Expanding - + 20 20 - + layout2 @@ -271,7 +271,7 @@ unnamed - + qlBottomRight @@ -279,7 +279,7 @@ Bottom right: - + No Action @@ -303,7 +303,7 @@ - + layout10 @@ -321,14 +321,14 @@ Expanding - + 21 20 - + monitorLabel @@ -346,7 +346,7 @@ Expanding - + 31 20 @@ -365,7 +365,7 @@ Expanding - + 20 20 @@ -382,7 +382,7 @@ Expanding - + 20 20 diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index d13d131dc..66ba882d0 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -8,7 +8,7 @@ #endif KSWidget::KSWidget( TQWidget* parent, const char* name, int f ) - : QXEmbed( parent, name, f ), colormap( None ) + : QXEmbed( parent, name, (WFlags)f ), colormap( None ) { // use visual with support for double-buffering, for opengl // this code is duplicated in kdebase/kdesktop/lock/ @@ -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/saverconfig.cpp b/kcontrol/screensaver/saverconfig.cpp index bf8cdc54a..a7185135e 100644 --- a/kcontrol/screensaver/saverconfig.cpp +++ b/kcontrol/screensaver/saverconfig.cpp @@ -29,7 +29,7 @@ bool SaverConfig::read(const TQString &file) mSaver = config.readPathEntry("Exec"); } - int indx = file.findRev('/'); + int indx = file.tqfindRev('/'); if (indx >= 0) { mFile = file.mid(indx+1); } diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index f80cc19e9..7582aea53 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -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() ) ); @@ -360,7 +360,7 @@ void KScreenSaver::load( bool useDefaults ) for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) { if (saver->file() == mSaver) { - selectedItem = mSaverListView->findItem ( saver->name(), 0 ); + selectedItem = mSaverListView->tqfindItem ( saver->name(), 0 ); if (selectedItem) { mSelected = i; break; @@ -454,7 +454,7 @@ void KScreenSaver::save() // on exit. I don't know why yet. DCOPClient *client = kapp->dcopClient(); - client->send("kdesktop", "KScreensaverIface", "configure()", ""); + client->send("kdesktop", "KScreensaverIface", "configure()", TQString("")); mChanged = false; emit changed(false); @@ -503,7 +503,7 @@ void KScreenSaver::findSavers() item = new TQListViewItem ( mSaverListView, s->name(), "2" + s->name() ); else { - TQListViewItem *categoryItem = mSaverListView->findItem( s->category(), 0 ); + TQListViewItem *categoryItem = mSaverListView->tqfindItem( s->category(), 0 ); if ( !categoryItem ) { categoryItem = new TQListViewItem ( mSaverListView, s->category(), "1" + s->category() ); categoryItem->setPixmap ( 0, SmallIcon ( "kscreensaver" ) ); @@ -639,9 +639,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item) int i = 0, indx = -1; for (SaverConfig* saver = mSaverList.first(); saver != 0; saver = mSaverList.next()) { - if ( item->parent() ) + if ( item->tqparent() ) { - if ( item->parent()->text( 0 ) == saver->category() && saver->name() == item->text (0)) + if ( item->tqparent()->text( 0 ) == saver->category() && saver->name() == item->text (0)) { indx = i; break; @@ -739,7 +739,7 @@ void KScreenSaver::slotSetup() // void KScreenSaver::slotAdvanced() { - KScreenSaverAdvancedDialog dlg( topLevelWidget() ); + KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() ); if ( dlg.exec() ) { mChanged = true; emit changed(true); diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h index b03bd878b..9dcf7f46e 100644 --- a/kcontrol/screensaver/scrnsave.h +++ b/kcontrol/screensaver/scrnsave.h @@ -81,7 +81,7 @@ protected: TQPushButton *mSetupBt; TQPushButton *mTestBt; TQListView *mSaverListView; - QSpinBox *mWaitEdit; + TQSpinBox *mWaitEdit; TQSpinBox *mWaitLockEdit; TQCheckBox *mLockCheckBox; TQCheckBox *mStarsCheckBox; diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp index a5d316be5..3676c0db7 100644 --- a/kcontrol/screensaver/testwin.cpp +++ b/kcontrol/screensaver/testwin.cpp @@ -6,7 +6,7 @@ class QXEmbed; TestWin::TestWin() : KSWidget(0, 0, WStyle_Customize | WStyle_NoBorder | WX11BypassWM ) { - setFocusPolicy(StrongFocus); + setFocusPolicy(TQ_StrongFocus); KWin::setState( winId(), NET::StaysOnTop ); } -- cgit v1.2.1