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 /kdm/kfrontend/themer/kdmitem.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 'kdm/kfrontend/themer/kdmitem.cpp')
| -rw-r--r-- | kdm/kfrontend/themer/kdmitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp index 3d81de58a..2d3f841f4 100644 --- a/kdm/kfrontend/themer/kdmitem.cpp +++ b/kdm/kfrontend/themer/kdmitem.cpp @@ -564,7 +564,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType ) } else { // int value dType = DTpixel; TQString sCopy = s; - if (sCopy.at( 0 ) == '-') { + if (sCopy.tqat( 0 ) == '-') { sCopy.remove( 0, 1 ); dType = DTnpixel; } @@ -588,7 +588,7 @@ KdmItem::parseFont( const TQString &s, TQFont &font ) void KdmItem::parseColor( const TQString &s, TQColor &color ) { - if (s.at( 0 ) != '#') + if (s.tqat( 0 ) != '#') return; bool ok; TQString sCopy = s; @@ -621,7 +621,7 @@ KdmItem::tqparentWidget() const if (!this->parent()) return 0; - if (tqparent()->tqqt_cast("TQWidget")) + if (tqparent()->qt_cast("TQWidget")) return (TQWidget*)parent(); return ((KdmItem*)parent())->tqparentWidget(); } |