diff options
Diffstat (limited to 'kexi/main/startup')
| -rw-r--r-- | kexi/main/startup/KexiConnSelector.cpp | 30 | ||||
| -rw-r--r-- | kexi/main/startup/KexiNewProjectWizard.cpp | 32 | ||||
| -rw-r--r-- | kexi/main/startup/KexiProjectSelector.cpp | 14 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartup.cpp | 20 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupDialog.cpp | 42 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupDialogTemplatesPage.cpp | 4 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupFileDialog_win.cpp | 72 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartup_p.cpp | 8 |
8 files changed, 111 insertions, 111 deletions
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 25305e1a..360b7031 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -119,7 +119,7 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, // TQLabel* lbl = new TQLabel(i18n("<b>Select existing Kexi project to open:</b>"), openExistingWidget); // openExistingWidgetLyr->addWidget( lbl ); d->prjTypeSelector = new KexiPrjTypeSelector( d->openExistingWidget ); - connect(d->prjTypeSelector->buttonGroup,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotPrjTypeSelected(int))); + connect(d->prjTypeSelector->buttonGroup,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotPrjTypeSelected(int))); openExistingWidgetLyr->addWidget( d->prjTypeSelector ); openExistingWidgetLyr->addSpacing( KDialogBase::spacingHint() ); TQFrame* line = new TQFrame( d->openExistingWidget, "line" ); @@ -136,28 +136,28 @@ KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, m_fileDlg = 0; // addWidget(m_file); -// connect(m_file->btn_advanced,TQT_SIGNAL(clicked()),this,TQT_SLOT(showAdvancedConn())); +// connect(m_file->btn_advanced,TQ_SIGNAL(clicked()),this,TQ_SLOT(showAdvancedConn())); m_remote = new KexiConnSelectorBase(d->stack, "conn_sel"); m_remote->icon->setPixmap( DesktopIcon("network") ); m_remote->icon->setFixedSize( m_remote->icon->pixmap()->size() ); // m_remote->btn_back->setIconSet( SmallIconSet("1uparrow") ); - connect(m_remote->btn_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteAddBtnClicked())); - connect(m_remote->btn_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteEditBtnClicked())); - connect(m_remote->btn_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoteRemoveBtnClicked())); + connect(m_remote->btn_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteAddBtnClicked())); + connect(m_remote->btn_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteEditBtnClicked())); + connect(m_remote->btn_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoteRemoveBtnClicked())); TQToolTip::add(m_remote->btn_add, i18n("Add a new database connection")); TQToolTip::add(m_remote->btn_edit, i18n("Edit selected database connection")); TQToolTip::add(m_remote->btn_remove, i18n("Remove selected database connections")); d->stack->addWidget(m_remote); if (m_remote->layout()) m_remote->layout()->setMargin(0); -// connect(m_remote->btn_back,TQT_SIGNAL(clicked()),this,TQT_SLOT(showSimpleConn())); - connect(m_remote->list,TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); - connect(m_remote->list,TQT_SIGNAL(returnPressed(TQListViewItem*)), - this,TQT_SLOT(slotConnectionItemExecuted(TQListViewItem*))); - connect(m_remote->list,TQT_SIGNAL(selectionChanged()), - this,TQT_SLOT(slotConnectionSelectionChanged())); +// connect(m_remote->btn_back,TQ_SIGNAL(clicked()),this,TQ_SLOT(showSimpleConn())); + connect(m_remote->list,TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this,TQ_SLOT(slotConnectionItemExecuted(TQListViewItem*))); + connect(m_remote->list,TQ_SIGNAL(returnPressed(TQListViewItem*)), + this,TQ_SLOT(slotConnectionItemExecuted(TQListViewItem*))); + connect(m_remote->list,TQ_SIGNAL(selectionChanged()), + this,TQ_SLOT(slotConnectionSelectionChanged())); } KexiConnSelectorWidget::~KexiConnSelectorWidget() @@ -167,7 +167,7 @@ KexiConnSelectorWidget::~KexiConnSelectorWidget() /*void KexiConnSelectorWidget::disconnectShowSimpleConnButton() { - m_remote->btn_back->disconnect(this,TQT_SLOT(showSimpleConn())); + m_remote->btn_back->disconnect(this,TQ_SLOT(showSimpleConn())); }*/ void KexiConnSelectorWidget::showAdvancedConn() @@ -228,9 +228,9 @@ void KexiConnSelectorWidget::showSimpleConn() for (TQWidget *w = parentWidget(true);w;w=w->parentWidget(true)) { if (w->isDialog()) { //#ifndef TQ_WS_WIN - connect(m_fileDlg,TQT_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQT_SLOT(reject())); + connect(m_fileDlg,TQ_SIGNAL(rejected()),static_cast<TQDialog*>(w),TQ_SLOT(reject())); //#endif -// connect(m_fileDlg,TQT_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQT_SLOT(reject())); +// connect(m_fileDlg,TQ_SIGNAL(cancelled()),static_cast<TQDialog*>(w),TQ_SLOT(reject())); break; } } diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 2b1f4026..e97532b3 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -123,9 +123,9 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, // d->chk_server_txt = i18n("Always &use database server for creating new projects.") // +"\n"+txt_dns; - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(executed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotLvTypesExecuted(TQListViewItem*))); - connect(m_prjtype_sel->lv_types,TQT_SIGNAL(selectionChanged( TQListViewItem*)),this,TQT_SLOT(slotLvTypesSelected(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(executed(TQListViewItem*)),this,TQ_SLOT(slotLvTypesExecuted(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotLvTypesExecuted(TQListViewItem*))); + connect(m_prjtype_sel->lv_types,TQ_SIGNAL(selectionChanged( TQListViewItem*)),this,TQ_SLOT(slotLvTypesSelected(TQListViewItem*))); // static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertWidget(1,d->m_prjtype_sel->lv_types); // static_cast<TQVBoxLayout*>(m_prjtype_sel->layout())->insertStretch(3,1); @@ -167,26 +167,26 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set, m_conn_sel->m_fileDlg->setMode( KexiStartupFileDialog::SavingFileBasedDB ); // m_conn_sel->m_fileDlg->setMode( KFile::LocalOnly | KFile::File ); // m_conn_sel->m_fileDlg->setOperationMode( KFileDialog::Saving ); -////js connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(rejected()),this,TQT_SLOT(reject())); -// connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(fileHighlighted(const TQString&)),this,TQT_SLOT(slotFileHighlighted(const TQString&))); - connect(m_conn_sel->m_fileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept())); +////js connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(rejected()),this,TQ_SLOT(reject())); +// connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(fileHighlighted(const TQString&)),this,TQ_SLOT(slotFileHighlighted(const TQString&))); + connect(m_conn_sel->m_fileDlg,TQ_SIGNAL(accepted()),this,TQ_SLOT(accept())); m_conn_sel->showAdvancedConn(); - connect(m_conn_sel,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,TQT_SLOT(next())); + connect(m_conn_sel,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQ_SLOT(next())); addPage(m_conn_sel_widget, i18n("Select Project's Location")); //page: server db name m_server_db_name = new KexiServerDBNamePage(this, "KexiServerDBNamePage"); d->server_db_name_dblist_lbl_txt = i18n("Existing project databases on <b>%1</b> database server:"); - connect(m_server_db_name->le_caption, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotServerDBCaptionTxtChanged(const TQString&))); - connect(m_server_db_name->le_dbname, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotServerDBNameTxtChanged(const TQString&))); - connect(m_server_db_name->le_caption, TQT_SIGNAL(returnPressed()), - this,TQT_SLOT(accept())); - connect(m_server_db_name->le_dbname, TQT_SIGNAL(returnPressed()), - this,TQT_SLOT(accept())); + connect(m_server_db_name->le_caption, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotServerDBCaptionTxtChanged(const TQString&))); + connect(m_server_db_name->le_dbname, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotServerDBNameTxtChanged(const TQString&))); + connect(m_server_db_name->le_caption, TQ_SIGNAL(returnPressed()), + this,TQ_SLOT(accept())); + connect(m_server_db_name->le_dbname, TQ_SIGNAL(returnPressed()), + this,TQ_SLOT(accept())); m_server_db_name->le_caption->setText(i18n("New database")); m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(this, "id_val")); m_project_selector = new KexiProjectSelectorWidget( diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index 8f7682a4..b31a7e49 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -121,9 +121,9 @@ KexiProjectSelectorWidget::KexiProjectSelectorWidget( //show projects setProjectSet( m_prj_set ); - connect(list,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*))); - connect(list,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemExecuted(TQListViewItem*))); - connect(list,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotItemSelected())); + connect(list,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(slotItemExecuted(TQListViewItem*))); + connect(list,TQ_SIGNAL(returnPressed(TQListViewItem*)),this,TQ_SLOT(slotItemExecuted(TQListViewItem*))); + connect(list,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotItemSelected())); } /*! @@ -267,10 +267,10 @@ void KexiProjectSelectorDialog::init(KexiProjectSet* prj_set, bool showProjectNa setIcon(*m_sel->icon()); m_sel->setFocus(); - connect(m_sel,TQT_SIGNAL(projectExecuted(KexiProjectData*)), - this,TQT_SLOT(slotProjectExecuted(KexiProjectData*))); - connect(m_sel,TQT_SIGNAL(selectionChanged(KexiProjectData*)), - this,TQT_SLOT(slotProjectSelectionChanged(KexiProjectData*))); + connect(m_sel,TQ_SIGNAL(projectExecuted(KexiProjectData*)), + this,TQ_SLOT(slotProjectExecuted(KexiProjectData*))); + connect(m_sel,TQ_SIGNAL(selectionChanged(KexiProjectData*)), + this,TQ_SLOT(slotProjectSelectionChanged(KexiProjectData*))); } KexiProjectData* KexiProjectSelectorDialog::selectedProjectData() const diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index f47d7da1..6e668b6c 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -162,8 +162,8 @@ KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionD setPrompt( msg ); if (showDetailsButton) { - connect( this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(slotShowConnectionDetails()) ); + connect( this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(slotShowConnectionDetails()) ); setButtonText(KDialogBase::User1, i18n("&Details")+ " >>"); } setButtonOK(KGuiItem(i18n("&Open"), "document-open")); @@ -388,8 +388,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (cdata.password.isEmpty()) { delete d->passwordDialog; d->passwordDialog = new KexiDBPasswordDialog(0, cdata, true); -// connect( d->passwordDialog, TQT_SIGNAL(user1Clicked()), -// this, TQT_SLOT(slotShowConnectionDetails()) ); +// connect( d->passwordDialog, TQ_SIGNAL(user1Clicked()), +// this, TQ_SLOT(slotShowConnectionDetails()) ); const int ret = d->passwordDialog->exec(); if (d->passwordDialog->showConnectionDetailsRequested() || ret == TQDialog::Accepted) { // if ( ret == TQDialog::Accepted ) { @@ -485,8 +485,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) } d->connDialog = new KexiDBConnectionDialog( *m_projectData, d->shortcutFile->fileName()); - connect(d->connDialog, TQT_SIGNAL(saveChanges()), - this, TQT_SLOT(slotSaveShortcutFileChanges())); + connect(d->connDialog, TQ_SIGNAL(saveChanges()), + this, TQ_SLOT(slotSaveShortcutFileChanges())); int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { //get (possibly changed) prj data @@ -522,8 +522,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) if (!d->connDialog) { d->connDialog = new KexiDBConnectionDialog( cdata, d->connShortcutFile->fileName()); - connect(d->connDialog, TQT_SIGNAL(saveChanges()), - this, TQT_SLOT(slotSaveShortcutFileChanges())); + connect(d->connDialog, TQ_SIGNAL(saveChanges()), + this, TQ_SLOT(slotSaveShortcutFileChanges())); } const int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { @@ -565,8 +565,8 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/) //let's show connection details, user asked for that in the "password dialog" if (d->passwordDialog && d->passwordDialog->showConnectionDetailsRequested()) { d->connDialog = new KexiDBConnectionDialog(*m_projectData); -// connect(d->connDialog->tabWidget->mainWidget, TQT_SIGNAL(saveChanges()), -// this, TQT_SLOT(slotSaveShortcutFileChanges())); +// connect(d->connDialog->tabWidget->mainWidget, TQ_SIGNAL(saveChanges()), +// this, TQ_SLOT(slotSaveShortcutFileChanges())); int res = d->connDialog->exec(); if (res == TQDialog::Accepted) { diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index c738d192..de382d2f 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -194,7 +194,7 @@ KexiStartupDialog::KexiStartupDialog( #endif if (!d->singlePage) { - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageShown(TQWidget*))); d->templatesWidget->setFocus(); } showPage(0); @@ -304,7 +304,7 @@ void KexiStartupDialog::setupPageTemplates() d->templatesWidget_IconListBox->installEventFilter(this); } lyr->addWidget(d->templatesWidget); - connect(d->templatesWidget, TQT_SIGNAL(aboutToShowPage(TQWidget*)), this, TQT_SLOT(slotPageShown(TQWidget*))); + connect(d->templatesWidget, TQ_SIGNAL(aboutToShowPage(TQWidget*)), this, TQ_SLOT(slotPageShown(TQWidget*))); if (d->dialogOptions & CheckBoxDoNotShowAgain) { d->chkDoNotShow = new TQCheckBox(i18n("Don't show me this dialog again"), d->pageTemplates, "chkDoNotShow"); @@ -348,21 +348,21 @@ void KexiStartupDialog::setupPageTemplates() d->viewTemplates = new KexiStartupDialogTemplatesPage( templPageFrame ); tmplyr->addWidget( d->viewTemplates ); - connect(d->viewTemplates,TQT_SIGNAL(selected(const TQString&)), - this,TQT_SLOT(templateSelected(const TQString&))); -/* connect(d->viewTemplates->templates,TQT_SIGNAL(returnPressed(TQIconViewItem*)), - this,TQT_SLOT(templateItemExecuted(TQIconViewItem*))); - connect(d->viewTemplates->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)), - this,TQT_SLOT(templateItemSelected(TQIconViewItem*)));*/ + connect(d->viewTemplates,TQ_SIGNAL(selected(const TQString&)), + this,TQ_SLOT(templateSelected(const TQString&))); +/* connect(d->viewTemplates->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)), + this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewTemplates->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)), + this,TQ_SLOT(templateItemSelected(TQIconViewItem*)));*/ /*later 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(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*))); - connect(d->viewPersonalTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewPersonalTempl->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),this,TQ_SLOT(templateItemSelected(TQIconViewItem*))); */ //- page "business db" @@ -374,9 +374,9 @@ void KexiStartupDialog::setupPageTemplates() tmplyr = new TQVBoxLayout(templPageFrame, 0, KDialogBase::spacingHint()); 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*))); - connect(d->viewBusinessTempl->templates,TQT_SIGNAL(currentChanged(TQIconViewItem*)),this,TQT_SLOT(templateItemSelected(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(doubleClicked(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(returnPressed(TQIconViewItem*)),this,TQ_SLOT(templateItemExecuted(TQIconViewItem*))); + connect(d->viewBusinessTempl->templates,TQ_SIGNAL(currentChanged(TQIconViewItem*)),this,TQ_SLOT(templateItemSelected(TQIconViewItem*))); */ #endif //DB_TEMPLATES @@ -559,11 +559,11 @@ void KexiStartupDialog::setupPageOpenExisting() d->openExistingConnWidget->showAdvancedConn(); } d->openExistingFileDlg = d->openExistingConnWidget->m_fileDlg; - connect(d->openExistingFileDlg,TQT_SIGNAL(accepted()),this,TQT_SLOT(accept())); - connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), - this,TQT_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*))); - connect(d->openExistingConnWidget,TQT_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)), - this,TQT_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*))); + connect(d->openExistingFileDlg,TQ_SIGNAL(accepted()),this,TQ_SLOT(accept())); + connect(d->openExistingConnWidget,TQ_SIGNAL(connectionItemExecuted(ConnectionDataLVItem*)), + this,TQ_SLOT(connectionItemForOpenExistingExecuted(ConnectionDataLVItem*))); + connect(d->openExistingConnWidget,TQ_SIGNAL(connectionItemHighlighted(ConnectionDataLVItem*)), + this,TQ_SLOT(connectionItemForOpenExistingHighlighted(ConnectionDataLVItem*))); } void KexiStartupDialog::connectionItemForOpenExistingExecuted(ConnectionDataLVItem *item) @@ -632,8 +632,8 @@ void KexiStartupDialog::setupPageOpenRecent() TQVBoxLayout *lyr = new TQVBoxLayout( d->pageOpenRecent, 0, KDialogBase::spacingHint() ); lyr->addWidget( d->prj_selector = new KexiProjectSelectorWidget( d->pageOpenRecent, "prj_selector", d->recentProjects ) ); - connect(d->prj_selector,TQT_SIGNAL(projectExecuted(KexiProjectData*)), - this,TQT_SLOT(recentProjectItemExecuted(KexiProjectData*))); + connect(d->prj_selector,TQ_SIGNAL(projectExecuted(KexiProjectData*)), + this,TQ_SLOT(recentProjectItemExecuted(KexiProjectData*))); #endif } diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp index d99ad4ae..d0440730 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp @@ -78,7 +78,7 @@ KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * paren setColumnWidthMode(0, Maximum); setResizeMode(LastColumn); setItemMargin(6); - connect(this,TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotExecuted(TQListViewItem*))); + connect(this,TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotExecuted(TQListViewItem*))); } KexiStartupDialogTemplatesPage::~KexiStartupDialogTemplatesPage() @@ -104,7 +104,7 @@ void KexiStartupDialogTemplatesPage::populate() // info = new KTextBrowser(this,"info"); // setResizeMode(templates,KeepSize); // setResizeMode(info,KeepSize); -// connect(templates,TQT_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQT_SLOT(itemClicked(TQIconViewItem*))); +// connect(templates,TQ_SIGNAL(selectionChanged(TQIconViewItem*)),this,TQ_SLOT(itemClicked(TQIconViewItem*))); } /* diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 9708b037..0db50981 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -93,8 +93,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f //(js) d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget ); //(js) d->okButton->setDefault( true ); //(js) d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget); -//(js) connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() )); -//(js) connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() )); +//(js) connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() )); +//(js) connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() )); //(js) d->customWidget = widget; //(js) d->autoSelectExtCheckBox = 0; // delayed loading //TODO d->autoSelectExtChecked = false; @@ -167,14 +167,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops"); ops->setOnlyDoubleClickSelectsFiles( true ); - connect(ops, TQT_SIGNAL(urlEntered(const KURL&)), - TQT_SLOT(urlEntered(const KURL&))); - connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); - connect(ops, TQT_SIGNAL(finishedLoading()), - TQT_SLOT(slotLoadingFinished())); + connect(ops, TQ_SIGNAL(urlEntered(const KURL&)), + TQ_SLOT(urlEntered(const KURL&))); + connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); + connect(ops, TQ_SIGNAL(finishedLoading()), + TQ_SLOT(slotLoadingFinished())); ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | @@ -208,13 +208,13 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f "edit or select a bookmark.<p>" "These bookmarks are specific to the file dialog, but otherwise operate " "like bookmarks elsewhere in TDE.</qt>")); - connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - TQT_SLOT( enterURL( const TQString& ))); + connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + TQ_SLOT( enterURL( const TQString& ))); TDEToggleAction *showSidebarAction = new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); - connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleSpeedbar( bool )) ); + connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleSpeedbar( bool )) ); TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. " @@ -241,8 +241,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f menu->insert( coll->action( "separate dirs" )); menu->setDelayed( false ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - ops, TQT_SLOT( updateSelectionDependentActions() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + ops, TQ_SLOT( updateSelectionDependentActions() )); menu->plug( toolbar ); */ /* @@ -264,16 +264,16 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f d->pathCombo->setCompletionObject( ops->dirCompletionObject(), false ); - connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( enterURL( const KURL& ) )); - connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL(textChanged( const TQString& )), - TQT_SLOT( pathComboChanged( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( dirCompletion( const TQString& ))); - connect( d->pathCombo, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), - d->pathCombo, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); + connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( enterURL( const KURL& ) )); + connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL(textChanged( const TQString& )), + TQ_SLOT( pathComboChanged( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( dirCompletion( const TQString& ))); + connect( d->pathCombo, TQ_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), + d->pathCombo, TQ_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); TQString whatsThisText; @@ -293,14 +293,14 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f // locationEdit->setAutoDeleteCompletionObject( true ); locationEdit->setCompletionObject( ops->completionObject(), false ); - connect( locationEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotOk())); - connect(locationEdit, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( locationActivated( const TQString& ) )); - connect( locationEdit, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( fileCompletion( const TQString& ))); - connect( locationEdit, TQT_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), - locationEdit, TQT_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); + connect( locationEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotOk())); + connect(locationEdit, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( locationActivated( const TQString& ) )); + connect( locationEdit, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( fileCompletion( const TQString& ))); + connect( locationEdit, TQ_SIGNAL( textRotation(TDECompletionBase::KeyBindingType) ), + locationEdit, TQ_SLOT( rotateText(TDECompletionBase::KeyBindingType) )); // the Filter label/edit whatsThisText = i18n("<qt>This is the filter to apply to the file list. " @@ -316,12 +316,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f TQWhatsThis::add(filterWidget, whatsThisText); setFilter(filter); d->filterLabel->setBuddy(filterWidget); - connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged())); + connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged())); // the Automatically Select Extension checkbox // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig()) d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget); - connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked())); + connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked())); initGUI(); // activate GM diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index f9b535c8..bb3a9d56 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -65,9 +65,9 @@ tristate SQLite2ToSQLite3Migration::run() m_process = new TDEProcess(this, "process"); *m_process << ksqlite2to3_app << m_filePath; m_process->setWorkingDirectory( fi.dir(true).absPath() ); - connect( m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - this, TQT_SLOT(receivedStderr(TDEProcess*,char*,int))); - connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(processExited(TDEProcess*)) ); + connect( m_process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + this, TQ_SLOT(receivedStderr(TDEProcess*,char*,int))); + connect( m_process, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(processExited(TDEProcess*)) ); if (!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) return false; @@ -76,7 +76,7 @@ tristate SQLite2ToSQLite3Migration::run() .arg(TQDir::convertSeparators(TQFileInfo(m_filePath).fileName())).arg("SQLite3") ); m_dlg->setModal(true); - connect(m_dlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelClicked())); + connect(m_dlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelClicked())); m_dlg->setMinimumDuration(1000); m_dlg->setAutoClose(true); m_dlg->progressBar()->setTotalSteps(100); |