Commit 3fa9fe9e authored by Laurent Montel's avatar Laurent Montel 😁

Reactivate code for using AddressTypeDialog

parent 5bc9dba7
......@@ -7,14 +7,14 @@ ecm_mark_as_test(addresseslocationviewer)
target_link_libraries(addresseslocationviewer Qt5::Test Qt5::Widgets KF5::AkonadiContact KF5::Contacts KF5::I18n Qt5::WebKitWidgets Grantlee5::Templates KF5::IconThemes)
set(addresslocationwidget_SRCS addresslocationwidgettest.cpp ../addresslocationwidget.cpp ../selectaddresstypecombobox.cpp)
set(addresslocationwidget_SRCS addresslocationwidgettest.cpp ../addresslocationwidget.cpp ../selectaddresstypecombobox.cpp ../addresstypedialog.cpp)
add_executable(addresslocationwidget ${addresslocationwidget_SRCS})
add_test(addresslocationwidget addresslocationwidget)
ecm_mark_as_test(addresslocationwidget)
target_link_libraries(addresslocationwidget Qt5::Test Qt5::Widgets KF5::AkonadiContact KF5::Contacts KF5::I18n KF5::Completion)
set(addresseslocationwidget_SRCS addresseslocationwidgettest.cpp ../addresseslocationwidget.cpp ../addresseslocationviewer.cpp ../addresseslocationgrantleeformater.cpp
../addressgrantleeobject.cpp ../iconnamecache.cpp ../addresslocationwidget.cpp ../selectaddresstypecombobox.cpp)
../addressgrantleeobject.cpp ../iconnamecache.cpp ../addresslocationwidget.cpp ../selectaddresstypecombobox.cpp ../addresstypedialog.cpp)
add_executable(addresseslocationwidget ${addresseslocationwidget_SRCS})
add_test(addresseslocationwidget addresseslocationwidget)
ecm_mark_as_test(addresseslocationwidget)
......
......@@ -21,8 +21,10 @@
*/
#include "addresstypedialog.h"
#include "selectaddresstypecombobox.h"
#include <KLocalizedString>
#include <autoqpointer_p.h>
SelectAddressTypeComboBox::SelectAddressTypeComboBox(QWidget *parent)
: KComboBox(parent)
......@@ -97,7 +99,6 @@ void SelectAddressTypeComboBox::selected(int pos)
void SelectAddressTypeComboBox::otherSelected()
{
#if 0
AutoQPointer<AddressTypeDialog> dlg = new AddressTypeDialog(mType, this);
if (dlg->exec()) {
mType = dlg->type();
......@@ -107,6 +108,5 @@ void SelectAddressTypeComboBox::otherSelected()
} else {
setType(KContacts::Address::Type(mTypeList.at(mLastSelected)));
}
#endif
update();
}
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