diff options
Diffstat (limited to 'plugins')
100 files changed, 425 insertions, 425 deletions
diff --git a/plugins/infowidget/availabilitychunkbar.h b/plugins/infowidget/availabilitychunkbar.h index 5897591..ce8ba27 100644 --- a/plugins/infowidget/availabilitychunkbar.h +++ b/plugins/infowidget/availabilitychunkbar.h @@ -30,7 +30,7 @@ namespace kt */ class AvailabilityChunkBar : public ChunkBar { - Q_OBJECT + TQ_OBJECT public: AvailabilityChunkBar(TQWidget* parent, const char* name); diff --git a/plugins/infowidget/chunkbar.h b/plugins/infowidget/chunkbar.h index 2c2ecf9..593acfe 100644 --- a/plugins/infowidget/chunkbar.h +++ b/plugins/infowidget/chunkbar.h @@ -49,7 +49,7 @@ namespace kt */ class ChunkBar : public TQFrame { - Q_OBJECT + TQ_OBJECT public: ChunkBar(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/infowidget/chunkdownloadview.h b/plugins/infowidget/chunkdownloadview.h index 070b8ea..b72c07b 100644 --- a/plugins/infowidget/chunkdownloadview.h +++ b/plugins/infowidget/chunkdownloadview.h @@ -45,7 +45,7 @@ namespace kt */ class ChunkDownloadView : public ChunkDownloadViewBase { - Q_OBJECT + TQ_OBJECT TQMap<kt::ChunkDownloadInterface*,ChunkDownloadViewItem*> items; diff --git a/plugins/infowidget/downloadedchunkbar.h b/plugins/infowidget/downloadedchunkbar.h index 1982fc3..fa0fea2 100644 --- a/plugins/infowidget/downloadedchunkbar.h +++ b/plugins/infowidget/downloadedchunkbar.h @@ -29,7 +29,7 @@ namespace kt */ class DownloadedChunkBar : public ChunkBar { - Q_OBJECT + TQ_OBJECT public: DownloadedChunkBar(TQWidget* parent, const char* name); diff --git a/plugins/infowidget/fileview.cpp b/plugins/infowidget/fileview.cpp index c7bd470..63436fb 100644 --- a/plugins/infowidget/fileview.cpp +++ b/plugins/infowidget/fileview.cpp @@ -69,13 +69,13 @@ namespace kt context_menu->setItemEnabled(dnd_keep_id, false); context_menu->setItemEnabled(dnd_throw_away_id, false); - connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), - this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); - connect(context_menu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( contextItem ( int ) ) ); - connect(this,TQT_SIGNAL(doubleClicked( TQListViewItem*, const TQPoint&, int )), - this,TQT_SLOT(onDoubleClicked(TQListViewItem*, const TQPoint&, int))); + connect(this,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), + this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); + connect(context_menu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( contextItem ( int ) ) ); + connect(this,TQ_SIGNAL(doubleClicked( TQListViewItem*, const TQPoint&, int )), + this,TQ_SLOT(onDoubleClicked(TQListViewItem*, const TQPoint&, int))); - connect(&fill_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( fillTreePartial() ) ); + connect(&fill_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( fillTreePartial() ) ); setEnabled(false); @@ -108,8 +108,8 @@ namespace kt multi_root->updatePercentageInformation(); multi_root->updatePreviewInformation(curr_tc); fill_timer.stop(); - connect(curr_tc,TQT_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), - this,TQT_SLOT(refreshFileTree( kt::TorrentInterface* ))); + connect(curr_tc,TQ_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), + this,TQ_SLOT(refreshFileTree( kt::TorrentInterface* ))); } else fill_timer.start(0,true); @@ -141,8 +141,8 @@ namespace kt item->setPixmap(0,KMimeType::findByPath(s.torrent_name)->pixmap(TDEIcon::Small)); setEnabled(true); - connect(curr_tc,TQT_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), - this,TQT_SLOT(refreshFileTree( kt::TorrentInterface* ))); + connect(curr_tc,TQ_SIGNAL(missingFilesMarkedDND( kt::TorrentInterface* )), + this,TQ_SLOT(refreshFileTree( kt::TorrentInterface* ))); } } diff --git a/plugins/infowidget/fileview.h b/plugins/infowidget/fileview.h index 01443dd..e42935d 100644 --- a/plugins/infowidget/fileview.h +++ b/plugins/infowidget/fileview.h @@ -34,7 +34,7 @@ namespace kt */ class FileView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: FileView(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/infowidget/flagdb.cpp b/plugins/infowidget/flagdb.cpp index c1e1fb4..63ce4c6 100644 --- a/plugins/infowidget/flagdb.cpp +++ b/plugins/infowidget/flagdb.cpp @@ -100,7 +100,7 @@ const TQPixmap& kt::FlagDB::getFlag(const TQString& country) if (TQFile::exists(path)) { if (img.load(path)) { if (img.width() != preferredWidth || img.height() != preferredHeight) { - const TQImage& imgScaled = img.smoothScale(preferredWidth, preferredHeight, TQ_ScaleMin); + const TQImage& imgScaled = img.smoothScale(preferredWidth, preferredHeight, TQImage::ScaleMin); if (!imgScaled.isNull()) { pixmap.convertFromImage(imgScaled); break; diff --git a/plugins/infowidget/floatspinbox.cpp b/plugins/infowidget/floatspinbox.cpp index 111070b..d463d9a 100644 --- a/plugins/infowidget/floatspinbox.cpp +++ b/plugins/infowidget/floatspinbox.cpp @@ -41,8 +41,8 @@ kt::FloatSpinBox::FloatSpinBox( { TQSpinBox::setValue(0); setStep( 0.25f ); - connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int ))); - setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) )); + connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int ))); + setValidator( new LocaleFloatValidator( dynamic_cast<TQSpinBox * > (this) )); editor()->setAlignment(TQt::AlignRight); } @@ -61,8 +61,8 @@ kt::FloatSpinBox::FloatSpinBox( { TQSpinBox::setValue(0); setStep( 0.25 ); - connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int ))); - setValidator( new LocaleFloatValidator( TQT_TQOBJECT(dynamic_cast<TQSpinBox * > (this)) )); + connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int ))); + setValidator( new LocaleFloatValidator( dynamic_cast<TQSpinBox * > (this) )); } @@ -85,8 +85,8 @@ kt::FloatSpinBox::FloatSpinBox( TQSpinBox::setValue(0); setValue(0.0f); setStep( step ); - connect(this, TQT_SIGNAL(valueChanged ( int )), this, TQT_SLOT(internalValueChanged( int ))); - setValidator( new LocaleFloatValidator( TQT_TQOBJECT(this) )); + connect(this, TQ_SIGNAL(valueChanged ( int )), this, TQ_SLOT(internalValueChanged( int ))); + setValidator( new LocaleFloatValidator( this )); } diff --git a/plugins/infowidget/floatspinbox.h b/plugins/infowidget/floatspinbox.h index a123382..50c6b0c 100644 --- a/plugins/infowidget/floatspinbox.h +++ b/plugins/infowidget/floatspinbox.h @@ -37,7 +37,7 @@ namespace kt class FloatSpinBox : public TQSpinBox { - Q_OBJECT + TQ_OBJECT public: FloatSpinBox( TQWidget* parent=0, const char* name=0 ); diff --git a/plugins/infowidget/infowidgetplugin.cpp b/plugins/infowidget/infowidgetplugin.cpp index 506efdb..00df391 100644 --- a/plugins/infowidget/infowidgetplugin.cpp +++ b/plugins/infowidget/infowidgetplugin.cpp @@ -216,8 +216,8 @@ namespace kt tracker_view->changeTC(const_cast<kt::TorrentInterface*>(getGUI()->getCurrentTorrent())); // seeing that a merge of the trackers might happen after a torrent has been loaded // we need to update the tracker_view - connect(getCore(),TQT_SIGNAL(loadingFinished(const KURL&, bool, bool)), - tracker_view,TQT_SLOT(onLoadingFinished(const KURL&, bool, bool))); + connect(getCore(),TQ_SIGNAL(loadingFinished(const KURL&, bool, bool)), + tracker_view,TQ_SLOT(onLoadingFinished(const KURL&, bool, bool))); } else if (!show && tracker_view) { diff --git a/plugins/infowidget/infowidgetplugin.h b/plugins/infowidget/infowidgetplugin.h index 75a7fea..01796ec 100644 --- a/plugins/infowidget/infowidgetplugin.h +++ b/plugins/infowidget/infowidgetplugin.h @@ -41,7 +41,7 @@ namespace kt */ class InfoWidgetPlugin : public Plugin,public ViewListener { - Q_OBJECT + TQ_OBJECT public: InfoWidgetPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/infowidget/iwfiletreeitem.cpp b/plugins/infowidget/iwfiletreeitem.cpp index effe20a..d641fe5 100644 --- a/plugins/infowidget/iwfiletreeitem.cpp +++ b/plugins/infowidget/iwfiletreeitem.cpp @@ -37,8 +37,8 @@ namespace kt : FileTreeItem(item,name,file) { perc_complete = 0.0; - connect(&file,TQT_SIGNAL(downloadPercentageChanged( float )),this,TQT_SLOT(onPercentageUpdated( float ))); - connect(&file,TQT_SIGNAL(previewAvailable( bool )),this,TQT_SLOT(onPreviewAvailable( bool ))); + connect(&file,TQ_SIGNAL(downloadPercentageChanged( float )),this,TQ_SLOT(onPercentageUpdated( float ))); + connect(&file,TQ_SIGNAL(previewAvailable( bool )),this,TQ_SLOT(onPreviewAvailable( bool ))); } IWFileTreeItem::~IWFileTreeItem() diff --git a/plugins/infowidget/iwfiletreeitem.h b/plugins/infowidget/iwfiletreeitem.h index d2eb350..20972fa 100644 --- a/plugins/infowidget/iwfiletreeitem.h +++ b/plugins/infowidget/iwfiletreeitem.h @@ -38,7 +38,7 @@ namespace kt */ class IWFileTreeItem : public TQObject, public kt::FileTreeItem { - Q_OBJECT + TQ_OBJECT double perc_complete; diff --git a/plugins/infowidget/localefloatvalidator.h b/plugins/infowidget/localefloatvalidator.h index a20858f..83be87d 100644 --- a/plugins/infowidget/localefloatvalidator.h +++ b/plugins/infowidget/localefloatvalidator.h @@ -32,7 +32,7 @@ namespace kt{ */ class LocaleFloatValidator : public TQValidator { - Q_OBJECT + TQ_OBJECT public: LocaleFloatValidator( TQObject * parent, const char *name = 0 ); diff --git a/plugins/infowidget/peerview.cpp b/plugins/infowidget/peerview.cpp index f3b346f..8551c5d 100644 --- a/plugins/infowidget/peerview.cpp +++ b/plugins/infowidget/peerview.cpp @@ -249,9 +249,9 @@ namespace kt kick_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("delete_user", TDEIcon::NoGroup), i18n("to kick", "Kick peer")); ban_id = menu->insertItem(TDEGlobal::iconLoader()->loadIcon("filter",TDEIcon::NoGroup), i18n("to ban", "Ban peer")); - connect(this,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), - this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); - connect(menu, TQT_SIGNAL ( activated ( int ) ), this, TQT_SLOT ( contextItem ( int ) ) ); + connect(this,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), + this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); + connect(menu, TQ_SIGNAL ( activated ( int ) ), this, TQ_SLOT ( contextItem ( int ) ) ); setFrameShape(TQFrame::NoFrame); } diff --git a/plugins/infowidget/peerview.h b/plugins/infowidget/peerview.h index 9c4289a..b75371d 100644 --- a/plugins/infowidget/peerview.h +++ b/plugins/infowidget/peerview.h @@ -54,7 +54,7 @@ namespace kt */ class PeerView : public TDEListView { - Q_OBJECT + TQ_OBJECT TQMap<kt::PeerInterface*,PeerViewItem*> items; diff --git a/plugins/infowidget/statustab.cpp b/plugins/infowidget/statustab.cpp index a4eab2c..b87487f 100644 --- a/plugins/infowidget/statustab.cpp +++ b/plugins/infowidget/statustab.cpp @@ -46,15 +46,15 @@ namespace kt maxRatio->setMinValue(0.0f); maxRatio->setMaxValue(100.0f); maxRatio->setStep(0.1f); - connect(maxRatio, TQT_SIGNAL(valueHasChanged()), this, TQT_SLOT(maxRatioReturnPressed())); - connect(useLimit, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( useLimitToggled(bool) ) ); + connect(maxRatio, TQ_SIGNAL(valueHasChanged()), this, TQ_SLOT(maxRatioReturnPressed())); + connect(useLimit, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( useLimitToggled(bool) ) ); maxTime->setMinValue(0.0f); maxTime->setMaxValue(10000000.0f); maxTime->setStep(0.05f); maxTime->setSpecialValueText(i18n("No limit")); - connect(useTimeLimit,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(useTimeLimitToggled(bool))); - connect(maxTime,TQT_SIGNAL(valueHasChanged()), this, TQT_SLOT(timeValueChanged())); + connect(useTimeLimit,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(useTimeLimitToggled(bool))); + connect(maxTime,TQ_SIGNAL(valueHasChanged()), this, TQ_SLOT(timeValueChanged())); int h = (int)ceil(fontMetrics().height()*1.25); m_chunk_bar->setFixedHeight(h); diff --git a/plugins/infowidget/statustab.h b/plugins/infowidget/statustab.h index b5f73dc..d044011 100644 --- a/plugins/infowidget/statustab.h +++ b/plugins/infowidget/statustab.h @@ -29,7 +29,7 @@ namespace kt class StatusTab : public StatusTabBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/infowidget/trackerview.h b/plugins/infowidget/trackerview.h index 2c22eb5..44d8872 100644 --- a/plugins/infowidget/trackerview.h +++ b/plugins/infowidget/trackerview.h @@ -36,7 +36,7 @@ namespace kt */ class TrackerView: public TrackerViewBase { - Q_OBJECT + TQ_OBJECT public: TrackerView(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/infowidget/trackerviewbase.ui b/plugins/infowidget/trackerviewbase.ui index c1e05fe..3ec9d91 100644 --- a/plugins/infowidget/trackerviewbase.ui +++ b/plugins/infowidget/trackerviewbase.ui @@ -295,14 +295,14 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>btnChange_clicked()</slot> <slot>listTrackers_currentChanged(TQListViewItem*)</slot> <slot>btnUpdate_clicked()</slot> <slot>btnAdd_clicked()</slot> <slot>btnRemove_clicked()</slot> <slot>btnRestore_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/plugins/ipfilter/convert_dlg.ui b/plugins/ipfilter/convert_dlg.ui index 15e1a2f..de0aa40 100644 --- a/plugins/ipfilter/convert_dlg.ui +++ b/plugins/ipfilter/convert_dlg.ui @@ -146,10 +146,10 @@ <slot>btnCancel_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnClose_clicked()</slot> <slot>btnCancel_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kprogress.h</include> diff --git a/plugins/ipfilter/convertdialog.h b/plugins/ipfilter/convertdialog.h index 408ff39..cf292a3 100644 --- a/plugins/ipfilter/convertdialog.h +++ b/plugins/ipfilter/convertdialog.h @@ -29,7 +29,7 @@ namespace kt { class ConvertDialog: public ConvertingDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/ipfilter/ipblockingpref.ui b/plugins/ipfilter/ipblockingpref.ui index d221270..3435167 100644 --- a/plugins/ipfilter/ipblockingpref.ui +++ b/plugins/ipfilter/ipblockingpref.ui @@ -188,11 +188,11 @@ NOTE: ZIP file from bluetack.co.uk is supported.</string> <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnDownload_clicked()</slot> <slot>checkUseLevel1_toggled(bool)</slot> <slot>checkUseKTfilter_toggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/plugins/ipfilter/ipfilterplugin.h b/plugins/ipfilter/ipfilterplugin.h index 251bdcd..2ef114a 100644 --- a/plugins/ipfilter/ipfilterplugin.h +++ b/plugins/ipfilter/ipfilterplugin.h @@ -41,7 +41,7 @@ namespace kt */ class IPFilterPlugin : public Plugin, public kt::IPBlockingInterface { - Q_OBJECT + TQ_OBJECT public: IPFilterPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/logviewer/logprefwidget.h b/plugins/logviewer/logprefwidget.h index edb93f6..4b23949 100644 --- a/plugins/logviewer/logprefwidget.h +++ b/plugins/logviewer/logprefwidget.h @@ -26,7 +26,7 @@ namespace kt { class LogPrefWidget: public LogPrefWidgetBase { - Q_OBJECT + TQ_OBJECT public: LogPrefWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/logviewer/logviewer.h b/plugins/logviewer/logviewer.h index 5fc7933..e8a1476 100644 --- a/plugins/logviewer/logviewer.h +++ b/plugins/logviewer/logviewer.h @@ -31,7 +31,7 @@ namespace kt */ class LogViewer : public KTextBrowser, public LogMonitorInterface { - Q_OBJECT + TQ_OBJECT public: LogViewer(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/logviewer/logviewerplugin.h b/plugins/logviewer/logviewerplugin.h index ba990d6..7742880 100644 --- a/plugins/logviewer/logviewerplugin.h +++ b/plugins/logviewer/logviewerplugin.h @@ -34,7 +34,7 @@ namespace kt */ class LogViewerPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: LogViewerPlugin(TQObject* parent, const char* qt_name, const TQStringList& args); diff --git a/plugins/partfileimport/importdialog.cpp b/plugins/partfileimport/importdialog.cpp index 6f517be..f570012 100644 --- a/plugins/partfileimport/importdialog.cpp +++ b/plugins/partfileimport/importdialog.cpp @@ -52,8 +52,8 @@ namespace kt r = m_data_url; r->setMode(KFile::File|KFile::Directory|KFile::LocalOnly); - connect(m_import_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onImport())); - connect(m_cancel_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(m_import_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onImport())); + connect(m_cancel_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); m_progress->setEnabled(false); } @@ -226,7 +226,7 @@ namespace kt { // download the torrent file TDEIO::StoredTransferJob* j = TDEIO::storedGet(tor_url); - connect(j,TQT_SIGNAL(result(TDEIO::Job* )),this,TQT_SLOT(onTorrentGetReult(TDEIO::Job*))); + connect(j,TQ_SIGNAL(result(TDEIO::Job* )),this,TQ_SLOT(onTorrentGetReult(TDEIO::Job*))); } else { diff --git a/plugins/partfileimport/importdialog.h b/plugins/partfileimport/importdialog.h index 1f1a82a..c422da8 100644 --- a/plugins/partfileimport/importdialog.h +++ b/plugins/partfileimport/importdialog.h @@ -45,7 +45,7 @@ namespace kt class ImportDialog : public ImportDlgBase,public bt::DataCheckerListener { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/partfileimport/partfileimportplugin.cpp b/plugins/partfileimport/partfileimportplugin.cpp index 148cf4f..ab05633 100644 --- a/plugins/partfileimport/partfileimportplugin.cpp +++ b/plugins/partfileimport/partfileimportplugin.cpp @@ -54,7 +54,7 @@ namespace kt void PartFileImportPlugin::load() { import_action = new TDEAction(i18n("Import existing download" ), 0, this, - TQT_SLOT(onImport()), actionCollection(), "partfileimport" ); + TQ_SLOT(onImport()), actionCollection(), "partfileimport" ); } void PartFileImportPlugin::unload() diff --git a/plugins/partfileimport/partfileimportplugin.h b/plugins/partfileimport/partfileimportplugin.h index 6753f07..7525bec 100644 --- a/plugins/partfileimport/partfileimportplugin.h +++ b/plugins/partfileimport/partfileimportplugin.h @@ -32,7 +32,7 @@ namespace kt */ class PartFileImportPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: PartFileImportPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/rssfeed/rss/image.cpp b/plugins/rssfeed/rss/image.cpp index 174a105..65aaf53 100644 --- a/plugins/rssfeed/rss/image.cpp +++ b/plugins/rssfeed/rss/image.cpp @@ -112,9 +112,9 @@ void Image::getPixmap() d->pixmapBuffer->open(IO_WriteOnly); d->job = TDEIO::get(d->url, false, false); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } void Image::slotData(TDEIO::Job *, const TQByteArray &data) diff --git a/plugins/rssfeed/rss/image.h b/plugins/rssfeed/rss/image.h index adbb800..19a8103 100644 --- a/plugins/rssfeed/rss/image.h +++ b/plugins/rssfeed/rss/image.h @@ -33,7 +33,7 @@ namespace RSS */ class Image : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/plugins/rssfeed/rss/loader.cpp b/plugins/rssfeed/rss/loader.cpp index 09450a2..ea20d84 100644 --- a/plugins/rssfeed/rss/loader.cpp +++ b/plugins/rssfeed/rss/loader.cpp @@ -83,13 +83,13 @@ void FileRetriever::retrieveData(const KURL &url) d->job = TDEIO::get(u, !m_useCache, false); - TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout())); - connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), - TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); + connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), + TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); } void FileRetriever::slotTimeout() @@ -179,10 +179,10 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotExited(TDEProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotOutput(TDEProcess *, char *, int))); + connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } @@ -240,7 +240,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -262,8 +262,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->url=url; d->retriever = retriever; - connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), - this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); + connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } diff --git a/plugins/rssfeed/rss/loader.h b/plugins/rssfeed/rss/loader.h index 3a48e49..7d2dbc0 100644 --- a/plugins/rssfeed/rss/loader.h +++ b/plugins/rssfeed/rss/loader.h @@ -34,7 +34,7 @@ namespace RSS */ class DataRetriever : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** @@ -89,7 +89,7 @@ namespace RSS */ class FileRetriever : public DataRetriever { - Q_OBJECT + TQ_OBJECT public: /** @@ -159,7 +159,7 @@ namespace RSS */ class OutputRetriever : public DataRetriever { - Q_OBJECT + TQ_OBJECT public: /** @@ -209,8 +209,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * @@ -254,7 +254,7 @@ namespace RSS */ class Loader : public TQObject { - Q_OBJECT + TQ_OBJECT friend class someClassWhichDoesNotExist; public: diff --git a/plugins/rssfeed/rss/testlibrss.cpp b/plugins/rssfeed/rss/testlibrss.cpp index bef989c..4515cf7 100644 --- a/plugins/rssfeed/rss/testlibrss.cpp +++ b/plugins/rssfeed/rss/testlibrss.cpp @@ -19,8 +19,8 @@ static const TDECmdLineOptions options[] = void Tester::test( const TQString &url ) { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( url, new FileRetriever ); } diff --git a/plugins/rssfeed/rss/testlibrss.h b/plugins/rssfeed/rss/testlibrss.h index 222943a..2a918a5 100644 --- a/plugins/rssfeed/rss/testlibrss.h +++ b/plugins/rssfeed/rss/testlibrss.h @@ -14,7 +14,7 @@ using RSS::Status; class Tester : public TQObject { - Q_OBJECT + TQ_OBJECT public: void test( const TQString &url ); diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp index 5b45a4c..2e8d14b 100644 --- a/plugins/rssfeed/rssfeed.cpp +++ b/plugins/rssfeed/rssfeed.cpp @@ -48,8 +48,8 @@ namespace kt feedLoading = false; loadArticles(); - connect(&refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( refreshFeed() ) ); - connect(this, TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT( saveArticles() ) ); + connect(&refreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( refreshFeed() ) ); + connect(this, TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT( saveArticles() ) ); startFeed(); } @@ -261,8 +261,8 @@ namespace kt feedLoading = true; cleanArticles(); Loader * feedLoader = Loader::create(); - connect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) ); + connect( feedLoader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( feedLoaded( Loader *, Document, Status ) ) ); feedLoader->loadFrom( m_feedUrl, new FileRetriever ); } @@ -313,8 +313,8 @@ namespace kt tqDebug( "There was and error loading the feed\n"); } - disconnect( feedLoader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( feedLoaded( Loader *, Document, Status ) ) ); + disconnect( feedLoader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( feedLoaded( Loader *, Document, Status ) ) ); feedLoader->deleteLater(); } diff --git a/plugins/rssfeed/rssfeed.h b/plugins/rssfeed/rssfeed.h index 46bd837..214177b 100644 --- a/plugins/rssfeed/rssfeed.h +++ b/plugins/rssfeed/rssfeed.h @@ -47,7 +47,7 @@ namespace kt class RssFeed : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp index 8addd09..a1ebebf 100644 --- a/plugins/rssfeed/rssfeedmanager.cpp +++ b/plugins/rssfeed/rssfeedmanager.cpp @@ -94,37 +94,37 @@ namespace kt loadFilterList(); //connect the buttons - connect(newFeed, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewFeed() ) ); - connect(deleteFeed, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedFeed() ) ); + connect(newFeed, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewFeed() ) ); + connect(deleteFeed, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedFeed() ) ); - connect(newAcceptFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewAcceptFilter() ) ); - connect(deleteAcceptFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedAcceptFilter() ) ); + connect(newAcceptFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewAcceptFilter() ) ); + connect(deleteAcceptFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedAcceptFilter() ) ); - connect(newRejectFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewRejectFilter() ) ); - connect(deleteRejectFilter, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedRejectFilter() ) ); + connect(newRejectFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewRejectFilter() ) ); + connect(deleteRejectFilter, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedRejectFilter() ) ); //connect the changing of the active feed - connect(feedlist, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveFeed()) ); + connect(feedlist, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveFeed()) ); //connect the changing of the url to enable the refresh button - connect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changedFeedUrl()) ); + connect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changedFeedUrl()) ); //connect the changing of the filters - connect(acceptFilterList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveAcceptFilter()) ); - connect(rejectFilterList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedActiveRejectFilter()) ); + connect(acceptFilterList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveAcceptFilter()) ); + connect(rejectFilterList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedActiveRejectFilter()) ); //connect the selection and downloading of articles - connect(feedArticles, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedArticleSelection()) ); - connect(downloadArticle, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadSelectedArticles()) ); + connect(feedArticles, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedArticleSelection()) ); + connect(downloadArticle, TQ_SIGNAL(clicked()), this, TQ_SLOT(downloadSelectedArticles()) ); //connect the selection, downloading and deletion of matches - connect(filterMatches, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(changedMatchSelection()) ); - connect(downloadFilterMatch, TQT_SIGNAL(clicked()), this, TQT_SLOT(downloadSelectedMatches()) ); - connect(deleteFilterMatch, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedMatches()) ); + connect(filterMatches, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(changedMatchSelection()) ); + connect(downloadFilterMatch, TQ_SIGNAL(clicked()), this, TQ_SLOT(downloadSelectedMatches()) ); + connect(deleteFilterMatch, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedMatches()) ); //connect the test text update to the slot - connect(testText, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(testTextChanged()) ); - connect(testTestText, TQT_SIGNAL(clicked()), this, TQT_SLOT(testFilter()) ); + connect(testText, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(testTextChanged()) ); + connect(testTestText, TQ_SIGNAL(clicked()), this, TQ_SLOT(testFilter()) ); changedActiveFeed(); changedActiveAcceptFilter(); @@ -159,65 +159,65 @@ namespace kt void RssFeedManager::connectFeed(int index) { - connect(feedTitle, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFeedTitle(const TQString &) ) ); + connect(feedTitle, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFeedTitle(const TQString &) ) ); //url - connect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setFeedUrl(const TQString&) ) ); - connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQT_SLOT(setKURL(const KURL&) ) ); + connect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setFeedUrl(const TQString&) ) ); + connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQ_SLOT(setKURL(const KURL&) ) ); //articleAge - connect(feedArticleAge, TQT_SIGNAL(valueChanged(int)), feeds.at(index), TQT_SLOT(setArticleAge(int) ) ); - connect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQT_SLOT(setValue(int) ) ); + connect(feedArticleAge, TQ_SIGNAL(valueChanged(int)), feeds.at(index), TQ_SLOT(setArticleAge(int) ) ); + connect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQ_SLOT(setValue(int) ) ); //active - connect(feedActive, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setActive(bool) ) ); - connect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), feedActive, TQT_SLOT(setChecked(bool) ) ); + connect(feedActive, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setActive(bool) ) ); + connect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), feedActive, TQ_SLOT(setChecked(bool) ) ); //autoRefresh - connect(feedAutoRefresh, TQT_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQT_SLOT(setAutoRefresh(const TQTime&) ) ); - connect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQT_SLOT(setTime(const TQTime&) ) ); + connect(feedAutoRefresh, TQ_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQ_SLOT(setAutoRefresh(const TQTime&) ) ); + connect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQ_SLOT(setTime(const TQTime&) ) ); //ignoreTTL - connect(feedIgnoreTTL, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setIgnoreTTL(bool) ) ); - connect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQT_SLOT(setChecked(bool) ) ); + connect(feedIgnoreTTL, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setIgnoreTTL(bool) ) ); + connect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQ_SLOT(setChecked(bool) ) ); //articles - connect(feeds.at(index), TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT(updateArticles(const RssArticle::List&) ) ); + connect(feeds.at(index), TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT(updateArticles(const RssArticle::List&) ) ); //connect the refresh button - connect(refreshFeed, TQT_SIGNAL(clicked()), feeds.at(index), TQT_SLOT(refreshFeed()) ); + connect(refreshFeed, TQ_SIGNAL(clicked()), feeds.at(index), TQ_SLOT(refreshFeed()) ); } void RssFeedManager::disconnectFeed(int index) { - disconnect(feedTitle, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFeedTitle(const TQString &) ) ); + disconnect(feedTitle, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFeedTitle(const TQString &) ) ); //url - disconnect(feedUrl, TQT_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQT_SLOT(setFeedUrl(const TQString&) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQT_SLOT(setKURL(const KURL&) ) ); + disconnect(feedUrl, TQ_SIGNAL(textChanged(const TQString &)), feeds.at(index), TQ_SLOT(setFeedUrl(const TQString&) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), feedUrl, TQ_SLOT(setKURL(const KURL&) ) ); //articleAge - disconnect(feedArticleAge, TQT_SIGNAL(valueChanged(int)), feeds.at(index), TQT_SLOT(setArticleAge(int) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQT_SLOT(setValue(int) ) ); + disconnect(feedArticleAge, TQ_SIGNAL(valueChanged(int)), feeds.at(index), TQ_SLOT(setArticleAge(int) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), feedArticleAge, TQ_SLOT(setValue(int) ) ); //active - disconnect(feedActive, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setActive(bool) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), feedActive, TQT_SLOT(setChecked(bool) ) ); + disconnect(feedActive, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setActive(bool) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), feedActive, TQ_SLOT(setChecked(bool) ) ); //autoRefresh - disconnect(feedAutoRefresh, TQT_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQT_SLOT(setAutoRefresh(const TQTime&) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQT_SLOT(setTime(const TQTime&) ) ); + disconnect(feedAutoRefresh, TQ_SIGNAL(valueChanged(const TQTime&)), feeds.at(index), TQ_SLOT(setAutoRefresh(const TQTime&) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), feedAutoRefresh, TQ_SLOT(setTime(const TQTime&) ) ); //ignoreTTL - disconnect(feedIgnoreTTL, TQT_SIGNAL(toggled(bool)), feeds.at(index), TQT_SLOT(setIgnoreTTL(bool) ) ); - disconnect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQT_SLOT(setChecked(bool) ) ); + disconnect(feedIgnoreTTL, TQ_SIGNAL(toggled(bool)), feeds.at(index), TQ_SLOT(setIgnoreTTL(bool) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), feedIgnoreTTL, TQ_SLOT(setChecked(bool) ) ); //articles - disconnect(feeds.at(index), TQT_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQT_SLOT(updateArticles(const RssArticle::List&) ) ); + disconnect(feeds.at(index), TQ_SIGNAL(articlesChanged(const RssArticle::List&)), this, TQ_SLOT(updateArticles(const RssArticle::List&) ) ); - disconnect(refreshFeed, TQT_SIGNAL(clicked()), feeds.at(index), TQT_SLOT(refreshFeed()) ); + disconnect(refreshFeed, TQ_SIGNAL(clicked()), feeds.at(index), TQ_SLOT(refreshFeed()) ); } void RssFeedManager::connectFilter(int index, bool acceptFilter) @@ -225,69 +225,69 @@ namespace kt if (acceptFilter) { //title - connect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); + connect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) ); //active - connect(filterActive, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setActive(bool) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); + connect(filterActive, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setActive(bool) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) ); //regExps - connect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); + connect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) ); //series - connect(filterSeries, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSeries(bool) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); + connect(filterSeries, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSeries(bool) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) ); //sansEpisode - connect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); + connect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) ); //minSeason - connect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); + connect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinSeason(int) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) ); //minEpisode - connect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); + connect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinEpisode(int) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) ); //maxSeason - connect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); + connect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxSeason(int) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) ); //maxEpisode - connect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); - connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); + connect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) ); //matches - connect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - connect(processFilter, TQT_SIGNAL(clicked()), acceptFilters.at(index), TQT_SIGNAL(rescanFilter()) ); + connect(processFilter, TQ_SIGNAL(clicked()), acceptFilters.at(index), TQ_SIGNAL(rescanFilter()) ); } else { //title - connect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); + connect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) ); //active - connect(filterActive, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setActive(bool) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); + connect(filterActive, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setActive(bool) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) ); //regExps - connect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); + connect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) ); //series - connect(filterSeries, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSeries(bool) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); + connect(filterSeries, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSeries(bool) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) ); //sansEpisode - connect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); + connect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) ); //minSeason - connect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); + connect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinSeason(int) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) ); //minEpisode - connect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); + connect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinEpisode(int) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) ); //maxSeason - connect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); + connect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxSeason(int) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) ); //maxEpisode - connect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); - connect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); + connect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) ); //matches - connect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - connect(processFilter, TQT_SIGNAL(clicked()), rejectFilters.at(index), TQT_SIGNAL(rescanFilter()) ); + connect(processFilter, TQ_SIGNAL(clicked()), rejectFilters.at(index), TQ_SIGNAL(rescanFilter()) ); } } @@ -297,68 +297,68 @@ namespace kt if (acceptFilter) { //title - disconnect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); + disconnect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), acceptFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) ); //active - disconnect(filterActive, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setActive(bool) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterActive, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setActive(bool) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) ); //regExps - disconnect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); + disconnect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) ); //series - disconnect(filterSeries, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSeries(bool) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterSeries, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSeries(bool) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) ); //sansEpisode - disconnect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), acceptFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), acceptFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) ); //minSeason - disconnect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); + disconnect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinSeason(int) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) ); //minEpisode - disconnect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); + disconnect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMinEpisode(int) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) ); //maxSeason - disconnect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); + disconnect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxSeason(int) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) ); //maxEpisode - disconnect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); - disconnect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); + disconnect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), acceptFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) ); //matches - disconnect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); + disconnect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - disconnect(processFilter, TQT_SIGNAL(clicked()), acceptFilters.at(index), TQT_SIGNAL(rescanFilter()) ); + disconnect(processFilter, TQ_SIGNAL(clicked()), acceptFilters.at(index), TQ_SIGNAL(rescanFilter()) ); } else { //title - disconnect(filterTitle, TQT_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQT_SLOT(setTitle(const TQString &) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(setFilterTitle(const TQString &) ) ); + disconnect(filterTitle, TQ_SIGNAL(textChanged(const TQString &)), rejectFilters.at(index), TQ_SLOT(setTitle(const TQString &) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(setFilterTitle(const TQString &) ) ); //active - disconnect(filterActive, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setActive(bool) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(activeChanged(bool)), filterActive, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterActive, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setActive(bool) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(activeChanged(bool)), filterActive, TQ_SLOT(setChecked(bool) ) ); //regExps - disconnect(filterRegExps, TQT_SIGNAL(changed()), this, TQT_SLOT(updateRegExps()) ); + disconnect(filterRegExps, TQ_SIGNAL(changed()), this, TQ_SLOT(updateRegExps()) ); //series - disconnect(filterSeries, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSeries(bool) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged(bool)), filterSeries, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterSeries, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSeries(bool) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged(bool)), filterSeries, TQ_SLOT(setChecked(bool) ) ); //sansEpisode - disconnect(filterSansEpisode, TQT_SIGNAL(toggled(bool)), rejectFilters.at(index), TQT_SLOT(setSansEpisode(bool) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQT_SLOT(setChecked(bool) ) ); + disconnect(filterSansEpisode, TQ_SIGNAL(toggled(bool)), rejectFilters.at(index), TQ_SLOT(setSansEpisode(bool) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged(bool)), filterSansEpisode, TQ_SLOT(setChecked(bool) ) ); //minSeason - disconnect(filterMinSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinSeason(int) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQT_SLOT(setValue(int) ) ); + disconnect(filterMinSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinSeason(int) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged(int)), filterMinSeason, TQ_SLOT(setValue(int) ) ); //minEpisode - disconnect(filterMinEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMinEpisode(int) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQT_SLOT(setValue(int) ) ); + disconnect(filterMinEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMinEpisode(int) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged(int)), filterMinEpisode, TQ_SLOT(setValue(int) ) ); //maxSeason - disconnect(filterMaxSeason, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxSeason(int) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQT_SLOT(setValue(int) ) ); + disconnect(filterMaxSeason, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxSeason(int) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged(int)), filterMaxSeason, TQ_SLOT(setValue(int) ) ); //maxEpisode - disconnect(filterMaxEpisode, TQT_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQT_SLOT(setMaxEpisode(int) ) ); - disconnect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQT_SLOT(setValue(int) ) ); + disconnect(filterMaxEpisode, TQ_SIGNAL(valueChanged(int)), rejectFilters.at(index), TQ_SLOT(setMaxEpisode(int) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged(int)), filterMaxEpisode, TQ_SLOT(setValue(int) ) ); //matches - disconnect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQT_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); + disconnect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged(const TQValueList<FilterMatch>&)), this, TQ_SLOT(updateMatches(const TQValueList<FilterMatch>&) ) ); - disconnect(processFilter, TQT_SIGNAL(clicked()), rejectFilters.at(index), TQT_SIGNAL(rescanFilter()) ); + disconnect(processFilter, TQ_SIGNAL(clicked()), rejectFilters.at(index), TQ_SIGNAL(rescanFilter()) ); } } @@ -375,27 +375,27 @@ namespace kt feedlist->setCurrentItem(index); //update the feed list - connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateFeedList()) ); + connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateFeedList()) ); //clear the articles list when the url is changed - connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), this, TQT_SLOT(clearArticles() ) ); + connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), this, TQ_SLOT(clearArticles() ) ); //connect the scanArticle signal to the scanArticle slot - connect(feeds.at(index), TQT_SIGNAL(scanRssArticle(RssArticle)), this, TQT_SLOT(scanArticle(RssArticle) ) ); + connect(feeds.at(index), TQ_SIGNAL(scanRssArticle(RssArticle)), this, TQ_SLOT(scanArticle(RssArticle) ) ); //connect all the fields to the save slot //title - connect(feeds.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFeedList() ) ); //url - connect(feeds.at(index), TQT_SIGNAL(feedUrlChanged(const KURL&)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(feedUrlChanged(const KURL&)), this, TQ_SLOT(saveFeedList() ) ); //articleAge - connect(feeds.at(index), TQT_SIGNAL(articleAgeChanged(int)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(articleAgeChanged(int)), this, TQ_SLOT(saveFeedList() ) ); //active - connect(feeds.at(index), TQT_SIGNAL(activeChanged(bool)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(activeChanged(bool)), this, TQ_SLOT(saveFeedList() ) ); //autoRefresh - connect(feeds.at(index), TQT_SIGNAL(autoRefreshChanged(const TQTime&)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(autoRefreshChanged(const TQTime&)), this, TQ_SLOT(saveFeedList() ) ); //ignoreTTL - connect(feeds.at(index), TQT_SIGNAL(ignoreTTLChanged(bool)), this, TQT_SLOT(saveFeedList() ) ); + connect(feeds.at(index), TQ_SIGNAL(ignoreTTLChanged(bool)), this, TQ_SLOT(saveFeedList() ) ); } @@ -410,52 +410,52 @@ namespace kt acceptFilterList->insertItem(acceptFilters.at(index)->title()); acceptFilterList->setCurrentItem(index); - connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateAcceptFilterList()) ); + connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateAcceptFilterList()) ); //connect all the fields to the save slot //title - connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFilterList() ) ); //active - connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //regexps - connect(acceptFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(saveFilterList() ) ); //series - connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //sansEpisode - connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //minSeason - connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //minEpisode - connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //maxSeason - connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //maxEpiosde - connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //matches - connect(acceptFilters.at(index), TQT_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQT_SLOT(saveFilterList() ) ); + connect(acceptFilters.at(index), TQ_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQ_SLOT(saveFilterList() ) ); //connect the rescan signal to the rescan slot - connect(acceptFilters.at(index), TQT_SIGNAL(rescanFilter()), this, TQT_SLOT(rescanFilter()) ); + connect(acceptFilters.at(index), TQ_SIGNAL(rescanFilter()), this, TQ_SLOT(rescanFilter()) ); // //connect all except the matchesChanged to the rescanFilter slot // //title -// connect(acceptFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(rescanFilter() ) ); // //active -// connect(acceptFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(rescanFilter() ) ); // //regexps -// connect(acceptFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(rescanFilter() ) ); // //series -// connect(acceptFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(rescanFilter() ) ); // //sansEpisode -// connect(acceptFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(rescanFilter() ) ); // //minSeason -// connect(acceptFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(rescanFilter() ) ); // //minEpisode -// connect(acceptFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(rescanFilter() ) ); // //maxSeason -// connect(acceptFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(rescanFilter() ) ); // //maxEpiosde -// connect(acceptFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(rescanFilter() ) ); +// connect(acceptFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(rescanFilter() ) ); } @@ -470,29 +470,29 @@ namespace kt rejectFilterList->insertItem(rejectFilters.at(index)->title()); rejectFilterList->setCurrentItem(index); - connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString&)), this, TQT_SLOT(updateRejectFilterList()) ); + connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString&)), this, TQ_SLOT(updateRejectFilterList()) ); //connect all the fields to the save slot //title - connect(rejectFilters.at(index), TQT_SIGNAL(titleChanged(const TQString &)), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(titleChanged(const TQString &)), this, TQ_SLOT(saveFilterList() ) ); //active - connect(rejectFilters.at(index), TQT_SIGNAL(activeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(activeChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //regexps - connect(rejectFilters.at(index), TQT_SIGNAL(regExpsChanged( const TQStringList& )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(regExpsChanged( const TQStringList& )), this, TQ_SLOT(saveFilterList() ) ); //series - connect(rejectFilters.at(index), TQT_SIGNAL(seriesChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(seriesChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //sansEpisode - connect(rejectFilters.at(index), TQT_SIGNAL(sansEpisodeChanged( bool )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(sansEpisodeChanged( bool )), this, TQ_SLOT(saveFilterList() ) ); //minSeason - connect(rejectFilters.at(index), TQT_SIGNAL(minSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(minSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //minEpisode - connect(rejectFilters.at(index), TQT_SIGNAL(minEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(minEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //maxSeason - connect(rejectFilters.at(index), TQT_SIGNAL(maxSeasonChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(maxSeasonChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //maxEpiosde - connect(rejectFilters.at(index), TQT_SIGNAL(maxEpisodeChanged (int )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(maxEpisodeChanged (int )), this, TQ_SLOT(saveFilterList() ) ); //matches - connect(rejectFilters.at(index), TQT_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQT_SLOT(saveFilterList() ) ); + connect(rejectFilters.at(index), TQ_SIGNAL(matchesChanged( const TQValueList<FilterMatch>& )), this, TQ_SLOT(saveFilterList() ) ); } @@ -773,7 +773,7 @@ namespace kt curDownload = new RssLinkDownloader(m_core, feedArticles->text(j, 2)); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); + connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) ); } } } @@ -1232,7 +1232,7 @@ namespace kt RssLinkDownloader * curDownload = new RssLinkDownloader(m_core, article.link().prettyURL(), filter); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); + connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) ); } } } @@ -1245,7 +1245,7 @@ namespace kt RssLinkDownloader * curDownload = new RssLinkDownloader(m_core, article.link().prettyURL(), acceptFilters.at(i)); for (int i=0; i<feeds.count(); i++) { - connect(curDownload, TQT_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQT_SLOT(setDownloaded(TQString, int)) ); + connect(curDownload, TQ_SIGNAL(linkDownloaded( TQString, int )), feeds.at(i), TQ_SLOT(setDownloaded(TQString, int)) ); } } } diff --git a/plugins/rssfeed/rssfeedmanager.h b/plugins/rssfeed/rssfeedmanager.h index 939c460..fd6cb57 100644 --- a/plugins/rssfeed/rssfeedmanager.h +++ b/plugins/rssfeed/rssfeedmanager.h @@ -46,7 +46,7 @@ namespace kt */ class RssFeedManager : public RssFeedWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/rssfeed/rssfeedplugin.h b/plugins/rssfeed/rssfeedplugin.h index 5014908..c268097 100644 --- a/plugins/rssfeed/rssfeedplugin.h +++ b/plugins/rssfeed/rssfeedplugin.h @@ -36,7 +36,7 @@ namespace kt */ class RssFeedPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: RssFeedPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/rssfeed/rssfilter.h b/plugins/rssfeed/rssfilter.h index d557a78..eba0a21 100644 --- a/plugins/rssfeed/rssfilter.h +++ b/plugins/rssfeed/rssfilter.h @@ -68,7 +68,7 @@ namespace kt class RssFilter : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp index ee357d6..92bb90d 100644 --- a/plugins/rssfeed/rsslinkdownloader.cpp +++ b/plugins/rssfeed/rsslinkdownloader.cpp @@ -43,14 +43,14 @@ namespace kt { // no valid URL, so just display an error message KMessageBox::error(0,i18n("Failed to find and download a valid torrent for %1").arg(curLink)); - TQTimer::singleShot(50,this,TQT_SLOT(suicide())); + TQTimer::singleShot(50,this,TQ_SLOT(suicide())); } else { //first let's download the link so we can process it to check for the actual torrent curLink = curSubLink = link; curFile = TDEIO::storedGet(link,false,false); - connect(curFile, TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(processLink( TDEIO::Job* ))); + connect(curFile, TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(processLink( TDEIO::Job* ))); } } @@ -189,7 +189,7 @@ namespace kt curSubLink = subLinks.first(); subLinks.pop_front(); curFile = TDEIO::storedGet(curSubLink,false,false); - connect(curFile, TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(processLink( TDEIO::Job* ))); + connect(curFile, TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(processLink( TDEIO::Job* ))); } } diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h index a496af7..486eed8 100644 --- a/plugins/rssfeed/rsslinkdownloader.h +++ b/plugins/rssfeed/rsslinkdownloader.h @@ -46,7 +46,7 @@ namespace kt class RssLinkDownloader : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/scanfolder/scanfolder.cpp b/plugins/scanfolder/scanfolder.cpp index dfceba0..135aea2 100644 --- a/plugins/scanfolder/scanfolder.cpp +++ b/plugins/scanfolder/scanfolder.cpp @@ -58,9 +58,9 @@ namespace kt m_dir->setShowingDotFiles(true); - connect(m_dir, TQT_SIGNAL(newItems( const KFileItemList& )), this, TQT_SLOT(onNewItems( const KFileItemList& ))); - connect(m_core, TQT_SIGNAL(loadingFinished( const KURL&, bool, bool )), this, TQT_SLOT(onLoadingFinished( const KURL&, bool, bool ))); - connect(&m_incomplePollingTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onIncompletePollingTimeout())); + connect(m_dir, TQ_SIGNAL(newItems( const KFileItemList& )), this, TQ_SLOT(onNewItems( const KFileItemList& ))); + connect(m_core, TQ_SIGNAL(loadingFinished( const KURL&, bool, bool )), this, TQ_SLOT(onLoadingFinished( const KURL&, bool, bool ))); + connect(&m_incomplePollingTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onIncompletePollingTimeout())); } diff --git a/plugins/scanfolder/scanfolder.h b/plugins/scanfolder/scanfolder.h index 680f74c..58fbd04 100644 --- a/plugins/scanfolder/scanfolder.h +++ b/plugins/scanfolder/scanfolder.h @@ -55,7 +55,7 @@ namespace kt */ class ScanFolder : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/scanfolder/scanfolderplugin.h b/plugins/scanfolder/scanfolderplugin.h index 527b36d..3ea18ce 100644 --- a/plugins/scanfolder/scanfolderplugin.h +++ b/plugins/scanfolder/scanfolderplugin.h @@ -37,7 +37,7 @@ namespace kt */ class ScanFolderPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: ScanFolderPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/scanfolder/scanfolderprefpagewidget.h b/plugins/scanfolder/scanfolderprefpagewidget.h index 6468d9d..963ca40 100644 --- a/plugins/scanfolder/scanfolderprefpagewidget.h +++ b/plugins/scanfolder/scanfolderprefpagewidget.h @@ -26,7 +26,7 @@ namespace kt { class ScanFolderPrefPageWidget: public SfPrefPageWidgetBase { - Q_OBJECT + TQ_OBJECT public: ScanFolderPrefPageWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/scheduler/bwspage.ui b/plugins/scheduler/bwspage.ui index 46f797e..b5e1db1 100644 --- a/plugins/scheduler/bwspage.ui +++ b/plugins/scheduler/bwspage.ui @@ -838,14 +838,14 @@ <tabstop>dlCat3</tabstop> <tabstop>ulCat3</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>btnOk_clicked()</slot> <slot>btnApply_clicked()</slot> <slot>btnCancel_clicked()</slot> <slot>btnSave_clicked()</slot> <slot>btnLoad_clicked()</slot> <slot>btnReset_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">bwswidget.h</include> diff --git a/plugins/scheduler/bwsprefpagewidget.cpp b/plugins/scheduler/bwsprefpagewidget.cpp index 38ab296..2c342f4 100644 --- a/plugins/scheduler/bwsprefpagewidget.cpp +++ b/plugins/scheduler/bwsprefpagewidget.cpp @@ -93,16 +93,16 @@ namespace kt pix52->setPixmap(TQPixmap(locate("data", TQString("ktorrent/icons/cell-a-0004.png")))); } - connect(radio1, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio2, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio3, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio4, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio5, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio12, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio22, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio32, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio42, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); - connect(radio52, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(categoryChanged(int))); + connect(radio1, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio2, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio3, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio4, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio5, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio12, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio22, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio32, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio42, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); + connect(radio52, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(categoryChanged(int))); //pre-check default categories (say 1 for left and 0 for right) radio2->setChecked(true); diff --git a/plugins/scheduler/bwsprefpagewidget.h b/plugins/scheduler/bwsprefpagewidget.h index a2e68e0..d87a2bc 100644 --- a/plugins/scheduler/bwsprefpagewidget.h +++ b/plugins/scheduler/bwsprefpagewidget.h @@ -33,7 +33,7 @@ namespace kt */ class BWSPrefPageWidget : public BWSPage { - Q_OBJECT + TQ_OBJECT public: BWSPrefPageWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/plugins/scheduler/bwswidget.cpp b/plugins/scheduler/bwswidget.cpp index b3358a7..4423458 100644 --- a/plugins/scheduler/bwswidget.cpp +++ b/plugins/scheduler/bwswidget.cpp @@ -63,7 +63,7 @@ namespace kt setColumnLabels(days); setRowLabels(hours); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); TQFont f; f.setPointSize(8); @@ -101,8 +101,8 @@ namespace kt setHScrollBarMode(TQTable::AlwaysOff); setVScrollBarMode(TQTable::AlwaysOff); - connect(this, TQT_SIGNAL(currentChanged( int, int )), this, TQT_SLOT(cellSelectionChanged( int, int ))); - connect(this, TQT_SIGNAL(pressed(int, int, int, const TQPoint&)), this, TQT_SLOT(cellMouseDown(int, int, int, const TQPoint& ))); + connect(this, TQ_SIGNAL(currentChanged( int, int )), this, TQ_SLOT(cellSelectionChanged( int, int ))); + connect(this, TQ_SIGNAL(pressed(int, int, int, const TQPoint&)), this, TQ_SLOT(cellMouseDown(int, int, int, const TQPoint& ))); } BWSWidget::~BWSWidget() diff --git a/plugins/scheduler/bwswidget.h b/plugins/scheduler/bwswidget.h index 79d5ccd..9cb36ae 100644 --- a/plugins/scheduler/bwswidget.h +++ b/plugins/scheduler/bwswidget.h @@ -43,7 +43,7 @@ namespace kt */ class BWSWidget : public TQTable { - Q_OBJECT + TQ_OBJECT public: BWSWidget(TQWidget* parent = 0, const char* name = 0, bool useColors = true); diff --git a/plugins/scheduler/schedulerpage.ui b/plugins/scheduler/schedulerpage.ui index 0fc52b3..ce0cfb6 100644 --- a/plugins/scheduler/schedulerpage.ui +++ b/plugins/scheduler/schedulerpage.ui @@ -137,10 +137,10 @@ <slot>useColors_toggled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnEditBWS_toggled(bool)</slot> <slot>btnEditBWS_clicked()</slot> <slot>useColors_toggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/plugins/scheduler/schedulerplugin.cpp b/plugins/scheduler/schedulerplugin.cpp index d0b8f68..e0a71e7 100644 --- a/plugins/scheduler/schedulerplugin.cpp +++ b/plugins/scheduler/schedulerplugin.cpp @@ -60,7 +60,7 @@ namespace kt { setXMLFile("ktschedulerpluginui.rc"); bws_action = 0; - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer_triggered())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer_triggered())); } @@ -95,7 +95,7 @@ namespace kt // updateEnabledBWS(); bws_action = new TDEAction(i18n("Open Bandwidth Scheduler" ), "clock", 0, this, - TQT_SLOT(openBWS()), actionCollection(), "bwscheduler" ); + TQ_SLOT(openBWS()), actionCollection(), "bwscheduler" ); } void SchedulerPlugin::unload() @@ -135,7 +135,7 @@ namespace kt if(SchedulerPluginSettings::enableBWS()) { bws_action = new TDEAction(i18n("Open Bandwidth Scheduler" ), "clock", 0, this, - TQT_SLOT(openBWS()), actionCollection(), "bwscheduler" ); + TQ_SLOT(openBWS()), actionCollection(), "bwscheduler" ); } else { diff --git a/plugins/scheduler/schedulerplugin.h b/plugins/scheduler/schedulerplugin.h index 6fb9733..9143d99 100644 --- a/plugins/scheduler/schedulerplugin.h +++ b/plugins/scheduler/schedulerplugin.h @@ -42,7 +42,7 @@ namespace kt */ class SchedulerPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: SchedulerPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/scheduler/schedulerprefpagewidget.cpp b/plugins/scheduler/schedulerprefpagewidget.cpp index 65d600b..156f46f 100644 --- a/plugins/scheduler/schedulerprefpagewidget.cpp +++ b/plugins/scheduler/schedulerprefpagewidget.cpp @@ -61,7 +61,7 @@ namespace kt /* force trigger since the schedule has changed but after KTorrent::apply() * Used TQTimer with fixed interval - not very nice solution... */ if(useBS->isChecked()) - TQTimer::singleShot(1000, this, TQT_SLOT(scheduler_trigger())); + TQTimer::singleShot(1000, this, TQ_SLOT(scheduler_trigger())); BWScheduler::instance().setEnabled(use_bws); } diff --git a/plugins/scheduler/schedulerprefpagewidget.h b/plugins/scheduler/schedulerprefpagewidget.h index 271586f..5a3c5c3 100644 --- a/plugins/scheduler/schedulerprefpagewidget.h +++ b/plugins/scheduler/schedulerprefpagewidget.h @@ -31,7 +31,7 @@ namespace kt */ class SchedulerPrefPageWidget : public SchedulerPage { - Q_OBJECT + TQ_OBJECT public: SchedulerPrefPageWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp index 2c57aeb..1f3a50d 100644 --- a/plugins/search/htmlpart.cpp +++ b/plugins/search/htmlpart.cpp @@ -45,8 +45,8 @@ namespace kt setPluginsEnabled(false); setStatusMessagesEnabled(false); KParts::BrowserExtension* ext = this->browserExtension(); - connect(ext,TQT_SIGNAL(openURLRequest(const KURL&,const KParts::URLArgs&)), - this,TQT_SLOT(openURLRequest(const KURL&, const KParts::URLArgs& ))); + connect(ext,TQ_SIGNAL(openURLRequest(const KURL&,const KParts::URLArgs&)), + this,TQ_SLOT(openURLRequest(const KURL&, const KParts::URLArgs& ))); ext->enableAction("copy",true); ext->enableAction("paste",true); @@ -75,11 +75,11 @@ namespace kt } TDEIO::TransferJob* j = TDEIO::get(u,false,false); - connect(j,TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), - this,TQT_SLOT(dataRecieved(TDEIO::Job*, const TQByteArray& ))); - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(jobDone(TDEIO::Job* ))); - connect(j,TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString &)), - this,TQT_SLOT(mimetype(TDEIO::Job*, const TQString& ))); + connect(j,TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray &)), + this,TQ_SLOT(dataRecieved(TDEIO::Job*, const TQByteArray& ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(jobDone(TDEIO::Job* ))); + connect(j,TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString &)), + this,TQ_SLOT(mimetype(TDEIO::Job*, const TQString& ))); active_job = j; curr_data.resize(0); diff --git a/plugins/search/htmlpart.h b/plugins/search/htmlpart.h index 091c82f..5ed8f19 100644 --- a/plugins/search/htmlpart.h +++ b/plugins/search/htmlpart.h @@ -36,7 +36,7 @@ namespace kt */ class HTMLPart : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: HTMLPart(TQWidget *parent = 0); diff --git a/plugins/search/searchplugin.cpp b/plugins/search/searchplugin.cpp index e1126f5..ebf53e6 100644 --- a/plugins/search/searchplugin.cpp +++ b/plugins/search/searchplugin.cpp @@ -65,8 +65,8 @@ namespace kt engines.load(TDEGlobal::dirs()->saveLocation("data","ktorrent") + "search_engines"); TDEToolBar* tb = getGUI()->addToolBar("search"); tab = new SearchTab(tb); - connect(tab,TQT_SIGNAL(search( const TQString&, int, bool )), - this,TQT_SLOT(search( const TQString&, int, bool ))); + connect(tab,TQ_SIGNAL(search( const TQString&, int, bool )), + this,TQ_SLOT(search( const TQString&, int, bool ))); pref = new SearchPrefPage(this); getGUI()->addPrefPage(pref); @@ -118,7 +118,7 @@ namespace kt SearchWidget* search = new SearchWidget(this); getGUI()->addTabPage(search,iload->loadIconSet("viewmag", TDEIcon::Small),text,this); - TDEAction* copy_act = KStdAction::copy(TQT_TQOBJECT(search),TQT_SLOT(copy()),actionCollection()); + TDEAction* copy_act = KStdAction::copy(search,TQ_SLOT(copy()),actionCollection()); copy_act->plug(search->rightClickMenu(),0); searches.append(search); diff --git a/plugins/search/searchplugin.h b/plugins/search/searchplugin.h index 6d6f2dd..f7f41e7 100644 --- a/plugins/search/searchplugin.h +++ b/plugins/search/searchplugin.h @@ -36,7 +36,7 @@ namespace kt */ class SearchPlugin : public Plugin, public kt::CloseTabListener { - Q_OBJECT + TQ_OBJECT public: SearchPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/search/searchpref.ui b/plugins/search/searchpref.ui index 8f5761c..0c169bf 100644 --- a/plugins/search/searchpref.ui +++ b/plugins/search/searchpref.ui @@ -300,9 +300,9 @@ <slot>btnUpdate_clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnUpdate_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kactivelabel.h</include> diff --git a/plugins/search/searchprefpage.cpp b/plugins/search/searchprefpage.cpp index cc9e6d3..68bb613 100644 --- a/plugins/search/searchprefpage.cpp +++ b/plugins/search/searchprefpage.cpp @@ -60,12 +60,12 @@ namespace kt TQToolTip::add(m_infoLabel,info); TQToolTip::add(m_engine_name,info); - connect(btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked())); - connect(btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeClicked())); - connect(btn_add_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDefaultClicked())); - connect(btnRemoveAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeAllClicked())); + connect(btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked())); + connect(btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeClicked())); + connect(btn_add_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDefaultClicked())); + connect(btnRemoveAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeAllClicked())); - connect(useCustomBrowser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(customToggled( bool ))); + connect(useCustomBrowser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(customToggled( bool ))); useCustomBrowser->setChecked(SearchPluginSettings::useCustomBrowser()); useDefaultBrowser->setChecked(SearchPluginSettings::useDefaultBrowser()); diff --git a/plugins/search/searchprefpage.h b/plugins/search/searchprefpage.h index fb2565a..add87a9 100644 --- a/plugins/search/searchprefpage.h +++ b/plugins/search/searchprefpage.h @@ -33,7 +33,7 @@ namespace kt class SearchPrefPageWidget : public SEPreferences { - Q_OBJECT + TQ_OBJECT public: SearchPrefPageWidget(TQWidget *parent = 0); diff --git a/plugins/search/searchtab.cpp b/plugins/search/searchtab.cpp index c752bc5..dc68dc4 100644 --- a/plugins/search/searchtab.cpp +++ b/plugins/search/searchtab.cpp @@ -51,10 +51,10 @@ namespace kt m_clear_button->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase")); m_clear_button->setEnabled(false); - connect(m_search_new_tab,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchNewTabPressed())); - connect(m_search_text,TQT_SIGNAL(returnPressed(const TQString&)),this,TQT_SLOT(searchBoxReturn( const TQString& ))); - connect(m_search_text,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged( const TQString& ))); - connect(m_clear_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearButtonPressed())); + connect(m_search_new_tab,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchNewTabPressed())); + connect(m_search_text,TQ_SIGNAL(returnPressed(const TQString&)),this,TQ_SLOT(searchBoxReturn( const TQString& ))); + connect(m_search_text,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(textChanged( const TQString& ))); + connect(m_clear_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearButtonPressed())); m_search_text->setMaxCount(20); m_search_new_tab->setEnabled(false); m_search_text->setInsertionPolicy(TQComboBox::NoInsertion); diff --git a/plugins/search/searchtab.h b/plugins/search/searchtab.h index 2f63ab1..35fecfb 100644 --- a/plugins/search/searchtab.h +++ b/plugins/search/searchtab.h @@ -35,7 +35,7 @@ namespace kt */ class SearchTab : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp index 128ceeb..fc43870 100644 --- a/plugins/search/searchwidget.cpp +++ b/plugins/search/searchwidget.cpp @@ -69,18 +69,18 @@ namespace kt back_id = right_click_menu->insertItem( TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() ? "forward" : "back",TDEIcon::Small), - i18n("Back"),html_part,TQT_SLOT(back())); + i18n("Back"),html_part,TQ_SLOT(back())); right_click_menu->insertItem( TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small), - i18n("Reload"),html_part,TQT_SLOT(reload())); + i18n("Reload"),html_part,TQ_SLOT(reload())); right_click_menu->setItemEnabled(back_id,false); sbar->m_back->setEnabled(false); - connect(sbar->m_search_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchPressed())); - connect(sbar->m_clear_button,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearPressed())); - connect(sbar->m_search_text,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(searchPressed())); - connect(sbar->m_back,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(back())); - connect(sbar->m_reload,TQT_SIGNAL(clicked()),html_part,TQT_SLOT(reload())); + connect(sbar->m_search_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchPressed())); + connect(sbar->m_clear_button,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearPressed())); + connect(sbar->m_search_text,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(searchPressed())); + connect(sbar->m_back,TQ_SIGNAL(clicked()),html_part,TQ_SLOT(back())); + connect(sbar->m_reload,TQ_SIGNAL(clicked()),html_part,TQ_SLOT(reload())); sbar->m_clear_button->setIconSet( TDEGlobal::iconLoader()->loadIconSet(TQApplication::reverseLayout() @@ -92,22 +92,22 @@ namespace kt TDEGlobal::iconLoader()->loadIconSet("reload",TDEIcon::Small)); - connect(html_part,TQT_SIGNAL(backAvailable(bool )), - this,TQT_SLOT(onBackAvailable(bool ))); - connect(html_part,TQT_SIGNAL(onURL(const TQString& )), - this,TQT_SLOT(onURLHover(const TQString& ))); - connect(html_part,TQT_SIGNAL(openTorrent(const KURL& )), - this,TQT_SLOT(onOpenTorrent(const KURL& ))); - connect(html_part,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )), - this,TQT_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); - connect(html_part,TQT_SIGNAL(searchFinished()),this,TQT_SLOT(onFinished())); - connect(html_part,TQT_SIGNAL(saveTorrent(const KURL& )), - this,TQT_SLOT(onSaveTorrent(const KURL& ))); + connect(html_part,TQ_SIGNAL(backAvailable(bool )), + this,TQ_SLOT(onBackAvailable(bool ))); + connect(html_part,TQ_SIGNAL(onURL(const TQString& )), + this,TQ_SLOT(onURLHover(const TQString& ))); + connect(html_part,TQ_SIGNAL(openTorrent(const KURL& )), + this,TQ_SLOT(onOpenTorrent(const KURL& ))); + connect(html_part,TQ_SIGNAL(popupMenu(const TQString&, const TQPoint& )), + this,TQ_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); + connect(html_part,TQ_SIGNAL(searchFinished()),this,TQ_SLOT(onFinished())); + connect(html_part,TQ_SIGNAL(saveTorrent(const KURL& )), + this,TQ_SLOT(onSaveTorrent(const KURL& ))); KParts::PartManager* pman = html_part->partManager(); - connect(pman,TQT_SIGNAL(partAdded(KParts::Part*)),this,TQT_SLOT(onFrameAdded(KParts::Part* ))); + connect(pman,TQ_SIGNAL(partAdded(KParts::Part*)),this,TQ_SLOT(onFrameAdded(KParts::Part* ))); - connect(html_part->browserExtension(),TQT_SIGNAL(loadingProgress(int)),this,TQT_SLOT(loadingProgress(int))); + connect(html_part->browserExtension(),TQ_SIGNAL(loadingProgress(int)),this,TQ_SLOT(loadingProgress(int))); prog = 0; } @@ -143,8 +143,8 @@ namespace kt TDEHTMLPart* frame = dynamic_cast<TDEHTMLPart*>(p); if (frame) { - connect(frame,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )), - this,TQT_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); + connect(frame,TQ_SIGNAL(popupMenu(const TQString&, const TQPoint& )), + this,TQ_SLOT(showPopupMenu(const TQString&, const TQPoint& ))); } } diff --git a/plugins/search/searchwidget.h b/plugins/search/searchwidget.h index 9d42b93..e556f10 100644 --- a/plugins/search/searchwidget.h +++ b/plugins/search/searchwidget.h @@ -47,7 +47,7 @@ namespace kt */ class SearchWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SearchWidget(SearchPlugin* sp); diff --git a/plugins/stats/ChartDrawer.cpp b/plugins/stats/ChartDrawer.cpp index 6eb08b4..ad4ff67 100644 --- a/plugins/stats/ChartDrawer.cpp +++ b/plugins/stats/ChartDrawer.cpp @@ -190,7 +190,7 @@ void ChartDrawer::DrawChart(TQPainter & rPnt) // ------------ TQPen myop(rPnt.pen()); TQPen topl(myop); - topl.setStyle(Qt::DotLine); + topl.setStyle(TQt::DotLine); rPnt.setPen(topl); rPnt.drawLine(0, TrY(FindYScreenCoords(mEls[i].pmVals -> at(mEls[i].pmVals -> size() - 1))), width(), TrY(FindYScreenCoords(mEls[i].pmVals -> at(mEls[i].pmVals -> size() - 1))) ); rPnt.setPen(myop); diff --git a/plugins/stats/ChartDrawer.h b/plugins/stats/ChartDrawer.h index d7211b0..83a4e32 100644 --- a/plugins/stats/ChartDrawer.h +++ b/plugins/stats/ChartDrawer.h @@ -48,7 +48,7 @@ namespace kt { */ class ChartDrawer : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/stats/StatsCon.cpp b/plugins/stats/StatsCon.cpp index 568005d..d2f8d5f 100644 --- a/plugins/stats/StatsCon.cpp +++ b/plugins/stats/StatsCon.cpp @@ -25,13 +25,13 @@ namespace kt { StatsCon::StatsCon(TQWidget * p) : StatsConWgt(p), pmPeersConCht(new ChartDrawer(PeersConGbw, StatsPluginSettings::connectionsMeasurements())), pmDHTCht(new ChartDrawer(DHTGbw, StatsPluginSettings::dHTMeasurements())) { - PeersConGbw->setColumnLayout(0, Qt::Vertical ); + PeersConGbw->setColumnLayout(0, TQt::Vertical ); PeersConGbw->layout()->setSpacing( 6 ); PeersConGbw->layout()->setMargin( 11 ); pmPeersConLay = new TQVBoxLayout(PeersConGbw -> layout()); - DHTGbw->setColumnLayout(0, Qt::Vertical ); + DHTGbw->setColumnLayout(0, TQt::Vertical ); DHTGbw->layout()->setSpacing( 6 ); DHTGbw->layout()->setMargin( 11 ); diff --git a/plugins/stats/StatsCon.h b/plugins/stats/StatsCon.h index 53371a2..00deae5 100644 --- a/plugins/stats/StatsCon.h +++ b/plugins/stats/StatsCon.h @@ -34,7 +34,7 @@ namespace kt { class StatsCon : public StatsConWgt { - Q_OBJECT + TQ_OBJECT private: ///Layout of peers connections diff --git a/plugins/stats/StatsPluginPrefs.h b/plugins/stats/StatsPluginPrefs.h index 43c524d..047b921 100644 --- a/plugins/stats/StatsPluginPrefs.h +++ b/plugins/stats/StatsPluginPrefs.h @@ -42,7 +42,7 @@ namespace kt { */ class StatsPluginPrefs : public TQObject, public PrefPageInterface { - Q_OBJECT + TQ_OBJECT private: diff --git a/plugins/stats/StatsSpd.cpp b/plugins/stats/StatsSpd.cpp index c8cb157..d48e2fd 100644 --- a/plugins/stats/StatsSpd.cpp +++ b/plugins/stats/StatsSpd.cpp @@ -28,19 +28,19 @@ StatsSpd::StatsSpd(TQWidget *p) : StatsSpdWgt(p), pmUpCht(new ChartDrawer(UpSpeedGbw, StatsPluginSettings::uploadMeasurements())) { - DownSpeedGbw->setColumnLayout(0, Qt::Vertical ); + DownSpeedGbw->setColumnLayout(0, TQt::Vertical ); DownSpeedGbw->layout()->setSpacing( 6 ); DownSpeedGbw->layout()->setMargin( 11 ); pmDSpdLay = new TQVBoxLayout(DownSpeedGbw -> layout()); - UpSpeedGbw->setColumnLayout(0, Qt::Vertical ); + UpSpeedGbw->setColumnLayout(0, TQt::Vertical ); UpSpeedGbw->layout()->setSpacing( 6 ); UpSpeedGbw->layout()->setMargin( 11 ); pmUSpdLay = new TQVBoxLayout(UpSpeedGbw -> layout()); - PeersSpdGbw->setColumnLayout(0, Qt::Vertical ); + PeersSpdGbw->setColumnLayout(0, TQt::Vertical ); PeersSpdGbw->layout()->setSpacing( 6 ); PeersSpdGbw->layout()->setMargin( 11 ); diff --git a/plugins/stats/StatsSpd.h b/plugins/stats/StatsSpd.h index 4f75161..5ec2578 100644 --- a/plugins/stats/StatsSpd.h +++ b/plugins/stats/StatsSpd.h @@ -38,7 +38,7 @@ namespace kt { */ class StatsSpd : public StatsSpdWgt { - Q_OBJECT + TQ_OBJECT private: diff --git a/plugins/stats/statsplugin.cpp b/plugins/stats/statsplugin.cpp index 2980cb3..6693ebd 100644 --- a/plugins/stats/statsplugin.cpp +++ b/plugins/stats/statsplugin.cpp @@ -51,13 +51,13 @@ void StatsPlugin::load() pmPrefsUi = new StatsPluginPrefs(); pmUpdTmr = new TQTimer(this); - connect(pmUpdTmr, TQT_SIGNAL(timeout () ), this, TQT_SLOT(UpdateData())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(RestartTimer())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(TogglePeersSpdCht())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleLchInSwmDrawing())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleSdrInSwmDrawing())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMsmtsCounts())); - connect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMaxMode())); + connect(pmUpdTmr, TQ_SIGNAL(timeout () ), this, TQ_SLOT(UpdateData())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(RestartTimer())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(TogglePeersSpdCht())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleLchInSwmDrawing())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleSdrInSwmDrawing())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMsmtsCounts())); + connect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMaxMode())); TogglePeersSpdCht(); ChangeMaxMode(); @@ -76,13 +76,13 @@ void StatsPlugin::unload() getGUI() -> removeToolWidget(pmUiCon); getGUI() -> removePrefPage(pmPrefsUi); - disconnect(pmUpdTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(UpdateData())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(RestartTimer())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(TogglePeersSpdCht())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleLchInSwmDrawing())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ToggleSdrInSwmDrawing())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMsmtsCounts())); - disconnect(pmPrefsUi, TQT_SIGNAL(Applied()), this, TQT_SLOT(ChangeMaxMode())); + disconnect(pmUpdTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(UpdateData())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(RestartTimer())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(TogglePeersSpdCht())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleLchInSwmDrawing())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ToggleSdrInSwmDrawing())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMsmtsCounts())); + disconnect(pmPrefsUi, TQ_SIGNAL(Applied()), this, TQ_SLOT(ChangeMaxMode())); delete pmUiSpd; delete pmUiCon; diff --git a/plugins/stats/statsplugin.h b/plugins/stats/statsplugin.h index 8cdf345..4abb9eb 100644 --- a/plugins/stats/statsplugin.h +++ b/plugins/stats/statsplugin.h @@ -51,7 +51,7 @@ namespace kt { */ class StatsPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT private: diff --git a/plugins/upnp/upnpdescriptionparser.cpp b/plugins/upnp/upnpdescriptionparser.cpp index 1e73362..eb9d360 100644 --- a/plugins/upnp/upnpdescriptionparser.cpp +++ b/plugins/upnp/upnpdescriptionparser.cpp @@ -73,7 +73,7 @@ namespace kt if (!fptr.open(IO_ReadOnly)) return false; - TQXmlInputSource input(TQT_TQIODEVICE(&fptr)); + TQXmlInputSource input(&fptr); XMLContentHandler chandler(router); TQXmlSimpleReader reader; diff --git a/plugins/upnp/upnpmcastsocket.cpp b/plugins/upnp/upnpmcastsocket.cpp index 0172ed2..91c9dd9 100644 --- a/plugins/upnp/upnpmcastsocket.cpp +++ b/plugins/upnp/upnpmcastsocket.cpp @@ -47,8 +47,8 @@ namespace kt UPnPMCastSocket::UPnPMCastSocket(bool verbose) : verbose(verbose) { routers.setAutoDelete(true); - TQObject::connect(this,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead())); - TQObject::connect(this,TQT_SIGNAL(gotError(int)),this,TQT_SLOT(onError(int))); + TQObject::connect(this,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead())); + TQObject::connect(this,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int))); setAddressReuseable(true); setFamily(KNetwork::KResolver::IPv4Family); setBlocking(true); @@ -67,8 +67,8 @@ namespace kt UPnPMCastSocket::~UPnPMCastSocket() { leaveUPnPMCastGroup(); - TQObject::disconnect(this,TQT_SIGNAL(readyRead()),this,TQT_SLOT(onReadyRead())); - TQObject::disconnect(this,TQT_SIGNAL(gotError(int)),this,TQT_SLOT(onError(int))); + TQObject::disconnect(this,TQ_SIGNAL(readyRead()),this,TQ_SLOT(onReadyRead())); + TQObject::disconnect(this,TQ_SIGNAL(gotError(int)),this,TQ_SLOT(onError(int))); } void UPnPMCastSocket::discover() @@ -142,8 +142,8 @@ namespace kt UPnPRouter* r = parseResponse(p.data()); if (r) { - TQObject::connect(r,TQT_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )), - this,TQT_SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); + TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )), + this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); // download it's xml file r->downloadXMLFile(); @@ -269,7 +269,7 @@ namespace kt { UPnPRouter* r = new UPnPRouter(server,location); // download it's xml file - TQObject::connect(r,TQT_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQT_SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); + TQObject::connect(r,TQ_SIGNAL(xmlFileDownloaded( UPnPRouter*, bool )),this,TQ_SLOT(onXmlFileDownloaded( UPnPRouter*, bool ))); r->downloadXMLFile(); } } diff --git a/plugins/upnp/upnpmcastsocket.h b/plugins/upnp/upnpmcastsocket.h index f072531..fbd63df 100644 --- a/plugins/upnp/upnpmcastsocket.h +++ b/plugins/upnp/upnpmcastsocket.h @@ -39,7 +39,7 @@ namespace kt */ class UPnPMCastSocket : public KNetwork::KDatagramSocket { - Q_OBJECT + TQ_OBJECT public: UPnPMCastSocket(bool verbose = false); diff --git a/plugins/upnp/upnpplugin.h b/plugins/upnp/upnpplugin.h index a81a51c..5f4700f 100644 --- a/plugins/upnp/upnpplugin.h +++ b/plugins/upnp/upnpplugin.h @@ -32,7 +32,7 @@ namespace kt */ class UPnPPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: UPnPPlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp index 1d3a6da..067cbef 100644 --- a/plugins/upnp/upnpprefpage.cpp +++ b/plugins/upnp/upnpprefpage.cpp @@ -46,8 +46,8 @@ namespace kt void UPnPPrefPage::createWidget(TQWidget* parent) { widget = new UPnPPrefWidget(parent); - TQObject::connect(sock,TQT_SIGNAL(discovered(UPnPRouter* )),widget,TQT_SLOT(addDevice(UPnPRouter* ))); - TQObject::connect(widget,TQT_SIGNAL(rescan()),sock,TQT_SLOT(discover())); + TQObject::connect(sock,TQ_SIGNAL(discovered(UPnPRouter* )),widget,TQ_SLOT(addDevice(UPnPRouter* ))); + TQObject::connect(widget,TQ_SIGNAL(rescan()),sock,TQ_SLOT(discover())); } void UPnPPrefPage::deleteWidget() diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp index ab84a2e..dd61a3c 100644 --- a/plugins/upnp/upnpprefwidget.cpp +++ b/plugins/upnp/upnpprefwidget.cpp @@ -41,9 +41,9 @@ namespace kt : UPnPWidget(parent,name,fl) { def_router = 0; - connect(m_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onForwardBtnClicked())); - connect(m_undo_forward_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onUndoForwardBtnClicked())); - connect(m_rescan,TQT_SIGNAL(clicked()),this,TQT_SLOT(onRescanClicked())); + connect(m_forward_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onForwardBtnClicked())); + connect(m_undo_forward_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onUndoForwardBtnClicked())); + connect(m_rescan,TQ_SIGNAL(clicked()),this,TQ_SLOT(onRescanClicked())); bt::Globals::instance().getPortList().setListener(this); } @@ -72,7 +72,7 @@ namespace kt void UPnPPrefWidget::addDevice(UPnPRouter* r) { - connect(r,TQT_SIGNAL(updateGUI()),this,TQT_SLOT(updatePortMappings())); + connect(r,TQ_SIGNAL(updateGUI()),this,TQ_SLOT(updatePortMappings())); TDEListViewItem* item = new TDEListViewItem(m_device_list,r->getDescription().friendlyName); item->setMultiLinesEnabled(true); itemmap[item] = r; diff --git a/plugins/upnp/upnpprefwidget.h b/plugins/upnp/upnpprefwidget.h index 272e0a2..bcd9ac1 100644 --- a/plugins/upnp/upnpprefwidget.h +++ b/plugins/upnp/upnpprefwidget.h @@ -40,7 +40,7 @@ namespace kt */ class UPnPPrefWidget : public UPnPWidget,public net::PortListener { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp index 0e18e92..ee0a5c3 100644 --- a/plugins/upnp/upnprouter.cpp +++ b/plugins/upnp/upnprouter.cpp @@ -171,7 +171,7 @@ namespace kt { // downlaod XML description into a temporary file in /tmp TDEIO::Job* job = TDEIO::file_copy(location,tmp_file,-1,true,false,false); - connect(job,TQT_SIGNAL(result(TDEIO::Job *)),this,TQT_SLOT(downloadFinished( TDEIO::Job* ))); + connect(job,TQ_SIGNAL(result(TDEIO::Job *)),this,TQ_SLOT(downloadFinished( TDEIO::Job* ))); } void UPnPRouter::debugPrintData() @@ -339,12 +339,12 @@ namespace kt HTTPRequest* r = new HTTPRequest(http_hdr,query,location.host(),location.port(),verbose); - connect(r,TQT_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& )), - this,TQT_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& ))); - connect(r,TQT_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& )), - this,TQT_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& ))); - connect(r,TQT_SIGNAL(error(bt::HTTPRequest*, bool )), - this,TQT_SLOT(onError(bt::HTTPRequest*, bool ))); + connect(r,TQ_SIGNAL(replyError(bt::HTTPRequest* ,const TQString& )), + this,TQ_SLOT(onReplyError(bt::HTTPRequest* ,const TQString& ))); + connect(r,TQ_SIGNAL(replyOK(bt::HTTPRequest* ,const TQString& )), + this,TQ_SLOT(onReplyOK(bt::HTTPRequest* ,const TQString& ))); + connect(r,TQ_SIGNAL(error(bt::HTTPRequest*, bool )), + this,TQ_SLOT(onError(bt::HTTPRequest*, bool ))); r->start(); if (!at_exit) active_reqs.append(r); diff --git a/plugins/upnp/upnprouter.h b/plugins/upnp/upnprouter.h index 081d958..6dbf828 100644 --- a/plugins/upnp/upnprouter.h +++ b/plugins/upnp/upnprouter.h @@ -104,7 +104,7 @@ namespace kt */ class UPnPRouter : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/webinterface/httpclienthandler.cpp b/plugins/webinterface/httpclienthandler.cpp index cba0372..bc2a4f6 100644 --- a/plugins/webinterface/httpclienthandler.cpp +++ b/plugins/webinterface/httpclienthandler.cpp @@ -212,7 +212,7 @@ namespace kt else { php_response_hdr = hdr; - connect(php,TQT_SIGNAL(finished()),this,TQT_SLOT(onPHPFinished())); + connect(php,TQ_SIGNAL(finished()),this,TQ_SLOT(onPHPFinished())); state = PROCESSING_PHP; } } diff --git a/plugins/webinterface/httpclienthandler.h b/plugins/webinterface/httpclienthandler.h index 01d3913..8afbc39 100644 --- a/plugins/webinterface/httpclienthandler.h +++ b/plugins/webinterface/httpclienthandler.h @@ -40,7 +40,7 @@ namespace kt */ class HttpClientHandler : public TQObject { - Q_OBJECT + TQ_OBJECT enum State { diff --git a/plugins/webinterface/httpserver.cpp b/plugins/webinterface/httpserver.cpp index 24e847f..292ecc8 100644 --- a/plugins/webinterface/httpserver.cpp +++ b/plugins/webinterface/httpserver.cpp @@ -75,9 +75,9 @@ namespace kt TQSocket* socket = new TQSocket(this); socket->setSocket(s); - connect(socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotSocketReadyToRead())); - connect(socket, TQT_SIGNAL(delayedCloseFinished()), this, TQT_SLOT(slotConnectionClosed())); - connect(socket, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotConnectionClosed())); + connect(socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotSocketReadyToRead())); + connect(socket, TQ_SIGNAL(delayedCloseFinished()), this, TQ_SLOT(slotConnectionClosed())); + connect(socket, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotConnectionClosed())); HttpClientHandler* handler = new HttpClientHandler(this,socket); clients.insert(socket,handler); @@ -248,7 +248,7 @@ namespace kt void HttpServer::setDefaultResponseHeaders(HttpResponseHeader & hdr,const TQString & content_type,bool with_session_info) { hdr.setValue("Server","KTorrent/" KT_VERSION_MACRO); - hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC),false)); + hdr.setValue("Date",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC),false)); hdr.setValue("Content-Type",content_type); hdr.setValue("Connection","keep-alive"); if (with_session_info && session.sessionId && session.logged_in) @@ -351,7 +351,7 @@ namespace kt setDefaultResponseHeaders(rhdr,"text/html",true); rhdr.setValue("Cache-Control","max-age=0"); rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false)); - rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false)); + rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC).addSecs(3600),false)); hdlr->sendResponse(rhdr); return; } @@ -361,7 +361,7 @@ namespace kt HttpResponseHeader rhdr(200); setDefaultResponseHeaders(rhdr,ExtensionToContentType(ext),true); rhdr.setValue("Last-Modified",DateTimeToString(fi.lastModified(),false)); - rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(Qt::UTC).addSecs(3600),false)); + rhdr.setValue("Expires",DateTimeToString(TQDateTime::currentDateTime(TQt::UTC).addSecs(3600),false)); rhdr.setValue("Cache-Control","private"); if (!hdlr->sendFile(rhdr,path)) { @@ -381,7 +381,7 @@ namespace kt { // first send back login page redirectToLoginPage(hdlr); - TQTimer::singleShot(1000,kapp,TQT_SLOT(quit())); + TQTimer::singleShot(1000,kapp,TQ_SLOT(quit())); } else if (redirect) { @@ -505,7 +505,7 @@ namespace kt d.setYMD(sl[3].toInt(),m,sl[1].toInt()); - TQTime t = TQTime::fromString(sl[4],Qt::ISODate); + TQTime t = TQTime::fromString(sl[4],TQt::ISODate); return TQDateTime(d,t); } else if (sl.count() == 4) @@ -524,7 +524,7 @@ namespace kt d.setYMD(2000 + dl[2].toInt(),m,dl[0].toInt()); - TQTime t = TQTime::fromString(sl[2],Qt::ISODate); + TQTime t = TQTime::fromString(sl[2],TQt::ISODate); return TQDateTime(d,t); } else if (sl.count() == 5) @@ -539,7 +539,7 @@ namespace kt d.setYMD(sl[4].toInt(),m,sl[2].toInt()); - TQTime t = TQTime::fromString(sl[3],Qt::ISODate); + TQTime t = TQTime::fromString(sl[3],TQt::ISODate); return TQDateTime(d,t); } else diff --git a/plugins/webinterface/httpserver.h b/plugins/webinterface/httpserver.h index a5eaa3b..33eeddf 100644 --- a/plugins/webinterface/httpserver.h +++ b/plugins/webinterface/httpserver.h @@ -64,7 +64,7 @@ namespace kt class HttpServer : public TQServerSocket { - Q_OBJECT + TQ_OBJECT public: HttpServer(CoreInterface *core, int port); diff --git a/plugins/webinterface/php_handler.cpp b/plugins/webinterface/php_handler.cpp index cd8fd63..6586f7e 100644 --- a/plugins/webinterface/php_handler.cpp +++ b/plugins/webinterface/php_handler.cpp @@ -37,8 +37,8 @@ namespace kt PhpHandler::PhpHandler(const TQString & php_exe,PhpInterface *php) : TQProcess(php_exe),php_i(php) { - connect(this,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(onReadyReadStdout())); - connect(this,TQT_SIGNAL(processExited()),this,TQT_SLOT(onExited())); + connect(this,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(onReadyReadStdout())); + connect(this,TQ_SIGNAL(processExited()),this,TQ_SLOT(onExited())); } PhpHandler::~PhpHandler() @@ -101,7 +101,7 @@ namespace kt return launch(data); } - bool PhpHandler::containsDelimiters(const QString & str) + bool PhpHandler::containsDelimiters(const TQString & str) { return str.contains("\"") || str.contains("'"); } diff --git a/plugins/webinterface/php_handler.h b/plugins/webinterface/php_handler.h index 37a87e6..e817b51 100644 --- a/plugins/webinterface/php_handler.h +++ b/plugins/webinterface/php_handler.h @@ -31,7 +31,7 @@ namespace kt class PhpHandler : public TQProcess { - Q_OBJECT + TQ_OBJECT public: PhpHandler(const TQString & php_exe,PhpInterface *php); @@ -48,7 +48,7 @@ namespace kt void finished(); private: - bool containsDelimiters(const QString & str); + bool containsDelimiters(const TQString & str); private: TQByteArray output; diff --git a/plugins/webinterface/webinterfaceplugin.h b/plugins/webinterface/webinterfaceplugin.h index 260aa00..0edb5ed 100644 --- a/plugins/webinterface/webinterfaceplugin.h +++ b/plugins/webinterface/webinterfaceplugin.h @@ -32,7 +32,7 @@ namespace kt class WebInterfacePlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: WebInterfacePlugin(TQObject* parent, const char* name, const TQStringList& args); diff --git a/plugins/webinterface/webinterfacepref.ui b/plugins/webinterface/webinterfacepref.ui index 8e6e7c2..5830b0c 100644 --- a/plugins/webinterface/webinterfacepref.ui +++ b/plugins/webinterface/webinterfacepref.ui @@ -239,10 +239,10 @@ <slot>changeLedState()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnUpdate_clicked()</slot> <slot>changeLedState()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kled.h</include> diff --git a/plugins/webinterface/webinterfaceprefwidget.h b/plugins/webinterface/webinterfaceprefwidget.h index 3d3b5e4..0f227ee 100644 --- a/plugins/webinterface/webinterfaceprefwidget.h +++ b/plugins/webinterface/webinterfaceprefwidget.h @@ -27,7 +27,7 @@ namespace kt class WebInterfacePrefWidget:public WebInterfacePreference { - Q_OBJECT + TQ_OBJECT public: WebInterfacePrefWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/plugins/zeroconf/avahiservice.h b/plugins/zeroconf/avahiservice.h index 02dde11..f85062f 100644 --- a/plugins/zeroconf/avahiservice.h +++ b/plugins/zeroconf/avahiservice.h @@ -44,7 +44,7 @@ namespace kt class AvahiService : public kt::PeerSource { - Q_OBJECT + TQ_OBJECT public: AvahiService(const bt::PeerID&, bt::Uint16, const bt::SHA1Hash&); diff --git a/plugins/zeroconf/zeroconfplugin.cpp b/plugins/zeroconf/zeroconfplugin.cpp index d7e68d5..6307bdd 100644 --- a/plugins/zeroconf/zeroconfplugin.cpp +++ b/plugins/zeroconf/zeroconfplugin.cpp @@ -50,10 +50,10 @@ namespace kt void ZeroConfPlugin::load() { CoreInterface* core = getCore(); - connect(core,TQT_SIGNAL(torrentAdded( kt::TorrentInterface* )), - this,TQT_SLOT(torrentAdded( kt::TorrentInterface* ))); - connect(core,TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )), - this,TQT_SLOT(torrentRemoved( kt::TorrentInterface* ))); + connect(core,TQ_SIGNAL(torrentAdded( kt::TorrentInterface* )), + this,TQ_SLOT(torrentAdded( kt::TorrentInterface* ))); + connect(core,TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )), + this,TQ_SLOT(torrentRemoved( kt::TorrentInterface* ))); // go over existing torrents and add them bt::QueueManager* qman = core->getQueueManager(); @@ -66,10 +66,10 @@ namespace kt void ZeroConfPlugin::unload() { CoreInterface* core = getCore(); - disconnect(core,TQT_SIGNAL(torrentAdded( kt::TorrentInterface* )), - this,TQT_SLOT(torrentAdded( kt::TorrentInterface* ))); - disconnect(core,TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )), - this,TQT_SLOT(torrentRemoved( kt::TorrentInterface*))); + disconnect(core,TQ_SIGNAL(torrentAdded( kt::TorrentInterface* )), + this,TQ_SLOT(torrentAdded( kt::TorrentInterface* ))); + disconnect(core,TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )), + this,TQ_SLOT(torrentRemoved( kt::TorrentInterface*))); bt::PtrMap<kt::TorrentInterface*,AvahiService>::iterator i = services.begin(); while (i != services.end()) @@ -93,8 +93,8 @@ namespace kt tc->addPeerSource(av); Out(SYS_ZCO|LOG_NOTICE) << "ZeroConf service added for " << tc->getStats().torrent_name << endl; - connect(av,TQT_SIGNAL(serviceDestroyed( AvahiService* )), - this,TQT_SLOT(avahiServiceDestroyed( AvahiService* ))); + connect(av,TQ_SIGNAL(serviceDestroyed( AvahiService* )), + this,TQ_SLOT(avahiServiceDestroyed( AvahiService* ))); } diff --git a/plugins/zeroconf/zeroconfplugin.h b/plugins/zeroconf/zeroconfplugin.h index de91c53..5fabfab 100644 --- a/plugins/zeroconf/zeroconfplugin.h +++ b/plugins/zeroconf/zeroconfplugin.h @@ -35,7 +35,7 @@ namespace kt */ class ZeroConfPlugin : public Plugin { - Q_OBJECT + TQ_OBJECT public: ZeroConfPlugin(TQObject* parent, const char* name, const TQStringList& args); |