diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-19 01:42:14 +0000 |
commit | 8155225c9be993acc0512956416d195edfef4eb9 (patch) | |
tree | de4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kpersonalizer/kstylepage.cpp | |
parent | 364641b8e0279758d236af39abd138d379328a19 (diff) | |
download | tdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip |
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
Diffstat (limited to 'kpersonalizer/kstylepage.cpp')
-rw-r--r-- | kpersonalizer/kstylepage.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 1323d94fe..04f6e49da 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) { for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) { if (groups[i] == 0L) break; - KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); + KGlobal::config()->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons"); KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i)); } KGlobal::config()->sync(); @@ -522,9 +522,9 @@ void KStylePage::liveUpdate() { // color palette changes KIPC::sendMessageAll(KIPC::PaletteChanged); // kwin-style - kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); + kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); // kdesktop-background - kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", ""); + kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); } /** show the previewWidget styled with the selected one */ @@ -542,7 +542,7 @@ void KStylePage::switchPrevStyle() { // go ahead setStyleRecursive( stylePreview, palette, style ); // this flickers, but reliably draws the widgets corretly. - stylePreview->resize( stylePreview->sizeHint() ); + stylePreview->resize( stylePreview->tqsizeHint() ); delete appliedStyle; appliedStyle = style; @@ -552,11 +552,11 @@ void KStylePage::setStyleRecursive(TQWidget* w, TQPalette &palette, TQStyle* s) // Apply the new style. w->setStyle(s); // Recursively update all children. - const TQObjectList *children = w->children(); - if (!children) + const TQObjectList children = w->childrenListObject(); + if (children.isEmpty()) return; // Apply the style to each child widget. - TQPtrListIterator<TQObject> childit(*children); + TQPtrListIterator<TQObject> childit(children); TQObject *child; while ((child = childit.current()) != 0) { ++childit; |