aboutsummaryrefslogtreecommitdiff
path: root/src/qt/qvaluecombobox.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2012-05-09 08:33:44 -0700
committerWladimir J. van der Laan <[email protected]>2012-05-09 08:33:44 -0700
commit0981b80c2968e44cbbfac451cd15b7fe8bc700bd (patch)
treefac9a804298358687c4e175545ea73ca07df4cbd /src/qt/qvaluecombobox.cpp
parentMerge pull request #1237 from gmaxwell/master (diff)
parentMake it possible to set user interface language from options dialog (diff)
downloaddiscoin-0981b80c2968e44cbbfac451cd15b7fe8bc700bd.tar.xz
discoin-0981b80c2968e44cbbfac451cd15b7fe8bc700bd.zip
Merge pull request #1220 from laanwj/2012_05_organize_optionsdialog
Organize optionsdialog (split off Window and Network page) and add option to change language
Diffstat (limited to 'src/qt/qvaluecombobox.cpp')
-rw-r--r--src/qt/qvaluecombobox.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/qvaluecombobox.cpp b/src/qt/qvaluecombobox.cpp
index c0ad8c12e..d7ce3d013 100644
--- a/src/qt/qvaluecombobox.cpp
+++ b/src/qt/qvaluecombobox.cpp
@@ -6,12 +6,12 @@ QValueComboBox::QValueComboBox(QWidget *parent) :
connect(this, SIGNAL(currentIndexChanged(int)), this, SLOT(handleSelectionChanged(int)));
}
-int QValueComboBox::value() const
+QVariant QValueComboBox::value() const
{
- return itemData(currentIndex(), role).toInt();
+ return itemData(currentIndex(), role);
}
-void QValueComboBox::setValue(int value)
+void QValueComboBox::setValue(const QVariant &value)
{
setCurrentIndex(findData(value, role));
}