Revert "Add uintNickCompletionOrder to the options widget."

This reverts commit 6a0906274e93359e90337600192695b39706ff55.

2 files changed, 5 insertions, 26 deletions

diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 93c266945..69b37f88c 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -159,24 +159,10 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 
 	addBoolSelector(g, __tr2qs_ctx("Ignore special characters in nick completion", "options"), KviOption_boolIgnoreSpecialCharactersInNickCompletion);
 
-	KviTalHBox * hb = new KviTalHBox(g);
-
-	QLabel * l = new QLabel(__tr2qs_ctx("Nickname completion order:", "options"), hb);
-	l->setMinimumWidth(120);
-
-	m_pCompletionOrderCombo = new QComboBox(hb);
-	m_pCompletionOrderCombo->addItem(__tr2qs_ctx("As listed", "options"));
-	m_pCompletionOrderCombo->addItem(__tr2qs_ctx("Alphabetical", "options"));
-	m_pCompletionOrderCombo->addItem(__tr2qs_ctx("By last action time", "options"));
-
-	// TODO: add the tooltip
-
-	if (KVI_OPTION_UINT(KviOption_uintNickCompletionOrder) < 3)
-		m_pCompletionOrderCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintNickCompletionOrder));
-	else
-		m_pCompletionOrderCombo->setCurrentIndex(2);
-
-	hb->setStretchFactor(m_pCompletionOrderCombo, 1);
+	// TODO: Add a combo box for KviOption_uintNickCompletionOrder
+	// 0: as listed
+	// 1: alphabetical
+	// 2: by last action time
 
 	KviBoolSelector * d = addBoolSelector(0, 7, 0, 7, __tr2qs_ctx("Use a custom cursor width", "options"), KviOption_boolEnableCustomCursorWidth);
 	KviUIntSelector * f = addUIntSelector(0, 8, 0, 8, __tr2qs_ctx("Custom cursor width:", "options"), KviOption_uintCustomCursorWidth, 1, 24, 8, KVI_OPTION_BOOL(KviOption_boolEnableCustomCursorWidth));
@@ -187,8 +173,3 @@ OptionsWidget_inputFeatures::OptionsWidget_inputFeatures(QWidget * parent)
 
 OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures()
     = default;
-
-void OptionsWidget_inputFeatures::commit()
-{
-	KVI_OPTION_UINT(KviOption_uintNickCompletionOrder) = m_pCompletionOrderCombo->currentIndex();
-}
diff --git a/src/modules/options/OptionsWidget_input.h b/src/modules/options/OptionsWidget_input.h
index 0021cecba..0f16ee986 100644
--- a/src/modules/options/OptionsWidget_input.h
+++ b/src/modules/options/OptionsWidget_input.h
@@ -55,13 +55,11 @@ class OptionsWidget_inputFeatures : public KviOptionsWidget
 {
 	Q_OBJECT
 private:
-	QComboBox * m_pCompletionOrderCombo;
+	QComboBox * m_pNickCompletionOrder;
 
 public:
 	OptionsWidget_inputFeatures(QWidget * parent);
 	~OptionsWidget_inputFeatures();
-
-	virtual void commit();
 };
 
 #endif //!_OPTW_INPUT_H_