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

List:       kde-commits
Subject:    koffice/kexi/kexidb/drivers/mySQL
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2008-11-08 17:04:56
Message-ID: 1226163896.437661.16590.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 881639 by staniek:

make compile on windows


 M  +1 -0      mysqlconnection.cpp  
 M  +1 -0      mysqlconnection_p.cpp  
 M  +2 -1      mysqlcursor.cpp  
 M  +11 -10    mysqldriver.cpp  
 M  +1 -0      mysqlpreparedstatement.cpp  


--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp #881638:881639
@@ -20,6 +20,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
+#include "mysqldriver_global.h"
 #include <QVariant>
 #include <QFile>
 #include <QRegExp>
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqlconnection_p.cpp #881638:881639
@@ -18,6 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
+#include "mysqldriver_global.h"
 #include <QByteArray>
 #include <QStringList>
 #include <QFile>
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp #881638:881639
@@ -18,6 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
+#include "mysqldriver_global.h"
 #include "mysqlcursor.h"
 #include "mysqlconnection.h"
 #include "mysqlconnection_p.h"
@@ -116,7 +117,7 @@
     if (!d->mysqlrow || pos >= m_fieldCount || d->mysqlrow[pos] == 0)
         return QVariant();
 
-    KexiDB::Field *f = (m_fieldsExpanded && pos < m_fieldsExpanded->count())
+    KexiDB::Field *f = (m_fieldsExpanded && pos < (uint)m_fieldsExpanded->count())
                        ? m_fieldsExpanded->at(pos)->field : 0;
 
 //! @todo js: use MYSQL_FIELD::type here!
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqldriver.cpp #881638:881639
@@ -19,25 +19,26 @@
  * Boston, MA 02110-1301, USA.
 */
 
+#include "mysqldriver_global.h"
+#include "mysqldriver.h"
+#include "mysqlconnection.h"
+#include <kexidb/field.h>
+#include <kexidb/driver_p.h>
+#include <kexidb/utils.h>
+
+#include <QVariant>
+#include <QFile>
+
 #ifdef Q_WS_WIN
-# include <mysql/config-win.h>
+# include <config-win.h>
 #endif
 #include <mysql_version.h>
 #include <mysql.h>
 #define BOOL bool
 
-#include <QVariant>
-#include <QFile>
-
 #include <kgenericfactory.h>
 #include <kdebug.h>
 
-#include "mysqldriver.h"
-#include "mysqlconnection.h"
-#include <kexidb/field.h>
-#include <kexidb/driver_p.h>
-#include <kexidb/utils.h>
-
 using namespace KexiDB;
 
 KEXIDB_DRIVER_INFO(MySqlDriver, mysql)
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp #881638:881639
@@ -17,6 +17,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
+#include "mysqldriver_global.h"
 #include "mysqlpreparedstatement.h"
 #include <kdebug.h>
 #include <errmsg.h>
[prev in list] [next in list] [prev in thread] [next in thread]