diff options
| author | joerg <joerg@pkgsrc.org> | 2013-05-11 21:36:56 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-05-11 21:36:56 +0000 |
| commit | df7f210ed1d817cc20780a8eb618993d7a8c0ce7 (patch) | |
| tree | 4012842784543a520e446ddc735f990fa668497d | |
| parent | 35e54bb2bf7cdea2553313b87e35908fb4f1fc00 (diff) | |
| download | pkgsrc-df7f210ed1d817cc20780a8eb618993d7a8c0ce7.tar.gz | |
Explicitly resolve the conversion from QString to ifstream argument by
using ascii().
| -rw-r--r-- | editors/kdissert/distinfo | 4 | ||||
| -rw-r--r-- | editors/kdissert/patches/patch-src_kdissert_gui_KDissertPart.cpp | 18 | ||||
| -rw-r--r-- | editors/kdissert/patches/patch-src_kdissert_gui_generatorwizard.cpp | 17 |
3 files changed, 38 insertions, 1 deletions
diff --git a/editors/kdissert/distinfo b/editors/kdissert/distinfo index 931980a0837..03de94b9c52 100644 --- a/editors/kdissert/distinfo +++ b/editors/kdissert/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.6 2012/05/16 22:16:36 marino Exp $ +$NetBSD: distinfo,v 1.7 2013/05/11 21:36:56 joerg Exp $ SHA1 (kdissert-1.0.7.tar.bz2) = 37ecab653b0e5f626036ad847583990c825e5e7e RMD160 (kdissert-1.0.7.tar.bz2) = 2aa78e9423fa3ec8a46c6c53b3cf7c41396b3347 Size (kdissert-1.0.7.tar.bz2) = 501108 bytes SHA1 (patch-ab) = f3444118d50e6001443febbe63419051f8ebdfd7 SHA1 (patch-ac) = a961d66f239bbae8251c78c21fdd482a6dc3382c +SHA1 (patch-src_kdissert_gui_KDissertPart.cpp) = 669b74c558483a776eecaa798e71c4958d6a4543 +SHA1 (patch-src_kdissert_gui_generatorwizard.cpp) = a341fb482487d8c8435c536029a1d9929427427b SHA1 (patch-src_kdissert_wscript_build) = 849e62a5adcf809ef209f9afae85cbca27a5e279 diff --git a/editors/kdissert/patches/patch-src_kdissert_gui_KDissertPart.cpp b/editors/kdissert/patches/patch-src_kdissert_gui_KDissertPart.cpp new file mode 100644 index 00000000000..b65caca19fb --- /dev/null +++ b/editors/kdissert/patches/patch-src_kdissert_gui_KDissertPart.cpp @@ -0,0 +1,18 @@ +$NetBSD: patch-src_kdissert_gui_KDissertPart.cpp,v 1.1 2013/05/11 21:36:56 joerg Exp $ + +--- src/kdissert/gui/KDissertPart.cpp.orig 2013-05-10 15:12:25.000000000 +0000 ++++ src/kdissert/gui/KDissertPart.cpp +@@ -482,10 +482,11 @@ void KDissertPart::regenerateDocument() + + // read last generation date (for backup suffix) and save the actual one + std::string hash; +- std::ifstream is(m_data->m_generator_lasturl+"/.kdissert"); ++ ++ std::ifstream is((m_data->m_generator_lasturl+"/.kdissert").ascii()); + is>>hash; + is.close(); +- std::ofstream os(m_data->m_generator_lasturl+"/.kdissert"); ++ std::ofstream os((m_data->m_generator_lasturl+"/.kdissert").ascii()); + os<<QDate::currentDate().toString(Qt::ISODate) + <<'-' + <<QTime::currentTime().toString(Qt::ISODate); diff --git a/editors/kdissert/patches/patch-src_kdissert_gui_generatorwizard.cpp b/editors/kdissert/patches/patch-src_kdissert_gui_generatorwizard.cpp new file mode 100644 index 00000000000..eda16a370f5 --- /dev/null +++ b/editors/kdissert/patches/patch-src_kdissert_gui_generatorwizard.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-src_kdissert_gui_generatorwizard.cpp,v 1.1 2013/05/11 21:36:56 joerg Exp $ + +--- src/kdissert/gui/generatorwizard.cpp.orig 2013-05-10 15:14:38.000000000 +0000 ++++ src/kdissert/gui/generatorwizard.cpp +@@ -139,10 +139,10 @@ void generatorwizard::accept() + + // read last generation date (for backup suffix) and save the actual one + std::string hash("ERROR"); // if hash is used for backup, but not read from file, it's an error +- std::ifstream is(m_data->m_generator_lasturl+"/.kdissert"); ++ std::ifstream is((m_data->m_generator_lasturl+"/.kdissert").ascii()); + is>>hash; + is.close(); +- std::ofstream os(m_page1->docfinallocation->text()+"/.kdissert"); ++ std::ofstream os((m_page1->docfinallocation->text()+"/.kdissert").ascii()); + os<<QDate::currentDate().toString(Qt::ISODate) + <<'-' + <<QTime::currentTime().toString(Qt::ISODate); |