diff options
Diffstat (limited to 'kexi/widget/relations')
-rw-r--r-- | kexi/widget/relations/kexirelationview.cpp | 148 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationview.h | 59 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationviewconnection.cpp | 80 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationviewconnection.h | 34 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationviewtable.cpp | 198 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationviewtable.h | 63 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationwidget.cpp | 154 | ||||
-rw-r--r-- | kexi/widget/relations/kexirelationwidget.h | 37 |
8 files changed, 389 insertions, 384 deletions
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 9d68a755..ae35334b 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -20,15 +20,15 @@ #include <kdebug.h> -#include <qstringlist.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qheader.h> -#include <qevent.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qlineedit.h> -#include <qpopupmenu.h> +#include <tqstringlist.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqheader.h> +#include <tqevent.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqlineedit.h> +#include <tqpopupmenu.h> #include <klocale.h> #include <kaction.h> @@ -45,20 +45,20 @@ #include "kexirelationviewconnection.h" #include <kexi.h> -KexiRelationView::KexiRelationView(QWidget *parent, const char *name) - : QScrollView(parent, name, WStaticContents) +KexiRelationView::KexiRelationView(TQWidget *tqparent, const char *name) + : TQScrollView(tqparent, name, WStaticContents) { // m_relation=relation; // m_relation->incUsageCount(); m_selectedConnection = 0; m_readOnly=false; m_focusedTableView = 0; - setFrameStyle(QFrame::WinPanel | QFrame::Sunken); + setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); -// connect(relation, SIGNAL(relationListUpdated(QObject *)), this, SLOT(slotListUpdate(QObject *))); +// connect(relation, TQT_SIGNAL(relationListUpdated(TQObject *)), this, TQT_SLOT(slotListUpdate(TQObject *))); - viewport()->setPaletteBackgroundColor(colorGroup().mid()); - setFocusPolicy(WheelFocus); + viewport()->setPaletteBackgroundColor(tqcolorGroup().mid()); + setFocusPolicy(TQ_WheelFocus); setResizePolicy(Manual); /*MOVED TO KexiRelationDialog //actions @@ -70,18 +70,18 @@ KexiRelationView::KexiRelationView(QWidget *parent, const char *name) plugSharedAction("edit_delete", i18n("Hide Table"), m_tableQueryPopup); plugSharedAction("edit_delete",m_connectionPopup); - plugSharedAction("edit_delete",this, SLOT(removeSelectedObject())); + plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject())); */ #if 0 m_removeSelectedTableQueryAction = new KAction(i18n("&Hide Selected Table/Query"), "editdelete", "", - this, SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery"); + this, TQT_SLOT(removeSelectedTableQuery()), tqparent->actionCollection(), "relationsview_removeSelectedTableQuery"); m_removeSelectedConnectionAction = new KAction(i18n("&Remove Selected Relationship"), "button_cancel", "", - this, SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection"); + this, TQT_SLOT(removeSelectedConnection()), tqparent->actionCollection(), "relationsview_removeSelectedConnection"); m_openSelectedTableQueryAction = new KAction(i18n("&Open Selected Table/Query"), "", "", - this, SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery"); + this, TQT_SLOT(openSelectedTableQuery()), 0/*tqparent->actionCollection()*/, "relationsview_openSelectedTableQuery"); #endif -// invalidateActions(); +// tqinvalidateActions(); #if 0 @@ -91,10 +91,10 @@ KexiRelationView::KexiRelationView(QWidget *parent, const char *name) m_removeSelectedTableQueryAction->plug( m_popup ); m_removeSelectedConnectionAction->plug( m_popup ); - invalidateActions(); + tqinvalidateActions(); #endif - setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding, true); + tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding, true); } KexiRelationView::~KexiRelationView() @@ -116,11 +116,11 @@ KexiRelationView::containerForTable(KexiDB::TableSchema* tableSchema) KexiRelationViewTableContainer * KexiRelationView::tableContainer(KexiDB::TableSchema *t) const { - return t ? m_tables.find(t->name()) : 0; + return t ? m_tables.tqfind(t->name()) : 0; } KexiRelationViewTableContainer* -KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const QRect &rect) +KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const TQRect &rect) { if(!t) return 0; @@ -137,22 +137,22 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const QRect &rect) /*! @todo what about query? */ new KexiDB::TableOrQuerySchema(t) ); - connect(c, SIGNAL(endDrag()), this, SLOT(slotTableViewEndDrag())); - connect(c, SIGNAL(gotFocus()), this, SLOT(slotTableViewGotFocus())); -// connect(c, SIGNAL(headerContextMenuRequest(const QPoint&)), -// this, SLOT(tableHeaderContextMenuRequest(const QPoint&))); - connect(c, SIGNAL(contextMenuRequest(const QPoint&)), - this, SIGNAL(tableContextMenuRequest(const QPoint&))); + connect(c, TQT_SIGNAL(endDrag()), this, TQT_SLOT(slotTableViewEndDrag())); + connect(c, TQT_SIGNAL(gotFocus()), this, TQT_SLOT(slotTableViewGotFocus())); +// connect(c, TQT_SIGNAL(headerContextMenuRequest(const TQPoint&)), +// this, TQT_SLOT(tableHeaderContextMenuRequest(const TQPoint&))); + connect(c, TQT_SIGNAL(contextMenuRequest(const TQPoint&)), + this, TQT_SIGNAL(tableContextMenuRequest(const TQPoint&))); addChild(c, 100,100); if (rect.isValid()) {//predefined size - QSize finalSize = c->size().expandedTo( c->sizeHint() ); - QRect r = rect; - r.setSize( finalSize + QSize(0,10) ); + TQSize finalSize = c->size().expandedTo( c->tqsizeHint() ); + TQRect r = rect; + r.setSize( finalSize + TQSize(0,10) ); moveChild( c, rect.left(), rect.top() ); //we're doing this instead of setGeometry(rect) //because the geomenty might be saved on other system with bigger fonts :) - c->resize(c->sizeHint()); + c->resize(c->tqsizeHint()); // c->setGeometry(r); //TODO @@ -164,14 +164,14 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const QRect &rect) updateGeometry(); if (!rect.isValid()) { c->updateGeometry(); - c->resize(c->sizeHint()); + c->resize(c->tqsizeHint()); } int x, y; if(m_tables.count() > 0) { int place = -10; - QDictIterator<KexiRelationViewTableContainer> it(m_tables); + TQDictIterator<KexiRelationViewTableContainer> it(m_tables); for(; it.current(); ++it) { int right = (*it)->x() + (*it)->width(); @@ -187,7 +187,7 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const QRect &rect) } y = 5; - QPoint p = viewportToContents(QPoint(x, y)); + TQPoint p = viewportToContents(TQPoint(x, y)); recalculateSize(p.x() + c->width(), p.y() + c->height()); if (!rect.isValid()) { moveChild(c, x, y); @@ -195,8 +195,8 @@ KexiRelationView::addTableContainer(KexiDB::TableSchema *t, const QRect &rect) m_tables.insert(t->name(), c); - connect(c, SIGNAL(moved(KexiRelationViewTableContainer *)), this, - SLOT(containerMoved(KexiRelationViewTableContainer *))); + connect(c, TQT_SIGNAL(moved(KexiRelationViewTableContainer *)), this, + TQT_SLOT(containerMoved(KexiRelationViewTableContainer *))); if (hasFocus()) //ok? c->setFocus(); @@ -240,10 +240,10 @@ KexiRelationView::addConnection(const SourceConnection& _conn) KexiRelationViewTableContainer *tmp = master; master = details; details = tmp; - QString tmp_masterTable = conn.masterTable; + TQString tmp_masterTable = conn.masterTable; conn.masterTable = conn.detailsTable; conn.detailsTable = tmp_masterTable; - QString tmp_masterField = conn.masterField; + TQString tmp_masterField = conn.masterField; conn.masterField = conn.detailsField; conn.detailsField = tmp_masterField; } @@ -275,12 +275,12 @@ KexiRelationView::addConnection(const SourceConnection& _conn) } void -KexiRelationView::drawContents(QPainter *p, int cx, int cy, int cw, int ch) +KexiRelationView::drawContents(TQPainter *p, int cx, int cy, int cw, int ch) { KexiRelationViewConnection *cview; // p->translate(0, (double)contentsY()); - QRect clipping(cx, cy, cw, ch); + TQRect clipping(cx, cy, cw, ch); for(cview = m_connectionViews.first(); cview; cview = m_connectionViews.next()) { if(clipping.intersects(cview->oldRect() | cview->connectionRect())) @@ -289,7 +289,7 @@ KexiRelationView::drawContents(QPainter *p, int cx, int cy, int cw, int ch) } void -KexiRelationView::slotTableScrolling(const QString& table) +KexiRelationView::slotTableScrolling(const TQString& table) { KexiRelationViewTableContainer *c = m_tables[table]; @@ -301,7 +301,7 @@ void KexiRelationView::containerMoved(KexiRelationViewTableContainer *c) { KexiRelationViewConnection *cview; - QRect r; + TQRect r; for (ConnectionListIterator it(m_connectionViews); ((cview=it.current())); ++it) { //! @todo optimize if(cview->masterTable() == c || cview->detailsTable() == c @@ -320,10 +320,10 @@ KexiRelationView::containerMoved(KexiRelationViewTableContainer *c) //didn't work well: updateContents(r); updateContents(); -// QRect w(c->x() - 5, c->y() - 5, c->width() + 5, c->height() + 5); +// TQRect w(c->x() - 5, c->y() - 5, c->width() + 5, c->height() + 5); // updateContents(w); - QPoint p = viewportToContents(QPoint(c->x(), c->y())); + TQPoint p = viewportToContents(TQPoint(c->x(), c->y())); recalculateSize(p.x() + c->width(), p.y() + c->height()); emit tablePositionChanged(c); @@ -334,19 +334,19 @@ KexiRelationView::setReadOnly(bool b) { m_readOnly=b; //TODO -// invalidateActions(); +// tqinvalidateActions(); /* TableList::Iterator it, end( m_tables.end() ); for ( it=m_tables.begin(); it != end; ++it) { // (*it)->setReadOnly(b); -#ifndef Q_WS_WIN +#ifndef TQ_WS_WIN #warning readonly needed #endif }*/ } void -KexiRelationView::slotListUpdate(QObject *) +KexiRelationView::slotListUpdate(TQObject *) { #if 0 if(s != this) @@ -368,7 +368,7 @@ KexiRelationView::slotListUpdate(QObject *) } void -KexiRelationView::contentsMousePressEvent(QMouseEvent *ev) +KexiRelationView::contentsMousePressEvent(TQMouseEvent *ev) { KexiRelationViewConnection *cview; for(cview = m_connectionViews.first(); cview; cview = m_connectionViews.next()) @@ -381,11 +381,11 @@ KexiRelationView::contentsMousePressEvent(QMouseEvent *ev) updateContents(cview->connectionRect()); m_selectedConnection = cview; emit connectionViewGotFocus(); -// invalidateActions(); +// tqinvalidateActions(); - if(ev->button() == RightButton) {//show popup + if(ev->button() == Qt::RightButton) {//show popup kdDebug() << "KexiRelationView::contentsMousePressEvent(): context" << endl; -// QPopupMenu m; +// TQPopupMenu m; // m_removeSelectedTableQueryAction->plug( &m ); // m_removeSelectedConnectionAction->plug( &m ); emit connectionContextMenuRequest( ev->globalPos() ); @@ -395,9 +395,9 @@ KexiRelationView::contentsMousePressEvent(QMouseEvent *ev) } //connection not found clearSelection(); -// invalidateActions(); - if(ev->button() == RightButton) {//show popup on view background area -// QPopupMenu m; +// tqinvalidateActions(); + if(ev->button() == Qt::RightButton) {//show popup on view background area +// TQPopupMenu m; // m_removeSelectedConnectionAction->plug( &m ); emit emptyAreaContextMenuRequest( ev->globalPos() ); // executePopup(ev->globalPos()); @@ -406,7 +406,7 @@ KexiRelationView::contentsMousePressEvent(QMouseEvent *ev) emit emptyAreaGotFocus(); } setFocus(); -// QScrollView::contentsMousePressEvent(ev); +// TQScrollView::contentsMousePressEvent(ev); } void KexiRelationView::clearSelection() @@ -415,18 +415,18 @@ void KexiRelationView::clearSelection() m_focusedTableView->unsetFocus(); m_focusedTableView = 0; // setFocus(); -// invalidateActions(); +// tqinvalidateActions(); } if (m_selectedConnection) { m_selectedConnection->setSelected(false); updateContents(m_selectedConnection->connectionRect()); m_selectedConnection = 0; -// invalidateActions(); +// tqinvalidateActions(); } } void -KexiRelationView::keyPressEvent(QKeyEvent *ev) +KexiRelationView::keyPressEvent(TQKeyEvent *ev) { kdDebug() << "KexiRelationView::keyPressEvent()" << endl; @@ -467,14 +467,14 @@ void KexiRelationView::stretchExpandSize() { int max_x=-1, max_y=-1; - QDictIterator<KexiRelationViewTableContainer> it(m_tables); + TQDictIterator<KexiRelationViewTableContainer> it(m_tables); for (;it.current(); ++it) { if (it.current()->right()>max_x) max_x = it.current()->right(); if (it.current()->bottom()>max_y) max_y = it.current()->bottom(); } - QPoint p = viewportToContents(QPoint(max_x, max_y) + QPoint(3,3)); //3 pixels margin + TQPoint p = viewportToContents(TQPoint(max_x, max_y) + TQPoint(3,3)); //3 pixels margin resizeContents(p.x(), p.y()); } @@ -516,7 +516,7 @@ KexiRelationView::removeSelectedObject() #endif delete m_selectedConnection; m_selectedConnection = 0; -// invalidateActions(); +// tqinvalidateActions(); } else if (m_focusedTableView) { KexiRelationViewTableContainer *tmp = m_focusedTableView; @@ -531,7 +531,7 @@ KexiRelationView::hideTable(KexiRelationViewTableContainer* tableView) /*! @todo what about query? */ KexiDB::TableSchema *ts = tableView->schema()->table(); //for all connections: find and remove all connected with this table - QPtrListIterator<KexiRelationViewConnection> it(m_connectionViews); + TQPtrListIterator<KexiRelationViewConnection> it(m_connectionViews); for (;it.current();) { if (it.current()->masterTable() == tableView || it.current()->detailsTable() == tableView) @@ -554,7 +554,7 @@ KexiRelationView::hideAllTablesExcept( KexiDB::TableSchema::List* tables ) //! @todo what about queries? for (TablesDictIterator it(m_tables); it.current();) { KexiDB::TableSchema *table = it.current()->schema()->table(); - if (!table || tables->findRef( table )!=-1) { + if (!table || tables->tqfindRef( table )!=-1) { ++it; continue; } @@ -580,13 +580,13 @@ void KexiRelationView::slotTableViewGotFocus() // if (m_focusedTableView) // m_focusedTableView->unsetFocus(); m_focusedTableView = (KexiRelationViewTableContainer*)sender(); -// invalidateActions(); +// tqinvalidateActions(); emit tableViewGotFocus(); } -QSize KexiRelationView::sizeHint() const +TQSize KexiRelationView::tqsizeHint() const { - return QSize(QScrollView::sizeHint());//.width(), 600); + return TQSize(TQScrollView::tqsizeHint());//.width(), 600); } void KexiRelationView::clear() @@ -609,24 +609,24 @@ void KexiRelationView::removeAllConnections() /* -void KexiRelationView::tableHeaderContextMenuRequest(const QPoint& pos) +void KexiRelationView::tableHeaderContextMenuRequest(const TQPoint& pos) { if (m_focusedTableView != sender()) return; kdDebug() << "HEADER CTXT MENU!" <<endl; - invalidateActions(); + tqinvalidateActions(); m_tableQueryPopup->exec(pos); } //! Invalidates all actions availability -void KexiRelationView::invalidateActions() +void KexiRelationView::tqinvalidateActions() { setAvailable("edit_delete", m_selectedConnection || m_focusedTableView); } -void KexiRelationView::executePopup( QPoint pos ) +void KexiRelationView::executePopup( TQPoint pos ) { - if (pos==QPoint(-1,-1)) { + if (pos==TQPoint(-1,-1)) { pos = mapToGlobal( m_focusedTableView ? m_focusedTableView->pos() + m_focusedTableView->rect().center() : rect().center() ); } if (m_focusedTableView) diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h index 2de6620d..b5d1785d 100644 --- a/kexi/widget/relations/kexirelationview.h +++ b/kexi/widget/relations/kexirelationview.h @@ -21,16 +21,16 @@ #ifndef KEXIRELATIONVIEW_H #define KEXIRELATIONVIEW_H -#include <qguardedptr.h> -#include <qscrollview.h> -#include <qptrlist.h> -#include <qdict.h> +#include <tqguardedptr.h> +#include <tqscrollview.h> +#include <tqptrlist.h> +#include <tqdict.h> #include <kexidb/tableschema.h> #include "kexirelationviewconnection.h" -class QFrame; +class TQFrame; class KexiRelationViewTable; class KexiRelationViewTableContainer; @@ -43,17 +43,17 @@ namespace KexiDB class Connection; } -typedef QDict<KexiRelationViewTableContainer> TablesDict; -typedef QDictIterator<KexiRelationViewTableContainer> TablesDictIterator; -typedef QPtrList<KexiRelationViewConnection> ConnectionList; -typedef QPtrListIterator<KexiRelationViewConnection> ConnectionListIterator; +typedef TQDict<KexiRelationViewTableContainer> TablesDict; +typedef TQDictIterator<KexiRelationViewTableContainer> TablesDictIterator; +typedef TQPtrList<KexiRelationViewConnection> ConnectionList; +typedef TQPtrListIterator<KexiRelationViewConnection> ConnectionListIterator; struct SourceConnection { - QString masterTable; - QString detailsTable; - QString masterField; - QString detailsField; + TQString masterTable; + TQString detailsTable; + TQString masterField; + TQString detailsField; }; /*! @short provides a view for displaying relations between database tables. @@ -65,23 +65,24 @@ struct SourceConnection The class is for displaying only - retrieving data and updating data on the backend side is implemented in KexiRelationWidget, and more specifically in: Kexi Relation Part and Kexi Query Part. */ -class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public QScrollView +class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - KexiRelationView(QWidget *parent, const char *name=0); + KexiRelationView(TQWidget *tqparent, const char *name=0); virtual ~KexiRelationView(); //! \return a dictionary of added tables TablesDict* tables() { return &m_tables; } /*! Adds a table \a t to the area. This changes only visual representation. - If \a rect is valid, table widget geometry will be initialized. + If \a rect is valid, table widget tqgeometry will be initialized. \return added table container or 0 on failure. */ KexiRelationViewTableContainer* addTableContainer(KexiDB::TableSchema *t, - const QRect &rect = QRect()); + const TQRect &rect = TQRect()); /*! \return table container for table \a t. */ KexiRelationViewTableContainer * tableContainer(KexiDB::TableSchema *t) const; @@ -95,16 +96,16 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public QScrollView inline KexiRelationViewTableContainer* focusedTableView() const { return m_focusedTableView; } - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; const ConnectionList* connections() const { return &m_connectionViews; } // KexiRelationViewTableContainer* containerForTable(KexiDB::TableSchema* tableSchema); signals: - void tableContextMenuRequest( const QPoint& pos ); - void connectionContextMenuRequest( const QPoint& pos ); - void emptyAreaContextMenuRequest( const QPoint& pos ); + void tableContextMenuRequest( const TQPoint& pos ); + void connectionContextMenuRequest( const TQPoint& pos ); + void emptyAreaContextMenuRequest( const TQPoint& pos ); void tableViewGotFocus(); void connectionViewGotFocus(); void emptyAreaGotFocus(); @@ -126,7 +127,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public QScrollView /*! Hides all tables except \a tables. */ void hideAllTablesExcept( KexiDB::TableSchema::List* tables ); - void slotTableScrolling(const QString&); + void slotTableScrolling(const TQString&); //! removes selected table or connection void removeSelectedObject(); @@ -134,7 +135,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public QScrollView protected slots: void containerMoved(KexiRelationViewTableContainer *c); - void slotListUpdate(QObject *s); + void slotListUpdate(TQObject *s); void slotTableViewEndDrag(); void slotTableViewGotFocus(); @@ -142,15 +143,15 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public QScrollView // /*! executes popup menu at \a pos, or, // if \a pos not specified: at center of selected table view (if any selected), // or at center point of the relations view. */ -// void executePopup( QPoint pos = QPoint(-1,-1) ); +// void executePopup( TQPoint pos = TQPoint(-1,-1) ); - void drawContents(QPainter *p, int cx, int cy, int cw, int ch); - void contentsMousePressEvent(QMouseEvent *ev); - virtual void keyPressEvent(QKeyEvent *ev); + void drawContents(TQPainter *p, int cx, int cy, int cw, int ch); + void contentsMousePressEvent(TQMouseEvent *ev); + virtual void keyPressEvent(TQKeyEvent *ev); void recalculateSize(int width, int height); void stretchExpandSize(); -// void invalidateActions(); +// void tqinvalidateActions(); // void clearTableSelection(); // void clearConnSelection(); @@ -161,7 +162,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationView : public QScrollView bool m_readOnly; ConnectionList m_connectionViews; KexiRelationViewConnection* m_selectedConnection; - QGuardedPtr<KexiRelationViewTableContainer> m_focusedTableView; + TQGuardedPtr<KexiRelationViewTableContainer> m_focusedTableView; }; #endif diff --git a/kexi/widget/relations/kexirelationviewconnection.cpp b/kexi/widget/relations/kexirelationviewconnection.cpp index 2c27de87..7c813298 100644 --- a/kexi/widget/relations/kexirelationviewconnection.cpp +++ b/kexi/widget/relations/kexirelationviewconnection.cpp @@ -18,11 +18,11 @@ * Boston, MA 02110-1301, USA. */ -#include <qpainter.h> -#include <qpixmap.h> -#include <qcolor.h> -#include <qapplication.h> -#include <qpointarray.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqcolor.h> +#include <tqapplication.h> +#include <tqpointarray.h> #include <kdebug.h> @@ -40,9 +40,9 @@ KexiRelationViewConnection::KexiRelationViewConnection( KexiRelationViewTableContainer *masterTbl, KexiRelationViewTableContainer *detailsTbl, - SourceConnection &c, KexiRelationView *parent) + SourceConnection &c, KexiRelationView *tqparent) { - m_parent = parent; + m_parent = tqparent; // kdDebug() << "KexiRelationViewConnection::KexiRelationViewConnection()" << endl; m_masterTable = masterTbl; @@ -65,22 +65,22 @@ KexiRelationViewConnection::~KexiRelationViewConnection() } void -KexiRelationViewConnection::drawConnection(QPainter *p) +KexiRelationViewConnection::drawConnection(TQPainter *p) { - p->setPen(m_parent->palette().active().foreground()); + p->setPen(m_parent->tqpalette().active().foreground()); int sx = m_masterTable->x() + m_masterTable->width() + m_parent->contentsX(); int sy = m_masterTable->globalY(m_masterField); int rx = m_detailsTable->x() + m_parent->contentsX(); int ry = m_detailsTable->globalY(m_detailsField); - QFont f( Kexi::smallFont( m_parent ) ); - QFontMetrics fm(f); + TQFont f( Kexi::smallFont( m_parent ) ); + TQFontMetrics fm(f); int side1x=0, side1y=sy - fm.height(), sideNx=0, sideNy=ry - fm.height(); //! @todo details char can be also just a '1' for some cases - QChar sideNChar(0x221E); //infinity char + TQChar sideNChar(0x221E); //infinity char uint sideNCharWidth = 2+2+ fm.width( sideNChar ); - QChar side1Char('1'); + TQChar side1Char('1'); uint side1CharWidth = 2+2+ fm.width( side1Char ); p->setBrush(p->pen().color()); @@ -88,11 +88,11 @@ KexiRelationViewConnection::drawConnection(QPainter *p) { //det. side p->drawLine(rx - sideNCharWidth, ry, rx, ry); - QPointArray pa(3); + TQPointArray pa(3); pa.setPoint(0, rx - 4, ry - 3); pa.setPoint(1, rx - 4, ry + 3); pa.setPoint(2, rx - 1, ry); - p->drawPolygon(pa, true); + p->tqdrawPolygon(pa, true); //master side p->drawLine(sx, sy - 1, sx + side1CharWidth -1, sy - 1); @@ -105,10 +105,10 @@ KexiRelationViewConnection::drawConnection(QPainter *p) sideNx = rx - sideNCharWidth - 1; // sideNy = ry - 6; - QPen pen(p->pen()); + TQPen pen(p->pen()); if(m_selected) { - QPen pen(p->pen()); + TQPen pen(p->pen()); pen.setWidth(2); p->setPen(pen); } @@ -117,7 +117,7 @@ KexiRelationViewConnection::drawConnection(QPainter *p) if(m_selected) { - QPen pen(p->pen()); + TQPen pen(p->pen()); pen.setWidth(1); p->setPen(pen); } @@ -130,11 +130,11 @@ KexiRelationViewConnection::drawConnection(QPainter *p) //det. side p->drawLine(lx, ry, lx + sideNCharWidth, ry); - QPointArray pa(3); + TQPointArray pa(3); pa.setPoint(0, lx + 3, ry - 3); pa.setPoint(1, lx + 3, ry + 3); pa.setPoint(2, lx, ry); - p->drawPolygon(pa, true); + p->tqdrawPolygon(pa, true); // p->drawLine(lx, ry, lx + 8, ry); // p->drawPoint(lx + 1, ry - 1); @@ -154,7 +154,7 @@ KexiRelationViewConnection::drawConnection(QPainter *p) if(m_selected) { - QPen pen(p->pen()); + TQPen pen(p->pen()); pen.setWidth(2); p->setPen(pen); } @@ -163,20 +163,20 @@ KexiRelationViewConnection::drawConnection(QPainter *p) if(m_selected) { - QPen pen(p->pen()); + TQPen pen(p->pen()); pen.setWidth(1); p->setPen(pen); } } - p->drawText(side1x, side1y, side1CharWidth, fm.height(), Qt::AlignCenter, side1Char); - p->drawText(sideNx, sideNy, sideNCharWidth, fm.height(), Qt::AlignCenter, sideNChar); - //p->drawRect(QRect(connectionRect().topLeft(), QSize(50,50))); -// p->drawPixmap(side1, QPixmap(r1_xpm)); -// p->drawPixmap(sideN, QPixmap(rn_xpm)); + p->drawText(side1x, side1y, side1CharWidth, fm.height(), TQt::AlignCenter, side1Char); + p->drawText(sideNx, sideNy, sideNCharWidth, fm.height(), TQt::AlignCenter, sideNChar); + //p->drawRect(TQRect(connectionRect().topLeft(), TQSize(50,50))); +// p->drawPixmap(side1, TQPixmap(r1_xpm)); +// p->drawPixmap(sideN, TQPixmap(rn_xpm)); } -const QRect +const TQRect KexiRelationViewConnection::connectionRect() { int sx = m_masterTable->x() + m_parent->contentsX(); @@ -200,15 +200,15 @@ KexiRelationViewConnection::connectionRect() } - int dx = QABS((leftX + width) - rightX); - int dy = QABS(sy - ry) + 2; + int dx = TQABS((leftX + width) - rightX); + int dy = TQABS(sy - ry) + 2; - int top = QMIN(sy, ry); + int top = TQMIN(sy, ry); int left = leftX + width; -// return QRect(sx - 1, sy - 1, (rx + m_detailsTable->width()) - sx + 1, ry - sy + 1); - QRect rect(left - 150, top - 150, dx + 150, dy + 150); +// return TQRect(sx - 1, sy - 1, (rx + m_detailsTable->width()) - sx + 1, ry - sy + 1); + TQRect rect(left - 150, top - 150, dx + 150, dy + 150); // kdDebug() << "KexiRelationViewConnection::connectionRect():" << m_oldRect << "," << rect << endl; m_oldRect = rect; @@ -217,11 +217,11 @@ KexiRelationViewConnection::connectionRect() } bool -KexiRelationViewConnection::matchesPoint(const QPoint &p, int tolerance) +KexiRelationViewConnection::matchesPoint(const TQPoint &p, int tolerance) { - QRect we = connectionRect(); + TQRect we = connectionRect(); - if(!we.contains(p)) + if(!we.tqcontains(p)) return false; /** get our coordinats @@ -282,17 +282,17 @@ KexiRelationViewConnection::matchesPoint(const QPoint &p, int tolerance) return false; } -QString +TQString KexiRelationViewConnection::toString() const { - QString str; + TQString str; /*! @todo what about query? */ if (m_masterTable && m_masterTable->schema()->table()) { - str += (QString(m_masterTable->schema()->name()) + "." + m_masterField); + str += (TQString(m_masterTable->schema()->name()) + "." + m_masterField); } if (m_detailsTable && m_detailsTable->schema()->table()) { str += " - "; - str += (QString(m_detailsTable->schema()->name()) + "." + m_detailsField); + str += (TQString(m_detailsTable->schema()->name()) + "." + m_detailsField); } return str; } diff --git a/kexi/widget/relations/kexirelationviewconnection.h b/kexi/widget/relations/kexirelationviewconnection.h index 699fdf4f..7b596210 100644 --- a/kexi/widget/relations/kexirelationviewconnection.h +++ b/kexi/widget/relations/kexirelationviewconnection.h @@ -21,10 +21,10 @@ #ifndef KEXIRELATIONVIEWCONNECTION_H #define KEXIRELATIONVIEWCONNECTION_H -#include <qstring.h> -#include <qguardedptr.h> +#include <tqstring.h> +#include <tqguardedptr.h> -class QPainter; +class TQPainter; class KexiRelationViewTableContainer; class KexiRelationView; @@ -33,7 +33,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewConnection public: KexiRelationViewConnection(KexiRelationViewTableContainer *masterTbl, - KexiRelationViewTableContainer *detailsTbl, struct SourceConnection &s, KexiRelationView *parent); + KexiRelationViewTableContainer *detailsTbl, struct SourceConnection &s, KexiRelationView *tqparent); ~KexiRelationViewConnection(); @@ -43,33 +43,33 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewConnection http://www.c-plusplus.de ;) */ - void drawConnection(QPainter *p); + void drawConnection(TQPainter *p); bool selected() { return m_selected; } void setSelected(bool s) { m_selected = s; } - const QRect connectionRect(); - const QRect oldRect() const { return m_oldRect; } + const TQRect connectionRect(); + const TQRect oldRect() const { return m_oldRect; } KexiRelationViewTableContainer *masterTable() { return m_masterTable; } KexiRelationViewTableContainer *detailsTable() { return m_detailsTable; } - QString masterField() const { return m_masterField; } - QString detailsField() const { return m_detailsField; } + TQString masterField() const { return m_masterField; } + TQString detailsField() const { return m_detailsField; } - bool matchesPoint(const QPoint &p, int tolerance=3); + bool matchesPoint(const TQPoint &p, int tolerance=3); // SourceConnection connection() { return m_conn; } - QString toString() const; + TQString toString() const; private: - QGuardedPtr<KexiRelationViewTableContainer> m_masterTable; - QGuardedPtr<KexiRelationViewTableContainer> m_detailsTable; - QString m_masterField; - QString m_detailsField; - QRect m_oldRect; + TQGuardedPtr<KexiRelationViewTableContainer> m_masterTable; + TQGuardedPtr<KexiRelationViewTableContainer> m_detailsTable; + TQString m_masterField; + TQString m_detailsField; + TQRect m_oldRect; bool m_selected; - QGuardedPtr<KexiRelationView> m_parent; + TQGuardedPtr<KexiRelationView> m_parent; }; #endif diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index 97beaa87..c850d722 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -20,15 +20,15 @@ #include <stdlib.h> -#include <qheader.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> -#include <qcursor.h> -#include <qpoint.h> -#include <qapplication.h> -#include <qbitmap.h> -#include <qstyle.h> +#include <tqheader.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> +#include <tqcursor.h> +#include <tqpoint.h> +#include <tqapplication.h> +#include <tqbitmap.h> +#include <tqstyle.h> #include <kdebug.h> #include <kiconloader.h> @@ -43,10 +43,10 @@ #include "kexirelationview.h" KexiRelationViewTableContainer::KexiRelationViewTableContainer( - KexiRelationView *parent, KexiDB::TableOrQuerySchema *schema) - : QFrame(parent,"KexiRelationViewTableContainer" ) + KexiRelationView *tqparent, KexiDB::TableOrQuerySchema *schema) + : TQFrame(tqparent,"KexiRelationViewTableContainer" ) // , m_table(t) - , m_parent(parent) + , m_parent(tqparent) // , m_mousePressed(false) { @@ -54,29 +54,29 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer( //js: resize(100, 150); //setMouseTracking(true); - setFrameStyle( QFrame::WinPanel | QFrame::Raised ); + setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); - QVBoxLayout *lyr = new QVBoxLayout(this,4,1); //js: using Q*BoxLayout is a good idea + TQVBoxLayout *lyr = new TQVBoxLayout(this,4,1); //js: using Q*BoxLayout is a good idea m_tableHeader = new KexiRelationViewTableContainerHeader(schema->name(), this); m_tableHeader->unsetFocus(); - m_tableHeader->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed)); + m_tableHeader->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed)); lyr->addWidget(m_tableHeader); - connect(m_tableHeader,SIGNAL(moved()),this,SLOT(moved())); - connect(m_tableHeader, SIGNAL(endDrag()), this, SIGNAL(endDrag())); + connect(m_tableHeader,TQT_SIGNAL(moved()),this,TQT_SLOT(moved())); + connect(m_tableHeader, TQT_SIGNAL(endDrag()), this, TQT_SIGNAL(endDrag())); - m_tableView = new KexiRelationViewTable(schema, parent, this, "KexiRelationViewTable"); + m_tableView = new KexiRelationViewTable(schema, tqparent, this, "KexiRelationViewTable"); //m_tableHeader->setFocusProxy( m_tableView ); - m_tableView->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); + m_tableView->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); - m_tableView->setMaximumSize( m_tableView->sizeHint() ); + m_tableView->setMaximumSize( m_tableView->tqsizeHint() ); -// m_tableView->resize( m_tableView->sizeHint() ); +// m_tableView->resize( m_tableView->tqsizeHint() ); lyr->addWidget(m_tableView, 0); - connect(m_tableView, SIGNAL(tableScrolling()), this, SLOT(moved())); - connect(m_tableView, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)), - this, SLOT(slotContextMenu(KListView*, QListViewItem*, const QPoint&))); + connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved())); + connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&))); } KexiRelationViewTableContainer::~KexiRelationViewTableContainer() @@ -88,7 +88,7 @@ KexiDB::TableOrQuerySchema* KexiRelationViewTableContainer::schema() const return m_tableView->schema(); } -void KexiRelationViewTableContainer::slotContextMenu(KListView *, QListViewItem *, const QPoint &p) +void KexiRelationViewTableContainer::slotContextMenu(KListView *, TQListViewItem *, const TQPoint &p) { // m_parent->executePopup(p); emit contextMenuRequest( p ); @@ -99,24 +99,24 @@ void KexiRelationViewTableContainer::moved() { emit moved(this); } -int KexiRelationViewTableContainer::globalY(const QString &field) +int KexiRelationViewTableContainer::globalY(const TQString &field) { // kdDebug() << "KexiRelationViewTableContainer::globalY()" << endl; -// QPoint o = mapFromGlobal(QPoint(0, (m_tableView->globalY(field))/*+m_parent->contentsY()*/)); +// TQPoint o = mapFromGlobal(TQPoint(0, (m_tableView->globalY(field))/*+m_parent->contentsY()*/)); - QPoint o(0, (m_tableView->globalY(field)) + m_parent->contentsY()); + TQPoint o(0, (m_tableView->globalY(field)) + m_parent->contentsY()); // kdDebug() << "KexiRelationViewTableContainer::globalY() db2" << endl; return m_parent->viewport()->mapFromGlobal(o).y(); } #if 0//js -QSize KexiRelationViewTableContainer::sizeHint() +TQSize KexiRelationViewTableContainer::tqsizeHint() { -#ifdef Q_WS_WIN - QSize s = m_tableView->sizeHint() - + QSize( 2 * 5 , m_tableHeader->height() + 2 * 5 ); +#ifdef TQ_WS_WIN + TQSize s = m_tableView->tqsizeHint() + + TQSize( 2 * 5 , m_tableHeader->height() + 2 * 5 ); #else - QSize s = m_tableView->sizeHint(); + TQSize s = m_tableView->tqsizeHint(); s.setWidth(s.width() + 4); s.setHeight(m_tableHeader->height() + s.height()); #endif @@ -134,13 +134,13 @@ void KexiRelationViewTableContainer::setFocus() } m_tableHeader->setFocus(); m_tableView->setFocus(); -/* QPalette p = qApp->palette(); - p.setColor( QPalette::Active, QColorGroup::Highlight, KGlobalSettings::highlightColor() ); - p.setColor( QPalette::Active, QColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() ); +/* TQPalette p = tqApp->palette(); + p.setColor( TQPalette::Active, TQColorGroup::Highlight, KGlobalSettings::highlightColor() ); + p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() ); m_tableView->setPalette(p);*/ raise(); - repaint(); + tqrepaint(); emit gotFocus(); } @@ -155,18 +155,18 @@ void KexiRelationViewTableContainer::unsetFocus() m_tableView->clearSelection(); // m_tableView->unsetPalette(); -/* QPalette p = m_tableView->palette(); -// p.setColor( QPalette::Active, QColorGroup::Highlight, KGlobalSettings::highlightColor() ); -// p.setColor( QPalette::Active, QColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() ); - p.setColor( QPalette::Active, QColorGroup::Highlight, p.color(QPalette::Active, QColorGroup::Background ) ); -// p.setColor( QPalette::Active, QColorGroup::Highlight, gray ); - p.setColor( QPalette::Active, QColorGroup::HighlightedText, p.color(QPalette::Active, QColorGroup::Foreground ) ); -// p.setColor( QPalette::Active, QColorGroup::Highlight, green ); -// p.setColor( QPalette::Active, QColorGroup::HighlightedText, blue ); +/* TQPalette p = m_tableView->palette(); +// p.setColor( TQPalette::Active, TQColorGroup::Highlight, KGlobalSettings::highlightColor() ); +// p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, KGlobalSettings::highlightedTextColor() ); + p.setColor( TQPalette::Active, TQColorGroup::Highlight, p.color(TQPalette::Active, TQColorGroup::Background ) ); +// p.setColor( TQPalette::Active, TQColorGroup::Highlight, gray ); + p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, p.color(TQPalette::Active, TQColorGroup::Foreground ) ); +// p.setColor( TQPalette::Active, TQColorGroup::Highlight, green ); +// p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, blue ); m_tableView->setPalette(p);*/ clearFocus(); - repaint(); + tqrepaint(); } @@ -176,8 +176,8 @@ void KexiRelationViewTableContainer::unsetFocus() //BEGIN KexiRelatoinViewTableContainerHeader KexiRelationViewTableContainerHeader::KexiRelationViewTableContainerHeader( - const QString& text,QWidget *parent) - :QLabel(text,parent),m_dragging(false) + const TQString& text,TQWidget *tqparent) + :TQLabel(text,tqparent),m_dragging(false) { setMargin(1); m_activeBG = KGlobalSettings::activeTitleColor(); @@ -204,17 +204,17 @@ void KexiRelationViewTableContainerHeader::unsetFocus() setPaletteForegroundColor(m_inactiveFG); } -bool KexiRelationViewTableContainerHeader::eventFilter(QObject *, QEvent *ev) +bool KexiRelationViewTableContainerHeader::eventFilter(TQObject *, TQEvent *ev) { - if (ev->type()==QEvent::MouseMove) + if (ev->type()==TQEvent::MouseMove) { - if (m_dragging && static_cast<QMouseEvent*>(ev)->state()==Qt::LeftButton) { + if (m_dragging && TQT_TQMOUSEEVENT(ev)->state()==Qt::LeftButton) { int diffX,diffY; - diffX=static_cast<QMouseEvent*>(ev)->globalPos().x()-m_grabX; - diffY=static_cast<QMouseEvent*>(ev)->globalPos().y()-m_grabY; + diffX=TQT_TQMOUSEEVENT(ev)->globalPos().x()-m_grabX; + diffY=TQT_TQMOUSEEVENT(ev)->globalPos().y()-m_grabY; if ((abs(diffX)>2) || (abs(diffY)>2)) { - QPoint newPos=parentWidget()->pos()+QPoint(diffX,diffY); + TQPoint newPos=tqparentWidget()->pos()+TQPoint(diffX,diffY); //correct the x position if (newPos.x()<0) { m_offsetX+=newPos.x(); @@ -244,9 +244,9 @@ bool KexiRelationViewTableContainerHeader::eventFilter(QObject *, QEvent *ev) } //move and update helpers - parentWidget()->move(newPos); - m_grabX=static_cast<QMouseEvent*>(ev)->globalPos().x(); - m_grabY=static_cast<QMouseEvent*>(ev)->globalPos().y(); + tqparentWidget()->move(newPos); + m_grabX=TQT_TQMOUSEEVENT(ev)->globalPos().x(); + m_grabY=TQT_TQMOUSEEVENT(ev)->globalPos().y(); // kdDebug()<<"HEADER:emitting moved"<<endl; emit moved(); } @@ -256,9 +256,9 @@ bool KexiRelationViewTableContainerHeader::eventFilter(QObject *, QEvent *ev) return false; } -void KexiRelationViewTableContainerHeader::mousePressEvent(QMouseEvent *ev) { +void KexiRelationViewTableContainerHeader::mousePressEvent(TQMouseEvent *ev) { kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Press Event"<<endl; - parentWidget()->setFocus(); + tqparentWidget()->setFocus(); ev->accept(); if (ev->button()==Qt::LeftButton) { m_dragging=true; @@ -266,20 +266,20 @@ void KexiRelationViewTableContainerHeader::mousePressEvent(QMouseEvent *ev) { m_grabY=ev->globalPos().y(); m_offsetX=0; m_offsetY=0; - setCursor(Qt::SizeAllCursor); + setCursor(TQt::SizeAllCursor); return; } if (ev->button()==Qt::RightButton) { - emit static_cast<KexiRelationViewTableContainer*>(parentWidget()) + emit static_cast<KexiRelationViewTableContainer*>(tqparentWidget()) ->contextMenuRequest(ev->globalPos()); } -// QLabel::mousePressEvent(ev); +// TQLabel::mousePressEvent(ev); } -void KexiRelationViewTableContainerHeader::mouseReleaseEvent(QMouseEvent *ev) { +void KexiRelationViewTableContainerHeader::mouseReleaseEvent(TQMouseEvent *ev) { kdDebug()<<"KexiRelationViewTableContainerHeader::Mouse Release Event"<<endl; if (m_dragging && ev->button() & Qt::LeftButton) { - setCursor(Qt::ArrowCursor); + setCursor(TQt::ArrowCursor); m_dragging=false; emit endDrag(); } @@ -292,37 +292,37 @@ void KexiRelationViewTableContainerHeader::mouseReleaseEvent(QMouseEvent *ev) { //===================================================================================== KexiRelationViewTable::KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOrQuerySchema, - KexiRelationView *view, QWidget *parent, const char *name) - : KexiFieldListView(parent, name, KexiFieldListView::ShowAsterisk) + KexiRelationView *view, TQWidget *tqparent, const char *name) + : KexiFieldListView(tqparent, name, KexiFieldListView::ShowAsterisk) , m_view(view) { setSchema(tableOrQuerySchema); header()->hide(); - connect(this, SIGNAL(dropped(QDropEvent *, QListViewItem *)), this, SLOT(slotDropped(QDropEvent *))); - connect(this, SIGNAL(contentsMoving(int, int)), this, SLOT(slotContentsMoving(int,int))); + connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *)), this, TQT_SLOT(slotDropped(TQDropEvent *))); + connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotContentsMoving(int,int))); } KexiRelationViewTable::~KexiRelationViewTable() { } -QSize KexiRelationViewTable::sizeHint() const +TQSize KexiRelationViewTable::tqsizeHint() const { - QFontMetrics fm(fontMetrics()); + TQFontMetrics fm(fontMetrics()); // kdDebug() << schema()->name() << " cw=" << columnWidth(0) + fm.width("i") // << ", " << fm.width(schema()->name()+" ") << endl; int maxWidth = -1; const int iconWidth = IconSize(KIcon::Small) + fm.width("i")+20; - for (QListViewItem *item = firstChild(); item; item = item->nextSibling()) - maxWidth = QMAX(maxWidth, iconWidth + fm.width(item->text(0))); + for (TQListViewItem *item = firstChild(); item; item = item->nextSibling()) + maxWidth = TQMAX(maxWidth, iconWidth + fm.width(item->text(0))); - const uint rowCount = QMIN( 8, childCount() ); + const uint rowCount = TQMIN( 8, childCount() ); - QSize s( - QMAX( maxWidth, fm.width(schema()->name()+" ")), + TQSize s( + TQMAX( maxWidth, fm.width(schema()->name()+" ")), rowCount*firstChild()->totalHeight() + 4 ); return s; } @@ -336,58 +336,58 @@ void KexiRelationViewTable::setReadOnly(bool b) #endif int -KexiRelationViewTable::globalY(const QString &item) +KexiRelationViewTable::globalY(const TQString &item) { - QListViewItem *i = findItem(item, 0); + TQListViewItem *i = tqfindItem(item, 0); if (!i) return -1; - int y = itemRect(i).y() + (itemRect(i).height() / 2); + int y = tqitemRect(i).y() + (tqitemRect(i).height() / 2); if (contentsY() > itemPos(i)) y = 0; else if (y == 0) y = height(); - return mapToGlobal(QPoint(0, y)).y(); + return mapToGlobal(TQPoint(0, y)).y(); } bool -KexiRelationViewTable::acceptDrag(QDropEvent *ev) const +KexiRelationViewTable::acceptDrag(TQDropEvent *ev) const { // kdDebug() << "KexiRelationViewTable::acceptDrag()" << endl; - QListViewItem *receiver = itemAt(ev->pos() - QPoint(0,contentsY())); + TQListViewItem *receiver = itemAt(ev->pos() - TQPoint(0,contentsY())); if (!receiver || !KexiFieldDrag::canDecodeSingle(ev)) return false; - QString sourceMimeType; - QString srcTable; - QString srcField; + TQString sourceMimeType; + TQString srcTable; + TQString srcField; if (!KexiFieldDrag::decodeSingle(ev,sourceMimeType,srcTable,srcField)) return false; if (sourceMimeType!="kexi/table" && sourceMimeType=="kexi/query") return false; - QString f = receiver->text(0).stripWhiteSpace(); - if (!srcField.stripWhiteSpace().startsWith("*") && !f.startsWith("*") && ev->source() != (QWidget*)this) + TQString f = receiver->text(0).stripWhiteSpace(); + if (!srcField.stripWhiteSpace().startsWith("*") && !f.startsWith("*") && ev->source() != (TQWidget*)this) return true; return false; } void -KexiRelationViewTable::slotDropped(QDropEvent *ev) +KexiRelationViewTable::slotDropped(TQDropEvent *ev) { - QListViewItem *recever = itemAt(ev->pos() - QPoint(0,contentsY())); + TQListViewItem *recever = itemAt(ev->pos() - TQPoint(0,contentsY())); if (!recever || !KexiFieldDrag::canDecodeSingle(ev)) { ev->ignore(); return; } - QString sourceMimeType; - QString srcTable; - QString srcField; + TQString sourceMimeType; + TQString srcTable; + TQString srcField; if (!KexiFieldDrag::decodeSingle(ev,sourceMimeType,srcTable,srcField)) return; if (sourceMimeType!="kexi/table" && sourceMimeType=="kexi/query") return; // kdDebug() << "KexiRelationViewTable::slotDropped() srcfield: " << srcField << endl; - QString rcvField = recever->text(0); + TQString rcvField = recever->text(0); SourceConnection s; s.masterTable = srcTable; @@ -408,22 +408,22 @@ KexiRelationViewTable::slotContentsMoving(int,int) emit tableScrolling(); } -void KexiRelationViewTable::contentsMousePressEvent(QMouseEvent *ev) +void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev) { - parentWidget()->setFocus(); + tqparentWidget()->setFocus(); setFocus(); KListView::contentsMousePressEvent(ev); // if (ev->button()==Qt::RightButton) -// static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos()); +// static_cast<KexiRelationView*>(tqparentWidget())->executePopup(ev->pos()); } -QRect KexiRelationViewTable::drawItemHighlighter(QPainter *painter, QListViewItem *item) +TQRect KexiRelationViewTable::drawItemHighlighter(TQPainter *painter, TQListViewItem *item) { if (painter) { - style().drawPrimitive(QStyle::PE_FocusRect, painter, itemRect(item), colorGroup(), - QStyle::Style_FocusAtBorder); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, painter, tqitemRect(item), tqcolorGroup(), + TQStyle::Style_FocusAtBorder); } - return itemRect(item); + return tqitemRect(item); } #include "kexirelationviewtable.moc" diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h index cc90e16d..deabc2e0 100644 --- a/kexi/widget/relations/kexirelationviewtable.h +++ b/kexi/widget/relations/kexirelationviewtable.h @@ -21,9 +21,9 @@ #ifndef KEXIRELATIONVIEWTABLE_H #define KEXIRELATIONVIEWTABLE_H -#include <qframe.h> -#include <qstringlist.h> -#include <qlabel.h> +#include <tqframe.h> +#include <tqstringlist.h> +#include <tqlabel.h> #include <klistview.h> #include <widget/kexifieldlistview.h> @@ -37,18 +37,19 @@ namespace KexiDB class TableOrQuerySchema; } -class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public QFrame +class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame { Q_OBJECT + TQ_OBJECT public: -// KexiRelationViewTableContainer(KexiRelationView *parent, KexiDB::TableSchema *t); +// KexiRelationViewTableContainer(KexiRelationView *tqparent, KexiDB::TableSchema *t); KexiRelationViewTableContainer( - KexiRelationView *parent, KexiDB::TableOrQuerySchema *schema); + KexiRelationView *tqparent, KexiDB::TableOrQuerySchema *schema); virtual ~KexiRelationViewTableContainer(); - int globalY(const QString &field); + int globalY(const TQString &field); // KexiDB::TableSchema *table(); KexiRelationViewTable* tableView() const { return m_tableView; } @@ -61,7 +62,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public QFrame void moved(KexiRelationViewTableContainer *); void endDrag(); void gotFocus(); - void contextMenuRequest(const QPoint& pos); + void contextMenuRequest(const TQPoint& pos); public slots: virtual void setFocus(); @@ -69,7 +70,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public QFrame protected slots: void moved(); - void slotContextMenu(KListView *lv, QListViewItem *i, const QPoint& p); + void slotContextMenu(KListView *lv, TQListViewItem *i, const TQPoint& p); protected: // KexiDB::TableSchema *m_table; @@ -84,53 +85,55 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public QFrame class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public KListViewItem { public: - KexiRelationViewTableItem(QListView *parent, QListViewItem *after, - QString key, QString field); - virtual void paintFocus ( QPainter * p, const QColorGroup & cg, const QRect & r ); + KexiRelationViewTableItem(TQListView *tqparent, TQListViewItem *after, + TQString key, TQString field); + virtual void paintFocus ( TQPainter * p, const TQColorGroup & cg, const TQRect & r ); };*/ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTable : public KexiFieldListView { Q_OBJECT + TQ_OBJECT public: KexiRelationViewTable(KexiDB::TableOrQuerySchema* tableOrQuerySchema, - KexiRelationView *view, QWidget *parent, const char *name = 0); -// KexiRelationViewTable(QWidget *parent, KexiRelationView *view, KexiDB::TableSchema *t, const char *name=0); + KexiRelationView *view, TQWidget *tqparent, const char *name = 0); +// KexiRelationViewTable(TQWidget *tqparent, KexiRelationView *view, KexiDB::TableSchema *t, const char *name=0); virtual ~KexiRelationViewTable(); // KexiDB::TableSchema *table() const { return m_table; }; - int globalY(const QString &item); + int globalY(const TQString &item); // void setReadOnly(bool); - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; signals: void tableScrolling(); protected slots: - void slotDropped(QDropEvent *e); + void slotDropped(TQDropEvent *e); void slotContentsMoving(int, int); -// void slotItemDoubleClicked( QListViewItem *i, const QPoint &, int ); +// void slotItemDoubleClicked( TQListViewItem *i, const TQPoint &, int ); protected: - virtual void contentsMousePressEvent( QMouseEvent * e ); - virtual bool acceptDrag(QDropEvent *e) const; -//moved virtual QDragObject *dragObject(); - virtual QRect drawItemHighlighter(QPainter *painter, QListViewItem *item); + virtual void contentsMousePressEvent( TQMouseEvent * e ); + virtual bool acceptDrag(TQDropEvent *e) const; +//moved virtual TQDragObject *dragObject(); + virtual TQRect drawItemHighlighter(TQPainter *painter, TQListViewItem *item); private: -// QStringList m_fieldList; +// TQStringList m_fieldList; // KexiDB::TableSchema *m_table; KexiRelationView *m_view; -// QPixmap m_keyIcon, m_noIcon; +// TQPixmap m_keyIcon, m_noIcon; }; -class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainerHeader : public QLabel +class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainerHeader : public TQLabel { Q_OBJECT + TQ_OBJECT public: - KexiRelationViewTableContainerHeader(const QString& text,QWidget *parent); + KexiRelationViewTableContainerHeader(const TQString& text,TQWidget *tqparent); virtual ~KexiRelationViewTableContainerHeader(); virtual void setFocus(); @@ -141,9 +144,9 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainerHeader : public QLa void endDrag(); protected: - bool eventFilter(QObject *obj, QEvent *ev); - void mousePressEvent(QMouseEvent *ev); - void mouseReleaseEvent(QMouseEvent *ev); + bool eventFilter(TQObject *obj, TQEvent *ev); + void mousePressEvent(TQMouseEvent *ev); + void mouseReleaseEvent(TQMouseEvent *ev); bool m_dragging; int m_grabX; @@ -151,7 +154,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainerHeader : public QLa int m_offsetX; int m_offsetY; - QColor m_activeBG, m_activeFG, m_inactiveBG, m_inactiveFG; + TQColor m_activeBG, m_activeFG, m_inactiveBG, m_inactiveFG; }; #endif diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 14ec4ce0..7ef5a961 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -21,10 +21,10 @@ #include "kexirelationwidget.h" -#include <qlayout.h> -#include <qlistbox.h> -#include <qpushbutton.h> -#include <qtimer.h> +#include <tqlayout.h> +#include <tqlistbox.h> +#include <tqpushbutton.h> +#include <tqtimer.h> #include <kcombobox.h> #include <klocale.h> @@ -41,31 +41,31 @@ #include "kexirelationviewtable.h" #include "kexirelationviewconnection.h" -KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, QWidget *parent, +KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, const char *name) - : KexiViewBase(win, parent, name) + : KexiViewBase(win, tqparent, name) , m_win(win) { m_conn = m_win->project()->dbConnection(); - QHBoxLayout *hlyr = new QHBoxLayout(0); - QGridLayout *g = new QGridLayout(this); + TQHBoxLayout *hlyr = new TQHBoxLayout(0); + TQGridLayout *g = new TQGridLayout(this); g->addLayout( hlyr, 0, 0 ); m_tableCombo = new KComboBox(this, "tables_combo"); - m_tableCombo->setMinimumWidth(QFontMetrics(font()).width("w")*20); - QLabel *lbl = new QLabel(m_tableCombo, i18n("Table")+": ", this); + m_tableCombo->setMinimumWidth(TQFontMetrics(font()).width("w")*20); + TQLabel *lbl = new TQLabel(m_tableCombo, i18n("Table")+": ", this); lbl->setIndent(3); - m_tableCombo->setInsertionPolicy(QComboBox::NoInsertion); + m_tableCombo->setInsertionPolicy(TQComboBox::NoInsertion); hlyr->addWidget(lbl); hlyr->addWidget(m_tableCombo); - m_tableCombo->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred)); + m_tableCombo->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred)); fillTablesCombo(); m_btnAdd = new KPushButton(i18n("&Add"), this); hlyr->addWidget(m_btnAdd); hlyr->addStretch(1); - connect(m_btnAdd, SIGNAL(clicked()), this, SLOT(slotAddTable())); + connect(m_btnAdd, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotAddTable())); m_relationView = new KexiRelationView(this, "relation_view"); setViewWidget(m_relationView); @@ -75,50 +75,50 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, QWidget *parent, //actions m_tableQueryPopup = new KPopupMenu(this, "m_popup"); m_tableQueryPopupTitleID = m_tableQueryPopup->insertTitle(SmallIcon("table"), ""); - connect(m_tableQueryPopup, SIGNAL(aboutToShow()), this, SLOT(aboutToShowPopupMenu())); + connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); m_connectionPopup = new KPopupMenu(this, "m_connectionPopup"); m_connectionPopupTitleID = m_connectionPopup->insertTitle(""); - connect(m_connectionPopup, SIGNAL(aboutToShow()), this, SLOT(aboutToShowPopupMenu())); + connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu())); m_areaPopup = new KPopupMenu(this, "m_areaPopup"); m_openSelectedTableAction = new KAction(i18n("&Open Table"), SmallIcon("fileopen"), KShortcut(), - this, SLOT(openSelectedTable()), this, "relationsview_openTable"); + TQT_TQOBJECT(this), TQT_SLOT(openSelectedTable()), TQT_TQOBJECT(this), "relationsview_openTable"); m_openSelectedTableAction->plug( m_tableQueryPopup ); m_designSelectedTableAction = new KAction(i18n("&Design Table"), SmallIcon("edit"), KShortcut(), - this, SLOT(designSelectedTable()), this, "relationsview_designTable"); + TQT_TQOBJECT(this), TQT_SLOT(designSelectedTable()), TQT_TQOBJECT(this), "relationsview_designTable"); m_designSelectedTableAction->plug( m_tableQueryPopup ); m_tableQueryPopup->insertSeparator(); KAction* hide_action = plugSharedAction("edit_delete", i18n("&Hide Table"), m_tableQueryPopup); - hide_action->setIconSet(QIconSet()); + hide_action->setIconSet(TQIconSet()); plugSharedAction("edit_delete",m_connectionPopup); - plugSharedAction("edit_delete",this, SLOT(removeSelectedObject())); - - connect(m_relationView, SIGNAL(tableViewGotFocus()), - this, SLOT(tableViewGotFocus())); - connect(m_relationView, SIGNAL(connectionViewGotFocus()), - this, SLOT(connectionViewGotFocus())); - connect(m_relationView, SIGNAL(emptyAreaGotFocus()), - this, SLOT(emptyAreaGotFocus())); - connect(m_relationView, SIGNAL(tableContextMenuRequest( const QPoint& )), - this, SLOT(tableContextMenuRequest( const QPoint& ))); - connect(m_relationView, SIGNAL(connectionContextMenuRequest( const QPoint& )), - this, SLOT(connectionContextMenuRequest( const QPoint& ))); - connect(m_relationView, SIGNAL(tableHidden(KexiDB::TableSchema&)), - this, SLOT(slotTableHidden(KexiDB::TableSchema&))); - connect(m_relationView, SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), - this, SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); - connect(m_relationView, SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), - this, SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); + plugSharedAction("edit_delete",TQT_TQOBJECT(this), TQT_SLOT(removeSelectedObject())); + + connect(m_relationView, TQT_SIGNAL(tableViewGotFocus()), + TQT_TQOBJECT(this), TQT_SLOT(tableViewGotFocus())); + connect(m_relationView, TQT_SIGNAL(connectionViewGotFocus()), + TQT_TQOBJECT(this), TQT_SLOT(connectionViewGotFocus())); + connect(m_relationView, TQT_SIGNAL(emptyAreaGotFocus()), + TQT_TQOBJECT(this), TQT_SLOT(emptyAreaGotFocus())); + connect(m_relationView, TQT_SIGNAL(tableContextMenuRequest( const TQPoint& )), + TQT_TQOBJECT(this), TQT_SLOT(tableContextMenuRequest( const TQPoint& ))); + connect(m_relationView, TQT_SIGNAL(connectionContextMenuRequest( const TQPoint& )), + TQT_TQOBJECT(this), TQT_SLOT(connectionContextMenuRequest( const TQPoint& ))); + connect(m_relationView, TQT_SIGNAL(tableHidden(KexiDB::TableSchema&)), + TQT_TQOBJECT(this), TQT_SLOT(slotTableHidden(KexiDB::TableSchema&))); + connect(m_relationView, TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*)), + TQT_TQOBJECT(this), TQT_SIGNAL(tablePositionChanged(KexiRelationViewTableContainer*))); + connect(m_relationView, TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*)), + TQT_TQOBJECT(this), TQT_SIGNAL(aboutConnectionRemove(KexiRelationViewConnection*))); #if 0 if(!embedd) { /*todo setContextHelp(i18n("Relations"), i18n("To create a relationship simply drag the source field onto the target field. " - "An arrowhead is used to show which table is the parent (master) and which table is the child (slave) in the relationship."));*/ + "An arrowhead is used to show which table is the tqparent (master) and which table is the child (slave) in the relationship."));*/ } #endif // else @@ -126,10 +126,10 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, QWidget *parent, #ifdef TESTING_KexiRelationWidget for (int i=0;i<(int)m_db->tableNames().count();i++) - QTimer::singleShot(100,this,SLOT(slotAddTable())); + TQTimer::singleShot(100,this,TQT_SLOT(slotAddTable())); #endif - invalidateActions(); + tqinvalidateActions(); } KexiRelationWidget::~KexiRelationWidget() @@ -141,9 +141,9 @@ TablesDict* KexiRelationWidget::tables() const return m_relationView->tables(); } -KexiRelationViewTableContainer* KexiRelationWidget::table(const QString& name) const +KexiRelationViewTableContainer* KexiRelationWidget::table(const TQString& name) const { - return m_relationView->tables()->find( name ); + return m_relationView->tables()->tqfind( name ); } const ConnectionList* KexiRelationWidget::connections() const @@ -156,13 +156,13 @@ KexiRelationWidget::slotAddTable() { if (m_tableCombo->currentItem()==-1) return; - QString tname = m_tableCombo->text(m_tableCombo->currentItem()); + TQString tname = m_tableCombo->text(m_tableCombo->currentItem()); KexiDB::TableSchema *t = m_conn->tableSchema(tname); addTable(t); } void -KexiRelationWidget::addTable(KexiDB::TableSchema *t, const QRect &rect) +KexiRelationWidget::addTable(KexiDB::TableSchema *t, const TQRect &rect) { if (!t) return; @@ -171,11 +171,11 @@ KexiRelationWidget::addTable(KexiDB::TableSchema *t, const QRect &rect) kdDebug() << "KexiRelationWidget::slotAddTable(): adding table " << t->name() << endl; if (!c) return; - connect(c->tableView(), SIGNAL(doubleClicked(QListViewItem*,const QPoint&,int)), - this, SLOT(slotTableFieldDoubleClicked(QListViewItem*,const QPoint&,int))); + connect(c->tableView(), TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)), + TQT_TQOBJECT(this), TQT_SLOT(slotTableFieldDoubleClicked(TQListViewItem*,const TQPoint&,int))); } - const QString tname = t->name().lower(); + const TQString tname = t->name().lower(); const int count = m_tableCombo->count(); int i = 0; for (; i < count; i++ ) { @@ -207,7 +207,7 @@ KexiRelationWidget::addConnection(const SourceConnection& conn) } void -KexiRelationWidget::addTable(const QString& t) +KexiRelationWidget::addTable(const TQString& t) { for(int i=0; i < m_tableCombo->count(); i++) { @@ -221,53 +221,53 @@ KexiRelationWidget::addTable(const QString& t) void KexiRelationWidget::tableViewGotFocus() { -// if (m_relationView->focusedTableView == sender()) +// if (m_relationView->focusedTableView == TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))) // return; // kdDebug() << "GOT FOCUS!" <<endl; // clearSelection(); // if (m_focusedTableView) // m_focusedTableView->unsetFocus(); -// m_focusedTableView = (KexiRelationViewTableContainer*)sender(); - invalidateActions(); +// m_focusedTableView = (KexiRelationViewTableContainer*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + tqinvalidateActions(); } void KexiRelationWidget::connectionViewGotFocus() { - invalidateActions(); + tqinvalidateActions(); } void KexiRelationWidget::emptyAreaGotFocus() { - invalidateActions(); + tqinvalidateActions(); } -void KexiRelationWidget::tableContextMenuRequest(const QPoint& pos) +void KexiRelationWidget::tableContextMenuRequest(const TQPoint& pos) { - invalidateActions(); + tqinvalidateActions(); executePopup( pos ); } -void KexiRelationWidget::connectionContextMenuRequest(const QPoint& pos) +void KexiRelationWidget::connectionContextMenuRequest(const TQPoint& pos) { - invalidateActions(); + tqinvalidateActions(); executePopup( pos ); // m_connectionPopup->exec(pos); } -void KexiRelationWidget::emptyAreaContextMenuRequest( const QPoint& /*pos*/ ) +void KexiRelationWidget::emptyAreaContextMenuRequest( const TQPoint& /*pos*/ ) { - invalidateActions(); + tqinvalidateActions(); //TODO } -void KexiRelationWidget::invalidateActions() +void KexiRelationWidget::tqinvalidateActions() { setAvailable("edit_delete", m_relationView->selectedConnection() || m_relationView->focusedTableView()); } -void KexiRelationWidget::executePopup( QPoint pos ) +void KexiRelationWidget::executePopup( TQPoint pos ) { - if (pos==QPoint(-1,-1)) { + if (pos==TQPoint(-1,-1)) { pos = mapToGlobal( m_relationView->focusedTableView() ? m_relationView->focusedTableView()->pos() + m_relationView->focusedTableView()->rect().center() : rect().center() ); } @@ -302,14 +302,14 @@ void KexiRelationWidget::designSelectedTable() Kexi::DesignViewMode, openingCancelled); } -QSize KexiRelationWidget::sizeHint() const +TQSize KexiRelationWidget::tqsizeHint() const { - return m_relationView->sizeHint(); + return m_relationView->tqsizeHint(); } void KexiRelationWidget::slotTableHidden(KexiDB::TableSchema &table) { - const QString &t = table.name().lower(); + const TQString &t = table.name().lower(); int i; for (i=0; i<m_tableCombo->count() && t > m_tableCombo->text(i).lower(); i++) ; @@ -328,7 +328,7 @@ void KexiRelationWidget::aboutToShowPopupMenu() /*! @todo what about query? */ if (m_relationView->focusedTableView() && m_relationView->focusedTableView()->schema()->table()) { m_tableQueryPopup->changeTitle(m_tableQueryPopupTitleID, SmallIcon("table"), - QString(m_relationView->focusedTableView()->schema()->name()) + " : " + i18n("Table")); + TQString(m_relationView->focusedTableView()->schema()->name()) + " : " + i18n("Table")); } else if (m_relationView->selectedConnection()) { m_connectionPopup->changeTitle( m_connectionPopupTitleID, @@ -337,12 +337,12 @@ void KexiRelationWidget::aboutToShowPopupMenu() } void -KexiRelationWidget::slotTableFieldDoubleClicked(QListViewItem *i,const QPoint&,int) +KexiRelationWidget::slotTableFieldDoubleClicked(TQListViewItem *i,const TQPoint&,int) { - if (!sender()->isA("KexiRelationViewTable")) + if (!TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->isA("KexiRelationViewTable")) return; - const KexiRelationViewTable* t = static_cast<const KexiRelationViewTable*>(sender()); - const QStringList selectedFieldNames( t->selectedFieldNames() ); + const KexiRelationViewTable* t = static_cast<const KexiRelationViewTable*>(TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + const TQStringList selectedFieldNames( t->selectedFieldNames() ); if (selectedFieldNames.count()==1) emit tableFieldDoubleClicked( t->schema()->table(), selectedFieldNames.first() ); } @@ -364,26 +364,26 @@ void KexiRelationWidget::fillTablesCombo() { m_tableCombo->clear(); - QStringList tmp = m_conn->tableNames(); + TQStringList tmp = m_conn->tableNames(); tmp.sort(); m_tableCombo->insertStringList(tmp); } void -KexiRelationWidget::objectCreated(const QCString &mime, const QCString& name) +KexiRelationWidget::objectCreated(const TQCString &mime, const TQCString& name) { if (mime=="kexi/table" || mime=="kexi/query") { //! @todo query? - m_tableCombo->insertItem(QString(name)); + m_tableCombo->insertItem(TQString(name)); m_tableCombo->listBox()->sort(); } } void -KexiRelationWidget::objectDeleted(const QCString &mime, const QCString& name) +KexiRelationWidget::objectDeleted(const TQCString &mime, const TQCString& name) { if (mime=="kexi/table" || mime=="kexi/query") { - QString strName(name); + TQString strName(name); for (int i=0; i<m_tableCombo->count(); i++) { //! @todo query? if (m_tableCombo->text(i)==strName) { @@ -401,14 +401,14 @@ KexiRelationWidget::objectDeleted(const QCString &mime, const QCString& name) } void -KexiRelationWidget::objectRenamed(const QCString &mime, const QCString& name, const QCString& newName) +KexiRelationWidget::objectRenamed(const TQCString &mime, const TQCString& name, const TQCString& newName) { if (mime=="kexi/table" || mime=="kexi/query") { - QString strName(name); + TQString strName(name); for (int i=0; i<m_tableCombo->count(); i++) { //! @todo query? if (m_tableCombo->text(i)==strName) { - m_tableCombo->changeItem(QString(newName), i); + m_tableCombo->changeItem(TQString(newName), i); m_tableCombo->listBox()->sort(); break; } diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h index 3beb0b34..869dbf11 100644 --- a/kexi/widget/relations/kexirelationwidget.h +++ b/kexi/widget/relations/kexirelationwidget.h @@ -21,7 +21,7 @@ #ifndef KEXIRELATIONWIDGET_H #define KEXIRELATIONWIDGET_H -//#include <qwidget.h> +//#include <tqwidget.h> //#include "kexiactionproxy.h" #include "kexiviewbase.h" #include "kexirelationview.h" @@ -30,7 +30,7 @@ class KComboBox; class KPushButton; class KPopupMenu; class KAction; -class QListViewItem; +class TQListViewItem; class KexiMainWindow; @@ -44,40 +44,41 @@ namespace KexiDB class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase { Q_OBJECT + TQ_OBJECT public: - KexiRelationWidget(KexiMainWindow *win, QWidget *parent, const char *name=0); + KexiRelationWidget(KexiMainWindow *win, TQWidget *tqparent, const char *name=0); virtual ~KexiRelationWidget(); //! \return a dictionary of added tables TablesDict* tables() const; - KexiRelationViewTableContainer* table(const QString& name) const; + KexiRelationViewTableContainer* table(const TQString& name) const; const ConnectionList* connections() const; // KexiRelationView *relationView() const { return m_relationView; } - void addTable(const QString& t); + void addTable(const TQString& t); // void openTable(KexiDB::TableSchema* table, bool designMode); - virtual QSize sizeHint() const; + virtual TQSize tqsizeHint() const; /*! Used to add newly created object information to the combo box. */ - void objectCreated(const QCString &mime, const QCString& name); - void objectDeleted(const QCString &mime, const QCString& name); - void objectRenamed(const QCString &mime, const QCString& name, const QCString& newName); + void objectCreated(const TQCString &mime, const TQCString& name); + void objectDeleted(const TQCString &mime, const TQCString& name); + void objectRenamed(const TQCString &mime, const TQCString& name, const TQCString& newName); signals: void tableAdded(KexiDB::TableSchema& t); void tableHidden(KexiDB::TableSchema& t); void tablePositionChanged(KexiRelationViewTableContainer*); void aboutConnectionRemove(KexiRelationViewConnection*); - void tableFieldDoubleClicked( KexiDB::TableSchema* table, const QString& fieldName ); + void tableFieldDoubleClicked( KexiDB::TableSchema* table, const TQString& fieldName ); public slots: /*! Adds a table \a t to the area. This changes only visual representation. - If \a rect is valid, table widget rgeometry will be initialized. + If \a rect is valid, table widget rtqgeometry will be initialized. */ - void addTable(KexiDB::TableSchema *t, const QRect &rect = QRect()); + void addTable(KexiDB::TableSchema *t, const TQRect &rect = TQRect()); //! Adds a connection \a con to the area. This changes only visual representation. void addConnection(const SourceConnection& conn); @@ -98,23 +99,23 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase void tableViewGotFocus(); void connectionViewGotFocus(); void emptyAreaGotFocus(); - void tableContextMenuRequest(const QPoint& pos); - void connectionContextMenuRequest(const QPoint& pos); - void emptyAreaContextMenuRequest( const QPoint& pos ); + void tableContextMenuRequest(const TQPoint& pos); + void connectionContextMenuRequest(const TQPoint& pos); + void emptyAreaContextMenuRequest( const TQPoint& pos ); void openSelectedTable(); void designSelectedTable(); void slotTableHidden(KexiDB::TableSchema &table); void aboutToShowPopupMenu(); - void slotTableFieldDoubleClicked(QListViewItem *i,const QPoint&,int); + void slotTableFieldDoubleClicked(TQListViewItem *i,const TQPoint&,int); protected: /*! executes popup menu at \a pos, or, if \a pos not specified: at center of selected table view (if any selected), or at center point of the relations view. */ - void executePopup( QPoint pos = QPoint(-1,-1) ); + void executePopup( TQPoint pos = TQPoint(-1,-1) ); //! Invalidates all actions availability. - void invalidateActions(); + void tqinvalidateActions(); //! Fills table's combo box with all available table names. void fillTablesCombo(); |