diff options
Diffstat (limited to 'kexi/formeditor/connectiondialog.cpp')
| -rw-r--r-- | kexi/formeditor/connectiondialog.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp index 3fe0ac61..f683ce74 100644 --- a/kexi/formeditor/connectiondialog.cpp +++ b/kexi/formeditor/connectiondialog.cpp @@ -18,7 +18,7 @@ * Boston, MA 02110-1301, USA. */ -#include <layout.h> +#include <tqlayout.h> #include <tqhbox.h> #include <tqlabel.h> #include <tqregexp.h> @@ -51,7 +51,7 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) , m_buffer(0) { TQFrame *frame = makeMainWidget(); - TQHBoxLayout *layout = new TQHBoxLayout(frame, 0, 6); + TQHBoxLayout *tqlayout = new TQHBoxLayout(frame, 0, 6); // Setup the details widget ///////// TQHBox *details = new TQHBox(frame); @@ -60,10 +60,10 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) m_pixmapLabel = new TQLabel(details); m_pixmapLabel->setFixedWidth( int(IconSize(KIcon::Desktop) * 1.5) ); - m_pixmapLabel->setAlignment(AlignHCenter | AlignTop); + m_pixmapLabel->tqsetAlignment(AlignHCenter | AlignTop); m_textLabel = new TQLabel(details); - m_textLabel->setAlignment(AlignLeft | AlignTop); + m_textLabel->tqsetAlignment(AlignLeft | AlignTop); //setStatusOk(); // And the KexiTableView //////// @@ -74,21 +74,21 @@ ConnectionDialog::ConnectionDialog(TQWidget *parent) initTable(); m_table->setData(m_data, false); m_table->adjustColumnWidthToContents(0); - layout->addWidget(m_table); + tqlayout->addWidget(m_table); //// Setup the icon toolbar ///////////////// - TQVBoxLayout *vlayout = new TQVBoxLayout(layout, 3); + TQVBoxLayout *vtqlayout = new TQVBoxLayout(tqlayout, 3); KPushButton *newItem = new KPushButton(SmallIconSet("filenew"), i18n("&New Connection"), frame); - vlayout->addWidget(newItem); + vtqlayout->addWidget(newItem); m_buttons.insert(BAdd, newItem); connect(newItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(newItem())); KPushButton *delItem = new KPushButton(SmallIconSet("editdelete"), i18n("&Remove Connection"), frame); - vlayout->addWidget(delItem); + vtqlayout->addWidget(delItem); m_buttons.insert(BRemove, delItem); connect(delItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeItem())); - vlayout->addStretch(); + vtqlayout->addStretch(); setInitialSize(TQSize(600, 300)); //setWFlags(WDestructiveClose); @@ -289,7 +289,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item) TQString signalArg(signal); signalArg = signalArg.remove( TQRegExp(".*[(]|[)]") ); - TQStrList slotList = tree->widget()->metaObject()->slotNames(true); + TQStrList slotList = tree->widget()->tqmetaObject()->slotNames(true); TQStrListIterator it(slotList); for(; it.current() != 0; ++it) { @@ -297,7 +297,7 @@ ConnectionDialog::updateSlotList(KexiTableItem *item) TQString slotArg(*it); slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") ); - if(!signalArg.startsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible + if(!signalArg.tqstartsWith(slotArg, true) && (!signal.isEmpty())) // args not compatible continue; KexiTableItem *item = m_slotsColumnData->createItem(); //new KexiTableItem(2); @@ -315,7 +315,7 @@ ConnectionDialog::updateSignalList(KexiTableItem *item) return; m_signalsColumnData->deleteAllRows(); - TQStrList signalList = tree->widget()->metaObject()->signalNames(true); + TQStrList signalList = tree->widget()->tqmetaObject()->signalNames(true); TQStrListIterator it(signalList); for(; it.current() != 0; ++it) { @@ -334,7 +334,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item) { if( !item || (*item)[i].toString().isEmpty()) { - setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").arg(m_data->column(i)->captionAliasOrName()), + setStatusError( i18n("<qt>You have not selected item: <b>%1</b>.</qt>").tqarg(m_data->column(i)->captionAliasOrName()), item); return; } @@ -346,7 +346,7 @@ ConnectionDialog::checkConnection(KexiTableItem *item) TQString slot = (*item)[4].toString(); slot = slot.remove( TQRegExp(".*[(]|[)]") ); - if(!signal.startsWith(slot, true)) + if(!signal.tqstartsWith(slot, true)) { setStatusError( i18n("The signal/slot arguments are not compatible."), item); return; |