SVN commit 1307636 by andriusr: Minor fixes for MSVC build. M +2 -0 kbattleship/src/battlefieldview.cpp M +1 -1 kbattleship/src/battlefieldview.h M +1 -1 libkdegames/kgthemeprovider.cpp --- trunk/KDE/kdegames/kbattleship/src/battlefieldview.cpp #1307635:1307636 @@ -341,3 +341,5 @@ { m_player = player; } + +const qreal BattleFieldView::PREVIEW_OPACITY = 0.5; --- trunk/KDE/kdegames/kbattleship/src/battlefieldview.h #1307635:1307636 @@ -30,7 +30,7 @@ class BattleFieldView : public QGraphicsView { - static const qreal PREVIEW_OPACITY = 0.5; + static const qreal PREVIEW_OPACITY; KGameRenderedItem* m_background; KGameRenderedItem* m_background_lower; --- trunk/KDE/kdegames/libkdegames/kgthemeprovider.cpp #1307635:1307636 @@ -135,7 +135,7 @@ } } //fall back to default theme (or first theme if no default specified) - return d->m_currentTheme = (d->m_defaultTheme ?: d->m_themes[0]); + return d->m_currentTheme = (d->m_defaultTheme ? d->m_defaultTheme : d->m_themes.first()); } void KgThemeProvider::setCurrentTheme(const KgTheme* theme)