← Back to branch summary

~smartboyhw/ubuntu/raring/calligra/2.6.0-0ubuntu1

« back to all changes in this revision

Viewing changes to kexi/kexidb/drivers/odbc/odbcdriver.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-10-23 21:09:16 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20121023210916-m82w6zxnxhaxz7va
Tags: 1:2.5.90-0ubuntu1
https://launchpad.net/bugs/1070436
https://launchpad.net/bugs/1071686
* New upstream alpha release (LP: #1070436)
  - Add libkactivities-dev and libopenimageio-dev to build-depends
  - Add kubuntu_build_calligraactive.diff to build calligraactive by default
  - Add package for calligraauthor and move files that are shared between
    calligrawords and calligraauthor to calligrawords-common
* Document the patches
* Remove numbers from patches so they follow the same naming scheme as
  the rest of our patches.
* calligra-data breaks replaces krita-data (<< 1:2.5.3) (LP: #1071686)

Show diffs side-by-side

added added

removed removed

Lines of Context:
kexi/kexidb/drivers/odbc/odbcdriver.cpp
24
24
#include "odbctypeinfoqueryunit.h"
25
25
#include "odbcspecialcolumnsqueryunit.h"
26
26
 
27
 
#include <kexidb/field.h>
28
 
#include <kexidb/driver_p.h>
29
 
#include <kexidb/utils.h>
 
27
#include <db/field.h>
 
28
#include <db/driver_p.h>
 
29
#include <db/utils.h>
30
30
 
31
31
#include <QVariant>
32
32
#include <QFile>
327
327
 
328
328
bool ODBCDriver::populateROWID(ODBCConnection* connection ) {
329
329
    // pass true, as we want *some* table. If there are no tables which already exist
330
 
    // lets atleast get the kexidb system tables
 
330
    // lets at least get the kexidb system tables
331
331
    QStringList tableNames = connection->tableNames(true);
332
332
    if ( tableNames.size() == 0 ) {
333
333
        return false;