Commit 755cc729 authored by Clement CHAVANCE's avatar Clement CHAVANCE

changed declaration of the signal/slot witch will load the settings

parent e5d498ac
......@@ -116,6 +116,6 @@ void SettingsManager::loadSettings( const QDomElement& settings )
QVariant( attrMap.item( 0 ).nodeValue() ));
}
m_lock.unlock();
emit settingsLoaded( m_data );
emit settingsLoaded();
}
......@@ -51,11 +51,11 @@ class SettingsManager : public QObject, public QSingleton<SettingsManager>
SettingsManager( QObject* parent = 0 );
~SettingsManager();
QHash<QString, QVariant> m_data;
QHash<QString, QVariant> m_data;
mutable QReadWriteLock m_lock;
signals:
void settingsLoaded( const QHash<QString, QVariant>& settings );
void settingsLoaded();
};
......
......@@ -66,9 +66,9 @@ void Settings::addWidget( const QString& name,
{
m_stackedWidgets->addWidget( pWidget );
QObject::connect( SettingsManager::getInstance(),
SIGNAL( settingsLoaded( const QHash<QString, QVariant>& ) ),
SIGNAL( settingsLoaded() ),
this,
SLOT( loadSettings( const QHash<QString, QVariant>& ) ) );
SLOT( loadSettings() ) );
int idx = m_stackedWidgets->indexOf( pWidget );
m_widgets.insert( idx, name );
......@@ -175,6 +175,6 @@ void Settings::switchWidget( int widget )
emit widgetSwitched( widget );
}
void Settings::loadSettings( const QHash<QString, QVariant>& sett )
void Settings::loadSettings()
{
}
......@@ -67,7 +67,7 @@ class Settings : public QDialog
public slots:
void switchWidget( int widget );
void loadSettings( const QHash<QString, QVariant>& );
void loadSettings();
private slots:
void buttonClicked( QAbstractButton* button );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment