diff options
Diffstat (limited to 'kexi/widget')
108 files changed, 308 insertions, 308 deletions
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 0f8b5e02..4c279382 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -68,8 +68,8 @@ KexiBrowserView::KexiBrowserView(KexiMainWindow *mainWin) setFocusProxy(m_browser); }*/ -KexiBrowser::KexiBrowser(TQWidget* tqparent, KexiMainWindow *mainWin, int features) - : TQWidget(tqparent, "KexiBrowser") +KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features) + : TQWidget(parent, "KexiBrowser") , m_mainWin(mainWin) , m_features(features) , m_actions( new KActionCollection(this) ) @@ -370,18 +370,18 @@ KexiBrowserItem *KexiBrowser::addGroup(KexiPart::Info& info) KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item) { //part object for this item - KexiBrowserItem *tqparent = item.mimeType().isEmpty() ? 0 : m_baseItems.find(item.mimeType().lower()); - return addItem(item, tqparent, tqparent->info()); + KexiBrowserItem *parent = item.mimeType().isEmpty() ? 0 : m_baseItems.find(item.mimeType().lower()); + return addItem(item, parent, parent->info()); } -KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item, KexiBrowserItem *tqparent, KexiPart::Info* info) +KexiBrowserItem* KexiBrowser::addItem(KexiPart::Item& item, KexiBrowserItem *parent, KexiPart::Info* info) { -// if (!tqparent) //TODO: add "Other" part group for that +// if (!parent) //TODO: add "Other" part group for that // return 0; -// kdDebug() << "KexiBrowser::addItem() found tqparent:" << tqparent << endl; +// kdDebug() << "KexiBrowser::addItem() found parent:" << parent << endl; KexiBrowserItem *bitem; - if (tqparent) - bitem = new KexiBrowserItem(tqparent, info, &item); + if (parent) + bitem = new KexiBrowserItem(parent, info, &item); else bitem = new KexiBrowserItem(m_list, info, &item); m_normalItems.insert(item.identifier(), bitem); @@ -400,7 +400,7 @@ KexiBrowser::slotRemoveItem(const KexiPart::Item &item) TQListViewItem *new_item_to_select = 0; if (it==to_remove) {//compute item to select if current one will be removed new_item_to_select = it->itemBelow();//nearest item to select - if (!new_item_to_select || new_item_to_select->tqparent()!=it->tqparent()) { + if (!new_item_to_select || new_item_to_select->parent()!=it->parent()) { new_item_to_select = it->itemAbove(); } } @@ -421,7 +421,7 @@ KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQ pm = m_itemPopup; //update popup title TQString title_text = bit->text(0).stripWhiteSpace(); - KexiBrowserItem *par_it = static_cast<KexiBrowserItem*>(bit->tqparent()); + KexiBrowserItem *par_it = static_cast<KexiBrowserItem*>(bit->parent()); KexiPart::Part* par_part = 0; if (par_it && par_it->info() && ((par_part = Kexi::partManager().part(par_it->info()))) && !par_part->instanceCaption().isEmpty()) { //add part type name @@ -471,7 +471,7 @@ KexiBrowser::slotSelectionChanged(TQListViewItem* i) return; KexiPart::Part* part = Kexi::partManager().part(it->info()); if (!part) { - it = static_cast<KexiBrowserItem*>(it->tqparent()); + it = static_cast<KexiBrowserItem*>(it->parent()); if (it) { part = Kexi::partManager().part(it->info()); } @@ -710,7 +710,7 @@ void KexiBrowser::itemRenameDone() m_list->nameEndsWithAsterisk = false; } it->setText(0, txt); - it->tqparent()->sort(); + it->parent()->sort(); setFocus(); } @@ -852,8 +852,8 @@ void KexiBrowser::clear() } //-------------------------------------------- -KexiBrowserListView::KexiBrowserListView(TQWidget *tqparent) - : KListView(tqparent, "KexiBrowserListView") +KexiBrowserListView::KexiBrowserListView(TQWidget *parent) + : KListView(parent, "KexiBrowserListView") , nameEndsWithAsterisk(false) , enableExecuteArea(true) { diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h index df51197a..3f9347cb 100644 --- a/kexi/widget/kexibrowser.h +++ b/kexi/widget/kexibrowser.h @@ -63,13 +63,13 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget | SingleClickOpensItemOptionEnabled //!< the default }; - KexiBrowser(TQWidget* tqparent, KexiMainWindow *mainWin, int features = DefaultFeatures); + KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features = DefaultFeatures); virtual ~KexiBrowser(); /*! Sets project \a prj for this browser. If \a partManagerErrorMessages is not NULL it will be set to error message if there's a problem with loading any KexiPart. If \a itemsMimeType is empty (the default), items of all mime types are displayed, - items for only one mime type are displayed. In the latter case, no group (tqparent) + items for only one mime type are displayed. In the latter case, no group (parent) items are displayed. Previous items are removed. */ void setProject(KexiProject* prj, const TQString& itemsMimeType = TQString(), @@ -151,7 +151,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget protected: void itemRenameDone(); - KexiBrowserItem* addItem(KexiPart::Item& item, KexiBrowserItem *tqparent, KexiPart::Info* info); + KexiBrowserItem* addItem(KexiPart::Item& item, KexiBrowserItem *parent, KexiPart::Info* info); KexiMainWindow *m_mainWin; int m_features; diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h index 4459daab..d0cc5589 100644 --- a/kexi/widget/kexibrowser_p.h +++ b/kexi/widget/kexibrowser_p.h @@ -29,7 +29,7 @@ class KexiBrowserListView : public KListView Q_OBJECT TQ_OBJECT public: - KexiBrowserListView(TQWidget *tqparent); + KexiBrowserListView(TQWidget *parent); ~KexiBrowserListView(); virtual bool isExecuteArea( const TQPoint& point ); diff --git a/kexi/widget/kexibrowseritem.cpp b/kexi/widget/kexibrowseritem.cpp index 24f1d46c..99b80095 100644 --- a/kexi/widget/kexibrowseritem.cpp +++ b/kexi/widget/kexibrowseritem.cpp @@ -24,8 +24,8 @@ #include <kiconloader.h> #include <core/kexipartinfo.h> -KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i) - : KListViewItem(tqparent, i->groupName()) +KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i) + : KListViewItem(parent, i->groupName()) , m_info(i) , m_item(0) { @@ -36,8 +36,8 @@ KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i) m_fifoSorting = 1; //because this is top level item } -KexiBrowserItem::KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, KexiPart::Item *item) - : KListViewItem(tqparent, item->name()) +KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item) + : KListViewItem(parent, item->name()) , m_info(i) , m_item(item) { @@ -45,8 +45,8 @@ KexiBrowserItem::KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, Kex initItem(); } -KexiBrowserItem::KexiBrowserItem(KListView *tqparent, KexiPart::Info *i, KexiPart::Item *item) - : KListViewItem(tqparent, item->name()) +KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item) + : KListViewItem(parent, item->name()) , m_info(i) , m_item(item) { @@ -63,8 +63,8 @@ void KexiBrowserItem::initItem() m_fifoSorting = 0; int sortKey = 0; // set sorting key with FIFO order - if (tqparent()) { - sortKey = tqparent()->childCount(); + if (parent()) { + sortKey = parent()->childCount(); } else if (listView()) { sortKey = listView()->childCount(); } diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h index a46f5a8d..9138dafd 100644 --- a/kexi/widget/kexibrowseritem.h +++ b/kexi/widget/kexibrowseritem.h @@ -37,14 +37,14 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem { public: //! Creates group item for part \a i - KexiBrowserItem(KListView *tqparent, KexiPart::Info *i); + KexiBrowserItem(KListView *parent, KexiPart::Info *i); - //! Creates item for object \a item defined by part \a i for \a tqparent - KexiBrowserItem(KListViewItem *tqparent, KexiPart::Info *i, KexiPart::Item *item); + //! Creates item for object \a item defined by part \a i for \a parent + KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item); - //! Creates item for object \a item defined by part \a i, without tqparent + //! Creates item for object \a item defined by part \a i, without parent //! (used in a case when KexiBrowser::itemsMimeType() is not empty) - KexiBrowserItem(KListView *tqparent, KexiPart::Info *i, KexiPart::Item *item); + KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item); virtual ~KexiBrowserItem(); @@ -53,7 +53,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem //! \return part info; should not be null. KexiPart::Info *info() const { return m_info; } - //! \return part item. Can be null if the browser item is a "folder", i.e. a tqparent node. + //! \return part item. Can be null if the browser item is a "folder", i.e. a parent node. KexiPart::Item* item() const { return m_item; } protected: diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp index 1b66f6a8..ff277e7d 100644 --- a/kexi/widget/kexicharencodingcombobox.cpp +++ b/kexi/widget/kexicharencodingcombobox.cpp @@ -27,8 +27,8 @@ #include <kcharsets.h> KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( - TQWidget* tqparent, const TQString& selectedEncoding ) - : KComboBox( tqparent, "KexiCharacterEncodingComboBox" ) + TQWidget* parent, const TQString& selectedEncoding ) + : KComboBox( parent, "KexiCharacterEncodingComboBox" ) , m_defaultEncodingAdded(false) { TQString defaultEncoding(TQString::tqfromLatin1(KGlobal::locale()->encoding())); diff --git a/kexi/widget/kexicharencodingcombobox.h b/kexi/widget/kexicharencodingcombobox.h index fd147cec..eba25d6d 100644 --- a/kexi/widget/kexicharencodingcombobox.h +++ b/kexi/widget/kexicharencodingcombobox.h @@ -30,7 +30,7 @@ class KEXIEXTWIDGETS_EXPORT KexiCharacterEncodingComboBox : public KComboBox public: //! Constructs a new combobox. \a selectedEncoding can be provided to preselect encoding. //! If it is not provided, default encoding is selected for current system settings. - KexiCharacterEncodingComboBox( TQWidget* tqparent = 0, + KexiCharacterEncodingComboBox( TQWidget* parent = 0, const TQString& selectedEncoding = TQString() ); ~KexiCharacterEncodingComboBox(); diff --git a/kexi/widget/kexicustompropertyfactory.cpp b/kexi/widget/kexicustompropertyfactory.cpp index e89727d0..7936ddb1 100644 --- a/kexi/widget/kexicustompropertyfactory.cpp +++ b/kexi/widget/kexicustompropertyfactory.cpp @@ -29,8 +29,8 @@ using namespace KoProperty; class PixmapIdCustomProperty : public CustomProperty { public: - PixmapIdCustomProperty(Property *tqparent) - : CustomProperty(tqparent) { + PixmapIdCustomProperty(Property *parent) + : CustomProperty(parent) { } virtual ~PixmapIdCustomProperty() {}; virtual void setValue(const TQVariant &value, bool rememberOldValue) { @@ -47,8 +47,8 @@ class PixmapIdCustomProperty : public CustomProperty class IdentifierCustomProperty : public CustomProperty { public: - IdentifierCustomProperty(Property *tqparent) - : CustomProperty(tqparent) { + IdentifierCustomProperty(Property *parent) + : CustomProperty(parent) { } virtual ~IdentifierCustomProperty() {}; virtual void setValue(const TQVariant &value, bool rememberOldValue) @@ -66,8 +66,8 @@ class IdentifierCustomProperty : public CustomProperty //--------------- -KexiCustomPropertyFactory::KexiCustomPropertyFactory(TQObject* tqparent) -: CustomPropertyFactory(tqparent) +KexiCustomPropertyFactory::KexiCustomPropertyFactory(TQObject* parent) +: CustomPropertyFactory(parent) { } @@ -75,13 +75,13 @@ KexiCustomPropertyFactory::~KexiCustomPropertyFactory() { } -CustomProperty* KexiCustomPropertyFactory::createCustomProperty(Property *tqparent) +CustomProperty* KexiCustomPropertyFactory::createCustomProperty(Property *parent) { - const int type = tqparent->type(); + const int type = parent->type(); if (type==(int)KexiCustomPropertyFactory::PixmapId) - return new PixmapIdCustomProperty(tqparent); + return new PixmapIdCustomProperty(parent); else if (type==(int)KexiCustomPropertyFactory::Identifier) - return new IdentifierCustomProperty(tqparent); + return new IdentifierCustomProperty(parent); return 0; } diff --git a/kexi/widget/kexicustompropertyfactory.h b/kexi/widget/kexicustompropertyfactory.h index d1550947..58efe5df 100644 --- a/kexi/widget/kexicustompropertyfactory.h +++ b/kexi/widget/kexicustompropertyfactory.h @@ -35,10 +35,10 @@ class KEXIEXTWIDGETS_EXPORT KexiCustomPropertyFactory : public KoProperty::Custo //! Called once to register all propert and editor types provided by this factory. static void init(); - KexiCustomPropertyFactory(TQObject* tqparent); + KexiCustomPropertyFactory(TQObject* parent); virtual ~KexiCustomPropertyFactory(); - virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property *tqparent); + virtual KoProperty::CustomProperty* createCustomProperty(KoProperty::Property *parent); virtual KoProperty::Widget* createCustomWidget(KoProperty::Property *prop); }; diff --git a/kexi/widget/kexicustompropertyfactory_p.cpp b/kexi/widget/kexicustompropertyfactory_p.cpp index f5fbb90a..20e85b04 100644 --- a/kexi/widget/kexicustompropertyfactory_p.cpp +++ b/kexi/widget/kexicustompropertyfactory_p.cpp @@ -27,8 +27,8 @@ using namespace KoProperty; KexiImagePropertyEdit::KexiImagePropertyEdit( - Property *property, TQWidget *tqparent, const char *name) - : PixmapEdit(property, tqparent, name) + Property *property, TQWidget *parent, const char *name) + : PixmapEdit(property, parent, name) , m_id(0) { } @@ -79,8 +79,8 @@ void KexiImagePropertyEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, con //---------------------------------------------------------------- KexiIdentifierPropertyEdit::KexiIdentifierPropertyEdit( - Property *property, TQWidget *tqparent, const char *name) - : StringEdit(property, tqparent, name) + Property *property, TQWidget *parent, const char *name) + : StringEdit(property, parent, name) { m_edit->setValidator( new KexiUtils::IdentifierValidator(TQT_TQOBJECT(m_edit), "KexiIdentifierPropertyEdit Validator") ); diff --git a/kexi/widget/kexicustompropertyfactory_p.h b/kexi/widget/kexicustompropertyfactory_p.h index 49a4066b..792f424c 100644 --- a/kexi/widget/kexicustompropertyfactory_p.h +++ b/kexi/widget/kexicustompropertyfactory_p.h @@ -32,7 +32,7 @@ class KexiImagePropertyEdit : public KoProperty::PixmapEdit public: KexiImagePropertyEdit(KoProperty::Property *property, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); virtual ~KexiImagePropertyEdit(); virtual TQVariant value() const; @@ -61,7 +61,7 @@ class KexiIdentifierPropertyEdit : public KoProperty::StringEdit public: KexiIdentifierPropertyEdit(KoProperty::Property *property, - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); virtual ~KexiIdentifierPropertyEdit(); /*! Reimplemented: sets \a value but it is converted to identifier diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 13e308c8..113f8be4 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -27,8 +27,8 @@ #include <kpopupmenu.h> -KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name) - : KexiViewBase(mainWin, tqparent, name) +KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name) + : KexiViewBase(mainWin, parent, name) , KexiSearchAndReplaceViewInterface() , m_internalView(0) , m_actionClient(0) diff --git a/kexi/widget/kexidataawareview.h b/kexi/widget/kexidataawareview.h index 98124f5a..5cc76e97 100644 --- a/kexi/widget/kexidataawareview.h +++ b/kexi/widget/kexidataawareview.h @@ -45,7 +45,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDataAwareView : public KexiViewBase, TQ_OBJECT public: - KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0); + KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); TQWidget* mainWidget(); diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp index 0db52c9d..f830926f 100644 --- a/kexi/widget/kexidatasourcecombobox.cpp +++ b/kexi/widget/kexidatasourcecombobox.cpp @@ -69,8 +69,8 @@ class KexiDataSourceComboBox::Private //------------------------ -KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *tqparent, const char *name) - : KComboBox(true/*rw*/, tqparent, name) +KexiDataSourceComboBox::KexiDataSourceComboBox(TQWidget *parent, const char *name) + : KComboBox(true/*rw*/, parent, name) , d(new Private()) { setInsertionPolicy(NoInsertion); diff --git a/kexi/widget/kexidatasourcecombobox.h b/kexi/widget/kexidatasourcecombobox.h index 6f9f58ed..0ccb663a 100644 --- a/kexi/widget/kexidatasourcecombobox.h +++ b/kexi/widget/kexidatasourcecombobox.h @@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDataSourceComboBox : public KComboBox TQ_OBJECT public: - KexiDataSourceComboBox(TQWidget *tqparent, const char *name=0); + KexiDataSourceComboBox(TQWidget *parent, const char *name=0); ~KexiDataSourceComboBox(); //! \return global project that is used to retrieve schema informationm for this combo box. diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp index e0f2dd1b..09680b14 100644 --- a/kexi/widget/kexidatatable.cpp +++ b/kexi/widget/kexidatatable.cpp @@ -34,10 +34,10 @@ #include "kexidatatable.h" #include "kexidialogbase.h" -KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, +KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, const char *name, bool dbAware) -// : KexiViewBase(mainWin, tqparent, name) - : KexiDataAwareView( mainWin, tqparent, name ) +// : KexiViewBase(mainWin, parent, name) + : KexiDataAwareView( mainWin, parent, name ) { KexiTableView *view; if (dbAware) @@ -50,9 +50,9 @@ KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, KexiDataAwareView::init( view, view, view ); } -KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, +KexiDataTable::KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, KexiDB::Cursor *cursor, const char *name) - : KexiDataAwareView( mainWin, tqparent, name ) + : KexiDataAwareView( mainWin, parent, name ) { KexiTableView *view = new KexiDataTableView(this, "view", cursor); KexiDataAwareView::init( view, view, view ); diff --git a/kexi/widget/kexidatatable.h b/kexi/widget/kexidatatable.h index ccc5c6c3..1cf392e1 100644 --- a/kexi/widget/kexidatatable.h +++ b/kexi/widget/kexidatatable.h @@ -54,12 +54,12 @@ class KEXIEXTWIDGETS_EXPORT KexiDataTable : public KexiDataAwareView Otherwise, table will be not-db-aware, and KexiTableView is used internally. In the latter case, data can be set by calling tableView()->setData(KexiTableViewData* data). */ - KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0, + KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0, bool dbAware = true); /*! CTOR2: Creates db-aware, table view initialized with \a cursor. KexiDataTableView is used internally. */ - KexiDataTable(KexiMainWindow *mainWin, TQWidget *tqparent, + KexiDataTable(KexiMainWindow *mainWin, TQWidget *parent, KexiDB::Cursor *cursor, const char *name = 0); virtual ~KexiDataTable(); diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbconnectionwidget.cpp index a048e929..78b67c8d 100644 --- a/kexi/widget/kexidbconnectionwidget.cpp +++ b/kexi/widget/kexidbconnectionwidget.cpp @@ -65,8 +65,8 @@ class KexiDBConnectionWidget::Private //--------- -KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* tqparent, const char* name ) - : KexiDBConnectionWidgetBase( tqparent, name ) +KexiDBConnectionWidget::KexiDBConnectionWidget( TQWidget* parent, const char* name ) + : KexiDBConnectionWidgetBase( parent, name ) , d(new Private()) { iconLabel->setPixmap(DesktopIcon("network")); @@ -221,8 +221,8 @@ void KexiDBConnectionWidget::slotCBToggled(bool on) //----------- -KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* tqparent, const char* name ) - : KTabWidget( tqparent, name ) +KexiDBConnectionTabWidget::KexiDBConnectionTabWidget( TQWidget* parent, const char* name ) + : KTabWidget( parent, name ) { mainWidget = new KexiDBConnectionWidget( this, "mainWidget" ); mainWidget->tqlayout()->setMargin(KDialog::marginHint()); diff --git a/kexi/widget/kexidbconnectionwidget.h b/kexi/widget/kexidbconnectionwidget.h index 72c49c89..db9bef11 100644 --- a/kexi/widget/kexidbconnectionwidget.h +++ b/kexi/widget/kexidbconnectionwidget.h @@ -39,7 +39,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionWidget : public KexiDBConnectionWidg TQ_OBJECT public: - KexiDBConnectionWidget( TQWidget* tqparent = 0, const char* name = 0 ); + KexiDBConnectionWidget( TQWidget* parent = 0, const char* name = 0 ); virtual ~KexiDBConnectionWidget(); /*! Sets project data \a data. @@ -95,7 +95,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBConnectionTabWidget : public KTabWidget TQ_OBJECT public: - KexiDBConnectionTabWidget( TQWidget* tqparent = 0, const char* name = 0 ); + KexiDBConnectionTabWidget( TQWidget* parent = 0, const char* name = 0 ); virtual ~KexiDBConnectionTabWidget(); /*! Sets connection data \a data. diff --git a/kexi/widget/kexidbdrivercombobox.cpp b/kexi/widget/kexidbdrivercombobox.cpp index e083ac1c..e1719576 100644 --- a/kexi/widget/kexidbdrivercombobox.cpp +++ b/kexi/widget/kexidbdrivercombobox.cpp @@ -23,9 +23,9 @@ #include <kiconloader.h> -KexiDBDriverComboBox::KexiDBDriverComboBox(TQWidget* tqparent, const KexiDB::Driver::InfoMap& driversInfo, +KexiDBDriverComboBox::KexiDBDriverComboBox(TQWidget* parent, const KexiDB::Driver::InfoMap& driversInfo, Options options) - : KComboBox(tqparent, "KexiDBDriverComboBox") + : KComboBox(parent, "KexiDBDriverComboBox") { //retrieve list of drivers and sort it: file-based first, then server-based TQStringList captionsForFileBasedDrivers, captionsForServerBasedDrivers; diff --git a/kexi/widget/kexidbdrivercombobox.h b/kexi/widget/kexidbdrivercombobox.h index cdd18f76..31b4eb04 100644 --- a/kexi/widget/kexidbdrivercombobox.h +++ b/kexi/widget/kexidbdrivercombobox.h @@ -65,7 +65,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDBDriverComboBox : public KComboBox If \a includeFileBasedDrivers is set to false, then only those drivers that are for database servers (those which have X-Kexi-DriverType=Network in their .desktop file) are shown. */ - KexiDBDriverComboBox(TQWidget* tqparent, const KexiDB::Driver::InfoMap& driversInfo, + KexiDBDriverComboBox(TQWidget* parent, const KexiDB::Driver::InfoMap& driversInfo, Options options = ShowAll ); ~KexiDBDriverComboBox(); diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index ca2480f6..b07dc997 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -30,10 +30,10 @@ #include "kexidatasourcewizard.h" #include "kexidswelcome.h" -KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *tqparent) - : TQWidget(tqparent) +KexiDSWelcome::KexiDSWelcome(KexiDataSourceWizard *parent) + : TQWidget(parent) { - m_wiz = tqparent; + m_wiz = parent; KexiDSPixmap *pic = new KexiDSPixmap(this); TQLabel *lText = new TQLabel(i18n("Kexi can help you with creation of %2 using data sources in almost no time with the \"%1 Wizard\""), this); diff --git a/kexi/widget/kexidswelcome.h b/kexi/widget/kexidswelcome.h index dc7cbd14..978beaad 100644 --- a/kexi/widget/kexidswelcome.h +++ b/kexi/widget/kexidswelcome.h @@ -35,7 +35,7 @@ class KEXIEXTWIDGETS_EXPORT KexiDSWelcome : public TQWidget TQ_OBJECT public: - KexiDSWelcome(KexiDataSourceWizard *tqparent); + KexiDSWelcome(KexiDataSourceWizard *parent); ~KexiDSWelcome(); protected slots: diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index f45faaa1..07627f32 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -81,8 +81,8 @@ class KexiEditorPrivate { #endif }; -KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name) - : KexiViewBase(mainWin, tqparent, name) +KexiEditor::KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name) + : KexiViewBase(mainWin, parent, name) , d(new KexiEditorPrivate()) { TQVBoxLayout *tqlayout = new TQVBoxLayout(this); diff --git a/kexi/widget/kexieditor.h b/kexi/widget/kexieditor.h index 022b0dd9..2c659f01 100644 --- a/kexi/widget/kexieditor.h +++ b/kexi/widget/kexieditor.h @@ -48,12 +48,12 @@ class KEXIEXTWIDGETS_EXPORT KexiEditor : public KexiViewBase * * \param mainWin The \a KexiMainWindow instance this KexiEditor * belongs too. - * \param tqparent The tqparent \a TQWidget this KexiEditor is child + * \param parent The parent \a TQWidget this KexiEditor is child * of. You don't need to free the KexiEditor cause TQt * will handle that for us. * \param name The name this KexiEditor has. Used only for debugging. */ - KexiEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0); + KexiEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); /** * Destructor. diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index 0439a178..e1afd1f8 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -70,8 +70,8 @@ class KexiFieldComboBox::Private //------------------------ -KexiFieldComboBox::KexiFieldComboBox(TQWidget *tqparent, const char *name) - : KComboBox(true/*rw*/, tqparent, name) +KexiFieldComboBox::KexiFieldComboBox(TQWidget *parent, const char *name) + : KComboBox(true/*rw*/, parent, name) , d(new Private()) { setInsertionPolicy(NoInsertion); diff --git a/kexi/widget/kexifieldcombobox.h b/kexi/widget/kexifieldcombobox.h index 9619f407..8785b73b 100644 --- a/kexi/widget/kexifieldcombobox.h +++ b/kexi/widget/kexifieldcombobox.h @@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldComboBox : public KComboBox TQ_OBJECT public: - KexiFieldComboBox(TQWidget *tqparent, const char *name = 0); + KexiFieldComboBox(TQWidget *parent, const char *name = 0); virtual ~KexiFieldComboBox(); // /*! Sets table or query schema \a schema. diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index e9796abf..521b1ce3 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -42,8 +42,8 @@ #include <kexidragobjects.h> #include <kexiutils/utils.h> -KexiFieldListView::KexiFieldListView(TQWidget *tqparent, const char *name, int options) - : KListView(tqparent, name) +KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int options) + : KListView(parent, name) , m_schema(0) , m_keyIcon(SmallIcon("key")) , m_noIcon(KexiUtils::emptyIcon(KIcon::Small)) diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h index e133aeae..50d94dba 100644 --- a/kexi/widget/kexifieldlistview.h +++ b/kexi/widget/kexifieldlistview.h @@ -45,7 +45,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView AllowMultiSelection = 4 //!< if set, multiple selection is allowed }; - KexiFieldListView(TQWidget *tqparent, const char *name = 0, + KexiFieldListView(TQWidget *parent, const char *name = 0, int options = ShowDataTypes | AllowMultiSelection ); virtual ~KexiFieldListView(); diff --git a/kexi/widget/kexifilterdlg.cpp b/kexi/widget/kexifilterdlg.cpp index aec34dc4..e41681ab 100644 --- a/kexi/widget/kexifilterdlg.cpp +++ b/kexi/widget/kexifilterdlg.cpp @@ -30,8 +30,8 @@ #include "kexifilterdlg.h" #include "kexiquerydesignersqleditor.h" -KexiFilterDlg::KexiFilterDlg(KexiProject *project, TQWidget *tqparent, const char *name) - : TQDialog(tqparent, name) +KexiFilterDlg::KexiFilterDlg(KexiProject *project, TQWidget *parent, const char *name) + : TQDialog(parent, name) { m_project = project; diff --git a/kexi/widget/kexifilterdlg.h b/kexi/widget/kexifilterdlg.h index 4a3d7e79..a92824e2 100644 --- a/kexi/widget/kexifilterdlg.h +++ b/kexi/widget/kexifilterdlg.h @@ -33,7 +33,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFilterDlg : public TQDialog TQ_OBJECT public: - KexiFilterDlg(KexiProject *p, TQWidget *tqparent=0, const char *name=0); + KexiFilterDlg(KexiProject *p, TQWidget *parent=0, const char *name=0); ~KexiFilterDlg(); TQPushButton *createMiniButton(const TQString &text); diff --git a/kexi/widget/kexiprjtypeselector.cpp b/kexi/widget/kexiprjtypeselector.cpp index 94a62e0a..2717e0e9 100644 --- a/kexi/widget/kexiprjtypeselector.cpp +++ b/kexi/widget/kexiprjtypeselector.cpp @@ -23,8 +23,8 @@ #include <kmimetype.h> #include <kexidb/driver.h> -KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* tqparent ) - : KexiPrjTypeSelectorBase( tqparent, "KexiPrjTypeSelector" ) +KexiPrjTypeSelector::KexiPrjTypeSelector( TQWidget* parent ) + : KexiPrjTypeSelectorBase( parent, "KexiPrjTypeSelector" ) { TQString none; icon_file->setPixmap( diff --git a/kexi/widget/kexiprjtypeselector.h b/kexi/widget/kexiprjtypeselector.h index 13e46484..717ad724 100644 --- a/kexi/widget/kexiprjtypeselector.h +++ b/kexi/widget/kexiprjtypeselector.h @@ -29,7 +29,7 @@ class KEXIEXTWIDGETS_EXPORT KexiPrjTypeSelector : public KexiPrjTypeSelectorBase TQ_OBJECT public: - KexiPrjTypeSelector( TQWidget* tqparent = 0 ); + KexiPrjTypeSelector( TQWidget* parent = 0 ); ~KexiPrjTypeSelector(); protected slots: diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index 5c36cfb0..02b050b8 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -30,8 +30,8 @@ #include <tqlayout.h> #include <tqlabel.h> -KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) +KexiObjectInfoLabel::KexiObjectInfoLabel(TQWidget* parent, const char* name) + : TQWidget(parent, name) { TQHBoxLayout *hlyr = new TQHBoxLayout(this); m_objectIconLabel = new TQLabel(this); @@ -103,8 +103,8 @@ class KexiPropertyEditorView::Private //------------------------------ -KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* tqparent) - : TQWidget(tqparent, "KexiPropertyEditorView") +KexiPropertyEditorView::KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* parent) + : TQWidget(parent, "KexiPropertyEditorView") , d(new Private()) { setCaption(i18n("Properties")); diff --git a/kexi/widget/kexipropertyeditorview.h b/kexi/widget/kexipropertyeditorview.h index 79adb9e0..66cc0ac7 100644 --- a/kexi/widget/kexipropertyeditorview.h +++ b/kexi/widget/kexipropertyeditorview.h @@ -47,7 +47,7 @@ namespace KoProperty { class KEXIEXTWIDGETS_EXPORT KexiObjectInfoLabel : public TQWidget { public: - KexiObjectInfoLabel(TQWidget* tqparent, const char* name = 0); + KexiObjectInfoLabel(TQWidget* parent, const char* name = 0); ~KexiObjectInfoLabel(); void setObjectClassIcon(const TQString& name); @@ -85,7 +85,7 @@ class KEXIEXTWIDGETS_EXPORT KexiPropertyEditorView : public TQWidget TQ_OBJECT public: - KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* tqparent); + KexiPropertyEditorView(KexiMainWindow *mainWin, TQWidget* parent); virtual ~KexiPropertyEditorView(); /*! Helper function. Updates \a infoLabel widget by reusing properties provided diff --git a/kexi/widget/kexiquerydesignersqleditor.cpp b/kexi/widget/kexiquerydesignersqleditor.cpp index 1c68138f..d5e1f887 100644 --- a/kexi/widget/kexiquerydesignersqleditor.cpp +++ b/kexi/widget/kexiquerydesignersqleditor.cpp @@ -22,8 +22,8 @@ #include "kexiquerydesignersqleditor.h" KexiQueryDesignerSQLEditor::KexiQueryDesignerSQLEditor( - KexiMainWindow *mainWin, TQWidget *tqparent, const char *name) - : KexiEditor(mainWin, tqparent, name) + KexiMainWindow *mainWin, TQWidget *parent, const char *name) + : KexiEditor(mainWin, parent, name) { setHighlightMode("sql"); } diff --git a/kexi/widget/kexiquerydesignersqleditor.h b/kexi/widget/kexiquerydesignersqleditor.h index 9b1f9f9b..a0bd4bee 100644 --- a/kexi/widget/kexiquerydesignersqleditor.h +++ b/kexi/widget/kexiquerydesignersqleditor.h @@ -33,7 +33,7 @@ class KEXIEXTWIDGETS_EXPORT KexiQueryDesignerSQLEditor : public KexiEditor TQ_OBJECT public: - KexiQueryDesignerSQLEditor(KexiMainWindow *mainWin, TQWidget *tqparent, const char *name = 0); + KexiQueryDesignerSQLEditor(KexiMainWindow *mainWin, TQWidget *parent, const char *name = 0); virtual ~KexiQueryDesignerSQLEditor(); }; diff --git a/kexi/widget/kexiqueryparameters.cpp b/kexi/widget/kexiqueryparameters.cpp index bcef819f..04257ec2 100644 --- a/kexi/widget/kexiqueryparameters.cpp +++ b/kexi/widget/kexiqueryparameters.cpp @@ -29,7 +29,7 @@ #include "utils/kexidatetimeformatter.h" //static -TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, +TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *parent, const KexiDB::Driver &driver, KexiDB::QuerySchema& querySchema, bool &ok) { Q_UNUSED(driver); @@ -48,7 +48,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, //! @todo add support for unsigned parameter here KexiDB::getLimitsForType((*it).type, minValue, maxValue); const int result = KInputDialog::getInteger( - caption, (*it).message, 0, minValue, maxValue, 1/*step*/, 10/*base*/, &ok, tqparent); + caption, (*it).message, 0, minValue, maxValue, 1/*step*/, 10/*base*/, &ok, parent); if (!ok) return TQValueList<TQVariant>(); //cancelled values.append(result); @@ -58,7 +58,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, TQStringList list; list << i18n("Boolean True - Yes", "Yes") << i18n("Boolean False - No", "No"); const TQString result = KInputDialog::getItem( - caption, (*it).message, list, 0/*current*/, false /*!editable*/, &ok, tqparent); + caption, (*it).message, list, 0/*current*/, false /*!editable*/, &ok, parent); if (!ok || result.isEmpty()) return TQValueList<TQVariant>(); //cancelled values.append( TQVariant( result==list.first(), 1 ) ); @@ -67,7 +67,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, case KexiDB::Field::Date: { KexiDateFormatter df; const TQString result = KInputDialog::getText( - caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, + caption, (*it).message, TQString(), &ok, parent, 0/*name*/, //! @todo add validator 0/*validator*/, df.inputMask() ); if (!ok) @@ -79,7 +79,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, KexiDateFormatter df; KexiTimeFormatter tf; const TQString result = KInputDialog::getText( - caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, + caption, (*it).message, TQString(), &ok, parent, 0/*name*/, //! @todo add validator 0/*validator*/, dateTimeInputMask(df, tf) ); if (!ok) @@ -90,7 +90,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, case KexiDB::Field::Time: { KexiTimeFormatter tf; const TQString result = KInputDialog::getText( - caption, (*it).message, TQString(), &ok, tqparent, 0/*name*/, + caption, (*it).message, TQString(), &ok, parent, 0/*name*/, //! @todo add validator 0/*validator*/, tf.inputMask() ); if (!ok) @@ -103,7 +103,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, // KInputDialog::getDouble() does not work well, use getText and double validator KDoubleValidator validator(0); const TQString textResult = KInputDialog::getText( caption, (*it).message, TQString(), &ok, - tqparent, 0, &validator); + parent, 0, &validator); if (!ok || textResult.isEmpty()) return TQValueList<TQVariant>(); //cancelled //! @todo this value will be still rounded: consider storing them as a decimal type @@ -117,7 +117,7 @@ TQValueList<TQVariant> KexiQueryParameters::getParameters(TQWidget *tqparent, case KexiDB::Field::Text: case KexiDB::Field::LongText: { const TQString result = KInputDialog::getText( - caption, (*it).message, TQString(), &ok, tqparent); + caption, (*it).message, TQString(), &ok, parent); if (!ok) return TQValueList<TQVariant>(); //cancelled values.append( result ); diff --git a/kexi/widget/kexiqueryparameters.h b/kexi/widget/kexiqueryparameters.h index b80a37ad..986c1ce9 100644 --- a/kexi/widget/kexiqueryparameters.h +++ b/kexi/widget/kexiqueryparameters.h @@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiQueryParameters //! @todo support defaults //! @todo support validation rules, e.g. min/max value, unsigned //! @todo support Enum type (list of strings, need support for keys and user-visible strings) - static TQValueList<TQVariant> getParameters(TQWidget *tqparent, const KexiDB::Driver &driver, + static TQValueList<TQVariant> getParameters(TQWidget *parent, const KexiDB::Driver &driver, KexiDB::QuerySchema& querySchema, bool &ok); }; diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index b88ad3ae..db9dbb14 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -44,8 +44,8 @@ class KexiScrollViewData static KStaticDeleter<KexiScrollViewData> KexiScrollView_data_deleter; KexiScrollViewData* KexiScrollView_data = 0; -KexiScrollView::KexiScrollView(TQWidget *tqparent, bool preview) - : TQScrollView(tqparent, "kexiscrollview", WStaticContents) +KexiScrollView::KexiScrollView(TQWidget *parent, bool preview) + : TQScrollView(parent, "kexiscrollview", WStaticContents) , m_widget(0) , m_helpFont(font()) , m_preview(preview) diff --git a/kexi/widget/kexiscrollview.h b/kexi/widget/kexiscrollview.h index 92615cf3..1fccdbd6 100644 --- a/kexi/widget/kexiscrollview.h +++ b/kexi/widget/kexiscrollview.h @@ -37,7 +37,7 @@ class KEXIEXTWIDGETS_EXPORT KexiScrollView : public TQScrollView TQ_OBJECT public: - KexiScrollView(TQWidget *tqparent, bool preview); + KexiScrollView(TQWidget *parent, bool preview); virtual ~KexiScrollView(); void setWidget(TQWidget *w); diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 7bc3fe5f..7e6989f3 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -32,7 +32,7 @@ class KexiSectionHeader::BoxLayout : public TQBoxLayout { public: - BoxLayout( KexiSectionHeader* tqparent, Direction d, int margin = 0, + BoxLayout( KexiSectionHeader* parent, Direction d, int margin = 0, int spacing = -1, const char * name = 0 ); virtual void addItem( TQLayoutItem * item ); TQGuardedPtr<KexiViewBase> view; @@ -56,8 +56,8 @@ class KexiSectionHeaderPrivate //========================== -KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, TQWidget* tqparent ) - : TQWidget(tqparent, "KexiSectionHeader") +KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, TQWidget* parent ) + : TQWidget(parent, "KexiSectionHeader") , d( new KexiSectionHeaderPrivate() ) { d->orientation = o; @@ -138,8 +138,8 @@ TQSize KexiSectionHeader::tqsizeHint() const //====================== -KexiSectionHeader::BoxLayout::BoxLayout( KexiSectionHeader* tqparent, Direction d, int margin, int spacing, const char * name ) - : TQBoxLayout(tqparent, d, margin, spacing, name ) +KexiSectionHeader::BoxLayout::BoxLayout( KexiSectionHeader* parent, Direction d, int margin, int spacing, const char * name ) + : TQBoxLayout(parent, d, margin, spacing, name ) { } diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h index 9e8d1215..9ed31a35 100644 --- a/kexi/widget/kexisectionheader.h +++ b/kexi/widget/kexisectionheader.h @@ -32,7 +32,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget class BoxLayout; KexiSectionHeader(const TQString &caption, Qt::Orientation o, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); virtual ~KexiSectionHeader(); diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index 94a088a0..81bab0c6 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -28,24 +28,24 @@ #include <core/kexi.h> -KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, const TQString& text, +KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text, const TQString& icon, const char* name) - : TQToolButton(tqparent, name) + : TQToolButton(parent, name) { init(); update(text, SmallIconSet(icon)); } -KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, const TQString& text, +KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text, const TQIconSet& iconSet, const char* name) - : TQToolButton(tqparent, name) + : TQToolButton(parent, name) { init(); update(text, iconSet); } -KexiSmallToolButton::KexiSmallToolButton(TQWidget* tqparent, KAction* action) - : TQToolButton(tqparent, action->name()) +KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, KAction* action) + : TQToolButton(parent, action->name()) , m_action(action) { init(); diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h index 90ba7e5e..53efb0d1 100644 --- a/kexi/widget/kexismalltoolbutton.h +++ b/kexi/widget/kexismalltoolbutton.h @@ -32,13 +32,13 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton TQ_OBJECT public: - KexiSmallToolButton(TQWidget* tqparent, const TQString& text, + KexiSmallToolButton(TQWidget* parent, const TQString& text, const TQString& icon = TQString(), const char* name = 0); - KexiSmallToolButton(TQWidget* tqparent, const TQString& text, + KexiSmallToolButton(TQWidget* parent, const TQString& text, const TQIconSet& iconSet, const char* name = 0); - KexiSmallToolButton(TQWidget* tqparent, KAction *action); + KexiSmallToolButton(TQWidget* parent, KAction *action); virtual ~KexiSmallToolButton(); diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index fecc5b76..0aeddca4 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -40,8 +40,8 @@ #include "pixmapcollection.h" /// Pixmap Collection -PixmapCollection::PixmapCollection(const TQString &collectionName, TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +PixmapCollection::PixmapCollection(const TQString &collectionName, TQObject *parent, const char *name) + : TQObject(parent, name) { m_name = collectionName; } @@ -150,8 +150,8 @@ PixmapCollection::load(TQDomNode node) } //// A dialog to load a KDE icon by its name -LoadIconDialog::LoadIconDialog(TQWidget *tqparent) -: KDialogBase(tqparent, "loadicon_dialog", true, i18n("Load KDE Icon by Name"), Ok|Cancel, Ok, false) +LoadIconDialog::LoadIconDialog(TQWidget *parent) +: KDialogBase(parent, "loadicon_dialog", true, i18n("Load KDE Icon by Name"), Ok|Cancel, Ok, false) { TQFrame *frame = makeMainWidget(); TQGridLayout *l = new TQGridLayout(frame, 2, 3, 0, 6); @@ -230,8 +230,8 @@ TQString LoadIconDialog::iconName() } /// Pixmap Collection Editor Dialog -PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *tqparent) -: KDialogBase(tqparent, "pixcollection_dialog", true, +PixmapCollectionEditor::PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent) +: KDialogBase(parent, "pixcollection_dialog", true, i18n("Edit Pixmap Collection: %1").tqarg(collection->collectionName()), Close, Close, false) { m_collection = collection; @@ -372,8 +372,8 @@ PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p) } //// A Dialog to choose a pixmap from the PixmapCollection -PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *tqparent) -: KDialogBase(tqparent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()), +PixmapCollectionChooser::PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent) +: KDialogBase(parent, "pixchoose_dialog", true, i18n("Select Pixmap From %1").tqarg(collection->collectionName()), User1|Ok|Cancel, Ok, false, KGuiItem(i18n("Edit Collection..."))) { m_collection = collection; diff --git a/kexi/widget/pixmapcollection.h b/kexi/widget/pixmapcollection.h index 3ac4c417..833fbd98 100644 --- a/kexi/widget/pixmapcollection.h +++ b/kexi/widget/pixmapcollection.h @@ -46,7 +46,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollection : public TQObject TQ_OBJECT public: - PixmapCollection(const TQString &collectionName, TQObject *tqparent = 0, const char *name = 0); + PixmapCollection(const TQString &collectionName, TQObject *parent = 0, const char *name = 0); ~PixmapCollection() {;} TQString addPixmapPath(const KURL &url); @@ -80,7 +80,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionEditor : public KDialogBase TQ_OBJECT public: - PixmapCollectionEditor(PixmapCollection *collection, TQWidget *tqparent = 0); + PixmapCollectionEditor(PixmapCollection *collection, TQWidget *parent = 0); ~PixmapCollectionEditor() {;} protected: @@ -109,7 +109,7 @@ class KEXIEXTWIDGETS_EXPORT PixmapCollectionChooser : public KDialogBase TQ_OBJECT public: - PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *tqparent = 0); + PixmapCollectionChooser(PixmapCollection *collection, const TQString &selectedItem, TQWidget *parent = 0); ~PixmapCollectionChooser() {;} TQPixmap pixmap(); @@ -132,7 +132,7 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase TQ_OBJECT public: - LoadIconDialog(TQWidget *tqparent = 0); + LoadIconDialog(TQWidget *parent = 0); ~LoadIconDialog() {;} int iconSize(); @@ -152,8 +152,8 @@ class KEXIEXTWIDGETS_EXPORT LoadIconDialog : public KDialogBase class KEXIEXTWIDGETS_EXPORT PixmapIconViewItem : public KIconViewItem { public: - PixmapIconViewItem(KIconView *tqparent, const TQString &text, const TQPixmap &icon) - : KIconViewItem(tqparent, text, icon) { m_name = text; } + PixmapIconViewItem(KIconView *parent, const TQString &text, const TQPixmap &icon) + : KIconViewItem(parent, text, icon) { m_name = text; } ~PixmapIconViewItem() {;} void setName(const TQString &name) { m_name = name; } diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index b1fc22d2..18c19ef9 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -45,8 +45,8 @@ #include "kexirelationviewconnection.h" #include <kexi.h> -KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name) - : TQScrollView(tqparent, name, WStaticContents) +KexiRelationView::KexiRelationView(TQWidget *parent, const char *name) + : TQScrollView(parent, name, WStaticContents) { // m_relation=relation; // m_relation->incUsageCount(); @@ -74,11 +74,11 @@ KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name) */ #if 0 m_removeSelectedTableQueryAction = new KAction(i18n("&Hide Selected Table/Query"), "editdelete", "", - this, TQT_SLOT(removeSelectedTableQuery()), tqparent->actionCollection(), "relationsview_removeSelectedTableQuery"); + this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); m_removeSelectedConnectionAction = new KAction(i18n("&Remove Selected Relationship"), "button_cancel", "", - this, TQT_SLOT(removeSelectedConnection()), tqparent->actionCollection(), "relationsview_removeSelectedConnection"); + this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); m_openSelectedTableQueryAction = new KAction(i18n("&Open Selected Table/Query"), "", "", - this, TQT_SLOT(openSelectedTableQuery()), 0/*tqparent->actionCollection()*/, "relationsview_openSelectedTableQuery"); + this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery"); #endif // invalidateActions(); diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h index dcf78834..6bc31b31 100644 --- a/kexi/widget/relations/kexirelationview.h +++ b/kexi/widget/relations/kexirelationview.h @@ -71,7 +71,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView TQ_OBJECT public: - KexiRelationView(TQWidget *tqparent, const char *name=0); + KexiRelationView(TQWidget *parent, const char *name=0); virtual ~KexiRelationView(); //! \return a dictionary of added tables diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp index f294b49c..c0635c1b 100644 --- a/kexi/widget/relations/kexirelationviewconnection.cpp +++ b/kexi/widget/relations/kexirelationviewconnection.cpp @@ -40,9 +40,9 @@ KexiRelationViewConnection::KexiRelationViewConnection( KexiRelationViewTableContainer *masterTbl, KexiRelationViewTableContainer *detailsTbl, - SourceConnection &c, KexiRelationView *tqparent) + SourceConnection &c, KexiRelationView *parent) { - m_parent = tqparent; + m_parent = parent; // kdDebug() << "KexiRelationViewConnection::KexiRelationViewConnection()" << endl; m_masterTable = masterTbl; diff --git a/kexi/widget/relations/kexirelationviewconnection.h b/kexi/widget/relations/kexirelationviewconnection.h index 7b596210..745a5e23 100644 --- a/kexi/widget/relations/kexirelationviewconnection.h +++ b/kexi/widget/relations/kexirelationviewconnection.h @@ -33,7 +33,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewConnection public: KexiRelationViewConnection(KexiRelationViewTableContainer *masterTbl, - KexiRelationViewTableContainer *detailsTbl, struct SourceConnection &s, KexiRelationView *tqparent); + KexiRelationViewTableContainer *detailsTbl, struct SourceConnection &s, KexiRelationView *parent); ~KexiRelationViewConnection(); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index a45a9ad1..94a17f4d 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -43,10 +43,10 @@ #include "kexirelationview.h" KexiRelationViewTableContainer::KexiRelationViewTableContainer( - KexiRelationView *tqparent, KexiDB::TableOrQuerySchema *schema) - : TQFrame(tqparent,"KexiRelationViewTableContainer" ) + KexiRelationView *parent, KexiDB::TableOrQuerySchema *schema) + : TQFrame(parent,"KexiRelationViewTableContainer" ) // , m_table(t) - , m_parent(tqparent) + , m_parent(parent) // , m_mousePressed(false) { @@ -66,7 +66,7 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved())); connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag())); - m_tableView = new KexiRelationViewTable(schema, tqparent, this, "KexiRelationViewTable"); + m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable"); //m_tableHeader->setFocusProxy( m_tableView ); m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); @@ -176,8 +176,8 @@ void KexiRelationViewTableContainer::unsetFocus() //BEGIN KexiRelatoinViewTableContainerHeader KexiRelationViewTableContainerHeader::KexiRelationViewTableContainerHeader( - const TQString& text,TQWidget *tqparent) - :TQLabel(text,tqparent),m_dragging(false) + const TQString& text,TQWidget *parent) + :TQLabel(text,parent),m_dragging(false) { setMargin(1); m_activeBG = KGlobalSettings::activeTitleColor(); @@ -292,8 +292,8 @@ void KexiRelationViewTableContainerHeader::mouseReleaseEvent(TQMouseEvent *ev) { //===================================================================================== KexiRelationViewTable::KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOrQuerySchema, - KexiRelationView *view, TQWidget *tqparent, const char *name) - : KexiFieldListView(tqparent, name, KexiFieldListView::ShowAsterisk) + KexiRelationView *view, TQWidget *parent, const char *name) + : KexiFieldListView(parent, name, KexiFieldListView::ShowAsterisk) , m_view(view) { setSchema(tableOrQuerySchema); diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h index deabc2e0..5c622dad 100644 --- a/kexi/widget/relations/kexirelationviewtable.h +++ b/kexi/widget/relations/kexirelationviewtable.h @@ -43,9 +43,9 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame TQ_OBJECT public: -// KexiRelationViewTableContainer(KexiRelationView *tqparent, KexiDB::TableSchema *t); +// KexiRelationViewTableContainer(KexiRelationView *parent, KexiDB::TableSchema *t); KexiRelationViewTableContainer( - KexiRelationView *tqparent, KexiDB::TableOrQuerySchema *schema); + KexiRelationView *parent, KexiDB::TableOrQuerySchema *schema); virtual ~KexiRelationViewTableContainer(); @@ -85,7 +85,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public KListViewItem { public: - KexiRelationViewTableItem(TQListView *tqparent, TQListViewItem *after, + KexiRelationViewTableItem(TQListView *parent, TQListViewItem *after, TQString key, TQString field); virtual void paintFocus ( TQPainter * p, const TQColorGroup & cg, const TQRect & r ); };*/ @@ -98,8 +98,8 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView public: KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOrQuerySchema, - KexiRelationView *view, TQWidget *tqparent, const char *name = 0); -// KexiRelationViewTable(TQWidget *tqparent, KexiRelationView *view, KexiDB::TableSchema *t, const char *name=0); + KexiRelationView *view, TQWidget *parent, const char *name = 0); +// KexiRelationViewTable(TQWidget *parent, KexiRelationView *view, KexiDB::TableSchema *t, const char *name=0); virtual ~KexiRelationViewTable(); // KexiDB::TableSchema *table() const { return m_table; }; @@ -133,7 +133,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainerHeader : public TQL Q_OBJECT TQ_OBJECT public: - KexiRelationViewTableContainerHeader(const TQString& text,TQWidget *tqparent); + KexiRelationViewTableContainerHeader(const TQString& text,TQWidget *parent); virtual ~KexiRelationViewTableContainerHeader(); virtual void setFocus(); diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index ee9caeed..4b952163 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -41,9 +41,9 @@ #include "kexirelationviewtable.h" #include "kexirelationviewconnection.h" -KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, +KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, const char *name) - : KexiViewBase(win, tqparent, name) + : KexiViewBase(win, parent, name) , m_win(win) { m_conn = m_win->project()->dbConnection(); @@ -118,7 +118,7 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, if(!embedd) { /*todo setContextHelp(i18n("Relations"), i18n("To create a relationship simply drag the source field onto the target field. " - "An arrowhead is used to show which table is the tqparent (master) and which table is the child (slave) in the relationship."));*/ + "An arrowhead is used to show which table is the parent (master) and which table is the child (slave) in the relationship."));*/ } #endif // else diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h index 20a70174..39ac549a 100644 --- a/kexi/widget/relations/kexirelationwidget.h +++ b/kexi/widget/relations/kexirelationwidget.h @@ -47,7 +47,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase TQ_OBJECT public: - KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, const char *name=0); + KexiRelationWidget(KexiMainWindow *win, TQWidget *parent, const char *name=0); virtual ~KexiRelationWidget(); //! \return a dictionary of added tables 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 ); diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp index 2c6f86aa..fa5c35ab 100644 --- a/kexi/widget/utils/kexiarrowtip.cpp +++ b/kexi/widget/utils/kexiarrowtip.cpp @@ -30,8 +30,8 @@ #include <kexiutils/utils.h> -KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent) - : KexiToolTip(text, tqparent) +KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* parent) + : KexiToolTip(text, parent) , m_opacity(0.0) { TQPalette pal( palette() ); @@ -49,7 +49,7 @@ KexiArrowTip::KexiArrowTip(const TQString& text, TQWidget* tqparent) setAutoMask( false ); - //generate tqmask + //generate mask TQPixmap maskPm(size()); maskPm.fill( black ); TQPainter maskPainter(&maskPm); diff --git a/kexi/widget/utils/kexiarrowtip.h b/kexi/widget/utils/kexiarrowtip.h index 791535fa..f4d87d41 100644 --- a/kexi/widget/utils/kexiarrowtip.h +++ b/kexi/widget/utils/kexiarrowtip.h @@ -31,7 +31,7 @@ class KEXIGUIUTILS_EXPORT KexiArrowTip : public KexiToolTip Q_OBJECT TQ_OBJECT public: - KexiArrowTip(const TQString& text, TQWidget* tqparent); + KexiArrowTip(const TQString& text, TQWidget* parent); virtual ~KexiArrowTip(); inline TQString text() const { return m_value.toString(); } diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index b5c22372..777fea1b 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -26,8 +26,8 @@ #include <tqstyle.h> #include <tqapplication.h> -KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *tqparent ) - : KPushButton(tqparent) +KexiComboBoxDropDownButton::KexiComboBoxDropDownButton( TQWidget *parent ) + : KPushButton(parent) { m_paintedCombo = new KComboBox(this); m_paintedCombo->hide(); diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.h b/kexi/widget/utils/kexicomboboxdropdownbutton.h index 970e46c3..f480de74 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.h +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.h @@ -30,7 +30,7 @@ class KComboBox; class KEXIGUIUTILS_EXPORT KexiComboBoxDropDownButton : public KPushButton { public: - KexiComboBoxDropDownButton( TQWidget *tqparent ); + KexiComboBoxDropDownButton( TQWidget *parent ); virtual ~KexiComboBoxDropDownButton(); protected: diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index f882f6fa..3c6b22f0 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -39,8 +39,8 @@ class KexiImageContextMenu::Private { public: - Private(TQWidget *tqparent) - : actionCollection(tqparent) + Private(TQWidget *parent) + : actionCollection(parent) { } @@ -55,8 +55,8 @@ public: //------------ -KexiImageContextMenu::KexiImageContextMenu(TQWidget* tqparent) - : KPopupMenu(tqparent) +KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent) + : KPopupMenu(parent) , d( new Private(this) ) { setName("KexiImageContextMenu"); diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h index 2f73b18e..50bb96a0 100644 --- a/kexi/widget/utils/kexicontextmenuutils.h +++ b/kexi/widget/utils/kexicontextmenuutils.h @@ -53,7 +53,7 @@ class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu TQ_OBJECT public: - KexiImageContextMenu(TQWidget *tqparent); + KexiImageContextMenu(TQWidget *parent); virtual ~KexiImageContextMenu(); KActionCollection* actionCollection() const; diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 1e7b9bc9..8f4d0b96 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -317,9 +317,9 @@ TQString KexiTimeFormatter::timeToString( const TQTime& time ) const TQString dateTimeInputMask(const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter) { - TQString tqmask(dateFormatter.inputMask()); - tqmask.truncate(dateFormatter.inputMask().length()-2); - return tqmask + " " + timeFormatter.inputMask(); + TQString mask(dateFormatter.inputMask()); + mask.truncate(dateFormatter.inputMask().length()-2); + return mask + " " + timeFormatter.inputMask(); } TQDateTime stringToDateTime( diff --git a/kexi/widget/utils/kexidatetimeformatter.h b/kexi/widget/utils/kexidatetimeformatter.h index 1340320b..f011a0e2 100644 --- a/kexi/widget/utils/kexidatetimeformatter.h +++ b/kexi/widget/utils/kexidatetimeformatter.h @@ -50,7 +50,7 @@ class KEXIGUIUTILS_EXPORT KexiDateFormatter //! \return null string if \a date is invalid TQString dateToString( const TQDate& date ) const; - //! \return Input tqmask generated using the formatter settings. + //! \return Input mask generated using the formatter settings. //! Can be used in TQLineEdit::setInputMask(). TQString inputMask() const { return m_inputMask; } @@ -62,7 +62,7 @@ class KEXIGUIUTILS_EXPORT KexiDateFormatter bool isEmpty( const TQString& str ) const; protected: - //! Input tqmask generated using the formatter settings. Can be used in TQLineEdit::setInputMask(). + //! Input mask generated using the formatter settings. Can be used in TQLineEdit::setInputMask(). TQString m_inputMask; //! Order of date sections @@ -111,7 +111,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter //! \return null string if \a time is invalid TQString timeToString( const TQTime& time ) const; - //! \return Input tqmask generated using the formatter settings. + //! \return Input mask generated using the formatter settings. //! Can be used in TQLineEdit::setInputMask(). TQString inputMask() const { return m_inputMask; } @@ -120,7 +120,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter bool isEmpty( const TQString& str ) const; protected: - //! Input tqmask generated using the formatter settings. Can be used in TQLineEdit::setInputMask(). + //! Input mask generated using the formatter settings. Can be used in TQLineEdit::setInputMask(). TQString m_inputMask; // //! Order of date sections @@ -140,7 +140,7 @@ class KEXIGUIUTILS_EXPORT KexiTimeFormatter TQRegExp *m_hmsRegExp, *m_hmRegExp; }; -//! \return a date/time input tqmask using date and time formatter. +//! \return a date/time input mask using date and time formatter. //! Date is separated from time by one space character. KEXIGUIUTILS_EXPORT TQString dateTimeInputMask( const KexiDateFormatter& dateFormatter, const KexiTimeFormatter& timeFormatter); diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index b2ed022e..909d507c 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -25,8 +25,8 @@ #include <tqstyle.h> #include <tqapplication.h> -KexiDropDownButton::KexiDropDownButton(TQWidget *tqparent) - : TQToolButton(tqparent, "KexiDBImageBox::Button") +KexiDropDownButton::KexiDropDownButton(TQWidget *parent) + : TQToolButton(parent, "KexiDBImageBox::Button") { tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding); //! @todo get this from a KStyle diff --git a/kexi/widget/utils/kexidropdownbutton.h b/kexi/widget/utils/kexidropdownbutton.h index a2d280a7..e61ab9f5 100644 --- a/kexi/widget/utils/kexidropdownbutton.h +++ b/kexi/widget/utils/kexidropdownbutton.h @@ -33,7 +33,7 @@ class KEXIGUIUTILS_EXPORT KexiDropDownButton : public TQToolButton TQ_OBJECT public: - KexiDropDownButton(TQWidget *tqparent); + KexiDropDownButton(TQWidget *parent); virtual ~KexiDropDownButton(); virtual void drawButton( TQPainter *p ); diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index c7c7687c..dc655c63 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -66,16 +66,16 @@ KexiFlowLayoutIterator::takeCurrent() //// The tqlayout itself -KexiFlowLayout::KexiFlowLayout(TQWidget *tqparent, int border, int space, const char *name) - : TQLayout(tqparent, border, space, name) +KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name) + : TQLayout(parent, border, space, name) { m_orientation =Qt::Horizontal; m_justify = false; m_cached_width = 0; } -KexiFlowLayout::KexiFlowLayout(TQLayout* tqparent, int space, const char *name) - : TQLayout( tqparent, space, name ) +KexiFlowLayout::KexiFlowLayout(TQLayout* parent, int space, const char *name) + : TQLayout( parent, space, name ) { m_orientation =Qt::Horizontal; m_justify = false; diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h index e410fb83..83d2f172 100644 --- a/kexi/widget/utils/kexiflowlayout.h +++ b/kexi/widget/utils/kexiflowlayout.h @@ -27,8 +27,8 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout { public: - KexiFlowLayout(TQWidget *tqparent, int border=0, int space=-1, const char *name=0); - KexiFlowLayout(TQLayout* tqparent, int space=-1, const char *name=0); + KexiFlowLayout(TQWidget *parent, int border=0, int space=-1, const char *name=0); + KexiFlowLayout(TQLayout* parent, int space=-1, const char *name=0); KexiFlowLayout(int space=-1, const char *name=0); ~KexiFlowLayout(); diff --git a/kexi/widget/utils/kexigradientwidget.cpp b/kexi/widget/utils/kexigradientwidget.cpp index ce92444f..18d34447 100644 --- a/kexi/widget/utils/kexigradientwidget.cpp +++ b/kexi/widget/utils/kexigradientwidget.cpp @@ -29,8 +29,8 @@ #include "kexigradientwidget.h" -KexiGradientWidget::KexiGradientWidget( TQWidget *tqparent, const char *name, WFlags f ) - : TQWidget( tqparent, name, f ), p_displayMode( NoGradient ), +KexiGradientWidget::KexiGradientWidget( TQWidget *parent, const char *name, WFlags f ) + : TQWidget( parent, name, f ), p_displayMode( NoGradient ), p_gradientType( VerticalGradient ), p_color1( TQt::white ), p_color2( TQt::blue ), p_currentChild( 0 ), p_opacity( 0.5 ), p_cacheDirty( true ) @@ -179,7 +179,7 @@ void KexiGradientWidget::rebuildCache( void ) { Get the part of the tempPixmap that is under the current child-widget. */ - if ( TQT_BASE_OBJECT(childWidget->tqparent()) == TQT_BASE_OBJECT(this) ) { + if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) { area = childWidget->tqgeometry(); } else { area.setTopLeft( childWidget->mapTo( this, @@ -310,11 +310,11 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget ) return; /** - Exclude widgtes that don't have a tqparent. + Exclude widgtes that don't have a parent. This happens when tqchildren are removed which are in the knownWidgets-list. */ - if ( childWidget->tqparent() == 0L ) + if ( childWidget->parent() == 0L ) return; /** @@ -329,7 +329,7 @@ void KexiGradientWidget::updateChildBackground( TQWidget* childWidget ) Get the part of the tempPixmap that is under the current child-widget. */ - if ( TQT_BASE_OBJECT(childWidget->tqparent()) == TQT_BASE_OBJECT(this) ) { + if ( TQT_BASE_OBJECT(childWidget->parent()) == TQT_BASE_OBJECT(this) ) { area = childWidget->tqgeometry(); } else { area.setTopLeft( childWidget->mapTo( this, diff --git a/kexi/widget/utils/kexigradientwidget.h b/kexi/widget/utils/kexigradientwidget.h index 3a90add8..05d6f68f 100644 --- a/kexi/widget/utils/kexigradientwidget.h +++ b/kexi/widget/utils/kexigradientwidget.h @@ -69,7 +69,7 @@ class KEXIGUIUTILS_EXPORT KexiGradientWidget : public TQWidget { EllipticGradient = KImageEffect::EllipticGradient }; - KexiGradientWidget( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); + KexiGradientWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~KexiGradientWidget(); diff --git a/kexi/widget/utils/kexirecordmarker.cpp b/kexi/widget/utils/kexirecordmarker.cpp index 654f3be7..b22e0500 100644 --- a/kexi/widget/utils/kexirecordmarker.cpp +++ b/kexi/widget/utils/kexirecordmarker.cpp @@ -116,8 +116,8 @@ public: //---------------------------------------------------------------- -KexiRecordMarker::KexiRecordMarker(TQWidget *tqparent, const char* name) - : TQWidget(tqparent, name) +KexiRecordMarker::KexiRecordMarker(TQWidget *parent, const char* name) + : TQWidget(parent, name) , d( new Private() ) { initRecordMarkerImages(); diff --git a/kexi/widget/utils/kexirecordmarker.h b/kexi/widget/utils/kexirecordmarker.h index 1348ca1d..e309c5a1 100644 --- a/kexi/widget/utils/kexirecordmarker.h +++ b/kexi/widget/utils/kexirecordmarker.h @@ -34,7 +34,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordMarker : public TQWidget TQ_OBJECT public: - KexiRecordMarker(TQWidget *tqparent, const char* name = 0); + KexiRecordMarker(TQWidget *parent, const char* name = 0); ~KexiRecordMarker(); int rows() const; diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 6fe7fbdc..4c1dd02b 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -65,14 +65,14 @@ KexiRecordNavigatorHandler::~KexiRecordNavigatorHandler() //-------------------------------------------------- -KexiRecordNavigator::KexiRecordNavigator(TQWidget *tqparent, int leftMargin, const char *name) - : TQFrame(tqparent, name) +KexiRecordNavigator::KexiRecordNavigator(TQWidget *parent, int leftMargin, const char *name) + : TQFrame(parent, name) , m_view(0) , m_isInsertingEnabled(true) , d( new KexiRecordNavigatorPrivate() ) { - if (tqparent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) - setParentView( dynamic_cast<TQScrollView*>(tqparent) ); + if (parent->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) + setParentView( dynamic_cast<TQScrollView*>(parent) ); setFrameStyle(TQFrame::NoFrame); d->lyr = new TQHBoxLayout(this,0,0,"nav_lyr"); diff --git a/kexi/widget/utils/kexirecordnavigator.h b/kexi/widget/utils/kexirecordnavigator.h index 29faf115..9eae328b 100644 --- a/kexi/widget/utils/kexirecordnavigator.h +++ b/kexi/widget/utils/kexirecordnavigator.h @@ -68,7 +68,7 @@ class KEXIGUIUTILS_EXPORT KexiRecordNavigator : public TQFrame TQ_OBJECT public: - KexiRecordNavigator(TQWidget *tqparent, int leftMargin = 0, const char *name=0); + KexiRecordNavigator(TQWidget *parent, int leftMargin = 0, const char *name=0); virtual ~KexiRecordNavigator(); void setParentView(TQScrollView *view); diff --git a/kexi/widget/utils/kexitooltip.cpp b/kexi/widget/utils/kexitooltip.cpp index d5df13aa..7d71752c 100644 --- a/kexi/widget/utils/kexitooltip.cpp +++ b/kexi/widget/utils/kexitooltip.cpp @@ -29,8 +29,8 @@ #include <tqtimer.h> -KexiToolTip::KexiToolTip(const TQVariant& value, TQWidget* tqparent) - : TQWidget(tqparent, "KexiToolTip", TQt::WStyle_Customize | TQt::WType_Popup | TQt::WStyle_NoBorder +KexiToolTip::KexiToolTip(const TQVariant& value, TQWidget* parent) + : TQWidget(parent, "KexiToolTip", TQt::WStyle_Customize | TQt::WType_Popup | TQt::WStyle_NoBorder | TQt::WX11BypassWM | TQt::WDestructiveClose) , m_value(value) { diff --git a/kexi/widget/utils/kexitooltip.h b/kexi/widget/utils/kexitooltip.h index 3ff93120..cfa1b483 100644 --- a/kexi/widget/utils/kexitooltip.h +++ b/kexi/widget/utils/kexitooltip.h @@ -29,7 +29,7 @@ class KEXIGUIUTILS_EXPORT KexiToolTip : public TQWidget Q_OBJECT TQ_OBJECT public: - KexiToolTip(const TQVariant& value, TQWidget* tqparent); + KexiToolTip(const TQVariant& value, TQWidget* parent); virtual ~KexiToolTip(); virtual TQSize tqsizeHint() const; diff --git a/kexi/widget/utils/klistviewitemtemplate.h b/kexi/widget/utils/klistviewitemtemplate.h index 3807d43c..45a5b889 100644 --- a/kexi/widget/utils/klistviewitemtemplate.h +++ b/kexi/widget/utils/klistviewitemtemplate.h @@ -27,22 +27,22 @@ template<class type> class KListViewItemTemplate : public KListViewItem { public: - KListViewItemTemplate(type _data, TQListView *tqparent) - : KListViewItem(tqparent), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *tqparent) - : KListViewItem(tqparent), data(_data) {} - KListViewItemTemplate(type _data, TQListView *tqparent, TQListViewItem *after) - : KListViewItem(tqparent, after), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQListViewItem *after) - : KListViewItem(tqparent, after), data(_data) {} - KListViewItemTemplate(type _data, TQListView *tqparent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(tqparent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListView *tqparent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} - KListViewItemTemplate(type _data, TQListViewItem *tqparent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) - : KListViewItem(tqparent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + KListViewItemTemplate(type _data, TQListView *parent) + : KListViewItem(parent), data(_data) {} + KListViewItemTemplate(type _data, TQListViewItem *parent) + : KListViewItem(parent), data(_data) {} + KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after) + : KListViewItem(parent, after), data(_data) {} + KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after) + : KListViewItem(parent, after), data(_data) {} + KListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + KListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} + KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString()) + : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {} type data; }; |