diff options
Diffstat (limited to 'src/newstuff')
| -rw-r--r-- | src/newstuff/dialog.cpp | 40 | ||||
| -rw-r--r-- | src/newstuff/manager.cpp | 4 |
2 files changed, 22 insertions, 22 deletions
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()); |