summaryrefslogtreecommitdiffstats
path: root/kexi/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/plugins')
-rw-r--r--kexi/plugins/forms/kexiformpart.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbform.cpp8
-rw-r--r--kexi/plugins/forms/widgets/kexidblineedit.cpp4
-rw-r--r--kexi/plugins/forms/widgets/kexidbsubform.cpp4
-rw-r--r--kexi/plugins/forms/widgets/kexidbtextedit.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignersql.cpp14
-rw-r--r--kexi/plugins/queries/kexiquerypart.cpp6
-rw-r--r--kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp6
-rw-r--r--kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp2
-rw-r--r--kexi/plugins/tables/kexitabledesignerview.cpp30
-rw-r--r--kexi/plugins/tables/kexitablepart.cpp2
12 files changed, 41 insertions, 41 deletions
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index cce155d4..e5d7addf 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -230,7 +230,7 @@ void KexiFormPart::initInstanceActions()
KexiDialogTempData*
KexiFormPart::createTempData(KexiDialogBase* dialog)
{
- return new KexiFormPart::TempData(TQT_TQOBJECT(dialog));
+ return new KexiFormPart::TempData(dialog);
}
KexiViewBase* KexiFormPart::createView(TQWidget *parent, KexiDialogBase* dialog,
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 41e8cc64..263f327b 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -131,7 +131,7 @@ static void repaintAll(TQWidget *w)
TQObjectList *list = w->queryList("TQWidget");
TQObjectListIt it(*list);
for (TQObject *obj; (obj=it.current()); ++it ) {
- TQT_TQWIDGET(obj)->repaint();
+ static_cast<TQWidget*>(obj)->repaint();
}
delete list;
}
@@ -320,7 +320,7 @@ void KexiDBForm::updateTabStopsOrder(KFormDesigner::Form* form)
kexipluginsdbg << "KexiDBForm::updateTabStopsOrder(): also adding '"
<< childrenIt.current()->className() << " " << childrenIt.current()->name()
<< "' child to filtered widgets" << endl;
- //it.current()->widget()->installEventFilter(TQT_TQWIDGET(childrenIt.current()));
+ //it.current()->widget()->installEventFilter(childrenIt.current());
childrenIt.current()->installEventFilter(this);
// }
}
@@ -495,7 +495,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
if (!realWidget)
return true; //ignore
//the watched widget can be a subwidget of a real widget, e.g. autofield: find it
- //TQWidget* realWidget = TQT_TQWIDGET(watched);
+ //TQWidget* realWidget = static_cast<TQWidget*>(watched);
while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface())
realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface() );
@@ -548,7 +548,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
//behaves differently (e.g. TQLineEdit calls selectAll()) when
//focus event's reason is TQFocusEvent::Tab
if (widgetToFocus->focusProxy())
- widgetToFocus = TQT_TQWIDGET(widgetToFocus->focusProxy());
+ widgetToFocus = widgetToFocus->focusProxy();
if (widgetToFocus && d->dataAwareObject->acceptEditor()) {
if (tab) {
//try to accept this will validate the current input (if any)
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.cpp b/kexi/plugins/forms/widgets/kexidblineedit.cpp
index 5e2ac08a..e0395cde 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidblineedit.cpp
@@ -56,7 +56,7 @@ KexiDBLineEdit::KexiDBLineEdit(TQWidget *parent, const char *name)
, KexiFormDataItemInterface()
//moved , m_dateFormatter(0)
//moved , m_timeFormatter(0)
- , m_menuExtender(TQT_TQOBJECT(this), this)
+ , m_menuExtender(this, this)
, m_internalReadOnly(false)
, m_slotTextChanged_enabled(true)
{
@@ -254,7 +254,7 @@ void KexiDBLineEdit::setReadOnly( bool readOnly )
if (m_internalReadOnly) {
m_readWriteValidator = validator();
if (!m_readOnlyValidator)
- m_readOnlyValidator = new KexiDBLineEdit_ReadOnlyValidator(TQT_TQOBJECT(this));
+ m_readOnlyValidator = new KexiDBLineEdit_ReadOnlyValidator(this);
setValidator( m_readOnlyValidator );
}
else {
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 8b4149a9..d021bcb2 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -124,8 +124,8 @@ KexiDBSubForm::setFormName(const TQString &name)
m_form->setDesignMode(false);
// Install event filters on the whole newly created form
- KFormDesigner::ObjectTreeItem *tree = m_parentForm->objectTree()->lookup(TQT_TQOBJECT(this)->name());
- KFormDesigner::installRecursiveEventFilter(TQT_TQOBJECT(this), tree->eventEater());
+ KFormDesigner::ObjectTreeItem *tree = m_parentForm->objectTree()->lookup(this->name());
+ KFormDesigner::installRecursiveEventFilter(this, tree->eventEater());
}
#include "kexidbsubform.moc"
diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
index 07e932b4..3b9c6f09 100644
--- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp
+++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp
@@ -32,7 +32,7 @@ KexiDBTextEdit::KexiDBTextEdit(TQWidget *parent, const char *name)
: KTextEdit(parent, name)
, KexiDBTextWidgetInterface()
, KexiFormDataItemInterface()
- , m_menuExtender(TQT_TQOBJECT(this), this)
+ , m_menuExtender(this, this)
, m_slotTextChanged_enabled(true)
{
connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()));
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 9c9c5f22..61f86ec2 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -383,7 +383,7 @@ if ( m_mode == Clipboard )
connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(optionsButtonClicked()));
- installRecursiveEventFilter(TQT_TQOBJECT(this), TQT_TQOBJECT(this));
+ installRecursiveEventFilter(this, this);
initLater();
}
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index be57a766..f443c92f 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()), TQT_TQOBJECT(this), TQT_SLOT(slotTextChanged()));
+ connect(d->editor, TQT_SIGNAL(textChanged()), this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT(slotCheckQuery()));
- plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode()));
+ plugSharedAction("querypart_check_query", this, TQT_SLOT(slotCheckQuery()));
+ plugSharedAction("querypart_view_toggle_history", this, TQT_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, TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery()));
- d->historyHead->addButton("edit-clear", msg_clear, TQT_TQOBJECT(d->history), TQT_SLOT(clear()));
- d->history->popupMenu()->insertItem(SmallIcon("select_item"), msg_back, TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery()));
+ 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()), TQT_TQOBJECT(this), TQT_SLOT(slotSelectQuery()));
+ connect(d->history, TQT_SIGNAL(currentItemDoubleClicked()), this, TQT_SLOT(slotSelectQuery()));
d->heightForHistoryMode = -1; //height() / 2;
//d->historyHead->hide();
diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp
index 02c4ab94..aad6c992 100644
--- a/kexi/plugins/queries/kexiquerypart.cpp
+++ b/kexi/plugins/queries/kexiquerypart.cpp
@@ -214,7 +214,7 @@ tristate KexiQueryPart::rename(KexiMainWindow *win, KexiPart::Item &item, const
//----------------
KexiQueryPart::TempData::TempData(KexiDialogBase* parent, KexiDB::Connection *conn)
- : KexiDialogTempData(TQT_TQOBJECT(parent))
+ : KexiDialogTempData(parent)
, KexiDB::Connection::TableSchemaChangeListenerInterface()
, queryChangedInPreviousView(false)
, m_query(0)
@@ -253,7 +253,7 @@ void KexiQueryPart::TempData::registerTableSchemaChanges(KexiDB::QuerySchema *q)
tristate KexiQueryPart::TempData::closeListener()
{
- KexiDialogBase* dlg = static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent()));
+ KexiDialogBase* dlg = static_cast<KexiDialogBase*>(parent());
return dlg->mainWin()->closeDialog(dlg);
}
@@ -270,7 +270,7 @@ void KexiQueryPart::TempData::setQuery(KexiDB::QuerySchema *query)
return;
if (m_query
/* query not owned by dialog */
- && (static_cast<KexiDialogBase*>(TQT_TQWIDGET(parent()))->schemaData() != static_cast<KexiDB::SchemaData*>( m_query )))
+ && (static_cast<KexiDialogBase*>(parent())->schemaData() != static_cast<KexiDB::SchemaData*>( m_query )))
{
delete m_query;
}
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
index 6de68b7d..4348aae2 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp
@@ -88,13 +88,13 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa
d->statusbrowser->installEventFilter(this);
splitter->setResizeMode(d->statusbrowser, TQSplitter::KeepSize);
- plugSharedAction( "data_execute", TQT_TQOBJECT(this), TQT_SLOT(execute()) );
+ plugSharedAction( "data_execute", this, TQT_SLOT(execute()) );
if(KexiEditor::isAdvancedEditor()) // the configeditor is only in advanced mode avaiable.
- plugSharedAction( "script_config_editor", TQT_TQOBJECT(d->editor), TQT_SLOT(slotConfigureEditor()) );
+ plugSharedAction( "script_config_editor", d->editor, TQT_SLOT(slotConfigureEditor()) );
loadData();
- d->properties = new KoProperty::Set(TQT_TQOBJECT(this), "KexiScripting");
+ 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&) ));
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index b45c97c7..fe3453ab 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -124,7 +124,7 @@ void KexiScriptPart::initPartActions()
// scripting-plugin depends on this instance and loading the plugin will
// fail if it's not avaiable.
if(! Kross::Api::Manager::scriptManager()->hasChild("KexiMainWindow")) {
- Kross::Api::Manager::scriptManager()->addTQObject(TQT_TQOBJECT(m_mainWin), "KexiMainWindow");
+ Kross::Api::Manager::scriptManager()->addTQObject(m_mainWin, "KexiMainWindow");
// Add the TDEAction's provided by the ScriptGUIClient to the
// KexiMainWindow.
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 4b68a7de..d092bf89 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -160,45 +160,45 @@ KexiTableDesignerView::KexiTableDesignerView(KexiMainWindow *win, TQWidget *pare
d->view->setSpreadSheetMode();
connect(d->data, TQT_SIGNAL(aboutToChangeCell(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)),
- TQT_TQOBJECT(this), TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
+ this, TQT_SLOT(slotBeforeCellChanged(KexiTableItem*,int,TQVariant&,KexiDB::ResultInfo*)));
connect(d->data, TQT_SIGNAL(rowUpdated(KexiTableItem*)),
- TQT_TQOBJECT(this), TQT_SLOT(slotRowUpdated(KexiTableItem*)));
+ this, TQT_SLOT(slotRowUpdated(KexiTableItem*)));
//connect(d->data, TQT_SIGNAL(aboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)),
- // TQT_TQOBJECT(this), TQT_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)));
+ // this, TQT_SLOT(slotAboutToInsertRow(KexiTableItem*,KexiDB::ResultInfo*,bool)));
connect(d->data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
- TQT_TQOBJECT(this), TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
+ this, TQT_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()), TQT_TQOBJECT(this), TQT_SLOT(updateActions()));
- connect(d->sets, TQT_SIGNAL(rowInserted()), TQT_TQOBJECT(this), TQT_SLOT(slotRowInserted()));
+ connect(d->sets, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(updateActions()));
+ connect(d->sets, TQT_SIGNAL(rowInserted()), this, TQT_SLOT(slotRowInserted()));
d->contextMenuTitle = new TDEPopupTitle(d->view->contextMenu());
d->view->contextMenu()->insertItem(d->contextMenuTitle, -1, 0);
- connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotAboutToShowContextMenu()));
+ connect(d->view->contextMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShowContextMenu()));
- plugSharedAction("tablepart_toggle_pkey", TQT_TQOBJECT(this), TQT_SLOT(slotTogglePrimaryKey()));
+ plugSharedAction("tablepart_toggle_pkey", this, TQT_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", TQT_TQOBJECT(this), TQT_SLOT(slotUndo()));
- plugSharedAction("edit_redo", TQT_TQOBJECT(this), TQT_SLOT(slotRedo()));
+ plugSharedAction("edit_undo", this, TQT_SLOT(slotUndo()));
+ plugSharedAction("edit_redo", this, TQT_SLOT(slotRedo()));
setAvailable("edit_undo", false);
setAvailable("edit_redo", false);
- connect(d->history, TQT_SIGNAL(commandExecuted(KCommand*)), TQT_TQOBJECT(this), TQT_SLOT(slotCommandExecuted(KCommand*)));
+ connect(d->history, TQT_SIGNAL(commandExecuted(KCommand*)), this, TQT_SLOT(slotCommandExecuted(KCommand*)));
#endif
#ifdef KEXI_DEBUG_GUI
KexiUtils::addAlterTableActionDebug(TQString()); //to create the tab
KexiUtils::connectPushButtonActionForDebugWindow(
- "simulateAlterTableExecution", TQT_TQOBJECT(this), TQT_SLOT(slotSimulateAlterTableExecution()));
+ "simulateAlterTableExecution", this, TQT_SLOT(slotSimulateAlterTableExecution()));
KexiUtils::connectPushButtonActionForDebugWindow(
- "executeRealAlterTable", TQT_TQOBJECT(this), TQT_SLOT(executeRealAlterTable()));
+ "executeRealAlterTable", this, TQT_SLOT(executeRealAlterTable()));
#endif
}
@@ -309,7 +309,7 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b
if (mainWin()->project()->dbConnection()->isReadOnly())
set->setReadOnly( true );
// connect(buff,TQT_SIGNAL(propertyChanged(KexiPropertyBuffer&,KexiProperty&)),
-// TQT_TQOBJECT(this), TQT_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&)));
+// this, TQT_SLOT(slotPropertyChanged(KexiPropertyBuffer&,KexiProperty&)));
KoProperty::Property *prop;
@@ -457,7 +457,7 @@ KexiTableDesignerView::createPropertySet( int row, const KexiDB::Field& field, b
d->updatePropertiesVisibility(field.type(), *set);
connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)),
- TQT_TQOBJECT(this), TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
+ this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&)));
d->sets->insert(row, set, newOne);
return set;
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 2a9b61d3..e1c3cd22 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -93,7 +93,7 @@ void KexiTablePart::initInstanceActions()
KexiDialogTempData* KexiTablePart::createTempData(KexiDialogBase* dialog)
{
- return new KexiTablePart::TempData(TQT_TQOBJECT(dialog));
+ return new KexiTablePart::TempData(dialog);
}
KexiViewBase* KexiTablePart::createView(TQWidget *parent, KexiDialogBase* dialog,