diff options
Diffstat (limited to 'kexi')
47 files changed, 153 insertions, 153 deletions
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index 90adff17..b465c4d1 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -125,7 +125,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, // --------------- page margins --------------- TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this ); - marginsFrame->setColumnLayout( 0, Qt::Vertical ); + marginsFrame->setColumnLayout( 0, TQt::Vertical ); marginsFrame->setMargin( KDialog::marginHint() ); grid1->addWidget( marginsFrame, 3, 0 ); diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp index a0f05ab6..8d618793 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cpp +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp @@ -281,7 +281,7 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) TQGridLayout *grid2 = new TQGridLayout( tab2, 7, 2, 0, KDialog::spacingHint() ); // ------------- header --------------- - TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 ); + TQGroupBox *gHead = new TQGroupBox( 0, TQt::Vertical, i18n( "Head Line" ), tab2 ); gHead->layout()->setSpacing(KDialog::spacingHint()); gHead->layout()->setMargin(KDialog::marginHint()); TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 ); @@ -310,7 +310,7 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf ) grid2->addMultiCellWidget( gHead, 0, 1, 0, 1 ); // ------------- footer --------------- - TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 ); + TQGroupBox *gFoot = new TQGroupBox( 0, TQt::Vertical, i18n( "Foot Line" ), tab2 ); gFoot->layout()->setSpacing(KDialog::spacingHint()); gFoot->layout()->setMargin(KDialog::marginHint()); TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 ); diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index 378e6b36..8baabd7b 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -257,7 +257,7 @@ I am using update_kexi_po to recreate kexi.po file. THis will run cd koffice/ && - signal when null/empty value forcell isn't permitted - signal when repeated value isn't permitted - add support for cut, copy & paste of cell's contents (get shortcuts from TDEStdAccel) -HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem +HINT: removing WStaticContents from KexiTableView ctor fixed repaint problem the problem was with repainting when hscrollbar disapperars.... - KexiTableView loads all data from the table: very slow and consumes a lot of memory: (e.g. for each record with 3 fields: 1 integer, 1 text and 1 float consumed ~350B) diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 10bd7eb3..85f40707 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -933,9 +933,9 @@ CreateLayoutCommand::execute() } if(m_type == Container::HSplitter) - ((TQSplitter*)w)->setOrientation(Qt::Horizontal); + ((TQSplitter*)w)->setOrientation(TQt::Horizontal); else if(m_type == Container::VSplitter) - ((TQSplitter*)w)->setOrientation(Qt::Vertical); + ((TQSplitter*)w)->setOrientation(TQt::Vertical); else if(tree->container()) { tree->container()->setLayout((Container::LayoutType)m_type); w->resize(tree->container()->layout()->sizeHint()); // the layout doesn't have its own size diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index 89269b14..17f1ced8 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -64,7 +64,7 @@ EventEater::eventFilter(TQObject *, TQEvent *ev) if(ev->type() == TQEvent::MouseButtonRelease && m_widget->inherits("TQTabWidget")) { TQMouseEvent *mev = TQT_TQMOUSEEVENT(ev); - if(mev->button() == Qt::LeftButton) + if(mev->button() == TQt::LeftButton) { TQMouseEvent *myev = new TQMouseEvent(TQEvent::MouseButtonPress, mev->pos(), mev->button(), mev->state()); m_container->eventFilter(m_widget, myev); @@ -171,7 +171,7 @@ Container::eventFilter(TQObject *s, TQEvent *e) return true; } - if(((mev->state() == ControlButton) || (mev->state() == ShiftButton)) + if(((mev->state() == TQt::ControlButton) || (mev->state() == TQt::ShiftButton)) && (!FormManager::self()->isInserting())) // multiple selection mode { if(m_form->selectedWidgets()->findRef(m_moving) != -1) // widget is already selected @@ -187,22 +187,22 @@ Container::eventFilter(TQObject *s, TQEvent *e) } } else // the widget is not yet selected, we add it - setSelectedWidget(m_moving, true, (mev->button() == Qt::RightButton)); + setSelectedWidget(m_moving, true, (mev->button() == TQt::RightButton)); } else if((m_form->selectedWidgets()->count() > 1))//&& (!m_form->manager()->isInserting())) // more than one widget selected { if(m_form->selectedWidgets()->findRef(m_moving) == -1) // widget is not selected, it becomes the only selected widget - setSelectedWidget(m_moving, false, (mev->button() == Qt::RightButton)); + setSelectedWidget(m_moving, false, (mev->button() == TQt::RightButton)); // If the widget is already selected, we do nothing (to ease widget moving, etc.) } else// if(!m_form->manager()->isInserting()) - setSelectedWidget(m_moving, false, (mev->button() == Qt::RightButton)); + setSelectedWidget(m_moving, false, (mev->button() == TQt::RightButton)); // we are inserting a widget or drawing a selection rect in the form if((/*s == m_container &&*/ FormManager::self()->isInserting()) || ((s == m_container) && !m_toplevel)) { int tmpx,tmpy; - if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (Qt::LeftButton|ControlButton|AltButton))) + if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton))) { tmpx = mev->x(); tmpy = mev->y(); @@ -253,8 +253,8 @@ Container::eventFilter(TQObject *s, TQEvent *e) case TQEvent::MouseMove: { TQMouseEvent *mev = TQT_TQMOUSEEVENT(e); - if(m_insertBegin!=TQPoint(-1,-1) && FormManager::self()->isInserting() && ((mev->state() == Qt::LeftButton) || (mev->state() == (Qt::LeftButton|ControlButton)) || - (mev->state() == (Qt::LeftButton|ControlButton|AltButton)) || (mev->state() == (Qt::LeftButton|ShiftButton)) ) ) + if(m_insertBegin!=TQPoint(-1,-1) && FormManager::self()->isInserting() && ((mev->state() == TQt::LeftButton) || (mev->state() == (TQt::LeftButton|TQt::ControlButton)) || + (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) || (mev->state() == (TQt::LeftButton|TQt::ShiftButton)) ) ) // draw the insert rect { drawInsertRect(mev, s); @@ -270,9 +270,9 @@ Container::eventFilter(TQObject *s, TQEvent *e) if(m_form->formWidget() && (tree->widget() != s)) m_form->formWidget()->highlightWidgets(tree->widget(), TQT_TQWIDGET(s)); } - else if(m_insertBegin!=TQPoint(-1,-1) && s == m_container && !m_toplevel && (mev->state() != ControlButton) && !FormManager::self()->isCreatingConnection()) // draw the selection rect + else if(m_insertBegin!=TQPoint(-1,-1) && s == m_container && !m_toplevel && (mev->state() != TQt::ControlButton) && !FormManager::self()->isCreatingConnection()) // draw the selection rect { - if((mev->state() != Qt::LeftButton) || /*m_inlineEditing*/ m_state == InlineEditing) + if((mev->state() != TQt::LeftButton) || /*m_inlineEditing*/ m_state == InlineEditing) return true; int topx = (m_insertBegin.x() < mev->x()) ? m_insertBegin.x() : mev->x(); int topy = (m_insertBegin.y() < mev->y()) ? m_insertBegin.y() : mev->y(); @@ -287,14 +287,14 @@ Container::eventFilter(TQObject *s, TQEvent *e) m_state = DoingNothing; return true; } - else if(mev->state() == (Qt::LeftButton|ControlButton)) // draw the insert rect for the copied widget + else if(mev->state() == (TQt::LeftButton|TQt::ControlButton)) // draw the insert rect for the copied widget { if(s == m_container)// || (m_form->selectedWidgets()->count() > 1)) return true; drawCopiedWidgetRect(mev); return true; } - else if( ( (mev->state() == Qt::LeftButton) || (mev->state() == (Qt::LeftButton|ControlButton|AltButton)) ) + else if( ( (mev->state() == TQt::LeftButton) || (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) ) && !FormManager::self()->isInserting() && (m_state != CopyingWidget)) // we are dragging the widget(s) to move it { if(!m_toplevel && m_moving == m_container) // no effect for form @@ -372,8 +372,8 @@ Container::eventFilter(TQObject *s, TQEvent *e) if(!m_moving) return true; // we simulate a mouse move event to update screen - TQMouseEvent *mev = new TQMouseEvent(TQEvent::MouseMove, m_moving->mapFromGlobal(TQCursor::pos()), Qt::NoButton, - Qt::LeftButton|ControlButton ); + TQMouseEvent *mev = new TQMouseEvent(TQEvent::MouseMove, m_moving->mapFromGlobal(TQCursor::pos()), TQt::NoButton, + TQt::LeftButton|TQt::ControlButton ); eventFilter(TQT_TQOBJECT(m_moving), TQT_TQEVENT(mev)); delete mev; } @@ -487,16 +487,16 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev) m_insertRect = TQRect(); return true; } - else if(s == m_container && !m_toplevel && (mev->button() != Qt::RightButton) && m_insertRect.isValid()) // we are drawing a rect to select widgets + else if(s == m_container && !m_toplevel && (mev->button() != TQt::RightButton) && m_insertRect.isValid()) // we are drawing a rect to select widgets { drawSelectionRect(mev); return true; } - if(mev->button() == Qt::RightButton) // Right-click -> context menu + if(mev->button() == TQt::RightButton) // Right-click -> context menu { FormManager::self()->createContextMenu(TQT_TQWIDGET(s), this); } - else if(mev->state() == (Qt::LeftButton|TQt::ControlButton))// && (m_copyRect.isValid())) + else if(mev->state() == (TQt::LeftButton|TQt::ControlButton))// && (m_copyRect.isValid())) { // copying a widget by Ctrl+dragging @@ -620,7 +620,7 @@ Container::setLayout(LayoutType type) case HFlow: { KexiFlowLayout *flow = new KexiFlowLayout(m_container,m_margin, m_spacing); - flow->setOrientation(Qt::Horizontal); + flow->setOrientation(TQt::Horizontal); m_layout = (TQLayout*)flow; createFlowLayout(); break; @@ -628,7 +628,7 @@ Container::setLayout(LayoutType type) case VFlow: { KexiFlowLayout *flow = new KexiFlowLayout(m_container,m_margin, m_spacing); - flow->setOrientation(Qt::Vertical); + flow->setOrientation(TQt::Vertical); m_layout = (TQLayout*)flow; createFlowLayout(); break; @@ -674,7 +674,7 @@ Container::createFlowLayout() const int offset = 15; WidgetList *list=0, *list2=0; - if(flow->orientation() ==Qt::Horizontal) { + if(flow->orientation() ==TQt::Horizontal) { list = new VerWidgetList(m_form->toplevelContainer()->widget()); list2 = new HorWidgetList(m_form->toplevelContainer()->widget()); } @@ -688,7 +688,7 @@ Container::createFlowLayout() list->append( tree->widget()); list->sort(); - if(flow->orientation() ==Qt::Horizontal) { + if(flow->orientation() ==TQt::Horizontal) { int y = list->first()->y(); for(TQWidget *w = list->first(); w; w = list->next()) { if( (w->y() > y +offset)) { @@ -943,7 +943,7 @@ Container::stringToLayoutType(const TQString &name) void Container::drawConnection(TQMouseEvent *mev) { - if(mev->button() != Qt::LeftButton) + if(mev->button() != TQt::LeftButton) { FormManager::self()->resetCreatedConnection(); return; @@ -1023,7 +1023,7 @@ Container::drawInsertRect(TQMouseEvent *mev, TQObject *s) TQPoint pos = TQT_TQWIDGET(s)->mapTo(m_container, mev->pos()); int gridX = m_form->gridSize(); int gridY = m_form->gridSize(); - if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (Qt::LeftButton|ControlButton|AltButton)) ) + if(!FormManager::self()->snapWidgetsToGrid() || (mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) ) { tmpx = pos.x(); tmpy = pos.y(); @@ -1144,7 +1144,7 @@ Container::moveSelectedWidgetsBy(int realdx, int realdy, TQMouseEvent *mev) } int tmpx, tmpy; - if(!FormManager::self()->snapWidgetsToGrid() || (mev && mev->state() == (Qt::LeftButton|ControlButton|AltButton)) ) + if(!FormManager::self()->snapWidgetsToGrid() || (mev && mev->state() == (TQt::LeftButton|TQt::ControlButton|TQt::AltButton)) ) { tmpx = w->x() + dx; tmpy = w->y() + dy; diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 54372991..164dea27 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -610,7 +610,7 @@ ContainerFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, TQSplitter *split = new TQSplitter(p, n); if (0 == (options & WidgetFactory::AnyOrientation)) split->setOrientation( - (options & WidgetFactory::VerticalOrientation) ? Qt::Vertical : Qt::Horizontal); + (options & WidgetFactory::VerticalOrientation) ? TQt::Vertical : TQt::Horizontal); new KFormDesigner::Container(container, split, container); return split; } diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index a74097a0..10107333 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -72,32 +72,32 @@ KexiPictureLabel::setProperty(const char *name, const TQVariant &value) return TQLabel::setProperty(name, value); } -Line::Line(Qt::Orientation orient, TQWidget *parent, const char *name) +Line::Line(TQt::Orientation orient, TQWidget *parent, const char *name) : TQFrame(parent, name) { setFrameShadow(Sunken); - if(orient ==Qt::Horizontal) + if(orient ==TQt::Horizontal) setFrameShape(HLine); else setFrameShape(VLine); } void -Line::setOrientation(Qt::Orientation orient) +Line::setOrientation(TQt::Orientation orient) { - if(orient ==Qt::Horizontal) + if(orient ==TQt::Horizontal) setFrameShape(HLine); else setFrameShape(VLine); } -Qt::Orientation +TQt::Orientation Line::orientation() const { if(frameShape() == HLine) - return Qt::Horizontal; + return TQt::Horizontal; else - return Qt::Vertical; + return TQt::Vertical; } // The factory itself @@ -425,7 +425,7 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, ((TDEListView*)w)->setRootIsDecorated(true); } else if(c == "TQSlider") - w = new TQSlider(Qt::Horizontal, p, n); + w = new TQSlider(TQt::Horizontal, p, n); else if(c == "KProgress") w = new KProgress(p, n); @@ -440,13 +440,13 @@ StdWidgetFactory::createWidget(const TQCString &c, TQWidget *p, const char *n, w = new KDateTimeWidget(TQDateTime::currentDateTime(), p, n); else if(c == "Line") - w = new Line(options & WidgetFactory::VerticalOrientation ? Qt::Vertical : Qt::Horizontal, p, n); + w = new Line(options & WidgetFactory::VerticalOrientation ? TQt::Vertical : TQt::Horizontal, p, n); else if(c == "Spring") { w = new Spring(p, n); if (0 == (options & WidgetFactory::AnyOrientation)) static_cast<Spring*>(w)->setOrientation( - (options & WidgetFactory::VerticalOrientation) ? Qt::Vertical : Qt::Horizontal); + (options & WidgetFactory::VerticalOrientation) ? TQt::Vertical : TQt::Horizontal); } if(w) diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 298c07f8..62402bfa 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -1431,13 +1431,13 @@ FormIO::readChildNodes(ObjectTreeItem *item, Container *container, const TQDomEl if(layoutName == "HFlow") { item->container()->m_layType = Container::HFlow; KexiFlowLayout *layout = new KexiFlowLayout(item->widget()); - layout->setOrientation(Qt::Horizontal); + layout->setOrientation(TQt::Horizontal); item->container()->m_layout = (TQLayout*)layout; } else if(layoutName == "VFlow") { item->container()->m_layType = Container::VFlow; KexiFlowLayout *layout = new KexiFlowLayout(item->widget()); - layout->setOrientation(Qt::Vertical); + layout->setOrientation(TQt::Vertical); item->container()->m_layout = (TQLayout*)layout; } else { // grid layout diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp index 1c3ad69d..ab46ecd7 100644 --- a/kexi/formeditor/resizehandle.cpp +++ b/kexi/formeditor/resizehandle.cpp @@ -161,7 +161,7 @@ void ResizeHandle::mouseMoveEvent(TQMouseEvent *ev) int dummyx = ev->x() - m_x; int dummyy = ev->y() - m_y; - if(FormManager::self()->snapWidgetsToGrid() && (ev->state() != (Qt::LeftButton|ControlButton|AltButton))) + if(FormManager::self()->snapWidgetsToGrid() && (ev->state() != (TQt::LeftButton|TQt::ControlButton|TQt::AltButton))) { dummyy = (int) ( ((float)dummyy) / ((float)gridY) + 0.5 ); dummyy *= gridY; diff --git a/kexi/formeditor/spring.cpp b/kexi/formeditor/spring.cpp index 3e0651b1..0eb60400 100644 --- a/kexi/formeditor/spring.cpp +++ b/kexi/formeditor/spring.cpp @@ -37,12 +37,12 @@ Spring::Spring(TQWidget *parent, const char *name) : TQWidget(parent, name) { m_edit = true; - m_orient =Qt::Horizontal; + m_orient =TQt::Horizontal; setSizeType((SizeType)TQSizePolicy::Expanding); } void -Spring::setOrientation(Qt::Orientation orient) +Spring::setOrientation(TQt::Orientation orient) { SizeType type = sizeType(); m_orient = orient; @@ -53,7 +53,7 @@ Spring::setOrientation(Qt::Orientation orient) Spring::SizeType Spring::sizeType() const { - if(m_orient ==Qt::Vertical) + if(m_orient ==TQt::Vertical) return (SizeType)sizePolicy().verData(); else return (SizeType)sizePolicy().horData(); @@ -62,7 +62,7 @@ Spring::sizeType() const void Spring::setSizeType(SizeType size) { - if(m_orient ==Qt::Vertical) + if(m_orient ==TQt::Vertical) setSizePolicy(TQSizePolicy::Minimum, (TQSizePolicy::SizeType)size); else setSizePolicy( (TQSizePolicy::SizeType)size, TQSizePolicy::Minimum); @@ -80,7 +80,7 @@ Spring::paintEvent(TQPaintEvent *ev) p.setPen(TQPen(TQt::white, 1)); p.setRasterOp(TQt::XorROP); TQPointArray pa(4); - if(m_orient ==Qt::Vertical) { + if(m_orient ==TQt::Vertical) { uint part = (height()+16) / 16; if (part<3) part=3; diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index 953243e4..73b4f29c 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -275,9 +275,9 @@ TQString Driver::valueToSQL( uint ftype, const TQVariant& v ) const case Field::Boolean: return TQString::number(v.toInt()?1:0); //0 or 1 case Field::Time: - return TQString("\'")+v.toTime().toString(Qt::ISODate)+"\'"; + return TQString("\'")+v.toTime().toString(TQt::ISODate)+"\'"; case Field::Date: - return TQString("\'")+v.toDate().toString(Qt::ISODate)+"\'"; + return TQString("\'")+v.toDate().toString(TQt::ISODate)+"\'"; case Field::DateTime: return dateTimeToSQL( v.toDateTime() ); case Field::BLOB: { diff --git a/kexi/kexidb/driver.h b/kexi/kexidb/driver.h index 3fc1acbf..4abe8699 100644 --- a/kexi/kexidb/driver.h +++ b/kexi/kexidb/driver.h @@ -243,8 +243,8 @@ class KEXI_DB_EXPORT Driver : public TQObject, public KexiDB::Object @todo add support for time zones? */ //old const TQDateTime dt( v.toDateTime() ); -//old return TQString("\'")+dt.date().toString(Qt::ISODate)+" "+dt.time().toString(Qt::ISODate)+"\'"; - return TQString("\'")+v.toString(Qt::ISODate)+"\'"; +//old return TQString("\'")+dt.date().toString(TQt::ISODate)+" "+dt.time().toString(TQt::ISODate)+"\'"; + return TQString("\'")+v.toString(TQt::ISODate)+"\'"; } /*! Driver-specific SQL string escaping. diff --git a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp index 74479fe7..6f919585 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlpreparedstatement.cpp @@ -229,7 +229,7 @@ m_stringBuffer[ 1024 ]; ??? break; case KexiDB::Field::Time: res = sqlite3_bind_text(prepared_st_handle, arg, - (*it).toTime().toString(Qt::ISODate).latin1(), + (*it).toTime().toString(TQt::ISODate).latin1(), sizeof("HH:MM:SS"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? @@ -238,7 +238,7 @@ m_stringBuffer[ 1024 ]; ??? break; case KexiDB::Field::Date: res = sqlite3_bind_text(prepared_st_handle, arg, - (*it).toDate().toString(Qt::ISODate).latin1(), + (*it).toDate().toString(TQt::ISODate).latin1(), sizeof("YYYY-MM-DD"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? @@ -247,7 +247,7 @@ m_stringBuffer[ 1024 ]; ??? break; case KexiDB::Field::DateTime: res = sqlite3_bind_text(prepared_st_handle, arg, - (*it).toDateTime().toString(Qt::ISODate).latin1(), + (*it).toDateTime().toString(TQt::ISODate).latin1(), sizeof("YYYY-MM-DDTHH:MM:SS"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp index 6a80f76d..902e729a 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp @@ -141,14 +141,14 @@ class KexiDB::SQLiteCursorData : public SQLiteConnectionInternal else { switch (f->type()) { case Field::Date: - return TQDate::fromString( GET_sqlite3_column_text, Qt::ISODate ); + return TQDate::fromString( GET_sqlite3_column_text, TQt::ISODate ); case Field::Time: //TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull() return KexiUtils::stringToHackedTQTime(GET_sqlite3_column_text); case Field::DateTime: { TQString tmp( GET_sqlite3_column_text ); tmp[10] = 'T'; //for ISODate compatibility - return TQDateTime::fromString( tmp, Qt::ISODate ); + return TQDateTime::fromString( tmp, TQt::ISODate ); } case Field::Boolean: return TQVariant(sqliteStringToBool(GET_sqlite3_column_text)); @@ -483,7 +483,7 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const data[i] = TQVariant( sqliteStringToBool(TQString::fromLatin1(*col)) ); break; case Field::Date: - data[i] = TQDate::fromString( TQString::fromLatin1(*col), Qt::ISODate ); + data[i] = TQDate::fromString( TQString::fromLatin1(*col), TQt::ISODate ); break; case Field::Time: //TQDateTime - a hack needed because TQVariant(TQTime) has broken isNull() @@ -492,7 +492,7 @@ void SQLiteCursor::storeCurrentRow(RowData &data) const case Field::DateTime: { TQString tmp( TQString::fromLatin1(*col) ); tmp[10] = 'T'; - data[i] = TQDateTime::fromString( tmp, Qt::ISODate ); + data[i] = TQDateTime::fromString( tmp, TQt::ISODate ); break; } default: diff --git a/kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp b/kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp index bccfd11b..7a811d55 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitepreparedstatement.cpp @@ -178,7 +178,7 @@ bool SQLitePreparedStatement::execute() break; case KexiDB::Field::Time: res = sqlite3_bind_text(prepared_st_handle, arg, - TQString((*it).toTime().toString(Qt::ISODate)).latin1(), + TQString((*it).toTime().toString(TQt::ISODate)).latin1(), sizeof("HH:MM:SS"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? @@ -187,7 +187,7 @@ bool SQLitePreparedStatement::execute() break; case KexiDB::Field::Date: res = sqlite3_bind_text(prepared_st_handle, arg, - TQString((*it).toDate().toString(Qt::ISODate)).latin1(), + TQString((*it).toDate().toString(TQt::ISODate)).latin1(), sizeof("YYYY-MM-DD"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? @@ -196,7 +196,7 @@ bool SQLitePreparedStatement::execute() break; case KexiDB::Field::DateTime: res = sqlite3_bind_text(prepared_st_handle, arg, - (*it).toDateTime().toString(Qt::ISODate).latin1(), + (*it).toDateTime().toString(TQt::ISODate).latin1(), sizeof("YYYY-MM-DDTHH:MM:SS"), SQLITE_TRANSIENT /*??*/); if (SQLITE_OK != res) { //! @todo msg? diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index f4e5ccfe..25af20ee 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -539,12 +539,12 @@ TQString ConstExpr::toString(QuerySchemaParameterValueListIterator* params) else if (m_token==REAL_CONST) return TQString::number(value.toPoint().x())+"."+TQString::number(value.toPoint().y()); else if (m_token==DATE_CONST) - return "'" + value.toDate().toString(Qt::ISODate) + "'"; + return "'" + value.toDate().toString(TQt::ISODate) + "'"; else if (m_token==DATETIME_CONST) - return "'" + value.toDateTime().date().toString(Qt::ISODate) - + " " + value.toDateTime().time().toString(Qt::ISODate) + "'"; + return "'" + value.toDateTime().date().toString(TQt::ISODate) + + " " + value.toDateTime().time().toString(TQt::ISODate) + "'"; else if (m_token==TIME_CONST) - return "'" + value.toTime().toString(Qt::ISODate) + "'"; + return "'" + value.toTime().toString(TQt::ISODate) + "'"; return value.toString(); } diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index 41cce80b..e2dd698e 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -452,21 +452,21 @@ Field::setDefaultValue(const TQCString& def) m_defaultValue = TQVariant((bool)v); break; }case Date: {//YYYY-MM-DD - TQDate date = TQDate::fromString( def, Qt::ISODate ); + TQDate date = TQDate::fromString( def, TQt::ISODate ); if (!date.isValid()) m_defaultValue = TQVariant(); else m_defaultValue = TQVariant(date); break; }case DateTime: {//YYYY-MM-DDTHH:MM:SS - TQDateTime dt = TQDateTime::fromString( def, Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( def, TQt::ISODate ); if (!dt.isValid()) m_defaultValue = TQVariant(); else m_defaultValue = TQVariant(dt); break; }case Time: {//HH:MM:SS - TQTime time = TQTime::fromString( def, Qt::ISODate ); + TQTime time = TQTime::fromString( def, TQt::ISODate ); if (!time.isValid()) m_defaultValue = TQVariant(); else diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h index 7ad11324..89af157c 100644 --- a/kexi/kexiutils/utils.h +++ b/kexi/kexiutils/utils.h @@ -82,8 +82,8 @@ namespace KexiUtils { if (s.isEmpty()) return TQDateTime(); - // kdDebug() << TQDateTime( TQDate(0,1,2), TQTime::fromString( s, Qt::ISODate ) ).toString(Qt::ISODate) << endl;; - return TQDateTime( TQDate(0,1,2), TQTime::fromString( s, Qt::ISODate ) ); + // kdDebug() << TQDateTime( TQDate(0,1,2), TQTime::fromString( s, TQt::ISODate ) ).toString(TQt::ISODate) << endl;; + return TQDateTime( TQDate(0,1,2), TQTime::fromString( s, TQt::ISODate ) ); } /*! Sets "wait" cursor with 1 second delay (or 0 seconds if noDelay is true). diff --git a/kexi/main/ksplitter.h b/kexi/main/ksplitter.h index 47e9307c..05f2d568 100644 --- a/kexi/main/ksplitter.h +++ b/kexi/main/ksplitter.h @@ -53,10 +53,10 @@ public: * Constructor. * @param parent parent widget * @param name name - * @param orient orientation. Either @p Qt::Vertical or @p Qt::Horizontal + * @param orient orientation. Either @p TQt::Vertical or @p TQt::Horizontal * @param pos procentual position of the splitter. Must be int [0...100]. */ - KDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50); + KDockSplitter(TQWidget *parent= 0, const char *name= 0, TQt::Orientation orient=TQt::Vertical, int pos= 50); virtual ~KDockSplitter(){}; /** @@ -169,9 +169,9 @@ public: void restoreFromForcedFixedSize(KDockWidget *dw); /** - * The orientation is either @p Qt::Horizontal or @p Qt::Vertical. + * The orientation is either @p TQt::Horizontal or @p TQt::Vertical. */ - Qt::Orientation orientation(){return m_orientation;} + TQt::Orientation orientation(){return m_orientation;} protected: friend class KDockContainer; @@ -223,7 +223,7 @@ private: * child[01]->getWidget() may be KDockContainer. */ TQWidget *child0, *child1; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; /** * If initialised is true, the divider!=0L. If false, the divider==0L! */ @@ -235,7 +235,7 @@ private: TQFrame* divider; /** * @p xpos and @p savedXPos represent the current divider position. - * If the orientation is Qt::Horizontal @p xpos actually is "ypos". So + * If the orientation is horizontal @p xpos actually is "ypos". So * do not get confused only because of the 'x'. * * xpos and savedXPos are internally high resolution. So *not* 0..100% diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 49a55a35..9f3e5de7 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -358,7 +358,7 @@ void KexiStartupDialog::setupPageTemplates() templPageFrame = d->templatesWidget->addPage ( i18n("Personal Databases"), i18n("New Personal Database Project Templates"), DesktopIcon("folder_home") ); tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - d->viewPersonalTempl = new TemplatesPage(Qt::Vertical, templPageFrame, "personal_page" ); + d->viewPersonalTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "personal_page" ); tmplyr->addWidget( d->viewPersonalTempl ); connect(d->viewPersonalTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); connect(d->viewPersonalTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); @@ -372,7 +372,7 @@ void KexiStartupDialog::setupPageTemplates() i18n("Business Databases"), i18n("New Business Database Project Templates"), DesktopIcon( "business_user" )); tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); - d->viewBusinessTempl = new TemplatesPage(Qt::Vertical, templPageFrame, "business_page" ); + d->viewBusinessTempl = new TemplatesPage(TQt::Vertical, templPageFrame, "business_page" ); tmplyr->addWidget( d->viewBusinessTempl ); connect(d->viewBusinessTempl->templates,TQT_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); connect(d->viewBusinessTempl->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)),this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 8f445737..7b0aa5c8 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -410,7 +410,7 @@ bool KexiStartupFileDialog::eventFilter ( TQObject * watched, TQEvent * e ) { //filter-out ESC key if (e->type()==TQEvent::KeyPress && TQT_TQKEYEVENT(e)->key()==TQt::Key_Escape - && TQT_TQKEYEVENT(e)->state()==Qt::NoButton) { + && TQT_TQKEYEVENT(e)->state()==TQt::NoButton) { TQT_TQKEYEVENT(e)->accept(); emit rejected(); return true; diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp index afe2e3aa..d9e33b9b 100644 --- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp +++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp @@ -239,7 +239,7 @@ TQRect KexiDBComboBox::buttonGeometry() const bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) { - if ( e->button() != Qt::LeftButton || d->designMode ) + if ( e->button() != TQt::LeftButton || d->designMode ) return true; /*todo if ( m_discardNextMousePress ) { d->discardNextMousePress = FALSE; @@ -270,9 +270,9 @@ bool KexiDBComboBox::handleMousePressEvent(TQMouseEvent *e) bool KexiDBComboBox::handleKeyPressEvent(TQKeyEvent *ke) { const int k = ke->key(); - const bool dropDown = (ke->state() == Qt::NoButton && ((k==TQt::Key_F2 && !d->isEditable) || k==TQt::Key_F4)) + const bool dropDown = (ke->state() == TQt::NoButton && ((k==TQt::Key_F2 && !d->isEditable) || k==TQt::Key_F4)) || (ke->state() == TQt::AltButton && k==TQt::Key_Down); - const bool escPressed = ke->state() == Qt::NoButton && k==TQt::Key_Escape; + const bool escPressed = ke->state() == TQt::NoButton && k==TQt::Key_Escape; const bool popupVisible = popup() && popup()->isVisible(); if ((dropDown || escPressed) && popupVisible) { popup()->hide(); @@ -302,12 +302,12 @@ bool KexiDBComboBox::keyPressed(TQKeyEvent *ke) const int k = ke->key(); const bool popupVisible = popup() && popup()->isVisible(); - const bool escPressed = ke->state() == Qt::NoButton && k==TQt::Key_Escape; + const bool escPressed = ke->state() == TQt::NoButton && k==TQt::Key_Escape; if (escPressed && popupVisible) { popup()->hide(); return true; } - if (ke->state() == Qt::NoButton && (k==TQt::Key_PageDown || k==TQt::Key_PageUp) && popupVisible) + if (ke->state() == TQt::NoButton && (k==TQt::Key_PageDown || k==TQt::Key_PageUp) && popupVisible) return true; return false; } diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp index a6603867..0fb4519e 100644 --- a/kexi/plugins/forms/widgets/kexidbform.cpp +++ b/kexi/plugins/forms/widgets/kexidbform.cpp @@ -396,8 +396,8 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (preview()) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); const int key = ke->key(); - bool tab = ke->state() == Qt::NoButton && key == TQt::Key_Tab; - bool backtab = ((ke->state() == Qt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab) + bool tab = ke->state() == TQt::NoButton && key == TQt::Key_Tab; + bool backtab = ((ke->state() == TQt::NoButton || ke->state() == TQt::ShiftButton) && key == TQt::Key_Backtab) || (ke->state() == TQt::ShiftButton && key == TQt::Key_Tab); TQObject *o = watched; //focusWidget(); TQWidget* realWidget = dynamic_cast<TQWidget*>(o); //will beused below (for tab/backtab handling) @@ -405,9 +405,9 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) if (!tab && !backtab) { //for buttons, left/up and right/down keys act like tab/backtab (see qbutton.cpp) if (realWidget->inherits("TQButton")) { - if (ke->state() == Qt::NoButton && (key == TQt::Key_Right || key == TQt::Key_Down)) + if (ke->state() == TQt::NoButton && (key == TQt::Key_Right || key == TQt::Key_Down)) tab = true; - else if (ke->state() == Qt::NoButton && (key == TQt::Key_Left || key == TQt::Key_Up)) + else if (ke->state() == TQt::NoButton && (key == TQt::Key_Left || key == TQt::Key_Up)) backtab = true; } } @@ -437,7 +437,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) int curCol = d->dataAwareObject->currentColumn(); bool moveToFirstField; //if true, we'll move focus to the first field (in tab order) bool moveToLastField; //if true, we'll move focus to the first field (in tab order) - if (! (ke->state() == Qt::NoButton && (key == TQt::Key_Home + if (! (ke->state() == TQt::NoButton && (key == TQt::Key_Home || key == TQt::Key_End || key == TQt::Key_Down || key == TQt::Key_Up)) /* ^^ home/end/down/up are already handled by widgets */ && d->dataAwareObject->handleKeyPress( @@ -474,7 +474,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e ) } } // handle Esc key - if (ke->state() == Qt::NoButton && key == TQt::Key_Escape) { + if (ke->state() == TQt::NoButton && key == TQt::Key_Escape) { //cancel field editing/row editing if possible if (d->dataAwareObject->cancelEditor()) return true; diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index 1d81cc1c..f205de05 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -773,7 +773,7 @@ void KexiDBImageBox::setColumnInfo(KexiDB::QueryColumnInfo* cinfo) bool KexiDBImageBox::keyPressed(TQKeyEvent *ke) { // Esc key should close the popup - if (ke->state() == Qt::NoButton && ke->key() == TQt::Key_Escape) { + if (ke->state() == TQt::NoButton && ke->key() == TQt::Key_Escape) { if (m_popupMenu->isVisible()) { m_setFocusOnButtonAfterClosingPopup = true; return true; diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index 7b369c60..ee606300 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -223,11 +223,11 @@ bool KexiCSVExport::exportData(KexiDB::TableOrQuerySchema& tableOrQuery, APPEND( cursor->value(real_i).toString() ); } else if (isDateTime[real_i]) { //avoid "T" in ISO DateTime - APPEND( cursor->value(real_i).toDateTime().date().toString(Qt::ISODate)+" " - + cursor->value(real_i).toDateTime().time().toString(Qt::ISODate) ); + APPEND( cursor->value(real_i).toDateTime().date().toString(TQt::ISODate)+" " + + cursor->value(real_i).toDateTime().time().toString(TQt::ISODate) ); } else if (isTime[real_i]) { //time is temporarily stored as null date + time... - APPEND( cursor->value(real_i).toTime().toString(Qt::ISODate) ); + APPEND( cursor->value(real_i).toTime().toString(TQt::ISODate) ); } else if (isBLOB[real_i]) { //BLOB is escaped in a special way if (hasTextQuote) diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index b2d3940c..19e30f24 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -140,7 +140,7 @@ KexiCSVExportWizard::KexiCSVExportWizard( const KexiCSVExport::Options& options, m_showOptionsButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); // -<options section> - m_exportOptionsSection = new TQGroupBox(1,Qt::Vertical, i18n("Options"), m_exportOptionsPage, + m_exportOptionsSection = new TQGroupBox(1,TQt::Vertical, i18n("Options"), m_exportOptionsPage, "m_exportOptionsSection"); m_exportOptionsSection->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); exportOptionsLyr->addMultiCellWidget(m_exportOptionsSection, 3, 3, 0, 1); diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index cccc5f8b..daf536c5 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -1078,7 +1078,7 @@ bool KexiCSVImportDialog::parseDate(const TQString& text, TQDate& date) bool KexiCSVImportDialog::parseTime(const TQString& text, TQTime& time) { - time = TQTime::fromString(text, Qt::ISODate); //same as m_timeRegExp1 + time = TQTime::fromString(text, TQt::ISODate); //same as m_timeRegExp1 if (time.isValid()) return true; if (m_timeRegExp2.exactMatch(text)) { //hh:mm:ss diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 582d79e6..6d5d557c 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -145,7 +145,7 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( { d->conn = mainWin->project()->dbConnection(); - d->spl = new TQSplitter(Qt::Vertical, this); + 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&)), @@ -155,7 +155,7 @@ KexiQueryDesignerGuiEditor::KexiQueryDesignerGuiEditor( connect(d->relations, TQT_SIGNAL(tableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&)), this, TQT_SLOT(slotTableFieldDoubleClicked(KexiDB::TableSchema*,const TQString&))); - d->head = new KexiSectionHeader(i18n("Query Columns"),Qt::Vertical, d->spl); + d->head = new KexiSectionHeader(i18n("Query Columns"),TQt::Vertical, d->spl); d->dataTable = new KexiDataTable(mainWin, d->head, "guieditor_dataTable", false); d->dataTable->dataAwareObject()->setSpreadSheetMode(); @@ -1349,7 +1349,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in { valueExpr = new KexiDB::ConstExpr(DATE_CONST, TQDate::fromString( re.cap(1).rightJustify(4, '0')+"-"+re.cap(2).rightJustify(2, '0') - +"-"+re.cap(3).rightJustify(2, '0'), Qt::ISODate)); + +"-"+re.cap(3).rightJustify(2, '0'), TQt::ISODate)); } else if ((re = TQRegExp("(\\d{1,2}):(\\d{1,2})")).exactMatch( str ) || (re = TQRegExp("(\\d{1,2}):(\\d{1,2}):(\\d{1,2})")).exactMatch( str )) @@ -1357,7 +1357,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in TQString res = re.cap(1).rightJustify(2, '0')+":"+re.cap(2).rightJustify(2, '0') +":"+re.cap(3).rightJustify(2, '0'); // kexipluginsdbg << res << endl; - valueExpr = new KexiDB::ConstExpr(TIME_CONST, TQTime::fromString(res, Qt::ISODate)); + valueExpr = new KexiDB::ConstExpr(TIME_CONST, TQTime::fromString(res, TQt::ISODate)); } else if ((re = TQRegExp("(\\d{1,4})-(\\d{1,2})-(\\d{1,2})\\s+(\\d{1,2}):(\\d{1,2})")).exactMatch( str ) || (re = TQRegExp("(\\d{1,4})-(\\d{1,2})-(\\d{1,2})\\s+(\\d{1,2}):(\\d{1,2}):(\\d{1,2})")).exactMatch( str )) @@ -1368,7 +1368,7 @@ KexiQueryDesignerGuiEditor::parseExpressionString(const TQString& fullString, in +":"+re.cap(6).rightJustify(2, '0'); // kexipluginsdbg << res << endl; valueExpr = new KexiDB::ConstExpr(DATETIME_CONST, - TQDateTime::fromString(res, Qt::ISODate)); + TQDateTime::fromString(res, TQt::ISODate)); } else if (str[0]>='0' && str[0]<='9' || str[0]=='-' || str[0]=='+') { //number diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 5e076cb4..be57a766 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -104,8 +104,8 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi , d( new Private() ) { d->splitter = new TQSplitter(this); - d->splitter->setOrientation(Qt::Vertical); - d->head = new KexiSectionHeader(i18n("SQL Query Text"),Qt::Vertical, d->splitter); + d->splitter->setOrientation(TQt::Vertical); + 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())); @@ -140,7 +140,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode())); d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) ); - d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),Qt::Vertical, d->history_section); + d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),TQt::Vertical, d->history_section); d->historyHead->installEventFilter(this); d->history = new KexiQueryDesignerSQLHistory(d->historyHead, "sql_history"); diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index fba543db..883bf3ca 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -100,7 +100,7 @@ KexiQueryDesignerSQLHistory::contentsMousePressEvent(TQMouseEvent * e) m_selected = popupHistory; m_selected->setSelected(true, colorGroup()); updateContents(m_selected->geometry(pos, visibleWidth(), fontMetrics())); - if(e->button() == Qt::RightButton) { + if(e->button() == TQt::RightButton) { m_popup->exec(e->globalPos()); } } diff --git a/kexi/plugins/reports/reportwidgets.cpp b/kexi/plugins/reports/reportwidgets.cpp index 7cea50a3..08b41a37 100644 --- a/kexi/plugins/reports/reportwidgets.cpp +++ b/kexi/plugins/reports/reportwidgets.cpp @@ -104,7 +104,7 @@ ReportLine::paintEvent (TQPaintEvent *ev) TQPainter p(this); if(!ev->erased()) p.eraseRect(0, 0, width(), height()); - TQPen pen(m_color, m_lineWidth, (Qt::PenStyle)m_lineStyle); + TQPen pen(m_color, m_lineWidth, (TQt::PenStyle)m_lineStyle); pen.setCapStyle((TQt::PenCapStyle)m_capStyle); p.setPen(pen); p.drawLine(0, 0, width() -1, height() - 1); diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp index e991d61d..6de68b7d 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscriptdesignview.cpp @@ -72,7 +72,7 @@ KexiScriptDesignView::KexiScriptDesignView(KexiMainWindow *mainWin, TQWidget *pa d->updatesProperties = false; TQSplitter* splitter = new TQSplitter(this); - splitter->setOrientation(Qt::Vertical); + splitter->setOrientation(TQt::Vertical); TQHBoxLayout* layout = new TQHBoxLayout(this); layout->addWidget(splitter); diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 99deccf6..1d59dae0 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -582,13 +582,13 @@ bool KexiBrowser::eventFilter ( TQObject *o, TQEvent * e ) else if (e->type()==TQEvent::AccelOverride) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); //override delete action - if (ke->key()==TQt::Key_Delete && ke->state()==Qt::NoButton) { + if (ke->key()==TQt::Key_Delete && ke->state()==TQt::NoButton) { slotRemove(); ke->accept(); return true; } //override rename action - if (ke->key()==TQt::Key_F2 && ke->state()==Qt::NoButton) { + if (ke->key()==TQt::Key_F2 && ke->state()==TQt::NoButton) { slotRename(); ke->accept(); return true; diff --git a/kexi/widget/kexisectionheader.cpp b/kexi/widget/kexisectionheader.cpp index 7a414d2b..1176b793 100644 --- a/kexi/widget/kexisectionheader.cpp +++ b/kexi/widget/kexisectionheader.cpp @@ -48,7 +48,7 @@ class KexiSectionHeaderPrivate { } - Qt::Orientation orientation; + TQt::Orientation orientation; TQLabel *lbl; KexiSectionHeader::BoxLayout *lyr; TQHBox *lbl_b; @@ -56,12 +56,12 @@ class KexiSectionHeaderPrivate //========================== -KexiSectionHeader::KexiSectionHeader(const TQString &caption, Qt::Orientation o, TQWidget* parent ) +KexiSectionHeader::KexiSectionHeader(const TQString &caption, TQt::Orientation o, TQWidget* parent ) : TQWidget(parent, "KexiSectionHeader") , d( new KexiSectionHeaderPrivate() ) { d->orientation = o; - d->lyr = new BoxLayout( this, d->orientation==Qt::Vertical ? TQBoxLayout::TopToBottom : TQBoxLayout::LeftToRight ); + d->lyr = new BoxLayout( this, d->orientation==TQt::Vertical ? TQBoxLayout::TopToBottom : TQBoxLayout::LeftToRight ); d->lyr->setAutoAdd(true); d->lbl_b = new TQHBox(this); d->lbl = new TQLabel(TQString(" ")+caption, d->lbl_b); diff --git a/kexi/widget/kexisectionheader.h b/kexi/widget/kexisectionheader.h index 1b1054c3..083fac1a 100644 --- a/kexi/widget/kexisectionheader.h +++ b/kexi/widget/kexisectionheader.h @@ -31,7 +31,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSectionHeader : public TQWidget public: class BoxLayout; - KexiSectionHeader(const TQString &caption, Qt::Orientation o, + KexiSectionHeader(const TQString &caption, TQt::Orientation o, TQWidget* parent = 0 ); virtual ~KexiSectionHeader(); diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 47e9c859..81ce1382 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -383,7 +383,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev) emit connectionViewGotFocus(); // invalidateActions(); - if(ev->button() == Qt::RightButton) {//show popup + if(ev->button() == TQt::RightButton) {//show popup kdDebug() << "KexiRelationView::contentsMousePressEvent(): context" << endl; // TQPopupMenu m; // m_removeSelectedTableQueryAction->plug( &m ); @@ -396,7 +396,7 @@ KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev) //connection not found clearSelection(); // invalidateActions(); - if(ev->button() == Qt::RightButton) {//show popup on view background area + if(ev->button() == TQt::RightButton) {//show popup on view background area // TQPopupMenu m; // m_removeSelectedConnectionAction->plug( &m ); emit emptyAreaContextMenuRequest( ev->globalPos() ); diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 4bab34e4..2e18e00a 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -208,7 +208,7 @@ bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev) { if (ev->type()==TQEvent::MouseMove) { - if (m_dragging && TQT_TQMOUSEEVENT(ev)->state()==Qt::LeftButton) { + if (m_dragging && TQT_TQMOUSEEVENT(ev)->state()==TQt::LeftButton) { int diffX,diffY; diffX=TQT_TQMOUSEEVENT(ev)->globalPos().x()-m_grabX; diffY=TQT_TQMOUSEEVENT(ev)->globalPos().y()-m_grabY; @@ -260,7 +260,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Press Event"<<endl; parentWidget()->setFocus(); ev->accept(); - if (ev->button()==Qt::LeftButton) { + if (ev->button()==TQt::LeftButton) { m_dragging=true; m_grabX=ev->globalPos().x(); m_grabY=ev->globalPos().y(); @@ -269,7 +269,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { setCursor(TQt::SizeAllCursor); return; } - if (ev->button()==Qt::RightButton) { + if (ev->button()==TQt::RightButton) { emit static_cast<KexiRelationViewTableContainer*>(parentWidget()) ->contextMenuRequest(ev->globalPos()); } @@ -278,7 +278,7 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { void KexiRelationViewTableContainerHeader::mouseReleaseEvent(TQMouseEvent *ev) { kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Release Event"<<endl; - if (m_dragging && ev->button() & Qt::LeftButton) { + if (m_dragging && ev->button() & TQt::LeftButton) { setCursor(TQt::ArrowCursor); m_dragging=false; emit endDrag(); @@ -413,7 +413,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) parentWidget()->setFocus(); setFocus(); TDEListView::contentsMousePressEvent(ev); -// if (ev->button()==Qt::RightButton) +// if (ev->button()==TQt::RightButton) // static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos()); } diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 0c153c75..75f51611 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -413,13 +413,13 @@ bool KexiBlobTableEdit::handleKeyPress( TQKeyEvent* ke, bool editorActive ) const int k = ke->key(); KKey kkey(ke); if (!d->readOnly) { - if ((ke->state()==Qt::NoButton && k==TQt::Key_F4) + if ((ke->state()==TQt::NoButton && k==TQt::Key_F4) || (ke->state()==TQt::AltButton && k==TQt::Key_Down)) { d->button->animateClick(); - TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(2,2), Qt::LeftButton, Qt::NoButton ); + TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(2,2), TQt::LeftButton, TQt::NoButton ); TQApplication::sendEvent( d->button, &me ); } - else if ((ke->state()==Qt::NoButton && (k==TQt::Key_F2 || k==TQt::Key_Space || k==TQt::Key_Enter || k==TQt::Key_Return))) { + else if ((ke->state()==TQt::NoButton && (k==TQt::Key_F2 || k==TQt::Key_Space || k==TQt::Key_Enter || k==TQt::Key_Return))) { d->popup->insertFromFile(); } else @@ -459,7 +459,7 @@ bool KexiBlobTableEdit::eventFilter( TQObject *o, TQEvent *e ) TQKeyEvent* ke = TQT_TQKEYEVENT(e); const int state = ke->state(); const int k = ke->key(); - if ( (state==Qt::NoButton && (k==TQt::Key_Tab || k==TQt::Key_Left || k==TQt::Key_Right)) + if ( (state==TQt::NoButton && (k==TQt::Key_Tab || k==TQt::Key_Left || k==TQt::Key_Right)) || (state==TQt::ShiftButton && k==TQt::Key_Backtab) ) { diff --git a/kexi/widget/tableview/kexicomboboxpopup.cpp b/kexi/widget/tableview/kexicomboboxpopup.cpp index 8a0e678a..dfd6edb4 100644 --- a/kexi/widget/tableview/kexicomboboxpopup.cpp +++ b/kexi/widget/tableview/kexicomboboxpopup.cpp @@ -353,7 +353,7 @@ bool KexiComboBoxPopup::eventFilter( TQObject *o, TQEvent *e ) if (e->type()==TQEvent::KeyPress) { TQKeyEvent *ke = TQT_TQKEYEVENT(e); const int k = ke->key(); - if ((ke->state()==Qt::NoButton && (k==Key_Escape || k==Key_F4)) + if ((ke->state()==TQt::NoButton && (k==Key_Escape || k==Key_F4)) || (ke->state()==AltButton && k==Key_Up)) { hide(); diff --git a/kexi/widget/tableview/kexicomboboxtableedit.cpp b/kexi/widget/tableview/kexicomboboxtableedit.cpp index 9eecc498..a818e40b 100644 --- a/kexi/widget/tableview/kexicomboboxtableedit.cpp +++ b/kexi/widget/tableview/kexicomboboxtableedit.cpp @@ -298,7 +298,7 @@ void KexiComboBoxTableEdit::show() bool KexiComboBoxTableEdit::handleKeyPress( TQKeyEvent *ke, bool editorActive ) { const int k = ke->key(); - if ((ke->state()==Qt::NoButton && k==TQt::Key_F4) + if ((ke->state()==TQt::NoButton && k==TQt::Key_F4) || (ke->state()==AltButton && k==TQt::Key_Down)) { //show popup diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index 4ff50673..2ba85294 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -1668,7 +1668,7 @@ bool KexiDataAwareObjectInterface::handleKeyPress(TQKeyEvent *e, int &curRow, in if (moveToLastField) *moveToLastField = false; - const bool nobtn = e->state()==Qt::NoButton; + const bool nobtn = e->state()==TQt::NoButton; const int k = e->key(); //kdDebug() << "-----------" << e->state() << " " << k << endl; diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index 36a44566..da553388 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -99,7 +99,7 @@ void KexiDateTableEdit::setupContents( TQPainter *p, bool focused, const TQVaria #endif if (val.toDate().isValid()) txt = m_formatter.dateToString(val.toDate()); -// txt = val.toDate().toString(Qt::LocalDate); +// txt = val.toDate().toString(TQt::LocalDate); align |= AlignLeft; } diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 39e397ea..284cbd1d 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -241,7 +241,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch // Create headers m_horizontalHeader = new KexiTableViewHeader(this, "topHeader"); m_horizontalHeader->setSelectionBackgroundColor( palette().active().highlight() ); - m_horizontalHeader->setOrientation(Qt::Horizontal); + 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))); @@ -1023,11 +1023,11 @@ void KexiTableView::contentsMousePressEvent( TQMouseEvent* e ) } // kdDebug(44021)<<"void KexiTableView::contentsMousePressEvent( TQMouseEvent* e ) by now the current items should be set, if not -> error + crash"<<endl; - if(e->button() == Qt::RightButton) + if(e->button() == TQt::RightButton) { showContextMenu(e->globalPos()); } - else if(e->button() == Qt::LeftButton) + else if(e->button() == TQt::LeftButton) { if(columnType(m_curCol) == KexiDB::Field::Boolean && columnEditable(m_curCol)) { @@ -1115,7 +1115,7 @@ bool KexiTableView::handleContentsMousePressOrRelease(TQMouseEvent* e, bool rele } newcol = columnAt(e->pos().x()); - if(e->button() != Qt::NoButton) { + if(e->button() != TQt::NoButton) { setCursorPosition(newrow,newcol); } return true; @@ -1244,9 +1244,9 @@ bool KexiTableView::shortCutPressed( TQKeyEvent *e, const TQCString &action_name if (action_name=="edit_delete_row") return k == TQt::Key_Delete && e->state()==TQt::ControlButton; if (action_name=="edit_delete") - return k == TQt::Key_Delete && e->state()==Qt::NoButton; + return k == TQt::Key_Delete && e->state()==TQt::NoButton; if (action_name=="edit_edititem") - return k == TQt::Key_F2 && e->state()==Qt::NoButton; + return k == TQt::Key_F2 && e->state()==TQt::NoButton; if (action_name=="edit_insert_empty_row") return k == TQt::Key_Insert && e->state()==(TQt::ShiftButton | TQt::ControlButton); @@ -1317,7 +1317,7 @@ void KexiTableView::keyPressEvent(TQKeyEvent* e) int curRow = m_curRow; int curCol = m_curCol; - const bool nobtn = e->state()==Qt::NoButton; + const bool nobtn = e->state()==TQt::NoButton; bool printable = false; //check shared shortcuts @@ -2423,7 +2423,7 @@ bool KexiTableView::eventFilter( TQObject *o, TQEvent *e ) return true; } else if (m_editor && (o==dynamic_cast<TQObject*>(m_editor) || o==m_editor->widget())) { - if ( (k==TQt::Key_Tab && (s==Qt::NoButton || s==TQt::ShiftButton)) + if ( (k==TQt::Key_Tab && (s==TQt::NoButton || s==TQt::ShiftButton)) || (overrideEditorShortcutNeeded(ke)) || (k==TQt::Key_Enter || k==TQt::Key_Return || k==TQt::Key_Up || k==TQt::Key_Down) || (k==TQt::Key_Left && m_editor->cursorAtStart()) diff --git a/kexi/widget/utils/kexiarrowtip.cpp b/kexi/widget/utils/kexiarrowtip.cpp index 6279aa04..f22248e6 100644 --- a/kexi/widget/utils/kexiarrowtip.cpp +++ b/kexi/widget/utils/kexiarrowtip.cpp @@ -124,7 +124,7 @@ void KexiArrowTip::drawContents(TQPainter& p) void KexiArrowTip::drawFrame(TQPainter& p) { - TQPen pen(palette().active().foreground(), 1, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin); + TQPen pen(palette().active().foreground(), 1, TQt::SolidLine, TQt::SquareCap, TQt::MiterJoin); p.setPen( pen ); /* /\ diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index cf204d13..68ba7deb 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -67,12 +67,12 @@ TQSize KexiDropDownButton::sizeHint () const void KexiDropDownButton::keyPressEvent( TQKeyEvent * e ) { const int k = e->key(); - const bool dropDown = (e->state() == Qt::NoButton && (k==TQt::Key_Space || k==TQt::Key_Enter || k==TQt::Key_Return || k==TQt::Key_F2 || k==TQt::Key_F4)) + const bool dropDown = (e->state() == TQt::NoButton && (k==TQt::Key_Space || k==TQt::Key_Enter || k==TQt::Key_Return || k==TQt::Key_F2 || k==TQt::Key_F4)) || (e->state() == TQt::AltButton && k==TQt::Key_Down); if (dropDown) { e->accept(); animateClick(); - TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(2,2), Qt::LeftButton, Qt::NoButton ); + TQMouseEvent me( TQEvent::MouseButtonPress, TQPoint(2,2), TQt::LeftButton, TQt::NoButton ); TQApplication::sendEvent( this, &me ); return; } diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp index 14e5e959..cedb7b74 100644 --- a/kexi/widget/utils/kexiflowlayout.cpp +++ b/kexi/widget/utils/kexiflowlayout.cpp @@ -69,7 +69,7 @@ KexiFlowLayoutIterator::takeCurrent() KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const char *name) : TQLayout(parent, border, space, name) { - m_orientation =Qt::Horizontal; + m_orientation =TQt::Horizontal; m_justify = false; m_cached_width = 0; } @@ -77,7 +77,7 @@ KexiFlowLayout::KexiFlowLayout(TQWidget *parent, int border, int space, const ch KexiFlowLayout::KexiFlowLayout(TQLayout* parent, int space, const char *name) : TQLayout( parent, space, name ) { - m_orientation =Qt::Horizontal; + m_orientation =TQt::Horizontal; m_justify = false; m_cached_width = 0; } @@ -85,7 +85,7 @@ KexiFlowLayout::KexiFlowLayout(TQLayout* parent, int space, const char *name) KexiFlowLayout::KexiFlowLayout(int space, const char *name) : TQLayout(space, name) { - m_orientation =Qt::Horizontal; + m_orientation =TQt::Horizontal; m_justify = false; m_cached_width = 0; } @@ -104,7 +104,7 @@ KexiFlowLayout::addItem(TQLayoutItem *item) void KexiFlowLayout::addSpacing(int size) { - if (m_orientation ==Qt::Horizontal) + if (m_orientation ==TQt::Horizontal) addItem( TQT_TQLAYOUTITEM(new TQSpacerItem( size, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum )) ); else addItem( TQT_TQLAYOUTITEM(new TQSpacerItem( 0, size, TQSizePolicy::Minimum, TQSizePolicy::Fixed )) ); @@ -145,7 +145,7 @@ KexiFlowLayout::isEmpty() bool KexiFlowLayout::hasHeightForWidth() const { - return (m_orientation ==Qt::Horizontal); + return (m_orientation ==TQt::Horizontal); } int @@ -192,7 +192,7 @@ KexiFlowLayout::minimumSize() const TQSizePolicy::ExpandData KexiFlowLayout::expanding() const { - if(m_orientation == Qt::Vertical) + if(m_orientation == TQt::Vertical) return TQSizePolicy::Vertically; else return TQSizePolicy::Horizontally; @@ -202,7 +202,7 @@ void KexiFlowLayout::setGeometry(const TQRect &r) { TQLayout::setGeometry(r); - if(m_orientation ==Qt::Horizontal) + if(m_orientation ==TQt::Horizontal) doHorizontalLayout(r); else doVerticalLayout(r); @@ -211,7 +211,7 @@ KexiFlowLayout::setGeometry(const TQRect &r) int KexiFlowLayout::simulateLayout(const TQRect &r) { - if(m_orientation ==Qt::Horizontal) + if(m_orientation ==TQt::Horizontal) return doHorizontalLayout(r, true); else return doVerticalLayout(r, true); diff --git a/kexi/widget/utils/kexiflowlayout.h b/kexi/widget/utils/kexiflowlayout.h index fa48df6f..4ac7450c 100644 --- a/kexi/widget/utils/kexiflowlayout.h +++ b/kexi/widget/utils/kexiflowlayout.h @@ -37,11 +37,11 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout ie as it is stored in m_list. You must delete the list after using it. */ TQPtrList<TQWidget>* widgetList() const; - /*! Sets layout's orientation to \a orientation. Default orientation is Qt::Vertical. */ - void setOrientation(Qt::Orientation orientation) { m_orientation = orientation; } + /*! Sets layout's orientation to \a orientation. Default orientation is TQt::Vertical. */ + void setOrientation(TQt::Orientation orientation) { m_orientation = orientation; } /*! \return layout's orientation. */ - Qt::Orientation orientation() const { return m_orientation; } + TQt::Orientation orientation() const { return m_orientation; } void setJustified(bool justify) { m_justify = justify; } bool isJustified() const { return m_justify; } @@ -70,7 +70,7 @@ class KEXIGUIUTILS_EXPORT KexiFlowLayout : public TQLayout int m_cached_width; int m_cached_hfw; bool m_justify; - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQSize m_cached_sizeHint; TQSize m_cached_minSize; }; |