casa-mp-base

From 4b44db4eea4f7ec4db3c1bc23a35c0a3b18110fe Mon Sep 17 00:00:00 2001

From: Teus Benschop <teusjannette@gmail.com>

Date: Fri, 28 Feb 2014 06:48:31 +0000

Subject: Fixed: keyterms.cpp:753:57: note: put the semicolon on a separate line to silence this warning

​

---

diff --git a/gtk/src/keyterms.cpp b/gtk/src/keyterms.cpp

index 997af74..0b3c84e 100644

--- src/keyterms.cpp

+++ src/keyterms.cpp

@@ -750,8 +750,7 @@ void keyterms_import_ktbh_txt(const ustring& textfile, ustring category)

       catch(exception & ex) {

         ustring msg = "Skipping: ";

         msg.append(ex.what());

-        if (write(1, msg.c_str(), strlen(msg.c_str()))) ;

-        cout << endl;

+        cout << msg << endl;

       }

     }

--

cgit v0.9.0.2

From 87b405bd3d305a48c64dfea5d28dca3d7b9e4afb Mon Sep 17 00:00:00 2001

From: Teus Benschop <teusjannette@gmail.com>

Date: Fri, 28 Feb 2014 08:14:15 +0000

Subject: trying to fix: keyterms.cpp:1073:207: error: cannot pass non-POD object of type...

​

---

diff --git a/gtk/src/keyterms.cpp b/gtk/src/keyterms.cpp

index 0b3c84e..fa6fa9c 100644

--- src/keyterms.cpp

+++ src/keyterms.cpp

@@ -1070,7 +1070,10 @@ void keyterms_store_renderings(const ustring & project, const ustring & keyterm,

     rc = sqlite3_exec(db, sql, NULL, NULL, &error);

     g_free(sql);

     for (unsigned int i = 0; i < renderings.size(); i++) {

-      sql = g_strdup_printf("insert into renderings values ('%s', '%s', '%s', %d, %d);", double_apostrophy(keyterm).c_str(), double_apostrophy(collection).c_str(), double_apostrophy(renderings[i]).c_str(), wholewords[i], casesensitives[i]);

+      ustring s1 = double_apostrophy(keyterm);

+      ustring s2 = double_apostrophy(collection);

+      ustring s3 = double_apostrophy(renderings[i]);

+      sql = g_strdup_printf("insert into renderings values ('%s', '%s', '%s', %d, %d);", s1.c_str(), s2.c_str(), s3.c_str(), wholewords[i], casesensitives[i]);

       rc = sqlite3_exec(db, sql, NULL, NULL, &error);

       g_free(sql);

       if (rc)

--

cgit v0.9.0.2

From cbb0c28a08707094cefedd754b07406d2e349eb2 Mon Sep 17 00:00:00 2001

From: Teus Benschop <teusjannette@gmail.com>

Date: Fri, 28 Feb 2014 17:10:24 +0000

Subject: fixed: keyterms.cpp:1076:126: error: cannot pass non-POD object of type

​

---

diff --git a/gtk/src/keyterms.cpp b/gtk/src/keyterms.cpp

index fa6fa9c..9d85135 100644

--- src/keyterms.cpp

+++ src/keyterms.cpp

@@ -1073,7 +1073,9 @@ void keyterms_store_renderings(const ustring & project, const ustring & keyterm,

       ustring s1 = double_apostrophy(keyterm);

       ustring s2 = double_apostrophy(collection);

       ustring s3 = double_apostrophy(renderings[i]);

-      sql = g_strdup_printf("insert into renderings values ('%s', '%s', '%s', %d, %d);", s1.c_str(), s2.c_str(), s3.c_str(), wholewords[i], casesensitives[i]);

+      int i1 = wholewords[i];

+      int i2 = casesensitives[i];