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 /kpersonalizer | |
| 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 'kpersonalizer')
| -rw-r--r-- | kpersonalizer/kstylepage.cpp | 12 | ||||
| -rw-r--r-- | kpersonalizer/ksysinfo.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 04f6e49da..214d95cd3 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -428,12 +428,12 @@ void KStylePage::getAvailability() { else if (*it == "Light, 3rd revision") kde_light_exist = true; } // and disable the ListItems, if they are not. - if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false); - if ( !(kde_hc_exist || kde_def_exist) ) classic->setVisible(false); - if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->setVisible(false); - if (!cde_exist) cde->setVisible(false); - if (!win_exist) win->setVisible(false); - if (!platinum_exist) platinum->setVisible(false); + if ( !(kde_plastik_exist || kde_light_exist) ) kde->tqsetVisible(false); + if ( !(kde_hc_exist || kde_def_exist) ) classic->tqsetVisible(false); + if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->tqsetVisible(false); + if (!cde_exist) cde->tqsetVisible(false); + if (!win_exist) win->tqsetVisible(false); + if (!platinum_exist) platinum->tqsetVisible(false); // test, wich KWin-styles are available kwin_keramik_exist = kwin_system_exist = kwin_plastik_exist diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp index 014e6d489..15b30fbf9 100644 --- a/kpersonalizer/ksysinfo.cpp +++ b/kpersonalizer/ksysinfo.cpp @@ -104,7 +104,7 @@ void KSysInfo::initFontFamilies() { m_fixed_font = TQString::null; int normal_priority = 0, fixed_priority = 0; for (uint i=0; i < families.count(); i++) { - TQString font = *families.at(i); + TQString font = *families.tqat(i); //add further NORMAL fonts here if ( (font.tqcontains("Arial [") || font=="Arial") && normal_priority < 15 ) { m_normal_font = font; |