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/iccconfig/iccconfig.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/iccconfig/iccconfig.cpp')
| -rw-r--r-- | kcontrol/iccconfig/iccconfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index e78a70af2..6556b912d 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -286,7 +286,7 @@ void KICCConfig::load(bool useDefaults ) base->deleteProfileButton->setFixedWidth(90); XRROutputInfo *output_info; - KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI(); + KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); config->setReadDefaults( useDefaults ); @@ -356,7 +356,7 @@ void KICCConfig::save() { int i; int j; - KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI(); + KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); // Write system configuration systemconfig->setGroup(NULL); @@ -408,4 +408,4 @@ TQString KICCConfig::quickHelp() const " for a more lifelike and vibrant image."); } -#include "iccconfig.moc"
\ No newline at end of file +#include "iccconfig.moc" |