summaryrefslogtreecommitdiffstats
path: root/kexi/core
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/core')
-rw-r--r--kexi/core/kexidataiteminterface.cpp4
-rw-r--r--kexi/core/kexidataiteminterface.h6
-rw-r--r--kexi/core/kexidialogbase.cpp8
-rw-r--r--kexi/core/kexidialogbase.h8
-rw-r--r--kexi/core/kexisharedactionhost.cpp8
-rw-r--r--kexi/core/kexisharedactionhost.h4
-rw-r--r--kexi/core/kexiviewbase.cpp16
-rw-r--r--kexi/core/kexiviewbase.h8
8 files changed, 31 insertions, 31 deletions
diff --git a/kexi/core/kexidataiteminterface.cpp b/kexi/core/kexidataiteminterface.cpp
index 2dd9c813..b95d7472 100644
--- a/kexi/core/kexidataiteminterface.cpp
+++ b/kexi/core/kexidataiteminterface.cpp
@@ -135,9 +135,9 @@ bool KexiDataItemInterface::valueIsValid()
return true;
}
-void KexiDataItemInterface::setParentDataItemInterface(KexiDataItemInterface* tqparentDataItemInterface)
+void KexiDataItemInterface::setParentDataItemInterface(KexiDataItemInterface* parentDataItemInterface)
{
- m_parentDataItemInterface = tqparentDataItemInterface;
+ m_parentDataItemInterface = parentDataItemInterface;
}
bool KexiDataItemInterface::cursorAtNewRow()
diff --git a/kexi/core/kexidataiteminterface.h b/kexi/core/kexidataiteminterface.h
index db6a9afe..ad3a3d25 100644
--- a/kexi/core/kexidataiteminterface.h
+++ b/kexi/core/kexidataiteminterface.h
@@ -192,11 +192,11 @@ class KEXICORE_EXPORT KexiDataItemInterface
It is the case for KexiDBFieldEdit widget (see KexiDBFieldEdit::createEditor()). Use with care.
signalValueChanged() method will check this pointer, and if it's not 0,
m_parentDataItemInterface->signalValueChanged() is called, so a changes can be signalled at higher level. */
- void setParentDataItemInterface(KexiDataItemInterface* tqparentDataItemInterface);
+ void setParentDataItemInterface(KexiDataItemInterface* parentDataItemInterface);
/*! \return a pointer to a Parent Data Item Interface.
@see setParentDataItemInterface() */
- inline KexiDataItemInterface* tqparentInterface() const { return m_parentDataItemInterface; }
+ inline KexiDataItemInterface* parentInterface() const { return m_parentDataItemInterface; }
/*! Handles action having standard name \a actionName.
Action could be: "edit_cut", "edit_paste", etc.
@@ -239,7 +239,7 @@ class KEXICORE_EXPORT KexiDataItemInterface
bool m_listenerIsTQObject;
TQVariant m_origValue;
- /*! @see tqparentDataItemInterface() */
+ /*! @see parentDataItemInterface() */
KexiDataItemInterface* m_parentDataItemInterface;
bool m_hasFocusableWidget : 1;
bool m_disable_signalValueChanged : 1;
diff --git a/kexi/core/kexidialogbase.cpp b/kexi/core/kexidialogbase.cpp
index 1469575b..01f20d8c 100644
--- a/kexi/core/kexidialogbase.cpp
+++ b/kexi/core/kexidialogbase.cpp
@@ -394,7 +394,7 @@ tristate KexiDialogBase::switchToViewMode( int newViewMode, TQMap<TQString,TQStr
addActionProxyChild( newView ); //new proxy child
m_stack->raiseWidget( newView );
newView->propertySetSwitched();
- m_parentWindow->tqinvalidateSharedActions( TQT_TQOBJECT(newView) );
+ m_parentWindow->invalidateSharedActions( TQT_TQOBJECT(newView) );
TQTimer::singleShot(10, newView, TQT_SLOT(setFocus())); //newView->setFocus(); //js ok?
// setFocus();
return true;
@@ -633,7 +633,7 @@ void KexiDialogBase::activate()
}
if (v)
v->updateActions(true);
-//js: not neeed?? m_parentWindow->tqinvalidateSharedActions(this);
+//js: not neeed?? m_parentWindow->invalidateSharedActions(this);
}
void KexiDialogBase::deactivate()
@@ -647,14 +647,14 @@ void KexiDialogBase::sendDetachedStateToCurrentView()
{
KexiViewBase *v = selectedView();
if (v)
- v->tqparentDialogDetached();
+ v->parentDialogDetached();
}
void KexiDialogBase::sendAttachedStateToCurrentView()
{
KexiViewBase *v = selectedView();
if (v)
- v->tqparentDialogAttached();
+ v->parentDialogAttached();
}
#include "kexidialogbase.moc"
diff --git a/kexi/core/kexidialogbase.h b/kexi/core/kexidialogbase.h
index 68c71236..6479ae5b 100644
--- a/kexi/core/kexidialogbase.h
+++ b/kexi/core/kexidialogbase.h
@@ -238,13 +238,13 @@ class KEXICORE_EXPORT KexiDialogBase :
tristate storeNewData();
/*! Reimplemented - we're informing the current view about performed detaching by calling
- KexiViewBase::tqparentDialogDetached(), so the view can react on this event
- (by default KexiViewBase::tqparentDialogDetached() does nothing, you can reimplement it). */
+ KexiViewBase::parentDialogDetached(), so the view can react on this event
+ (by default KexiViewBase::parentDialogDetached() does nothing, you can reimplement it). */
void sendDetachedStateToCurrentView();
/*! W're informing the current view about performed atttaching by calling
- KexiViewBase::tqparentDialogAttached(), so the view can react on this event
- (by default KexiViewBase::tqparentDialogAttached() does nothing, you can reimplement it). */
+ KexiViewBase::parentDialogAttached(), so the view can react on this event
+ (by default KexiViewBase::parentDialogAttached() does nothing, you can reimplement it). */
void sendAttachedStateToCurrentView();
signals:
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index b00cbc1b..a98ac5a6 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -44,7 +44,7 @@ void KexiSharedActionHostPrivate::slotAction(const TQString& act_id)
{
TQWidget *w = host->focusWindow(); //tqfocusWidget();
// while (w && !w->inherits("KexiDialogBase") && !w->inherits("KexiDockBase"))
-// w = w->tqparentWidget();
+// w = w->parentWidget();
KexiActionProxy *proxy = w ? actionProxies[ w ] : 0;
@@ -113,7 +113,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a
return; //sanity
TQWidget *fw = d->mainWin->tqfocusWidget();
while (fw && TQT_BASE_OBJECT(obj)!=TQT_BASE_OBJECT(fw))
- fw = fw->tqparentWidget();
+ fw = fw->parentWidget();
if (!fw)
return;
@@ -137,7 +137,7 @@ KMainWindow* KexiSharedActionHost::mainWindow() const
return d->mainWin;
}
-void KexiSharedActionHost::tqinvalidateSharedActions(TQObject *o)
+void KexiSharedActionHost::invalidateSharedActions(TQObject *o)
{
if (!d)
return;
@@ -208,7 +208,7 @@ TQWidget* KexiSharedActionHost::focusWindow()
fw = aw->tqfocusWidget();
}
while (fw && !acceptsSharedActions(TQT_TQOBJECT(fw)))
- fw = fw->tqparentWidget();
+ fw = fw->parentWidget();
return fw;
}
diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h
index 035ce352..235ca9b8 100644
--- a/kexi/core/kexisharedactionhost.h
+++ b/kexi/core/kexisharedactionhost.h
@@ -100,13 +100,13 @@ class KEXICORE_EXPORT KexiSharedActionHost
Otherwise the action is disabled.
If \a o is not KexiDialogBase or its child,
- actions are only tqinvalidated if these come from mainwindow's KActionCollection
+ actions are only invalidated if these come from mainwindow's KActionCollection
(thus part-actions are untouched when the focus is e.g. in the Property Editor.
Call this method when it is known that some actions need invalidation
(e.g. when new window is activated). See how it is used in KexiMainWindowImpl.
*/
- virtual void tqinvalidateSharedActions(TQObject *o);
+ virtual void invalidateSharedActions(TQObject *o);
void setActionAvailable(const char *action_name, bool avail);
diff --git a/kexi/core/kexiviewbase.cpp b/kexi/core/kexiviewbase.cpp
index d31a15fa..be201c9b 100644
--- a/kexi/core/kexiviewbase.cpp
+++ b/kexi/core/kexiviewbase.cpp
@@ -41,7 +41,7 @@ KexiViewBase::KexiViewBase(KexiMainWindow *mainWin, TQWidget *tqparent, const ch
, m_dirty(false)
{
TQWidget *wi=this;
- while ((wi = wi->tqparentWidget()) && !wi->inherits("KexiDialogBase"))
+ while ((wi = wi->parentWidget()) && !wi->inherits("KexiDialogBase"))
;
m_dialog = (wi && wi->inherits("KexiDialogBase")) ? static_cast<KexiDialogBase*>(wi) : 0;
if (m_dialog) {
@@ -74,7 +74,7 @@ tristate KexiViewBase::afterSwitchFrom(int /* mode */)
TQSize KexiViewBase::preferredSizeHint(const TQSize& otherSize)
{
- KexiDialogBase* dlg = tqparentDialog();
+ KexiDialogBase* dlg = parentDialog();
if (dlg && dlg->mdiParent()) {
TQRect r = dlg->mdiParent()->mdiAreaContentsRect();
return otherSize.boundedTo( TQSize(
@@ -103,14 +103,14 @@ KoProperty::Set *KexiViewBase::propertySet()
void KexiViewBase::propertySetSwitched()
{
- if (tqparentDialog())
- m_mainWin->propertySetSwitched( tqparentDialog(), false );
+ if (parentDialog())
+ m_mainWin->propertySetSwitched( parentDialog(), false );
}
void KexiViewBase::propertySetReloaded(bool preservePrevSelection, const TQCString& propertyToSelect)
{
- if (tqparentDialog())
- m_mainWin->propertySetSwitched( tqparentDialog(), true, preservePrevSelection, propertyToSelect );
+ if (parentDialog())
+ m_mainWin->propertySetSwitched( parentDialog(), true, preservePrevSelection, propertyToSelect );
}
void KexiViewBase::setDirty(bool set)
@@ -240,7 +240,7 @@ bool KexiViewBase::eventFilter( TQObject *o, TQEvent *e )
if (e->type()==TQEvent::FocusIn && m_actionProxyParent) {
m_actionProxyParent->m_focusedChild = this;
}
-// m_mainWin->tqinvalidateSharedActions(this);
+// m_mainWin->invalidateSharedActions(this);
}
}
return false;
@@ -286,7 +286,7 @@ void KexiViewBase::setFocus()
else
setFocusInternal();
}
- m_mainWin->tqinvalidateSharedActions(TQT_TQOBJECT(this));
+ m_mainWin->invalidateSharedActions(TQT_TQOBJECT(this));
}
KAction* KexiViewBase::sharedAction( const char *action_name )
diff --git a/kexi/core/kexiviewbase.h b/kexi/core/kexiviewbase.h
index 24f5d8ad..60beadf8 100644
--- a/kexi/core/kexiviewbase.h
+++ b/kexi/core/kexiviewbase.h
@@ -62,11 +62,11 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
inline KexiMainWindow *mainWin() const { return m_mainWin; }
//! \return tqparent KexiDialogBase that contains this view, or 0 if no dialog contain this view
- KexiDialogBase* tqparentDialog() const { return m_dialog; }
+ KexiDialogBase* parentDialog() const { return m_dialog; }
/*! Added for convenience.
\return KexiPart object that was used to create this view (with a dialog)
- or 0 if this view is not created using KexiPart. \sa tqparentDialog() */
+ or 0 if this view is not created using KexiPart. \sa parentDialog() */
KexiPart::Part* part() const;
/*! \return preferred size hint, that can be used to resize the view.
@@ -237,13 +237,13 @@ class KEXICORE_EXPORT KexiViewBase : public TQWidget, public KexiActionProxy
- it is called by KexiDialogBase::youAreDetached().
Default implementation does nothing.
Implement it if you want to perform some appropriate actions. */
- virtual void tqparentDialogDetached() {};
+ virtual void parentDialogDetached() {};
/*! Allows to react on tqparent dialog's attaching (only for KMDI's ChildFrame mode)
- it is called by KexiDialogBase::youAreAttached().
Default implementation does nothing.
Implement it if you want to perform some appropriate actions. */
- virtual void tqparentDialogAttached() {};
+ virtual void parentDialogAttached() {};
TQString m_defaultIconName;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 11:19:12 +0000