diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:15:16 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-15 19:15:16 +0000 |
commit | cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 (patch) | |
tree | 2a29ccab4d3cea34b87bfcbc38e64a8e25d25bb0 /kcontrol/screensaver/scrnsave.cpp | |
parent | 107dd1f98367d07df7cbe2042786511e44706d3a (diff) | |
download | tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.tar.gz tdebase-cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9.zip |
Allow kdebase to (mostly) function correctly with TQt for Qt4
Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch)
Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6)
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kcontrol/screensaver/scrnsave.cpp')
-rw-r--r-- | kcontrol/screensaver/scrnsave.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 7582aea53..d4470be06 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -537,7 +537,7 @@ void KScreenSaver::findSavers() mSaverListView->setSelected(selectedItem, true); mSaverListView->setCurrentItem(selectedItem); mSaverListView->ensureItemVisible(selectedItem); - mSetupBt->setEnabled(!mSaverList.at(mSelected)->setup().isEmpty()); + mSetupBt->setEnabled(!mSaverList.tqat(mSelected)->setup().isEmpty()); mTestBt->setEnabled(true); } @@ -587,7 +587,7 @@ void KScreenSaver::slotPreviewExited(KProcess *) if (mSelected >= 0) { mPreviewProc->clearArguments(); - TQString saver = mSaverList.at(mSelected)->saver(); + TQString saver = mSaverList.tqat(mSelected)->saver(); TQTextStream ts(&saver, IO_ReadOnly); TQString word; @@ -665,9 +665,9 @@ void KScreenSaver::slotScreenSaver(TQListViewItem *item) bool bChanged = (indx != mSelected); if (!mSetupProc->isRunning()) - mSetupBt->setEnabled(!mSaverList.at(indx)->setup().isEmpty()); + mSetupBt->setEnabled(!mSaverList.tqat(indx)->setup().isEmpty()); mTestBt->setEnabled(true); - mSaver = mSaverList.at(indx)->file(); + mSaver = mSaverList.tqat(indx)->file(); mSelected = indx; setMonitor(); @@ -690,7 +690,7 @@ void KScreenSaver::slotSetup() mSetupProc->clearArguments(); - TQString saver = mSaverList.at(mSelected)->setup(); + TQString saver = mSaverList.tqat(mSelected)->setup(); if( saver.isEmpty()) return; TQTextStream ts(&saver, IO_ReadOnly); @@ -708,7 +708,7 @@ void KScreenSaver::slotSetup() if (!kxsconfig) { word = "-caption"; (*mSetupProc) << word; - word = mSaverList.at(mSelected)->name(); + word = mSaverList.tqat(mSelected)->name(); (*mSetupProc) << word; word = "-icon"; (*mSetupProc) << word; @@ -724,7 +724,7 @@ void KScreenSaver::slotSetup() // Pass translated name to kxsconfig if (kxsconfig) { - word = mSaverList.at(mSelected)->name(); + word = mSaverList.tqat(mSelected)->name(); (*mSetupProc) << word; } @@ -758,7 +758,7 @@ void KScreenSaver::slotTest() } mTestProc->clearArguments(); - TQString saver = mSaverList.at(mSelected)->saver(); + TQString saver = mSaverList.tqat(mSelected)->saver(); TQTextStream ts(&saver, IO_ReadOnly); TQString word; |