diff options
Diffstat (limited to 'kexi/plugins')
42 files changed, 364 insertions, 364 deletions
diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 9b1af9c1..b282385b 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -430,8 +430,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ d->actionCategoriesListView = new ActionCategoriesListView(mainWidget); d->actionCategoriesListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); d->glyr->addWidget(d->actionCategoriesListView, 1, 0); - connect( d->actionCategoriesListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotActionCategorySelected(TQListViewItem*))); + connect( d->actionCategoriesListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotActionCategorySelected(TQListViewItem*))); TQLabel *lbl = new TQLabel(d->actionCategoriesListView, i18n("Action category:"), mainWidget); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); @@ -453,8 +453,8 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ // 2nd column: list of actions/objects d->objectsListView = new KexiBrowser(d->secondAnd3rdColumnMainWidget, d->mainWin, 0/*features*/); d->secondAnd3rdColumnGrLyr->addWidget(d->objectsListView, 1, 0); - connect(d->objectsListView, TQT_SIGNAL(selectionChanged(KexiPart::Item*)), - this, TQT_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*))); + connect(d->objectsListView, TQ_SIGNAL(selectionChanged(KexiPart::Item*)), + this, TQ_SLOT(slotItemForOpeningOrExecutingSelected(KexiPart::Item*))); d->selectActionToBeExecutedLbl = new TQLabel(d->secondAnd3rdColumnMainWidget); d->selectActionToBeExecutedLbl->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); @@ -470,10 +470,10 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ d->actionToExecuteListView->installEventFilter(this); //to be able to disable painting d->actionToExecuteListView->viewport()->installEventFilter(this); //to be able to disable painting d->actionToExecuteListView->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); - connect(d->actionToExecuteListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*))); - connect(d->actionToExecuteListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotActionToExecuteItemSelected(TQListViewItem*))); + connect(d->actionToExecuteListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotActionToExecuteItemExecuted(TQListViewItem*))); + connect(d->actionToExecuteListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotActionToExecuteItemSelected(TQListViewItem*))); d->secondAnd3rdColumnGrLyr->addWidget(d->actionToExecuteListView, 1, 1); d->actionToExecuteLbl = new TQLabel(d->actionToExecuteListView, @@ -594,10 +594,10 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) vlyr->addWidget(lbl); vlyr->addWidget(d->tdeactionListView); d->secondAnd3rdColumnStack->addWidget(d->tdeactionPageWidget); - connect(d->tdeactionListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*))); - connect( d->tdeactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*))); + connect(d->tdeactionListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotTDEActionItemExecuted(TQListViewItem*))); + connect( d->tdeactionListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotTDEActionItemSelected(TQListViewItem*))); } d->setActionToExecuteSectionVisible(false); d->raiseWidget(d->tdeactionPageWidget); @@ -619,10 +619,10 @@ void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) vlyr->addWidget(lbl); vlyr->addWidget(d->currentFormActionsListView); d->secondAnd3rdColumnStack->addWidget(d->currentFormActionsPageWidget); - connect(d->currentFormActionsListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotCurrentFormActionItemExecuted(TQListViewItem*))); - connect( d->currentFormActionsListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotCurrentFormActionItemSelected(TQListViewItem*))); + connect(d->currentFormActionsListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotCurrentFormActionItemExecuted(TQListViewItem*))); + connect( d->currentFormActionsListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotCurrentFormActionItemSelected(TQListViewItem*))); } d->setActionToExecuteSectionVisible(false); d->raiseWidget(d->currentFormActionsPageWidget); diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index ba21827e..d673f5f3 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -88,7 +88,7 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_clearWidgetDSButton->setMinimumHeight(m_widgetDSLabel->minimumHeight()); TQToolTip::add(m_clearWidgetDSButton, i18n("Clear widget's data source")); hlyr->addWidget(m_clearWidgetDSButton); - connect(m_clearWidgetDSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearWidgetDataSourceSelection())); + connect(m_clearWidgetDSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearWidgetDataSourceSelection())); m_sourceFieldCombo = new KexiFieldComboBox(contents, "sourceFieldCombo"); m_widgetDSLabel->setBuddy(m_sourceFieldCombo); @@ -114,13 +114,13 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_gotoButton->setMinimumHeight(m_dataSourceLabel->minimumHeight()); TQToolTip::add(m_gotoButton, i18n("Go to selected form's data source")); hlyr->addWidget(m_gotoButton); - connect(m_gotoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGotoSelected())); + connect(m_gotoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGotoSelected())); m_clearDSButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearDSButton"); m_clearDSButton->setMinimumHeight(m_dataSourceLabel->minimumHeight()); TQToolTip::add(m_clearDSButton, i18n("Clear form's data source")); hlyr->addWidget(m_clearDSButton); - connect(m_clearDSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearDataSourceSelection())); + connect(m_clearDSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearDataSourceSelection())); m_dataSourceCombo = new KexiDataSourceComboBox(contents, "dataSourceCombo"); m_dataSourceLabel->setBuddy(m_dataSourceCombo); @@ -179,23 +179,23 @@ KexiDataSourcePage::KexiDataSourcePage(TQWidget *parent, const char *name) m_addField->setFocusPolicy(TQWidget::StrongFocus); TQToolTip::add(m_addField, i18n("Insert selected fields into form")); hlyr->addWidget(m_addField); - connect(m_addField, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSelectedFields())); + connect(m_addField, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInsertSelectedFields())); m_fieldListView = new KexiFieldListView(contents, "fieldListView", KexiFieldListView::ShowDataTypes | KexiFieldListView::AllowMultiSelection ); m_fieldListView->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding)); m_availableFieldsLabel->setBuddy(m_fieldListView); contentsVlyr->addWidget(m_fieldListView, 1); - connect(m_fieldListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotFieldListViewSelectionChanged())); - connect(m_fieldListView, TQT_SIGNAL(fieldDoubleClicked(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotFieldDoubleClicked(const TQString&, const TQString&, const TQString&))); + connect(m_fieldListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotFieldListViewSelectionChanged())); + connect(m_fieldListView, TQ_SIGNAL(fieldDoubleClicked(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotFieldDoubleClicked(const TQString&, const TQString&, const TQString&))); #endif vlyr->addStretch(1); - connect(m_dataSourceCombo, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotDataSourceTextChanged(const TQString &))); - connect(m_dataSourceCombo, TQT_SIGNAL(dataSourceChanged()), this, TQT_SLOT(slotDataSourceChanged())); - connect(m_sourceFieldCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotFieldSelected())); + connect(m_dataSourceCombo, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotDataSourceTextChanged(const TQString &))); + connect(m_dataSourceCombo, TQ_SIGNAL(dataSourceChanged()), this, TQ_SLOT(slotDataSourceChanged())); + connect(m_sourceFieldCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotFieldSelected())); clearDataSourceSelection(); slotFieldListViewSelectionChanged(); diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 19241a36..1dbffdb1 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -384,7 +384,7 @@ KexiDBFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, #ifndef KEXI_NO_IMAGEBOX_WIDGET else if(c == "KexiDBImageBox") { w = new KexiDBImageBox(designMode, p, n); - connect(w, TQT_SIGNAL(idChanged(long)), this, TQT_SLOT(slotImageBoxIdChanged(long))); + connect(w, TQ_SIGNAL(idChanged(long)), this, TQ_SLOT(slotImageBoxIdChanged(long))); } #endif #ifndef KEXI_NO_AUTOFIELD_WIDGET diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index aae99906..f7a247ec 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -174,14 +174,14 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() ); if (!action) continue; - TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); //safety - TQObject::connect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); + TQObject::disconnect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); //safety + TQObject::connect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); } else if (partInfo) { //'open or execute' action KexiFormEventAction* action = new KexiFormEventAction(mainWin, obj, actionType, actionArg, data.option); - TQObject::disconnect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); - TQObject::connect( obj, TQT_SIGNAL(clicked()), action, TQT_SLOT(activate()) ); + TQObject::disconnect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); + TQObject::connect( obj, TQ_SIGNAL(clicked()), action, TQ_SLOT(activate()) ); } } delete l; diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index e5d7addf..4ba0442a 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -107,13 +107,13 @@ KexiFormPart::KexiFormPart(TQObject *parent, const char *name, const TQStringLis static_formsLibrary = KFormDesigner::FormManager::createWidgetLibrary( formManager, supportedFactoryGroups); static_formsLibrary->setAdvancedPropertiesVisible(false); - connect(static_formsLibrary, TQT_SIGNAL(widgetCreated(TQWidget*)), - this, TQT_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*))); + connect(static_formsLibrary, TQ_SIGNAL(widgetCreated(TQWidget*)), + this, TQ_SLOT(slotWidgetCreatedByFormsLibrary(TQWidget*))); - connect(KFormDesigner::FormManager::self()->propertySet(), TQT_SIGNAL(widgetPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)), - this, TQT_SLOT(slotPropertyChanged(TQWidget *, const TQCString &, const TQVariant&))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)), - this, TQT_SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool))); + connect(KFormDesigner::FormManager::self()->propertySet(), TQ_SIGNAL(widgetPropertyChanged(TQWidget *, const TQCString &, const TQVariant&)), + this, TQ_SLOT(slotPropertyChanged(TQWidget *, const TQCString &, const TQVariant&))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(autoTabStopsSet(KFormDesigner::Form*,bool)), + this, TQ_SLOT(slotAutoTabStopsSet(KFormDesigner::Form*,bool))); } KexiFormPart::~KexiFormPart() @@ -143,8 +143,8 @@ void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col ) { if (mode==Kexi::DesignViewMode) { KFormDesigner::FormManager::self()->createActions(col, 0); - new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder()), col, "taborder"); - new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(ajustWidgetSize()), col, "adjust"); + new TDEAction(i18n("Edit Tab Order..."), "tab_order", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder()), col, "taborder"); + new TDEAction(i18n("Adjust Size"), "zoom-fit-best", TDEShortcut(0), KFormDesigner::FormManager::self(), TQ_SLOT(ajustWidgetSize()), col, "adjust"); } //TODO } @@ -152,7 +152,7 @@ void KexiFormPart::initInstanceActions( int mode, TDEActionCollection *col ) void KexiFormPart::initPartActions() { -// new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQT_SLOT(showFormUICode()), +// new TDEAction(i18n("Show Form UI Code"), "show_form_ui", CTRL+Key_U, m_manager, TQ_SLOT(showFormUICode()), // guiClient()->actionCollection(), "show_form_ui"); } @@ -162,7 +162,7 @@ void KexiFormPart::initInstanceActions() kapp->config()->setGroup("General"); if (kapp->config()->readBoolEntry("showInternalDebugger", false)) { new TDEAction(i18n("Show Form UI Code"), "compfile", - CTRL+Key_U, KFormDesigner::FormManager::self(), TQT_SLOT(showFormUICode()), + CTRL+Key_U, KFormDesigner::FormManager::self(), TQ_SLOT(showFormUICode()), actionCollectionForMode(Kexi::DesignViewMode), "show_form_ui"); } #endif @@ -171,7 +171,7 @@ void KexiFormPart::initInstanceActions() KFormDesigner::FormManager::self()->createActions( library(), col, (KXMLGUIClient*)col->parentGUIClient() ); //guiClient() ); //connect actions provided by widget factories - connect( col->action("widget_assign_action"), TQT_SIGNAL(activated()), this, TQT_SLOT(slotAssignAction())); + connect( col->action("widget_assign_action"), TQ_SIGNAL(activated()), this, TQ_SLOT(slotAssignAction())); createSharedAction(Kexi::DesignViewMode, i18n("Clear Widget Contents"), "edit-clear", 0, "formpart_clear_contents"); createSharedAction(Kexi::DesignViewMode, i18n("Edit Tab Order..."), "tab_order", 0, "formpart_taborder"); @@ -488,14 +488,14 @@ void KexiFormPart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow* d->objectTreeView = new KFormDesigner::ObjectTreeView(0, "KexiFormPart:ObjectTreeView"); KFormDesigner::FormManager::self()->setObjectTreeView(d->objectTreeView); //important: assign to manager d->dataSourcePage = new KexiDataSourcePage(0, "dataSourcePage"); - connect(d->dataSourcePage, TQT_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)), - mainWin, TQT_SLOT(highlightObject(const TQCString&, const TQCString&))); - connect(d->dataSourcePage, TQT_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)), - KFormDesigner::FormManager::self(), TQT_SLOT(setFormDataSource(const TQCString&, const TQCString&))); - connect(d->dataSourcePage, TQT_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)), - KFormDesigner::FormManager::self(), TQT_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type))); - connect(d->dataSourcePage, TQT_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)), - KFormDesigner::FormManager::self(), TQT_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&))); + connect(d->dataSourcePage, TQ_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)), + mainWin, TQ_SLOT(highlightObject(const TQCString&, const TQCString&))); + connect(d->dataSourcePage, TQ_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)), + KFormDesigner::FormManager::self(), TQ_SLOT(setFormDataSource(const TQCString&, const TQCString&))); + connect(d->dataSourcePage, TQ_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)), + KFormDesigner::FormManager::self(), TQ_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type))); + connect(d->dataSourcePage, TQ_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)), + KFormDesigner::FormManager::self(), TQ_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&))); } KexiProject *prj = mainWin->project(); @@ -520,16 +520,16 @@ void KexiFormPart::slotWidgetCreatedByFormsLibrary(TQWidget* widget) kdDebug() << it.current() << endl; KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView"); if (formView) { - connect(widget, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), - formView, TQT_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*))); + connect(widget, TQ_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), + formView, TQ_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*))); } } else if (0==qstrcmp(it.current(), handleDropEventSignal)) { kdDebug() << it.current() << endl; KexiFormView *formView = KexiUtils::findParent<KexiFormView>(widget, "KexiFormView"); if (formView) { - connect(widget, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), - formView, TQT_SLOT(slotHandleDropEvent(TQDropEvent*))); + connect(widget, TQ_SIGNAL(handleDropEvent(TQDropEvent*)), + formView, TQ_SLOT(slotHandleDropEvent(TQDropEvent*))); } } } diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index 4e0677f8..86d66517 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -49,7 +49,7 @@ KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview) // recordNavigator()->showEditingIndicator(true); } - connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted())); + connect(this, TQ_SIGNAL(resizingStarted()), this, TQ_SLOT(slotResizingStarted())); m_popupMenu = new TDEPopupMenu(this, "contextMenu"); @@ -288,9 +288,9 @@ KexiDataItemInterface *KexiFormScrollView::editor( int col, bool ignoreMissingEd return 0; } editor->hide(); - connect(editor,TQT_SIGNAL(editRequested()),this,TQT_SLOT(slotEditRequested())); - connect(editor,TQT_SIGNAL(cancelRequested()),this,TQT_SLOT(cancelEditor())); - connect(editor,TQT_SIGNAL(acceptRequested()),this,TQT_SLOT(acceptEditor())); + connect(editor,TQ_SIGNAL(editRequested()),this,TQ_SLOT(slotEditRequested())); + connect(editor,TQ_SIGNAL(cancelRequested()),this,TQ_SLOT(cancelEditor())); + connect(editor,TQ_SIGNAL(acceptRequested()),this,TQ_SLOT(acceptEditor())); editor->resize(columnWidth(col)-1, rowHeight()-1); editor->installEventFilter(this); diff --git a/kexi/plugins/forms/kexiformview.cpp b/kexi/plugins/forms/kexiformview.cpp index 6ea8bd15..d9423cd8 100644 --- a/kexi/plugins/forms/kexiformview.cpp +++ b/kexi/plugins/forms/kexiformview.cpp @@ -91,67 +91,67 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, if (viewMode()==Kexi::DataViewMode) { m_scrollView->recordNavigator()->setRecordHandler( m_scrollView ); m_scrollView->viewport()->setPaletteBackgroundColor(m_dbform->palette().active().background()); -//moved to formmanager connect(formPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected())); +//moved to formmanager connect(formPart()->manager(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected())); } else { - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)), - this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form *, bool)), - this, TQT_SLOT(slotDirty(KFormDesigner::Form *, bool))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set*, bool, const TQCString&)), + this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set*, bool, const TQCString&))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form *, bool)), + this, TQ_SLOT(slotDirty(KFormDesigner::Form *, bool))); - connect(m_dbform, TQT_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), - this, TQT_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*))); - connect(m_dbform, TQT_SIGNAL(handleDropEvent(TQDropEvent*)), - this, TQT_SLOT(slotHandleDropEvent(TQDropEvent*))); + connect(m_dbform, TQ_SIGNAL(handleDragMoveEvent(TQDragMoveEvent*)), + this, TQ_SLOT(slotHandleDragMoveEvent(TQDragMoveEvent*))); + connect(m_dbform, TQ_SIGNAL(handleDropEvent(TQDropEvent*)), + this, TQ_SLOT(slotHandleDropEvent(TQDropEvent*))); // action stuff - plugSharedAction("formpart_taborder", KFormDesigner::FormManager::self(), TQT_SLOT(editTabOrder())); - plugSharedAction("formpart_adjust_size", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize())); -//TODO plugSharedAction("formpart_pixmap_collection", formPart()->manager(), TQT_SLOT(editFormPixmapCollection())); -//TODO plugSharedAction("formpart_connections", formPart()->manager(), TQT_SLOT(editConnections())); - - plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget())); - plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget())); - plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget())); - plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget())); - plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQT_SLOT(selectAll())); - plugSharedAction("formpart_clear_contents", KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent())); - plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQT_SLOT(undo())); - plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo())); + plugSharedAction("formpart_taborder", KFormDesigner::FormManager::self(), TQ_SLOT(editTabOrder())); + plugSharedAction("formpart_adjust_size", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize())); +//TODO plugSharedAction("formpart_pixmap_collection", formPart()->manager(), TQ_SLOT(editFormPixmapCollection())); +//TODO plugSharedAction("formpart_connections", formPart()->manager(), TQ_SLOT(editConnections())); + + plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget())); + plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget())); + plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget())); + plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget())); + plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQ_SLOT(selectAll())); + plugSharedAction("formpart_clear_contents", KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent())); + plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQ_SLOT(undo())); + plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQ_SLOT(redo())); plugSharedAction("formpart_layout_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()) ); - plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()) ); - plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()) ); + plugSharedAction("formpart_layout_hbox", KFormDesigner::FormManager::self(), TQ_SLOT(layoutHBox()) ); + plugSharedAction("formpart_layout_vbox", KFormDesigner::FormManager::self(), TQ_SLOT(layoutVBox()) ); + plugSharedAction("formpart_layout_grid", KFormDesigner::FormManager::self(), TQ_SLOT(layoutGrid()) ); #ifdef KEXI_SHOW_SPLITTER_WIDGET - plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutHSplitter()) ); - plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQT_SLOT(layoutVSplitter()) ); + plugSharedAction("formpart_layout_hsplitter", KFormDesigner::FormManager::self(), TQ_SLOT(layoutHSplitter()) ); + plugSharedAction("formpart_layout_vsplitter", KFormDesigner::FormManager::self(), TQ_SLOT(layoutVSplitter()) ); #endif - plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()) ); + plugSharedAction("formpart_break_layout", KFormDesigner::FormManager::self(), TQ_SLOT(breakLayout()) ); - plugSharedAction("formpart_format_raise", KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()) ); - plugSharedAction("formpart_format_lower", KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()) ); + plugSharedAction("formpart_format_raise", KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()) ); + plugSharedAction("formpart_format_lower", KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()) ); plugSharedAction("other_widgets_menu", KFormDesigner::FormManager::self(), 0 ); setAvailable("other_widgets_menu", true); plugSharedAction("formpart_align_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("formpart_align_to_left", KFormDesigner::FormManager::self(),TQT_SLOT(alignWidgetsToLeft()) ); - plugSharedAction("formpart_align_to_right", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()) ); - plugSharedAction("formpart_align_to_top", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()) ); - plugSharedAction("formpart_align_to_bottom", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()) ); - plugSharedAction("formpart_align_to_grid", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()) ); + plugSharedAction("formpart_align_to_left", KFormDesigner::FormManager::self(),TQ_SLOT(alignWidgetsToLeft()) ); + plugSharedAction("formpart_align_to_right", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()) ); + plugSharedAction("formpart_align_to_top", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()) ); + plugSharedAction("formpart_align_to_bottom", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()) ); + plugSharedAction("formpart_align_to_grid", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()) ); plugSharedAction("formpart_adjust_size_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("formpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()) ); - plugSharedAction("formpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()) ); - plugSharedAction("formpart_adjust_height_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()) ); - plugSharedAction("formpart_adjust_height_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()) ); - plugSharedAction("formpart_adjust_width_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()) ); - plugSharedAction("formpart_adjust_width_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()) ); - - plugSharedAction("format_font", KFormDesigner::FormManager::self(), TQT_SLOT(changeFont()) ); + plugSharedAction("formpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()) ); + plugSharedAction("formpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()) ); + plugSharedAction("formpart_adjust_height_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()) ); + plugSharedAction("formpart_adjust_height_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()) ); + plugSharedAction("formpart_adjust_width_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()) ); + plugSharedAction("formpart_adjust_width_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()) ); + + plugSharedAction("format_font", KFormDesigner::FormManager::self(), TQ_SLOT(changeFont()) ); } initForm(); @@ -159,7 +159,7 @@ KexiFormView::KexiFormView(KexiMainWindow *mainWin, TQWidget *parent, KexiDataAwareView::init( m_scrollView, m_scrollView, m_scrollView, /* skip data-awarness if design mode */ viewMode()==Kexi::DesignViewMode ); - connect(this, TQT_SIGNAL(focus(bool)), this, TQT_SLOT(slotFocus(bool))); + connect(this, TQ_SIGNAL(focus(bool)), this, TQ_SLOT(slotFocus(bool))); /// @todo skip this if ther're no borders // m_dbform->resize( m_dbform->size()+TQSize(m_scrollView->verticalScrollBar()->width(), m_scrollView->horizontalScrollBar()->height()) ); } @@ -225,8 +225,8 @@ KexiFormView::initForm() if (viewMode()==Kexi::DesignViewMode) { //we want to be informed about executed commands - connect(form()->commandHistory(), TQT_SIGNAL(commandExecuted()), - KFormDesigner::FormManager::self(), TQT_SLOT(slotHistoryCommandExecuted())); + connect(form()->commandHistory(), TQ_SIGNAL(commandExecuted()), + KFormDesigner::FormManager::self(), TQ_SLOT(slotHistoryCommandExecuted())); } const bool newForm = parentDialog()->id() < 0; diff --git a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp index d97fe7d9..0f36a427 100644 --- a/kexi/plugins/forms/widgets/kexidbcheckbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcheckbox.cpp @@ -31,7 +31,7 @@ KexiDBCheckBox::KexiDBCheckBox(const TQString &text, TQWidget *parent, const cha { setFocusPolicy(TQWidget::StrongFocus); updateTristate(); - connect(this, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotStateChanged(int))); + connect(this, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotStateChanged(int))); } KexiDBCheckBox::~KexiDBCheckBox() diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index 5fb89443..ac97d639 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -317,7 +317,7 @@ void KexiDBComboBox::mousePressEvent( TQMouseEvent *e ) if (handleMousePressEvent(e)) return; -// TQTimer::singleShot( 200, this, TQT_SLOT(internalClickTimeout())); +// TQTimer::singleShot( 200, this, TQ_SLOT(internalClickTimeout())); // d->shortClick = TRUE; // } KexiDBAutoField::mousePressEvent( e ); diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index da8c9fc4..58dee2e6 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -38,8 +38,8 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char m_edit = new TQDateEdit(date, this); m_edit->setAutoAdvance(true); m_edit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); - connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&)) ); - connect( m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateChanged(const TQDate&)) ); + connect( m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged(const TQDate&)) ); + connect( m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SIGNAL(dateChanged(const TQDate&)) ); TQToolButton* btn = new TQToolButton(this); btn->setText("..."); @@ -53,12 +53,12 @@ KexiDBDateEdit::KexiDBDateEdit(const TQDate &date, TQWidget *parent, const char #endif m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup"); - connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); + connect(m_datePickerPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotShowDatePicker())); m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable"); if (dt) - connect(dt, TQT_SIGNAL(tableClicked()), this, TQT_SLOT(acceptDate())); + connect(dt, TQ_SIGNAL(tableClicked()), this, TQ_SLOT(acceptDate())); m_datePicker->setCloseButton(true); m_datePicker->installEventFilter(this); m_datePickerPopupMenu->insertItem(m_datePicker); diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 35506591..6b62f805 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -38,8 +38,8 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_dateEdit->setAutoAdvance(true); m_dateEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); // m_dateEdit->setFixedWidth( TQFontMetrics(m_dateEdit->font()).width("8888-88-88___") ); - connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged())); - connect(m_dateEdit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SIGNAL(dateTimeChanged())); + connect(m_dateEdit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged())); + connect(m_dateEdit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SIGNAL(dateTimeChanged())); TQToolButton* btn = new TQToolButton(this); btn->setText("..."); @@ -49,8 +49,8 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par m_timeEdit = new TQTimeEdit(datetime.time(), this);; m_timeEdit->setAutoAdvance(true); m_timeEdit->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding); - connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged())); - connect(m_timeEdit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SIGNAL(dateTimeChanged())); + connect(m_timeEdit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged())); + connect(m_timeEdit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SIGNAL(dateTimeChanged())); #ifdef TQDateTimeEditor_HACK m_dte_date = KexiUtils::findFirstChild<TQDateTimeEditor>(m_dateEdit, "TQDateTimeEditor"); @@ -60,12 +60,12 @@ KexiDBDateTimeEdit::KexiDBDateTimeEdit(const TQDateTime &datetime, TQWidget *par #endif m_datePickerPopupMenu = new TDEPopupMenu(0, "date_popup"); - connect(m_datePickerPopupMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotShowDatePicker())); + connect(m_datePickerPopupMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotShowDatePicker())); m_datePicker = new KDatePicker(m_datePickerPopupMenu, TQDate::currentDate(), 0); KDateTable *dt = KexiUtils::findFirstChild<KDateTable>(m_datePicker, "KDateTable"); if (dt) - connect(dt, TQT_SIGNAL(tableClicked()), this, TQT_SLOT(acceptDate())); + connect(dt, TQ_SIGNAL(tableClicked()), this, TQ_SLOT(acceptDate())); m_datePicker->setCloseButton(true); m_datePicker->installEventFilter(this); m_datePickerPopupMenu->insertItem(m_datePicker); diff --git a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp index 0fdc08cf..195cecc1 100644 --- a/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbdoublespinbox.cpp @@ -25,7 +25,7 @@ KexiDBDoubleSpinBox::KexiDBDoubleSpinBox(TQWidget *parent, const char *name) : KDoubleSpinBox(parent, name) , KexiFormDataItemInterface() { - connect(this, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged())); + connect(this, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotValueChanged())); } KexiDBDoubleSpinBox::~KexiDBDoubleSpinBox() diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 1d74f94f..2fec335d 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -106,29 +106,29 @@ KexiDBImageBox::KexiDBImageBox( bool designMode, TQWidget *parent, const char *n m_paletteBackgroundColorChanged = false; //set this here, not before - connect(m_popupMenu, TQT_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), - this, TQT_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&))); - connect(m_popupMenu, TQT_SIGNAL(insertFromFileRequested(const KURL&)), - this, TQT_SLOT(handleInsertFromFileAction(const KURL&))); - connect(m_popupMenu, TQT_SIGNAL(saveAsRequested(const TQString&)), - this, TQT_SLOT(handleSaveAsAction(const TQString&))); - connect(m_popupMenu, TQT_SIGNAL(cutRequested()), - this, TQT_SLOT(handleCutAction())); - connect(m_popupMenu, TQT_SIGNAL(copyRequested()), - this, TQT_SLOT(handleCopyAction())); - connect(m_popupMenu, TQT_SIGNAL(pasteRequested()), - this, TQT_SLOT(handlePasteAction())); - connect(m_popupMenu, TQT_SIGNAL(clearRequested()), - this, TQT_SLOT(clear())); - connect(m_popupMenu, TQT_SIGNAL(showPropertiesRequested()), - this, TQT_SLOT(handleShowPropertiesAction())); - -// connect(m_popupMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotAboutToHidePopupMenu())); + connect(m_popupMenu, TQ_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)), + this, TQ_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&))); + connect(m_popupMenu, TQ_SIGNAL(insertFromFileRequested(const KURL&)), + this, TQ_SLOT(handleInsertFromFileAction(const KURL&))); + connect(m_popupMenu, TQ_SIGNAL(saveAsRequested(const TQString&)), + this, TQ_SLOT(handleSaveAsAction(const TQString&))); + connect(m_popupMenu, TQ_SIGNAL(cutRequested()), + this, TQ_SLOT(handleCutAction())); + connect(m_popupMenu, TQ_SIGNAL(copyRequested()), + this, TQ_SLOT(handleCopyAction())); + connect(m_popupMenu, TQ_SIGNAL(pasteRequested()), + this, TQ_SLOT(handlePasteAction())); + connect(m_popupMenu, TQ_SIGNAL(clearRequested()), + this, TQ_SLOT(clear())); + connect(m_popupMenu, TQ_SIGNAL(showPropertiesRequested()), + this, TQ_SLOT(handleShowPropertiesAction())); + +// connect(m_popupMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotAboutToHidePopupMenu())); // if (m_chooser) { //we couldn't use m_chooser->setPopup() because of drawing problems -// connect(m_chooser, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooserPressed())); -// connect(m_chooser, TQT_SIGNAL(released()), this, TQT_SLOT(slotChooserReleased())); -// connect(m_chooser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled(bool))); +// connect(m_chooser, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChooserPressed())); +// connect(m_chooser, TQ_SIGNAL(released()), this, TQ_SLOT(slotChooserReleased())); +// connect(m_chooser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled(bool))); // } setDataSource( TQString() ); //to initialize popup menu and actions availability diff --git a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp index 633fe6fc..d574963b 100644 --- a/kexi/plugins/forms/widgets/kexidbintspinbox.cpp +++ b/kexi/plugins/forms/widgets/kexidbintspinbox.cpp @@ -26,7 +26,7 @@ KexiDBIntSpinBox::KexiDBIntSpinBox(TQWidget *parent, const char *name) : KIntSpinBox(parent, name) , KexiFormDataItemInterface() { - connect(this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged())); + connect(this, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged())); } KexiDBIntSpinBox::~KexiDBIntSpinBox() diff --git a/kexi/plugins/forms/widgets/kexidblabel.cpp b/kexi/plugins/forms/widgets/kexidblabel.cpp index 93f35027..7df46895 100644 --- a/kexi/plugins/forms/widgets/kexidblabel.cpp +++ b/kexi/plugins/forms/widgets/kexidblabel.cpp @@ -433,7 +433,7 @@ void KexiDBLabel::updatePixmapLater() { if (d->resizeEvent) { if (!d->timer) { d->timer = new TQTimer(this, "KexiDBLabelTimer"); - connect(d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updatePixmap())); + connect(d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updatePixmap())); } d->timer->start(100, true); d->resizeEvent = false; diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp index e0395cde..eebe699d 100644 --- a/kexi/plugins/forms/widgets/kexidblineedit.cpp +++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp @@ -67,7 +67,7 @@ KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name) widget->setPalette(p); #endif - connect(this, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged(const TQString&))); + connect(this, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged(const TQString&))); } KexiDBLineEdit::~KexiDBLineEdit() diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index 3b9c6f09..96060220 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -35,7 +35,7 @@ KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name) , m_menuExtender(this, this) , m_slotTextChanged_enabled(true) { - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); installEventFilter(this); } diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp index ac42fa85..1233c1dd 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp @@ -42,7 +42,7 @@ KexiDBTimeEdit::KexiDBTimeEdit(const TQTime &time, TQWidget *parent, const char m_dte_time = 0; #endif - connect(this, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged(const TQTime&))); + connect(this, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged(const TQTime&))); } KexiDBTimeEdit::~KexiDBTimeEdit() diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 19e30f24..5719f9f0 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -109,7 +109,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_fileSavePage->setAdditionalFilters( csvMimeTypes() ); m_fileSavePage->setDefaultExtension("csv"); m_fileSavePage->setLocationText( KexiUtils::stringToFileName(m_tableOrQuery->captionOrName()) ); - connect(m_fileSavePage, TQT_SIGNAL(rejected()), this, TQT_SLOT(reject())); + connect(m_fileSavePage, TQ_SIGNAL(rejected()), this, TQ_SLOT(reject())); addPage(m_fileSavePage, i18n("Enter Name of File You Want to Save Data To")); } @@ -135,7 +135,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_showOptionsButton = new KPushButton(KGuiItem(i18n("Show Options >>"), "configure"), m_exportOptionsPage); - connect(m_showOptionsButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotShowOptionsButtonClicked())); + connect(m_showOptionsButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotShowOptionsButtonClicked())); exportOptionsLyr->addMultiCellWidget(m_showOptionsButton, 2, 2, 0, 0); m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); @@ -358,7 +358,7 @@ void KexiCSVExportWizard::layOutButtonRow( TQHBoxLayout * layout ) if (!m_defaultsBtn) { m_defaultsBtn = new KPushButton(i18n("Defaults"), this); TQWidget::setTabOrder(backButton(), m_defaultsBtn); - connect(m_defaultsBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultsButtonClicked())); + connect(m_defaultsBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultsButtonClicked())); } if (!m_exportOptionsSection->isVisible()) m_defaultsBtn->hide(); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 61f86ec2..26efa602 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -235,7 +235,7 @@ KexiCSVImportDialog::KexiCSVImportDialog( Mode mode, KexiMainWindow* mainWin, m_primaryKeyField = new TQCheckBox( i18n( "Primary key" ), page, "m_primaryKeyField" ); glyr->addWidget( m_primaryKeyField, 2, 1 ); - connect(m_primaryKeyField, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPrimaryKeyFieldToggled(bool))); + connect(m_primaryKeyField, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPrimaryKeyFieldToggled(bool))); m_comboQuote = new KexiCSVTextQuoteComboBox( page ); glyr->addWidget( m_comboQuote, 1, 2 ); @@ -364,24 +364,24 @@ if ( m_mode == Clipboard ) m_table->setSelectionMode(TQTable::NoSelection); - connect(m_formatCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(formatChanged(int))); - connect(m_delimiterWidget, TQT_SIGNAL(delimiterChanged(const TQString&)), - this, TQT_SLOT(delimiterChanged(const TQString&))); - connect(m_startAtLineSpinBox, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(startlineSelected(int))); - connect(m_comboQuote, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(textquoteSelected(int))); - connect(m_table, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(currentCellChanged(int, int))); - connect(m_table, TQT_SIGNAL(valueChanged(int,int)), - this, TQT_SLOT(cellValueChanged(int,int))); - connect(m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(ignoreDuplicatesChanged(int))); - connect(m_1stRowForFieldNames, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(slot1stRowForFieldNamesChanged(int))); - - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(optionsButtonClicked())); + connect(m_formatCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(formatChanged(int))); + connect(m_delimiterWidget, TQ_SIGNAL(delimiterChanged(const TQString&)), + this, TQ_SLOT(delimiterChanged(const TQString&))); + connect(m_startAtLineSpinBox, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(startlineSelected(int))); + connect(m_comboQuote, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(textquoteSelected(int))); + connect(m_table, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(currentCellChanged(int, int))); + connect(m_table, TQ_SIGNAL(valueChanged(int,int)), + this, TQ_SLOT(cellValueChanged(int,int))); + connect(m_ignoreDuplicates, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(ignoreDuplicatesChanged(int))); + connect(m_1stRowForFieldNames, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(slot1stRowForFieldNamesChanged(int))); + + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(optionsButtonClicked())); installRecursiveEventFilter(this, this); @@ -406,7 +406,7 @@ void KexiCSVImportDialog::initLater() if (m_dialogCancelled) { // m_loadingProgressDlg->hide(); // m_loadingProgressDlg->close(); - TQTimer::singleShot(0, this, TQT_SLOT(reject())); + TQTimer::singleShot(0, this, TQ_SLOT(reject())); return; } @@ -1270,7 +1270,7 @@ void KexiCSVImportDialog::textquoteSelected(int) void KexiCSVImportDialog::fillTableLater() { m_table->setNumRows( 0 ); - TQTimer::singleShot(10, this, TQT_SLOT(fillTable())); + TQTimer::singleShot(10, this, TQ_SLOT(fillTable())); } void KexiCSVImportDialog::startlineSelected(int startline) diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index d424ffad..a63c3347 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -65,12 +65,12 @@ KexiCSVDelimiterWidget::KexiCSVDelimiterWidget( bool lineEditOnBottom, TQWidget lyr->addStretch(2); slotDelimiterChangedInternal(KEXICSV_DEFAULT_FILE_DELIMITER_INDEX); //this will init m_delimiter - connect(m_combo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDelimiterChanged(int))); - connect(m_delimiterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotDelimiterLineEditReturnPressed())); - connect(m_delimiterEdit, TQT_SIGNAL(textChanged( const TQString & )), - this, TQT_SLOT(slotDelimiterLineEditTextChanged( const TQString & ) )); + connect(m_combo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDelimiterChanged(int))); + connect(m_delimiterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotDelimiterLineEditReturnPressed())); + connect(m_delimiterEdit, TQ_SIGNAL(textChanged( const TQString & )), + this, TQ_SLOT(slotDelimiterLineEditTextChanged( const TQString & ) )); } void KexiCSVDelimiterWidget::slotDelimiterChanged(int index) diff --git a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp index dd8b9a92..2352e02f 100644 --- a/kexi/plugins/macros/kexipart/keximacrodesignview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrodesignview.cpp @@ -173,14 +173,14 @@ KexiMacroDesignView::KexiMacroDesignView(KexiMainWindow *mainwin, TQWidget *pare d->propertyset = new KexiDataAwarePropertySet(this, d->tableview); // Connect signals the KexiDataTable provides to local slots. - connect(d->tabledata, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), - this, TQT_SLOT(beforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); - connect(d->tabledata, TQT_SIGNAL(rowUpdated(KexiTableItem*)), - this, TQT_SLOT(rowUpdated(KexiTableItem*))); - connect(d->tabledata, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), - this, TQT_SLOT(rowInserted(KexiTableItem*,uint,bool))); - connect(d->tabledata, TQT_SIGNAL(rowDeleted()), - this, TQT_SLOT(rowDeleted())); + connect(d->tabledata, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), + this, TQ_SLOT(beforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); + connect(d->tabledata, TQ_SIGNAL(rowUpdated(KexiTableItem*)), + this, TQ_SLOT(rowUpdated(KexiTableItem*))); + connect(d->tabledata, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), + this, TQ_SLOT(rowInserted(KexiTableItem*,uint,bool))); + connect(d->tabledata, TQ_SIGNAL(rowDeleted()), + this, TQ_SLOT(rowDeleted())); // Everything is ready. So, update the data now. updateData(); @@ -382,8 +382,8 @@ void KexiMacroDesignView::updateProperties(int row, KoProperty::Set* set, TDESha // if there exists no such propertyset yet, create one. set = new KoProperty::Set(d->propertyset, action->name()); d->propertyset->insert(row, set, true); - connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(propertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(propertyChanged(KoProperty::Set&, KoProperty::Property&))); } // The caption. @@ -433,9 +433,9 @@ void KexiMacroDesignView::propertyChanged(KoProperty::Set& set, KoProperty::Prop updateProperties(row, &set, macroitem); } // It's needed to call the reload delayed cause in KoProperty::Editor - // TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); may lead + // TQTimer::singleShot(10, this, TQ_SLOT(selectItemLater())); may lead // to crashes if we are to fast. - TQTimer::singleShot(50, this, TQT_SLOT(reloadPropertyLater())); + TQTimer::singleShot(50, this, TQ_SLOT(reloadPropertyLater())); } d->reloadsProperties = false; diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp index 8b676fb0..d4ba42b4 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.cpp +++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp @@ -86,8 +86,8 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co } } - connect(designerbtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(designbtnClicked())); - connect(continuebtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(continuebtnClicked())); + connect(designerbtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(designbtnClicked())); + connect(continuebtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(continuebtnClicked())); } KexiMacroError::~KexiMacroError() @@ -125,6 +125,6 @@ void KexiMacroError::designbtnClicked() void KexiMacroError::continuebtnClicked() { - TQTimer::singleShot(200, d->context, TQT_SLOT(activateNext())); + TQTimer::singleShot(200, d->context, TQ_SLOT(activateNext())); close(); } diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 3bb5629d..45d21b10 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -543,14 +543,14 @@ KexiMacroPropertyWidget::KexiMacroPropertyWidget(KoProperty::Property* property, d->combobox->setFocusProxy( d->listbox->editItem()->widget() ); setFocusWidget( d->combobox->lineEdit() ); - connect(d->combobox, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotComboBoxChanged())); - connect(d->combobox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotComboBoxActivated())); - connect(d->listbox->editItem()->widget(), TQT_SIGNAL(valueChanged(Widget*)), - this, TQT_SLOT(slotWidgetValueChanged())); - connect(d->macroproperty, TQT_SIGNAL(valueChanged()), - this, TQT_SLOT(slotPropertyValueChanged())); + connect(d->combobox, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotComboBoxChanged())); + connect(d->combobox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotComboBoxActivated())); + connect(d->listbox->editItem()->widget(), TQ_SIGNAL(valueChanged(Widget*)), + this, TQ_SLOT(slotWidgetValueChanged())); + connect(d->macroproperty, TQ_SIGNAL(valueChanged()), + this, TQ_SLOT(slotPropertyValueChanged())); } KexiMacroPropertyWidget::~KexiMacroPropertyWidget() diff --git a/kexi/plugins/macros/kexipart/keximacrotextview.cpp b/kexi/plugins/macros/kexipart/keximacrotextview.cpp index 540dcc39..afbd0e8d 100644 --- a/kexi/plugins/macros/kexipart/keximacrotextview.cpp +++ b/kexi/plugins/macros/kexipart/keximacrotextview.cpp @@ -51,7 +51,7 @@ KexiMacroTextView::KexiMacroTextView(KexiMainWindow *mainwin, TQWidget *parent, d->editor->setWordWrap(TQTextEdit::NoWrap); layout->addWidget(d->editor); - connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(editorChanged())); + connect(d->editor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(editorChanged())); } KexiMacroTextView::~KexiMacroTextView() diff --git a/kexi/plugins/macros/kexipart/keximacroview.cpp b/kexi/plugins/macros/kexipart/keximacroview.cpp index f0e7ea0b..34f57712 100644 --- a/kexi/plugins/macros/kexipart/keximacroview.cpp +++ b/kexi/plugins/macros/kexipart/keximacroview.cpp @@ -67,7 +67,7 @@ KexiMacroView::KexiMacroView(KexiMainWindow *mainwin, TQWidget *parent, KoMacro: , d( new Private(macro) ) { //kdDebug() << "KexiMacroView::KexiMacroView() Ctor" << endl; - plugSharedAction( "data_execute", this, TQT_SLOT(execute()) ); + plugSharedAction( "data_execute", this, TQ_SLOT(execute()) ); } KexiMacroView::~KexiMacroView() diff --git a/kexi/plugins/macros/lib/macro.cpp b/kexi/plugins/macros/lib/macro.cpp index af29da57..a5f84be7 100644 --- a/kexi/plugins/macros/lib/macro.cpp +++ b/kexi/plugins/macros/lib/macro.cpp @@ -115,7 +115,7 @@ TDESharedPtr<Context> Macro::execute(TQObject* sender) // set the sender-variable if we got a sender TQObject. c->setVariable("[sender]", TDESharedPtr<Variable>( new Variable(sender) )); } - //connect(context, TQT_SIGNAL(activated()), this, TQT_SIGNAL(activated())); + //connect(context, TQ_SIGNAL(activated()), this, TQ_SIGNAL(activated())); //call activate in the context of the macro c->activate( c ); diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 6d5d557c..d3725728 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -148,12 +148,12 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( d->spl = new TQSplitter(TQt::Vertical, this); d->spl->setChildrenCollapsible(false); d->relations = new KexiRelationWidget(mainWin, d->spl, "relations"); - connect(d->relations, TQT_SIGNAL(tableAdded(KexiDB::TableSchema&)), - this, TQT_SLOT(slotTableAdded(KexiDB::TableSchema&))); - connect(d->relations, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)), - this, TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); - connect(d->relations, TQT_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)), - this, TQT_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&))); + connect(d->relations, TQ_SIGNAL(tableAdded(KexiDB::TableSchema&)), + this, TQ_SLOT(slotTableAdded(KexiDB::TableSchema&))); + connect(d->relations, TQ_SIGNAL(tableHidden(KexiDB::TableSchema&)), + this, TQ_SLOT(slotTableHidden(KexiDB::TableSchema&))); + connect(d->relations, TQ_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)), + this, TQ_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&))); d->head = new KexiSectionHeader(i18n("Query Columns"),TQt::Vertical, d->spl); d->dataTable = new KexiDataTable(mainWin, d->head, "guieditor_dataTable", false); @@ -171,21 +171,21 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( d->dataTable->tableView()->adjustColumnWidthToContents(COLUMN_ID_SORTING); d->dataTable->tableView()->maximizeColumnsWidth( c ); d->dataTable->tableView()->setDropsAtRowEnabled(true); - connect(d->dataTable->tableView(), TQT_SIGNAL(dragOverRow(KexiTableItem*,int,TQDragMoveEvent*)), - this, TQT_SLOT(slotDragOverTableRow(KexiTableItem*,int,TQDragMoveEvent*))); - connect(d->dataTable->tableView(), TQT_SIGNAL(droppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&)), - this, TQT_SLOT(slotDroppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&))); - connect(d->dataTable->tableView(), TQT_SIGNAL(newItemAppendedForAfterDeletingInSpreadSheetMode()), - this, TQT_SLOT(slotNewItemAppendedForAfterDeletingInSpreadSheetMode())); + connect(d->dataTable->tableView(), TQ_SIGNAL(dragOverRow(KexiTableItem*,int,TQDragMoveEvent*)), + this, TQ_SLOT(slotDragOverTableRow(KexiTableItem*,int,TQDragMoveEvent*))); + connect(d->dataTable->tableView(), TQ_SIGNAL(droppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&)), + this, TQ_SLOT(slotDroppedAtRow(KexiTableItem*,int,TQDropEvent*,KexiTableItem*&))); + connect(d->dataTable->tableView(), TQ_SIGNAL(newItemAppendedForAfterDeletingInSpreadSheetMode()), + this, TQ_SLOT(slotNewItemAppendedForAfterDeletingInSpreadSheetMode())); } - connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), - this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); - connect(d->data, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), - this, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); - connect(d->relations, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), - this, TQT_SLOT(slotTablePositionChanged(KexiRelationViewTableContainer*))); - connect(d->relations, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), - this, TQT_SLOT(slotAboutConnectionRemove(KexiRelationViewConnection*))); + connect(d->data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), + this, TQ_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); + connect(d->data, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)), + this, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); + connect(d->relations, TQ_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), + this, TQ_SLOT(slotTablePositionChanged(KexiRelationViewTableContainer*))); + connect(d->relations, TQ_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), + this, TQ_SLOT(slotAboutConnectionRemove(KexiRelationViewConnection*))); TQVBoxLayout *l = new TQVBoxLayout(this); l->addWidget(d->spl); @@ -1742,8 +1742,8 @@ KexiQueryDesignerGuiEditor::createPropertySet( int row, set->addProperty(prop = new KoProperty::Property("isExpression", TQVariant(false)) ); prop->setVisible(false); - connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); d->sets->insert(row, set, newOne); diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index f443c92f..fbd43f31 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -108,7 +108,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi d->head = new KexiSectionHeader(i18n("SQL Query Text"),TQt::Vertical, d->splitter); d->editor = new KexiQueryDesignerSQLEditor(mainWin, d->head, "sqle"); // d->editor->installEventFilter(this);//for keys - connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + connect(d->editor, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); addChildView(d->editor); setViewWidget(d->editor); d->splitter->setFocusProxy(d->editor); @@ -136,8 +136,8 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi TQHBoxLayout *b = new TQHBoxLayout(this); b->addWidget(d->splitter); - plugSharedAction("querypart_check_query", this, TQT_SLOT(slotCheckQuery())); - plugSharedAction("querypart_view_toggle_history", this, TQT_SLOT(slotUpdateMode())); + plugSharedAction("querypart_check_query", this, TQ_SLOT(slotCheckQuery())); + plugSharedAction("querypart_view_toggle_history", this, TQ_SLOT(slotUpdateMode())); d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) ); d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),TQt::Vertical, d->history_section); @@ -146,11 +146,11 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi static const TQString msg_back = i18n("Back to Selected Query"); static const TQString msg_clear = i18n("Clear History"); - d->historyHead->addButton("select_item", msg_back, this, TQT_SLOT(slotSelectQuery())); - d->historyHead->addButton("edit-clear", msg_clear, d->history, TQT_SLOT(clear())); - d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, this, TQT_SLOT(slotSelectQuery())); - d->history->popupMenu()->insertItem(SmallIcon("edit-clear"), msg_clear, d->history, TQT_SLOT(clear())); - connect(d->history, TQT_SIGNAL(currentItemDoubleClicked()), this, TQT_SLOT(slotSelectQuery())); + d->historyHead->addButton("select_item", msg_back, this, TQ_SLOT(slotSelectQuery())); + d->historyHead->addButton("edit-clear", msg_clear, d->history, TQ_SLOT(clear())); + d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, this, TQ_SLOT(slotSelectQuery())); + d->history->popupMenu()->insertItem(SmallIcon("edit-clear"), msg_clear, d->history, TQ_SLOT(clear())); + connect(d->history, TQ_SIGNAL(currentItemDoubleClicked()), this, TQ_SLOT(slotSelectQuery())); d->heightForHistoryMode = -1; //height() / 2; //d->historyHead->hide(); @@ -320,7 +320,7 @@ KexiQueryDesignerSQLView::afterSwitchFrom(int mode) d->slotTextChangedEnabled = false; d->editor->setText( d->origStatement ); d->slotTextChangedEnabled = true; - TQTimer::singleShot(100, d->editor, TQT_SLOT(setFocus())); + TQTimer::singleShot(100, d->editor, TQ_SLOT(setFocus())); return true; } diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 883bf3ca..4c1c1c6e 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -41,7 +41,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const m_history->setAutoDelete(true); m_popup = new TDEPopupMenu(this); - m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); + m_popup->insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQ_SLOT(slotToClipboard())); } KexiQueryDesignerSQLHistory::~KexiQueryDesignerSQLHistory() @@ -162,12 +162,12 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e) KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *) { TDEPopupMenu p(this); - p.insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard())); + p.insertItem(SmallIcon("edit-copy"), i18n("Copy to Clipboard"), this, TQ_SLOT(slotToClipboard())); #ifndef KEXI_NO_UNFINISHED p.insertSeparator(); - p.insertItem(SmallIcon("edit"), i18n("Edit"), this, TQT_SLOT(slotEdit())); + p.insertItem(SmallIcon("edit"), i18n("Edit"), this, TQ_SLOT(slotEdit())); p.insertItem(SmallIcon("reload"), i18n("Requery")); #endif diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp index aad6c992..4882ea9d 100644 --- a/kexi/plugins/queries/kexiquerypart.cpp +++ b/kexi/plugins/queries/kexiquerypart.cpp @@ -79,15 +79,15 @@ KexiQueryPart::createView(TQWidget *parent, KexiDialogBase* dialog, KexiPart::It dialog->mainWin(), parent, "guieditor"); //needed for updating tables combo box: KexiProject *prj = dialog->mainWin()->project(); - connect(prj, TQT_SIGNAL(newItemStored(KexiPart::Item&)), - view, TQT_SLOT(slotNewItemStored(KexiPart::Item&))); - connect(prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), - view, TQT_SLOT(slotItemRemoved(const KexiPart::Item&))); - connect(prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), - view, TQT_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&))); - -// connect(dialog->mainWin()->project(), TQT_SIGNAL(tableCreated(KexiDB::TableSchema&)), -// view, TQT_SLOT(slotTableCreated(KexiDB::TableSchema&))); + connect(prj, TQ_SIGNAL(newItemStored(KexiPart::Item&)), + view, TQ_SLOT(slotNewItemStored(KexiPart::Item&))); + connect(prj, TQ_SIGNAL(itemRemoved(const KexiPart::Item&)), + view, TQ_SLOT(slotItemRemoved(const KexiPart::Item&))); + connect(prj, TQ_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), + view, TQ_SLOT(slotItemRenamed(const KexiPart::Item&, const TQCString&))); + +// connect(dialog->mainWin()->project(), TQ_SIGNAL(tableCreated(KexiDB::TableSchema&)), +// view, TQ_SLOT(slotTableCreated(KexiDB::TableSchema&))); return view; } else if (viewMode == Kexi::TextViewMode) { @@ -128,9 +128,9 @@ void KexiQueryPart::initInstanceActions( int mode, TDEActionCollection *col ) else if (mode==Kexi::DesignViewMode) { } else if (mode==Kexi::TextViewMode) { -// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query"); +// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQ_SLOT(slotCheckQuery()), col, "querypart_check_query"); -//TODO new TDEAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query"); +//TODO new TDEAction(i18n("Execute Query"), "?????", 0, this, TQ_SLOT(checkQuery()), col, "querypart_execute_query"); } } #endif @@ -141,7 +141,7 @@ void KexiQueryPart::initPartActions() void KexiQueryPart::initInstanceActions() { -// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), +// new TDEAction(i18n("Check Query"), "test_it", 0, this, TQ_SLOT(slotCheckQuery()), // m_instanceGuiClients[Kexi::DesignViewMode]->actionCollection(), "querypart_check_query"); TDEAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index 57753a30..2d11892d 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -121,7 +121,7 @@ KexiReportFactory::createMenuActions(const TQCString &classname, TQWidget *w, Q_UNUSED(container); if(classname == "Label") { /*! @todo use TDEAction */ - menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQT_SLOT(editText())); + menu->insertItem(SmallIconSet("edit"), i18n("Edit Rich Text"), this, TQ_SLOT(editText())); return true; } return false; diff --git a/kexi/plugins/reports/kexireportview.cpp b/kexi/plugins/reports/kexireportview.cpp index 2de5f4a7..902bc179 100644 --- a/kexi/plugins/reports/kexireportview.cpp +++ b/kexi/plugins/reports/kexireportview.cpp @@ -47,7 +47,7 @@ KexiReportScrollView::KexiReportScrollView(TQWidget *parent, bool preview) recordNavigator()->setLabelText(i18n("Page:")); recordNavigator()->setInsertingButtonVisible(false); } - connect(this, TQT_SIGNAL(resizingStarted()), this, TQT_SLOT(slotResizingStarted())); + connect(this, TQ_SIGNAL(resizingStarted()), this, TQ_SLOT(slotResizingStarted())); } KexiReportScrollView::~KexiReportScrollView() @@ -102,52 +102,52 @@ KexiReportView::KexiReportView(KexiMainWindow *win, TQWidget *parent, const char if (viewMode()==Kexi::DataViewMode) { m_scrollView->viewport()->setPaletteBackgroundColor(m_reportform->palette().active().background()); #if 0 - connect(reportPart()->manager(), TQT_SIGNAL(noFormSelected()), TQT_SLOT(slotNoFormSelected())); + connect(reportPart()->manager(), TQ_SIGNAL(noFormSelected()), TQ_SLOT(slotNoFormSelected())); #endif } else { - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(propertySetSwitched(KoProperty::Set *, bool)), - this, TQT_SLOT(slotPropertySetSwitched(KoProperty::Set *, bool))); - connect(KFormDesigner::FormManager::self(), TQT_SIGNAL(dirty(KFormDesigner::Form *, bool)), - this, TQT_SLOT(slotDirty(KFormDesigner::Form *, bool))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(propertySetSwitched(KoProperty::Set *, bool)), + this, TQ_SLOT(slotPropertySetSwitched(KoProperty::Set *, bool))); + connect(KFormDesigner::FormManager::self(), TQ_SIGNAL(dirty(KFormDesigner::Form *, bool)), + this, TQ_SLOT(slotDirty(KFormDesigner::Form *, bool))); // action stuff - /*connect(reportPart()->manager(), TQT_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQT_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool))); - connect(reportPart()->manager(), TQT_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQT_SLOT(slotFormWidgetSelected(KFormDesigner::Form*))); - connect(reportPart()->manager(), TQT_SIGNAL(undoEnabled(bool, const TQString&)), this, TQT_SLOT(setUndoEnabled(bool))); - connect(reportPart()->manager(), TQT_SIGNAL(redoEnabled(bool, const TQString&)), this, TQT_SLOT(setRedoEnabled(bool)));*/ - - plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQT_SLOT(copyWidget())); - plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQT_SLOT(cutWidget())); - plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQT_SLOT(pasteWidget())); - plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQT_SLOT(deleteWidget())); - plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQT_SLOT(selectAll())); - plugSharedAction("reportpart_clear_contents", KFormDesigner::FormManager::self(), TQT_SLOT(clearWidgetContent())); - plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQT_SLOT(undo())); - plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQT_SLOT(redo())); - - plugSharedAction("reportpart_format_raise", KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()) ); - plugSharedAction("reportpart_format_lower", KFormDesigner::FormManager::self(), TQT_SLOT(sendWidgetToBack()) ); + /*connect(reportPart()->manager(), TQ_SIGNAL(widgetSelected(KFormDesigner::Form*, bool)), TQ_SLOT(slotWidgetSelected(KFormDesigner::Form*, bool))); + connect(reportPart()->manager(), TQ_SIGNAL(formWidgetSelected(KFormDesigner::Form*)), TQ_SLOT(slotFormWidgetSelected(KFormDesigner::Form*))); + connect(reportPart()->manager(), TQ_SIGNAL(undoEnabled(bool, const TQString&)), this, TQ_SLOT(setUndoEnabled(bool))); + connect(reportPart()->manager(), TQ_SIGNAL(redoEnabled(bool, const TQString&)), this, TQ_SLOT(setRedoEnabled(bool)));*/ + + plugSharedAction("edit_copy", KFormDesigner::FormManager::self(), TQ_SLOT(copyWidget())); + plugSharedAction("edit_cut", KFormDesigner::FormManager::self(), TQ_SLOT(cutWidget())); + plugSharedAction("edit_paste", KFormDesigner::FormManager::self(), TQ_SLOT(pasteWidget())); + plugSharedAction("edit_delete", KFormDesigner::FormManager::self(), TQ_SLOT(deleteWidget())); + plugSharedAction("edit_select_all", KFormDesigner::FormManager::self(), TQ_SLOT(selectAll())); + plugSharedAction("reportpart_clear_contents", KFormDesigner::FormManager::self(), TQ_SLOT(clearWidgetContent())); + plugSharedAction("edit_undo", KFormDesigner::FormManager::self(), TQ_SLOT(undo())); + plugSharedAction("edit_redo", KFormDesigner::FormManager::self(), TQ_SLOT(redo())); + + plugSharedAction("reportpart_format_raise", KFormDesigner::FormManager::self(), TQ_SLOT(bringWidgetToFront()) ); + plugSharedAction("reportpart_format_lower", KFormDesigner::FormManager::self(), TQ_SLOT(sendWidgetToBack()) ); plugSharedAction("reportpart_align_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("reportpart_align_to_left", KFormDesigner::FormManager::self(),TQT_SLOT(alignWidgetsToLeft()) ); - plugSharedAction("reportpart_align_to_right", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToRight()) ); - plugSharedAction("reportpart_align_to_top", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToTop()) ); - plugSharedAction("reportpart_align_to_bottom", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToBottom()) ); - plugSharedAction("reportpart_align_to_grid", KFormDesigner::FormManager::self(), TQT_SLOT(alignWidgetsToGrid()) ); + plugSharedAction("reportpart_align_to_left", KFormDesigner::FormManager::self(),TQ_SLOT(alignWidgetsToLeft()) ); + plugSharedAction("reportpart_align_to_right", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToRight()) ); + plugSharedAction("reportpart_align_to_top", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToTop()) ); + plugSharedAction("reportpart_align_to_bottom", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToBottom()) ); + plugSharedAction("reportpart_align_to_grid", KFormDesigner::FormManager::self(), TQ_SLOT(alignWidgetsToGrid()) ); plugSharedAction("reportpart_adjust_size_menu", KFormDesigner::FormManager::self(), 0 ); - plugSharedAction("reportpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidgetSize()) ); - plugSharedAction("reportpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQT_SLOT(adjustSizeToGrid()) ); - plugSharedAction("reportpart_adjust_height_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToSmall()) ); - plugSharedAction("reportpart_adjust_height_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustHeightToBig()) ); - plugSharedAction("reportpart_adjust_width_small", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToSmall()) ); - plugSharedAction("reportpart_adjust_width_big", KFormDesigner::FormManager::self(), TQT_SLOT(adjustWidthToBig()) ); + plugSharedAction("reportpart_adjust_to_fit", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidgetSize()) ); + plugSharedAction("reportpart_adjust_size_grid", KFormDesigner::FormManager::self(), TQ_SLOT(adjustSizeToGrid()) ); + plugSharedAction("reportpart_adjust_height_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToSmall()) ); + plugSharedAction("reportpart_adjust_height_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustHeightToBig()) ); + plugSharedAction("reportpart_adjust_width_small", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToSmall()) ); + plugSharedAction("reportpart_adjust_width_big", KFormDesigner::FormManager::self(), TQ_SLOT(adjustWidthToBig()) ); } initForm(); - connect(this, TQT_SIGNAL(focus(bool)), this, TQT_SLOT(slotFocus(bool))); + connect(this, TQ_SIGNAL(focus(bool)), this, TQ_SLOT(slotFocus(bool))); /// @todo skip this if ther're no borders // m_reportform->resize( m_reportform->size()+TQSize(m_scrollView->verticalScrollBar()->width(), m_scrollView->horizontalScrollBar()->height()) ); } diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index 4348aae2..b6cf85f4 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -88,18 +88,18 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa d->statusbrowser->installEventFilter(this); splitter->setResizeMode(d->statusbrowser, TQSplitter::KeepSize); - plugSharedAction( "data_execute", this, TQT_SLOT(execute()) ); + plugSharedAction( "data_execute", this, TQ_SLOT(execute()) ); if(KexiEditor::isAdvancedEditor()) // the configeditor is only in advanced mode avaiable. - plugSharedAction( "script_config_editor", d->editor, TQT_SLOT(slotConfigureEditor()) ); + plugSharedAction( "script_config_editor", d->editor, TQ_SLOT(slotConfigureEditor()) ); loadData(); d->properties = new KoProperty::Set(this, "KexiScripting"); - connect(d->properties, TQT_SIGNAL( propertyChanged(KoProperty::Set&, KoProperty::Property&) ), - this, TQT_SLOT( slotPropertyChanged(KoProperty::Set&, KoProperty::Property&) )); + connect(d->properties, TQ_SIGNAL( propertyChanged(KoProperty::Set&, KoProperty::Property&) ), + this, TQ_SLOT( slotPropertyChanged(KoProperty::Set&, KoProperty::Property&) )); // To schedule the initialize fixes a crasher in Kate. - TQTimer::singleShot(50, this, TQT_SLOT( initialize() )); + TQTimer::singleShot(50, this, TQ_SLOT( initialize() )); } KexiScriptDesignView::~KexiScriptDesignView() diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp index 8e4db059..75afc420 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp @@ -62,7 +62,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction) d->scriptaction = scriptaction; Q_ASSERT(d->scriptaction); - disconnect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + disconnect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); TQString code = d->scriptaction->getCode(); if(code.isNull()) { @@ -85,7 +85,7 @@ void KexiScriptEditor::initialize(Kross::Api::ScriptAction* scriptaction) clearUndoRedo(); KexiEditor::setDirty(false); - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged())); } void KexiScriptEditor::slotTextChanged() diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp index fe3453ab..22527f53 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp @@ -102,7 +102,7 @@ bool KexiScriptPart::execute(KexiPart::Item* item, TQObject* sender) } if(exec) { - //TQTimer::singleShot(10, scriptaction, TQT_SLOT(activate())); + //TQTimer::singleShot(10, scriptaction, TQ_SLOT(activate())); d->scriptguiclient->executeScriptAction( scriptaction ); } } diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py index 6ecbea5f..4bde164b 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenter.py @@ -105,10 +105,10 @@ def runGuiApp(copycenter, name): btnbox.setSpacing(6) self.okbtn = tqt.TQPushButton(btnbox) self.okbtn.setText("Ok") - #tqt.TQObject.connect(okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + #tqt.TQObject.connect(okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) self.cancelbtn = tqt.TQPushButton(btnbox) self.cancelbtn.setText("Cancel") - tqt.TQObject.connect(self.cancelbtn, tqt.SIGNAL("clicked()"), self.close) + tqt.TQObject.connect(self.cancelbtn, tqt.TQ_SIGNAL("clicked()"), self.close) box.setMinimumSize(tqt.TQSize(460,380)) def addItem(self,valuelist,afteritem = None): if afteritem == None: @@ -136,7 +136,7 @@ def runGuiApp(copycenter, name): self.jobfilecombobox.setEditable(True) self.jobfilecombobox.insertItem("") label.setBuddy(self.jobfilecombobox) - tqt.TQObject.connect(self.jobfilecombobox, tqt.SIGNAL("textChanged(const TQString&)"), self.jobfilecomboboxChanged) + tqt.TQObject.connect(self.jobfilecombobox, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.jobfilecomboboxChanged) import os import re @@ -147,10 +147,10 @@ def runGuiApp(copycenter, name): loadbtn = tqt.TQPushButton(typebox) loadbtn.setText("Open...") - tqt.TQObject.connect(loadbtn, tqt.SIGNAL("clicked()"), self.openClicked) + tqt.TQObject.connect(loadbtn, tqt.TQ_SIGNAL("clicked()"), self.openClicked) savebtn = tqt.TQPushButton(typebox) savebtn.setText("Save...") - tqt.TQObject.connect(savebtn, tqt.SIGNAL("clicked()"), self.saveClicked) + tqt.TQObject.connect(savebtn, tqt.TQ_SIGNAL("clicked()"), self.saveClicked) self.listview = tqt.TQListView(self) self.listview.setAllColumnsShowFocus(True) @@ -159,8 +159,8 @@ def runGuiApp(copycenter, name): self.listview.header().setClickEnabled(False) self.listview.addColumn("Name") self.listview.addColumn("Value") - tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.doubleClicked) - #tqt.TQObject.connect(self.listview, tqt.SIGNAL("itemRenamed(TQListViewItem*, int, const TQString&)"), self.itemRenamed) + tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.doubleClicked) + #tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("itemRenamed(TQListViewItem*, int, const TQString&)"), self.itemRenamed) def doubleClicked(self, **args): print("CopyJobWidget.doubleClicked") @@ -339,10 +339,10 @@ def runGuiApp(copycenter, name): self.donebtn = tqt.TQPushButton(btnbox) self.donebtn.setText("Done") self.donebtn.setEnabled(False) - tqt.TQObject.connect(self.donebtn,tqt.SIGNAL("clicked()"),self.close) + tqt.TQObject.connect(self.donebtn,tqt.TQ_SIGNAL("clicked()"),self.close) self.cancelbtn = tqt.TQPushButton(btnbox) self.cancelbtn.setText("Cancel") - tqt.TQObject.connect(self.cancelbtn,tqt.SIGNAL("clicked()"),self.close) + tqt.TQObject.connect(self.cancelbtn,tqt.TQ_SIGNAL("clicked()"),self.close) box.setMinimumSize( tqt.TQSize(500,380) ) def updateStates(self): @@ -375,7 +375,7 @@ def runGuiApp(copycenter, name): self.starttime = tqt.TQTime() self.updatetimer = tqt.TQTimer(self) - tqt.TQObject.connect(self.updatetimer,tqt.SIGNAL("timeout()"),self.updateStates) + tqt.TQObject.connect(self.updatetimer,tqt.TQ_SIGNAL("timeout()"),self.updateStates) # Initialize the source sourcename = self.dialog.getSourcePluginName() @@ -469,7 +469,7 @@ def runGuiApp(copycenter, name): except: import traceback print("".join( traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2]) )) - tqt.TQObject.connect(self.combobox, tqt.SIGNAL("activated(int)"), self.activated) + tqt.TQObject.connect(self.combobox, tqt.TQ_SIGNAL("activated(int)"), self.activated) def updatePlugin(self): print("DataSelector.updatePlugin") @@ -570,10 +570,10 @@ def runGuiApp(copycenter, name): okbtn = tqt.TQPushButton(btnbox) okbtn.setText("Start Copy") okbtn.setDefault(True) - tqt.TQObject.connect(okbtn,tqt.SIGNAL("clicked()"),self.startCopy) + tqt.TQObject.connect(okbtn,tqt.TQ_SIGNAL("clicked()"),self.startCopy) cancelbtn = tqt.TQPushButton(btnbox) cancelbtn.setText("Cancel") - tqt.TQObject.connect(cancelbtn,tqt.SIGNAL("clicked()"),self.close) + tqt.TQObject.connect(cancelbtn,tqt.TQ_SIGNAL("clicked()"),self.close) self.tab.addTab(self.splitter,"Copy") self.tab.setCurrentPage(1) @@ -582,7 +582,7 @@ def runGuiApp(copycenter, name): self.helpbrowser.setLinkUnderline(False) self.helpbrowser.setUndoRedoEnabled(False) self.tab.addTab(self.helpbrowser,"Help") - tqt.TQObject.connect(self.tab,tqt.SIGNAL("currentChanged(TQWidget*)"),self.currentTabChanged) + tqt.TQObject.connect(self.tab,tqt.TQ_SIGNAL("currentChanged(TQWidget*)"),self.currentTabChanged) box.setMinimumSize( tqt.TQSize(760,500) ) diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py index 8c6c431b..87cbfb89 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginKexiDB.py @@ -227,8 +227,8 @@ class CopyCenterPlugin: prjlabel.setBuddy(self.prjcombo) prjsavebtn = tqt.TQPushButton("...",self) - tqt.TQObject.connect(prjsavebtn, tqt.SIGNAL("clicked()"),self.buttonClicked) - tqt.TQObject.connect(self.prjcombo, tqt.SIGNAL("textChanged(const TQString&)"), self.main.projectChanged) + tqt.TQObject.connect(prjsavebtn, tqt.TQ_SIGNAL("clicked()"),self.buttonClicked) + tqt.TQObject.connect(self.prjcombo, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.main.projectChanged) self.setStretchFactor(self.prjcombo,1) def buttonClicked(self): text = str(self.prjcombo.currentText()) @@ -258,7 +258,7 @@ class CopyCenterPlugin: for driver in self.copycenterplugin.drivermanager.driverNames(): self.drivercombo.insertItem(driver) - tqt.TQObject.connect(self.drivercombo, tqt.SIGNAL("activated(int)"), self.activated) + tqt.TQObject.connect(self.drivercombo, tqt.TQ_SIGNAL("activated(int)"), self.activated) driverlabel.setBuddy(self.drivercombo) driverbox.setStretchFactor(self.drivercombo,1) @@ -291,7 +291,7 @@ class CopyCenterPlugin: filelabel.setBuddy(self.fileedit) filebox.setStretchFactor(self.fileedit,1) filebtn = tqt.TQPushButton("...",filebox) - tqt.TQObject.connect(filebtn, tqt.SIGNAL("clicked()"), self.fileClicked) + tqt.TQObject.connect(filebtn, tqt.TQ_SIGNAL("clicked()"), self.fileClicked) else: hostbox = tqt.TQHBox(mainbox) hostlabel = tqt.TQLabel("Hostname:",hostbox) @@ -307,13 +307,13 @@ class CopyCenterPlugin: sockbox = tqt.TQHBox(mainbox) self.sockfilecheckbox = tqt.TQCheckBox("Socket File:",sockbox) - tqt.TQObject.connect(self.sockfilecheckbox, tqt.SIGNAL("toggled(bool)"), self.sockfilecheckboxClicked) + tqt.TQObject.connect(self.sockfilecheckbox, tqt.TQ_SIGNAL("toggled(bool)"), self.sockfilecheckboxClicked) self.sockfilebox = tqt.TQHBox(sockbox) self.sockfileedit = tqt.TQLineEdit(self.plugin.options['socketfile'],self.sockfilebox) self.sockfilebox.setEnabled(False) sockfilebtn = tqt.TQPushButton("...",self.sockfilebox) self.sockfilecheckbox.setChecked( str(self.plugin.options['usesocketfile']) == str(True) ) - tqt.TQObject.connect(sockfilebtn, tqt.SIGNAL("clicked()"), self.sockfileClicked) + tqt.TQObject.connect(sockfilebtn, tqt.TQ_SIGNAL("clicked()"), self.sockfileClicked) self.sockfilebox.setStretchFactor(self.sockfileedit,1) sockbox.setStretchFactor(self.sockfilebox,1) @@ -372,7 +372,7 @@ class CopyCenterPlugin: self.tableedit = tqt.TQLineEdit(self.plugin.options['table'],self) self.tablebtn = tqt.TQPushButton("...",self) self.tablebtn.setEnabled(False) - tqt.TQObject.connect(self.tablebtn, tqt.SIGNAL("clicked()"), self.buttonClicked) + tqt.TQObject.connect(self.tablebtn, tqt.TQ_SIGNAL("clicked()"), self.buttonClicked) tablelabel.setBuddy(self.tableedit) self.setStretchFactor(self.tableedit,1) def buttonClicked(self): @@ -392,8 +392,8 @@ class CopyCenterPlugin: if table == text: self.listview.setSelected(item,True) self.listview.ensureItemVisible(item) - tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked) - tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked) + tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) def okClicked(self): item = self.listview.selectedItem() if item == None: @@ -416,7 +416,7 @@ class CopyCenterPlugin: fieldslabel.setBuddy(self.fieldsedit) self.fieldsbtn = tqt.TQPushButton("...",self) self.fieldsbtn.setEnabled(False) - tqt.TQObject.connect(self.fieldsbtn, tqt.SIGNAL("clicked()"), self.fieldsClicked) + tqt.TQObject.connect(self.fieldsbtn, tqt.TQ_SIGNAL("clicked()"), self.fieldsClicked) def fieldsClicked(self): ListViewDialog = self.copycenterplugin.dialog.ListViewDialog class FieldsDialog(ListViewDialog): @@ -441,7 +441,7 @@ class CopyCenterPlugin: item = self.addItem(( field.name(),field.type(),",".join(opts) ),item) if allfields or field.name() in fieldslist: self.listview.setSelected(item,True) - tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) def okClicked(self): selitems = [] item = self.listview.firstChild() @@ -477,15 +477,15 @@ class CopyCenterPlugin: statusbar.setStretchFactor(tqt.TQWidget(statusbar),1) self.connectbtn = tqt.TQPushButton("Connect",statusbar) self.connectbtn.setEnabled(False) - tqt.TQObject.connect(self.connectbtn, tqt.SIGNAL("clicked()"),self.connectClicked) + tqt.TQObject.connect(self.connectbtn, tqt.TQ_SIGNAL("clicked()"),self.connectClicked) self.disconnectbtn = tqt.TQPushButton("Disconnect",statusbar) self.disconnectbtn.setEnabled(False) - tqt.TQObject.connect(self.disconnectbtn, tqt.SIGNAL("clicked()"),self.disconnectClicked) + tqt.TQObject.connect(self.disconnectbtn, tqt.TQ_SIGNAL("clicked()"),self.disconnectClicked) #self.connectionbox = ConnectionBox(copycenterplugin,plugin,parent) self.tablebox = TableBox(copycenterplugin,plugin,parent) self.fieldbox = FieldBox(copycenterplugin,plugin,parent) - tqt.TQObject.connect(self.tablebox.tableedit, tqt.SIGNAL("textChanged(const TQString&)"), self.fieldbox.tableChanged) + tqt.TQObject.connect(self.tablebox.tableedit, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.fieldbox.tableChanged) if self.plugin.options['project'] != '': self.prjbox.prjcombo.setCurrentText(self.plugin.options['project']) diff --git a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py index 8f983eb5..9cb8ef93 100644 --- a/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py +++ b/kexi/plugins/scripting/scripts/copycenter/CopyCenterPluginQtSQL.py @@ -234,8 +234,8 @@ class CopyCenterPlugin: if table == text: self.listview.setSelected(item,True) self.listview.ensureItemVisible(item) - tqt.TQObject.connect(self.listview, tqt.SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked) - tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(self.listview, tqt.TQ_SIGNAL("doubleClicked(TQListViewItem*, const TQPoint&, int)"), self.okClicked) + tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) def okClicked(self): item = self.listview.selectedItem() if item == None: @@ -267,7 +267,7 @@ class CopyCenterPlugin: item = self.addItem((fieldinfo.name(), tqt.TQVariant.typeToName(fieldinfo.type()), opts),item) if allfields or fieldinfo.name() in fieldslist: self.listview.setSelected(item,True) - tqt.TQObject.connect(self.okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(self.okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) def okClicked(self): selitems = [] item = self.listview.firstChild() @@ -335,18 +335,18 @@ class CopyCenterPlugin: statusbar.setSpacing(2) statusbar.setStretchFactor(tqt.TQWidget(statusbar),1) self.connectbtn = tqt.TQPushButton("Connect",statusbar) - tqt.TQObject.connect(self.connectbtn, tqt.SIGNAL("clicked()"),self.connectClicked) + tqt.TQObject.connect(self.connectbtn, tqt.TQ_SIGNAL("clicked()"),self.connectClicked) self.disconnectbtn = tqt.TQPushButton("Disconnect",statusbar) self.disconnectbtn.setEnabled(False) - tqt.TQObject.connect(self.disconnectbtn, tqt.SIGNAL("clicked()"),self.disconnectClicked) + tqt.TQObject.connect(self.disconnectbtn, tqt.TQ_SIGNAL("clicked()"),self.disconnectClicked) tablebox = tqt.TQHBox(parent) tablelabel = tqt.TQLabel("Table:",tablebox) self.tableedit = tqt.TQLineEdit(self.plugin.options['table'],tablebox) - tqt.TQObject.connect(self.tableedit, tqt.SIGNAL("textChanged(const TQString&)"), self.tableEditChanged) + tqt.TQObject.connect(self.tableedit, tqt.TQ_SIGNAL("textChanged(const TQString&)"), self.tableEditChanged) self.tablebtn = tqt.TQPushButton("...",tablebox) self.tablebtn.setEnabled(False) - tqt.TQObject.connect(self.tablebtn, tqt.SIGNAL("clicked()"), self.tableBtnClicked) + tqt.TQObject.connect(self.tablebtn, tqt.TQ_SIGNAL("clicked()"), self.tableBtnClicked) tablelabel.setBuddy(self.tableedit) tablebox.setStretchFactor(self.tableedit,1) @@ -355,7 +355,7 @@ class CopyCenterPlugin: self.fieldedit = tqt.TQLineEdit(self.plugin.options['fields'],fieldbox) self.fieldbtn = tqt.TQPushButton("...",fieldbox) self.fieldbtn.setEnabled(False) - tqt.TQObject.connect(self.fieldbtn, tqt.SIGNAL("clicked()"), self.fieldBtnClicked) + tqt.TQObject.connect(self.fieldbtn, tqt.TQ_SIGNAL("clicked()"), self.fieldBtnClicked) fieldlabel.setBuddy(self.fieldedit) fieldbox.setStretchFactor(self.fieldedit,1) @@ -381,7 +381,7 @@ class CopyCenterPlugin: operationlabel.setBuddy(self.mainwidget.operationedit) opbox.setStretchFactor(self.mainwidget.operationedit,1) self.box = None - tqt.TQObject.connect(self.mainwidget.operationedit, tqt.SIGNAL("activated(int)"), self.operationActivated) + tqt.TQObject.connect(self.mainwidget.operationedit, tqt.TQ_SIGNAL("activated(int)"), self.operationActivated) self.operationActivated() def operationActivated(self, **args): if self.box: diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index f718efd0..c25bbc99 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -152,14 +152,14 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) d->gotoRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight()); TQToolTip::add(d->gotoRowSourceButton, i18n("Go to selected row source")); hlyr->addWidget(d->gotoRowSourceButton); - connect(d->gotoRowSourceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGotoSelectedRowSource())); + connect(d->gotoRowSourceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGotoSelectedRowSource())); d->clearRowSourceButton = new KexiSmallToolButton(contents, TQString(), "clear_left", "clearRowSourceButton"); d->clearRowSourceButton->setMinimumHeight(d->rowSourceLabel->minimumHeight()); TQToolTip::add(d->clearRowSourceButton, i18n("Clear row source")); hlyr->addWidget(d->clearRowSourceButton); - connect(d->clearRowSourceButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearRowSourceSelection())); + connect(d->clearRowSourceButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearRowSourceSelection())); d->rowSourceCombo = new KexiDataSourceComboBox(contents, "rowSourceCombo"); d->rowSourceLabel->setBuddy(d->rowSourceCombo); @@ -181,7 +181,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) d->clearBoundColumnButton->setMinimumHeight(d->boundColumnLabel->minimumHeight()); TQToolTip::add(d->clearBoundColumnButton, i18n("Clear bound column")); hlyr->addWidget(d->clearBoundColumnButton); - connect(d->clearBoundColumnButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearBoundColumnSelection())); + connect(d->clearBoundColumnButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearBoundColumnSelection())); d->boundColumnCombo = new KexiFieldComboBox(contents, "boundColumnCombo"); d->boundColumnLabel->setBuddy(d->boundColumnCombo); @@ -203,7 +203,7 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) d->clearVisibleColumnButton->setMinimumHeight(d->visibleColumnLabel->minimumHeight()); TQToolTip::add(d->clearVisibleColumnButton, i18n("Clear visible column")); hlyr->addWidget(d->clearVisibleColumnButton); - connect(d->clearVisibleColumnButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearVisibleColumnSelection())); + connect(d->clearVisibleColumnButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearVisibleColumnSelection())); d->visibleColumnCombo = new KexiFieldComboBox(contents, "visibleColumnCombo"); d->visibleColumnLabel->setBuddy(d->visibleColumnCombo); @@ -211,11 +211,11 @@ KexiLookupColumnPage::KexiLookupColumnPage(TQWidget *parent) vlyr->addStretch(1); - connect(d->rowSourceCombo, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotRowSourceTextChanged(const TQString &))); - connect(d->rowSourceCombo, TQT_SIGNAL(dataSourceChanged()), this, TQT_SLOT(slotRowSourceChanged())); - connect(d->boundColumnCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotBoundColumnSelected())); - connect(d->visibleColumnCombo, TQT_SIGNAL(selected()), this, TQT_SLOT(slotVisibleColumnSelected())); + connect(d->rowSourceCombo, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotRowSourceTextChanged(const TQString &))); + connect(d->rowSourceCombo, TQ_SIGNAL(dataSourceChanged()), this, TQ_SLOT(slotRowSourceChanged())); + connect(d->boundColumnCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotBoundColumnSelected())); + connect(d->visibleColumnCombo, TQ_SIGNAL(selected()), this, TQ_SLOT(slotVisibleColumnSelected())); clearBoundColumnSelection(); clearVisibleColumnSelection(); diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index d092bf89..c641c9cd 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -159,46 +159,46 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare d->view->setSpreadSheetMode(); - connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), - this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); - connect(d->data, TQT_SIGNAL(rowUpdated(KexiTableItem*)), - this, TQT_SLOT(slotRowUpdated(KexiTableItem*))); - //connect(d->data, TQT_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)), - // this, TQT_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool))); - connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), - this, TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); + connect(d->data, TQ_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)), + this, TQ_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*))); + connect(d->data, TQ_SIGNAL(rowUpdated(KexiTableItem*)), + this, TQ_SLOT(slotRowUpdated(KexiTableItem*))); + //connect(d->data, TQ_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)), + // this, TQ_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool))); + connect(d->data, TQ_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)), + this, TQ_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool))); setMinimumSize(d->view->minimumSizeHint().width(), d->view->minimumSizeHint().height()); d->view->setFocus(); d->sets = new KexiDataAwarePropertySet( this, d->view ); - connect(d->sets, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(updateActions())); - connect(d->sets, TQT_SIGNAL(rowInserted()), this, TQT_SLOT(slotRowInserted())); + connect(d->sets, TQ_SIGNAL(rowDeleted()), this, TQ_SLOT(updateActions())); + connect(d->sets, TQ_SIGNAL(rowInserted()), this, TQ_SLOT(slotRowInserted())); d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu()); d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0); - connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowContextMenu())); + connect(d->view->contextMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShowContextMenu())); - plugSharedAction("tablepart_toggle_pkey", this, TQT_SLOT(slotTogglePrimaryKey())); + plugSharedAction("tablepart_toggle_pkey", this, TQ_SLOT(slotTogglePrimaryKey())); d->action_toggle_pkey = static_cast<TDEToggleAction*>( sharedAction("tablepart_toggle_pkey") ); d->action_toggle_pkey->plug(d->view->contextMenu(), 1); //add at the beginning d->view->contextMenu()->insertSeparator(2); setAvailable("tablepart_toggle_pkey", !conn->isReadOnly()); #ifndef KEXI_NO_UNDOREDO_ALTERTABLE - plugSharedAction("edit_undo", this, TQT_SLOT(slotUndo())); - plugSharedAction("edit_redo", this, TQT_SLOT(slotRedo())); + plugSharedAction("edit_undo", this, TQ_SLOT(slotUndo())); + plugSharedAction("edit_redo", this, TQ_SLOT(slotRedo())); setAvailable("edit_undo", false); setAvailable("edit_redo", false); - connect(d->history, TQT_SIGNAL(commandExecuted(KCommand*)), this, TQT_SLOT(slotCommandExecuted(KCommand*))); + connect(d->history, TQ_SIGNAL(commandExecuted(KCommand*)), this, TQ_SLOT(slotCommandExecuted(KCommand*))); #endif #ifdef KEXI_DEBUG_GUI KexiUtils::addAlterTableActionDebug(TQString()); //to create the tab KexiUtils::connectPushButtonActionForDebugWindow( - "simulateAlterTableExecution", this, TQT_SLOT(slotSimulateAlterTableExecution())); + "simulateAlterTableExecution", this, TQ_SLOT(slotSimulateAlterTableExecution())); KexiUtils::connectPushButtonActionForDebugWindow( - "executeRealAlterTable", this, TQT_SLOT(executeRealAlterTable())); + "executeRealAlterTable", this, TQ_SLOT(executeRealAlterTable())); #endif } @@ -308,8 +308,8 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b KoProperty::Set *set = new KoProperty::Set(d->sets, typeName); if (mainWin()->project()->dbConnection()->isReadOnly()) set->setReadOnly( true ); -// connect(buff,TQT_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)), -// this, TQT_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&))); +// connect(buff,TQ_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)), +// this, TQ_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&))); KoProperty::Property *prop; @@ -456,8 +456,8 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b //---- d->updatePropertiesVisibility(field.type(), *set); - connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); d->sets->insert(row, set, newOne); return set; @@ -1556,7 +1556,7 @@ void KexiTableDesignerView::slotSimulateAlterTableExecution() tristate KexiTableDesignerView::executeRealAlterTable() { TQSignal signal; - signal.connect( mainWin(), TQT_SLOT(slotProjectSave()) ); + signal.connect( mainWin(), TQ_SLOT(slotProjectSave()) ); d->tempStoreDataUsingRealAlterTable = true; d->recentResultOfStoreData = false; signal.activate(); //will call KexiMainWindowImpl::slotProjectSaveAs() and thus storeData() diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index e1c3cd22..d709da33 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -222,18 +222,18 @@ void KexiTablePart::setupCustomPropertyPanelTabs(KTabWidget *tab, KexiMainWindow { if (!d->lookupColumnPage) { d->lookupColumnPage = new KexiLookupColumnPage(0); - connect(d->lookupColumnPage, TQT_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)), - mainWin, TQT_SLOT(highlightObject(const TQCString&, const TQCString&))); + connect(d->lookupColumnPage, TQ_SIGNAL(jumpToObjectRequested(const TQCString&, const TQCString&)), + mainWin, TQ_SLOT(highlightObject(const TQCString&, const TQCString&))); //! @todo add "Table" tab /* - connect(d->dataSourcePage, TQT_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)), - KFormDesigner::FormManager::self(), TQT_SLOT(setFormDataSource(const TQCString&, const TQCString&))); - connect(d->dataSourcePage, TQT_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)), - KFormDesigner::FormManager::self(), TQT_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type))); - connect(d->dataSourcePage, TQT_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)), - KFormDesigner::FormManager::self(), TQT_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));*/ + connect(d->dataSourcePage, TQ_SIGNAL(formDataSourceChanged(const TQCString&, const TQCString&)), + KFormDesigner::FormManager::self(), TQ_SLOT(setFormDataSource(const TQCString&, const TQCString&))); + connect(d->dataSourcePage, TQ_SIGNAL(dataSourceFieldOrExpressionChanged(const TQString&, const TQString&, KexiDB::Field::Type)), + KFormDesigner::FormManager::self(), TQ_SLOT(setDataSourceFieldOrExpression(const TQString&, const TQString&, KexiDB::Field::Type))); + connect(d->dataSourcePage, TQ_SIGNAL(insertAutoFields(const TQString&, const TQString&, const TQStringList&)), + KFormDesigner::FormManager::self(), TQ_SLOT(insertAutoFields(const TQString&, const TQString&, const TQStringList&)));*/ } KexiProject *prj = mainWin->project(); |