[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    alpha_0_4_branch: kdenonbeta/krecipes
From:       Unai Garro <Unai.Garro () ee ! ed ! ac ! uk>
Date:       2003-11-23 13:06:15
[Download RAW message or body]

CVS commit by uga: 

Fix the "\n"-s that turn up in SQlite with the sample recipes


  A            data/litedata.sql   1.1.2.1
  A            data/mysqldata.sql   1.1.2.1
  M +1 -1      data/Makefile.am   1.6.2.1
  M +1 -2      src/DBBackend/literecipedb.cpp   1.62.2.1
  M +1 -1      src/DBBackend/mysqlrecipedb.cpp   1.42.2.1
  R            data/data.sql   1.10


--- kdenonbeta/krecipes/data/Makefile.am  #1.6:1.6.2.1
@@ -1,3 +1,3 @@
 basedir = $(kde_datadir)/krecipes/data
-base_DATA = data.sql litestructure.sql mysqlstructure.sql
+base_DATA = litedata.sql mysqldata.sql litestructure.sql mysqlstructure.sql
 

--- kdenonbeta/krecipes/src/DBBackend/literecipedb.cpp  #1.62:1.62.2.1
@@ -735,5 +734,5 @@ void LiteRecipeDB::initializeData(void)
         QString commands;
         // Read the commands form the data file
-        QFile datafile(KGlobal::dirs()->findResource("appdata", "data/data.sql"));
+        QFile datafile(KGlobal::dirs()->findResource("appdata", "data/litedata.sql"));
         if ( datafile.open( IO_ReadOnly ) ) {
         QTextStream stream( &datafile );

--- kdenonbeta/krecipes/src/DBBackend/mysqlrecipedb.cpp  #1.42:1.42.2.1
@@ -704,5 +704,5 @@ QSqlQuery initializeQuery(command,databa
         QString commands;
         // Read the commands form the data file
-        QFile datafile(KGlobal::dirs()->findResource("appdata", "data/data.sql"));
+        QFile datafile(KGlobal::dirs()->findResource("appdata", "data/mysqldata.sql"));
         if ( datafile.open( IO_ReadOnly ) ) {
         QTextStream stream( &datafile );


[prev in list] [next in list] [prev in thread] [next in thread]