[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/kexi-frameworks7-staniek] kexi: Kexi: schema data -> object schema, row -> record (harmoni
From: Jaroslaw Staniek <staniek () kde ! org>
Date: 2015-06-30 20:24:27
Message-ID: E1ZA24x-0006Ps-7Q () scm ! kde ! org
[Download RAW message or body]
Git commit 1463105c93e06037bc7b2ff05c9210f4ff5c2bca by Jaroslaw Staniek.
Committed on 30/06/2015 at 20:16.
Pushed by staniek into branch 'kexi-frameworks7-staniek'.
Kexi: schema data -> object schema, row -> record (harmonize with KDb terms)
M +18 -18 kexi/core/KexiView.cpp
M +20 -20 kexi/core/KexiView.h
M +36 -36 kexi/core/KexiWindow.cpp
M +14 -12 kexi/core/KexiWindow.h
M +2 -2 kexi/core/KexiWindowData.h
M +16 -16 kexi/core/kexipart.cpp
M +6 -6 kexi/core/kexipart.h
M +2 -2 kexi/core/kexitabledesignerinterface.h
M +4 -4 kexi/plugins/forms/kexiformview.cpp
M +1 -1 kexi/plugins/forms/kexiformview.h
M +2 -2 kexi/plugins/forms/widgets/kexidbform.cpp
R +0 -0 kexi/plugins/queries/kexi_queryplugin.desktop [from: \
kexi/plugins/queries/kexiqueryhandler.desktop - 100% similarity] M +16 -16 \
kexi/plugins/queries/kexiquerydesignerguieditor.cpp M +4 -4 \
kexi/plugins/queries/kexiquerydesignersql.cpp M +1 -1 \
kexi/plugins/queries/kexiquerydesignersql.h M +6 -6 \
kexi/plugins/queries/kexiquerypart.cpp M +4 -5 \
kexi/plugins/queries/kexiquerypart.h M +4 -5 \
kexi/plugins/queries/kexiqueryview.cpp M +1 -1 \
kexi/plugins/queries/kexiqueryview.h M +3 -3 \
kexi/plugins/reports/kexireportdesignview.cpp M +1 -1 \
kexi/plugins/reports/kexireportdesignview.h M +1 -1 \
kexi/plugins/reports/kexireportpart.cpp M +3 -3 \
kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp M +2 -2 \
kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h M +12 -12 \
kexi/plugins/tables/kexitabledesignerview.cpp M +2 -2 \
kexi/plugins/tables/kexitabledesignerview.h M +2 -2 \
kexi/plugins/tables/kexitablepart.cpp M +2 -1 \
kexi/plugins/tables/kexitablepart.h M +2 -2 \
kexi/tests/altertable/altertable.cpp M +1 -1 kexi/widget/KexiNameDialog.cpp
M +1 -1 kexi/widget/dataviewcommon/kexidataawareview.cpp
M +3 -2 kexi/widget/kexiqueryparameters.cpp
M +1 -1 kexi/widget/kexiqueryparameters.h
M +2 -2 kexi/widget/tableview/kexicomboboxpopup.cpp
http://commits.kde.org/calligra/1463105c93e06037bc7b2ff05c9210f4ff5c2bca
diff --git a/kexi/core/KexiView.cpp b/kexi/core/KexiView.cpp
index 2241e76..dabe52b 100644
--- a/kexi/core/KexiView.cpp
+++ b/kexi/core/KexiView.cpp
@@ -395,57 +395,57 @@ void KexiView::setDirty()
setDirty(true);
}
-KDbObject* KexiView::storeNewData(const KDbObject& sdata,
+KDbObject* KexiView::storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel)
{
Q_ASSERT(cancel);
Q_UNUSED(options)
Q_UNUSED(cancel)
- QScopedPointer<KDbObject> new_schema(new KDbObject);
- *new_schema = sdata;
+ QScopedPointer<KDbObject> newObject(new KDbObject);
+ *newObject = object;
KDbConnection *conn = KexiMainWindowIface::global()->project()->dbConnection();
- if (!conn->storeNewObjectData(new_schema.data())
- || !conn->removeDataBlock(new_schema->id()) // for sanity
- || !KexiMainWindowIface::global()->project()->removeUserDataBlock(new_schema->id()) \
// for sanity + if (!conn->storeNewObjectData(newObject.data())
+ || !conn->removeDataBlock(newObject->id()) // for sanity
+ || !KexiMainWindowIface::global()->project()->removeUserDataBlock(newObject->id()) \
// for sanity )
{
return 0;
}
- d->newlyAssignedID = new_schema->id();
- return new_schema.take();
+ d->newlyAssignedID = newObject->id();
+ return newObject.take();
}
-KDbObject* KexiView::copyData(const KDbObject& sdata,
+KDbObject* KexiView::copyData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel)
{
Q_ASSERT(cancel);
Q_UNUSED(options)
Q_UNUSED(cancel)
- QScopedPointer<KDbObject> new_schema(new KDbObject);
- *new_schema = sdata;
+ QScopedPointer<KDbObject> newObject(new KDbObject);
+ *newObject = object;
KDbConnection *conn = KexiMainWindowIface::global()->project()->dbConnection();
- if (!conn->storeNewObjectData(new_schema.data())
- || !conn->copyDataBlock(d->window->id(), new_schema->id())
- || !KexiMainWindowIface::global()->project()->copyUserDataBlock(d->window->id(), \
new_schema->id()) + if (!conn->storeNewObjectData(newObject.data())
+ || !conn->copyDataBlock(d->window->id(), newObject->id())
+ || !KexiMainWindowIface::global()->project()->copyUserDataBlock(d->window->id(), \
newObject->id()) )
{
return 0;
}
- d->newlyAssignedID = new_schema->id();
- return new_schema.take();
+ d->newlyAssignedID = newObject->id();
+ return newObject.take();
}
tristate KexiView::storeData(bool dontAsk)
{
Q_UNUSED(dontAsk);
- if (!d->window || !d->window->schemaData())
+ if (!d->window || !d->window->schemaObject())
return false;
if (!KexiMainWindowIface::global()->project()
- ->dbConnection()->storeObjectData(d->window->schemaData()))
+ ->dbConnection()->storeObjectData(d->window->schemaObject()))
{
return false;
}
diff --git a/kexi/core/KexiView.h b/kexi/core/KexiView.h
index 3ca6c14..2669ed8 100644
--- a/kexi/core/KexiView.h
+++ b/kexi/core/KexiView.h
@@ -202,52 +202,52 @@ protected:
const QByteArray& propertyToSelect = QByteArray());
/*! Tells this view to create and store data of the new object
- pointed by \a sdata on the backend.
+ pointed by \a object on the backend.
Called by KexiWindow::storeNewData() and KexiWindow::storeDataAs().
Default implementation:
- - makes a deep copy of \a sdata
- - stores object schema data \a sdata in 'kexi__objects' internal table
+ - makes a deep copy of \a object
+ - stores object data \a object in 'kexi__objects' internal table
using KDbConnection::storeNewObjectData().
Reimplement this for your needs.
Requirements:
- - deep copy of \a sdata should be made
- - schema data should be created at the backend
+ - deep copy of \a object should be made
+ - object data should be created at the backend
(by calling KexiView::storeNewData(const KDbObject&, \
KexiView::StoreNewDataOptions,bool*))
or using KDbConnection::storeNewObjectData() or more specialized method.
For example KexiTableDesignerView uses \
KDbConnection::createTable(KDbTableSchema) for this
- (KDbTableSchema inherits SchemaData) to store more information than
- just schema data. You should use such subclasses if needed.
+ (KDbTableSchema inherits KDbObject) to store more information than
+ just the object data. You should use such subclasses if needed.
- Should return newly created schema data object on success.
+ Should return newly created object data object on success.
In this case, do not store schema object yourself (make a deep copy if needed). \
*/
- virtual KDbObject* storeNewData(const KDbObject& sdata,
+ virtual KDbObject* storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
- /*! Tells this view to fully copy existing object's data pointed by \a sdata on \
the backend.
- For example, for database tables it whould copy metadata, copy \a sdata, so the \
copy will + /*! Tells this view to fully copy existing object's data pointed by \a \
object on the backend. + For example, for database tables it whould copy \
metadata, copy \a object, so the copy will
have different name, caption and description, and physically copy the table \
(possibly on the server side).
Called by KexiWindow::storeDataAs().
Default implementation:
- - makes a deep copy of \a sdata
- - stores object schema data \a sdata in 'kexi__objects' internal table
+ - makes a deep copy of \a object
+ - stores object data \a object in 'kexi__objects' internal table
using KDbConnection::storeNewObjectData()
- makes a full copy of data and user data.
Reimplement this for your needs.
Requirements:
- - deep copy of \a sdata should be made
- - schema data should be created at the backend
+ - deep copy of \a object should be made
+ - object data should be created at the backend
(by calling KexiView::copyData(const KDbObject&, \
KexiView::StoreNewDataOptions,bool*))
or using KDbConnection::storeNewObjectData() or more specialized method.
For example KexiTableDesignerView uses \
KDbConnection::createTable(KDbTableSchema) for this
- (KDbTableSchema inherits SchemaData) to store more information than
- just schema data. Then it copies data table on the server side.
+ (KDbTableSchema inherits KDbObject) to store more information than
+ just object data. Then it copies data table on the server side.
You should use such subclasses if needed.
- Should return newly created schema data object on success.
+ Should return newly created object data object on success.
In this case, do not store schema object yourself (make deep copy if needed). \
*/
- virtual KDbObject* copyData(const KDbObject& sdata,
+ virtual KDbObject* copyData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
@@ -263,7 +263,7 @@ protected:
/*! Tells this view to store data changes on the backend.
Called by KexiWindow::storeData().
Default implementation:
- - stores object schema data \a sdata in 'kexi__objects' internal table
+ - stores object data \a object in 'kexi__objects' internal table
using KDbConnection::storeObjectData().
If \a dontAsk is true, no question dialog will
be shown to the user. The default is false.
diff --git a/kexi/core/KexiWindow.cpp b/kexi/core/KexiWindow.cpp
index aad434b..3904782 100644
--- a/kexi/core/KexiWindow.cpp
+++ b/kexi/core/KexiWindow.cpp
@@ -50,8 +50,8 @@ class KexiWindow::Private
public:
explicit Private(KexiWindow *window)
: win(window)
- , schemaData(0)
- , schemaDataOwned(false)
+ , schemaObject(0)
+ , schemaObjectOwned(false)
, isRegistered(false)
, dirtyChangedEnabled(true)
, switchToViewModeEnabled(true)
@@ -65,31 +65,31 @@ public:
}
~Private() {
- setSchemaData(0);
+ setSchemaObject(0);
}
- void setSchemaData(KDbObject* data)
+ void setSchemaObject(KDbObject* data)
{
- if (schemaDataOwned) {
- delete schemaData;
+ if (schemaObjectOwned) {
+ delete schemaObject;
}
- schemaData = data;
+ schemaObject = data;
}
- bool setupSchemaData(KDbObject *sdata, KexiPart::Item *item,
- KexiView::StoreNewDataOptions options) const
+ bool setupSchemaObject(KDbObject *object, KexiPart::Item *item,
+ KexiView::StoreNewDataOptions options) const
{
- sdata->setName(item->name());
- sdata->setCaption(item->caption());
- sdata->setDescription(item->description());
+ object->setName(item->name());
+ object->setCaption(item->caption());
+ object->setDescription(item->description());
KexiProject *project = KexiMainWindowIface::global()->project();
- KexiPart::Item* existingItem = project->item(part->info(), sdata->name());
+ KexiPart::Item* existingItem = project->item(part->info(), object->name());
if (existingItem && !(options & KexiView::OverwriteExistingData)) {
KMessageBox::information(win,
xi18n("Could not create new object.")
+ win->part()->i18nMessage("Object \
<resource>%1</resource> already exists.", win)
- .subs(sdata->name()).toString());
+ .subs(object->name()).toString());
return false;
}
return true;
@@ -109,8 +109,8 @@ public:
int id;
QPointer<KexiPart::Part> part;
KexiPart::Item *item;
- KDbObject* schemaData;
- bool schemaDataOwned;
+ KDbObject* schemaObject;
+ bool schemaObjectOwned;
QPointer<KexiView> newlySelectedView; //!< Used in isDirty(), temporary set in \
switchToViewMode() //!< during view setup, when a new view is not yet raised.
//! Used in viewThatRecentlySetDirtyFlag(), modified in dirtyChanged().
@@ -612,19 +612,19 @@ KexiWindow::propertySet()
return v->propertySet();
}
-void KexiWindow::setSchemaData(KDbObject* schemaData)
+void KexiWindow::setSchemaObject(KDbObject* object)
{
- d->setSchemaData(schemaData);
+ d->setSchemaObject(object);
}
-KDbObject* KexiWindow::schemaData() const
+KDbObject* KexiWindow::schemaObject() const
{
- return d->schemaData;
+ return d->schemaObject;
}
-void KexiWindow::setSchemaDataOwned(bool set)
+void KexiWindow::setSchemaObjectOwned(bool set)
{
- d->schemaDataOwned = set;
+ d->schemaObjectOwned = set;
}
KexiWindowData *KexiWindow::data() const
@@ -691,7 +691,7 @@ tristate KexiWindow::storeNewData(KexiView::StoreNewDataOptions \
options) if (!neverSaved()) {
return false;
}
- if (d->schemaData) {
+ if (d->schemaObject) {
return false; //schema must not exist
}
KexiView *v = selectedView();
@@ -701,15 +701,15 @@ tristate KexiWindow::storeNewData(KexiView::StoreNewDataOptions \
options) //create schema object and assign information
KexiProject *project = KexiMainWindowIface::global()->project();
KDbObject object(project->typeIdForPluginId(d->part->info()->pluginId()));
- if (!d->setupSchemaData(&object, d->item, options)) {
+ if (!d->setupSchemaObject(&object, d->item, options)) {
return false;
}
bool cancel = false;
- d->schemaData = v->storeNewData(object, options, &cancel);
+ d->schemaObject = v->storeNewData(object, options, &cancel);
if (cancel)
return cancelled;
- if (!d->schemaData) {
+ if (!d->schemaObject) {
setStatus(project->dbConnection(), xi18n("Saving object's definition \
failed."), ""); return false;
}
@@ -720,9 +720,9 @@ tristate KexiWindow::storeNewData(KexiView::StoreNewDataOptions \
options) }
/* Sets 'dirty' flag on every dialog's view. */
setDirty(false);
- //new schema data has now ID updated to a unique value
+ //new object data has now ID updated to a unique value
//-assign that to item's identifier
- d->item->setIdentifier(d->schemaData->id());
+ d->item->setIdentifier(d->schemaObject->id());
project->addStoredItem(part()->info(), d->item);
return true;
@@ -778,29 +778,29 @@ tristate KexiWindow::storeDataAs(KexiPart::Item *item, \
KexiView::StoreNewDataOpt //create schema object and assign information
KexiProject *project = KexiMainWindowIface::global()->project();
KDbObject object(project->typeIdForPluginId(d->part->info()->pluginId()));
- if (!d->setupSchemaData(&object, item, options)) {
+ if (!d->setupSchemaObject(&object, item, options)) {
return false;
}
bool cancel = false;
- KDbObject *newSchemaData;
+ KDbObject *newSchemaObject;
if (isDirty()) { // full save of new data
- newSchemaData = v->storeNewData(object, options, &cancel);
+ newSchemaObject = v->storeNewData(object, options, &cancel);
}
else { // there were no changes; full copy of the data is enough
// - gives better performance (e.g. tables are copied on server side)
// - works without bothering the user (no unnecessary questions)
- newSchemaData = v->copyData(object, options, &cancel);
+ newSchemaObject = v->copyData(object, options, &cancel);
}
if (cancel) {
return cancelled;
}
- if (!newSchemaData) {
+ if (!newSchemaObject) {
setStatus(project->dbConnection(), xi18n("Saving object's definition \
failed."), ""); return false;
}
- setSchemaData(newSchemaData); // deletes previous schema if owned
+ setSchemaObject(newSchemaObject); // deletes previous schema if owned
if (project->typeIdForPluginId(part()->info()->pluginId()) < 0) {
if (!project->createIdForPart(*part()->info()))
@@ -811,9 +811,9 @@ tristate KexiWindow::storeDataAs(KexiPart::Item *item, \
KexiView::StoreNewDataOpt // for now this Window has new item assigned
d->item = item;
- // new schema data has now ID updated to a unique value
+ // new object data has now ID updated to a unique value
// -assign that to item's identifier
- item->setIdentifier(d->schemaData->id());
+ item->setIdentifier(d->schemaObject->id());
project->addStoredItem(part()->info(), d->item);
diff --git a/kexi/core/KexiWindow.h b/kexi/core/KexiWindow.h
index de46f49..c7dec2f 100644
--- a/kexi/core/KexiWindow.h
+++ b/kexi/core/KexiWindow.h
@@ -149,15 +149,14 @@ public:
or NULL if there is no view set (or the view has no set assigned). */
KPropertySet *propertySet();
- KDbObject* schemaData() const;
+ //! @return schema object associated with this window
+ KDbObject* schemaObject() const;
- void setSchemaData(KDbObject* schemaData);
-
- //! Sets 'owned' property for schema data.
- //! If true, the window will delete the schema data before destruction.
- //! By default schema data is not owned.
- //! @see setSchemaData(), KexiPart::loadSchemaData(), \
KexiPart::loadAndSetSchemaData()
- void setSchemaDataOwned(bool set);
+ //! Sets 'owned' property for object data.
+ //! If true, the window will delete the object data before destruction.
+ //! By default object data is not owned.
+ //! @see setSchemaObject(), KexiPart::loadSchemaObject(), \
KexiPart::loadAndSetSchemaObject() + void setSchemaObjectOwned(bool set);
/*! Used by KexiView subclasses. \return temporary data shared between
views */
@@ -192,19 +191,19 @@ public Q_SLOTS:
/*! Internal. Called by KexiMainWindow::saveObject().
Tells this dialog to create and store data of the new object
to the backend.
- Object's schema data has been never stored,
+ Object's object data has been never stored,
so it is created automatically, using information obtained
form part item. On success, part item's ID is updated to new value,
- and schema data is set. \sa schemaData().
+ and object data is set. \sa schemaObject().
\return true on success, false on failure and cancelled when storing has been \
cancelled. */ tristate storeNewData(KexiView::StoreNewDataOptions options = 0);
/*! Internal. Called by KexiMainWindow::saveObject().
Tells this dialog to create and store a copy of data of existing object to the \
backend.
- Object's schema data has been never stored,
+ Object data has been never stored,
so it is created automatically, using information obtained
form the part item. On success, part item's ID is updated to new value,
- and schema data is set. \sa schemaData().
+ and object data is set. \sa schemaObject().
\return true on success, false on failure and cancelled when storing has been \
cancelled. */
tristate storeDataAs(KexiPart::Item *item, KexiView::StoreNewDataOptions \
options);
@@ -290,6 +289,9 @@ protected:
QVariant internalPropertyValue(const QByteArray& name,
const QVariant& defaultValue = QVariant()) const;
+ //! Sets schema object associated with this window to @a schemaObject
+ void setSchemaObject(KDbObject* schemaObject);
+
private Q_SLOTS:
/*! Helper, calls KexiMainWindowIface::switchToViewMode() which in turn calls \
KexiWindow::switchToViewMode() to get error handling and reporting as well on main \
window level. */
diff --git a/kexi/core/KexiWindowData.h b/kexi/core/KexiWindowData.h
index c8cd85c..29a82c4 100644
--- a/kexi/core/KexiWindowData.h
+++ b/kexi/core/KexiWindowData.h
@@ -33,11 +33,11 @@ public:
~KexiWindowData();
/*! Initially false, KexiPart::Part implementation can set this to true
- on data loading (e.g. in loadSchemaData()), to indicate that TextView mode
+ on data loading (e.g. in loadSchemaObject()), to indicate that TextView mode
could be used instead of DataView or DesignView, because there are problems
with opening object.
- For example, in KexiQueryPart::loadSchemaData() query statement can be invalid,
+ For example, in KexiQueryPart::loadSchemaObject() query statement can be \
invalid,
and thus could not be displayed in DesignView mode or executed for DataView.
So, this flag is set to true and user is asked for confirmation for switching
to TextView (SQL Editor).
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index 310e62b..a9b9b34 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -250,9 +250,9 @@ KexiWindow* Part::openInstance(QWidget* parent, KexiPart::Item \
*item, Kexi::View window->setData(windowData);
if (!item->neverSaved()) {
- //we have to load schema data for this dialog
- loadAndSetSchemaData(window, object, viewMode);
- if (!window->schemaData()) {
+ //we have to load object data for this dialog
+ loadAndSetSchemaObject(window, object, viewMode);
+ if (!window->schemaObject()) {
//last chance:
if (false == d->askForOpeningInTextMode(
window, item, window->supportedViewModes(), viewMode)) {
@@ -260,9 +260,9 @@ KexiWindow* Part::openInstance(QWidget* parent, KexiPart::Item \
*item, Kexi::View return 0;
}
viewMode = Kexi::TextViewMode;
- loadAndSetSchemaData(window, object, viewMode);
+ loadAndSetSchemaObject(window, object, viewMode);
}
- if (!window->schemaData()) {
+ if (!window->schemaObject()) {
if (!d->status.error())
d->status = \
Kexi::ObjectStatus(KexiMainWindowIface::global()->project()->dbConnection(),
xi18n("Could not load object's \
definition."), xi18n("Object design may be corrupted.")); @@ -283,13 +283,13 @@ \
KexiWindow* Part::openInstance(QWidget* parent, KexiPart::Item *item, Kexi::View \
tristate askForOpeningInTextModeRes
= d->askForOpeningInTextMode(window, item, window->supportedViewModes(), \
viewMode); if (true == askForOpeningInTextModeRes) {
- delete window->schemaData(); //old one
+ delete window->schemaObject(); //old one
window->close();
delete window;
//try in text mode
return openInstance(parent, item, Kexi::TextViewMode, staticObjectArgs);
} else if (false == askForOpeningInTextModeRes) {
- delete window->schemaData(); //old one
+ delete window->schemaObject(); //old one
window->close();
delete window;
qWarning() << "!window, cannot switch to a view mode" <<
@@ -323,25 +323,25 @@ KexiWindow* Part::openInstance(QWidget* parent, KexiPart::Item \
*item, Kexi::View return window;
}
-KDbObject* Part::loadSchemaData(KexiWindow *window, const KDbObject& sdata,
+KDbObject* Part::loadSchemaObject(KexiWindow *window, const KDbObject& object,
Kexi::ViewMode viewMode, bool *ownedByWindow)
{
Q_UNUSED(window);
Q_UNUSED(viewMode);
- KDbObject *new_schema = new KDbObject();
- *new_schema = sdata;
+ KDbObject *newObject = new KDbObject();
+ *newObject = object;
if (ownedByWindow)
*ownedByWindow = true;
- return new_schema;
+ return newObject;
}
-void Part::loadAndSetSchemaData(KexiWindow *window, const KDbObject& sdata,
+void Part::loadAndSetSchemaObject(KexiWindow *window, const KDbObject& object,
Kexi::ViewMode viewMode)
{
- bool schemaDataOwned = true;
- KDbObject* sd = loadSchemaData(window, sdata, viewMode, &schemaDataOwned);
- window->setSchemaData(sd);
- window->setSchemaDataOwned(schemaDataOwned);
+ bool schemaObjectOwned = true;
+ KDbObject* sd = loadSchemaObject(window, object, viewMode, &schemaObjectOwned);
+ window->setSchemaObject(sd);
+ window->setSchemaObjectOwned(schemaObjectOwned);
}
bool Part::loadDataBlock(KexiWindow *window, QString *dataString, const QString& \
dataID)
diff --git a/kexi/core/kexipart.h b/kexi/core/kexipart.h
index 3e19acd..609ae40 100644
--- a/kexi/core/kexipart.h
+++ b/kexi/core/kexipart.h
@@ -213,13 +213,13 @@ protected:
virtual void initPartActions();
virtual void initInstanceActions();
- /*! Can be reimplemented if schema data is extended behind the default set of \
properties. + /*! Can be reimplemented if object data is extended behind the \
default set of properties. This is the case for table and query schema objects,
where object of KDbObject subclass is returned.
In this case value pointed by @a ownedByWindow is set to false.
Default implemenatation owned (value pointed by @a ownedByWindow is set to \
true). */
- virtual KDbObject* loadSchemaData(KexiWindow *window,
- const KDbObject& sdata, Kexi::ViewMode viewMode, bool *ownedByWindow);
+ virtual KDbObject* loadSchemaObject(KexiWindow *window,
+ const KDbObject& object, Kexi::ViewMode viewMode, bool *ownedByWindow);
bool loadDataBlock(KexiWindow *window, QString *dataString, const QString& \
dataID = QString());
@@ -253,10 +253,10 @@ protected:
void setActionAvailable(const char *action_name, bool avail);
private:
- //! Calls loadSchemaData() (virtual), updates ownership of schema data for @a \
window + //! Calls loadSchemaObject() (virtual), updates ownership of object data \
for @a window //! and assigns the created data to @a window.
- void loadAndSetSchemaData(KexiWindow *window, const KDbObject& sdata,
- Kexi::ViewMode viewMode);
+ void loadAndSetSchemaObject(KexiWindow *window, const KDbObject& object,
+ Kexi::ViewMode viewMode);
Q_DISABLE_COPY(Part)
diff --git a/kexi/core/kexitabledesignerinterface.h \
b/kexi/core/kexitabledesignerinterface.h index 77a0347..1b81c19 100644
--- a/kexi/core/kexitabledesignerinterface.h
+++ b/kexi/core/kexitabledesignerinterface.h
@@ -68,13 +68,13 @@ public:
/*! Inserts a new field with \a caption for \a row.
Property set is also created.
- Existing field will be overwritten, so use insertEmptyRow()
+ Existing field will be overwritten, so use insertEmptyRecord();
is you want to move subsequent fields down. */
virtual void insertField(int row, const QString& caption, bool addCommand = \
false) = 0;
/*! Inserts a new \a field for \a row.
Property set is also created. \a set will be deeply-copied into the new set.
- Existing field will be overwritten, so use insertEmptyRow()
+ Existing field will be overwritten, so use insertEmptyRecord()
is you want to move subsequent fields down. */
virtual void insertField(int row, KPropertySet& set, bool addCommand = false) = \
0;
diff --git a/kexi/plugins/forms/kexiformview.cpp \
b/kexi/plugins/forms/kexiformview.cpp index 9cb8ff7..6d7acd8 100644
--- a/kexi/plugins/forms/kexiformview.cpp
+++ b/kexi/plugins/forms/kexiformview.cpp
@@ -570,7 +570,7 @@ tristate KexiFormView::afterSwitchFrom(Kexi::ViewMode mode)
}
if (d->query)
- d->scrollView->selectFirstRow();
+ d->scrollView->selectFirstRecord();
}
//dirty only if it's a new object
if (mode == Kexi::NoViewMode)
@@ -737,12 +737,12 @@ void KexiFormView::setFormModified()
form()->setModified(true);
}
-KDbObject* KexiFormView::storeNewData(const KDbObject& sdata,
+KDbObject* KexiFormView::storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions \
options, bool *cancel)
{
Q_ASSERT(cancel);
- KDbObject *s = KexiView::storeNewData(sdata, options, cancel);
+ KDbObject *s = KexiView::storeNewData(object, options, cancel);
//qDebug() << "new id:" << s->id();
if (!s || *cancel) {
@@ -750,7 +750,7 @@ KDbObject* KexiFormView::storeNewData(const KDbObject& sdata,
return 0;
}
if (!storeData()) {
- //failure: remove object's schema data to avoid garbage
+ //failure: remove object's object data to avoid garbage
KDbConnection *conn = \
KexiMainWindowIface::global()->project()->dbConnection(); \
conn->removeObject(s->id()); delete s;
diff --git a/kexi/plugins/forms/kexiformview.h b/kexi/plugins/forms/kexiformview.h
index 1a33204..df19260 100644
--- a/kexi/plugins/forms/kexiformview.h
+++ b/kexi/plugins/forms/kexiformview.h
@@ -125,7 +125,7 @@ protected:
virtual tristate beforeSwitchTo(Kexi::ViewMode mode, bool *dontStore);
virtual tristate afterSwitchFrom(Kexi::ViewMode mode);
virtual KPropertySet* propertySet();
- virtual KDbObject* storeNewData(const KDbObject& sdata,
+ virtual KDbObject* storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
virtual tristate storeData(bool dontAsk = false);
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp \
b/kexi/plugins/forms/widgets/kexidbform.cpp index 2e817a5..0ac3973 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -331,7 +331,7 @@ bool KexiDBForm::eventFilter(QObject * watched, QEvent * e)
}
if (key == Qt::Key_Delete && ke->modifiers() == Qt::ControlModifier) \
{ //! @todo remove hardcoded shortcuts: can be reconfigured...
- d->dataAwareObject->deleteCurrentRow();
+ d->dataAwareObject->deleteCurrentRecord();
return true;
}
}
@@ -463,7 +463,7 @@ bool KexiDBForm::eventFilter(QObject * watched, QEvent * e)
//qDebug() << "moving cursor to column #" << index;
editedItem = 0;
if ((int)index != d->dataAwareObject->currentColumn()) {
- \
d->dataAwareObject->setCursorPosition(d->dataAwareObject->currentRow(), index \
/*column*/); + \
d->dataAwareObject->setCursorPosition(d->dataAwareObject->currentRecord(), index \
/*column*/); }
break;
} else {
diff --git a/kexi/plugins/queries/kexiqueryhandler.desktop \
b/kexi/plugins/queries/kexi_queryplugin.desktop similarity index 100%
rename from kexi/plugins/queries/kexiqueryhandler.desktop
rename to kexi/plugins/queries/kexi_queryplugin.desktop
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp \
b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 9951d7d..12fb5ba 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -90,11 +90,11 @@ public:
sortColumnPreferredWidth = 0;
}
- bool changeSingleCellValue(KDbRecordData *data, int columnNumber,
+ bool changeSingleCellValue(KDbRecordData *recordData, int columnNumber,
const QVariant& value, KDbResultInfo* result) {
data->clearRecordEditBuffer();
- if (!data->updateRecordEditBuffer(data, columnNumber, value)
- || !data->saveRecordChanges(data, true)) {
+ if (!data->updateRecordEditBuffer(recordData, columnNumber, value)
+ || !data->saveRecordChanges(recordData, true)) {
if (result)
*result = data->result();
return false;
@@ -203,10 +203,10 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor(
d->dataTable->tableView()->setColumnWidth(COLUMN_ID_SORTING, \
d->sortColumnPreferredWidth); d->dataTable->tableView()->setStretchLastColumn(true);
d->dataTable->tableView()->maximizeColumnsWidth(c);
- d->dataTable->tableView()->setDropsAtRowEnabled(true);
+ d->dataTable->tableView()->setDropsAtRecordEnabled(true);
connect(d->dataTable->tableView(), \
SIGNAL(dragOverRecord(KDbRecordData*,int,QDragMoveEvent*)),
this, \
SLOT(slotDragOverTableRecord(KDbRecordData*,int,QDragMoveEvent*)));
- connect(d->dataTable->tableView(), \
SIGNAL(droppedAtRow(KDbRecordData*,int,QDropEvent*,KDbRecordData*&)), + \
connect(d->dataTable->tableView(), \
SIGNAL(droppedAtRecord(KDbRecordData*,int,QDropEvent*,KDbRecordData*&)),
this, \
SLOT(slotDroppedAtRecord(KDbRecordData*,int,QDropEvent*,KDbRecordData*&)));
connect(d->dataTable->tableView(), \
SIGNAL(newItemAppendedForAfterDeletingInSpreadSheetMode()),
this, SLOT(slotNewItemAppendedForAfterDeletingInSpreadSheetMode()));
@@ -346,7 +346,7 @@ void KexiQueryDesignerGuiEditor::updateColumnsData()
//table
/*! @todo what about query? */
KDbTableSchema *table = \
d->relations->tables()->value(tableName)->schema()->table();
- d->conn->registerForTableSchemaChanges(*tempData(), *table); //this table \
will be used + d->conn->registerForTableSchemaChanges(tempData(), table); \
//this table will be used data = d->tablesColumnData->createItem();
(*data)[COLUMN_ID_COLUMN] = table->name();
(*data)[COLUMN_ID_TABLE] = (*data)[COLUMN_ID_COLUMN];
@@ -658,9 +658,9 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(Kexi::ViewMode mode)
}
// Invalid queries case:
// KexiWindow::switchToViewMode() first opens DesignViewMode,
- // and then KexiQueryPart::loadSchemaData() doesn't allocate \
KDbQuerySchema object
- // do we're carefully looking at window()->schemaData()
- KDbQuerySchema * q = dynamic_cast<KDbQuerySchema \
*>(window()->schemaData()); + // and then \
KexiQueryPart::loadSchemaObject() doesn't allocate KDbQuerySchema object + \
// do we're carefully looking at window()->schemaObject() + KDbQuerySchema \
* q = dynamic_cast<KDbQuerySchema *>(window()->schemaObject()); if (q) {
KDbResultInfo result;
showFieldsForQuery(q, result);
@@ -700,7 +700,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(Kexi::ViewMode mode)
if (mode == Kexi::DataViewMode) {
//this is just a SWITCH from data view
//set cursor if needed:
- if (d->dataTable->dataAwareObject()->currentRow() < 0
+ if (d->dataTable->dataAwareObject()->currentRecord() < 0
|| d->dataTable->dataAwareObject()->currentColumn() < 0) {
d->dataTable->dataAwareObject()->ensureCellVisible(0, 0);
d->dataTable->dataAwareObject()->setCursorPosition(0, 0);
@@ -717,7 +717,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(Kexi::ViewMode mode)
KDbObject*
-KexiQueryDesignerGuiEditor::storeNewData(const KDbObject& sdata,
+KexiQueryDesignerGuiEditor::storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel)
{
@@ -737,7 +737,7 @@ KexiQueryDesignerGuiEditor::storeNewData(const KDbObject& sdata,
return 0;
}
}
- (KDbObject&)*temp->query() = sdata; //copy main attributes
+ (KDbObject&)*temp->query() = object; //copy main attributes
bool ok = d->conn->storeNewObjectData(temp->query());
if (ok) {
@@ -1085,7 +1085,7 @@ bool KexiQueryDesignerGuiEditor::loadLayout()
//in a case when query layout was not saved, build layout by hand
// -- dynamic cast because of a need for handling invalid queries
// (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()):
- KDbQuerySchema * q = dynamic_cast<KDbQuerySchema *>(window()->schemaData());
+ KDbQuerySchema * q = dynamic_cast<KDbQuerySchema \
*>(window()->schemaObject()); if (q) {
showTablesForQuery(q);
KDbResultInfo result;
@@ -1140,12 +1140,12 @@ bool KexiQueryDesignerGuiEditor::storeLayout()
KexiQueryPart::TempData * temp = tempData();
// Save SQL without driver-escaped keywords.
- if (window()->schemaData()) //set this instance as obsolete (only if it's \
stored)
- d->conn->setQuerySchemaObsolete(window()->schemaData()->name());
+ if (window()->schemaObject()) //set this instance as obsolete (only if it's \
stored) + d->conn->setQuerySchemaObsolete(window()->schemaObject()->name());
KDbConnection::SelectStatementOptions options;
options.addVisibleLookupColumns = false;
- QString sqlText = KDb::selectStatement(temp->query(), options);
+ QString sqlText = KDb::selectStatement(temp->query(), options).toString();
if (!storeDataBlock(sqlText, "sql")) {
return false;
}
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp \
b/kexi/plugins/queries/kexiquerydesignersql.cpp index f406280..41e48aa 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -263,7 +263,7 @@ KexiQueryDesignerSQLView::afterSwitchFrom(Kexi::ViewMode mode)
KexiQueryPart::TempData * temp = tempData();
KDbQuerySchema *query = temp->query();
if (!query) {//try to just get saved schema, instead of temporary one
- query = dynamic_cast<KDbQuerySchema *>(window()->schemaData());
+ query = dynamic_cast<KDbQuerySchema *>(window()->schemaObject());
}
if (mode != 0/*failure only if it is switching from prev. view*/ && !query) {
@@ -388,7 +388,7 @@ KDbObject* KexiQueryDesignerSQLView::storeNewData(const \
KDbObject& sdata, query = new KDbObject(); //just empty
}
- (KDbObject&)*query = sdata; //copy main attributes
+ (KDbObject&)*query = object; //copy main attributes
ok = KexiMainWindowIface::global()->project()->dbConnection()->storeNewObjectData(query);
if (ok) {
@@ -407,8 +407,8 @@ KDbObject* KexiQueryDesignerSQLView::storeNewData(const \
KDbObject& sdata,
tristate KexiQueryDesignerSQLView::storeData(bool dontAsk)
{
- if (window()->schemaData()) { //set this instance as obsolete (only if it's \
stored)
- KexiMainWindowIface::global()->project()->dbConnection()->setQuerySchemaObsolete(window()->schemaData()->name());
+ if (window()->schemaObject()) { //set this instance as obsolete (only if it's \
stored) + KexiMainWindowIface::global()->project()->dbConnection()->setQuerySchemaObsolete(window()->schemaObject()->name());
}
tristate res = KexiView::storeData(dontAsk);
if (~res)
diff --git a/kexi/plugins/queries/kexiquerydesignersql.h \
b/kexi/plugins/queries/kexiquerydesignersql.h index 2d86b3a..4d51f61 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.h
+++ b/kexi/plugins/queries/kexiquerydesignersql.h
@@ -46,7 +46,7 @@ protected:
virtual tristate beforeSwitchTo(Kexi::ViewMode mode, bool *dontStore);
virtual tristate afterSwitchFrom(Kexi::ViewMode mode);
- virtual KDbObject* storeNewData(const KDbObject& sdata,
+ virtual KDbObject* storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
virtual tristate storeData(bool dontAsk = false);
diff --git a/kexi/plugins/queries/kexiquerypart.cpp \
b/kexi/plugins/queries/kexiquerypart.cpp index 0725fe2..04ef187 100644
--- a/kexi/plugins/queries/kexiquerypart.cpp
+++ b/kexi/plugins/queries/kexiquerypart.cpp
@@ -114,8 +114,8 @@ void KexiQueryPart::initInstanceActions()
{
}
-KDbObject* KexiQueryPart::loadSchemaData(
- KexiWindow *window, const KDbObject& sdata, Kexi::ViewMode viewMode,
+KDbObject* KexiQueryPart::loadSchemaObject(
+ KexiWindow *window, const KDbObject& object, Kexi::ViewMode viewMode,
bool *ownedByWindow)
{
KexiQueryPart::TempData * temp = \
static_cast<KexiQueryPart::TempData*>(window->data()); @@ -131,9 +131,9 @@ KDbObject* \
KexiQueryPart::loadSchemaData( if (viewMode == Kexi::TextViewMode) {
//for SQL view, no parsing is initially needed:
//-just make a copy:
- return KexiPart::Part::loadSchemaData(window, sdata, viewMode, \
ownedByWindow); + return KexiPart::Part::loadSchemaObject(window, object, \
viewMode, ownedByWindow); }
- /* Set this to true on data loading loadSchemaData() to indicate that \
TextView mode + /* Set this to true on data loading loadSchemaObject() to \
indicate that TextView mode
could be used instead of DataView or DesignView, because there are problems
with opening object. */
temp->proposeOpeningInTextViewModeBecauseOfProblems = true;
@@ -141,7 +141,7 @@ KDbObject* KexiQueryPart::loadSchemaData(
return 0;
}
qDebug() << *query;
- (KDbObject&)*query = sdata; //copy main attributes
+ (KDbObject&)*query = object; //copy main attributes
temp->registerTableSchemaChanges(query);
if (ownedByWindow)
@@ -242,7 +242,7 @@ void KexiQueryPart::TempData::setQuery(KDbQuerySchema *query)
return;
if (m_query
/* query not owned by window */
- && (static_cast<KexiWindow*>(parent())->schemaData() != \
static_cast<KDbObject*>(m_query))) + && \
(static_cast<KexiWindow*>(parent())->schemaObject() != \
static_cast<KDbObject*>(m_query))) {
delete m_query;
}
diff --git a/kexi/plugins/queries/kexiquerypart.h \
b/kexi/plugins/queries/kexiquerypart.h index 26831340..b10787e 100644
--- a/kexi/plugins/queries/kexiquerypart.h
+++ b/kexi/plugins/queries/kexiquerypart.h
@@ -33,7 +33,7 @@
class KDbQuerySchema;
class KDbConnection;
-//! @short Kexi Query Designer Plugin.
+//! @short Kexi Query Designer plugin
class KexiQueryPart : public KexiPart::Part
{
Q_OBJECT
@@ -58,7 +58,7 @@ public:
/*! Assigns query \a query for this data.
Existing query (available using query()) is deleted but only
- if it is not owned by parent window (i.e. != KexiWindow::schemaData()).
+ if it is not owned by parent window (i.e. != KexiWindow::schemaObject()).
\a query can be 0.
If \a query is equal to existing query, nothing is performed.
*/
@@ -111,9 +111,8 @@ protected:
virtual void initPartActions();
virtual void initInstanceActions();
- virtual KDbObject* loadSchemaData(KexiWindow *window,
- const KDbObject& sdata, Kexi::ViewMode viewMode, bool *ownedByWindow);
+ virtual KDbObject* loadSchemaObject(KexiWindow *window,
+ const KDbObject& object, Kexi::ViewMode viewMode, bool *ownedByWindow);
};
#endif
-
diff --git a/kexi/plugins/queries/kexiqueryview.cpp \
b/kexi/plugins/queries/kexiqueryview.cpp index 14a5aca..406849b 100644
--- a/kexi/plugins/queries/kexiqueryview.cpp
+++ b/kexi/plugins/queries/kexiqueryview.cpp
@@ -116,7 +116,7 @@ tristate KexiQueryView::executeQuery(KDbQuerySchema *query)
tristate KexiQueryView::afterSwitchFrom(Kexi::ViewMode mode)
{
if (mode == Kexi::NoViewMode) {
- KDbQuerySchema *querySchema = static_cast<KDbQuerySchema \
*>(window()->schemaData()); + KDbQuerySchema *querySchema = \
static_cast<KDbQuerySchema *>(window()->schemaObject()); const tristate result = \
executeQuery(querySchema); if (true != result)
return result;
@@ -129,15 +129,15 @@ tristate KexiQueryView::afterSwitchFrom(Kexi::ViewMode mode)
return true;
}
-KDbObject* KexiQueryView::storeNewData(const KDbObject& sdata,
+KDbObject* KexiQueryView::storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions \
options, bool *cancel)
{
KexiView * view = window()->viewThatRecentlySetDirtyFlag();
if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view))
- return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeNewData(sdata, \
options, cancel); + return \
dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeNewData(object, options, \
cancel); if (dynamic_cast<KexiQueryDesignerSQLView*>(view))
- return dynamic_cast<KexiQueryDesignerSQLView*>(view)->storeNewData(sdata, \
options, cancel); + return \
dynamic_cast<KexiQueryDesignerSQLView*>(view)->storeNewData(object, options, cancel); \
return 0; }
@@ -155,4 +155,3 @@ QList<QVariant> KexiQueryView::currentParameters() const
{
return d->currentParams;
}
-
diff --git a/kexi/plugins/queries/kexiqueryview.h \
b/kexi/plugins/queries/kexiqueryview.h index 9732d3c..2afeb4f 100644
--- a/kexi/plugins/queries/kexiqueryview.h
+++ b/kexi/plugins/queries/kexiqueryview.h
@@ -39,7 +39,7 @@ public:
protected:
virtual tristate afterSwitchFrom(Kexi::ViewMode mode);
- virtual KDbObject* storeNewData(const KDbObject& sdata,
+ virtual KDbObject* storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
diff --git a/kexi/plugins/reports/kexireportdesignview.cpp \
b/kexi/plugins/reports/kexireportdesignview.cpp index cfdeba5..00aad5b 100644
--- a/kexi/plugins/reports/kexireportdesignview.cpp
+++ b/kexi/plugins/reports/kexireportdesignview.cpp
@@ -80,11 +80,11 @@ void KexiReportDesignView::slotDesignerPropertySetChanged()
propertySetSwitched();
}
-KDbObject* KexiReportDesignView::storeNewData(const KDbObject& sdata,
+KDbObject* KexiReportDesignView::storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions \
options, bool *cancel)
{
- KDbObject *s = KexiView::storeNewData(sdata, options, cancel);
+ KDbObject *s = KexiView::storeNewData(object, options, cancel);
qDebug() << "new id:" << s->id();
if (!s || *cancel) {
@@ -92,7 +92,7 @@ KDbObject* KexiReportDesignView::storeNewData(const KDbObject& \
sdata, return 0;
}
if (!storeData()) {
- //failure: remove object's schema data to avoid garbage
+ //failure: remove object's object data to avoid garbage
KDbConnection *conn = \
KexiMainWindowIface::global()->project()->dbConnection(); \
conn->removeObject(s->id()); delete s;
diff --git a/kexi/plugins/reports/kexireportdesignview.h \
b/kexi/plugins/reports/kexireportdesignview.h index 34290ae..fc65ac1 100644
--- a/kexi/plugins/reports/kexireportdesignview.h
+++ b/kexi/plugins/reports/kexireportdesignview.h
@@ -70,7 +70,7 @@ private:
protected:
virtual KPropertySet *propertySet();
virtual tristate storeData(bool dontAsk = false);
- virtual KDbObject* storeNewData(const KDbObject& sdata,
+ virtual KDbObject* storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
diff --git a/kexi/plugins/reports/kexireportpart.cpp \
b/kexi/plugins/reports/kexireportpart.cpp index b458c71..d4b947b 100644
--- a/kexi/plugins/reports/kexireportpart.cpp
+++ b/kexi/plugins/reports/kexireportpart.cpp
@@ -123,7 +123,7 @@ QString KexiReportPart::loadReport(const QString& name)
if (conn->loadObjectData(win->project()->typeIdForPluginId("org.kexi-project.report"), \
name, &sd) != true
&& conn->loadObjectData(win->project()->typeIdForPluginId("uk.co.piggz.report"), \
name, &sd) != true /* compat. */) {
- qWarning() << "failed to load schema data";
+ qWarning() << "failed to load object data";
return QString();
}
qDebug() << "***Object ID:" << sd.id();
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp \
b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index \
3517baf..cb9813f 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -447,11 +447,11 @@ bool KexiScriptDesignView::loadData()
return true;
}
-KDbObject* KexiScriptDesignView::storeNewData(const KDbObject& sdata,
+KDbObject* KexiScriptDesignView::storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions \
options, bool *cancel)
{
- KDbObject *s = KexiView::storeNewData(sdata, options, cancel);
+ KDbObject *s = KexiView::storeNewData(object, options, cancel);
qDebug() << "new id:" << s->id();
if (!s || *cancel) {
@@ -461,7 +461,7 @@ KDbObject* KexiScriptDesignView::storeNewData(const KDbObject& \
sdata,
if (! storeData()) {
qWarning() << "Failed to store the data.";
- //failure: remove object's schema data to avoid garbage
+ //failure: remove object's object data to avoid garbage
KDbConnection *conn = \
KexiMainWindowIface::global()->project()->dbConnection(); \
conn->removeObject(s->id()); delete s;
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h \
b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h index 17a06dd..e587c8a \
100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.h
@@ -74,13 +74,13 @@ public:
* Try to call \a storeData with new data we like to store. On
* success the matching \a KDbObject is returned.
*
- * \param sdata The source \a KDbObject instance.
+ * \param object The source \a KDbObject instance.
* \param cancel Cancel on failure and don't try to clean
* possible temporary created data up.
* \return The matching \a KDbObject instance or NULL
* if storing failed.
*/
- virtual KDbObject* storeNewData(const KDbObject& sdata,
+ virtual KDbObject* storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp \
b/kexi/plugins/tables/kexitabledesignerview.cpp index 4f49b87..6e40039 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -1310,19 +1310,19 @@ tristate KexiTableDesignerView::buildAlterTableActions(
return true;
}
-KDbObject* KexiTableDesignerView::storeNewData(const KDbObject& sdata,
+KDbObject* KexiTableDesignerView::storeNewData(const KDbObject& object,
\
KexiView::StoreNewDataOptions options, bool *cancel)
{
Q_ASSERT(cancel);
- if (tempData()->table || window()->schemaData()) //must not be
+ if (tempData()->table || window()->schemaObject()) //must not be
return 0;
//create table schema definition
- tempData()->table = new KDbTableSchema(sdata.name());
- tempData()->table->setName(sdata.name());
- tempData()->table->setCaption(sdata.caption());
- tempData()->table->setDescription(sdata.description());
+ tempData()->table = new KDbTableSchema(object.name());
+ tempData()->table->setName(object.name());
+ tempData()->table->setCaption(object.caption());
+ tempData()->table->setDescription(object.description());
tristate res = buildSchema(*tempData()->table);
*cancel = ~res;
@@ -1351,7 +1351,7 @@ KDbObject* KexiTableDesignerView::storeNewData(const KDbObject& \
sdata, return tempData()->table;
}
-KDbObject* KexiTableDesignerView::copyData(const KDbObject& sdata,
+KDbObject* KexiTableDesignerView::copyData(const KDbObject& object,
KexiView::StoreNewDataOptions \
options, bool *cancel)
{
@@ -1364,7 +1364,7 @@ KDbObject* KexiTableDesignerView::copyData(const KDbObject& \
sdata, return 0;
}
KDbConnection *conn = KexiMainWindowIface::global()->project()->dbConnection();
- KDbTableSchema *copiedTable = conn->copyTable(*tempData()->table, sdata);
+ KDbTableSchema *copiedTable = conn->copyTable(*tempData()->table, object);
if (!copiedTable) {
return 0;
}
@@ -1380,7 +1380,7 @@ KDbObject* KexiTableDesignerView::copyData(const KDbObject& \
sdata,
tristate KexiTableDesignerView::storeData(bool dontAsk)
{
- if (!tempData()->table || !window()->schemaData()) {
+ if (!tempData()->table || !window()->schemaObject()) {
d->recentResultOfStoreData = false;
return false;
}
@@ -1441,7 +1441,7 @@ tristate KexiTableDesignerView::storeData(bool dontAsk)
}
// keep old behaviour:
newTable = new KDbTableSchema();
- // copy the schema data
+ // copy the object data
static_cast<KDbObject&>(*newTable)
= static_cast<KDbObject&>(*tempData()->table);
res = buildSchema(*newTable);
@@ -1483,7 +1483,7 @@ tristate \
KexiTableDesignerView::simulateAlterTableExecution(QString *debugTarget //to avoid \
executing for multiple alter table views return false;
}
- if (!tempData()->table || !window()->schemaData())
+ if (!tempData()->table || !window()->schemaObject())
return false;
KDbConnection *conn = KexiMainWindowIface::global()->project()->dbConnection();
KDbAlterTableHandler::ActionList actions;
@@ -1617,7 +1617,7 @@ void KexiTableDesignerView::slotAboutToShowContextMenu()
QString KexiTableDesignerView::debugStringForCurrentTableSchema(tristate& result)
{
KDbTableSchema tempTable;
- //copy schema data
+ //copy object data
static_cast<KDbObject&>(tempTable)
= static_cast<KDbObject&>(*tempData()->table);
result = buildSchema(tempTable, true /*beSilent*/);
diff --git a/kexi/plugins/tables/kexitabledesignerview.h \
b/kexi/plugins/tables/kexitabledesignerview.h index a216ca3..00d95ae 100644
--- a/kexi/plugins/tables/kexitabledesignerview.h
+++ b/kexi/plugins/tables/kexitabledesignerview.h
@@ -186,12 +186,12 @@ protected:
/*! Reimplemented from KexiView, because tables creation is more complex.
No table schema altering is required, so just buildSchema() is used to create a \
new schema.
*/
- virtual KDbObject* storeNewData(const KDbObject& sdata,
+ virtual KDbObject* storeNewData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
/*! Reimplemented from KexiView, because cloning of table objects is more \
complex. */
- virtual KDbObject* copyData(const KDbObject& sdata,
+ virtual KDbObject* copyData(const KDbObject& object,
KexiView::StoreNewDataOptions options,
bool *cancel);
diff --git a/kexi/plugins/tables/kexitablepart.cpp \
b/kexi/plugins/tables/kexitablepart.cpp index 1e77aee..4512863 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -155,14 +155,14 @@ tristate KexiTablePart::rename(KexiPart::Item *item, const \
QString& newName) return conn->alterTableName(schema, newName);
}
-KDbObject* KexiTablePart::loadSchemaData(KexiWindow *window, const KDbObject& sdata,
+KDbObject* KexiTablePart::loadSchemaObject(KexiWindow *window, const KDbObject& \
object,
Kexi::ViewMode viewMode, bool *ownedByWindow)
{
Q_UNUSED(window);
Q_UNUSED(viewMode);
if (ownedByWindow)
*ownedByWindow = false;
- return KexiMainWindowIface::global()->project()->dbConnection()->tableSchema(sdata.name());
+ return KexiMainWindowIface::global()->project()->dbConnection()->tableSchema(object.name());
}
//static
diff --git a/kexi/plugins/tables/kexitablepart.h \
b/kexi/plugins/tables/kexitablepart.h index 3346a4c..7da722e 100644
--- a/kexi/plugins/tables/kexitablepart.h
+++ b/kexi/plugins/tables/kexitablepart.h
@@ -32,6 +32,7 @@
class KexiLookupColumnPage;
+//! @short Kexi Table Designer plugin
class KexiTablePart : public KexiPart::Part
{
Q_OBJECT
@@ -75,7 +76,7 @@ protected:
virtual void setupCustomPropertyPanelTabs(QTabWidget *tab);
- virtual KDbObject* loadSchemaData(KexiWindow *window, const KDbObject& sdata,
+ virtual KDbObject* loadSchemaObject(KexiWindow *window, const KDbObject& object,
Kexi::ViewMode viewMode, bool *ownedByWindow);
private:
diff --git a/kexi/tests/altertable/altertable.cpp \
b/kexi/tests/altertable/altertable.cpp index 3aeff70..04bd737 100644
--- a/kexi/tests/altertable/altertable.cpp
+++ b/kexi/tests/altertable/altertable.cpp
@@ -546,14 +546,14 @@ tristate AlterTableTester::run(bool *closeAppRequested)
return false;
designerIface->insertField(row, testFileLine[2], true);
continue;
- } else if (command == "insertEmptyRow") {
+ } else if (command == "insertEmptyRecord") {
if (!checkItemsNumber(2))
return false;
bool ok;
int row = getNumber(testFileLine[1], &ok) - 1;
if (!ok)
return false;
- designerIface->insertEmptyRow(row, true);
+ designerIface->insertEmptyRecord(row, true);
continue;
} else if (command == "changeFieldProperty") {
if (!checkItemsNumber(5) || !changeFieldProperty(designerIface))
diff --git a/kexi/widget/KexiNameDialog.cpp b/kexi/widget/KexiNameDialog.cpp
index eeeec71..0298603 100644
--- a/kexi/widget/KexiNameDialog.cpp
+++ b/kexi/widget/KexiNameDialog.cpp
@@ -160,7 +160,7 @@ bool KexiNameDialog::canOverwrite()
return true;
}
if (result == false) {
- qWarning() << "Cannot load object schema data for" << widget()->nameText();
+ qWarning() << "Cannot load object data for" << widget()->nameText();
return false;
}
if (widget()->originalNameText() == tmpObject.name()) {
diff --git a/kexi/widget/dataviewcommon/kexidataawareview.cpp \
b/kexi/widget/dataviewcommon/kexidataawareview.cpp index 40789e7..b7909eb 100644
--- a/kexi/widget/dataviewcommon/kexidataawareview.cpp
+++ b/kexi/widget/dataviewcommon/kexidataawareview.cpp
@@ -311,7 +311,7 @@ void KexiDataAwareView::reloadActions()
if (d->dataAwareObject->isEmptyRecordInsertingEnabled()) {
unplugSharedAction("edit_insert_empty_row");
- plugSharedAction("edit_insert_empty_row", d->internalView, \
SLOT(insertEmptyRow())); + plugSharedAction("edit_insert_empty_row", \
d->internalView, SLOT(insertEmptyRecord())); if (separatorNeeded)
d->dataAwareObject->contextMenu()->addSeparator();
plugSharedAction("edit_insert_empty_row", \
d->dataAwareObject->contextMenu());
diff --git a/kexi/widget/kexiqueryparameters.cpp \
b/kexi/widget/kexiqueryparameters.cpp index 958cf41..33cd2e8 100644
--- a/kexi/widget/kexiqueryparameters.cpp
+++ b/kexi/widget/kexiqueryparameters.cpp
@@ -32,12 +32,13 @@
//static
QList<QVariant> KexiQueryParameters::getParameters(QWidget *parent,
- const KDbDriver &driver, KDbQuerySchema& querySchema, bool *ok)
+ const KDbDriver &driver, KDbQuerySchema* querySchema, bool *ok)
{
Q_ASSERT(ok);
+ Q_ASSERT(querySchema);
Q_UNUSED(driver);
*ok = false;
- const QList<KDbQuerySchemaParameter> params(querySchema.parameters());
+ const QList<KDbQuerySchemaParameter> params(querySchema->parameters());
QList<QVariant> values;
const QString caption(xi18nc("@title:window Enter Query Parameter Value", "Enter \
Parameter Value")); foreach(const KDbQuerySchemaParameter ¶meter, params) {
diff --git a/kexi/widget/kexiqueryparameters.h b/kexi/widget/kexiqueryparameters.h
index 75db89f..be79b3c 100644
--- a/kexi/widget/kexiqueryparameters.h
+++ b/kexi/widget/kexiqueryparameters.h
@@ -40,7 +40,7 @@ public:
//! @todo support validation rules, e.g. min/max value, unsigned
//! @todo support Enum type (list of strings, need support for keys and \
user-visible strings)
static QList<QVariant> getParameters(QWidget *parent, const KDbDriver &driver,
- KDbQuerySchema& querySchema, bool *ok);
+ KDbQuerySchema* querySchema, bool *ok);
};
#endif // KEXIDBCONNECTIONWIDGET_H
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp \
b/kexi/widget/tableview/kexicomboboxpopup.cpp index f4b05ae..ce8eb36 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -266,8 +266,8 @@ void KexiComboBoxPopup::setData(KDbTableViewColumn *column, \
KDbField *field) continue;
}
KDbVariableExpression fieldExpr(ci->field->table()->name() + "." + \
ci->field->name());
- //! @todo KEXI3 check this we're calling KDbQuerySchema::validate() \
instead of this: fieldExpr->field = ci->field;
- //! @todo KEXI3 check this we're calling KDbQuerySchema::validate() \
instead of this: fieldExpr->tablePositionForField = \
d->privateQuery->tableBoundToColumn(*it); + //! @todo KEXI3 check this \
we're calling KDbQuerySchema::validate() instead of this: fieldExpr.field = \
ci->field; + //! @todo KEXI3 check this we're calling \
KDbQuerySchema::validate() instead of this: fieldExpr.tablePositionForField = \
d->privateQuery->tableBoundToColumn(*it); if (expr.isValid()) {
//! @todo " " separator hardcoded...
//! @todo use SQL sub-parser here...
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic