diff options
Diffstat (limited to 'kexi/main/keximainwindowimpl.cpp')
| -rw-r--r-- | kexi/main/keximainwindowimpl.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 5594d577..293271c5 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -245,8 +245,8 @@ KexiMainWindowImpl::KexiMainWindowImpl() int scnum = TQApplication::desktop()->screenNumber(parentWidget()); TQRect desk = TQApplication::desktop()->screenGeometry(scnum); d->config->setGroup("MainWindow"); - TQSize s ( d->config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ), - d->config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) ); + TQSize s ( d->config->readNumEntry( TQString::fromLatin1("Width %1").tqarg(desk.width()), 700 ), + d->config->readNumEntry( TQString::fromLatin1("Height %1").tqarg(desk.height()), 480 ) ); resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } @@ -1836,7 +1836,7 @@ void KexiMainWindowImpl::initPropertyEditor() //1 dw->setMinimumWidth(200); - // ds->setSeparatorPos(d->propEditor->tqsizeHint().width(), true); + // ds->setSeparatorPos(d->propEditor->sizeHint().width(), true); //heh, this is for IDEAl only, I suppose? //js if (m_rightContainer) { @@ -1885,10 +1885,10 @@ void KexiMainWindowImpl::slotCaptionForCurrentMDIChild(bool tqchildrenMaximized) if (tqchildrenMaximized && view) { setCaption( d->curDialog->caption() - + (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::tqfromLatin1(" - ") + d->appCaptionPrefix)) ); + + (d->appCaptionPrefix.isEmpty() ? TQString() : (TQString::fromLatin1(" - ") + d->appCaptionPrefix)) ); } else { - setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::tqfromLatin1(" - "))) + setCaption( (d->appCaptionPrefix.isEmpty() ? TQString() : (d->appCaptionPrefix + TQString::fromLatin1(" - "))) + d->origAppCaption ); } } @@ -2093,8 +2093,8 @@ KexiMainWindowImpl::restoreSettings() }*/ config->setGroup("MainWindow"); - TQSize s ( config->readNumEntry( TQString::tqfromLatin1("Width %1").tqarg(desk.width()), 700 ), - config->readNumEntry( TQString::tqfromLatin1("Height %1").tqarg(desk.height()), 480 ) ); + TQSize s ( config->readNumEntry( TQString::fromLatin1("Width %1").tqarg(desk.width()), 700 ), + config->readNumEntry( TQString::fromLatin1("Height %1").tqarg(desk.height()), 480 ) ); resize (kMin (s.width(), desk.width()), kMin(s.height(), desk.height())); } #endif @@ -3479,8 +3479,8 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) KexiVDebug << (focus_w ? focus_w->name() : "" ) << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl; #ifdef KEXI_STATUSBAR_DEBUG - TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0; - d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") + TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0; + d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") .tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "") .tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "") ); @@ -3492,8 +3492,8 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) KexiVDebug << (focus_w ? focus_w->name() : "" ) << endl; KexiVDebug << "eventFilter: " <<e->type() << " " <<obj->name() <<endl; #ifdef KEXI_STATUSBAR_DEBUG - TQWidget *focus_widget = focus_w ? focus_w->tqfocusWidget() : 0; - d->statusBar->settqStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") + TQWidget *focus_widget = focus_w ? focus_w->focusWidget() : 0; + d->statusBar->setStatus(TQString("FOCUS VIEW: %1 %2, FOCUS WIDGET: %3 %4") .tqarg(focus_w ? focus_w->className() : "").tqarg(focus_w ? focus_w->name() : "") .tqarg(focus_widget ? focus_widget->className() : "").tqarg(focus_widget ? focus_widget->name() : "") ); @@ -3512,7 +3512,7 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e ) // invalidateSharedActions(); } else { -/* TQObject* o = tqfocusWidget(); +/* TQObject* o = focusWidget(); while (o && !o->inherits("KexiDialogBase") && !o->inherits("KexiDockBase")) o = o->parent();*/ //js invalidateSharedActions(focus_w); @@ -4409,7 +4409,7 @@ tristate KexiMainWindowImpl::printActionForItem(KexiPart::Item* item, PrintActio if (dlg) { // accept row changes - TQWidget *prevFocusWidget = tqfocusWidget(); + TQWidget *prevFocusWidget = focusWidget(); dlg->setFocus(); d->action_data_save_row->activate(); if (prevFocusWidget) |