diff options
Diffstat (limited to 'kexi/plugins/queries')
-rw-r--r-- | kexi/plugins/queries/kexiaddparamwidget.ui | 2 | ||||
-rw-r--r-- | kexi/plugins/queries/kexiparameterlisteditor.ui | 2 | ||||
-rw-r--r-- | kexi/plugins/queries/kexiquerydesignerguieditor.cpp | 24 | ||||
-rw-r--r-- | kexi/plugins/queries/kexiquerydesignersql.cpp | 10 | ||||
-rw-r--r-- | kexi/plugins/queries/kexiqueryview.cpp | 10 |
5 files changed, 24 insertions, 24 deletions
diff --git a/kexi/plugins/queries/kexiaddparamwidget.ui b/kexi/plugins/queries/kexiaddparamwidget.ui index cddfa20e..a1f28a79 100644 --- a/kexi/plugins/queries/kexiaddparamwidget.ui +++ b/kexi/plugins/queries/kexiaddparamwidget.ui @@ -128,7 +128,7 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> </includehints> diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui index dd5a00d8..e7526413 100644 --- a/kexi/plugins/queries/kexiparameterlisteditor.ui +++ b/kexi/plugins/queries/kexiparameterlisteditor.ui @@ -79,7 +79,7 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index a6205222..5be54145 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -349,7 +349,7 @@ KexiRelationWidget *KexiQueryDesignerGuiEditor::relationView() const KexiQueryPart::TempData * KexiQueryDesignerGuiEditor::tempData() const { - return static_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData()); + return static_cast<KexiQueryPart::TempData*>(parentDialog()->tempData()); } static TQString msgCannotSwitch_EmptyDesign() { @@ -581,7 +581,7 @@ KexiQueryDesignerGuiEditor::beforeSwitchTo(int mode, bool &dontStore) // if (!d->dataTable->dataAwareObject()->acceptRowEdit()) // return cancelled; - if (!dirty() && tqparentDialog()->neverSaved()) { + if (!dirty() && parentDialog()->neverSaved()) { KMessageBox::information(this, msgCannotSwitch_EmptyDesign()); return cancelled; } @@ -618,13 +618,13 @@ tristate KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) { const bool was_dirty = dirty(); - KexiDB::Connection *conn = tqparentDialog()->mainWin()->project()->dbConnection(); + KexiDB::Connection *conn = parentDialog()->mainWin()->project()->dbConnection(); if (mode==Kexi::NoViewMode || (mode==Kexi::DataViewMode && !tempData()->query())) { //this is not a SWITCH but a fresh opening in this view mode if (!m_dialog->neverSaved()) { if (!loadLayout()) { //err msg - tqparentDialog()->settqStatus(conn, + parentDialog()->settqStatus(conn, i18n("Query definition loading failed."), i18n("Query design may be corrupted so it could not be opened even in text view.\n" "You can delete the query and create it again.")); @@ -633,13 +633,13 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) // Invalid queries case: // KexiDialogBase::switchToViewMode() first opens DesignViewMode, // and then KexiQueryPart::loadSchemaData() doesn't allocate QuerySchema object - // do we're carefully looking at tqparentDialog()->schemaData() - KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData()); + // do we're carefully looking at parentDialog()->schemaData() + KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData()); if (q) { KexiDB::ResultInfo result; showFieldsForQuery( q, result ); if (!result.success) { - tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); tempData()->proposeOpeningInTextViewModeBecauseOfProblems = true; return false; } @@ -662,7 +662,7 @@ KexiQueryDesignerGuiEditor::afterSwitchFrom(int mode) KexiDB::ResultInfo result; showFieldsAndRelationsForQuery( tempData()->query(), result ); if (!result.success) { - tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); return false; } } @@ -813,7 +813,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( KexiDB::BaseExpr* e = query->whereExpression(); KexiDB::BaseExpr* eItem = 0; while (e) { - //eat tqparentheses because the expression can be (....) AND (... AND ... ) + //eat parentheses because the expression can be (....) AND (... AND ... ) while (e && e->toUnary() && e->token()=='(') e = e->toUnary()->arg(); @@ -826,7 +826,7 @@ void KexiQueryDesignerGuiEditor::showFieldsOrRelationsForQueryInternal( e = 0; } - //eat tqparentheses + //eat parentheses while (eItem && eItem->toUnary() && eItem->token()=='(') eItem = eItem->toUnary()->arg(); @@ -1077,13 +1077,13 @@ bool KexiQueryDesignerGuiEditor::loadLayout() //in a case when query tqlayout was not saved, build tqlayout by hand // -- dynamic cast because of a need for handling invalid queries // (as in KexiQueryDesignerGuiEditor::afterSwitchFrom()): - KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData()); + KexiDB::QuerySchema * q = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData()); if (q) { showTablesForQuery( q ); KexiDB::ResultInfo result; showRelationsForQuery( q, result ); if (!result.success) { - tqparentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); + parentDialog()->settqStatus(&result, i18n("Query definition loading failed.")); return false; } } diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 36455837..e6eb9835 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -222,7 +222,7 @@ KexiQueryDesignerSQLView::beforeSwitchTo(int mode, bool &dontStore) } } else { - const bool designViewWasVisible = tqparentDialog()->viewForMode(mode)!=0; + const bool designViewWasVisible = parentDialog()->viewForMode(mode)!=0; //should we check SQL text? if (designViewWasVisible && !d->justSwitchedFromNoViewMode //unchanged, but we should check SQL text @@ -274,7 +274,7 @@ KexiQueryDesignerSQLView::beforeSwitchTo(int mode, bool &dontStore) } setDirty(true);*/ -// if (tqparentDialog()->hasFocus()) +// if (parentDialog()->hasFocus()) d->editor->setFocus(); return true; } @@ -287,13 +287,13 @@ KexiQueryDesignerSQLView::afterSwitchFrom(int mode) if (mode==Kexi::NoViewMode) { //User opened text view _directly_. //This flag is set to indicate for beforeSwitchTo() that even if text has not been changed, - //SQL text should be tqinvalidated. + //SQL text should be invalidated. d->justSwitchedFromNoViewMode = true; } KexiQueryPart::TempData * temp = tempData(); KexiDB::QuerySchema *query = temp->query(); if (!query) {//try to just get saved schema, instead of temporary one - query = dynamic_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData()); + query = dynamic_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData()); } if (mode!=0/*failure only if it is switching from prev. view*/ && !query) { @@ -441,7 +441,7 @@ void KexiQueryDesignerSQLView::slotSelectQuery() KexiQueryPart::TempData * KexiQueryDesignerSQLView::tempData() const { - return dynamic_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData()); + return dynamic_cast<KexiQueryPart::TempData*>(parentDialog()->tempData()); } KexiDB::SchemaData* diff --git a/kexi/plugins/queries/kexiqueryview.cpp b/kexi/plugins/queries/kexiqueryview.cpp index cf5400dc..9d7cc542 100644 --- a/kexi/plugins/queries/kexiqueryview.cpp +++ b/kexi/plugins/queries/kexiqueryview.cpp @@ -83,7 +83,7 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query) } d->cursor = mainWin()->project()->dbConnection()->executeQuery(*query, params); if (!d->cursor) { - tqparentDialog()->settqStatus(tqparentDialog()->mainWin()->project()->dbConnection(), + parentDialog()->settqStatus(parentDialog()->mainWin()->project()->dbConnection(), i18n("Query executing failed.")); //todo: also provide server result and sql statement return false; @@ -108,13 +108,13 @@ tristate KexiQueryView::executeQuery(KexiDB::QuerySchema *query) tristate KexiQueryView::afterSwitchFrom(int mode) { if (mode==Kexi::NoViewMode) { - KexiDB::QuerySchema *querySchema = static_cast<KexiDB::QuerySchema *>(tqparentDialog()->schemaData()); + KexiDB::QuerySchema *querySchema = static_cast<KexiDB::QuerySchema *>(parentDialog()->schemaData()); const tristate result = executeQuery(querySchema); if (true != result) return result; } else if (mode==Kexi::DesignViewMode || Kexi::TextViewMode) { - KexiQueryPart::TempData * temp = static_cast<KexiQueryPart::TempData*>(tqparentDialog()->tempData()); + KexiQueryPart::TempData * temp = static_cast<KexiQueryPart::TempData*>(parentDialog()->tempData()); //remember what view we should use to store data changes, if needed // if (temp->queryChangedInPreviousView) @@ -131,7 +131,7 @@ tristate KexiQueryView::afterSwitchFrom(int mode) KexiDB::SchemaData* KexiQueryView::storeNewData(const KexiDB::SchemaData& sdata, bool &cancel) { - KexiViewBase * view = tqparentDialog()->viewThatRecentlySetDirtyFlag(); + KexiViewBase * view = parentDialog()->viewThatRecentlySetDirtyFlag(); if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view)) return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeNewData(sdata, cancel); if (dynamic_cast<KexiQueryDesignerSQLView*>(view)) @@ -141,7 +141,7 @@ KexiDB::SchemaData* KexiQueryView::storeNewData(const KexiDB::SchemaData& sdata, tristate KexiQueryView::storeData(bool dontAsk) { - KexiViewBase * view = tqparentDialog()->viewThatRecentlySetDirtyFlag(); + KexiViewBase * view = parentDialog()->viewThatRecentlySetDirtyFlag(); if (dynamic_cast<KexiQueryDesignerGuiEditor*>(view)) return dynamic_cast<KexiQueryDesignerGuiEditor*>(view)->storeData(dontAsk); if (dynamic_cast<KexiQueryDesignerSQLView*>(view)) |