From aa5bb4434eb6b60314787106284ad99294de4468 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 4 Jan 2024 10:31:17 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit c650254e1855d383dcafd15d18be20becc3b2253) --- src/borrowerdialog.cpp | 16 +- src/cite/openoffice.cpp | 6 +- src/collectionfieldsdialog.cpp | 36 ++-- src/configdialog.cpp | 72 ++++---- src/controller.cpp | 8 +- src/core/netaccess.cpp | 8 +- src/detailedentryitem.cpp | 4 +- src/detailedlistview.cpp | 18 +- src/document.cpp | 2 +- src/entryeditdialog.cpp | 14 +- src/entryiconview.cpp | 10 +- src/entrymerger.cpp | 8 +- src/entryupdater.cpp | 26 +-- src/entryview.cpp | 10 +- src/exportdialog.cpp | 2 +- src/fetch/amazonfetcher.cpp | 20 +-- src/fetch/animenfofetcher.cpp | 8 +- src/fetch/arxivfetcher.cpp | 8 +- src/fetch/bibsonomyfetcher.cpp | 8 +- src/fetch/citebasefetcher.cpp | 8 +- src/fetch/configwidget.cpp | 2 +- src/fetch/crossreffetcher.cpp | 12 +- src/fetch/discogsfetcher.cpp | 12 +- src/fetch/entrezfetcher.cpp | 16 +- src/fetch/execexternalfetcher.cpp | 16 +- src/fetch/fetchmanager.cpp | 16 +- src/fetch/gcstarpluginfetcher.cpp | 14 +- src/fetch/googlescholarfetcher.cpp | 8 +- src/fetch/ibsfetcher.cpp | 8 +- src/fetch/imdbfetcher.cpp | 42 ++--- src/fetch/isbndbfetcher.cpp | 8 +- src/fetch/srufetcher.cpp | 20 +-- src/fetch/yahoofetcher.cpp | 8 +- src/fetch/z3950fetcher.cpp | 20 +-- src/fetchdialog.cpp | 52 +++--- src/fetcherconfigdialog.cpp | 8 +- src/filehandler.cpp | 2 +- src/filterdialog.cpp | 32 ++-- src/filterview.cpp | 8 +- src/groupview.cpp | 18 +- src/gui/boolfieldwidget.cpp | 2 +- src/gui/choicefieldwidget.cpp | 2 +- src/gui/datefieldwidget.cpp | 2 +- src/gui/datewidget.cpp | 12 +- src/gui/fieldwidget.cpp | 8 +- src/gui/imagefieldwidget.cpp | 2 +- src/gui/imagewidget.cpp | 6 +- src/gui/kwidgetlister.cpp | 12 +- src/gui/lineedit.cpp | 20 +-- src/gui/linefieldwidget.cpp | 2 +- src/gui/listview.cpp | 10 +- src/gui/numberfieldwidget.cpp | 8 +- src/gui/parafieldwidget.cpp | 2 +- src/gui/previewdialog.cpp | 2 +- src/gui/ratingfieldwidget.cpp | 2 +- src/gui/stringmapdialog.cpp | 8 +- src/gui/tablefieldwidget.cpp | 24 +-- src/gui/urlfieldwidget.cpp | 6 +- src/importdialog.cpp | 4 +- src/loandialog.cpp | 16 +- src/loanview.cpp | 16 +- src/mainwindow.cpp | 282 ++++++++++++++++---------------- src/newstuff/dialog.cpp | 40 ++--- src/newstuff/manager.cpp | 4 +- src/progressmanager.cpp | 12 +- src/reportdialog.cpp | 6 +- src/statusbar.cpp | 8 +- src/translators/alexandriaimporter.cpp | 2 +- src/translators/amcimporter.cpp | 2 +- src/translators/audiofileimporter.cpp | 4 +- src/translators/bibteximporter.cpp | 2 +- src/translators/bibtexmlimporter.cpp | 2 +- src/translators/csvexporter.cpp | 4 +- src/translators/csvimporter.cpp | 24 +-- src/translators/filelistingimporter.cpp | 6 +- src/translators/freedbimporter.cpp | 4 +- src/translators/gcfilmsimporter.cpp | 2 +- src/translators/griffithimporter.cpp | 6 +- src/translators/htmlexporter.cpp | 2 +- src/translators/pdfimporter.cpp | 2 +- src/translators/risimporter.cpp | 2 +- src/translators/tellicoimporter.cpp | 6 +- src/translators/tellicosaximporter.cpp | 6 +- src/translators/tellicozipexporter.cpp | 2 +- 84 files changed, 605 insertions(+), 605 deletions(-) diff --git a/src/borrowerdialog.cpp b/src/borrowerdialog.cpp index fca07d2..b03b1dd 100644 --- a/src/borrowerdialog.cpp +++ b/src/borrowerdialog.cpp @@ -48,21 +48,21 @@ BorrowerDialog::BorrowerDialog(TQWidget* parent_, const char* name_/*=0*/) topLayout->addWidget(m_listView); m_listView->addColumn(i18n("Name")); m_listView->setFullWidth(true); - connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(slotOk())); - connect(m_listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(updateEdit(TQListViewItem*))); + connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(slotOk())); + connect(m_listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(updateEdit(TQListViewItem*))); m_lineEdit = new KLineEdit(mainWidget); topLayout->addWidget(m_lineEdit); - connect(m_lineEdit->completionObject(), TQT_SIGNAL(match(const TQString&)), - TQT_SLOT(selectItem(const TQString&))); + connect(m_lineEdit->completionObject(), TQ_SIGNAL(match(const TQString&)), + TQ_SLOT(selectItem(const TQString&))); m_lineEdit->setFocus(); m_lineEdit->completionObject()->setIgnoreCase(true); TDEABC::AddressBook* abook = TDEABC::StdAddressBook::self(true); - connect(abook, TQT_SIGNAL(addressBookChanged(AddressBook*)), - TQT_SLOT(slotLoadAddressBook())); - connect(abook, TQT_SIGNAL(loadingFinished(Resource*)), - TQT_SLOT(slotLoadAddressBook())); + connect(abook, TQ_SIGNAL(addressBookChanged(AddressBook*)), + TQ_SLOT(slotLoadAddressBook())); + connect(abook, TQ_SIGNAL(loadingFinished(Resource*)), + TQ_SLOT(slotLoadAddressBook())); slotLoadAddressBook(); setMinimumWidth(400); diff --git a/src/cite/openoffice.cpp b/src/cite/openoffice.cpp index 7ae0712..67be849 100644 --- a/src/cite/openoffice.cpp +++ b/src/cite/openoffice.cpp @@ -200,17 +200,17 @@ bool OpenOffice::connectionDialog() { KLineEdit* pipeEdit = new KLineEdit(w2); pipeEdit->setText(d->pipe); gl->addMultiCellWidget(pipeEdit, 0, 0, 1, 2); - pipeEdit->connect(radioPipe, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setEnabled(bool))); + pipeEdit->connect(radioPipe, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setEnabled(bool))); KLineEdit* hostEdit = new KLineEdit(w2); hostEdit->setText(d->host); gl->addWidget(hostEdit, 1, 1); - hostEdit->connect(radioTCP, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setEnabled(bool))); + hostEdit->connect(radioTCP, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setEnabled(bool))); KIntSpinBox* portSpin = new KIntSpinBox(w2); portSpin->setMaxValue(99999); portSpin->setValue(d->port); gl->addWidget(portSpin, 1, 2); - portSpin->connect(radioTCP, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setEnabled(bool))); + portSpin->connect(radioTCP, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setEnabled(bool))); if(d->pipe.isEmpty()) { radioTCP->setChecked(true); diff --git a/src/collectionfieldsdialog.cpp b/src/collectionfieldsdialog.cpp index 132f640..06feeca 100644 --- a/src/collectionfieldsdialog.cpp +++ b/src/collectionfieldsdialog.cpp @@ -77,7 +77,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa (void) new FieldListBox(m_fieldsBox, it); } } - connect(m_fieldsBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotHighlightedChanged(int))); + connect(m_fieldsBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotHighlightedChanged(int))); TQHBox* hb1 = new TQHBox(fieldsGroup); hb1->setSpacing(KDialog::spacingHint()); @@ -88,8 +88,8 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa m_btnDelete->setIconSet(BarIconSet(TQString::fromLatin1("edit-delete"), TDEIcon::SizeSmall)); TQWhatsThis::add(m_btnDelete, i18n("Remove a field from the collection")); - connect(m_btnNew, TQT_SIGNAL(clicked()), TQT_SLOT(slotNew()) ); - connect(m_btnDelete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); + connect(m_btnNew, TQ_SIGNAL(clicked()), TQ_SLOT(slotNew()) ); + connect(m_btnDelete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete())); TQHBox* hb2 = new TQHBox(fieldsGroup); hb2->setSpacing(KDialog::spacingHint()); @@ -102,8 +102,8 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa TQWhatsThis::add(m_btnDown, i18n("Move this field down in the list. The list order is important " "for the layout of the entry editor.")); - connect(m_btnUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp()) ); - connect(m_btnDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); + connect(m_btnUp, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp()) ); + connect(m_btnDown, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown())); TQVBox* vbox = new TQVBox(page); vbox->setSpacing(KDialog::spacingHint()); @@ -124,7 +124,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa TQString whats = i18n("The title of the field"); TQWhatsThis::add(label, whats); TQWhatsThis::add(m_titleEdit, whats); - connect(m_titleEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_titleEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); label = new TQLabel(i18n("T&ype:"), grid); layout->addWidget(label, row, 2); @@ -151,8 +151,8 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa TQWhatsThis::add(m_typeCombo, whats); // the typeTitles match the fieldMap().values() but in a better order m_typeCombo->insertStringList(Data::Field::typeTitles()); - connect(m_typeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); - connect(m_typeCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotTypeChanged(const TQString&))); + connect(m_typeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified())); + connect(m_typeCombo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotTypeChanged(const TQString&))); label = new TQLabel(i18n("Cate&gory:"), grid); layout->addWidget(label, ++row, 0); @@ -174,7 +174,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa } m_catCombo->insertStringList(cats); m_catCombo->setDuplicatesEnabled(false); - connect(m_catCombo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_catCombo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); label = new TQLabel(i18n("Descr&iption:"), grid); layout->addWidget(label, ++row, 0); @@ -188,7 +188,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa "\"%{year} %{title}\" where the named fields get substituted in the string."); TQWhatsThis::add(label, whats); TQWhatsThis::add(m_descEdit, whats); - connect(m_descEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_descEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); label = new TQLabel(i18n("&Default value:"), grid); layout->addWidget(label, ++row, 0); @@ -198,7 +198,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa whats = i18n("A default value can be set for new entries."); TQWhatsThis::add(label, whats); TQWhatsThis::add(m_defaultEdit, whats); - connect(m_defaultEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_defaultEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); label = new TQLabel(i18n("A&llowed values:"), grid); layout->addWidget(label, ++row, 0); @@ -210,7 +210,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa "for example: \"dog; cat; mouse\""); TQWhatsThis::add(label, whats); TQWhatsThis::add(m_allowEdit, whats); - connect(m_allowEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_allowEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); label = new TQLabel(i18n("Extended &properties:"), grid); layout->addWidget(label, ++row, 0); @@ -221,7 +221,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa whats = i18n("Extended field properties are used to specify things such as the corresponding bibtex field."); TQWhatsThis::add(label, whats); TQWhatsThis::add(m_btnExtended, whats); - connect(m_btnExtended, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowExtendedProperties())); + connect(m_btnExtended, TQ_SIGNAL(clicked()), TQ_SLOT(slotShowExtendedProperties())); TQButtonGroup* bg = new TQButtonGroup(1, TQt::Horizontal, i18n("Format Options"), vbox); m_formatNone = new TQRadioButton(i18n("No formatting"), bg); @@ -236,7 +236,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa m_formatName = new TQRadioButton(i18n("Format as a name"), bg); TQWhatsThis::add(m_formatName, i18n("This option capitalizes and formats the field as a " "name, but only if those options are globally set.")); - connect(bg, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotModified())); + connect(bg, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotModified())); TQGroupBox* optionsGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Field Options"), vbox); m_complete = new TQCheckBox(i18n("Enable auto-completion"), optionsGroup); @@ -248,9 +248,9 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa m_grouped = new TQCheckBox(i18n("Allow grouping"), optionsGroup); TQWhatsThis::add(m_grouped, i18n("If checked, this field may be used to group the entries in " "the group view.")); - connect(m_complete, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); - connect(m_multiple, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); - connect(m_grouped, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); + connect(m_complete, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); + connect(m_multiple, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); + connect(m_grouped, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); // need to stretch at bottom vbox->setStretchFactor(new TQWidget(vbox), 1); @@ -271,7 +271,7 @@ CollectionFieldsDialog::CollectionFieldsDialog(Data::CollPtr coll_, TQWidget* pa // new types. The problem is that when more types are added, the size of the combo box // doesn't change. So when everything is laid out, the combo box needs to have all the // items there. - TQTimer::singleShot(0, this, TQT_SLOT(slotSelectInitial())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSelectInitial())); } CollectionFieldsDialog::~CollectionFieldsDialog() { diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 3f6d458..d50cd45 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -134,7 +134,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent_, const char* name_/*=0*/) enableButtonApply(false); setHelp(TQString::fromLatin1("general-options")); - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_SLOT(slotUpdateHelpLink(TQWidget*))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), TQ_SLOT(slotUpdateHelpLink(TQWidget*))); } ConfigDialog::~ConfigDialog() { @@ -202,13 +202,13 @@ void ConfigDialog::setupGeneralPage() { TQWhatsThis::add(m_cbOpenLastFile, i18n("If checked, the file that was last open " "will be re-opened at program start-up.")); l->addWidget(m_cbOpenLastFile); - connect(m_cbOpenLastFile, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); + connect(m_cbOpenLastFile, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); m_cbShowTipDay = new TQCheckBox(i18n("&Show \"Tip of the Day\" at startup"), frame); TQWhatsThis::add(m_cbShowTipDay, i18n("If checked, the \"Tip of the Day\" will be " "shown at program start-up.")); l->addWidget(m_cbShowTipDay); - connect(m_cbShowTipDay, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); + connect(m_cbShowTipDay, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); TQButtonGroup* imageGroup = new TQVButtonGroup(i18n("Image Storage Options"), frame); m_rbImageInFile = new TQRadioButton(i18n("Store images in data file"), imageGroup); @@ -219,7 +219,7 @@ void ConfigDialog::setupGeneralPage() { "application directory, or stored in a directory in the " "same location as the data file.")); l->addWidget(imageGroup); - connect(imageGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotModified())); + connect(imageGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotModified())); TQVGroupBox* formatGroup = new TQVGroupBox(i18n("Formatting Options"), frame); l->addWidget(formatGroup); @@ -227,12 +227,12 @@ void ConfigDialog::setupGeneralPage() { m_cbCapitalize = new TQCheckBox(i18n("Auto capitalize &titles and names"), formatGroup); TQWhatsThis::add(m_cbCapitalize, i18n("If checked, titles and names will " "be automatically capitalized.")); - connect(m_cbCapitalize, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); + connect(m_cbCapitalize, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); m_cbFormat = new TQCheckBox(i18n("Auto &format titles and names"), formatGroup); TQWhatsThis::add(m_cbFormat, i18n("If checked, titles and names will " "be automatically formatted.")); - connect(m_cbFormat, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); + connect(m_cbFormat, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); TQGrid* g1 = new TQGrid(2, formatGroup); g1->setSpacing(5); @@ -244,7 +244,7 @@ void ConfigDialog::setupGeneralPage() { "should be separated by a semi-colon."); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_leCapitals, whats); - connect(m_leCapitals, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_leCapitals, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); lab = new TQLabel(i18n("Artic&les:"), g1); m_leArticles = new KLineEdit(g1); @@ -254,7 +254,7 @@ void ConfigDialog::setupGeneralPage() { "should be separated by a semi-colon."); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_leArticles, whats); - connect(m_leArticles, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_leArticles, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); lab = new TQLabel(i18n("Personal suffi&xes:"), g1); m_leSuffixes = new KLineEdit(g1); @@ -263,7 +263,7 @@ void ConfigDialog::setupGeneralPage() { "should be separated by a semi-colon."); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_leSuffixes, whats); - connect(m_leSuffixes, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_leSuffixes, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); lab = new TQLabel(i18n("Surname &prefixes:"), g1); m_lePrefixes = new KLineEdit(g1); @@ -272,7 +272,7 @@ void ConfigDialog::setupGeneralPage() { "should be separated by a semi-colon."); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_lePrefixes, whats); - connect(m_lePrefixes, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_lePrefixes, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); // stretch to fill lower area l->addStretch(1); @@ -301,18 +301,18 @@ void ConfigDialog::setupPrintingPage() { m_cbPrintFormatted = new TQCheckBox(i18n("&Format titles and names"), formatOptions); TQWhatsThis::add(m_cbPrintFormatted, i18n("If checked, titles and names will be automatically formatted.")); - connect(m_cbPrintFormatted, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); + connect(m_cbPrintFormatted, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); m_cbPrintHeaders = new TQCheckBox(i18n("&Print field headers"), formatOptions); TQWhatsThis::add(m_cbPrintHeaders, i18n("If checked, the field names will be printed as table headers.")); - connect(m_cbPrintHeaders, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); + connect(m_cbPrintHeaders, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); TQHGroupBox* groupOptions = new TQHGroupBox(i18n("Grouping Options"), frame); l->addWidget(groupOptions); m_cbPrintGrouped = new TQCheckBox(i18n("&Group the entries"), groupOptions); TQWhatsThis::add(m_cbPrintGrouped, i18n("If checked, the entries will be grouped by the selected field.")); - connect(m_cbPrintGrouped, TQT_SIGNAL(clicked()), TQT_SLOT(slotModified())); + connect(m_cbPrintGrouped, TQ_SIGNAL(clicked()), TQ_SLOT(slotModified())); TQVGroupBox* imageOptions = new TQVGroupBox(i18n("Image Options"), frame); l->addWidget(imageOptions); @@ -328,10 +328,10 @@ void ConfigDialog::setupPrintingPage() { TQString whats = i18n("The maximum width of the images in the printout. The aspect ration is preserved."); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_imageWidthBox, whats); - connect(m_imageWidthBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotModified())); + connect(m_imageWidthBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotModified())); // TQSpinBox doesn't emit valueChanged if you edit the value with // the lineEdit until you change the keyboard focus - connect(m_imageWidthBox->child("qt_spinbox_edit"), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_imageWidthBox->child("qt_spinbox_edit"), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); lab = new TQLabel(i18n("&Maximum image height:"), grid); m_imageHeightBox = new KIntSpinBox(0, 999, 1, 50, 10, grid); @@ -341,10 +341,10 @@ void ConfigDialog::setupPrintingPage() { whats = i18n("The maximum height of the images in the printout. The aspect ration is preserved."); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_imageHeightBox, whats); - connect(m_imageHeightBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotModified())); + connect(m_imageHeightBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotModified())); // TQSpinBox doesn't emit valueChanged if you edit the value with // the lineEdit until you change the keyboard focus - connect(m_imageHeightBox->child("qt_spinbox_edit"), TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotModified())); + connect(m_imageHeightBox->child("qt_spinbox_edit"), TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotModified())); // stretch to fill lower area l->addStretch(1); @@ -368,7 +368,7 @@ void ConfigDialog::setupTemplatePage() { lab = new TQLabel(i18n("Template:"), frame); m_templateCombo = new GUI::ComboBox(frame); - connect(m_templateCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); + connect(m_templateCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified())); lab->setBuddy(m_templateCombo); TQString whats = i18n("Select the template to use for the current type of collections. " "Not all templates will use the font and color settings."); @@ -381,7 +381,7 @@ void ConfigDialog::setupTemplatePage() { TQWhatsThis::add(btn, i18n("Show a preview of the template")); btn->setIconSet(SmallIconSet(TQString::fromLatin1("viewmag"))); gridLayout->addWidget(btn, row, 2); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowTemplatePreview())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotShowTemplatePreview())); // so the button is squeezed small gridLayout->setColStretch(0, 10); @@ -406,7 +406,7 @@ void ConfigDialog::setupTemplatePage() { fontLayout->addWidget(lab, ++row, 0); m_fontCombo = new TDEFontCombo(fontGroup); fontLayout->addWidget(m_fontCombo, row, 1); - connect(m_fontCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); + connect(m_fontCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified())); lab->setBuddy(m_fontCombo); whats = i18n("This font is passed to the template used in the Entry View."); TQWhatsThis::add(lab, whats); @@ -417,7 +417,7 @@ void ConfigDialog::setupTemplatePage() { m_fontSizeInput->setRange(5, 30); // 30 is same max as konq config m_fontSizeInput->setSuffix(TQString::fromLatin1("pt")); fontLayout->addWidget(m_fontSizeInput, row, 1); - connect(m_fontSizeInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotModified())); + connect(m_fontSizeInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotModified())); lab->setBuddy(m_fontSizeInput); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_fontSizeInput, whats); @@ -433,7 +433,7 @@ void ConfigDialog::setupTemplatePage() { colLayout->addWidget(lab, ++row, 0); m_baseColorCombo = new KColorCombo(colGroup); colLayout->addWidget(m_baseColorCombo, row, 1); - connect(m_baseColorCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); + connect(m_baseColorCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified())); lab->setBuddy(m_baseColorCombo); whats = i18n("This color is passed to the template used in the Entry View."); TQWhatsThis::add(lab, whats); @@ -443,7 +443,7 @@ void ConfigDialog::setupTemplatePage() { colLayout->addWidget(lab, ++row, 0); m_textColorCombo = new KColorCombo(colGroup); colLayout->addWidget(m_textColorCombo, row, 1); - connect(m_textColorCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); + connect(m_textColorCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified())); lab->setBuddy(m_textColorCombo); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_textColorCombo, whats); @@ -452,7 +452,7 @@ void ConfigDialog::setupTemplatePage() { colLayout->addWidget(lab, ++row, 0); m_highBaseColorCombo = new KColorCombo(colGroup); colLayout->addWidget(m_highBaseColorCombo, row, 1); - connect(m_highBaseColorCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); + connect(m_highBaseColorCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified())); lab->setBuddy(m_highBaseColorCombo); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_highBaseColorCombo, whats); @@ -461,7 +461,7 @@ void ConfigDialog::setupTemplatePage() { colLayout->addWidget(lab, ++row, 0); m_highTextColorCombo = new KColorCombo(colGroup); colLayout->addWidget(m_highTextColorCombo, row, 1); - connect(m_highTextColorCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotModified())); + connect(m_highTextColorCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotModified())); lab->setBuddy(m_highTextColorCombo); TQWhatsThis::add(lab, whats); TQWhatsThis::add(m_highTextColorCombo, whats); @@ -474,19 +474,19 @@ void ConfigDialog::setupTemplatePage() { KPushButton* b1 = new KPushButton(i18n("Install..."), box1); b1->setIconSet(SmallIconSet(TQString::fromLatin1("add"))); - connect(b1, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstallTemplate())); + connect(b1, TQ_SIGNAL(clicked()), TQ_SLOT(slotInstallTemplate())); whats = i18n("Click to install a new template directly."); TQWhatsThis::add(b1, whats); KPushButton* b2 = new KPushButton(i18n("Download..."), box1); b2->setIconSet(SmallIconSet(TQString::fromLatin1("knewstuff"))); - connect(b2, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownloadTemplate())); + connect(b2, TQ_SIGNAL(clicked()), TQ_SLOT(slotDownloadTemplate())); whats = i18n("Click to download additional templates via the Internet."); TQWhatsThis::add(b2, whats); KPushButton* b3 = new KPushButton(i18n("Delete..."), box1); b3->setIconSet(SmallIconSet(TQString::fromLatin1("remove"))); - connect(b3, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteTemplate())); + connect(b3, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteTemplate())); whats = i18n("Click to select and remove installed templates."); TQWhatsThis::add(b3, whats); @@ -508,8 +508,8 @@ void ConfigDialog::setupFetchPage() { m_sourceListView->setSorting(-1); // no sorting m_sourceListView->setSelectionMode(TQListView::Single); leftLayout->addWidget(m_sourceListView, 1); - connect(m_sourceListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelectedSourceChanged(TQListViewItem*))); - connect(m_sourceListView, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQT_SLOT(slotModifySourceClicked())); + connect(m_sourceListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelectedSourceChanged(TQListViewItem*))); + connect(m_sourceListView, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), TQ_SLOT(slotModifySourceClicked())); TQHBox* hb = new TQHBox(frame); leftLayout->addWidget(hb); @@ -551,12 +551,12 @@ void ConfigDialog::setupFetchPage() { vlay->addWidget(m_newStuffBtn); vlay->addStretch(1); - connect(newSourceBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewSourceClicked())); - connect(m_modifySourceBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifySourceClicked())); - connect(m_moveUpSourceBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUpSourceClicked())); - connect(m_moveDownSourceBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDownSourceClicked())); - connect(m_removeSourceBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveSourceClicked())); - connect(m_newStuffBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewStuffClicked())); + connect(newSourceBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewSourceClicked())); + connect(m_modifySourceBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifySourceClicked())); + connect(m_moveUpSourceBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUpSourceClicked())); + connect(m_moveDownSourceBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDownSourceClicked())); + connect(m_removeSourceBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveSourceClicked())); + connect(m_newStuffBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewStuffClicked())); TDEAcceleratorManager::manage(frame); } diff --git a/src/controller.cpp b/src/controller.cpp index a99cca9..02063fe 100644 --- a/src/controller.cpp +++ b/src/controller.cpp @@ -141,11 +141,11 @@ void Controller::slotCollectionAdded(Data::CollPtr coll_) { updateActions(); - connect(coll_, TQT_SIGNAL(signalGroupsModified(Tellico::Data::CollPtr, PtrVector)), - m_mainWindow->m_groupView, TQT_SLOT(slotModifyGroups(Tellico::Data::CollPtr, PtrVector))); + connect(coll_, TQ_SIGNAL(signalGroupsModified(Tellico::Data::CollPtr, PtrVector)), + m_mainWindow->m_groupView, TQ_SLOT(slotModifyGroups(Tellico::Data::CollPtr, PtrVector))); - connect(coll_, TQT_SIGNAL(signalRefreshField(Tellico::Data::FieldPtr)), - this, TQT_SLOT(slotRefreshField(Tellico::Data::FieldPtr))); + connect(coll_, TQ_SIGNAL(signalRefreshField(Tellico::Data::FieldPtr)), + this, TQ_SLOT(slotRefreshField(Tellico::Data::FieldPtr))); } void Controller::slotCollectionModified(Data::CollPtr coll_) { diff --git a/src/core/netaccess.cpp b/src/core/netaccess.cpp index 5b12cbe..e9932ca 100644 --- a/src/core/netaccess.cpp +++ b/src/core/netaccess.cpp @@ -73,8 +73,8 @@ TQPixmap NetAccess::filePreview(const KURL& url, int size) { KURL::List list; list.append(url); TDEIO::Job* previewJob = TDEIO::filePreview(list, size, size); - connect(previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), - &netaccess, TQT_SLOT(slotPreview(const KFileItem*, const TQPixmap&))); + connect(previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + &netaccess, TQ_SLOT(slotPreview(const KFileItem*, const TQPixmap&))); TDEIO::NetAccess::synchronousRun(previewJob, Kernel::self()->widget()); return netaccess.m_preview; @@ -86,8 +86,8 @@ TQPixmap NetAccess::filePreview(KFileItem* item, int size) { KFileItemList list; list.append(item); TDEIO::Job* previewJob = TDEIO::filePreview(list, size, size); - connect(previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), - &netaccess, TQT_SLOT(slotPreview(const KFileItem*, const TQPixmap&))); + connect(previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + &netaccess, TQ_SLOT(slotPreview(const KFileItem*, const TQPixmap&))); TDEIO::NetAccess::synchronousRun(previewJob, Kernel::self()->widget()); return netaccess.m_preview; diff --git a/src/detailedentryitem.cpp b/src/detailedentryitem.cpp index bbfe657..19a2030 100644 --- a/src/detailedentryitem.cpp +++ b/src/detailedentryitem.cpp @@ -62,13 +62,13 @@ void DetailedEntryItem::setState(State state_) { if(!m_timer) { m_timer = new TQTimer(); - m_timer->connect(m_timer, TQT_SIGNAL(timeout()), listView(), TQT_SLOT(triggerUpdate())); + m_timer->connect(m_timer, TQ_SIGNAL(timeout()), listView(), TQ_SLOT(triggerUpdate())); } m_timer->start(30 * 1000); // every 30 seconds } // have to put this in a timer, or it doesn't update properly - TQTimer::singleShot(500, listView(), TQT_SLOT(triggerUpdate())); + TQTimer::singleShot(500, listView(), TQ_SLOT(triggerUpdate())); } void DetailedEntryItem::paintCell(TQPainter* p_, const TQColorGroup& cg_, diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp index f014baf..2f1d59c 100644 --- a/src/detailedlistview.cpp +++ b/src/detailedlistview.cpp @@ -50,23 +50,23 @@ DetailedListView::DetailedListView(TQWidget* parent_, const char* name_/*=0*/) setShowSortIndicator(true); setShadeSortColumn(true); -// connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); - connect(header(), TQT_SIGNAL(indexChange(int, int, int)), - TQT_SLOT(slotUpdatePixmap())); +// connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(header(), TQ_SIGNAL(indexChange(int, int, int)), + TQ_SLOT(slotUpdatePixmap())); // header menu header()->setClickEnabled(true); header()->installEventFilter(this); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(slotCacheColumnWidth(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(slotCacheColumnWidth(int, int, int))); m_headerMenu = new TDEPopupMenu(this); m_headerMenu->setCheckable(true); m_headerMenu->insertTitle(i18n("View Columns")); - connect(m_headerMenu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotHeaderMenuActivated(int))); + connect(m_headerMenu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotHeaderMenuActivated(int))); m_checkPix = UserIcon(TQString::fromLatin1("checkmark")); } diff --git a/src/document.cpp b/src/document.cpp index 97a5c5a..9684211 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -149,7 +149,7 @@ bool Document::openDocument(const KURL& url_) { // } if(m_importer->hasImages()) { m_cancelImageWriting = false; - TQTimer::singleShot(500, this, TQT_SLOT(slotLoadAllImages())); + TQTimer::singleShot(500, this, TQ_SLOT(slotLoadAllImages())); } else { emit signalCollectionImagesLoaded(m_coll); m_importer->deleteLater(); diff --git a/src/entryeditdialog.cpp b/src/entryeditdialog.cpp index 3cb94d0..2aa077e 100644 --- a/src/entryeditdialog.cpp +++ b/src/entryeditdialog.cpp @@ -67,10 +67,10 @@ EntryEditDialog::EntryEditDialog(TQWidget* parent_, const char* name_) setButtonGuiItem(m_saveBtn, save); enableButton(m_saveBtn, false); - connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(slotHandleSave())); - connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(slotHandleNew())); - connect(this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(slotGoNextEntry())); - connect(this, TQT_SIGNAL(user3Clicked()), TQT_SLOT(slotGoPrevEntry())); + connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(slotHandleSave())); + connect(this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(slotHandleNew())); + connect(this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(slotGoNextEntry())); + connect(this, TQ_SIGNAL(user3Clicked()), TQ_SLOT(slotGoPrevEntry())); KGuiItem prev; prev.setIconName(TQString::fromLatin1(TQApplication::reverseLayout() ? "forward" : "back")); @@ -87,9 +87,9 @@ EntryEditDialog::EntryEditDialog(TQWidget* parent_, const char* name_) TDEAccel* accel = new TDEAccel(this); accel->insert(TQString::fromLatin1("Go Prev"), TQString(), prev.toolTip(), TQt::Key_PageUp, - Controller::self(), TQT_SLOT(slotGoPrevEntry())); + Controller::self(), TQ_SLOT(slotGoPrevEntry())); accel->insert(TQString::fromLatin1("Go Next"), TQString(), next.toolTip(), TQt::Key_PageDown, - Controller::self(), TQT_SLOT(slotGoNextEntry())); + Controller::self(), TQ_SLOT(slotGoNextEntry())); setHelp(TQString::fromLatin1("entry-editor")); @@ -194,7 +194,7 @@ void EntryEditDialog::setLayout(Data::CollPtr coll_) { if(!widget) { continue; } - connect(widget, TQT_SIGNAL(modified()), TQT_SLOT(slotSetModified())); + connect(widget, TQ_SIGNAL(modified()), TQ_SLOT(slotSetModified())); if(!focusedFirst && widget->isFocusEnabled()) { widget->setFocus(); focusedFirst = true; diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp index b84d5d0..a72ad67 100644 --- a/src/entryiconview.cpp +++ b/src/entryiconview.cpp @@ -57,10 +57,10 @@ EntryIconView::EntryIconView(TQWidget* parent_, const char* name_/*=0*/) m_defaultPixmaps.setAutoDelete(true); - connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(doubleClicked(TQIconViewItem*)), TQT_SLOT(slotDoubleClicked(TQIconViewItem*))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), - TQT_SLOT(slotShowContextMenu(TQIconViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(doubleClicked(TQIconViewItem*)), TQ_SLOT(slotDoubleClicked(TQIconViewItem*))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), + TQ_SLOT(slotShowContextMenu(TQIconViewItem*, const TQPoint&))); } EntryIconView::~EntryIconView() { @@ -282,7 +282,7 @@ void EntryIconView::slotShowContextMenu(TQIconViewItem* item_, const TQPoint& po for(TQStringList::ConstIterator it = titles.begin(); it != titles.end(); ++it) { sortMenu.insertItem(*it); } - connect(&sortMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSortMenuActivated(int))); + connect(&sortMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSortMenuActivated(int))); menu.insertItem(i18n("&Sort By"), &sortMenu); menu.exec(point_); diff --git a/src/entrymerger.cpp b/src/entrymerger.cpp index 62de6c1..2f7da22 100644 --- a/src/entrymerger.cpp +++ b/src/entrymerger.cpp @@ -35,11 +35,11 @@ EntryMerger::EntryMerger(Data::EntryVec entries_, TQObject* parent_) TQString label = i18n("Merging entries..."); ProgressItem& item = ProgressManager::self()->newProgressItem(this, label, true /*canCancel*/); item.setTotalSteps(m_origCount); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); // done if no entries to merge if(m_origCount < 2) { - TQTimer::singleShot(500, this, TQT_SLOT(slotCleanup())); + TQTimer::singleShot(500, this, TQ_SLOT(slotCleanup())); } else { slotStartNext(); // starts fetching } @@ -72,9 +72,9 @@ void EntryMerger::slotStartNext() { m_entriesToCheck.remove(baseEntry); if(m_cancelled || m_entriesToCheck.count() < 2) { - TQTimer::singleShot(0, this, TQT_SLOT(slotCleanup())); + TQTimer::singleShot(0, this, TQ_SLOT(slotCleanup())); } else { - TQTimer::singleShot(0, this, TQT_SLOT(slotStartNext())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStartNext())); } } diff --git a/src/entryupdater.cpp b/src/entryupdater.cpp index 600ff4c..83ad826 100644 --- a/src/entryupdater.cpp +++ b/src/entryupdater.cpp @@ -42,10 +42,10 @@ EntryUpdater::EntryUpdater(Data::CollPtr coll_, Data::EntryVec entries_, TQObjec // for now, we're assuming all entries are same collection type m_fetchers = Fetch::Manager::self()->createUpdateFetchers(m_coll->type()); for(Fetch::FetcherVec::Iterator it = m_fetchers.begin(); it != m_fetchers.end(); ++it) { - connect(it.data(), TQT_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), - TQT_SLOT(slotResult(Tellico::Fetch::SearchResult*))); - connect(it.data(), TQT_SIGNAL(signalDone(Tellico::Fetch::Fetcher::Ptr)), - TQT_SLOT(slotDone())); + connect(it.data(), TQ_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), + TQ_SLOT(slotResult(Tellico::Fetch::SearchResult*))); + connect(it.data(), TQ_SIGNAL(signalDone(Tellico::Fetch::Fetcher::Ptr)), + TQ_SLOT(slotDone())); } init(); } @@ -59,10 +59,10 @@ EntryUpdater::EntryUpdater(const TQString& source_, Data::CollPtr coll_, Data::E Fetch::Fetcher::Ptr f = Fetch::Manager::self()->createUpdateFetcher(m_coll->type(), source_); if(f) { m_fetchers.append(f); - connect(f, TQT_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), - TQT_SLOT(slotResult(Tellico::Fetch::SearchResult*))); - connect(f, TQT_SIGNAL(signalDone(Tellico::Fetch::Fetcher::Ptr)), - TQT_SLOT(slotDone())); + connect(f, TQ_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), + TQ_SLOT(slotResult(Tellico::Fetch::SearchResult*))); + connect(f, TQ_SIGNAL(signalDone(Tellico::Fetch::Fetcher::Ptr)), + TQ_SLOT(slotDone())); } init(); } @@ -85,11 +85,11 @@ void EntryUpdater::init() { Kernel::self()->beginCommandGroup(i18n("Update Entries")); ProgressItem& item = ProgressManager::self()->newProgressItem(this, label, true /*canCancel*/); item.setTotalSteps(m_fetchers.count() * m_origEntryCount); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); // done if no fetchers available if(m_fetchers.isEmpty()) { - TQTimer::singleShot(500, this, TQT_SLOT(slotCleanup())); + TQTimer::singleShot(500, this, TQ_SLOT(slotCleanup())); } else { slotStartNext(); // starts fetching } @@ -107,7 +107,7 @@ void EntryUpdater::slotStartNext() { void EntryUpdater::slotDone() { if(m_cancelled) { myLog() << "EntryUpdater::slotDone() - cancelled" << endl; - TQTimer::singleShot(500, this, TQT_SLOT(slotCleanup())); + TQTimer::singleShot(500, this, TQ_SLOT(slotCleanup())); return; } @@ -125,13 +125,13 @@ void EntryUpdater::slotDone() { m_entriesToUpdate.remove(m_entriesToUpdate.begin()); // if there are no more entries, and this is the last fetcher, time to delete if(m_entriesToUpdate.isEmpty()) { - TQTimer::singleShot(500, this, TQT_SLOT(slotCleanup())); + TQTimer::singleShot(500, this, TQ_SLOT(slotCleanup())); return; } } kapp->processEvents(); // so the entry updater can clean up a bit - TQTimer::singleShot(500, this, TQT_SLOT(slotStartNext())); + TQTimer::singleShot(500, this, TQ_SLOT(slotStartNext())); } void EntryUpdater::slotResult(Fetch::SearchResult* result_) { diff --git a/src/entryview.cpp b/src/entryview.cpp index 66ad116..9281c68 100644 --- a/src/entryview.cpp +++ b/src/entryview.cpp @@ -65,9 +65,9 @@ EntryView::EntryView(TQWidget* parent_, const char* name_) : TDEHTMLPart(new Ent DropHandler* drophandler = new DropHandler(this); view()->installEventFilter(drophandler); - connect(browserExtension(), TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), - TQT_SLOT(slotOpenURL(const KURL&))); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotResetColors())); + connect(browserExtension(), TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + TQ_SLOT(slotOpenURL(const KURL&))); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotResetColors())); } EntryView::~EntryView() { @@ -305,7 +305,7 @@ void EntryView::slotOpenURL(const KURL& url_) { void EntryView::slotReloadEntry() { // this slot should only be connected in setXSLTFile() // must disconnect the signal first, otherwise, get an infinite loop - disconnect(TQT_SIGNAL(completed())); + disconnect(TQ_SIGNAL(completed())); closeURL(); // this is needed to stop everything, for some reason view()->setUpdatesEnabled(true); @@ -371,7 +371,7 @@ void EntryView::resetColors() { // don't flicker view()->setUpdatesEnabled(false); openURL(m_tempFile->name()); - connect(this, TQT_SIGNAL(completed()), TQT_SLOT(slotReloadEntry())); + connect(this, TQ_SIGNAL(completed()), TQ_SLOT(slotReloadEntry())); } #include "entryview.moc" diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp index 350a011..3970111 100644 --- a/src/exportdialog.cpp +++ b/src/exportdialog.cpp @@ -88,7 +88,7 @@ ExportDialog::ExportDialog(Export::Format format_, Data::CollPtr coll_, TQWidget } else if(format_ == Export::Alexandria || format_ == Export::PilotDB) { bg->setEnabled(false); } - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSaveOptions())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSaveOptions())); } ExportDialog::~ExportDialog() { diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp index 1cb6b0c..b018ff1 100644 --- a/src/fetch/amazonfetcher.cpp +++ b/src/fetch/amazonfetcher.cpp @@ -321,10 +321,10 @@ void AmazonFetcher::doSearch() { // myDebug() << "AmazonFetcher::search() - url: " << newUrl.url() << endl; m_job = TDEIO::get(newUrl, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void AmazonFetcher::stop() { @@ -869,8 +869,8 @@ AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const AmazonFetcher m_siteCombo->insertItem(i18n("Japan"), JP); m_siteCombo->insertItem(i18n("France"), FR); m_siteCombo->insertItem(i18n("Canada"), CA); - connect(m_siteCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetModified())); - connect(m_siteCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSiteChanged())); + connect(m_siteCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetModified())); + connect(m_siteCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSiteChanged())); l->addWidget(m_siteCombo, row, 1); TQString w = i18n("Amazon.com provides data from several different localized sites. Choose the one " "you wish to use for this data source."); @@ -885,7 +885,7 @@ AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const AmazonFetcher m_imageCombo->insertItem(i18n("Medium Image"), MediumImage); m_imageCombo->insertItem(i18n("Large Image"), LargeImage); m_imageCombo->insertItem(i18n("No Image"), NoImage); - connect(m_imageCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetModified())); + connect(m_imageCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetModified())); l->addWidget(m_imageCombo, row, 1); w = i18n("The cover image may be downloaded as well. However, too many large images in the " "collection may degrade performance."); @@ -896,7 +896,7 @@ AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const AmazonFetcher label = new TQLabel(i18n("&Associate's ID: "), optionsWidget()); l->addWidget(label, ++row, 0); m_assocEdit = new KLineEdit(optionsWidget()); - connect(m_assocEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_assocEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_assocEdit, row, 1); w = i18n("The associate's id identifies the person accessing the Amazon.com Web Services, and is included " "in any links to the Amazon.com site."); @@ -907,13 +907,13 @@ AmazonFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const AmazonFetcher label = new TQLabel(i18n("Access key: "), optionsWidget()); l->addWidget(label, ++row, 0); m_accessEdit = new KLineEdit(optionsWidget()); - connect(m_accessEdit, SIGNAL(textChanged(const TQString&)), SLOT(slotSetModified())); + connect(m_accessEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_accessEdit, row, 1); label = new TQLabel(i18n("Secret Key: "), optionsWidget()); l->addWidget(label, ++row, 0); m_secretKeyEdit = new KLineEdit(optionsWidget()); - connect(m_secretKeyEdit, SIGNAL(textChanged(const TQString&)), SLOT(slotSetModified())); + connect(m_secretKeyEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_secretKeyEdit, row, 1); l->setRowStretch(++row, 10); diff --git a/src/fetch/animenfofetcher.cpp b/src/fetch/animenfofetcher.cpp index 9447a5f..e95f852 100644 --- a/src/fetch/animenfofetcher.cpp +++ b/src/fetch/animenfofetcher.cpp @@ -91,10 +91,10 @@ void AnimeNfoFetcher::search(FetchKey key_, const TQString& value_) { // myDebug() << "AnimeNfoFetcher::search() - url: " << u.url() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void AnimeNfoFetcher::stop() { diff --git a/src/fetch/arxivfetcher.cpp b/src/fetch/arxivfetcher.cpp index ec3f8fb..8c06e21 100644 --- a/src/fetch/arxivfetcher.cpp +++ b/src/fetch/arxivfetcher.cpp @@ -96,10 +96,10 @@ void ArxivFetcher::doSearch() { } m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void ArxivFetcher::stop() { diff --git a/src/fetch/bibsonomyfetcher.cpp b/src/fetch/bibsonomyfetcher.cpp index 3e80b10..47d91cc 100644 --- a/src/fetch/bibsonomyfetcher.cpp +++ b/src/fetch/bibsonomyfetcher.cpp @@ -79,10 +79,10 @@ void BibsonomyFetcher::search(FetchKey key_, const TQString& value_) { } m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void BibsonomyFetcher::stop() { diff --git a/src/fetch/citebasefetcher.cpp b/src/fetch/citebasefetcher.cpp index 2b5a8db..22a4f46 100644 --- a/src/fetch/citebasefetcher.cpp +++ b/src/fetch/citebasefetcher.cpp @@ -80,10 +80,10 @@ void CitebaseFetcher::search(FetchKey key_, const TQString& value_) { } m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void CitebaseFetcher::stop() { diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp index 052868c..9c707b2 100644 --- a/src/fetch/configwidget.cpp +++ b/src/fetch/configwidget.cpp @@ -45,7 +45,7 @@ void ConfigWidget::addFieldsWidget(const StringMap& customFields_, const TQStrin if(fieldsToAdd_.contains(it.key())) { cb->setChecked(true); } - connect(cb, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetModified())); + connect(cb, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetModified())); } TDEAcceleratorManager::manage(this); diff --git a/src/fetch/crossreffetcher.cpp b/src/fetch/crossreffetcher.cpp index 5029f08..cea642c 100644 --- a/src/fetch/crossreffetcher.cpp +++ b/src/fetch/crossreffetcher.cpp @@ -104,10 +104,10 @@ void CrossRefFetcher::search(FetchKey key_, const TQString& value_) { } m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void CrossRefFetcher::stop() { @@ -352,7 +352,7 @@ CrossRefFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const CrossRefFet TQLabel* label = new TQLabel(i18n("&Username: "), optionsWidget()); l->addWidget(label, ++row, 0); m_userEdit = new KLineEdit(optionsWidget()); - connect(m_userEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_userEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_userEdit, row, 1); TQString w = i18n("A username and password is required to access the CrossRef service. The password is " "stored as plain text in the Tellico configuration file."); @@ -363,7 +363,7 @@ CrossRefFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const CrossRefFet label = new TQLabel(i18n("&Password: "), optionsWidget()); l->addWidget(label, ++row, 0); m_passEdit = new KLineEdit(optionsWidget()); - connect(m_passEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_passEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_passEdit, row, 1); TQWhatsThis::add(label, w); TQWhatsThis::add(m_passEdit, w); diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp index ba4e65c..519a8d9 100644 --- a/src/fetch/discogsfetcher.cpp +++ b/src/fetch/discogsfetcher.cpp @@ -128,10 +128,10 @@ void DiscogsFetcher::doSearch() { // myDebug() << "DiscogsFetcher::search() - url: " << u.url() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void DiscogsFetcher::stop() { @@ -357,7 +357,7 @@ DiscogsFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const DiscogsFetch l->addWidget(label, ++row, 0); m_apiKeyEdit = new KLineEdit(optionsWidget()); - connect(m_apiKeyEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_apiKeyEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_apiKeyEdit, row, 1); TQString w = i18n("With your discogs.com account you receive an API key for the usage of their XML-based interface " "(See http://www.discogs.com/help/api)."); @@ -366,7 +366,7 @@ DiscogsFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const DiscogsFetch label->setBuddy(m_apiKeyEdit); m_fetchImageCheck = new TQCheckBox(i18n("Download cover &image"), optionsWidget()); - connect(m_fetchImageCheck, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetModified())); + connect(m_fetchImageCheck, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetModified())); ++row; l->addMultiCellWidget(m_fetchImageCheck, row, row, 0, 1); w = i18n("The cover image may be downloaded as well. However, too many large images in the " diff --git a/src/fetch/entrezfetcher.cpp b/src/fetch/entrezfetcher.cpp index b1d2789..4b4bf59 100644 --- a/src/fetch/entrezfetcher.cpp +++ b/src/fetch/entrezfetcher.cpp @@ -131,10 +131,10 @@ void EntrezFetcher::search(FetchKey key_, const TQString& value_) { m_step = Search; // myLog() << "EntrezFetcher::doSearch() - url: " << u.url() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void EntrezFetcher::continueSearch() { @@ -256,10 +256,10 @@ void EntrezFetcher::doSummary() { m_step = Summary; // myLog() << "EntrezFetcher::searchResults() - url: " << u.url() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void EntrezFetcher::summaryResults() { diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp index 73fcd27..26f9c2d 100644 --- a/src/fetch/execexternalfetcher.cpp +++ b/src/fetch/execexternalfetcher.cpp @@ -163,9 +163,9 @@ void ExecExternalFetcher::startSearch(const TQStringList& args_) { #endif m_process = new TDEProcess(); - connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(slotData(TDEProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(slotError(TDEProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(slotData(TDEProcess*, char*, int))); + connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(slotError(TDEProcess*, char*, int))); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); *m_process << m_path << args_; if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { myDebug() << "ExecExternalFetcher::startSearch() - process failed to start" << endl; @@ -346,7 +346,7 @@ ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExt TQLabel* label = new TQLabel(i18n("Collection &type:"), optionsWidget()); l->addWidget(label, ++row, 0); m_collCombo = new GUI::CollectionTypeCombo(optionsWidget()); - connect(m_collCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetModified())); + connect(m_collCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetModified())); l->addWidget(m_collCombo, row, 1); TQString w = i18n("Set the collection type of the data returned from the external application."); TQWhatsThis::add(label, w); @@ -362,7 +362,7 @@ ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExt m_formatCombo->insertItem(it.data(), it.key()); } } - connect(m_formatCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetModified())); + connect(m_formatCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetModified())); l->addWidget(m_formatCombo, row, 1); w = i18n("Set the result type of the data returned from the external application."); TQWhatsThis::add(label, w); @@ -372,7 +372,7 @@ ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExt label = new TQLabel(i18n("Application &path: "), optionsWidget()); l->addWidget(label, ++row, 0); m_pathEdit = new KURLRequester(optionsWidget()); - connect(m_pathEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_pathEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_pathEdit, row, 1); w = i18n("Set the path of the application to run that should output a valid Tellico data file."); TQWhatsThis::add(label, w); @@ -410,7 +410,7 @@ ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExt cb->setChecked(false); le->setEnabled(false); } - connect(cb, TQT_SIGNAL(toggled(bool)), le, TQT_SLOT(setEnabled(bool))); + connect(cb, TQ_SIGNAL(toggled(bool)), le, TQ_SLOT(setEnabled(bool))); TQWhatsThis::add(cb, w); TQWhatsThis::add(le, w2); } @@ -435,7 +435,7 @@ ExecExternalFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const ExecExt m_cbUpdate->setChecked(false); m_leUpdate->setEnabled(false); } - connect(m_cbUpdate, TQT_SIGNAL(toggled(bool)), m_leUpdate, TQT_SLOT(setEnabled(bool))); + connect(m_cbUpdate, TQ_SIGNAL(toggled(bool)), m_leUpdate, TQ_SLOT(setEnabled(bool))); l->setRowStretch(++row, 1); diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp index 3903642..5e5d514 100644 --- a/src/fetch/fetchmanager.cpp +++ b/src/fetch/fetchmanager.cpp @@ -163,10 +163,10 @@ void Manager::startSearch(const TQString& source_, FetchKey key_, const TQString for(FetcherVec::Iterator it = m_fetchers.begin(); it != m_fetchers.end(); ++it, ++i) { if(source_ == it->source()) { ++m_count; // Fetcher::search() might emit done(), so increment before calling search() - connect(it.data(), TQT_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), - TQT_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*))); - connect(it.data(), TQT_SIGNAL(signalDone(Tellico::Fetch::Fetcher::Ptr)), - TQT_SLOT(slotFetcherDone(Tellico::Fetch::Fetcher::Ptr))); + connect(it.data(), TQ_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), + TQ_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*))); + connect(it.data(), TQ_SIGNAL(signalDone(Tellico::Fetch::Fetcher::Ptr)), + TQ_SLOT(slotFetcherDone(Tellico::Fetch::Fetcher::Ptr))); it->search(key_, value_); m_currentFetcherIndex = i; break; @@ -183,10 +183,10 @@ void Manager::continueSearch() { Fetcher::Ptr f = m_fetchers[m_currentFetcherIndex]; if(f && f->hasMoreResults()) { ++m_count; - connect(f, TQT_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), - TQT_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*))); - connect(f, TQT_SIGNAL(signalDone(Tellico::Fetch::Fetcher::Ptr)), - TQT_SLOT(slotFetcherDone(Tellico::Fetch::Fetcher::Ptr))); + connect(f, TQ_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), + TQ_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*))); + connect(f, TQ_SIGNAL(signalDone(Tellico::Fetch::Fetcher::Ptr)), + TQ_SLOT(slotFetcherDone(Tellico::Fetch::Fetcher::Ptr))); f->continueSearch(); } else { emit signalDone(); diff --git a/src/fetch/gcstarpluginfetcher.cpp b/src/fetch/gcstarpluginfetcher.cpp index 336cccd..e5f7212 100644 --- a/src/fetch/gcstarpluginfetcher.cpp +++ b/src/fetch/gcstarpluginfetcher.cpp @@ -229,9 +229,9 @@ void GCstarPluginFetcher::search(FetchKey key_, const TQString& value_) { } m_process = new TDEProcess(); - connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(slotData(TDEProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(slotError(TDEProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(slotData(TDEProcess*, char*, int))); + connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(slotError(TDEProcess*, char*, int))); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); TQStringList args; args << gcstar << TQString::fromLatin1("-x") << TQString::fromLatin1("--collection") << gcstarCollection @@ -398,8 +398,8 @@ GCstarPluginFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const GCstarP TQLabel* label = new TQLabel(i18n("Collection &type:"), optionsWidget()); l->addWidget(label, ++row, 0); m_collCombo = new GUI::CollectionTypeCombo(optionsWidget()); - connect(m_collCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetModified())); - connect(m_collCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged())); + connect(m_collCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetModified())); + connect(m_collCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged())); l->addMultiCellWidget(m_collCombo, row, row, 1, 3); TQString w = i18n("Set the collection type of the data returned from the plugin."); TQWhatsThis::add(label, w); @@ -409,8 +409,8 @@ GCstarPluginFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const GCstarP label = new TQLabel(i18n("&Plugin: "), optionsWidget()); l->addWidget(label, ++row, 0); m_pluginCombo = new GUI::ComboBox(optionsWidget()); - connect(m_pluginCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetModified())); - connect(m_pluginCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPluginChanged())); + connect(m_pluginCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetModified())); + connect(m_pluginCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPluginChanged())); l->addMultiCellWidget(m_pluginCombo, row, row, 1, 3); w = i18n("Select the GCstar plugin used for the data source."); TQWhatsThis::add(label, w); diff --git a/src/fetch/googlescholarfetcher.cpp b/src/fetch/googlescholarfetcher.cpp index 8ac7d4d..d70d7bd 100644 --- a/src/fetch/googlescholarfetcher.cpp +++ b/src/fetch/googlescholarfetcher.cpp @@ -114,10 +114,10 @@ void GoogleScholarFetcher::doSearch() { // myDebug() << "GoogleScholarFetcher::search() - url: " << u.url() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void GoogleScholarFetcher::stop() { diff --git a/src/fetch/ibsfetcher.cpp b/src/fetch/ibsfetcher.cpp index 404bc1c..061307c 100644 --- a/src/fetch/ibsfetcher.cpp +++ b/src/fetch/ibsfetcher.cpp @@ -110,12 +110,12 @@ void IBSFetcher::search(FetchKey key_, const TQString& value_) { // myDebug() << "IBSFetcher::search() - url: " << u.url() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); if(key_ == ISBN) { - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotCompleteISBN(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotCompleteISBN(TDEIO::Job*))); } else { - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotComplete(TDEIO::Job*))); } } diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp index 36b19a1..7427aa4 100644 --- a/src/fetch/imdbfetcher.cpp +++ b/src/fetch/imdbfetcher.cpp @@ -165,12 +165,12 @@ void IMDBFetcher::search(FetchKey key_, const TQString& value_) { #endif m_job = TDEIO::get(m_url, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); - connect(m_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), - TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQ_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); } void IMDBFetcher::continueSearch() { @@ -609,12 +609,12 @@ void IMDBFetcher::parseMultipleNameResults() { m_redirected = true; m_data.truncate(0); m_job = TDEIO::get(m_url, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); - connect(m_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), - TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQ_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); // do not stop() here } @@ -1109,12 +1109,12 @@ void IMDBFetcher::updateEntry(Data::EntryPtr entry_) { m_url = link; m_redirected = true; // m_redirected is used as a flag later to tell if we get a single result m_job = TDEIO::get(m_url, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); - connect(m_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), - TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQ_SLOT(slotRedirection(TDEIO::Job*, const KURL&))); return; } // optimistically try searching for title and rely on Collection::sameEntry() to figure things out @@ -1139,7 +1139,7 @@ IMDBFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const IMDBFetcher* fe TQLabel* label = new TQLabel(i18n("Hos&t: "), optionsWidget()); l->addWidget(label, ++row, 0); m_hostEdit = new KLineEdit(optionsWidget()); - connect(m_hostEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_hostEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_hostEdit, row, 1); TQString w = i18n("The Internet Movie Database uses several different servers. Choose the one " "you wish to use."); @@ -1150,7 +1150,7 @@ IMDBFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const IMDBFetcher* fe label = new TQLabel(i18n("&Maximum cast: "), optionsWidget()); l->addWidget(label, ++row, 0); m_numCast = new KIntSpinBox(0, 99, 1, 10, 10, optionsWidget()); - connect(m_numCast, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_numCast, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_numCast, row, 1); w = i18n("The list of cast members may include many people. Set the maximum number returned from the search."); TQWhatsThis::add(label, w); @@ -1158,7 +1158,7 @@ IMDBFetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const IMDBFetcher* fe label->setBuddy(m_numCast); m_fetchImageCheck = new TQCheckBox(i18n("Download cover &image"), optionsWidget()); - connect(m_fetchImageCheck, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetModified())); + connect(m_fetchImageCheck, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetModified())); ++row; l->addMultiCellWidget(m_fetchImageCheck, row, row, 0, 1); w = i18n("The cover image may be downloaded as well. However, too many large images in the " diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp index 7bf8486..cc8419d 100644 --- a/src/fetch/isbndbfetcher.cpp +++ b/src/fetch/isbndbfetcher.cpp @@ -134,10 +134,10 @@ void ISBNdbFetcher::doSearch() { // myDebug() << "ISBNdbFetcher::search() - url: " << u.url() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void ISBNdbFetcher::stop() { diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp index ec879b2..b10f40f 100644 --- a/src/fetch/srufetcher.cpp +++ b/src/fetch/srufetcher.cpp @@ -184,10 +184,10 @@ void SRUFetcher::search(FetchKey key_, const TQString& value_) { // myDebug() << u.prettyURL() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void SRUFetcher::stop() { @@ -439,9 +439,9 @@ SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ / TQLabel* label = new TQLabel(i18n("Hos&t: "), optionsWidget()); l->addWidget(label, ++row, 0); m_hostEdit = new GUI::LineEdit(optionsWidget()); - connect(m_hostEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); - connect(m_hostEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(signalName(const TQString&))); - connect(m_hostEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotCheckHost())); + connect(m_hostEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); + connect(m_hostEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(signalName(const TQString&))); + connect(m_hostEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotCheckHost())); l->addWidget(m_hostEdit, row, 1); TQString w = i18n("Enter the host name of the server."); TQWhatsThis::add(label, w); @@ -451,7 +451,7 @@ SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ / label = new TQLabel(i18n("&Port: "), optionsWidget()); l->addWidget(label, ++row, 0); m_portSpinBox = new KIntSpinBox(0, 999999, 1, SRU_DEFAULT_PORT, 10, optionsWidget()); - connect(m_portSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetModified())); + connect(m_portSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotSetModified())); l->addWidget(m_portSpinBox, row, 1); w = i18n("Enter the port number of the server. The default is %1.").arg(SRU_DEFAULT_PORT); TQWhatsThis::add(label, w); @@ -461,7 +461,7 @@ SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ / label = new TQLabel(i18n("Path: "), optionsWidget()); l->addWidget(label, ++row, 0); m_pathEdit = new GUI::LineEdit(optionsWidget()); - connect(m_pathEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_pathEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_pathEdit, row, 1); w = i18n("Enter the path to the database used by the server."); TQWhatsThis::add(label, w); @@ -474,7 +474,7 @@ SRUConfigWidget::SRUConfigWidget(TQWidget* parent_, const SRUFetcher* fetcher_ / m_formatCombo->insertItem(TQString::fromLatin1("MODS"), TQString::fromLatin1("mods")); m_formatCombo->insertItem(TQString::fromLatin1("MARCXML"), TQString::fromLatin1("marcxml")); m_formatCombo->insertItem(TQString::fromLatin1("Dublin Core"), TQString::fromLatin1("dc")); - connect(m_formatCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetModified())); + connect(m_formatCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetModified())); l->addWidget(m_formatCombo, row, 1); w = i18n("Enter the result format used by the server."); TQWhatsThis::add(label, w); diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp index 9e73b50..474fc7c 100644 --- a/src/fetch/yahoofetcher.cpp +++ b/src/fetch/yahoofetcher.cpp @@ -120,10 +120,10 @@ void YahooFetcher::doSearch() { // myDebug() << "YahooFetcher::search() - url: " << u.url() << endl; m_job = TDEIO::get(u, false, false); - connect(m_job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(m_job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotComplete(TDEIO::Job*))); + connect(m_job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(m_job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotComplete(TDEIO::Job*))); } void YahooFetcher::stop() { diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp index bd517ae..f65d83e 100644 --- a/src/fetch/z3950fetcher.cpp +++ b/src/fetch/z3950fetcher.cpp @@ -517,9 +517,9 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* m_usePreset = new TQCheckBox(i18n("Use preset &server:"), optionsWidget()); l->addWidget(m_usePreset, ++row, 0); - connect(m_usePreset, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTogglePreset(bool))); + connect(m_usePreset, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTogglePreset(bool))); m_serverCombo = new GUI::ComboBox(optionsWidget()); - connect(m_serverCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotPresetChanged())); + connect(m_serverCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotPresetChanged())); l->addWidget(m_serverCombo, row, 1); ++row; l->addMultiCellWidget(new KSeparator(optionsWidget()), row, row, 0, 1); @@ -528,8 +528,8 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* TQLabel* label = new TQLabel(i18n("Hos&t: "), optionsWidget()); l->addWidget(label, ++row, 0); m_hostEdit = new GUI::LineEdit(optionsWidget()); - connect(m_hostEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); - connect(m_hostEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(signalName(const TQString&))); + connect(m_hostEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); + connect(m_hostEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(signalName(const TQString&))); l->addWidget(m_hostEdit, row, 1); TQString w = i18n("Enter the host name of the server."); TQWhatsThis::add(label, w); @@ -539,7 +539,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* label = new TQLabel(i18n("&Port: "), optionsWidget()); l->addWidget(label, ++row, 0); m_portSpinBox = new KIntSpinBox(0, 999999, 1, Z3950_DEFAULT_PORT, 10, optionsWidget()); - connect(m_portSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSetModified())); + connect(m_portSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotSetModified())); l->addWidget(m_portSpinBox, row, 1); w = i18n("Enter the port number of the server. The default is %1.").arg(Z3950_DEFAULT_PORT); TQWhatsThis::add(label, w); @@ -549,7 +549,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* label = new TQLabel(i18n("&Database: "), optionsWidget()); l->addWidget(label, ++row, 0); m_databaseEdit = new GUI::LineEdit(optionsWidget()); - connect(m_databaseEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_databaseEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_databaseEdit, row, 1); w = i18n("Enter the database name used by the server."); TQWhatsThis::add(label, w); @@ -563,7 +563,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* m_charSetCombo->insertItem(TQString::fromLatin1("marc8")); m_charSetCombo->insertItem(TQString::fromLatin1("iso-8859-1")); m_charSetCombo->insertItem(TQString::fromLatin1("utf-8")); - connect(m_charSetCombo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_charSetCombo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_charSetCombo, row, 1); w = i18n("Enter the character set encoding used by the z39.50 server. The most likely choice " "is MARC-8, although ISO-8859-1 is common as well."); @@ -580,7 +580,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* m_syntaxCombo->insertItem(TQString::fromLatin1("UNIMARC"), TQString::fromLatin1("unimarc")); m_syntaxCombo->insertItem(TQString::fromLatin1("USMARC"), TQString::fromLatin1("usmarc")); m_syntaxCombo->insertItem(TQString::fromLatin1("GRS-1"), TQString::fromLatin1("grs-1")); - connect(m_syntaxCombo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_syntaxCombo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_syntaxCombo, row, 1); w = i18n("Enter the data format used by the z39.50 server. Tellico will attempt to " "automatically detect the best setting if auto-detect is selected."); @@ -592,7 +592,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* l->addWidget(label, ++row, 0); m_userEdit = new GUI::LineEdit(optionsWidget()); m_userEdit->setHint(i18n("Optional")); - connect(m_userEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_userEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_userEdit, row, 1); w = i18n("Enter the authentication user name used by the z39.50 database. Most servers " "do not need one."); @@ -605,7 +605,7 @@ Z3950Fetcher::ConfigWidget::ConfigWidget(TQWidget* parent_, const Z3950Fetcher* m_passwordEdit = new GUI::LineEdit(optionsWidget()); m_passwordEdit->setHint(i18n("Optional")); m_passwordEdit->setEchoMode(TQLineEdit::Password); - connect(m_passwordEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSetModified())); + connect(m_passwordEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSetModified())); l->addWidget(m_passwordEdit, row, 1); w = i18n("Enter the authentication password used by the z39.50 database. Most servers " "do not need one. The password will be saved in plain text in the Tellico " diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp index 0ca85f9..30ff1b9 100644 --- a/src/fetchdialog.cpp +++ b/src/fetchdialog.cpp @@ -107,13 +107,13 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) for(Fetch::KeyMap::ConstIterator it = map.begin(); it != map.end(); ++it) { m_keyCombo->insertItem(it.data(), it.key()); } - connect(m_keyCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotKeyChanged(int))); + connect(m_keyCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotKeyChanged(int))); TQWhatsThis::add(m_keyCombo, i18n("Choose the type of search")); m_searchButton = new KPushButton(box1); m_searchButton->setGuiItem(KGuiItem(i18n(FETCH_STRING_STOP), SmallIconSet(TQString::fromLatin1("cancel")))); - connect(m_searchButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSearchClicked())); + connect(m_searchButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSearchClicked())); TQWhatsThis::add(m_searchButton, i18n("Click to start or stop the search")); // the search button's text changes from search to stop @@ -133,12 +133,12 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) m_multipleISBN = new TQCheckBox(i18n("&Multiple ISBN/UPC search"), box2); TQWhatsThis::add(m_multipleISBN, i18n("Check this box to search for multiple ISBN or UPC values.")); - connect(m_multipleISBN, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotMultipleISBN(bool))); + connect(m_multipleISBN, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotMultipleISBN(bool))); m_editISBN = new KPushButton(KGuiItem(i18n("Edit List..."), TQString::fromLatin1("text_block")), box2); m_editISBN->setEnabled(false); TQWhatsThis::add(m_editISBN, i18n("Click to open a text edit box for entering or editing multiple ISBN values.")); - connect(m_editISBN, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditMultipleISBN())); + connect(m_editISBN, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditMultipleISBN())); // add for spacing box2->setStretchFactor(new TQWidget(box2), 10); @@ -150,7 +150,7 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) for(Fetch::FetcherVec::Iterator it = sources.begin(); it != sources.end(); ++it) { m_sourceCombo->insertItem(Fetch::Manager::self()->fetcherIcon(it.data()), (*it).source()); } - connect(m_sourceCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSourceChanged(const TQString&))); + connect(m_sourceCombo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSourceChanged(const TQString&))); TQWhatsThis::add(m_sourceCombo, i18n("Select the database to search")); TQSplitter* split = new TQSplitter(TQt::Vertical, mainWidget); @@ -171,9 +171,9 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) m_listView->addColumn(i18n("Source")); m_listView->viewport()->installEventFilter(this); - connect(m_listView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowEntry())); + connect(m_listView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowEntry())); // double clicking should add the entry - connect(m_listView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(slotAddEntry())); + connect(m_listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(slotAddEntry())); TQWhatsThis::add(m_listView, i18n("As results are found, they are added to this list. Selecting one " "will fetch the complete entry and show it in the view below.")); @@ -192,16 +192,16 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) m_addButton = new KPushButton(i18n("&Add Entry"), box3); m_addButton->setEnabled(false); m_addButton->setIconSet(UserIconSet(Kernel::self()->collectionTypeName())); - connect(m_addButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddEntry())); + connect(m_addButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddEntry())); TQWhatsThis::add(m_addButton, i18n("Add the selected entry to the current collection")); m_moreButton = new KPushButton(KGuiItem(i18n("Get More Results"), SmallIconSet(TQString::fromLatin1("edit-find"))), box3); m_moreButton->setEnabled(false); - connect(m_moreButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoreClicked())); + connect(m_moreButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoreClicked())); TQWhatsThis::add(m_moreButton, i18n("Fetch more results from the current data source")); KPushButton* clearButton = new KPushButton(KStdGuiItem::clear(), box3); - connect(clearButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearClicked())); + connect(clearButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearClicked())); TQWhatsThis::add(clearButton, i18n("Clear all search fields and results")); TQHBox* bottombox = new TQHBox(mainWidget, "box"); @@ -218,9 +218,9 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) m_statusBar->addWidget(m_progress, 0, true); KPushButton* closeButton = new KPushButton(KStdGuiItem::close(), bottombox); - connect(closeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotClose())); + connect(closeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotClose())); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMoveProgress())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMoveProgress())); setMinimumWidth(TQMAX(minimumWidth(), FETCH_MIN_WIDTH)); setStatus(i18n("Ready.")); @@ -233,19 +233,19 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) split->setSizes(splitList); } - connect(Fetch::Manager::self(), TQT_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), - TQT_SLOT(slotResultFound(Tellico::Fetch::SearchResult*))); - connect(Fetch::Manager::self(), TQT_SIGNAL(signalStatus(const TQString&)), - TQT_SLOT(slotStatus(const TQString&))); - connect(Fetch::Manager::self(), TQT_SIGNAL(signalDone()), - TQT_SLOT(slotFetchDone())); + connect(Fetch::Manager::self(), TQ_SIGNAL(signalResultFound(Tellico::Fetch::SearchResult*)), + TQ_SLOT(slotResultFound(Tellico::Fetch::SearchResult*))); + connect(Fetch::Manager::self(), TQ_SIGNAL(signalStatus(const TQString&)), + TQ_SLOT(slotStatus(const TQString&))); + connect(Fetch::Manager::self(), TQ_SIGNAL(signalDone()), + TQ_SLOT(slotFetchDone())); // make sure to delete results afterwards m_results.setAutoDelete(true); TDEAcceleratorManager::manage(this); // initialize combos - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); #ifdef ENABLE_WEBCAM // barcode recognition @@ -258,8 +258,8 @@ FetchDialog::FetchDialog(TQWidget* parent_, const char* name_) } else { m_barcodePreview = 0; } - connect( m_barcodeRecognitionThread, TQT_SIGNAL(recognized(TQString)), this, TQT_SLOT(slotBarcodeRecognized(TQString)) ); - connect( m_barcodeRecognitionThread, TQT_SIGNAL(gotImage(TQImage&)), this, TQT_SLOT(slotBarcodeGotImage(TQImage&)) ); + connect( m_barcodeRecognitionThread, TQ_SIGNAL(recognized(TQString)), this, TQ_SLOT(slotBarcodeRecognized(TQString)) ); + connect( m_barcodeRecognitionThread, TQ_SIGNAL(gotImage(TQImage&)), this, TQ_SLOT(slotBarcodeGotImage(TQImage&)) ); m_barcodeRecognitionThread->start(); /* //DEBUG TQImage img( "/home/sebastian/white.png", "PNG" ); @@ -339,7 +339,7 @@ void FetchDialog::slotStatus(const TQString& status_) { // if the queue was empty, start the timer if(m_statusMessages.count() == 1) { // wait 2 seconds - TQTimer::singleShot(2000, this, TQT_SLOT(slotUpdateStatus())); + TQTimer::singleShot(2000, this, TQ_SLOT(slotUpdateStatus())); } } @@ -351,7 +351,7 @@ void FetchDialog::slotUpdateStatus() { m_statusMessages.pop_front(); if(!m_statusMessages.isEmpty()) { // wait 2 seconds - TQTimer::singleShot(2000, this, TQT_SLOT(slotUpdateStatus())); + TQTimer::singleShot(2000, this, TQ_SLOT(slotUpdateStatus())); } } @@ -417,7 +417,7 @@ void FetchDialog::slotFetchDone(bool checkISBN /* = true */) { lay->addWidget(edit); edit->setText(values.join(TQChar('\n'))); TQWhatsThis::add(edit, s); - connect(dlg, TQT_SIGNAL(okClicked()), dlg, TQT_SLOT(deleteLater())); + connect(dlg, TQ_SIGNAL(okClicked()), dlg, TQ_SLOT(deleteLater())); dlg->setMainWidget(box); dlg->setMinimumWidth(TQMAX(dlg->minimumWidth(), FETCH_MIN_WIDTH*2/3)); dlg->show(); @@ -556,7 +556,7 @@ void FetchDialog::slotKeyChanged(int idx_) { m_valueLineEdit->setValidator(new ISBNValidator(this)); } else { UPCValidator* upc = new UPCValidator(this); - connect(upc, TQT_SIGNAL(signalISBN()), TQT_SLOT(slotUPC2ISBN())); + connect(upc, TQ_SIGNAL(signalISBN()), TQ_SLOT(slotUPC2ISBN())); m_valueLineEdit->setValidator(upc); // only want to convert to ISBN if ISBN is accepted by the fetcher Fetch::KeyMap map = Fetch::Manager::self()->keyMap(m_sourceCombo->currentText()); @@ -610,7 +610,7 @@ void FetchDialog::slotEditMultipleISBN() { KPushButton* fromFileBtn = new KPushButton(SmallIconSet(TQString::fromLatin1("document-open")), i18n("&Load From File..."), box); TQWhatsThis::add(fromFileBtn, i18n("Load the list from a text file.")); - connect(fromFileBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotLoadISBNList())); + connect(fromFileBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotLoadISBNList())); dlg.setMainWidget(box); dlg.setMinimumWidth(TQMAX(dlg.minimumWidth(), FETCH_MIN_WIDTH*2/3)); diff --git a/src/fetcherconfigdialog.cpp b/src/fetcherconfigdialog.cpp index 2d743a7..f307420 100644 --- a/src/fetcherconfigdialog.cpp +++ b/src/fetcherconfigdialog.cpp @@ -88,7 +88,7 @@ void FetcherConfigDialog::init(Fetch::Type type_) { m_nameEdit->setFocus(); TQWhatsThis::add(m_nameEdit, w); label->setBuddy(m_nameEdit); - connect(m_nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&))); + connect(m_nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotNameChanged(const TQString&))); if(m_newSource) { label = new TQLabel(i18n("Source &type: "), widget); @@ -121,7 +121,7 @@ void FetcherConfigDialog::init(Fetch::Type type_) { if(m_newSource) { m_stack = new TQWidgetStack(widget); vlay2->addWidget(m_stack); - connect(m_typeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotNewSourceSelected(int))); + connect(m_typeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotNewSourceSelected(int))); int z3950_idx = 0; const Fetch::TypePairList typeList = Fetch::Manager::self()->typeList(); @@ -141,7 +141,7 @@ void FetcherConfigDialog::init(Fetch::Type type_) { // just add config widget and reparent m_configWidget->reparent(widget, TQPoint()); vlay2->addWidget(m_configWidget); - connect(m_configWidget, TQT_SIGNAL(signalName(const TQString&)), TQT_SLOT(slotPossibleNewName(const TQString&))); + connect(m_configWidget, TQ_SIGNAL(signalName(const TQString&)), TQ_SLOT(slotPossibleNewName(const TQString&))); } setMainWidget(widget); @@ -200,7 +200,7 @@ void FetcherConfigDialog::slotNewSourceSelected(int idx_) { slotNewSourceSelected(0); return; } - connect(cw, TQT_SIGNAL(signalName(const TQString&)), TQT_SLOT(slotPossibleNewName(const TQString&))); + connect(cw, TQ_SIGNAL(signalName(const TQString&)), TQ_SLOT(slotPossibleNewName(const TQString&))); m_configWidgets.insert(idx_, cw); m_stack->addWidget(cw); m_stack->raiseWidget(cw); diff --git a/src/filehandler.cpp b/src/filehandler.cpp index 0d7ed6b..0624f5e 100644 --- a/src/filehandler.cpp +++ b/src/filehandler.cpp @@ -39,7 +39,7 @@ class FileHandler::ItemDeleter : public TQObject { public: ItemDeleter(TDEIO::Job* job, KFileItem* item) : TQObject(), m_job(job), m_item(item) { FileHandler::s_deleterList.append(this); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(deleteLater())); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(deleteLater())); } ~ItemDeleter() { FileHandler::s_deleterList.removeRef(this); diff --git a/src/filterdialog.cpp b/src/filterdialog.cpp index 17c262d..b4e6337 100644 --- a/src/filterdialog.cpp +++ b/src/filterdialog.cpp @@ -78,18 +78,18 @@ void FilterRuleWidget::initWidget() { setSpacing(4); m_ruleField = new KComboBox(this); - connect(m_ruleField, TQT_SIGNAL(activated(int)), TQT_SIGNAL(signalModified())); - connect(m_ruleField, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRuleFieldChanged(int))); + connect(m_ruleField, TQ_SIGNAL(activated(int)), TQ_SIGNAL(signalModified())); + connect(m_ruleField, TQ_SIGNAL(activated(int)), TQ_SLOT(slotRuleFieldChanged(int))); m_ruleFunc = new KComboBox(this); - connect(m_ruleFunc, TQT_SIGNAL(activated(int)), TQT_SIGNAL(signalModified())); + connect(m_ruleFunc, TQ_SIGNAL(activated(int)), TQ_SIGNAL(signalModified())); m_ruleValue = new KLineEdit(this); - connect(m_ruleValue, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(signalModified())); + connect(m_ruleValue, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(signalModified())); if(!TDETrader::self()->query(TQString::fromLatin1("KRegExpEditor/KRegExpEditor")).isEmpty()) { m_editRegExp = new KPushButton(i18n("Edit..."), this); - connect(m_editRegExp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditRegExp())); - connect(m_ruleFunc, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotRuleFunctionChanged(int))); + connect(m_editRegExp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditRegExp())); + connect(m_ruleFunc, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotRuleFunctionChanged(int))); slotRuleFunctionChanged(m_ruleFunc->currentItem()); } @@ -101,10 +101,10 @@ void FilterRuleWidget::initWidget() { m_ruleFunc->insertStringList(m_ruleFuncList); // m_ruleFunc->adjustSize(); -// connect(m_ruleField, TQT_SIGNAL(textChanged(const TQString &)), -// this, TQT_SIGNAL(fieldChanged(const TQString &))); -// connect(m_ruleValue, TQT_SIGNAL(textChanged(const TQString &)), -// this, TQT_SIGNAL(contentsChanged(const TQString &))); +// connect(m_ruleField, TQ_SIGNAL(textChanged(const TQString &)), +// this, TQ_SIGNAL(fieldChanged(const TQString &))); +// connect(m_ruleValue, TQ_SIGNAL(textChanged(const TQString &)), +// this, TQ_SIGNAL(contentsChanged(const TQString &))); } void FilterRuleWidget::slotEditRegExp() { @@ -255,7 +255,7 @@ void FilterRuleWidgetLister::setFocus() { TQWidget* FilterRuleWidgetLister::createWidget(TQWidget* parent_) { TQWidget* w = new FilterRuleWidget(static_cast(0), parent_); - connect(w, TQT_SIGNAL(signalModified()), TQT_SIGNAL(signalModified())); + connect(w, TQ_SIGNAL(signalModified()), TQ_SIGNAL(signalModified())); return w; } @@ -300,11 +300,11 @@ void FilterDialog::init() { m_matchAll = new TQRadioButton(i18n("Match a&ll of the following"), bg); m_matchAny = new TQRadioButton(i18n("Match an&y of the following"), bg); m_matchAll->setChecked(true); - connect(bg, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotFilterChanged())); + connect(bg, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotFilterChanged())); m_ruleLister = new FilterRuleWidgetLister(m_matchGroup); - connect(m_ruleLister, TQT_SIGNAL(widgetRemoved()), TQT_SLOT(slotShrink())); - connect(m_ruleLister, TQT_SIGNAL(signalModified()), TQT_SLOT(slotFilterChanged())); + connect(m_ruleLister, TQ_SIGNAL(widgetRemoved()), TQ_SLOT(slotShrink())); + connect(m_ruleLister, TQ_SIGNAL(signalModified()), TQ_SLOT(slotFilterChanged())); m_ruleLister->setFocus(); TQHBoxLayout* blay = new TQHBoxLayout(topLayout); @@ -312,14 +312,14 @@ void FilterDialog::init() { m_filterName = new KLineEdit(page); blay->addWidget(m_filterName); - connect(m_filterName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFilterChanged())); + connect(m_filterName, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotFilterChanged())); // only when creating a new filter can it be saved if(m_mode == CreateFilter) { m_saveFilter = new KPushButton(SmallIconSet(TQString::fromLatin1("filter")), i18n("&Save Filter"), page); blay->addWidget(m_saveFilter); m_saveFilter->setEnabled(false); - connect(m_saveFilter, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveFilter())); + connect(m_saveFilter, TQ_SIGNAL(clicked()), TQ_SLOT(slotSaveFilter())); enableButtonApply(false); } enableButtonOK(false); // disable at start diff --git a/src/filterview.cpp b/src/filterview.cpp index 2e724e4..fc12c68 100644 --- a/src/filterview.cpp +++ b/src/filterview.cpp @@ -38,8 +38,8 @@ FilterView::FilterView(TQWidget* parent_, const char* name_) : GUI::ListView(par setTreeStepSize(15); setFullWidth(true); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); } bool FilterView::isSelectable(GUI::ListViewItem* item_) const { @@ -65,9 +65,9 @@ void FilterView::contextMenuRequested(TQListViewItem* item_, const TQPoint& poin if(item->isFilterItem()) { TDEPopupMenu menu(this); menu.insertItem(SmallIconSet(TQString::fromLatin1("filter")), - i18n("Modify Filter"), this, TQT_SLOT(slotModifyFilter())); + i18n("Modify Filter"), this, TQ_SLOT(slotModifyFilter())); menu.insertItem(SmallIconSet(TQString::fromLatin1("edit-delete")), - i18n("Delete Filter"), this, TQT_SLOT(slotDeleteFilter())); + i18n("Delete Filter"), this, TQ_SLOT(slotDeleteFilter())); menu.exec(point_); } } diff --git a/src/groupview.cpp b/src/groupview.cpp index bce55d1..b79ff4f 100644 --- a/src/groupview.cpp +++ b/src/groupview.cpp @@ -48,14 +48,14 @@ GroupView::GroupView(TQWidget* parent_, const char* name_/*=0*/) setTreeStepSize(15); setFullWidth(true); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), - TQT_SLOT(slotExpanded(TQListViewItem*))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), + TQ_SLOT(slotExpanded(TQListViewItem*))); - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), - TQT_SLOT(slotCollapsed(TQListViewItem*))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), + TQ_SLOT(slotCollapsed(TQListViewItem*))); m_groupOpenPixmap = SmallIcon(TQString::fromLatin1("folder_open")); m_groupClosedPixmap = SmallIcon(TQString::fromLatin1("folder")); @@ -249,11 +249,11 @@ void GroupView::contextMenuRequested(TQListViewItem* item_, const TQPoint& point GUI::ListViewItem* item = static_cast(item_); if(item->isEntryGroupItem()) { menu.insertItem(SmallIconSet(TQString::fromLatin1("2downarrow")), - i18n("Expand All Groups"), this, TQT_SLOT(slotExpandAll())); + i18n("Expand All Groups"), this, TQ_SLOT(slotExpandAll())); menu.insertItem(SmallIconSet(TQString::fromLatin1("2uparrow")), - i18n("Collapse All Groups"), this, TQT_SLOT(slotCollapseAll())); + i18n("Collapse All Groups"), this, TQ_SLOT(slotCollapseAll())); menu.insertItem(SmallIconSet(TQString::fromLatin1("filter")), - i18n("Filter by Group"), this, TQT_SLOT(slotFilterGroup())); + i18n("Filter by Group"), this, TQ_SLOT(slotFilterGroup())); } else if(item->isEntryItem()) { Controller::self()->plugEntryActions(&menu); } diff --git a/src/gui/boolfieldwidget.cpp b/src/gui/boolfieldwidget.cpp index 6e7771d..b1dbdad 100644 --- a/src/gui/boolfieldwidget.cpp +++ b/src/gui/boolfieldwidget.cpp @@ -25,7 +25,7 @@ BoolFieldWidget::BoolFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const : FieldWidget(field_, parent_, name_) { m_checkBox = new TQCheckBox(this); - connect(m_checkBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(modified())); + connect(m_checkBox, TQ_SIGNAL(clicked()), TQ_SIGNAL(modified())); registerWidget(); } diff --git a/src/gui/choicefieldwidget.cpp b/src/gui/choicefieldwidget.cpp index 83e31f9..ee40c26 100644 --- a/src/gui/choicefieldwidget.cpp +++ b/src/gui/choicefieldwidget.cpp @@ -25,7 +25,7 @@ ChoiceFieldWidget::ChoiceFieldWidget(Data::FieldPtr field_, TQWidget* parent_, c : FieldWidget(field_, parent_, name_), m_comboBox(0) { m_comboBox = new KComboBox(this); - connect(m_comboBox, TQT_SIGNAL(activated(int)), TQT_SIGNAL(modified())); + connect(m_comboBox, TQ_SIGNAL(activated(int)), TQ_SIGNAL(modified())); // always have empty choice m_comboBox->insertItem(TQString()); m_comboBox->insertStringList(field_->allowed()); diff --git a/src/gui/datefieldwidget.cpp b/src/gui/datefieldwidget.cpp index 8f308f8..deae553 100644 --- a/src/gui/datefieldwidget.cpp +++ b/src/gui/datefieldwidget.cpp @@ -21,7 +21,7 @@ DateFieldWidget::DateFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const : FieldWidget(field_, parent_, name_) { m_widget = new DateWidget(this); - connect(m_widget, TQT_SIGNAL(signalModified()), TQT_SIGNAL(modified())); + connect(m_widget, TQ_SIGNAL(signalModified()), TQ_SIGNAL(modified())); registerWidget(); } diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp index b6ad777..08a0eab 100644 --- a/src/gui/datewidget.cpp +++ b/src/gui/datewidget.cpp @@ -66,13 +66,13 @@ DateWidget::DateWidget(TQWidget* parent_, const char* name_) : TQWidget(parent_, locale->calendar()->maxValidYear(), this); l->addWidget(m_yearSpin, 1); - connect(m_daySpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDateChanged())); - connect(m_monthCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotDateChanged())); - connect(m_yearSpin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDateChanged())); + connect(m_daySpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDateChanged())); + connect(m_monthCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotDateChanged())); + connect(m_yearSpin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDateChanged())); m_dateButton = new KPushButton(this); m_dateButton->setIconSet(SmallIconSet(TQString::fromLatin1("date"))); - connect(m_dateButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotShowPicker())); + connect(m_dateButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotShowPicker())); l->addWidget(m_dateButton, 0); m_frame = new TQVBox(0, 0, WType_Popup); @@ -81,8 +81,8 @@ DateWidget::DateWidget(TQWidget* parent_, const char* name_) : TQWidget(parent_, m_frame->hide(); m_picker = new KDatePicker(m_frame, 0); // must include name to get correct constructor - connect(m_picker, TQT_SIGNAL(dateEntered(TQDate)), TQT_SLOT(slotDateEntered(TQDate))); - connect(m_picker, TQT_SIGNAL(dateSelected(TQDate)), TQT_SLOT(slotDateSelected(TQDate))); + connect(m_picker, TQ_SIGNAL(dateEntered(TQDate)), TQ_SLOT(slotDateEntered(TQDate))); + connect(m_picker, TQ_SIGNAL(dateSelected(TQDate)), TQ_SLOT(slotDateSelected(TQDate))); } void DateWidget::slotDateChanged() { diff --git a/src/gui/fieldwidget.cpp b/src/gui/fieldwidget.cpp index 41d3d82..c443ae8 100644 --- a/src/gui/fieldwidget.cpp +++ b/src/gui/fieldwidget.cpp @@ -121,12 +121,12 @@ FieldWidget::FieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* n m_editMultiple = new TQCheckBox(this); m_editMultiple->setChecked(true); m_editMultiple->setFixedWidth(m_editMultiple->sizeHint().width()); // don't let it have any extra space - connect(m_editMultiple, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setEnabled(bool))); + connect(m_editMultiple, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setEnabled(bool))); l->addWidget(m_editMultiple); TQWhatsThis::add(this, field_->description()); // after letting the subclass get created, insert default value - TQTimer::singleShot(0, this, TQT_SLOT(insertDefault())); + TQTimer::singleShot(0, this, TQ_SLOT(insertDefault())); } void FieldWidget::insertDefault() { @@ -166,10 +166,10 @@ void FieldWidget::editMultiple(bool show_) { // FIXME: maybe modified should only be signaled when the button is toggle on if(show_) { m_editMultiple->show(); - connect(m_editMultiple, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(modified())); + connect(m_editMultiple, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(modified())); } else { m_editMultiple->hide(); - disconnect(m_editMultiple, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(modified())); + disconnect(m_editMultiple, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(modified())); } // the widget length needs to be updated since it gets shorter widget()->updateGeometry(); diff --git a/src/gui/imagefieldwidget.cpp b/src/gui/imagefieldwidget.cpp index 77f67b9..68f889c 100644 --- a/src/gui/imagefieldwidget.cpp +++ b/src/gui/imagefieldwidget.cpp @@ -23,7 +23,7 @@ ImageFieldWidget::ImageFieldWidget(Data::FieldPtr field_, TQWidget* parent_, con m_widget = new ImageWidget(this); m_widget->setLinkOnlyChecked(field_->property(TQString::fromLatin1("link")) == Latin1Literal("true")); - connect(m_widget, TQT_SIGNAL(signalModified()), TQT_SIGNAL(modified())); + connect(m_widget, TQ_SIGNAL(signalModified()), TQ_SIGNAL(modified())); registerWidget(); } diff --git a/src/gui/imagewidget.cpp b/src/gui/imagewidget.cpp index 75fe95f..73997ee 100644 --- a/src/gui/imagewidget.cpp +++ b/src/gui/imagewidget.cpp @@ -54,14 +54,14 @@ ImageWidget::ImageWidget(TQWidget* parent_, const char* name_) : TQWidget(parent boxLayout->addStretch(1); KButtonBox* box = new KButtonBox(this,TQt::Vertical); - box->addButton(i18n("Select Image..."), this, TQT_SLOT(slotGetImage())); - box->addButton(i18n("Clear"), this, TQT_SLOT(slotClear())); + box->addButton(i18n("Select Image..."), this, TQ_SLOT(slotGetImage())); + box->addButton(i18n("Clear"), this, TQ_SLOT(slotClear())); box->layout(); boxLayout->addWidget(box); boxLayout->addSpacing(8); m_cbLinkOnly = new TQCheckBox(i18n("Save link only"), this); - connect(m_cbLinkOnly, TQT_SIGNAL(clicked()), TQT_SLOT(slotLinkOnlyClicked())); + connect(m_cbLinkOnly, TQ_SIGNAL(clicked()), TQ_SLOT(slotLinkOnlyClicked())); boxLayout->addWidget(m_cbLinkOnly); boxLayout->addStretch(1); diff --git a/src/gui/kwidgetlister.cpp b/src/gui/kwidgetlister.cpp index 90fc007..edbda13 100644 --- a/src/gui/kwidgetlister.cpp +++ b/src/gui/kwidgetlister.cpp @@ -71,12 +71,12 @@ KWidgetLister::KWidgetLister( int minWidgets, int maxWidgets, TQWidget *parent, mButtonBox->setStretchFactor( mBtnClear, 0 ); //---------- connect everything - connect( mBtnMore, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotMore()) ); - connect( mBtnFewer, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFewer()) ); - connect( mBtnClear, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClear()) ); + connect( mBtnMore, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotMore()) ); + connect( mBtnFewer, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFewer()) ); + connect( mBtnClear, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClear()) ); enableControls(); } diff --git a/src/gui/lineedit.cpp b/src/gui/lineedit.cpp index 1096671..814fee8 100644 --- a/src/gui/lineedit.cpp +++ b/src/gui/lineedit.cpp @@ -28,7 +28,7 @@ LineEdit::LineEdit(TQWidget* parent_, const char* name_) : KLineEdit(parent_, na , m_allowSpellCheck(false) , m_enableSpellCheck(true) , m_spell(0) { - m_spellAction = KStdAction::spelling(this, TQT_SLOT(slotCheckSpelling()), new TDEActionCollection(this)); + m_spellAction = KStdAction::spelling(this, TQ_SLOT(slotCheckSpelling()), new TDEActionCollection(this)); } void LineEdit::clear() { @@ -110,19 +110,19 @@ void LineEdit::slotCheckSpelling() { delete m_spell; // re-use the action string to get translations m_spell = new KSpell(this, m_spellAction->text(), - this, TQT_SLOT(slotSpellCheckReady(KSpell*)), 0, true, true); - - connect(m_spell, TQT_SIGNAL(death()), - TQT_SLOT(spellCheckerFinished())); - connect(m_spell, TQT_SIGNAL(misspelling( const TQString &, const TQStringList &, unsigned int)), - TQT_SLOT(spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int))); - connect(m_spell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)), - TQT_SLOT(spellCheckerCorrected(const TQString &, const TQString &, unsigned int))); + this, TQ_SLOT(slotSpellCheckReady(KSpell*)), 0, true, true); + + connect(m_spell, TQ_SIGNAL(death()), + TQ_SLOT(spellCheckerFinished())); + connect(m_spell, TQ_SIGNAL(misspelling( const TQString &, const TQStringList &, unsigned int)), + TQ_SLOT(spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int))); + connect(m_spell, TQ_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)), + TQ_SLOT(spellCheckerCorrected(const TQString &, const TQString &, unsigned int))); } void LineEdit::slotSpellCheckReady(KSpell* spell) { spell->check(text()); - connect(spell, TQT_SIGNAL(done(const TQString&)), TQT_SLOT(slotSpellCheckDone(const TQString&))); + connect(spell, TQ_SIGNAL(done(const TQString&)), TQ_SLOT(slotSpellCheckDone(const TQString&))); } void LineEdit::slotSpellCheckDone(const TQString& newText) { diff --git a/src/gui/linefieldwidget.cpp b/src/gui/linefieldwidget.cpp index ee4474a..86b0ab8 100644 --- a/src/gui/linefieldwidget.cpp +++ b/src/gui/linefieldwidget.cpp @@ -27,7 +27,7 @@ LineFieldWidget::LineFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const m_lineEdit = new GUI::LineEdit(this); m_lineEdit->setAllowSpellCheck(true); m_lineEdit->setEnableSpellCheck(field_->formatFlag() != Data::Field::FormatName); - connect(m_lineEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(modified())); + connect(m_lineEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(modified())); registerWidget(); diff --git a/src/gui/listview.cpp b/src/gui/listview.cpp index 37673e0..2634097 100644 --- a/src/gui/listview.cpp +++ b/src/gui/listview.cpp @@ -28,16 +28,16 @@ using Tellico::GUI::ListViewItem; ListView::ListView(TQWidget* parent_, const char* name_) : TDEListView(parent_, name_/*=0*/), m_sortStyle(SortByText), m_isClear(true) { setSelectionMode(TQListView::Extended); - connect(this, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged())); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(slotDoubleClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(slotDoubleClicked(TQListViewItem*))); #if !KDE_IS_VERSION(3,3,90) m_shadeSortColumn = false; // call it once to initialize slotUpdateColors(); #endif - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotUpdateColors())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotUpdateColors())); m_comparisons.setAutoDelete(true); } diff --git a/src/gui/numberfieldwidget.cpp b/src/gui/numberfieldwidget.cpp index 3893f08..4fc1f46 100644 --- a/src/gui/numberfieldwidget.cpp +++ b/src/gui/numberfieldwidget.cpp @@ -36,8 +36,8 @@ NumberFieldWidget::NumberFieldWidget(Data::FieldPtr field_, TQWidget* parent_, c void NumberFieldWidget::initLineEdit() { m_lineEdit = new KLineEdit(this); - connect(m_lineEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(modified())); - // connect(kl, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotHandleReturn())); + connect(m_lineEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(modified())); + // connect(kl, TQ_SIGNAL(returnPressed(const TQString&)), this, TQ_SLOT(slotHandleReturn())); // regexp is any number of digits followed optionally by any number of // groups of a semi-colon followed optionally by a space, followed by digits @@ -48,10 +48,10 @@ void NumberFieldWidget::initLineEdit() { void NumberFieldWidget::initSpinBox() { // intentionally allow only positive numbers m_spinBox = new GUI::SpinBox(-1, INT_MAX, this); - connect(m_spinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(modified())); + connect(m_spinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(modified())); // TQSpinBox doesn't emit valueChanged if you edit the value with // the lineEdit until you change the keyboard focus - connect(m_spinBox->child("qt_spinbox_edit"), TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(modified())); + connect(m_spinBox->child("qt_spinbox_edit"), TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(modified())); // I want to allow no value, so set space as special text. Empty text is ignored m_spinBox->setSpecialValueText(TQChar(' ')); } diff --git a/src/gui/parafieldwidget.cpp b/src/gui/parafieldwidget.cpp index 12444f0..28a4a25 100644 --- a/src/gui/parafieldwidget.cpp +++ b/src/gui/parafieldwidget.cpp @@ -27,7 +27,7 @@ ParaFieldWidget::ParaFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const if(field_->property(TQString::fromLatin1("tools-check-spelling")) != Latin1Literal("false")) { m_textEdit->setCheckSpellingEnabled(true); } - connect(m_textEdit, TQT_SIGNAL(textChanged()), TQT_SIGNAL(modified())); + connect(m_textEdit, TQ_SIGNAL(textChanged()), TQ_SIGNAL(modified())); registerWidget(); } diff --git a/src/gui/previewdialog.cpp b/src/gui/previewdialog.cpp index 673c465..9b129b2 100644 --- a/src/gui/previewdialog.cpp +++ b/src/gui/previewdialog.cpp @@ -27,7 +27,7 @@ PreviewDialog::PreviewDialog(TQWidget* parent_) i18n("Template Preview"), KDialogBase::Ok) , m_tempDir(new KTempDir()) { m_tempDir->setAutoDelete(true); - connect(this, TQT_SIGNAL(finished()), TQT_SLOT(delayedDestruct())); + connect(this, TQ_SIGNAL(finished()), TQ_SLOT(delayedDestruct())); m_view = new EntryView(this); setMainWidget(m_view->view()); diff --git a/src/gui/ratingfieldwidget.cpp b/src/gui/ratingfieldwidget.cpp index 77b1677..5a88adc 100644 --- a/src/gui/ratingfieldwidget.cpp +++ b/src/gui/ratingfieldwidget.cpp @@ -20,7 +20,7 @@ using Tellico::GUI::RatingFieldWidget; RatingFieldWidget::RatingFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const char* name_/*=0*/) : FieldWidget(field_, parent_, name_) { m_rating = new RatingWidget(field_, this); - connect(m_rating, TQT_SIGNAL(modified()), TQT_SIGNAL(modified())); + connect(m_rating, TQ_SIGNAL(modified()), TQ_SIGNAL(modified())); registerWidget(); } diff --git a/src/gui/stringmapdialog.cpp b/src/gui/stringmapdialog.cpp index 28867a0..2e75e67 100644 --- a/src/gui/stringmapdialog.cpp +++ b/src/gui/stringmapdialog.cpp @@ -41,8 +41,8 @@ StringMapDialog::StringMapDialog(const TQMap& map_, TQWidget m_listView->setColumnWidthMode(0, TQListView::Maximum); m_listView->setColumnWidthMode(1, TQListView::Maximum); m_listView->setResizeMode(TQListView::AllColumns); - connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem*)), TQT_SLOT(slotUpdate(TQListViewItem*))); - connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotUpdate(TQListViewItem*))); + connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem*)), TQ_SLOT(slotUpdate(TQListViewItem*))); + connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotUpdate(TQListViewItem*))); l->addWidget(m_listView); TQHBox* box = new TQHBox(page); @@ -54,9 +54,9 @@ StringMapDialog::StringMapDialog(const TQMap& map_, TQWidget m_edit2 = new KLineEdit(box); KButtonBox* bb = new KButtonBox(box); bb->addStretch(); - TQPushButton* btn = bb->addButton(i18n("&Set"), this, TQT_SLOT(slotAdd())); + TQPushButton* btn = bb->addButton(i18n("&Set"), this, TQ_SLOT(slotAdd())); btn->setIconSet(BarIcon(TQString::fromLatin1("document-new"), TDEIcon::SizeSmall)); - btn = bb->addButton(i18n("&Delete"), this, TQT_SLOT(slotDelete())); + btn = bb->addButton(i18n("&Delete"), this, TQ_SLOT(slotDelete())); btn->setIconSet(BarIcon(TQString::fromLatin1("edit-delete"), TDEIcon::SizeSmall)); l->addWidget(box); diff --git a/src/gui/tablefieldwidget.cpp b/src/gui/tablefieldwidget.cpp index d030968..724918c 100644 --- a/src/gui/tablefieldwidget.cpp +++ b/src/gui/tablefieldwidget.cpp @@ -49,7 +49,7 @@ TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, TQWidget* parent_, con m_table->verticalHeader()->setClickEnabled(true); m_table->verticalHeader()->installEventFilter(this); - connect(m_table->verticalHeader(), TQT_SIGNAL(indexChange(int, int, int)), TQT_SIGNAL(modified())); + connect(m_table->verticalHeader(), TQ_SIGNAL(indexChange(int, int, int)), TQ_SIGNAL(modified())); m_table->setDragEnabled(false); m_table->setFocusStyle(TQTable::FollowStyle); @@ -61,10 +61,10 @@ TableFieldWidget::TableFieldWidget(Data::FieldPtr field_, TQWidget* parent_, con m_table->setSelectionMode(TQTable::NoSelection); m_table->setHScrollBarMode(TQScrollView::AlwaysOff); - connect(m_table, TQT_SIGNAL(valueChanged(int, int)), TQT_SIGNAL(modified())); - connect(m_table, TQT_SIGNAL(currentChanged(int, int)), TQT_SLOT(slotCheckRows(int, int))); - connect(m_table, TQT_SIGNAL(valueChanged(int, int)), TQT_SLOT(slotResizeColumn(int, int))); - connect(m_table, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint&)), TQT_SLOT(contextMenu(int, int, const TQPoint&))); + connect(m_table, TQ_SIGNAL(valueChanged(int, int)), TQ_SIGNAL(modified())); + connect(m_table, TQ_SIGNAL(currentChanged(int, int)), TQ_SLOT(slotCheckRows(int, int))); + connect(m_table, TQ_SIGNAL(valueChanged(int, int)), TQ_SLOT(slotResizeColumn(int, int))); + connect(m_table, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint&)), TQ_SLOT(contextMenu(int, int, const TQPoint&))); registerWidget(); } @@ -239,7 +239,7 @@ bool TableFieldWidget::eventFilter(TQObject* obj_, TQEvent* ev_) { m_col = col; TDEPopupMenu menu(this); menu.insertItem(SmallIconSet(TQString::fromLatin1("edit")), i18n("Rename Column..."), - this, TQT_SLOT(slotRenameColumn())); + this, TQ_SLOT(slotRenameColumn())); menu.exec(ev->globalPos()); return true; } else if(obj_ == m_table->verticalHeader()) { @@ -272,28 +272,28 @@ void TableFieldWidget::contextMenu(int row_, int col_, const TQPoint& p_) { int id; TDEPopupMenu menu(this); menu.insertItem(SmallIconSet(TQString::fromLatin1("insrow")), i18n("Insert Row"), - this, TQT_SLOT(slotInsertRow())); + this, TQ_SLOT(slotInsertRow())); menu.insertItem(SmallIconSet(TQString::fromLatin1("remrow")), i18n("Remove Row"), - this, TQT_SLOT(slotRemoveRow())); + this, TQ_SLOT(slotRemoveRow())); id = menu.insertItem(SmallIconSet(TQString::fromLatin1("1uparrow")), i18n("Move Row Up"), - this, TQT_SLOT(slotMoveRowUp())); + this, TQ_SLOT(slotMoveRowUp())); if(m_row == 0) { menu.setItemEnabled(id, false); } id = menu.insertItem(SmallIconSet(TQString::fromLatin1("1downarrow")), i18n("Move Row Down"), - this, TQT_SLOT(slotMoveRowDown())); + this, TQ_SLOT(slotMoveRowDown())); if(m_row == m_table->numRows()-1) { menu.setItemEnabled(id, false); } menu.insertSeparator(); id = menu.insertItem(SmallIconSet(TQString::fromLatin1("edit")), i18n("Rename Column..."), - this, TQT_SLOT(slotRenameColumn())); + this, TQ_SLOT(slotRenameColumn())); if(m_col < 0 || m_col > m_columns-1) { menu.setItemEnabled(id, false); } menu.insertSeparator(); menu.insertItem(SmallIconSet(TQString::fromLatin1("locationbar_erase")), i18n("Clear Table"), - this, TQT_SLOT(clear())); + this, TQ_SLOT(clear())); menu.exec(p_); } diff --git a/src/gui/urlfieldwidget.cpp b/src/gui/urlfieldwidget.cpp index 187f8bb..6b28013 100644 --- a/src/gui/urlfieldwidget.cpp +++ b/src/gui/urlfieldwidget.cpp @@ -38,9 +38,9 @@ URLFieldWidget::URLFieldWidget(Data::FieldPtr field_, TQWidget* parent_, const c m_requester = new KURLRequester(this); m_requester->lineEdit()->setCompletionObject(new URLCompletion()); m_requester->lineEdit()->setAutoDeleteCompletionObject(true); - connect(m_requester, TQT_SIGNAL(textChanged(const TQString&)), TQT_SIGNAL(modified())); - connect(m_requester, TQT_SIGNAL(textChanged(const TQString&)), label(), TQT_SLOT(setURL(const TQString&))); - connect(label(), TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(slotOpenURL(const TQString&))); + connect(m_requester, TQ_SIGNAL(textChanged(const TQString&)), TQ_SIGNAL(modified())); + connect(m_requester, TQ_SIGNAL(textChanged(const TQString&)), label(), TQ_SLOT(setURL(const TQString&))); + connect(label(), TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(slotOpenURL(const TQString&))); registerWidget(); // special case, remember if it's a relative url diff --git a/src/importdialog.cpp b/src/importdialog.cpp index d78ae43..964643d 100644 --- a/src/importdialog.cpp +++ b/src/importdialog.cpp @@ -86,7 +86,7 @@ ImportDialog::ImportDialog(Import::Format format_, const KURL::List& urls_, TQWi topLayout->addWidget(w, 0); } - connect(bg, TQT_SIGNAL(clicked(int)), m_importer, TQT_SLOT(slotActionChanged(int))); + connect(bg, TQ_SIGNAL(clicked(int)), m_importer, TQ_SLOT(slotActionChanged(int))); topLayout->addStretch(); setMainWidget(widget); @@ -97,7 +97,7 @@ ImportDialog::ImportDialog(Import::Format format_, const KURL::List& urls_, TQWi // want to grab default button action, too // since the importer might do something with widgets, don't just call it, do it after layout is done - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateAction())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateAction())); } ImportDialog::~ImportDialog() { diff --git a/src/loandialog.cpp b/src/loandialog.cpp index fcaed2c..010b929 100644 --- a/src/loandialog.cpp +++ b/src/loandialog.cpp @@ -99,11 +99,11 @@ void LoanDialog::init() { m_borrowerEdit = new KLineEdit(hbox); l->setBuddy(m_borrowerEdit); m_borrowerEdit->completionObject()->setIgnoreCase(true); - connect(m_borrowerEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotBorrowerNameChanged(const TQString&))); + connect(m_borrowerEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotBorrowerNameChanged(const TQString&))); actionButton(Ok)->setEnabled(false); // disable until a name is entered KPushButton* pb = new KPushButton(SmallIconSet(TQString::fromLatin1("kaddressbook")), TQString(), hbox); - connect(pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotGetBorrower())); + connect(pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotGetBorrower())); TQString whats = i18n("Enter the name of the person borrowing the items from you. " "Clicking the button allows you to select from your address book."); TQWhatsThis::add(l, whats); @@ -135,7 +135,7 @@ void LoanDialog::init() { l->setBuddy(m_dueDate); topLayout->addWidget(m_dueDate, 3, 1); // valid due dates will enable the calendar adding checkbox - connect(m_dueDate, TQT_SIGNAL(signalModified()), TQT_SLOT(slotDueDateChanged())); + connect(m_dueDate, TQ_SIGNAL(signalModified()), TQ_SLOT(slotDueDateChanged())); whats = i18n("The due date is when the items are due to be returned. The due date " "is not required, unless you want to add the loan to your active calendar."); TQWhatsThis::add(l, whats); @@ -161,10 +161,10 @@ void LoanDialog::init() { resize(configDialogSize(TQString::fromLatin1("Loan Dialog Options"))); TDEABC::AddressBook* abook = TDEABC::StdAddressBook::self(true); - connect(abook, TQT_SIGNAL(addressBookChanged(AddressBook*)), - TQT_SLOT(slotLoadAddressBook())); - connect(abook, TQT_SIGNAL(loadingFinished(Resource*)), - TQT_SLOT(slotLoadAddressBook())); + connect(abook, TQ_SIGNAL(addressBookChanged(AddressBook*)), + TQ_SLOT(slotLoadAddressBook())); + connect(abook, TQ_SIGNAL(loadingFinished(Resource*)), + TQ_SLOT(slotLoadAddressBook())); slotLoadAddressBook(); } diff --git a/src/loanview.cpp b/src/loanview.cpp index 324c27a..64d3464 100644 --- a/src/loanview.cpp +++ b/src/loanview.cpp @@ -38,14 +38,14 @@ LoanView::LoanView(TQWidget* parent_, const char* name_) : GUI::ListView(parent_ setTreeStepSize(15); setFullWidth(true); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), - TQT_SLOT(slotExpanded(TQListViewItem*))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), + TQ_SLOT(slotExpanded(TQListViewItem*))); - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), - TQT_SLOT(slotCollapsed(TQListViewItem*))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), + TQ_SLOT(slotCollapsed(TQListViewItem*))); } bool LoanView::isSelectable(GUI::ListViewItem* item_) const { @@ -71,9 +71,9 @@ void LoanView::contextMenuRequested(TQListViewItem* item_, const TQPoint& point_ if(item->isLoanItem()) { TDEPopupMenu menu(this); menu.insertItem(SmallIconSet(TQString::fromLatin1("2downarrow")), - i18n("Check-in"), this, TQT_SLOT(slotCheckIn())); + i18n("Check-in"), this, TQ_SLOT(slotCheckIn())); menu.insertItem(SmallIconSet(TQString::fromLatin1("2downarrow")), - i18n("Modify Loan..."), this, TQT_SLOT(slotModifyLoan())); + i18n("Modify Loan..."), this, TQ_SLOT(slotModifyLoan())); menu.exec(point_); } } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dc6a035..5901dd9 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -151,7 +151,7 @@ MainWindow::MainWindow(TQWidget* parent_/*=0*/, const char* name_/*=0*/) : TDEMa installEventFilter(drophandler); MARK_LINE; - TQTimer::singleShot(0, this, TQT_SLOT(slotInit())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInit())); } void MainWindow::slotInit() { @@ -183,8 +183,8 @@ void MainWindow::initActions() { * File->New menu *************************************************/ TQSignalMapper* collectionMapper = new TQSignalMapper(this); - connect(collectionMapper, TQT_SIGNAL(mapped(int)), - this, TQT_SLOT(slotFileNew(int))); + connect(collectionMapper, TQ_SIGNAL(mapped(int)), + this, TQ_SLOT(slotFileNew(int))); TDEActionMenu* fileNewMenu = new TDEActionMenu(actionCollection(), "file_new_collection"); fileNewMenu->setText(i18n("New")); @@ -198,7 +198,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("book"))); action->setToolTip(i18n("Create a new book collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Book); action = new TDEAction(actionCollection(), "new_bibtex_collection"); @@ -206,7 +206,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("bibtex"))); action->setToolTip(i18n("Create a new bibtex bibliography")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Bibtex); action = new TDEAction(actionCollection(), "new_comic_book_collection"); @@ -214,7 +214,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("comic"))); action->setToolTip(i18n("Create a new comic book collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::ComicBook); action = new TDEAction(actionCollection(), "new_video_collection"); @@ -222,7 +222,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("video-x-generic"))); action->setToolTip(i18n("Create a new video collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Video); action = new TDEAction(actionCollection(), "new_music_collection"); @@ -230,7 +230,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("album"))); action->setToolTip(i18n("Create a new music collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Album); action = new TDEAction(actionCollection(), "new_coin_collection"); @@ -238,7 +238,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("coin"))); action->setToolTip(i18n("Create a new coin collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Coin); action = new TDEAction(actionCollection(), "new_stamp_collection"); @@ -246,7 +246,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("stamp"))); action->setToolTip(i18n("Create a new stamp collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Stamp); action = new TDEAction(actionCollection(), "new_card_collection"); @@ -254,7 +254,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("card"))); action->setToolTip(i18n("Create a new trading card collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Card); action = new TDEAction(actionCollection(), "new_wine_collection"); @@ -262,7 +262,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("wine"))); action->setToolTip(i18n("Create a new wine collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Wine); action = new TDEAction(actionCollection(), "new_game_collection"); @@ -270,7 +270,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("game"))); action->setToolTip(i18n("Create a new game collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Game); action = new TDEAction(actionCollection(), "new_boardgame_collection"); @@ -278,7 +278,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("boardgame"))); action->setToolTip(i18n("Create a new board game collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::BoardGame); action = new TDEAction(actionCollection(), "new_file_catalog"); @@ -286,7 +286,7 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("file"))); action->setToolTip(i18n("Create a new file catalog")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::File); action = new TDEAction(actionCollection(), "new_custom_collection"); @@ -294,30 +294,30 @@ void MainWindow::initActions() { action->setIconSet(UserIconSet(TQString::fromLatin1("document-new"))); action->setToolTip(i18n("Create a new custom collection")); fileNewMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), collectionMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), collectionMapper, TQ_SLOT(map())); collectionMapper->setMapping(action, Data::Collection::Base); /************************************************* * File menu *************************************************/ - action = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); action->setToolTip(i18n("Open an existing document")); - m_fileOpenRecent = KStdAction::openRecent(this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + m_fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); m_fileOpenRecent->setToolTip(i18n("Open a recently used file")); - m_fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); + m_fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); m_fileSave->setToolTip(i18n("Save the document")); - action = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); + action = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); action->setToolTip(i18n("Save the document as a different file...")); - action = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + action = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); action->setToolTip(i18n("Print the contents of the document...")); - action = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + action = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); action->setToolTip(i18n("Quit the application")); /**************** Import Menu ***************************/ TQSignalMapper* importMapper = new TQSignalMapper(this); - connect(importMapper, TQT_SIGNAL(mapped(int)), - this, TQT_SLOT(slotFileImport(int))); + connect(importMapper, TQ_SIGNAL(mapped(int)), + this, TQ_SLOT(slotFileImport(int))); TDEActionMenu* importMenu = new TDEActionMenu(actionCollection(), "file_import"); importMenu->setText(i18n("&Import")); @@ -330,7 +330,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import another Tellico data file")); action->setIcon(TQString::fromLatin1("tellico")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::TellicoXML); action = new TDEAction(actionCollection(), "file_import_csv"); @@ -338,7 +338,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import a CSV file")); action->setIcon(MIME_ICON("text/csv")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::CSV); action = new TDEAction(actionCollection(), "file_import_mods"); @@ -346,7 +346,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import a MODS data file")); action->setIcon(MIME_ICON("text/xml")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::MODS); action = new TDEAction(actionCollection(), "file_import_alexandria"); @@ -354,7 +354,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import data from the Alexandria book collection manager")); action->setIcon(TQString::fromLatin1("alexandria")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::Alexandria); action = new TDEAction(actionCollection(), "file_import_delicious"); @@ -362,7 +362,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import data from Delicious Library")); action->setIcon(MIME_ICON("text/xml")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::Delicious); action = new TDEAction(actionCollection(), "file_import_referencer"); @@ -370,7 +370,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import data from Referencer")); action->setIcon(TQString::fromLatin1("referencer")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::Referencer); action = new TDEAction(actionCollection(), "file_import_bibtex"); @@ -378,7 +378,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import a bibtex bibliography file")); action->setIcon(MIME_ICON("text/x-bibtex")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::Bibtex); action = new TDEAction(actionCollection(), "file_import_bibtexml"); @@ -386,7 +386,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import a Bibtexml bibliography file")); action->setIcon(MIME_ICON("text/xml")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::Bibtexml); action = new TDEAction(actionCollection(), "file_import_ris"); @@ -394,7 +394,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import an RIS reference file")); action->setIcon(MIME_ICON("application/x-research-info-systems")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::RIS); action = new TDEAction(actionCollection(), "file_import_pdf"); @@ -402,7 +402,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import a PDF file")); action->setIcon(MIME_ICON("application/pdf")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::PDF); action = new TDEAction(actionCollection(), "file_import_audiofile"); @@ -410,7 +410,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import meta-data from audio files")); action->setIcon(MIME_ICON("audio/x-mp3")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::AudioFile); #ifndef HAVE_TAGLIB action->setEnabled(false); @@ -421,7 +421,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import audio CD information")); action->setIcon(MIME_ICON("media/audiocd")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::FreeDB); #ifndef HAVE_KCDDB action->setEnabled(false); @@ -432,7 +432,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import a GCstar data file")); action->setIcon(TQString::fromLatin1("gcstar")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::GCfilms); action = new TDEAction(actionCollection(), "file_import_griffith"); @@ -440,7 +440,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import a Griffith database")); action->setIcon(TQString::fromLatin1("griffith")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::Griffith); action = new TDEAction(actionCollection(), "file_import_amc"); @@ -448,7 +448,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import an Ant Movie Catalog data file")); action->setIcon(MIME_ICON("application/x-crossover-amc")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::AMC); action = new TDEAction(actionCollection(), "file_import_filelisting"); @@ -456,7 +456,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import information about files in a folder")); action->setIcon(MIME_ICON("inode/directory")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::FileListing); action = new TDEAction(actionCollection(), "file_import_xslt"); @@ -464,14 +464,14 @@ void MainWindow::initActions() { action->setToolTip(i18n("Import using an XSL Transform")); action->setIcon(MIME_ICON("text/x-xslt")); importMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), importMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), importMapper, TQ_SLOT(map())); importMapper->setMapping(action, Import::XSLT); /**************** Export Menu ***************************/ TQSignalMapper* exportMapper = new TQSignalMapper(this); - connect(exportMapper, TQT_SIGNAL(mapped(int)), - this, TQT_SLOT(slotFileExport(int))); + connect(exportMapper, TQ_SIGNAL(mapped(int)), + this, TQ_SLOT(slotFileExport(int))); TDEActionMenu* exportMenu = new TDEActionMenu(actionCollection(), "file_export"); exportMenu->setText(i18n("&Export")); @@ -484,7 +484,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to a Tellico XML file")); action->setIcon(TQString::fromLatin1("tellico")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::TellicoXML); action = new TDEAction(actionCollection(), "file_export_zip"); @@ -492,7 +492,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to a Tellico Zip file")); action->setIcon(TQString::fromLatin1("tellico")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::TellicoZip); action = new TDEAction(actionCollection(), "file_export_html"); @@ -500,7 +500,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to an HTML file")); action->setIcon(MIME_ICON("text/html")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::HTML); action = new TDEAction(actionCollection(), "file_export_csv"); @@ -508,7 +508,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to a comma-separated values file")); action->setIcon(MIME_ICON("text/csv")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::CSV); action = new TDEAction(actionCollection(), "file_export_pilotdb"); @@ -516,7 +516,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to a PilotDB database")); action->setIcon(MIME_ICON("application/vnd.palm")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::PilotDB); action = new TDEAction(actionCollection(), "file_export_alexandria"); @@ -524,7 +524,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to an Alexandria library")); action->setIcon(TQString::fromLatin1("alexandria")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::Alexandria); action = new TDEAction(actionCollection(), "file_export_bibtex"); @@ -532,7 +532,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to a bibtex file")); action->setIcon(MIME_ICON("text/x-bibtex")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::Bibtex); action = new TDEAction(actionCollection(), "file_export_bibtexml"); @@ -540,7 +540,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to a Bibtexml file")); action->setIcon(MIME_ICON("text/xml")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::Bibtexml); action = new TDEAction(actionCollection(), "file_export_onix"); @@ -548,7 +548,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to an ONIX file")); action->setIcon(MIME_ICON("text/xml")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::ONIX); action = new TDEAction(actionCollection(), "file_export_gcfilms"); @@ -556,7 +556,7 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export to a GCfilms data file")); action->setIcon(TQString::fromLatin1("gcstar")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::GCfilms); #if 0 @@ -569,30 +569,30 @@ void MainWindow::initActions() { action->setToolTip(i18n("Export using an XSL Transform")); action->setIcon(MIME_ICON("text/x-xslt")); exportMenu->insert(action); - connect(action, TQT_SIGNAL(activated()), exportMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), exportMapper, TQ_SLOT(map())); exportMapper->setMapping(action, Export::XSLT); /************************************************* * Edit menu *************************************************/ - action = KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); + action = KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); action->setToolTip(i18n("Cut the selected text and puts it in the clipboard")); - action = KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); + action = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); action->setToolTip(i18n("Copy the selected text to the clipboard")); - action = KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); + action = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); action->setToolTip(i18n("Paste the clipboard contents")); - action = KStdAction::selectAll(this, TQT_SLOT(slotEditSelectAll()), actionCollection()); + action = KStdAction::selectAll(this, TQ_SLOT(slotEditSelectAll()), actionCollection()); action->setToolTip(i18n("Select all the entries in the collection")); - action = KStdAction::deselect(this, TQT_SLOT(slotEditDeselect()), actionCollection()); + action = KStdAction::deselect(this, TQ_SLOT(slotEditDeselect()), actionCollection()); action->setToolTip(i18n("Deselect all the entries in the collection")); action = new TDEAction(i18n("Internet Search..."), TQString::fromLatin1("wizard"), CTRL + Key_M, - this, TQT_SLOT(slotShowFetchDialog()), + this, TQ_SLOT(slotShowFetchDialog()), actionCollection(), "edit_search_internet"); action->setToolTip(i18n("Search the internet...")); action = new TDEAction(i18n("Advanced &Filter..."), TQString::fromLatin1("filter"), CTRL + Key_J, - this, TQT_SLOT(slotShowFilterDialog()), + this, TQ_SLOT(slotShowFilterDialog()), actionCollection(), "filter_dialog"); action->setToolTip(i18n("Filter the collection")); @@ -600,86 +600,86 @@ void MainWindow::initActions() { * Collection menu *************************************************/ m_newEntry = new TDEAction(i18n("&New Entry..."), TQString::fromLatin1("document-new"), CTRL + Key_N, - this, TQT_SLOT(slotNewEntry()), + this, TQ_SLOT(slotNewEntry()), actionCollection(), "coll_new_entry"); m_newEntry->setToolTip(i18n("Create a new entry")); m_editEntry = new TDEAction(i18n("&Edit Entry..."), TQString::fromLatin1("edit"), CTRL + Key_E, - this, TQT_SLOT(slotShowEntryEditor()), + this, TQ_SLOT(slotShowEntryEditor()), actionCollection(), "coll_edit_entry"); m_editEntry->setToolTip(i18n("Edit the selected entries")); m_copyEntry = new TDEAction(i18n("D&uplicate Entry"), TQString::fromLatin1("edit-copy"), CTRL + Key_Y, - Controller::self(), TQT_SLOT(slotCopySelectedEntries()), + Controller::self(), TQ_SLOT(slotCopySelectedEntries()), actionCollection(), "coll_copy_entry"); m_copyEntry->setToolTip(i18n("Copy the selected entries")); m_deleteEntry = new TDEAction(i18n("&Delete Entry"), TQString::fromLatin1("edit-delete"), CTRL + Key_D, - Controller::self(), TQT_SLOT(slotDeleteSelectedEntries()), + Controller::self(), TQ_SLOT(slotDeleteSelectedEntries()), actionCollection(), "coll_delete_entry"); m_deleteEntry->setToolTip(i18n("Delete the selected entries")); m_mergeEntry = new TDEAction(i18n("&Merge Entries"), TQString::fromLatin1("edit-copy"), CTRL + Key_G, - Controller::self(), TQT_SLOT(slotMergeSelectedEntries()), + Controller::self(), TQ_SLOT(slotMergeSelectedEntries()), actionCollection(), "coll_merge_entry"); m_mergeEntry->setToolTip(i18n("Merge the selected entries")); m_mergeEntry->setEnabled(false); // gets enabled when more than 1 entry is selected action = new TDEAction(i18n("&Generate Reports..."), TQString::fromLatin1("text-x-generic"), 0, this, - TQT_SLOT(slotShowReportDialog()), + TQ_SLOT(slotShowReportDialog()), actionCollection(), "coll_reports"); action->setToolTip(i18n("Generate collection reports")); m_checkOutEntry = new TDEAction(i18n("Check-&out..."), TQString::fromLatin1("2uparrow"), 0, - Controller::self(), TQT_SLOT(slotCheckOut()), + Controller::self(), TQ_SLOT(slotCheckOut()), actionCollection(), "coll_checkout"); m_checkOutEntry->setToolTip(i18n("Check-out the selected items")); m_checkInEntry = new TDEAction(i18n("Check-&in"), TQString::fromLatin1("2downarrow"), 0, - Controller::self(), TQT_SLOT(slotCheckIn()), + Controller::self(), TQ_SLOT(slotCheckIn()), actionCollection(), "coll_checkin"); m_checkInEntry->setToolTip(i18n("Check-in the selected items")); action = new TDEAction(i18n("&Rename Collection..."), TQString::fromLatin1("edit-clear"), CTRL + Key_R, - this, TQT_SLOT(slotRenameCollection()), + this, TQ_SLOT(slotRenameCollection()), actionCollection(), "coll_rename_collection"); action->setToolTip(i18n("Rename the collection")); action = new TDEAction(i18n("Collection &Fields..."), TQString::fromLatin1("edit"), CTRL + Key_U, - this, TQT_SLOT(slotShowCollectionFieldsDialog()), + this, TQ_SLOT(slotShowCollectionFieldsDialog()), actionCollection(), "coll_fields"); action->setToolTip(i18n("Modify the collection fields")); action = new TDEAction(i18n("Convert to &Bibliography"), 0, - this, TQT_SLOT(slotConvertToBibliography()), + this, TQ_SLOT(slotConvertToBibliography()), actionCollection(), "coll_convert_bibliography"); action->setToolTip(i18n("Convert a book collection to a bibliography")); action->setIconSet(UserIconSet(TQString::fromLatin1("bibtex"))); action = new TDEAction(i18n("String &Macros..."), TQString::fromLatin1("view_text"), 0, - this, TQT_SLOT(slotShowStringMacroDialog()), + this, TQ_SLOT(slotShowStringMacroDialog()), actionCollection(), "coll_string_macros"); action->setToolTip(i18n("Edit the bibtex string macros")); TQSignalMapper* citeMapper = new TQSignalMapper(this); - connect(citeMapper, TQT_SIGNAL(mapped(int)), - this, TQT_SLOT(slotCiteEntry(int))); + connect(citeMapper, TQ_SIGNAL(mapped(int)), + this, TQ_SLOT(slotCiteEntry(int))); action = new TDEAction(actionCollection(), "cite_clipboard"); action->setText(i18n("Copy Bibtex to Cli&pboard")); action->setToolTip(i18n("Copy bibtex citations to the clipboard")); action->setIcon(TQString::fromLatin1("edit-paste")); - connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), citeMapper, TQ_SLOT(map())); citeMapper->setMapping(action, Cite::CiteClipboard); action = new TDEAction(actionCollection(), "cite_lyxpipe"); action->setText(i18n("Cite Entry in &LyX")); action->setToolTip(i18n("Cite the selected entries in LyX")); action->setIcon(TQString::fromLatin1("lyx")); - connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), citeMapper, TQ_SLOT(map())); citeMapper->setMapping(action, Cite::CiteLyxpipe); action = new TDEAction(actionCollection(), "cite_openoffice"); action->setText(i18n("Ci&te Entry in OpenOffice.org")); action->setToolTip(i18n("Cite the selected entries in OpenOffice.org")); action->setIcon(TQString::fromLatin1("ooo-writer")); - connect(action, TQT_SIGNAL(activated()), citeMapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), citeMapper, TQ_SLOT(map())); citeMapper->setMapping(action, Cite::CiteOpenOffice); TQSignalMapper* updateMapper = new TQSignalMapper(this, "update_mapper"); - connect(updateMapper, TQT_SIGNAL(mapped(const TQString&)), - Controller::self(), TQT_SLOT(slotUpdateSelectedEntries(const TQString&))); + connect(updateMapper, TQ_SIGNAL(mapped(const TQString&)), + Controller::self(), TQ_SLOT(slotUpdateSelectedEntries(const TQString&))); m_updateEntryMenu = new TDEActionMenu(i18n("&Update Entry"), actionCollection(), "coll_update_entry"); // m_updateEntryMenu->setIconSet(BarIconSet(TQString::fromLatin1("fileexport"))); @@ -689,7 +689,7 @@ void MainWindow::initActions() { m_updateAll->setText(i18n("All Sources")); m_updateAll->setToolTip(i18n("Update entry data from all available sources")); // m_updateEntryMenu->insert(action); - connect(m_updateAll, TQT_SIGNAL(activated()), updateMapper, TQT_SLOT(map())); + connect(m_updateAll, TQ_SIGNAL(activated()), updateMapper, TQ_SLOT(map())); updateMapper->setMapping(m_updateAll, TQString::fromLatin1("_all")); /************************************************* @@ -697,50 +697,50 @@ void MainWindow::initActions() { *************************************************/ setStandardToolBarMenuEnabled(true); createStandardStatusBarAction(); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfigToolbar()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigToolbar()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigKeys()), actionCollection()); m_toggleGroupWidget = new TDEToggleAction(i18n("Show Grou&p View"), 0, - this, TQT_SLOT(slotToggleGroupWidget()), + this, TQ_SLOT(slotToggleGroupWidget()), actionCollection(), "toggle_group_widget"); m_toggleGroupWidget->setToolTip(i18n("Enable/disable the group view")); m_toggleGroupWidget->setCheckedState(i18n("Hide Grou&p View")); m_toggleEntryEditor = new TDEToggleAction(i18n("Show Entry &Editor"), 0, - this, TQT_SLOT(slotToggleEntryEditor()), + this, TQ_SLOT(slotToggleEntryEditor()), actionCollection(), "toggle_edit_widget"); m_toggleEntryEditor->setToolTip(i18n("Enable/disable the editor")); m_toggleEntryEditor->setCheckedState(i18n("Hide Entry &Editor")); m_toggleEntryView = new TDEToggleAction(i18n("Show Entry &View"), 0, - this, TQT_SLOT(slotToggleEntryView()), + this, TQ_SLOT(slotToggleEntryView()), actionCollection(), "toggle_entry_view"); m_toggleEntryView->setToolTip(i18n("Enable/disable the entry view")); m_toggleEntryView->setCheckedState(i18n("Hide Entry &View")); - KStdAction::preferences(this, TQT_SLOT(slotShowConfigDialog()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotShowConfigDialog()), actionCollection()); /************************************************* * Help menu *************************************************/ - KStdAction::tipOfDay(this, TQT_SLOT(slotShowTipOfDay()), actionCollection(), "tipOfDay"); + KStdAction::tipOfDay(this, TQ_SLOT(slotShowTipOfDay()), actionCollection(), "tipOfDay"); /************************************************* * Collection Toolbar *************************************************/ (void) new TDEAction(i18n("Change Grouping"), CTRL + Key_G, - this, TQT_SLOT(slotGroupLabelActivated()), + this, TQ_SLOT(slotGroupLabelActivated()), actionCollection(), "change_entry_grouping_accel"); m_entryGrouping = new TDESelectAction(i18n("&Group Selection"), 0, this, - TQT_SLOT(slotChangeGrouping()), + TQ_SLOT(slotChangeGrouping()), actionCollection(), "change_entry_grouping"); m_entryGrouping->setToolTip(i18n("Change the grouping of the collection")); (void) new TDEAction(i18n("Filter"), CTRL + Key_F, - this, TQT_SLOT(slotFilterLabelActivated()), + this, TQ_SLOT(slotFilterLabelActivated()), actionCollection(), "quick_filter_accel"); (void) new TDEAction(i18n("Clear Filter"), TQString::fromLatin1("locationbar_erase"), 0, - this, TQT_SLOT(slotClearFilter()), + this, TQ_SLOT(slotClearFilter()), actionCollection(), "quick_filter_clear"); m_quickFilter = new GUI::LineEdit(); @@ -748,8 +748,8 @@ void MainWindow::initActions() { // about 10 characters wide m_quickFilter->setFixedWidth(m_quickFilter->fontMetrics().maxWidth()*10); // want to update every time the filter text changes - connect(m_quickFilter, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotQueueFilter())); + connect(m_quickFilter, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotQueueFilter())); m_quickFilter->installEventFilter(this); // intercept keyEvents KWidgetAction* wAction = new KWidgetAction(m_quickFilter, i18n("Filter"), 0, 0, 0, @@ -760,10 +760,10 @@ void MainWindow::initActions() { // show tool tips in status bar actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), - TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(clearStatusText()), - TQT_SLOT(slotClearStatus())); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), + TQ_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQ_SIGNAL(clearStatusText()), + TQ_SLOT(slotClearStatus())); #ifdef UIFILE kdWarning() << "MainWindow::initActions() - change createGUI() call!" << endl; @@ -781,17 +781,17 @@ void MainWindow::initDocument() { doc->setLoadAllImages(config.readBoolEntry("Load All Images", false)); // allow status messages from the document - connect(doc, TQT_SIGNAL(signalStatusMsg(const TQString&)), - TQT_SLOT(slotStatusMsg(const TQString&))); + connect(doc, TQ_SIGNAL(signalStatusMsg(const TQString&)), + TQ_SLOT(slotStatusMsg(const TQString&))); // do stuff that changes when the doc is modified - connect(doc, TQT_SIGNAL(signalModified(bool)), - TQT_SLOT(slotEnableModifiedActions(bool))); + connect(doc, TQ_SIGNAL(signalModified(bool)), + TQ_SLOT(slotEnableModifiedActions(bool))); - connect(Kernel::self()->commandHistory(), TQT_SIGNAL(commandExecuted()), - doc, TQT_SLOT(slotSetModified())); - connect(Kernel::self()->commandHistory(), TQT_SIGNAL(documentRestored()), - doc, TQT_SLOT(slotDocumentRestored())); + connect(Kernel::self()->commandHistory(), TQ_SIGNAL(commandExecuted()), + doc, TQ_SLOT(slotSetModified())); + connect(Kernel::self()->commandHistory(), TQ_SIGNAL(documentRestored()), + doc, TQ_SLOT(slotDocumentRestored())); } void MainWindow::initView() { @@ -813,25 +813,25 @@ void MainWindow::initView() { Controller::self()->addObserver(m_detailedView); TQWhatsThis::add(m_detailedView, i18n("The Column View shows the value of multiple fields " "for each entry.")); - connect(Data::Document::self(), TQT_SIGNAL(signalCollectionImagesLoaded(Tellico::Data::CollPtr)), - m_detailedView, TQT_SLOT(slotRefreshImages())); + connect(Data::Document::self(), TQ_SIGNAL(signalCollectionImagesLoaded(Tellico::Data::CollPtr)), + m_detailedView, TQ_SLOT(slotRefreshImages())); m_viewStack = new ViewStack(m_rightSplit, "viewstack"); Controller::self()->addObserver(m_viewStack->iconView()); - connect(m_viewStack->entryView(), TQT_SIGNAL(signalAction(const KURL&)), - TQT_SLOT(slotURLAction(const KURL&))); + connect(m_viewStack->entryView(), TQ_SIGNAL(signalAction(const KURL&)), + TQ_SLOT(slotURLAction(const KURL&))); setMinimumWidth(MAIN_WINDOW_MIN_WIDTH); } void MainWindow::initConnections() { // have to toggle the menu item if the dialog gets closed - connect(m_editDialog, TQT_SIGNAL(finished()), - this, TQT_SLOT(slotEditDialogFinished())); + connect(m_editDialog, TQ_SIGNAL(finished()), + this, TQ_SLOT(slotEditDialogFinished())); // let the group view call filters, too - connect(m_groupView, TQT_SIGNAL(signalUpdateFilter(Tellico::FilterPtr)), - Controller::self(), TQT_SLOT(slotUpdateFilter(Tellico::FilterPtr))); + connect(m_groupView, TQ_SIGNAL(signalUpdateFilter(Tellico::FilterPtr)), + Controller::self(), TQ_SLOT(slotUpdateFilter(Tellico::FilterPtr))); } void MainWindow::initFileOpen(bool nofile_) { @@ -1018,7 +1018,7 @@ void MainWindow::readOptions() { m_viewStack->iconView()->setMaxAllowedIconWidth(Config::maxIconSize()); - connect(toolBar("collectionToolBar"), TQT_SIGNAL(modechange()), TQT_SLOT(slotUpdateToolbarIcons())); + connect(toolBar("collectionToolBar"), TQ_SIGNAL(modechange()), TQ_SLOT(slotUpdateToolbarIcons())); m_toggleGroupWidget->setChecked(Config::showGroupWidget()); slotToggleGroupWidget(); @@ -1405,15 +1405,15 @@ void MainWindow::slotFileQuit() { } void MainWindow::slotEditCut() { - activateEditSlot(TQT_SLOT(cut())); + activateEditSlot(TQ_SLOT(cut())); } void MainWindow::slotEditCopy() { - activateEditSlot(TQT_SLOT(copy())); + activateEditSlot(TQ_SLOT(copy())); } void MainWindow::slotEditPaste() { - activateEditSlot(TQT_SLOT(paste())); + activateEditSlot(TQ_SLOT(paste())); } void MainWindow::activateEditSlot(const char* slot_) { @@ -1450,7 +1450,7 @@ void MainWindow::slotConfigToolbar() { #else KEditToolbar dlg(actionCollection()); #endif - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -1496,10 +1496,10 @@ void MainWindow::slotShowConfigDialog() { m_configDlg = new ConfigDialog(this); m_configDlg->show(); m_configDlg->readConfiguration(); - connect(m_configDlg, TQT_SIGNAL(signalConfigChanged()), - TQT_SLOT(slotHandleConfigChange())); - connect(m_configDlg, TQT_SIGNAL(finished()), - TQT_SLOT(slotHideConfigDialog())); + connect(m_configDlg, TQ_SIGNAL(signalConfigChanged()), + TQ_SLOT(slotHandleConfigChange())); + connect(m_configDlg, TQ_SIGNAL(finished()), + TQ_SLOT(slotHideConfigDialog())); } else { KWin::activateWindow(m_configDlg->winId()); m_configDlg->show(); @@ -1680,8 +1680,8 @@ void MainWindow::slotShowReportDialog() { // myDebug() << "MainWindow::slotShowReport()" << endl; if(!m_reportDlg) { m_reportDlg = new ReportDialog(this); - connect(m_reportDlg, TQT_SIGNAL(finished()), - TQT_SLOT(slotHideReportDialog())); + connect(m_reportDlg, TQ_SIGNAL(finished()), + TQ_SLOT(slotHideReportDialog())); } else { KWin::activateWindow(m_reportDlg->winId()); } @@ -1783,14 +1783,14 @@ void MainWindow::slotShowFilterDialog() { m_filterDlg = new FilterDialog(FilterDialog::CreateFilter, this); // allow saving m_filterDlg->setFilter(m_detailedView->filter()); m_quickFilter->setEnabled(false); - connect(m_filterDlg, TQT_SIGNAL(signalCollectionModified()), - Data::Document::self(), TQT_SLOT(slotSetModified())); - connect(m_filterDlg, TQT_SIGNAL(signalUpdateFilter(Tellico::FilterPtr)), - m_quickFilter, TQT_SLOT(clear())); - connect(m_filterDlg, TQT_SIGNAL(signalUpdateFilter(Tellico::FilterPtr)), - Controller::self(), TQT_SLOT(slotUpdateFilter(Tellico::FilterPtr))); - connect(m_filterDlg, TQT_SIGNAL(finished()), - TQT_SLOT(slotHideFilterDialog())); + connect(m_filterDlg, TQ_SIGNAL(signalCollectionModified()), + Data::Document::self(), TQ_SLOT(slotSetModified())); + connect(m_filterDlg, TQ_SIGNAL(signalUpdateFilter(Tellico::FilterPtr)), + m_quickFilter, TQ_SLOT(clear())); + connect(m_filterDlg, TQ_SIGNAL(signalUpdateFilter(Tellico::FilterPtr)), + Controller::self(), TQ_SLOT(slotUpdateFilter(Tellico::FilterPtr))); + connect(m_filterDlg, TQ_SIGNAL(finished()), + TQ_SLOT(slotHideFilterDialog())); } else { KWin::activateWindow(m_filterDlg->winId()); } @@ -1808,7 +1808,7 @@ void MainWindow::slotHideFilterDialog() { void MainWindow::slotQueueFilter() { m_queuedFilters++; - TQTimer::singleShot(200, this, TQT_SLOT(slotUpdateFilter())); + TQTimer::singleShot(200, this, TQ_SLOT(slotUpdateFilter())); } void MainWindow::slotUpdateFilter() { @@ -1872,8 +1872,8 @@ void MainWindow::setFilter(const TQString& text_) { void MainWindow::slotShowCollectionFieldsDialog() { if(!m_collFieldsDlg) { m_collFieldsDlg = new CollectionFieldsDialog(Data::Document::self()->collection(), this); - connect(m_collFieldsDlg, TQT_SIGNAL(finished()), - TQT_SLOT(slotHideCollectionFieldsDialog())); + connect(m_collFieldsDlg, TQ_SIGNAL(finished()), + TQ_SLOT(slotHideCollectionFieldsDialog())); } else { KWin::activateWindow(m_collFieldsDlg->winId()); } @@ -1976,8 +1976,8 @@ void MainWindow::slotShowStringMacroDialog() { m_stringMacroDlg = new StringMapDialog(c->macroList(), this, "StringMacroDialog", false); m_stringMacroDlg->setCaption(i18n("String Macros")); m_stringMacroDlg->setLabels(i18n("Macro"), i18n("String")); - connect(m_stringMacroDlg, TQT_SIGNAL(finished()), TQT_SLOT(slotHideStringMacroDialog())); - connect(m_stringMacroDlg, TQT_SIGNAL(okClicked()), TQT_SLOT(slotStringMacroDialogOk())); + connect(m_stringMacroDlg, TQ_SIGNAL(finished()), TQ_SLOT(slotHideStringMacroDialog())); + connect(m_stringMacroDlg, TQ_SIGNAL(okClicked()), TQ_SLOT(slotStringMacroDialogOk())); } else { KWin::activateWindow(m_stringMacroDlg->winId()); } @@ -2046,8 +2046,8 @@ void MainWindow::slotCiteEntry(int action_) { void MainWindow::slotShowFetchDialog() { if(!m_fetchDlg) { m_fetchDlg = new FetchDialog(this); - connect(m_fetchDlg, TQT_SIGNAL(finished()), TQT_SLOT(slotHideFetchDialog())); - connect(Controller::self(), TQT_SIGNAL(collectionAdded(int)), m_fetchDlg, TQT_SLOT(slotResetCollection())); + connect(m_fetchDlg, TQ_SIGNAL(finished()), TQ_SLOT(slotHideFetchDialog())); + connect(Controller::self(), TQ_SIGNAL(collectionAdded(int)), m_fetchDlg, TQ_SLOT(slotResetCollection())); } else { KWin::activateWindow(m_fetchDlg->winId()); } @@ -2296,7 +2296,7 @@ void MainWindow::updateEntrySources() { action->setText(it->source()); action->setToolTip(i18n("Update entry data from %1").arg(it->source())); action->setIconSet(Fetch::Manager::fetcherIcon(it.data())); - connect(action, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map())); + connect(action, TQ_SIGNAL(activated()), mapper, TQ_SLOT(map())); mapper->setMapping(action, it->source()); m_fetchActions.append(action); } diff --git a/src/newstuff/dialog.cpp b/src/newstuff/dialog.cpp index a9b17fc..6e59499 100644 --- a/src/newstuff/dialog.cpp +++ b/src/newstuff/dialog.cpp @@ -122,7 +122,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) m_listView->addColumn(i18n("Release Date")); m_listView->setSorting(2, false); m_listView->setResizeMode(TQListView::AllColumns); - connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*))); + connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected(TQListViewItem*))); TQWhatsThis::add(m_listView, i18n("This is a list of all the items available for download. " "Previously installed items have a checkmark icon, while " "items with new version available have an update icon")); @@ -147,7 +147,7 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) m_install = new KPushButton(i18n("Install"), widget); m_install->setIconSet(SmallIconSet(TQString::fromLatin1("knewstuff"))); m_install->setEnabled(false); - connect(m_install, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall())); + connect(m_install, TQ_SIGNAL(clicked()), TQ_SLOT(slotInstall())); // the button's text changes later // I don't want it resizing, so figure out the maximum size and set that @@ -211,10 +211,10 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) m_statusBar->addWidget(m_progress, 0, true); KPushButton* closeButton = new KPushButton(KStdGuiItem::close(), box); - connect(closeButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotClose())); + connect(closeButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotClose())); closeButton->setFocus(); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMoveProgress())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMoveProgress())); setMinimumWidth(TQMAX(minimumWidth(), NEW_STUFF_MIN_WIDTH)); setMinimumHeight(TQMAX(minimumHeight(), NEW_STUFF_MIN_HEIGHT)); @@ -229,9 +229,9 @@ Dialog::Dialog(NewStuff::DataType type_, TQWidget* parent_) setStatus(i18n("Downloading information...")); KNS::ProviderLoader* loader = new KNS::ProviderLoader(this); - connect(loader, TQT_SIGNAL(providersLoaded(Provider::List*)), this, TQT_SLOT(slotProviders(Provider::List*))); - connect(loader, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), this, TQT_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); - connect(loader, TQT_SIGNAL(error()), this, TQT_SLOT(slotProviderError())); + connect(loader, TQ_SIGNAL(providersLoaded(Provider::List*)), this, TQ_SLOT(slotProviders(Provider::List*))); + connect(loader, TQ_SIGNAL(percent(TDEIO::Job*, unsigned long)), this, TQ_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); + connect(loader, TQ_SIGNAL(error()), this, TQ_SLOT(slotProviderError())); TDEConfigGroup config(TDEGlobal::config(), "TDENewStuff"); TQString prov = config.readEntry("ProvidersUrl"); @@ -271,11 +271,11 @@ void Dialog::slotProviders(Provider::List* list_) { for(KNS::Provider* prov = list_->first(); prov; prov = list_->next()) { TDEIO::TransferJob* job = TDEIO::get(prov->downloadUrl()); m_jobs[job] = prov; - connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), - TQT_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(percent(TDEIO::Job*, unsigned long)), + TQ_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); } } @@ -375,9 +375,9 @@ void Dialog::slotSelected(TQListViewItem* item_) { KURL dest; dest.setPath(m_tempPreviewImage->name()); TDEIO::FileCopyJob* job = TDEIO::file_copy(preview, dest, -1, true, false, false); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotPreviewResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(percent(TDEIO::Job*, unsigned long)), - TQT_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotPreviewResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(percent(TDEIO::Job*, unsigned long)), + TQ_SLOT(slotShowPercent(TDEIO::Job*, unsigned long))); m_lastPreviewItem = item_; } TQPixmap pix = m_type == EntryTemplate @@ -423,7 +423,7 @@ void Dialog::slotInstall() { setStatus(i18n("Installing item...")); m_progress->show(); m_timer->start(100); - connect(m_manager, TQT_SIGNAL(signalInstalled(KNS::Entry*)), TQT_SLOT(slotDoneInstall(KNS::Entry*))); + connect(m_manager, TQ_SIGNAL(signalInstalled(KNS::Entry*)), TQ_SLOT(slotDoneInstall(KNS::Entry*))); mJobEntry = entry; // OpenDesktop.org broke the basic functionality of TDEHNS by forcing @@ -437,10 +437,10 @@ void Dialog::slotInstall() { // in the direct download ability for this to even be considered. if (entry->payload().url().contains(OPENDESKTOP_REDIRECT_URL)) { TDEIO::TransferJob *job = TDEIO::get( KURL( entry->payload() ), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { slotInstallPhase2(); diff --git a/src/newstuff/manager.cpp b/src/newstuff/manager.cpp index 011c375..133c266 100644 --- a/src/newstuff/manager.cpp +++ b/src/newstuff/manager.cpp @@ -347,7 +347,7 @@ void Manager::install(DataType type_, KNS::Entry* entry_) { KURL destination; destination.setPath(m_tempFile->name()); TDEIO::FileCopyJob* job = TDEIO::file_copy(entry_->payload(), destination, -1, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotDownloadJobResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotDownloadJobResult(TDEIO::Job*))); m_jobMap.insert(job, EntryPair(entry_, type_)); } @@ -377,7 +377,7 @@ void Manager::slotDownloadJobResult(TDEIO::Job* job_) { #if KDE_IS_VERSION(3,3,90) // needed so the GPG signature can be checked NewScript* newScript = new NewScript(this, Kernel::self()->widget()); - connect(newScript, TQT_SIGNAL(installFinished()), this, TQT_SLOT(slotInstallFinished())); + connect(newScript, TQ_SIGNAL(installFinished()), this, TQ_SLOT(slotInstallFinished())); // need to delete temp file if install was not a success // if it was a success, it gets deleted later deleteTempFile = !newScript->install(job->destURL().path()); diff --git a/src/progressmanager.cpp b/src/progressmanager.cpp index 6bc0298..e146023 100644 --- a/src/progressmanager.cpp +++ b/src/progressmanager.cpp @@ -56,7 +56,7 @@ void ProgressItem::setDone() { } emit signalDone(this); // make sure the deleting doesn't interfere with anything - TQTimer::singleShot(3000, this, TQT_SLOT(deleteLater())); + TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater())); } void ProgressItem::cancel() { @@ -131,12 +131,12 @@ ProgressItem& ProgressManager::newProgressItemImpl(const TQObject* owner_, ProgressItem* item = new ProgressItem(label_, canCancel_); m_items.insert(owner_, item); - connect(item, TQT_SIGNAL(signalTotalSteps(ProgressItem*)), TQT_SLOT(slotUpdateTotalProgress())); - connect(item, TQT_SIGNAL(signalProgress(ProgressItem*)), TQT_SLOT(slotUpdateTotalProgress())); - connect(item, TQT_SIGNAL(signalDone(ProgressItem*)), TQT_SLOT(slotUpdateTotalProgress())); - connect(item, TQT_SIGNAL(signalDone(ProgressItem*)), TQT_SLOT(slotItemDone(ProgressItem*))); + connect(item, TQ_SIGNAL(signalTotalSteps(ProgressItem*)), TQ_SLOT(slotUpdateTotalProgress())); + connect(item, TQ_SIGNAL(signalProgress(ProgressItem*)), TQ_SLOT(slotUpdateTotalProgress())); + connect(item, TQ_SIGNAL(signalDone(ProgressItem*)), TQ_SLOT(slotUpdateTotalProgress())); + connect(item, TQ_SIGNAL(signalDone(ProgressItem*)), TQ_SLOT(slotItemDone(ProgressItem*))); -// connect(item, TQT_SIGNAL(signalProgress(ProgressItem*)), TQT_SIGNAL(signalItemProgress(ProgressItem*))); +// connect(item, TQ_SIGNAL(signalProgress(ProgressItem*)), TQ_SIGNAL(signalItemProgress(ProgressItem*))); // emit signalItemAdded(item); return *item; } diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp index b33c529..9bccdcf 100644 --- a/src/reportdialog.cpp +++ b/src/reportdialog.cpp @@ -82,17 +82,17 @@ ReportDialog::ReportDialog(TQWidget* parent_, const char* name_/*=0*/) KPushButton* pb1 = new KPushButton(SmallIconSet(TQString::fromLatin1("application-x-executable")), i18n("&Generate"), mainWidget); hlay->addWidget(pb1); - connect(pb1, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(pb1, TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); hlay->addStretch(); KPushButton* pb2 = new KPushButton(KStdGuiItem::saveAs(), mainWidget); hlay->addWidget(pb2); - connect(pb2, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveAs())); + connect(pb2, TQ_SIGNAL(clicked()), TQ_SLOT(slotSaveAs())); KPushButton* pb3 = new KPushButton(KStdGuiItem::print(), mainWidget); hlay->addWidget(pb3); - connect(pb3, TQT_SIGNAL(clicked()), TQT_SLOT(slotPrint())); + connect(pb3, TQ_SIGNAL(clicked()), TQ_SLOT(slotPrint())); m_HTMLPart = new TDEHTMLPart(mainWidget); m_HTMLPart->setJScriptEnabled(false); diff --git a/src/statusbar.cpp b/src/statusbar.cpp index ffb4def..41b37ee 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -54,8 +54,8 @@ StatusBar::StatusBar(TQWidget* parent_) : KStatusBar(parent_) { m_cancelButton->hide(); ProgressManager* pm = ProgressManager::self(); - connect(pm, TQT_SIGNAL(signalTotalProgress(uint)), TQT_SLOT(slotProgress(uint))); - connect(m_cancelButton, TQT_SIGNAL(clicked()), pm, TQT_SLOT(slotCancelAll())); + connect(pm, TQ_SIGNAL(signalTotalProgress(uint)), TQ_SLOT(slotProgress(uint))); + connect(m_cancelButton, TQ_SIGNAL(clicked()), pm, TQ_SLOT(slotCancelAll())); } void StatusBar::polish() { @@ -110,10 +110,10 @@ void StatusBar::slotUpdate() { /* myDebug() << "StatusBar::slotUpdate() - " << m_progress->isShown() << endl; if(m_progressBox->isEmpty()) { - TQTimer::singleShot(0, m_progress, TQT_SLOT(hide())); + TQTimer::singleShot(0, m_progress, TQ_SLOT(hide())); // m_progressBox->hide(); } else { - TQTimer::singleShot(0, m_progress, TQT_SLOT(show())); + TQTimer::singleShot(0, m_progress, TQ_SLOT(show())); // m_progressBox->show(); } */ diff --git a/src/translators/alexandriaimporter.cpp b/src/translators/alexandriaimporter.cpp index 5a2d25b..3d5215f 100644 --- a/src/translators/alexandriaimporter.cpp +++ b/src/translators/alexandriaimporter.cpp @@ -65,7 +65,7 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(numFiles); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); TQStringList covers; diff --git a/src/translators/amcimporter.cpp b/src/translators/amcimporter.cpp index fb03b64..215bc0e 100644 --- a/src/translators/amcimporter.cpp +++ b/src/translators/amcimporter.cpp @@ -72,7 +72,7 @@ Tellico::Data::CollPtr AMCImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(f->size()); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); m_coll = new Data::VideoCollection(true); diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp index a30c6c4..81efa53 100644 --- a/src/translators/audiofileimporter.cpp +++ b/src/translators/audiofileimporter.cpp @@ -70,7 +70,7 @@ Tellico::Data::CollPtr AudioFileImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, i18n("Scanning audio files..."), true); item.setTotalSteps(100); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); // TODO: allow remote audio file importing @@ -350,7 +350,7 @@ TQWidget* AudioFileImporter::widget(TQWidget* parent_, const char* name_) { m_addFilePath = new TQCheckBox(i18n("Include file &location"), box); TQWhatsThis::add(m_addFilePath, i18n("If checked, the file names for each track are added to the entries.")); m_addFilePath->setChecked(false); - connect(m_addFilePath, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAddFileToggled(bool))); + connect(m_addFilePath, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAddFileToggled(bool))); m_addBitrate = new TQCheckBox(i18n("Include &bitrate"), box); TQWhatsThis::add(m_addBitrate, i18n("If checked, the bitrate for each track is added to the entries.")); diff --git a/src/translators/bibteximporter.cpp b/src/translators/bibteximporter.cpp index d3668d4..e8c9709 100644 --- a/src/translators/bibteximporter.cpp +++ b/src/translators/bibteximporter.cpp @@ -62,7 +62,7 @@ Tellico::Data::CollPtr BibtexImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(urls().count() * 100); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); bool useUTF8 = m_widget && m_readUTF8->isChecked(); diff --git a/src/translators/bibtexmlimporter.cpp b/src/translators/bibtexmlimporter.cpp index ce50ee1..e95b910 100644 --- a/src/translators/bibtexmlimporter.cpp +++ b/src/translators/bibtexmlimporter.cpp @@ -56,7 +56,7 @@ void BibtexmlImporter::loadDomDocument() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(count); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); for(uint j = 0; !m_cancelled && j < entryelems.count(); ++j) { diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp index 301f0e5..b89c220 100644 --- a/src/translators/csvexporter.cpp +++ b/src/translators/csvexporter.cpp @@ -145,8 +145,8 @@ TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) { m_editOther->setEnabled(m_radioOther->isChecked()); TQWhatsThis::add(m_editOther, i18n("A custom string, such as a colon, may be used as a delimiter.")); m_delimiterGroupLayout->addWidget(m_editOther, 1, 2); - TQObject::connect(m_radioOther, TQT_SIGNAL(toggled(bool)), - m_editOther, TQT_SLOT(setEnabled(bool))); + TQObject::connect(m_radioOther, TQ_SIGNAL(toggled(bool)), + m_editOther, TQ_SLOT(setEnabled(bool))); if(m_delimiter == TQChar(',')) { m_radioComma->setChecked(true); diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp index 57067e5..adc1b88 100644 --- a/src/translators/csvimporter.cpp +++ b/src/translators/csvimporter.cpp @@ -189,7 +189,7 @@ Tellico::Data::CollPtr CSVImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(numLines); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); uint j = 0; @@ -253,14 +253,14 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { m_comboColl = new GUI::CollectionTypeCombo(box); lab->setBuddy(m_comboColl); TQWhatsThis::add(m_comboColl, i18n("Select the type of collection being imported.")); - connect(m_comboColl, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged())); + connect(m_comboColl, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged())); // need a spacer TQWidget* w = new TQWidget(box); box->setStretchFactor(w, 1); m_checkFirstRowHeader = new TQCheckBox(i18n("&First row contains field titles"), group); TQWhatsThis::add(m_checkFirstRowHeader, i18n("If checked, the first row is used as field titles.")); - connect(m_checkFirstRowHeader, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFirstRowHeader(bool))); + connect(m_checkFirstRowHeader, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFirstRowHeader(bool))); TQHBox* hbox2 = new TQHBox(group); m_delimiterGroup = new TQButtonGroup(0, TQt::Vertical, i18n("Delimiter"), hbox2); @@ -268,7 +268,7 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { m_delimiterGroupLayout->setAlignment(TQt::AlignTop); TQWhatsThis::add(m_delimiterGroup, i18n("In addition to a comma, other characters may be used as " "a delimiter, separating each value in the file.")); - connect(m_delimiterGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotDelimiter())); + connect(m_delimiterGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotDelimiter())); m_radioComma = new TQRadioButton(m_delimiterGroup); m_radioComma->setText(i18n("&Comma")); @@ -297,9 +297,9 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { m_editOther->setMaxLength(1); TQWhatsThis::add(m_editOther, i18n("A custom string, such as a colon, may be used as a delimiter.")); m_delimiterGroupLayout->addWidget(m_editOther, 2, 2); - connect(m_radioOther, TQT_SIGNAL(toggled(bool)), - m_editOther, TQT_SLOT(setEnabled(bool))); - connect(m_editOther, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotDelimiter())); + connect(m_radioOther, TQ_SIGNAL(toggled(bool)), + m_editOther, TQ_SLOT(setEnabled(bool))); + connect(m_editOther, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotDelimiter())); w = new TQWidget(hbox2); hbox2->setStretchFactor(w, 1); @@ -313,8 +313,8 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { m_table->setReadOnly(true); m_table->setMinimumHeight(m_widget->fontMetrics().lineSpacing() * 8); TQWhatsThis::add(m_table, i18n("The table shows up to the first five lines of the CSV file.")); - connect(m_table, TQT_SIGNAL(currentChanged(int, int)), TQT_SLOT(slotCurrentChanged(int, int))); - connect(m_table->horizontalHeader(), TQT_SIGNAL(clicked(int)), TQT_SLOT(slotHeaderClicked(int))); + connect(m_table, TQ_SIGNAL(currentChanged(int, int)), TQ_SLOT(slotCurrentChanged(int, int))); + connect(m_table->horizontalHeader(), TQ_SIGNAL(clicked(int)), TQ_SLOT(slotHeaderClicked(int))); TQWidget* hbox = new TQWidget(group); TQHBoxLayout* hlay = new TQHBoxLayout(hbox, 5); @@ -326,7 +326,7 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { m_colSpinBox = new KIntSpinBox(hbox); hlay->addWidget(m_colSpinBox); m_colSpinBox->setMinValue(1); - connect(m_colSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSelectColumn(int))); + connect(m_colSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotSelectColumn(int))); lab->setBuddy(m_colSpinBox); hlay->addSpacing(10); @@ -334,14 +334,14 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) { hlay->addWidget(lab); m_comboField = new KComboBox(hbox); hlay->addWidget(m_comboField); - connect(m_comboField, TQT_SIGNAL(activated(int)), TQT_SLOT(slotFieldChanged(int))); + connect(m_comboField, TQ_SIGNAL(activated(int)), TQ_SLOT(slotFieldChanged(int))); lab->setBuddy(m_comboField); hlay->addSpacing(10); m_setColumnBtn = new KPushButton(i18n("&Assign Field"), hbox); hlay->addWidget(m_setColumnBtn); m_setColumnBtn->setIconSet(SmallIconSet(TQString::fromLatin1("apply"))); - connect(m_setColumnBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetColumnTitle())); + connect(m_setColumnBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetColumnTitle())); hlay->addStretch(10); l->addStretch(1); diff --git a/src/translators/filelistingimporter.cpp b/src/translators/filelistingimporter.cpp index e0a6c46..48d9d99 100644 --- a/src/translators/filelistingimporter.cpp +++ b/src/translators/filelistingimporter.cpp @@ -62,7 +62,7 @@ Tellico::Data::CollPtr FileListingImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, i18n("Scanning files..."), true); item.setTotalSteps(100); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); // going to assume only one volume will ever be imported @@ -71,8 +71,8 @@ Tellico::Data::CollPtr FileListingImporter::collection() { m_job = m_recursive->isChecked() ? TDEIO::listRecursive(url(), true, false) : TDEIO::listDir(url(), true, false); - connect(m_job, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(m_job, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&))); if(!TDEIO::NetAccess::synchronousRun(m_job, Kernel::self()->widget()) || m_cancelled) { return 0; diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp index f5e65bc..0765433 100644 --- a/src/translators/freedbimporter.cpp +++ b/src/translators/freedbimporter.cpp @@ -340,7 +340,7 @@ void FreeDBImporter::readCache() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(numFiles); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); uint step = 1; @@ -509,7 +509,7 @@ TQWidget* FreeDBImporter::widget(TQWidget* parent_, const char* name_/*=0*/) { m_buttonGroup->setExclusive(true); m_buttonGroup->insert(m_radioCDROM); m_buttonGroup->insert(m_radioCache); - connect(m_buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotClicked(int))); + connect(m_buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotClicked(int))); l->addWidget(bigbox); l->addStretch(1); diff --git a/src/translators/gcfilmsimporter.cpp b/src/translators/gcfilmsimporter.cpp index b1ad0c3..8949133 100644 --- a/src/translators/gcfilmsimporter.cpp +++ b/src/translators/gcfilmsimporter.cpp @@ -49,7 +49,7 @@ Tellico::Data::CollPtr GCfilmsImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(100); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); TQString str = text(); diff --git a/src/translators/griffithimporter.cpp b/src/translators/griffithimporter.cpp index 7bf3b08..64b5558 100644 --- a/src/translators/griffithimporter.cpp +++ b/src/translators/griffithimporter.cpp @@ -53,9 +53,9 @@ Tellico::Data::CollPtr GriffithImporter::collection() { } m_process = new TDEProcess(); - connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(slotData(TDEProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(slotError(TDEProcess*, char*, int))); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(slotData(TDEProcess*, char*, int))); + connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(slotError(TDEProcess*, char*, int))); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); *m_process << python << griffith; if(!m_process->start(TDEProcess::Block, TDEProcess::AllOutput)) { myDebug() << "ExecExternalFetcher::startSearch() - process failed to start" << endl; diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp index c6aee74..4fc30a4 100644 --- a/src/translators/htmlexporter.cpp +++ b/src/translators/htmlexporter.cpp @@ -121,7 +121,7 @@ bool HTMLExporter::exec() { if(options() & ExportProgress) { ProgressItem& item = ProgressManager::self()->newProgressItem(this, TQString(), true); item.setTotalSteps(100); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); } // ok if not ExportProgress, no worries ProgressItem::Done done(this); diff --git a/src/translators/pdfimporter.cpp b/src/translators/pdfimporter.cpp index e2b4c8e..e8a45be 100644 --- a/src/translators/pdfimporter.cpp +++ b/src/translators/pdfimporter.cpp @@ -56,7 +56,7 @@ Tellico::Data::CollPtr PDFImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(urls().count()); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); const bool showProgress = options() & ImportProgress; diff --git a/src/translators/risimporter.cpp b/src/translators/risimporter.cpp index 0158708..f2bda6f 100644 --- a/src/translators/risimporter.cpp +++ b/src/translators/risimporter.cpp @@ -150,7 +150,7 @@ Tellico::Data::CollPtr RISImporter::collection() { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(urls().count() * 100); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); int count = 0; diff --git a/src/translators/tellicoimporter.cpp b/src/translators/tellicoimporter.cpp index 35a9482..632f11a 100644 --- a/src/translators/tellicoimporter.cpp +++ b/src/translators/tellicoimporter.cpp @@ -97,7 +97,7 @@ Tellico::Data::CollPtr TellicoImporter::collection() { void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(100); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); TQDomDocument dom; @@ -872,7 +872,7 @@ void TellicoImporter::loadZipData() { if(m_images.isEmpty()) { // give it some time - TQTimer::singleShot(3000, this, TQT_SLOT(deleteLater())); + TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater())); } } @@ -890,7 +890,7 @@ bool TellicoImporter::loadImage(const TQString& id_) { m_images.remove(id_); if(m_images.isEmpty()) { // give it some time - TQTimer::singleShot(3000, this, TQT_SLOT(deleteLater())); + TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater())); } return !newID.isEmpty(); } diff --git a/src/translators/tellicosaximporter.cpp b/src/translators/tellicosaximporter.cpp index 4adc6f2..fe9a070 100644 --- a/src/translators/tellicosaximporter.cpp +++ b/src/translators/tellicosaximporter.cpp @@ -98,7 +98,7 @@ Tellico::Data::CollPtr TellicoSaxImporter::collection() { void TellicoSaxImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) { ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true); item.setTotalSteps(data_.size()); - connect(&item, SIGNAL(signalCancelled(ProgressItem*)), SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); const bool showProgress = options() & ImportProgress; @@ -258,7 +258,7 @@ void TellicoSaxImporter::loadZipData() { if(m_images.isEmpty()) { // give it some time - TQTimer::singleShot(3000, this, SLOT(deleteLater())); + TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater())); } } @@ -280,7 +280,7 @@ bool TellicoSaxImporter::loadImage(const TQString& id_) { m_images.remove(id_); if(m_images.isEmpty()) { // give it some time - TQTimer::singleShot(3000, this, SLOT(deleteLater())); + TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater())); } return !newID.isEmpty(); } diff --git a/src/translators/tellicozipexporter.cpp b/src/translators/tellicozipexporter.cpp index 863d78e..c546769 100644 --- a/src/translators/tellicozipexporter.cpp +++ b/src/translators/tellicozipexporter.cpp @@ -49,7 +49,7 @@ bool TellicoZipExporter::exec() { // TODO: maybe need label? ProgressItem& item = ProgressManager::self()->newProgressItem(this, TQString(), true); item.setTotalSteps(100); - connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel())); + connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel())); ProgressItem::Done done(this); TellicoXMLExporter exp; -- cgit v1.2.1