Differential D7968 Diff 24188 src/widgets/kurlrequester.cpp

Changeset View

Standalone View

src/widgets/kurlrequester.cpp

Show First 20 Lines • Show All 118 Lines • ▼ Show 20 Line(s)		108	if (combo) {
119	}	119		}
120	} else {	120		} else {
121	edit->setText(text);	121		edit->setText(text);
122	}	122		}
123	}	123		}
124		124
125	void connectSignals(KUrlRequester *receiver)	125		void connectSignals(KUrlRequester *receiver)
126	{	126		{
127	QLineEdit *sender;
128	if (combo) {	127		if (combo) {
129	sender = combo->lineEdit();	128		connect(combo, &QComboBox::currentTextChanged,
130	} else {
131	sender = edit;
132	}
133	if (sender) {
134	connect(sender, &QLineEdit::textChanged,
135	receiver, &KUrlRequester::textChanged);	129		receiver, &KUrlRequester::textChanged);
136	connect(sender, &QLineEdit::textEdited,	130		connect(combo, &QComboBox::editTextChanged,
137	receiver, &KUrlRequester::textEdited);	131		receiver, &KUrlRequester::textEdited);
138		132
139	connect(sender, SIGNAL(returnPressed()),	133		connect(combo, QOverload<>::of(&KComboBox::returnPressed),
140	receiver, SIGNAL(returnPressed()));	134		receiver, QOverload<>::of(&KUrlRequester::returnPressed));
141	connect(sender, SIGNAL(returnPressed(QString)),	135		connect(combo, QOverload<const QString&>::of(&KComboBox::returnPressed),
142	receiver, SIGNAL(returnPressed(QString)));	136		receiver, QOverload<const QString&>::of(&KUrlRequester::returnPressed));
		137		} else if (edit) {
		138		connect(edit, &QLineEdit::textChanged,
		139		receiver, &KUrlRequester::textChanged);
		140		connect(edit, &QLineEdit::textEdited,
		141		receiver, &KUrlRequester::textEdited);
		142
		143		connect(edit, QOverload<>::of(&QLineEdit::returnPressed),
		144		receiver, QOverload<>::of(&KUrlRequester::returnPressed));
		145
		146		if (auto kline = qobject_cast<KLineEdit*>(edit)) {
		147		connect(kline, QOverload<const QString&>::of(&KLineEdit::returnPressed),
		148		receiver, QOverload<const QString&>::of(&KUrlRequester::returnPressed));
		149		}
			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.
143	}	150		}
144	}	151		}
145		152
146	void setCompletionObject(KCompletion *comp)	153		void setCompletionObject(KCompletion *comp)
147	{	154		{
148	if (combo) {	155		if (combo) {
149	combo->setCompletionObject(comp);	156		combo->setCompletionObject(comp);
150	} else {	157		} else {
▲ Show 20 Lines • Show All 516 Lines • Show Last 20 Lines