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

List:       kde-commits
Subject:    koffice/kexi
From:       Martin Ellis <martin.ellis () kdemail ! net>
Date:       2006-05-21 16:51:21
Message-ID: 1148230281.495456.29720.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 543296 by martin:

KexiDB now links.  tests/newapi/kexidbtest runs successfully.

 M  +1 -1      kexidb/CMakeLists.txt  
 M  +2 -2      kexidb/connectiondata.cpp  
 M  +3 -4      kexidb/driver.cpp  
 M  +1 -1      kexidb/driver.h  
 M  +1 -1      kexidb/drivermanager.cpp  
 M  +2 -1      kexidb/drivers/mySQL/mysqldriver.cpp  
 M  +1 -1      kexidb/drivers/mySQL/mysqldriver.h  
 M  +7 -6      kexidb/drivers/sqlite/sqlitedriver.cpp  
 M  +1 -1      kexidb/drivers/sqlite/sqlitedriver.h  
 M  +1 -1      plugins/tables/CMakeLists.txt  
 M  +2 -1      tests/newapi/main.cpp  


--- trunk/koffice/kexi/kexidb/CMakeLists.txt #543295:543296
@@ -48,7 +48,7 @@
 kde4_automoc(${kexidb_LIB_SRCS})
 
 
-link_directories(${CMAKE_CURRENT_BUILD_DIR}/../kexiutils)
+add_definitions( -DMAKE_KEXI_DB_LIB )
 kde4_add_library(kexidb SHARED ${kexidb_LIB_SRCS})
 target_link_libraries(kexidb  ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kexiutils )
 
--- trunk/koffice/kexi/kexidb/connectiondata.cpp #543295:543296
@@ -86,8 +86,8 @@
 {
 	QFileInfo file(fn);
 	if (!fn.isEmpty() && m_fileName != file.absoluteFilePath()) {
-		m_fileName = QDir::convertSeparators( file.canonicalFilePath() );
-		m_dbPath = QDir::convertSeparators( file.canonicalPath() );
+		m_fileName = QDir::convertSeparators( file.absoluteFilePath() );
+		m_dbPath = QDir::convertSeparators( file.absolutePath() );
 		m_dbFileName = file.fileName();
 	}
 }
--- trunk/koffice/kexi/kexidb/driver.cpp #543295:543296
@@ -67,13 +67,12 @@
 
 //---------------------------------------------
 
-Driver::Driver( QObject *parent, const char *name, const QStringList & )
+Driver::Driver( QObject *parent, const QStringList & )
 	: QObject( parent )
 	, Object()
 	, beh( new DriverBehaviour() )
 	, d( new DriverPrivate() )
 {
-	setObjectName( name );
 	d->connections.setAutoDelete(false);
 	//TODO: reasonable size
 	d->connections.resize(101);
@@ -179,10 +178,10 @@
 	clearError();
 	if (!isValid())
 		return 0;
-
 	if (d->isFileDriver) {
 		if (conn_data.fileName().isEmpty()) {
-			setError(ERR_MISSING_DB_LOCATION, i18n("File name expected for file-based \
database driver.") ); +			setError(ERR_MISSING_DB_LOCATION, 
+			         i18n("File name expected for file-based database driver.") );
 			return 0;
 		}
 	}
--- trunk/koffice/kexi/kexidb/driver.h #543295:543296
@@ -303,7 +303,7 @@
 		 You may also want to change options in DriverBehaviour *beh member.
 		 See drivers/mySQL/mysqldriver.cpp for usage example.
 		 */
-		Driver( QObject *parent, const char *name, const QStringList &args = QStringList() \
); +		Driver( QObject *parent, const QStringList &args = QStringList() );
 
 		/*! For reimplemenation: creates and returns connection object 
 		 with additional structures specific for a given driver.
--- trunk/koffice/kexi/kexidb/drivermanager.cpp #543295:543296
@@ -223,7 +223,7 @@
 		this,
 		QStringList(),
 		&m_serverResultNum);
-	//drv->setObjectName( srv_name.toLatin1().constData() );
+	drv->setObjectName( srv_name );
 
 	if (!drv) {
 		setError(ERR_DRIVERMANAGER, i18n("Could not load database driver \"%1\".")
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqldriver.cpp #543295:543296
@@ -55,7 +55,8 @@
  *
  * See: http://dev.mysql.com/doc/mysql/en/Column_types.html
  */
-MySqlDriver::MySqlDriver(QObject *parent, const char *name, const QStringList &args) \
: Driver(parent, name,args) +MySqlDriver::MySqlDriver(QObject *parent, const \
QStringList &args) : +	Driver(parent, args)
 {
 //	KexiDBDrvDbg << "MySqlDriver::MySqlDriver()" << endl;
 
--- trunk/koffice/kexi/kexidb/drivers/mySQL/mysqldriver.h #543295:543296
@@ -35,7 +35,7 @@
 	KEXIDB_DRIVER
 
 	public:
-		MySqlDriver(QObject *parent, const char *name, const QStringList \
&args=QStringList()); +		MySqlDriver(QObject *parent, const QStringList \
&args=QStringList());  virtual ~MySqlDriver();
 		
 		virtual bool isSystemDatabaseName( const QString &n ) const;
--- trunk/koffice/kexi/kexidb/drivers/sqlite/sqlitedriver.cpp #543295:543296
@@ -50,8 +50,8 @@
 };
 
 //PgSqlDB::PgSqlDB(QObject *parent, const char *name, const QStringList &) 
-SQLiteDriver::SQLiteDriver( QObject *parent, const char *name, const QStringList \
                &args )
-	: Driver( parent, name, args )
+SQLiteDriver::SQLiteDriver( QObject *parent, const QStringList &args )
+	: Driver( parent, args )
 	,dp( new SQLiteDriverPrivate() )
 {
 	d->isFileDriver = true;
@@ -113,14 +113,15 @@
 
 bool SQLiteDriver::isSystemObjectName( const QString& n ) const
 {
-	return Driver::isSystemObjectName(n) || n.lower().startsWith("sqlite_");
+	return Driver::isSystemObjectName(n) || n.toLower().startsWith("sqlite_");
 }
 
 bool SQLiteDriver::drv_isSystemFieldName( const QString& n ) const
 {
-	return n.lower()=="_rowid_"
-		|| n.lower()=="rowid"
-		|| n.lower()=="oid";
+	QString lcName = n.toLower();
+	return ( lcName == "_rowid_" )
+		|| ( lcName =="rowid" )
+		|| ( lcName == "oid");
 }
 
 QString SQLiteDriver::escapeString(const QString& str) const
--- trunk/koffice/kexi/kexidb/drivers/sqlite/sqlitedriver.h #543295:543296
@@ -40,7 +40,7 @@
 	KEXIDB_DRIVER
 
 	public:
-		SQLiteDriver( QObject *parent, const char *name, const QStringList &args = \
QStringList() ); +		SQLiteDriver( QObject *parent, const QStringList &args = \
QStringList() );  virtual ~SQLiteDriver();
 
 		/*! \return true if \a n is a system object name; 
--- trunk/koffice/kexi/plugins/tables/CMakeLists.txt #543295:543296
@@ -6,7 +6,7 @@
 
 ########### next target ###############
 
-set(kexihandler_table_PART_SRCS kexitablepart.cpp kexitabledesignerview.cpp \
kexitabledesignerview_p.cpp +set(kexihandler_table_PART_SRCS kexitablepart.cpp \
kexitabledesignerview.cpp  kexitabledesigner_dataview.cpp \
kexitabledesignercommands.cpp )  
 kde4_automoc(${kexihandler_table_PART_SRCS})
--- trunk/koffice/kexi/tests/newapi/main.cpp #543295:543296
@@ -116,7 +116,7 @@
 		RETURN(0);
 	}*/
 	QFileInfo info=QFileInfo(argv[0]);
-	prgname = info.baseName().latin1();
+	prgname = info.baseName().toLatin1();
 	
 	KCmdLineArgs::init(argc, argv, 
 		new KAboutData( prgname, "KexiDBTest",
@@ -191,6 +191,7 @@
 	//open connection
 	if (args->count() >= 2)
 		db_name = args->arg(1);
+
 	if (db_name_required && db_name.isEmpty()) {
 		kDebug() << prgname << ": database name?" << endl;
 		RETURN(1);


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