summaryrefslogtreecommitdiffstats
path: root/kexi/core/kexipart.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/core/kexipart.cpp')
-rw-r--r--kexi/core/kexipart.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index ba54fea71..6671e1689 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -242,7 +242,7 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
d->instanceActionsInitialized = true;
}
- m_status.cleartqStatus();
+ m_status.clearStatus();
// KexiDialogBase *dlg = createInstance(win,item,viewMode);
// if (!dlg)
// return 0;
@@ -289,10 +289,10 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
}
if (!dlg->m_schemaData) {
if (!m_status.error())
- m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(),
+ m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(),
i18n("Could not load object's definition."), i18n("Object design may be corrupted."));
m_status.append(
- Kexi::ObjecttqStatus(i18n("You can delete \"%1\" object and create it again.")
+ Kexi::ObjectStatus(i18n("You can delete \"%1\" object and create it again.")
.tqarg(item.name()), TQString()) );
dlg->close();
@@ -339,9 +339,9 @@ KexiDialogBase* Part::openInstance(KexiMainWindow *win, KexiPart::Item &item, in
dlg->show();
if (dlg->mdiParent() && dlg->mdiParent()->state()==KMdiChildFrm::Normal) //only resize dialog if it is in normal state
- dlg->resize(dlg->tqsizeHint());
+ dlg->resize(dlg->sizeHint());
- dlg->setMinimumSize(dlg->tqminimumSizeHint().width(),dlg->tqminimumSizeHint().height());
+ dlg->setMinimumSize(dlg->minimumSizeHint().width(),dlg->minimumSizeHint().height());
//dirty only if it's a new object
if (dlg->selectedView())
@@ -366,7 +366,7 @@ KexiDB::SchemaData* Part::loadSchemaData(KexiDialogBase * /*dlg*/, const KexiDB:
bool Part::loadDataBlock( KexiDialogBase *dlg, TQString &dataString, const TQString& dataID)
{
if (!dlg->mainWin()->project()->dbConnection()->loadDataBlock( dlg->id(), dataString, dataID )) {
- m_status = Kexi::ObjecttqStatus( dlg->mainWin()->project()->dbConnection(),
+ m_status = Kexi::ObjectStatus( dlg->mainWin()->project()->dbConnection(),
i18n("Could not load object's data."), i18n("Data identifier: \"%1\".").tqarg(dataID) );
m_status.append( *dlg );
return false;
@@ -435,7 +435,7 @@ GUIClient::GUIClient(KexiMainWindow *win, Part* part, bool partInstanceClient, c
, KXMLGUIClient(win)
{
if(!win->project()->data()->userMode())
- setXMLFile(TQString::tqfromLatin1("kexi")+part->info()->objectName()
+ setXMLFile(TQString::fromLatin1("kexi")+part->info()->objectName()
+"part"+(partInstanceClient?"inst":"")+"ui.rc");
// new KAction(part->m_names["new"], part->info()->itemIcon(), 0, this,