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

List:       kde-commits
Subject:    koffice/kexi/kexidb (silent)
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2006-06-30 21:07:56
Message-ID: 1151701676.592040.3308.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 556602 by staniek:

SVN_SILENT compile


 M  +2 -1      CMakeLists.txt  
 M  +6 -6      drivermanager.cpp  
 M  +1 -2      drivers/sqlite/sqliteconnection.cpp  


--- trunk/koffice/kexi/kexidb/CMakeLists.txt #556601:556602
@@ -51,7 +51,8 @@
 
 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 )
+target_link_libraries(kexidb 
+   ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KPARTS_LIBS} kexiutils )
 
 set_target_properties(kexidb PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} \
SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )  install_targets(${LIB_INSTALL_DIR} \
                kexidb )
--- trunk/koffice/kexi/kexidb/drivermanager.cpp #556601:556602
@@ -219,7 +219,7 @@
 	QString srv_name = ptr->property("X-Kexi-DriverName").toString();
 
 	KexiDBDbg << "KexiDBInterfaceManager::load(): library: "<<ptr->library()<<endl;
-	drv = KParts::ComponentFactory::createInstanceFromService<KexiDB::Driver>(ptr,
+	drv = KParts::ComponentFactory::createPartInstanceFromService<KexiDB::Driver>(ptr, \
/*QWidget*/0,  this,
 		QStringList(),
 		&m_serverResultNum);
@@ -229,11 +229,11 @@
 		setError(ERR_DRIVERMANAGER, i18n("Could not load database driver \"%1\".")
 				.arg(name) );
 		if (m_componentLoadingErrors.isEmpty()) {//fill errtable on demand
-			m_componentLoadingErrors[KParts::ComponentFactory::ErrNoServiceFound]="ErrNoServiceFound";
                
-			m_componentLoadingErrors[KParts::ComponentFactory::ErrServiceProvidesNoLibrary]="ErrServiceProvidesNoLibrary";
                
-			m_componentLoadingErrors[KParts::ComponentFactory::ErrNoLibrary]="ErrNoLibrary";
-			m_componentLoadingErrors[KParts::ComponentFactory::ErrNoFactory]="ErrNoFactory";
-			m_componentLoadingErrors[KParts::ComponentFactory::ErrNoComponent]="ErrNoComponent";
 +			m_componentLoadingErrors[KLibLoader::ErrNoServiceFound]="ErrNoServiceFound";
+			m_componentLoadingErrors[KLibLoader::ErrServiceProvidesNoLibrary]="ErrServiceProvidesNoLibrary";
 +			m_componentLoadingErrors[KLibLoader::ErrNoLibrary]="ErrNoLibrary";
+			m_componentLoadingErrors[KLibLoader::ErrNoFactory]="ErrNoFactory";
+			m_componentLoadingErrors[KLibLoader::ErrNoComponent]="ErrNoComponent";
 		}
 		m_serverResultName=m_componentLoadingErrors[m_serverResultNum];
 		return 0;
--- trunk/koffice/kexi/kexidb/drivers/sqlite/sqliteconnection.cpp #556601:556602
@@ -178,9 +178,8 @@
 	const bool wasReadOnly = Connection::isReadOnly();
 
 	d->res = sqlite3_open( 
-		QFile::encodeName( m_data->fileName() ), 
 		//QFile::encodeName( m_data->fileName() ), 
-		m_data->fileName().toUtf8(), /* unicode expected since SQLite 3.1 */
+		m_data->fileName().toUtf8().constData(), /* unicode expected since SQLite 3.1 */
 		&d->data,
 		exclusiveFlag,
 		allowReadonly /* If 1 and locking fails, try opening in read-only mode */


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