diff options
| author | Luboš Doležel <lubos@dolezel.info> | 2015-07-04 22:11:12 +0200 |
|---|---|---|
| committer | Luboš Doležel <lubos@dolezel.info> | 2015-07-04 22:11:12 +0200 |
| commit | 4ec69237e6b777df818bc95bd46a58448340b30d (patch) | |
| tree | c08584cb8cd034d071f476372ceb6de44447fa6c /src/gui | |
| parent | 636331cbf0e0d0947f5d25771c5a0689f07564fd (diff) | |
| download | twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.tar twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.tar.gz twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.tar.lz twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.tar.xz twinkle-4ec69237e6b777df818bc95bd46a58448340b30d.zip | |
Replaced Boost regex dependency with C++11 regex
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/numberconversionform.cpp | 4 | ||||
| -rw-r--r-- | src/gui/userprofileform.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 57b8a19..c178b9c 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -134,7 +134,7 @@ add_executable(twinkle ${TWINKLE_GUI-SRCS}) target_link_libraries(twinkle -lpthread -lresolv ${LibMagic_LIBRARY} ${LIBXML2_LIBRARIES} ${Readline_LIBRARY} ${ILBC_LIBRARIES} ${SPEEX_LIBRARIES} ${ZRTPCPP_LIBRARIES} ${CCRTP_LIBRARIES} ${COMMONCPP_LIBRARIES} ${UCOMMON_LIBRARIES} ${LIBSNDFILE_LIBRARY} - ${Boost_LIBRARIES} ${ALSA_LIBRARY} ${qt_LIBS} ${G729_LIBRARY}) + ${ALSA_LIBRARY} ${qt_LIBS} ${G729_LIBRARY}) install(TARGETS twinkle DESTINATION bin) install(FILES ${twinkle_LANG} DESTINATION share/twinkle/lang) diff --git a/src/gui/numberconversionform.cpp b/src/gui/numberconversionform.cpp index af95dd2..f8ae64c 100644 --- a/src/gui/numberconversionform.cpp +++ b/src/gui/numberconversionform.cpp @@ -67,8 +67,8 @@ void NumberConversionForm::validate() } try { - boost::regex re(expr.toStdString()); - } catch (boost::bad_expression) { + std::regex re(expr.toStdString()); + } catch (std::regex_error) { ((t_gui *)ui)->cb_show_msg(this, tr("Invalid regular expression.").toStdString(), MSG_CRITICAL); exprLineEdit->setFocus(); diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp index d7f39a0..788d87b 100644 --- a/src/gui/userprofileform.cpp +++ b/src/gui/userprofileform.cpp @@ -598,7 +598,7 @@ void UserProfileForm::populate() int j = 0; for (list<t_number_conversion>::reverse_iterator i = conversions.rbegin(); i != conversions.rend(); i++, j++) { - QTableWidgetItem* item = new QTableWidgetItem(QString::fromStdString(i->re.str())); + QTableWidgetItem* item = new QTableWidgetItem(QString::fromStdString(i->re)); conversionListView->setItem(j, 0, item); item = new QTableWidgetItem(QString::fromStdString(i->fmt)); conversionListView->setItem(j, 1, item); @@ -712,7 +712,7 @@ list<t_number_conversion> UserProfileForm::get_number_conversions() item = conversionListView->item(0, 1); c.fmt = item->text().toStdString(); conversions.push_back(c); - } catch (boost::bad_expression) { + } catch (std::regex_error) { // Should never happen as validity has been // checked already. Just being defensive here. } |