From 106525470f87d10befa32d511dbf750f4ef341b8 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 18 Sep 2011 23:43:22 +0000 Subject: Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q* This fixes the Kopete MSN protocol among other things git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- amarok/src/mediadevice/daap/mongrel/http11/http11.c | 2 +- amarok/src/sqlite/sqlite3.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amarok/src/mediadevice/daap/mongrel/http11/http11.c b/amarok/src/mediadevice/daap/mongrel/http11/http11.c index 74742f3c..ad1d5126 100644 --- a/amarok/src/mediadevice/daap/mongrel/http11/http11.c +++ b/amarok/src/mediadevice/daap/mongrel/http11/http11.c @@ -534,7 +534,7 @@ void Init_libhttp11() DEF_GLOBAL(http_prefix, "HTTP_"); DEF_GLOBAL(request_method, "REQUEST_METHOD"); DEF_GLOBAL(request_uri, "REQUEST_URI"); - DEF_GLOBAL(query_string, "TQUERY_STRING"); + DEF_GLOBAL(query_string, "QUERY_STRING"); DEF_GLOBAL(http_version, "HTTP_VERSION"); DEF_GLOBAL(request_path, "REQUEST_PATH"); DEF_GLOBAL(content_length, "CONTENT_LENGTH"); diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c index 3d330da6..aa85d2ed 100644 --- a/amarok/src/sqlite/sqlite3.c +++ b/amarok/src/sqlite/sqlite3.c @@ -63508,7 +63508,7 @@ SQLITE_PRIVATE void sqlite3ParserTrace(FILE *TraceFILE, char *zTracePrompt){ /* For tracing shifts, the names of all terminals and nonterminals ** are required. The following table supplies these names */ static const char *const yyTokenName[] = { - "$", "SEMI", "EXPLAIN", "TQUERY", + "$", "SEMI", "EXPLAIN", "QUERY", "PLAN", "BEGIN", "TRANSACTION", "DEFERRED", "IMMEDIATE", "EXCLUSIVE", "COMMIT", "END", "ROLLBACK", "CREATE", "TABLE", "IF", -- cgit v1.2.3