diff options
Diffstat (limited to 'kexi/widget/tableview')
32 files changed, 72 insertions, 72 deletions
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index dbf95ad6..7ad76c34 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -80,8 +80,8 @@ public: //====================================================== -KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqparent) - : KexiTableEdit(column, tqparent) +KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *parent) + : KexiTableEdit(column, parent) , d ( new Private() ) { setName("KexiBlobTableEdit"); @@ -490,8 +490,8 @@ public: TQCache<TQPixmap> pixmapCache; }; -KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *tqparent) - : KexiTableEdit(column, tqparent) +KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent) + : KexiTableEdit(column, parent) , d( new Private() ) { setName("KexiKIconTableEdit"); diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h index fb64c21d..77a211d2 100644 --- a/kexi/widget/tableview/kexiblobtableedit.h +++ b/kexi/widget/tableview/kexiblobtableedit.h @@ -38,7 +38,7 @@ class KexiBlobTableEdit : public KexiTableEdit Q_OBJECT TQ_OBJECT public: - KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0); + KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); virtual ~KexiBlobTableEdit(); bool valueIsNull(); @@ -129,7 +129,7 @@ KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem) class KexiKIconTableEdit : public KexiTableEdit { public: - KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0); + KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); virtual ~KexiKIconTableEdit(); diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp index a9220ea8..8f199b5d 100644 --- a/kexi/widget/tableview/kexibooltableedit.cpp +++ b/kexi/widget/tableview/kexibooltableedit.cpp @@ -31,8 +31,8 @@ #include <kglobalsettings.h> -KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *tqparent) - : KexiTableEdit(column, tqparent) +KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent) + : KexiTableEdit(column, parent) { setName("KexiBoolTableEdit"); kdDebug() << "KexiBoolTableEdit: m_origValue.typeName()==" << m_origValue.typeName() << endl; diff --git a/kexi/widget/tableview/kexibooltableedit.h b/kexi/widget/tableview/kexibooltableedit.h index 3fc87d58..4f4ebad5 100644 --- a/kexi/widget/tableview/kexibooltableedit.h +++ b/kexi/widget/tableview/kexibooltableedit.h @@ -33,7 +33,7 @@ class KexiBoolTableEdit : public KexiTableEdit TQ_OBJECT public: - KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0); + KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); virtual ~KexiBoolTableEdit(); diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp index a2c79a88..9cfcfe27 100644 --- a/kexi/widget/tableview/kexicelleditorfactory.cpp +++ b/kexi/widget/tableview/kexicelleditorfactory.cpp @@ -146,7 +146,7 @@ static bool hasEnumType( const KexiTableViewColumn &column ) return true; } -KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, TQWidget* tqparent) +KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, TQWidget* parent) { init(); KexiDB::Field *realField; @@ -187,7 +187,7 @@ KexiTableEdit* KexiCellEditorFactory::createEditor(KexiTableViewColumn &column, } #endif - return item->createEditor(column, tqparent); + return item->createEditor(column, parent); } KexiCellEditorFactoryItem* KexiCellEditorFactory::item( uint type, const TQString& subType ) diff --git a/kexi/widget/tableview/kexicelleditorfactory.h b/kexi/widget/tableview/kexicelleditorfactory.h index 26b48bb6..06795ac0 100644 --- a/kexi/widget/tableview/kexicelleditorfactory.h +++ b/kexi/widget/tableview/kexicelleditorfactory.h @@ -51,10 +51,10 @@ class KEXIDATATABLE_EXPORT KexiCellEditorFactory If still no item found, the default is tried. Eventually, may return NULL. */ static KexiCellEditorFactoryItem* item( uint type, const TQString& subType = TQString() ); -// static KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* tqparent = 0); - /*! Creates a new editor for \a column. If \a tqparent is of TQScrollView, the new editor - will be created inside tqparent->viewport() instead. */ - static KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0); +// static KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* parent = 0); + /*! Creates a new editor for \a column. If \a parent is of TQScrollView, the new editor + will be created inside parent->viewport() instead. */ + static KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0); protected: static void init(); @@ -69,8 +69,8 @@ class KEXIDATATABLE_EXPORT KexiCellEditorFactoryItem TQString className() { return m_className; } protected: -// virtual KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* tqparent = 0) = 0; - virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0) = 0; +// virtual KexiTableEdit* createEditor(KexiDB::Field &f, TQScrollView* parent = 0) = 0; + virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0) = 0; TQString m_className; friend class KexiCellEditorFactory; diff --git a/kexi/widget/tableview/kexicomboboxbase.h b/kexi/widget/tableview/kexicomboboxbase.h index f36dd822..17b12072 100644 --- a/kexi/widget/tableview/kexicomboboxbase.h +++ b/kexi/widget/tableview/kexicomboboxbase.h @@ -122,7 +122,7 @@ class KEXIDATATABLE_EXPORT KexiComboBoxBase //! Implement this as signal virtual void acceptRequested() = 0; - //! Implement this to return a position \a pos mapped from tqparent (e.g. viewport) + //! Implement this to return a position \a pos mapped from parent (e.g. viewport) //! to global coordinates. TQPoint(-1, -1) should be returned if this cannot be computed. virtual TQPoint mapFromParentToGlobal(const TQPoint& pos) const = 0; diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp index 4fe8b940..6a2feec8 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.cpp +++ b/kexi/widget/tableview/kexicomboboxpopup.cpp @@ -38,8 +38,8 @@ class KexiComboBoxPopup_KexiTableView : public KexiDataTableView { public: - KexiComboBoxPopup_KexiTableView(TQWidget* tqparent=0) - : KexiDataTableView(tqparent, "KexiComboBoxPopup_tv") + KexiComboBoxPopup_KexiTableView(TQWidget* parent=0) + : KexiDataTableView(parent, "KexiComboBoxPopup_tv") { init(); } @@ -103,16 +103,16 @@ class KexiComboBoxPopupPrivate const int KexiComboBoxPopup::defaultMaxRows = 8; -KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* tqparent, KexiTableViewColumn &column) - : TQFrame( tqparent, "KexiComboBoxPopup", WType_Popup ) +KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* parent, KexiTableViewColumn &column) + : TQFrame( parent, "KexiComboBoxPopup", WType_Popup ) { init(); //setup tv data setData(&column, 0); } -KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* tqparent, KexiDB::Field &field) - : TQFrame( tqparent, "KexiComboBoxPopup", WType_Popup ) +KexiComboBoxPopup::KexiComboBoxPopup(TQWidget* parent, KexiDB::Field &field) + : TQFrame( parent, "KexiComboBoxPopup", WType_Popup ) { init(); //setup tv data diff --git a/kexi/widget/tableview/kexicomboboxpopup.h b/kexi/widget/tableview/kexicomboboxpopup.h index d78955b2..876be9bc 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.h +++ b/kexi/widget/tableview/kexicomboboxpopup.h @@ -42,10 +42,10 @@ class KexiComboBoxPopup : public TQFrame If the column is lookup column, it's definition is used to display one or more column within the popup. Otherwise column.field() is used to display single-column data. */ - KexiComboBoxPopup(TQWidget* tqparent, KexiTableViewColumn &column); + KexiComboBoxPopup(TQWidget* parent, KexiTableViewColumn &column); /*! Alternative constructor supporting lookup fields and enum hints. */ - KexiComboBoxPopup(TQWidget* tqparent, KexiDB::Field &field); + KexiComboBoxPopup(TQWidget* parent, KexiDB::Field &field); virtual ~KexiComboBoxPopup(); diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 8b803746..3ae97974 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -61,8 +61,8 @@ public: //====================================================== -KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *tqparent) - : KexiInputTableEdit(column, tqparent) +KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *parent) + : KexiInputTableEdit(column, parent) , KexiComboBoxBase() , d(new Private()) { diff --git a/kexi/widget/tableview/kexicomboboxtableedit.h b/kexi/widget/tableview/kexicomboboxtableedit.h index 7b8a7339..55d128c3 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.h +++ b/kexi/widget/tableview/kexicomboboxtableedit.h @@ -40,7 +40,7 @@ class KexiComboBoxTableEdit : public KexiInputTableEdit, public KexiComboBoxBase TQ_OBJECT public: - KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0); + KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); virtual ~KexiComboBoxTableEdit(); //! Implemented for KexiComboBoxBase diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp index 5668fbfd..257cf0aa 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.cpp +++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp @@ -111,8 +111,8 @@ void KexiDataAwarePropertySet::insert(uint row, KoProperty::Set* set, bool newOn kexiwarn << "KexiDataAwarePropertySet::insert() invalid args: rew="<< row<< " propertyset="<< set<< endl; return; } - if (set->tqparent() && set->tqparent()!=this) { - kexiwarn << "KexiDataAwarePropertySet::insert() propertyset's tqparent must be NULL or this KexiDataAwarePropertySet" << endl; + if (set->parent() && set->parent()!=this) { + kexiwarn << "KexiDataAwarePropertySet::insert() propertyset's parent must be NULL or this KexiDataAwarePropertySet" << endl; return; } diff --git a/kexi/widget/tableview/kexidataawarepropertyset.h b/kexi/widget/tableview/kexidataawarepropertyset.h index 8d6212c4..e24fbd8a 100644 --- a/kexi/widget/tableview/kexidataawarepropertyset.h +++ b/kexi/widget/tableview/kexidataawarepropertyset.h @@ -107,7 +107,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwarePropertySet : public TQObject The property set \a set will be owned by this object, so you should not delete this property set by hand but call removeCurrentPropertySet() or remove(uint) instead. - Note that property set's tqparent (TQObject::tqparent()) must be null + Note that property set's parent (TQObject::parent()) must be null or qual to this KexiDataAwarePropertySet object, otherwise this method will fail with a warning. */ diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp index 7d7dbde6..a132e829 100644 --- a/kexi/widget/tableview/kexidatatableview.cpp +++ b/kexi/widget/tableview/kexidatatableview.cpp @@ -33,14 +33,14 @@ #include "kexidatatableview.h" -KexiDataTableView::KexiDataTableView(TQWidget *tqparent, const char *name) - : KexiTableView(0, tqparent, name) +KexiDataTableView::KexiDataTableView(TQWidget *parent, const char *name) + : KexiTableView(0, parent, name) { init(); } -KexiDataTableView::KexiDataTableView(TQWidget *tqparent, const char *name, KexiDB::Cursor *cursor) - : KexiTableView(0, tqparent, name) +KexiDataTableView::KexiDataTableView(TQWidget *parent, const char *name, KexiDB::Cursor *cursor) + : KexiTableView(0, parent, name) { init(); setData(cursor); diff --git a/kexi/widget/tableview/kexidatatableview.h b/kexi/widget/tableview/kexidatatableview.h index 7835289f..000762f2 100644 --- a/kexi/widget/tableview/kexidatatableview.h +++ b/kexi/widget/tableview/kexidatatableview.h @@ -44,7 +44,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView /** * creates a blank widget */ - KexiDataTableView(TQWidget *tqparent, const char *name =0); + KexiDataTableView(TQWidget *parent, const char *name =0); /*! Creates a table widget and fills it using data from \a cursor. Cursor will be opened (with open()) if it is not yet opened. @@ -52,7 +52,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView and Connection::executeQuery()), otherwise the table view remain not filled with data. Cursor \a cursor will not be owned by this object. */ - KexiDataTableView(TQWidget *tqparent, const char *name, KexiDB::Cursor *cursor); + KexiDataTableView(TQWidget *parent, const char *name, KexiDB::Cursor *cursor); ~KexiDataTableView(); diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index a0b5185e..b68b4787 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -48,8 +48,8 @@ #include <kexiutils/utils.h> -KexiDateTableEdit::KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *tqparent) - : KexiInputTableEdit(column, tqparent) +KexiDateTableEdit::KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *parent) + : KexiInputTableEdit(column, parent) { setName("KexiDateTableEdit"); @@ -225,7 +225,7 @@ bool KexiDateTableEdit::eventFilter( TQObject *o, TQEvent *e ) } } #ifdef TQ_WS_WIN //tmp - else if (e->type()==TQEvent::FocusIn && o->tqparent() && o->tqparent()->tqparent()==m_edit + else if (e->type()==TQEvent::FocusIn && o->parent() && o->parent()->parent()==m_edit && m_setNumberOnFocus >= 0 && m_dte_date_obj) { // there was a number character passed as 'add' parameter in init(): diff --git a/kexi/widget/tableview/kexidatetableedit.h b/kexi/widget/tableview/kexidatetableedit.h index aad46c4b..2346dfd1 100644 --- a/kexi/widget/tableview/kexidatetableedit.h +++ b/kexi/widget/tableview/kexidatetableedit.h @@ -37,7 +37,7 @@ class KexiDateTableEdit : public KexiInputTableEdit TQ_OBJECT public: - KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0); + KexiDateTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); virtual ~KexiDateTableEdit(); virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, TQString &txt, int &align, int &x, int &y_offset, int &w, int &h ); diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp index 46f687f0..35c599cc 100644 --- a/kexi/widget/tableview/kexidatetimetableedit.cpp +++ b/kexi/widget/tableview/kexidatetimetableedit.cpp @@ -47,8 +47,8 @@ #include <kexiutils/utils.h> -KexiDateTimeTableEdit::KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent) - : KexiInputTableEdit(column, tqparent) +KexiDateTimeTableEdit::KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent) + : KexiInputTableEdit(column, parent) { setName("KexiDateTimeTableEdit"); diff --git a/kexi/widget/tableview/kexidatetimetableedit.h b/kexi/widget/tableview/kexidatetimetableedit.h index 6fb88a67..0e12fa84 100644 --- a/kexi/widget/tableview/kexidatetimetableedit.h +++ b/kexi/widget/tableview/kexidatetimetableedit.h @@ -37,7 +37,7 @@ class KexiDateTimeTableEdit : public KexiInputTableEdit TQ_OBJECT public: - KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0); + KexiDateTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); virtual ~KexiDateTimeTableEdit(); virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, TQString &txt, int &align, int &x, int &y_offset, int &w, int &h ); diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp index 575ae1e6..1b834fe9 100644 --- a/kexi/widget/tableview/kexiinputtableedit.cpp +++ b/kexi/widget/tableview/kexiinputtableedit.cpp @@ -43,7 +43,7 @@ class MyLineEdit : public KLineEdit { public: - MyLineEdit(TQWidget *tqparent, const char *name) : KLineEdit(tqparent,name) + MyLineEdit(TQWidget *parent, const char *name) : KLineEdit(parent,name) {} protected: virtual void drawFrame ( TQPainter * p ) { @@ -60,8 +60,8 @@ class MyLineEdit : public KLineEdit //====================================================== -KexiInputTableEdit::KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *tqparent) - : KexiTableEdit(column, tqparent) +KexiInputTableEdit::KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *parent) + : KexiTableEdit(column, parent) { setName("KexiInputTableEdit"); // m_type = f.type(); //copied because the rest of code uses m_type diff --git a/kexi/widget/tableview/kexiinputtableedit.h b/kexi/widget/tableview/kexiinputtableedit.h index 3b4cf015..89e64264 100644 --- a/kexi/widget/tableview/kexiinputtableedit.h +++ b/kexi/widget/tableview/kexiinputtableedit.h @@ -36,7 +36,7 @@ class KEXIDATATABLE_EXPORT KexiInputTableEdit : public KexiTableEdit TQ_OBJECT public: - KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0); + KexiInputTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); virtual ~KexiInputTableEdit(); diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp index fd4870fb..e531b814 100644 --- a/kexi/widget/tableview/kexitableedit.cpp +++ b/kexi/widget/tableview/kexitableedit.cpp @@ -30,12 +30,12 @@ #include <klocale.h> #include <kdebug.h> -KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* tqparent) -: TQWidget(dynamic_cast<TQScrollView*>(tqparent) ? dynamic_cast<TQScrollView*>(tqparent)->viewport() : tqparent) +KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent) +: TQWidget(dynamic_cast<TQScrollView*>(parent) ? dynamic_cast<TQScrollView*>(parent)->viewport() : parent) ,m_column(&column) // ,m_field(&f) // ,m_type(f.type()) //copied because the rest of code uses m_type - ,m_scrollView(dynamic_cast<TQScrollView*>(tqparent)) + ,m_scrollView(dynamic_cast<TQScrollView*>(parent)) ,m_usesSelectedTextColor(true) ,m_view(0) // ,m_hasFocusableWidget(true) diff --git a/kexi/widget/tableview/kexitableedit.h b/kexi/widget/tableview/kexitableedit.h index ef618178..4630757c 100644 --- a/kexi/widget/tableview/kexitableedit.h +++ b/kexi/widget/tableview/kexitableedit.h @@ -42,7 +42,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI TQ_OBJECT public: - KexiTableEdit(KexiTableViewColumn &column, TQWidget* tqparent = 0); + KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent = 0); virtual ~KexiTableEdit(); @@ -184,7 +184,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI for the editor, its events will be filtered, it will be resized when neede, and so on. */ void setViewWidget(TQWidget *v); - /*! Moves child widget within the viewport if the tqparent is scrollview (otherwise does nothing). + /*! Moves child widget within the viewport if the parent is scrollview (otherwise does nothing). Use this for child widgets that are outside of this editor widget, instead of calling TQWidget::move(). */ void moveChild( TQWidget * child, int x, int y ); @@ -195,7 +195,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI KexiTableViewColumn *m_column; int m_leftMargin; int m_rightMargin, m_rightMarginWhenFocused; - TQScrollView* m_scrollView; //!< may be 0 if the tqparent is not a scrollview + TQScrollView* m_scrollView; //!< may be 0 if the parent is not a scrollview bool m_usesSelectedTextColor : 1; //!< set in ctor, @see usesSelectedTextColor() private: @@ -211,7 +211,7 @@ class KEXIDATATABLE_EXPORT KexiTableEdit : public TQWidget, public KexiDataItemI virtual ~factoryclassname(); \ \ protected: \ - virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* tqparent = 0); \ + virtual KexiTableEdit* createEditor(KexiTableViewColumn &column, TQWidget* parent = 0); \ }; //! Implementation of cell editor factory @@ -226,9 +226,9 @@ factoryclassname::~factoryclassname() \ {} \ \ KexiTableEdit* factoryclassname::createEditor( \ - KexiTableViewColumn &column, TQWidget* tqparent) \ + KexiTableViewColumn &column, TQWidget* parent) \ { \ - return new itemclassname(column, tqparent); \ + return new itemclassname(column, parent); \ } #endif diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index d164f68a..4ed993cd 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -174,8 +174,8 @@ void KexiTableViewCellToolTip::maybeTip( const TQPoint & p ) //----------------------------------------- -KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* tqparent, const char* name) -: TQScrollView(tqparent, name, /*TQt::WRepaintNoErase | */TQt::WStaticContents /*| TQt::WResizeNoErase*/) +KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const char* name) +: TQScrollView(parent, name, /*TQt::WRepaintNoErase | */TQt::WStaticContents /*| TQt::WResizeNoErase*/) , KexiRecordNavigatorHandler() , KexiSharedActionClient() , KexiDataAwareObjectInterface() diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h index 6c03215b..9cfcf47e 100644 --- a/kexi/widget/tableview/kexitableview.h +++ b/kexi/widget/tableview/kexitableview.h @@ -149,7 +149,7 @@ public: TQColor rowMouseOverAlternateHighlightingColor; }; - KexiTableView(KexiTableViewData* data=0, TQWidget* tqparent=0, const char* name=0); + KexiTableView(KexiTableViewData* data=0, TQWidget* parent=0, const char* name=0); virtual ~KexiTableView(); /*! \return current appearance settings */ diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp index 1fb65c6a..5905706b 100644 --- a/kexi/widget/tableview/kexitableviewdata.cpp +++ b/kexi/widget/tableview/kexitableviewdata.cpp @@ -122,7 +122,7 @@ KexiTableViewColumn::KexiTableViewColumn( } init(); //setup column's readonly flag: true, if - // - it's not from tqparent table's field, or + // - it's not from parent table's field, or // - if the query itself is coming from read-only connection, or // - if the query itself is stored (i.e. has connection) and lookup column is defined const bool columnFromMasterTable = query.masterTable()==columnInfo->field->table(); @@ -168,7 +168,7 @@ void KexiTableViewColumn::init() void KexiTableViewColumn::setValidator( KexiUtils::Validator* v ) { if (m_validator) {//remove old one - if (!m_validator->tqparent()) //destroy if has no tqparent + if (!m_validator->parent()) //destroy if has no parent delete m_validator; } m_validator = v; diff --git a/kexi/widget/tableview/kexitableviewdata.h b/kexi/widget/tableview/kexitableviewdata.h index dec81f95..7263f3fe 100644 --- a/kexi/widget/tableview/kexitableviewdata.h +++ b/kexi/widget/tableview/kexitableviewdata.h @@ -85,7 +85,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewColumn { /*! \return true if the column is read-only For db-aware column this can depend on whether the column - is in tqparent table of this query. \sa setReadOnly() */ + is in parent table of this query. \sa setReadOnly() */ bool isReadOnly() const; //TODO: synchronize this with table view: @@ -123,7 +123,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewColumn { inline TQString captionAliasOrName() const { return m_captionAliasOrName; } /*! Assigns validator \a v for this column. - If the validator has no tqparent object, it will be owned by the column, + If the validator has no parent object, it will be owned by the column, so you shouldn't care about destroying it. */ void setValidator( KexiUtils::Validator* v ); diff --git a/kexi/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp index f6a839e3..4a00be38 100644 --- a/kexi/widget/tableview/kexitableviewheader.cpp +++ b/kexi/widget/tableview/kexitableviewheader.cpp @@ -58,8 +58,8 @@ class KexiTableViewHeaderStyle : public KexiUtils::StyleProxy TQColor m_backgroundColor; }; -KexiTableViewHeader::KexiTableViewHeader(TQWidget * tqparent, const char * name) - : TQHeader(tqparent, name) +KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name) + : TQHeader(parent, name) , m_lastToolTipSection(-1) , m_selectionBackgroundColor(tqApp->tqpalette().active().highlight()) , m_selectedSection(-1) diff --git a/kexi/widget/tableview/kexitableviewheader.h b/kexi/widget/tableview/kexitableviewheader.h index efc35055..eae13a71 100644 --- a/kexi/widget/tableview/kexitableviewheader.h +++ b/kexi/widget/tableview/kexitableviewheader.h @@ -36,7 +36,7 @@ class KEXIDATATABLE_EXPORT KexiTableViewHeader : public TQHeader TQ_OBJECT public: - KexiTableViewHeader(TQWidget * tqparent = 0, const char * name = 0); + KexiTableViewHeader(TQWidget * parent = 0, const char * name = 0); virtual ~KexiTableViewHeader(); diff --git a/kexi/widget/tableview/kexitextformatter.h b/kexi/widget/tableview/kexitextformatter.h index 12e67a37..9ec87656 100644 --- a/kexi/widget/tableview/kexitextformatter.h +++ b/kexi/widget/tableview/kexitextformatter.h @@ -53,7 +53,7 @@ class KEXIDATATABLE_EXPORT KexiTextFormatter A field schema set using setField() is used to perform the calculation. */ bool valueIsValid(const TQString& text) const; - /*! \return input tqmask for intering values related to a field schema + /*! \return input mask for intering values related to a field schema which has been set using setField(). */ TQString inputMask() const; diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp index 5f3313f7..8110716b 100644 --- a/kexi/widget/tableview/kexitimetableedit.cpp +++ b/kexi/widget/tableview/kexitimetableedit.cpp @@ -45,8 +45,8 @@ #include <kexiutils/utils.h> -KexiTimeTableEdit::KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent) - : KexiInputTableEdit(column, tqparent) +KexiTimeTableEdit::KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent) + : KexiInputTableEdit(column, parent) { setName("KexiTimeTableEdit"); diff --git a/kexi/widget/tableview/kexitimetableedit.h b/kexi/widget/tableview/kexitimetableedit.h index 6c427bbd..0231a9bf 100644 --- a/kexi/widget/tableview/kexitimetableedit.h +++ b/kexi/widget/tableview/kexitimetableedit.h @@ -35,7 +35,7 @@ class KexiTimeTableEdit : public KexiInputTableEdit TQ_OBJECT public: - KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *tqparent=0); + KexiTimeTableEdit(KexiTableViewColumn &column, TQWidget *parent=0); virtual ~KexiTimeTableEdit(); virtual void setupContents( TQPainter *p, bool focused, const TQVariant& val, TQString &txt, int &align, int &x, int &y_offset, int &w, int &h ); |