summaryrefslogtreecommitdiffstats
path: root/kexi/widget/tableview
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/widget/tableview')
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp38
-rw-r--r--kexi/widget/tableview/kexicomboboxbase.cpp8
-rw-r--r--kexi/widget/tableview/kexicomboboxpopup.cpp16
-rw-r--r--kexi/widget/tableview/kexicomboboxtableedit.cpp4
-rw-r--r--kexi/widget/tableview/kexidataawareobjectiface.cpp40
-rw-r--r--kexi/widget/tableview/kexidataawareobjectiface.h12
-rw-r--r--kexi/widget/tableview/kexidataawarepropertyset.cpp28
-rw-r--r--kexi/widget/tableview/kexidatatableview.cpp6
-rw-r--r--kexi/widget/tableview/kexiinputtableedit.cpp8
-rw-r--r--kexi/widget/tableview/kexitableview.cpp30
-rw-r--r--kexi/widget/tableview/kexitableviewheader.cpp4
11 files changed, 97 insertions, 97 deletions
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index b3de3419..b02a74a6 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -101,25 +101,25 @@ KexiBlobTableEdit::KexiBlobTableEdit(KexiTableViewColumn &column, TQWidget *pare
d->button->setPopup( d->popup );
//force edit requested to start editing... (this will call slotUpdateActionsAvailabilityRequested())
- //connect(d->popup, TQT_SIGNAL(aboutToShow()), this, TQT_SIGNAL(editRequested()));
-
- connect(d->popup, TQT_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)),
- this, TQT_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
-
- connect(d->popup, TQT_SIGNAL(insertFromFileRequested(const KURL&)),
- this, TQT_SLOT(handleInsertFromFileAction(const KURL&)));
- connect(d->popup, TQT_SIGNAL(saveAsRequested(const TQString&)),
- this, TQT_SLOT(handleSaveAsAction(const TQString&)));
- connect(d->popup, TQT_SIGNAL(cutRequested()),
- this, TQT_SLOT(handleCutAction()));
- connect(d->popup, TQT_SIGNAL(copyRequested()),
- this, TQT_SLOT(handleCopyAction()));
- connect(d->popup, TQT_SIGNAL(pasteRequested()),
- this, TQT_SLOT(handlePasteAction()));
- connect(d->popup, TQT_SIGNAL(clearRequested()),
- this, TQT_SLOT(clear()));
- connect(d->popup, TQT_SIGNAL(showPropertiesRequested()),
- this, TQT_SLOT(handleShowPropertiesAction()));
+ //connect(d->popup, TQ_SIGNAL(aboutToShow()), this, TQ_SIGNAL(editRequested()));
+
+ connect(d->popup, TQ_SIGNAL(updateActionsAvailabilityRequested(bool&, bool&)),
+ this, TQ_SLOT(slotUpdateActionsAvailabilityRequested(bool&, bool&)));
+
+ connect(d->popup, TQ_SIGNAL(insertFromFileRequested(const KURL&)),
+ this, TQ_SLOT(handleInsertFromFileAction(const KURL&)));
+ connect(d->popup, TQ_SIGNAL(saveAsRequested(const TQString&)),
+ this, TQ_SLOT(handleSaveAsAction(const TQString&)));
+ connect(d->popup, TQ_SIGNAL(cutRequested()),
+ this, TQ_SLOT(handleCutAction()));
+ connect(d->popup, TQ_SIGNAL(copyRequested()),
+ this, TQ_SLOT(handleCopyAction()));
+ connect(d->popup, TQ_SIGNAL(pasteRequested()),
+ this, TQ_SLOT(handlePasteAction()));
+ connect(d->popup, TQ_SIGNAL(clearRequested()),
+ this, TQ_SLOT(clear()));
+ connect(d->popup, TQ_SIGNAL(showPropertiesRequested()),
+ this, TQ_SLOT(handleShowPropertiesAction()));
}
KexiBlobTableEdit::~KexiBlobTableEdit()
diff --git a/kexi/widget/tableview/kexicomboboxbase.cpp b/kexi/widget/tableview/kexicomboboxbase.cpp
index 89ba63cf..d2aaee78 100644
--- a/kexi/widget/tableview/kexicomboboxbase.cpp
+++ b/kexi/widget/tableview/kexicomboboxbase.cpp
@@ -357,10 +357,10 @@ void KexiComboBoxBase::createPopup(bool show)
if (!popup()) {
setPopup( column() ? new KexiComboBoxPopup(thisWidget, *column())
: new KexiComboBoxPopup(thisWidget, *field()) );
- TQObject::connect(popup(), TQT_SIGNAL(rowAccepted(KexiTableItem*,int)),
- thisWidget, TQT_SLOT(slotRowAccepted(KexiTableItem*,int)));
- TQObject::connect(popup()->tableView(), TQT_SIGNAL(itemSelected(KexiTableItem*)),
- thisWidget, TQT_SLOT(slotItemSelected(KexiTableItem*)));
+ TQObject::connect(popup(), TQ_SIGNAL(rowAccepted(KexiTableItem*,int)),
+ thisWidget, TQ_SLOT(slotRowAccepted(KexiTableItem*,int)));
+ TQObject::connect(popup()->tableView(), TQ_SIGNAL(itemSelected(KexiTableItem*)),
+ thisWidget, TQ_SLOT(slotItemSelected(KexiTableItem*)));
popup()->setFocusProxy( widgetToFocus );
popup()->tableView()->setFocusProxy( widgetToFocus );
diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp
index 6877bd78..b0f6621c 100644
--- a/kexi/widget/tableview/kexicomboboxpopup.cpp
+++ b/kexi/widget/tableview/kexicomboboxpopup.cpp
@@ -134,14 +134,14 @@ void KexiComboBoxPopup::init()
d->tv = new KexiComboBoxPopup_KexiTableView(this);
installEventFilter(this);
- connect(d->tv, TQT_SIGNAL(itemReturnPressed(KexiTableItem*,int,int)),
- this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+ connect(d->tv, TQ_SIGNAL(itemReturnPressed(KexiTableItem*,int,int)),
+ this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
- connect(d->tv, TQT_SIGNAL(itemMouseReleased(KexiTableItem*,int,int)),
- this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+ connect(d->tv, TQ_SIGNAL(itemMouseReleased(KexiTableItem*,int,int)),
+ this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
- connect(d->tv, TQT_SIGNAL(itemDblClicked(KexiTableItem*,int,int)),
- this, TQT_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
+ connect(d->tv, TQ_SIGNAL(itemDblClicked(KexiTableItem*,int,int)),
+ this, TQ_SLOT(slotTVItemAccepted(KexiTableItem*,int,int)));
}
void KexiComboBoxPopup::setData(KexiTableViewColumn *column, KexiDB::Field *field)
@@ -258,7 +258,7 @@ void KexiComboBoxPopup::setData(KexiTableViewColumn *column, KexiDB::Field *fiel
d->tv->KexiDataAwareObjectInterface::data()->disconnect( this );
d->tv->setData( cursor );
- connect( d->tv, TQT_SIGNAL(dataRefreshed()), this, TQT_SLOT(slotDataReloadRequested()));
+ connect( d->tv, TQ_SIGNAL(dataRefreshed()), this, TQ_SLOT(slotDataReloadRequested()));
updateSize();
return;
}
@@ -287,7 +287,7 @@ void KexiComboBoxPopup::setDataInternal( KexiTableViewData *data, bool owner )
if (d->tv->KexiDataAwareObjectInterface::data())
d->tv->KexiDataAwareObjectInterface::data()->disconnect( this );
d->tv->setData( data, owner );
- connect( d->tv, TQT_SIGNAL(dataRefreshed()), this, TQT_SLOT(slotDataReloadRequested()));
+ connect( d->tv, TQ_SIGNAL(dataRefreshed()), this, TQ_SLOT(slotDataReloadRequested()));
updateSize();
}
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 0ac9923e..2d771041 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -71,9 +71,9 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
d->button = new KexiComboBoxDropDownButton( parentWidget() /*usually a viewport*/ );
d->button->hide();
d->button->setFocusPolicy( TQWidget::NoFocus );
- connect(d->button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotButtonClicked()));
+ connect(d->button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotButtonClicked()));
- connect(m_lineedit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLineEditTextChanged(const TQString&)));
+ connect(m_lineedit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotLineEditTextChanged(const TQString&)));
// m_lineedit = new KLineEdit(this, "lineedit");
// m_lineedit->setFrame(false);
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index 2ba85294..bcb510d2 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -158,29 +158,29 @@ void KexiDataAwareObjectInterface::setData( KexiTableViewData *data, bool owner
if (m_data && !theSameData) {
//! @todo: store sorting settings?
setSorting(-1);
-// connect(m_data, TQT_SIGNAL(refreshRequested()), this, TQT_SLOT(slotRefreshRequested()));
- connectToReloadDataSlot(m_data, TQT_SIGNAL(reloadRequested()));
+// connect(m_data, TQ_SIGNAL(refreshRequested()), this, TQ_SLOT(slotRefreshRequested()));
+ connectToReloadDataSlot(m_data, TQ_SIGNAL(reloadRequested()));
TQObject* thisObject = dynamic_cast<TQObject*>(this);
if (thisObject) {
- TQObject::connect(m_data, TQT_SIGNAL(destroying()), thisObject, TQT_SLOT(slotDataDestroying()));
- TQObject::connect(m_data, TQT_SIGNAL(rowsDeleted( const TQValueList<int> & )),
- thisObject, TQT_SLOT(slotRowsDeleted( const TQValueList<int> & )));
- TQObject::connect(m_data, TQT_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
- thisObject, TQT_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
- TQObject::connect(m_data, TQT_SIGNAL(rowDeleted()), thisObject, TQT_SLOT(slotRowDeleted()));
- TQObject::connect(m_data, TQT_SIGNAL(rowInserted(KexiTableItem*,bool)),
- thisObject, TQT_SLOT(slotRowInserted(KexiTableItem*,bool)));
- TQObject::connect(m_data, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
- thisObject, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); //not db-aware
- TQObject::connect(m_data, TQT_SIGNAL(rowRepaintRequested(KexiTableItem&)),
- thisObject, TQT_SLOT(slotRowRepaintRequested(KexiTableItem&)));
+ TQObject::connect(m_data, TQ_SIGNAL(destroying()), thisObject, TQ_SLOT(slotDataDestroying()));
+ TQObject::connect(m_data, TQ_SIGNAL(rowsDeleted( const TQValueList<int> & )),
+ thisObject, TQ_SLOT(slotRowsDeleted( const TQValueList<int> & )));
+ TQObject::connect(m_data, TQ_SIGNAL(aboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)),
+ thisObject, TQ_SLOT(slotAboutToDeleteRow(KexiTableItem&,KexiDB::ResultInfo*,bool)));
+ TQObject::connect(m_data, TQ_SIGNAL(rowDeleted()), thisObject, TQ_SLOT(slotRowDeleted()));
+ TQObject::connect(m_data, TQ_SIGNAL(rowInserted(KexiTableItem*,bool)),
+ thisObject, TQ_SLOT(slotRowInserted(KexiTableItem*,bool)));
+ TQObject::connect(m_data, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
+ thisObject, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool))); //not db-aware
+ TQObject::connect(m_data, TQ_SIGNAL(rowRepaintRequested(KexiTableItem&)),
+ thisObject, TQ_SLOT(slotRowRepaintRequested(KexiTableItem&)));
// setup scrollbar's tooltip
- TQObject::connect(verticalScrollBar(),TQT_SIGNAL(sliderReleased()),
- thisObject,TQT_SLOT(vScrollBarSliderReleased()));
- TQObject::connect(verticalScrollBar(),TQT_SIGNAL(valueChanged(int)),
- thisObject,TQT_SLOT(vScrollBarValueChanged(int)));
- TQObject::connect(&m_scrollBarTipTimer,TQT_SIGNAL(timeout()),
- thisObject,TQT_SLOT(scrollBarTipTimeout()));
+ TQObject::connect(verticalScrollBar(),TQ_SIGNAL(sliderReleased()),
+ thisObject,TQ_SLOT(vScrollBarSliderReleased()));
+ TQObject::connect(verticalScrollBar(),TQ_SIGNAL(valueChanged(int)),
+ thisObject,TQ_SLOT(vScrollBarValueChanged(int)));
+ TQObject::connect(&m_scrollBarTipTimer,TQ_SIGNAL(timeout()),
+ thisObject,TQ_SLOT(scrollBarTipTimeout()));
}
}
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index d9819f5d..31bfcc29 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -896,23 +896,23 @@ inline KexiTableItem *KexiDataAwareObjectInterface::itemAt(int row) const
#define KEXI_DATAAWAREOBJECTINTERFACE \
public: \
void connectCellSelectedSignal(const TQObject* receiver, const char* intIntMember) { \
- connect(this, TQT_SIGNAL(cellSelected(int,int)), receiver, intIntMember); \
+ connect(this, TQ_SIGNAL(cellSelected(int,int)), receiver, intIntMember); \
} \
void connectRowEditStartedSignal(const TQObject* receiver, const char* intMember) { \
- connect(this, TQT_SIGNAL(rowEditStarted(int)), receiver, intMember); \
+ connect(this, TQ_SIGNAL(rowEditStarted(int)), receiver, intMember); \
} \
void connectRowEditTerminatedSignal(const TQObject* receiver, const char* voidMember) { \
- connect(this, TQT_SIGNAL(rowEditTerminated(int)), receiver, voidMember); \
+ connect(this, TQ_SIGNAL(rowEditTerminated(int)), receiver, voidMember); \
} \
void connectReloadActionsSignal(const TQObject* receiver, const char* voidMember) { \
- connect(this, TQT_SIGNAL(reloadActions()), receiver, voidMember); \
+ connect(this, TQ_SIGNAL(reloadActions()), receiver, voidMember); \
} \
void connectDataSetSignal(const TQObject* receiver, \
const char* kexiTableViewDataMember) { \
- connect(this, TQT_SIGNAL(dataSet(KexiTableViewData*)), receiver, kexiTableViewDataMember); \
+ connect(this, TQ_SIGNAL(dataSet(KexiTableViewData*)), receiver, kexiTableViewDataMember); \
} \
void connectToReloadDataSlot(const TQObject* sender, const char* voidSignal) { \
- connect(sender, voidSignal, this, TQT_SLOT(reloadData())); \
+ connect(sender, voidSignal, this, TQ_SLOT(reloadData())); \
}
#endif
diff --git a/kexi/widget/tableview/kexidataawarepropertyset.cpp b/kexi/widget/tableview/kexidataawarepropertyset.cpp
index 8b0fdff7..2219cf97 100644
--- a/kexi/widget/tableview/kexidataawarepropertyset.cpp
+++ b/kexi/widget/tableview/kexidataawarepropertyset.cpp
@@ -35,12 +35,12 @@ KexiDataAwarePropertySet::KexiDataAwarePropertySet(KexiViewBase *view,
{
m_sets.setAutoDelete(true);
-// connect(m_dataObject, TQT_SIGNAL(dataSet(KexiTableViewData*)),
-// this, TQT_SLOT(slotDataSet(KexiTableViewData*)));
- m_dataObject->connectDataSetSignal(this, TQT_SLOT(slotDataSet(KexiTableViewData*)));
-// connect(m_dataObject, TQT_SIGNAL(cellSelected(int,int)),
-// this, TQT_SLOT(slotCellSelected(int,int)));
- m_dataObject->connectCellSelectedSignal(this, TQT_SLOT(slotCellSelected(int,int)));
+// connect(m_dataObject, TQ_SIGNAL(dataSet(KexiTableViewData*)),
+// this, TQ_SLOT(slotDataSet(KexiTableViewData*)));
+ m_dataObject->connectDataSetSignal(this, TQ_SLOT(slotDataSet(KexiTableViewData*)));
+// connect(m_dataObject, TQ_SIGNAL(cellSelected(int,int)),
+// this, TQ_SLOT(slotCellSelected(int,int)));
+ m_dataObject->connectCellSelectedSignal(this, TQ_SLOT(slotCellSelected(int,int)));
//
slotDataSet( m_dataObject->data() );
const bool wasDirty = view->dirty();
@@ -61,13 +61,13 @@ void KexiDataAwarePropertySet::slotDataSet( KexiTableViewData *data )
}
m_currentTVData = data;
if (!m_currentTVData.isNull()) {
- connect(m_currentTVData, TQT_SIGNAL(rowDeleted()), this, TQT_SLOT(slotRowDeleted()));
- connect(m_currentTVData, TQT_SIGNAL(rowsDeleted( const TQValueList<int> & )),
- this, TQT_SLOT(slotRowsDeleted( const TQValueList<int> & )));
- connect(m_currentTVData, TQT_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
- this, TQT_SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
- connect(m_currentTVData, TQT_SIGNAL(reloadRequested()),
- this, TQT_SLOT(slotReloadRequested()));
+ connect(m_currentTVData, TQ_SIGNAL(rowDeleted()), this, TQ_SLOT(slotRowDeleted()));
+ connect(m_currentTVData, TQ_SIGNAL(rowsDeleted( const TQValueList<int> & )),
+ this, TQ_SLOT(slotRowsDeleted( const TQValueList<int> & )));
+ connect(m_currentTVData, TQ_SIGNAL(rowInserted(KexiTableItem*,uint,bool)),
+ this, TQ_SLOT(slotRowInserted(KexiTableItem*,uint,bool)));
+ connect(m_currentTVData, TQ_SIGNAL(reloadRequested()),
+ this, TQ_SLOT(slotReloadRequested()));
}
}
@@ -118,7 +118,7 @@ void KexiDataAwarePropertySet::insert(uint row, KoProperty::Set* set, bool newOn
m_sets.insert(row, set);
- connect(set, TQT_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQT_SLOT(setDirty()));
+ connect(set, TQ_SIGNAL(propertyChanged(KoProperty::Set&, KoProperty::Property&)), m_view, TQ_SLOT(setDirty()));
if (newOne) {
//add a special property indicating that this is brand new set,
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index 800c76e7..3c7a3e27 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -59,14 +59,14 @@ KexiDataTableView::init()
// m_records = 0;
// m_first = false;
-// connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotMoving(int)));
-// connect(verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotMoving(int)));
+// connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotMoving(int)));
+// connect(verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(slotMoving(int)));
}
/*void KexiDataTableView::initActions(TDEActionCollection *col)
{
KexiTableView::initActions(col);
- new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter");
+ new TDEAction(i18n("Filter"), "filter", 0, this, TQ_SLOT(filter()), col, "tablepart_filter");
}*/
bool KexiDataTableView::setData(KexiDB::Cursor *cursor)
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index b6853037..5fe56aa9 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -107,10 +107,10 @@ void KexiInputTableEdit::init()
m_calculatedCell = false;
#if 0 //js TODO
- connect(m_cview->completionBox(), TQT_SIGNAL(activated(const TQString &)),
- this, TQT_SLOT(completed(const TQString &)));
- connect(m_cview->completionBox(), TQT_SIGNAL(highlighted(const TQString &)),
- this, TQT_SLOT(completed(const TQString &)));
+ connect(m_cview->completionBox(), TQ_SIGNAL(activated(const TQString &)),
+ this, TQ_SLOT(completed(const TQString &)));
+ connect(m_cview->completionBox(), TQ_SIGNAL(highlighted(const TQString &)),
+ this, TQ_SLOT(completed(const TQString &)));
m_cview->completionBox()->setTabHandling(true);
#endif
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 11ff828d..61655424 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -184,7 +184,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
d = new KexiTableViewPrivate(this);
- connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) );
+ connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) );
slotSettingsChanged(TDEApplication::SETTINGS_SHORTCUTS);
m_data = new KexiTableViewData(); //to prevent crash because m_data==0
@@ -219,10 +219,10 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
//context menu
m_popupMenu = new TDEPopupMenu(this, "contextMenu");
#if 0 //moved to mainwindow's actions
- d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
+ d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQ_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
d->menu_id_removeRecord = m_popupMenu->insertItem(
kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
- i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
+ i18n("Remove Record"), this, TQ_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
#endif
#ifdef TQ_WS_WIN
@@ -244,7 +244,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
m_horizontalHeader->setOrientation(TQt::Horizontal);
m_horizontalHeader->setTracking(false);
m_horizontalHeader->setMovingEnabled(false);
- connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int,int,int)), this, TQT_SLOT(slotTopHeaderSizeChange(int,int,int)));
+ connect(m_horizontalHeader, TQ_SIGNAL(sizeChange(int,int,int)), this, TQ_SLOT(slotTopHeaderSizeChange(int,int,int)));
m_verticalHeader = new KexiRecordMarker(this, "rm");
m_verticalHeader->setSelectionBackgroundColor( palette().active().highlight() );
@@ -268,7 +268,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
#if 0//(js) doesn't work!
d->scrollTimer = new TQTimer(this);
- connect(d->scrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoScroll()));
+ connect(d->scrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoScroll()));
#endif
// setBackgroundAltering(true);
@@ -278,13 +278,13 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
viewport()->setAcceptDrops(true);
// Connect header, table and scrollbars
- connect(horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), m_horizontalHeader, TQT_SLOT(setOffset(int)));
- connect(verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), m_verticalHeader, TQT_SLOT(setOffset(int)));
- connect(m_horizontalHeader, TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnWidthChanged(int, int, int)));
- connect(m_horizontalHeader, TQT_SIGNAL(sectionHandleDoubleClicked(int)), this, TQT_SLOT(slotSectionHandleDoubleClicked(int)));
- connect(m_horizontalHeader, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortColumnInternal(int)));
+ connect(horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), m_horizontalHeader, TQ_SLOT(setOffset(int)));
+ connect(verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), m_verticalHeader, TQ_SLOT(setOffset(int)));
+ connect(m_horizontalHeader, TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(slotColumnWidthChanged(int, int, int)));
+ connect(m_horizontalHeader, TQ_SIGNAL(sectionHandleDoubleClicked(int)), this, TQ_SLOT(slotSectionHandleDoubleClicked(int)));
+ connect(m_horizontalHeader, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortColumnInternal(int)));
- connect(d->pUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdate()));
+ connect(d->pUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdate()));
// horizontalScrollBar()->show();
updateScrollBars();
@@ -1010,7 +1010,7 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e )
}
// d->contentsMousePressEvent_ev = *e;
// d->contentsMousePressEvent_enabled = true;
-// TQTimer::singleShot(2000, this, TQT_SLOT( contentsMousePressEvent_Internal() ));
+// TQTimer::singleShot(2000, this, TQ_SLOT( contentsMousePressEvent_Internal() ));
// d->contentsMousePressEvent_timer.start(100,true);
// if (!d->contentsMousePressEvent_enabled)
@@ -1495,9 +1495,9 @@ KexiDataItemInterface *KexiTableView::editor( int col, bool ignoreMissingEditor
if (m_data->cursor() && m_data->cursor()->query())
editor->createInternalEditor(*m_data->cursor()->query());
- 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/widget/tableview/kexitableviewheader.cpp b/kexi/widget/tableview/kexitableviewheader.cpp
index 305222ca..ec1326ae 100644
--- a/kexi/widget/tableview/kexitableviewheader.cpp
+++ b/kexi/widget/tableview/kexitableviewheader.cpp
@@ -67,8 +67,8 @@ KexiTableViewHeader::KexiTableViewHeader(TQWidget * parent, const char * name)
{
styleChange( style() );
installEventFilter(this);
- connect(this, TQT_SIGNAL(sizeChange(int,int,int)),
- this, TQT_SLOT(slotSizeChange(int,int,int)));
+ connect(this, TQ_SIGNAL(sizeChange(int,int,int)),
+ this, TQ_SLOT(slotSizeChange(int,int,int)));
}
KexiTableViewHeader::~KexiTableViewHeader()