← Back to branch summary

~zsombi/ubuntu-ui-toolkit/03-styleditem-styleset

« back to all changes in this revision

Viewing changes to modules/Ubuntu/Components/plugin/uctheme.cpp

  • Committer: Zsombor Egri
  • Date: 2015-04-01 05:38:10 UTC
  • mfrom: (1434.1.25 02-styleset)
  • Revision ID: zsombor.egri@canonical.com-20150401053810-390pikcl1fbz2c8s
prereq sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/Ubuntu/Components/plugin/uctheme.cpp
180
180
{
181
181
    m_completed = false;
182
182
    QObject::connect(&m_defaultTheme, &UCDefaultTheme::themeNameChanged,
183
 
                     this, &UCTheme::onThemeNameChanged);
 
183
                     this, &UCTheme::_q_defaultThemeChanged);
184
184
    updateThemePaths();
185
185
}
186
186
 
188
188
{
189
189
    m_engine = qmlEngine(this);
190
190
    updateEnginePaths();
 
191
    loadPalette();
191
192
}
192
193
 
193
194
void UCTheme::updateEnginePaths()
204
205
    }
205
206
}
206
207
 
207
 
// slot called when the ThemeSettings uses the system theme
208
 
void UCTheme::onThemeNameChanged()
 
208
void UCTheme::_q_defaultThemeChanged()
209
209
{
210
210
    updateThemePaths();
211
211
    Q_EMIT nameChanged();
258
258
        init();
259
259
    } else {
260
260
        QObject::disconnect(&m_defaultTheme, &UCDefaultTheme::themeNameChanged,
261
 
                            this, &UCTheme::onThemeNameChanged);
 
261
                            this, &UCTheme::_q_defaultThemeChanged);
262
262
        updateThemePaths();
263
263
    }
264
264
    loadPalette();