diff --git a/resources/kolab/pimkolab/CMakeLists.txt b/resources/kolab/pimkolab/CMakeLists.txt --- a/resources/kolab/pimkolab/CMakeLists.txt +++ b/resources/kolab/pimkolab/CMakeLists.txt @@ -12,10 +12,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() -find_package(Boost REQUIRED) - include_directories( - ${Boost_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/kolabformatV2 ${Libkolabxml_INCLUDES} ./ diff --git a/resources/kolab/pimkolab/calendaring/calendaring.h b/resources/kolab/pimkolab/calendaring/calendaring.h --- a/resources/kolab/pimkolab/calendaring/calendaring.h +++ b/resources/kolab/pimkolab/calendaring/calendaring.h @@ -22,8 +22,8 @@ #include #include -#include #include +#include namespace Kolab { namespace Calendaring { @@ -73,7 +73,7 @@ private: Calendar(const Calendar &); void operator=(const Calendar &); - boost::scoped_ptr mCalendar; + std::unique_ptr mCalendar; }; } //Namespace } //Namespace diff --git a/resources/kolab/pimkolab/kolabformat/mimeobject.cpp b/resources/kolab/pimkolab/kolabformat/mimeobject.cpp --- a/resources/kolab/pimkolab/kolabformat/mimeobject.cpp +++ b/resources/kolab/pimkolab/kolabformat/mimeobject.cpp @@ -27,10 +27,12 @@ #include "kolabformat/v2helpers.h" #include "mime/mimeutils.h" #include "libkolab-version.h" +#include "pimkolab_debug.h" + #include #include -#include -#include "pimkolab_debug.h" +#include + Q_DECLARE_METATYPE(Kolab::Event) Q_DECLARE_METATYPE(Kolab::Todo) Q_DECLARE_METATYPE(Kolab::Journal) @@ -135,7 +137,7 @@ return NoteObject; } else if (type == freebusyKolabType()) { return FreebusyObject; - } else if (boost::contains(type, dictKolabType())) { //Previous versions appended the language to the type + } else if (strstr(type.c_str(), KOLAB_TYPE_DICT)) { //Previous versions appended the language to the type return DictionaryConfigurationObject; } else if (type == relationKolabType()) { return RelationConfigurationObject; diff --git a/resources/kolab/pimkolab/utils/CMakeLists.txt b/resources/kolab/pimkolab/utils/CMakeLists.txt --- a/resources/kolab/pimkolab/utils/CMakeLists.txt +++ b/resources/kolab/pimkolab/utils/CMakeLists.txt @@ -1,5 +1,2 @@ - -find_package(Boost REQUIRED COMPONENTS program_options system thread) - add_executable(kolabformatchecker kolabformatchecker.cpp) -target_link_libraries(kolabformatchecker pimkolab ${Boost_LIBRARIES} Qt5::Core KF5::AkonadiCore KF5::Contacts KF5::CalendarCore KF5::Mime) +target_link_libraries(kolabformatchecker pimkolab Qt5::Core KF5::AkonadiCore KF5::Contacts KF5::CalendarCore KF5::Mime) diff --git a/resources/kolab/pimkolab/utils/kolabformatchecker.cpp b/resources/kolab/pimkolab/utils/kolabformatchecker.cpp --- a/resources/kolab/pimkolab/utils/kolabformatchecker.cpp +++ b/resources/kolab/pimkolab/utils/kolabformatchecker.cpp @@ -16,7 +16,6 @@ * along with this program. If not, see . */ -#include #include #include #include @@ -26,7 +25,6 @@ #include "kolabformat/errorhandler.h" #include "kolabformat/kolabobject.h" #include "pimkolab_debug.h" -namespace po = boost::program_options; using namespace std; KMime::Message::Ptr readMimeFile(const QString &fileName, bool &ok) @@ -46,30 +44,11 @@ int main(int argc, char *argv[]) { - // Declare the supported options. - po::options_description desc("Allowed options"); - desc.add_options() - ("help", "produce help message") - ("input-file", po::value >(), "input files") - ; - - po::positional_options_description p; - p.add("input-file", -1); - - po::variables_map vm; - po::store(po::command_line_parser(argc, argv). - options(desc).positional(p).run(), vm); - po::notify(vm); - - if (vm.count("help")) { - cout << desc << "\n"; - return 1; - } - vector inputFiles; - if (vm.count("input-file")) { - inputFiles = vm["input-file"].as< vector >(); - } else { + for (int i = 1; i < argc; ++i) { + inputFiles.push_back(argv[i]); + } + if (inputFiles.empty()) { cout << "Specify input-file\n"; return -1; }