Differential D7968 Diff 23604 src/widgets/kurlrequester.cpp

Changeset View

Standalone View

src/widgets/kurlrequester.cpp

Show First 20 Lines • Show All 117 Lines • ▼ Show 20 Line(s)		107	if (combo) {
118	}	118		}
119	} else {	119		} else {
120	edit->setText(text);	120		edit->setText(text);
121	}	121		}
122	}	122		}
123		123
124	void connectSignals(KUrlRequester *receiver)	124		void connectSignals(KUrlRequester *receiver)
125	{	125		{
126	QLineEdit *sender;
127	if (combo) {	126		if (combo) {
128	sender = combo->lineEdit();	127		connect(combo, &QComboBox::currentTextChanged,
129	} else {
130	sender = edit;
131	}
132	if (sender) {
133	connect(sender, &QLineEdit::textChanged,
134	receiver, &KUrlRequester::textChanged);	128		receiver, &KUrlRequester::textChanged);
135	connect(sender, &QLineEdit::textEdited,	129		connect(combo, &QComboBox::editTextChanged,
136	receiver, &KUrlRequester::textEdited);	130		receiver, &KUrlRequester::textEdited);
137		131
138	connect(sender, SIGNAL(returnPressed()),	132		connect(combo, QOverload<>::of(&KComboBox::returnPressed),
139	receiver, SIGNAL(returnPressed()));	133		receiver, QOverload<>::of(&KUrlRequester::returnPressed));
140	connect(sender, SIGNAL(returnPressed(QString)),	134		connect(combo, QOverload<const QString&>::of(&KComboBox::returnPressed),
141	receiver, SIGNAL(returnPressed(QString)));	135		receiver, QOverload<>::of(&KUrlRequester::returnPressed));
		136		} else if (edit) {
		137		connect(edit, &QLineEdit::textChanged,
		138		receiver, &KUrlRequester::textChanged);
		139		connect(edit, &QLineEdit::textEdited,
		140		receiver, &KUrlRequester::textEdited);
		141
		142		connect(edit, QOverload<>::of(&QLineEdit::returnPressed),
		143		receiver, QOverload<>::of(&KUrlRequester::returnPressed));
		144
		145		if (auto kline = qobject_cast<KLineEdit*>(edit)) {
		146		connect(kline, QOverload<const QString&>::of(&KLineEdit::returnPressed),
		147		receiver, QOverload<const QString&>::of(&KUrlRequester::returnPressed));
		148		}
			apolUnsubmitted Not Done We can use qOverload now (we depend on Qt 5.7). It will end being much more readable. apol: We can use qOverload now (we depend on Qt 5.7). It will end being much more readable.
			broulikUnsubmitted Not Done `qOverload()` requires C++14 which I don't think we can use in Frameworks. broulik: `qOverload()` requires C++14 which I don't think we can use in Frameworks.
142	}	149		}
143	}	150		}
144		151
145	void setCompletionObject(KCompletion *comp)	152		void setCompletionObject(KCompletion *comp)
146	{	153		{
147	if (combo) {	154		if (combo) {
148	combo->setCompletionObject(comp);	155		combo->setCompletionObject(comp);
149	} else {	156		} else {
▲ Show 20 Lines • Show All 516 Lines • Show Last 20 Lines