summaryrefslogtreecommitdiffstats
path: root/kexi/widget/tableview/kexicomboboxtableedit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/widget/tableview/kexicomboboxtableedit.cpp')
-rw-r--r--kexi/widget/tableview/kexicomboboxtableedit.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp
index 3ae97974..24c4c38f 100644
--- a/kexi/widget/tableview/kexicomboboxtableedit.cpp
+++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp
@@ -18,12 +18,12 @@
* Boston, MA 02110-1301, USA.
*/
-#include <tqlayout.h>
+#include <layout.h>
#include <tqstyle.h>
#include <tqwindowsstyle.h>
#include <tqpainter.h>
#include <tqapplication.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
#include "kexicomboboxtableedit.h"
#include <widget/utils/kexicomboboxdropdownbutton.h>
@@ -80,11 +80,11 @@ KexiComboBoxTableEdit::KexiComboBoxTableEdit(KexiTableViewColumn &column, TQWidg
// m_lineedit->setFrameStyle( TQFrame::Plain | TQFrame::Box );
// m_lineedit->setLineWidth( 1 );
// if (f.isNumericType()) {
-// m_lineedit->tqsetAlignment(AlignRight);
+// m_lineedit->setAlignment(AlignRight);
// }
// setView( m_lineedit );
-// tqlayout->addWidget(m_view);
+// layout->addWidget(m_view);
// m_combo->setEditable( true );
// m_combo->clear();
// m_combo->insertStringList(f.enumHints());
@@ -350,8 +350,8 @@ bool KexiComboBoxTableEdit::eventFilter( TQObject *o, TQEvent *e )
if (!column()->isReadOnly() && e->type()==TQEvent::MouseButtonPress && m_scrollView) {
TQPoint gp = TQT_TQMOUSEEVENT(e)->globalPos()
+ TQPoint(m_scrollView->childX(d->button), m_scrollView->childY(d->button));
- TQRect r(d->button->mapToGlobal(d->button->tqgeometry().topLeft()),
- d->button->mapToGlobal(d->button->tqgeometry().bottomRight()));
+ TQRect r(d->button->mapToGlobal(d->button->geometry().topLeft()),
+ d->button->mapToGlobal(d->button->geometry().bottomRight()));
if (TQT_BASE_OBJECT(o)==TQT_BASE_OBJECT(popup()) && popup()->isVisible() && r.contains( gp )) {
m_mouseBtnPressedWhenPopupVisible = true;
}
@@ -434,7 +434,7 @@ void KexiComboBoxTableEdit::handleAction(const TQString& actionName)
m_lineedit->clear();
}
//! @todo does not work with BLOBs!
- setValueInInternalEditor( tqApp->tqclipboard()->text() );
+ setValueInInternalEditor( tqApp->clipboard()->text() );
}
else
KexiInputTableEdit::handleAction(actionName);