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

List:       kde-commits
Subject:    branches/work/predicate/Predicate
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-01-31 22:26:27
Message-ID: 1264976787.304583.30361.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1083258 by staniek:

fix case errors (compiled fine only on windows)

xbase disabled for now



 M  +2 -2      Connection.cpp  
 M  +1 -0      DriverManager.cpp  
 M  +1 -1      Expression.cpp  
 M  +1 -1      Field.cpp  
 M  +1 -1      Object.h  
 M  +1 -1      QuerySchema.cpp  
 M  +2 -2      Utils.cpp  
 M  +3 -5      drivers/CMakeLists.txt  
 M  +5 -2      drivers/mysql/CMakeLists.txt  
 M  +2 -2      drivers/xbase/XbaseDriver.cpp  
 M  +1 -1      parser/Parser.cpp  
 M  +1 -1      parser/Parser_p.cpp  
 M  +1 -1      parser/SqlScanner.cpp  
 M  +1 -1      parser/SqlScanner.l  


--- branches/work/predicate/Predicate/Connection.cpp #1083257:1083258
@@ -37,13 +37,13 @@
 #include "parser/Parser.h"
 
 #include "tools/Utils.h"
-#include "tools/identifier.h"
+#include "tools/Identifier.h"
 #include "Interfaces/PreparedStatementInterface.h"
 
 #include <QDir>
 #include <QFileInfo>
 #include <QPointer>
-#include <QtXML>
+#include <QtXml>
 #include <QtDebug>
 
 #define PREDICATE_EXTENDED_TABLE_SCHEMA_VERSION 1
--- branches/work/predicate/Predicate/DriverManager.cpp #1083257:1083258
@@ -24,6 +24,7 @@
 #include "Driver.h"
 #include "Driver_p.h"
 #include "Error.h"
+#include <Predicate/Global.h>
 
 //#include <klibloader.h>
 //#include <kservicetypetrader.h>
--- branches/work/predicate/Predicate/Expression.cpp #1083257:1083258
@@ -22,7 +22,7 @@
 
 #include "Expression.h"
 #include "Utils.h"
-#include "parser/sqlParser.h"
+#include "parser/SqlParser.h"
 #include "parser/Parser_p.h"
 #include "tools/Static.h"
 
--- branches/work/predicate/Predicate/Field.cpp #1083257:1083258
@@ -33,7 +33,7 @@
 
 #include <assert.h>
 
-#include "predicate_Global.h"
+#include "predicate_global.h"
 
 using namespace Predicate;
 
--- branches/work/predicate/Predicate/Object.h #1083257:1083258
@@ -164,7 +164,7 @@
     /*! Interactively asks a question. Console or GUI can be used for this,
      depending on installed message handler. For GUI version, message boxes are used.
      See Predicate::MessageHandler::askQuestion() for details. */
-    virtual MessageHandler::ButtonCode Object::askQuestion(
+    virtual MessageHandler::ButtonCode askQuestion(
             MessageHandler::QuestionType messageType,
             const QString& message,
             const QString &caption = QString(),
--- branches/work/predicate/Predicate/QuerySchema.cpp #1083257:1083258
@@ -21,7 +21,7 @@
 #include "Driver.h"
 #include "Connection.h"
 #include "Expression.h"
-#include "parser/sqlParser.h"
+#include "parser/SqlParser.h"
 #include "Utils.h"
 #include "LookupFieldSchema.h"
 
--- branches/work/predicate/Predicate/Utils.cpp #1083257:1083258
@@ -21,13 +21,13 @@
 #include "Cursor.h"
 #include "DriverManager.h"
 #include "LookupFieldSchema.h"
-#include "predicate_Global.h"
+#include "predicate_global.h"
 #include "tools/Static.h"
 
 #include <QMap>
 #include <QHash>
 #include <QThread>
-#include <QtXML>
+#include <QtXml>
 #include <QBuffer>
 #include <QPixmap>
 #include <QMutex>
--- branches/work/predicate/Predicate/drivers/CMakeLists.txt #1083257:1083258
@@ -5,10 +5,8 @@
 
 #TODO  add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44001)
 
-INCLUDE (FindSqlite)
-IF (SQLITE_FOUND)
-   add_subdirectory( sqlite )
-ENDIF (SQLITE_FOUND)
+# always available
+add_subdirectory( sqlite )
 
 INCLUDE (FindMySQL)
 IF (MYSQL_FOUND)
@@ -35,7 +33,7 @@
 
 INCLUDE(FindXBase)
 IF(XBASE_FOUND)
-   add_subdirectory(xbase)
+#todo   add_subdirectory(xbase)
 ENDIF(XBASE_FOUND)
 
 #message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(pgsql_dir)")
--- branches/work/predicate/Predicate/drivers/mysql/CMakeLists.txt #1083257:1083258
@@ -29,10 +29,13 @@
 
 add_library(predicate_mysql SHARED ${predicate_mysql_SRCS})
 
+if(MSVC)
+  set(EXTRA_LIBRARIES ws2_32 msvcrtd)
+endif(MSVC)
+
 target_link_libraries(predicate_mysql
   ${MYSQL_LIBRARIES}
-  ws2_32
-  msvcrtd
+  ${EXTRA_LIBRARIES}
   predicate
 )
 
--- branches/work/predicate/Predicate/drivers/xbase/XbaseDriver.cpp #1083257:1083258
@@ -24,8 +24,8 @@
 
 #include <QtDebug>
 
-#include "predicate/DriverManager.h"
-#include "predicate/Utils.h"
+#include <Predicate/DriverManager.h>
+#include <Predicate/Utils.h>
 
 #include "XbaseDriver.h"
 #include "XbaseConnection.h"
--- branches/work/predicate/Predicate/parser/Parser.cpp #1083257:1083258
@@ -22,7 +22,7 @@
 #include <TableSchema.h>
 #include "Parser.h"
 #include "Parser_p.h"
-#include "sqlParser.h"
+#include "SqlParser.h"
 
 /*moved to Driver
 #include "tokens.cpp"
--- branches/work/predicate/Predicate/parser/Parser_p.cpp #1083257:1083258
@@ -18,7 +18,7 @@
 */
 
 #include "Parser_p.h"
-#include "sqlParser.h"
+#include "SqlParser.h"
 
 #include <QRegExp>
 #include <QMutableListIterator>
--- branches/work/predicate/Predicate/parser/SqlScanner.cpp #1083257:1083258
@@ -581,7 +581,7 @@
 #include <Field.h>
 #include <Expression.h>
 
-#include "sqlParser.h"
+#include "SqlParser.h"
 #include "SqlTypes.h"
 #include <iostream>
 
--- branches/work/predicate/Predicate/parser/SqlScanner.l #1083257:1083258
@@ -22,7 +22,7 @@
 #include <Field.h>
 #include <Expression.h>
 
-#include "sqlParser.h"
+#include "SqlParser.h"
 #include "SqlTypes.h"
 #include <iostream>
 
[prev in list] [next in list] [prev in thread] [next in thread]