diff options
Diffstat (limited to 'apps')
54 files changed, 251 insertions, 251 deletions
diff --git a/apps/ktorrent/addpeerwidget.h b/apps/ktorrent/addpeerwidget.h index 4ca8db8..ed394a8 100644 --- a/apps/ktorrent/addpeerwidget.h +++ b/apps/ktorrent/addpeerwidget.h @@ -43,7 +43,7 @@ namespace bt */ class ManualPeerSource: public kt::PeerSource { - Q_OBJECT + TQ_OBJECT public: @@ -78,7 +78,7 @@ class ManualPeerSource: public kt::PeerSource */ class AddPeerWidget: public AddPeerWidgetBase { - Q_OBJECT + TQ_OBJECT public: AddPeerWidget(kt::TorrentInterface* tc, TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/apps/ktorrent/addpeerwidgetbase.ui index 369fabe..fbd148b 100644 --- a/apps/ktorrent/addpeerwidgetbase.ui +++ b/apps/ktorrent/addpeerwidgetbase.ui @@ -146,9 +146,9 @@ <tabstop>m_port</tabstop> <tabstop>btnAdd</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>btnAdd_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/apps/ktorrent/fileselectdlg.cpp b/apps/ktorrent/fileselectdlg.cpp index 1dc1f1f..a6dec27 100644 --- a/apps/ktorrent/fileselectdlg.cpp +++ b/apps/ktorrent/fileselectdlg.cpp @@ -53,12 +53,12 @@ FileSelectDlg::FileSelectDlg(GroupManager* gm, bool* user, bool* start, TQWidget : FileSelectDlgBase(parent, name, modal, fl), m_gman(gm), m_user(user), m_start(start) { root = 0; - connect(m_select_all, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectAll())); - connect(m_select_none, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectNone())); - connect(m_invert_selection, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertSelection())); - connect(m_ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(m_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - connect(m_downloadLocation, TQT_SIGNAL(textChanged (const TQString &)), this, TQT_SLOT(updateSizeLabels())); + connect(m_select_all, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectAll())); + connect(m_select_none, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectNone())); + connect(m_invert_selection, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertSelection())); + connect(m_ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(m_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); + connect(m_downloadLocation, TQ_SIGNAL(textChanged (const TQString &)), this, TQ_SLOT(updateSizeLabels())); m_downloadLocation->setMode(KFile::Directory); } diff --git a/apps/ktorrent/fileselectdlg.h b/apps/ktorrent/fileselectdlg.h index 9a67482..3a941c2 100644 --- a/apps/ktorrent/fileselectdlg.h +++ b/apps/ktorrent/fileselectdlg.h @@ -42,7 +42,7 @@ namespace kt class FileSelectDlg : public FileSelectDlgBase, public kt::FileTreeRootListener { - Q_OBJECT + TQ_OBJECT kt::TorrentInterface* tc; diff --git a/apps/ktorrent/filterbar.cpp b/apps/ktorrent/filterbar.cpp index 79bf686..d83895b 100644 --- a/apps/ktorrent/filterbar.cpp +++ b/apps/ktorrent/filterbar.cpp @@ -46,7 +46,7 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) : layout->addSpacing(gap); m_close = new TDEToolBarButton("window-close",0,this); - connect(m_close,TQT_SIGNAL(clicked()),this,TQT_SLOT(hide())); + connect(m_close,TQ_SIGNAL(clicked()),this,TQ_SLOT(hide())); layout->addWidget(m_close); m_filter = new TQLabel(i18n("Find:"), this); @@ -67,9 +67,9 @@ FilterBar::FilterBar(TQWidget *parent, const char *name) : layout->addWidget(m_case_sensitive); layout->addItem(new TQSpacerItem(10,10,TQSizePolicy::Expanding)); - connect(m_filterInput, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChangeFilter(const TQString&))); - connect(m_clear, TQT_SIGNAL(clicked()), m_filterInput, TQT_SLOT(clear())); + connect(m_filterInput, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChangeFilter(const TQString&))); + connect(m_clear, TQ_SIGNAL(clicked()), m_filterInput, TQ_SLOT(clear())); } FilterBar::~FilterBar() diff --git a/apps/ktorrent/filterbar.h b/apps/ktorrent/filterbar.h index 5164587..151fa73 100644 --- a/apps/ktorrent/filterbar.h +++ b/apps/ktorrent/filterbar.h @@ -41,7 +41,7 @@ namespace kt */ class FilterBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/apps/ktorrent/groups/groupview.cpp b/apps/ktorrent/groups/groupview.cpp index 25cf9f2..3e5b3ad 100644 --- a/apps/ktorrent/groups/groupview.cpp +++ b/apps/ktorrent/groups/groupview.cpp @@ -80,11 +80,11 @@ namespace kt current = gman->allGroup(); - connect(this,TQT_SIGNAL(clicked(TQListViewItem*)),this,TQT_SLOT(onExecuted( TQListViewItem* ))); - connect(this,TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint & )), - this,TQT_SLOT(showContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ))); - connect(this,TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), - this,TQT_SLOT(onDropped( TQDropEvent*, TQListViewItem* ))); + connect(this,TQ_SIGNAL(clicked(TQListViewItem*)),this,TQ_SLOT(onExecuted( TQListViewItem* ))); + connect(this,TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint & )), + this,TQ_SLOT(showContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ))); + connect(this,TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), + this,TQ_SLOT(onDropped( TQDropEvent*, TQListViewItem* ))); current_item = 0; menu = 0; @@ -136,16 +136,16 @@ namespace kt menu = new TDEPopupMenu(this); new_group = new TDEAction(i18n("New Group"),"document-new",0, - TQT_TQOBJECT(this), TQT_SLOT(addGroup()),col, "New Group"); + this, TQ_SLOT(addGroup()),col, "New Group"); edit_group = new TDEAction(i18n("Edit Name"),"edit",0, - TQT_TQOBJECT(this), TQT_SLOT(editGroupName()),col,"Edit Group Name"); + this, TQ_SLOT(editGroupName()),col,"Edit Group Name"); remove_group = new TDEAction(i18n("Remove Group"),"remove",0, - TQT_TQOBJECT(this), TQT_SLOT(removeGroup()),col,"Remove Group"); + this, TQ_SLOT(removeGroup()),col,"Remove Group"); open_in_new_tab = new TDEAction(i18n("Open Tab"),"document-open",0, - TQT_TQOBJECT(this) ,TQT_SLOT(openView()),col,"Open Tab"); + this ,TQ_SLOT(openView()),col,"Open Tab"); open_in_new_tab->plug(menu); menu->insertSeparator(); diff --git a/apps/ktorrent/groups/groupview.h b/apps/ktorrent/groups/groupview.h index 5b5d053..00a47ed 100644 --- a/apps/ktorrent/groups/groupview.h +++ b/apps/ktorrent/groups/groupview.h @@ -52,7 +52,7 @@ namespace kt */ class GroupView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: GroupView(ViewManager* view,TDEActionCollection* col,TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/groups/torrentdrag.h b/apps/ktorrent/groups/torrentdrag.h index b7eeebd..6943d18 100644 --- a/apps/ktorrent/groups/torrentdrag.h +++ b/apps/ktorrent/groups/torrentdrag.h @@ -31,7 +31,7 @@ namespace kt */ class TorrentDrag : public TQStoredDrag { - Q_OBJECT + TQ_OBJECT public: TorrentDrag(TQWidget* src,const char *name = 0); diff --git a/apps/ktorrent/ipfilterwidget.h b/apps/ktorrent/ipfilterwidget.h index 8863b1a..d8a49e1 100644 --- a/apps/ktorrent/ipfilterwidget.h +++ b/apps/ktorrent/ipfilterwidget.h @@ -29,7 +29,7 @@ */ class IPFilterWidget: public BlacklistWidgetBase { - Q_OBJECT + TQ_OBJECT public: IPFilterWidget(TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui index 3c8478c..6ef38e1 100644 --- a/apps/ktorrent/ipfilterwidgetbase.ui +++ b/apps/ktorrent/ipfilterwidgetbase.ui @@ -338,7 +338,7 @@ <tabstop>peerIP</tabstop> <tabstop>btnAdd</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>btnAdd_clicked()</slot> <slot>btnRemove_clicked()</slot> <slot>btnClear_clicked()</slot> @@ -346,7 +346,7 @@ <slot>btnSave_clicked()</slot> <slot>btnOk_clicked()</slot> <slot>btnApply_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/apps/ktorrent/ktorrent.cpp b/apps/ktorrent/ktorrent.cpp index 02df83a..b187c74 100644 --- a/apps/ktorrent/ktorrent.cpp +++ b/apps/ktorrent/ktorrent.cpp @@ -117,11 +117,11 @@ KTorrent::KTorrent() { setHidden(true); //setToolviewStyle(KMdi::TextAndIcon); - connect(this,TQT_SIGNAL(widgetChanged(TQWidget*)),this,TQT_SLOT(currentTabChanged(TQWidget*))); + connect(this,TQ_SIGNAL(widgetChanged(TQWidget*)),this,TQ_SLOT(currentTabChanged(TQWidget*))); - m_view_man = new ViewManager(TQT_TQOBJECT(this)); + m_view_man = new ViewManager(this); m_group_view = new kt::GroupView(m_view_man,actionCollection()); - connect(m_group_view,TQT_SIGNAL(openNewTab(kt::Group*)),this,TQT_SLOT(openView(kt::Group*))); + connect(m_group_view,TQ_SIGNAL(openNewTab(kt::Group*)),this,TQ_SLOT(openView(kt::Group*))); m_pref = new KTorrentPreferences(*this); @@ -137,26 +137,26 @@ KTorrent::KTorrent() TQToolButton* tb = new TQToolButton(m_activeTabWidget); tb->setIconSet(SmallIcon("tab_new")); tb->adjustSize(); - connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(openDefaultView())); + connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(openDefaultView())); m_activeTabWidget->setCornerWidget(tb, TopLeft); - connect(m_group_view,TQT_SIGNAL(currentGroupChanged( kt::Group* )), - this,TQT_SLOT(groupChanged(kt::Group*))); + connect(m_group_view,TQ_SIGNAL(currentGroupChanged( kt::Group* )), + this,TQ_SLOT(groupChanged(kt::Group*))); - connect(m_group_view,TQT_SIGNAL(groupRenamed(kt::Group*)), - this,TQT_SLOT(groupRenamed(kt::Group*))); + connect(m_group_view,TQ_SIGNAL(groupRenamed(kt::Group*)), + this,TQ_SLOT(groupRenamed(kt::Group*))); - connect(m_group_view,TQT_SIGNAL(groupRemoved(kt::Group*)), - this,TQT_SLOT(groupRemoved(kt::Group*))); + connect(m_group_view,TQ_SIGNAL(groupRemoved(kt::Group*)), + this,TQ_SLOT(groupRemoved(kt::Group*))); - connect(m_core,TQT_SIGNAL(torrentAdded(kt::TorrentInterface* )), - m_view_man,TQT_SLOT(addTorrent(kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(torrentAdded(kt::TorrentInterface* )), + m_view_man,TQ_SLOT(addTorrent(kt::TorrentInterface* ))); - connect(m_core,TQT_SIGNAL(torrentRemoved(kt::TorrentInterface* )), - m_view_man,TQT_SLOT(removeTorrent(kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(torrentRemoved(kt::TorrentInterface* )), + m_view_man,TQ_SLOT(removeTorrent(kt::TorrentInterface* ))); - connect(m_core, TQT_SIGNAL(torrentRemoved( kt::TorrentInterface* )), - m_group_view, TQT_SLOT(onTorrentRemoved( kt::TorrentInterface* ))); + connect(m_core, TQ_SIGNAL(torrentRemoved( kt::TorrentInterface* )), + m_group_view, TQ_SLOT(onTorrentRemoved( kt::TorrentInterface* ))); m_statusInfo = new KSqueezedTextLabel(this); m_statusSpeed = new TQLabel(this); @@ -191,7 +191,7 @@ KTorrent::KTorrent() m_core->loadTorrents(); m_core->loadPlugins(); - connect(&m_gui_update_timer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(updatedStats())); + connect(&m_gui_update_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updatedStats())); //Apply GUI update interval int val = 500; switch(Settings::guiUpdateInterval()) @@ -243,7 +243,7 @@ KTorrent::KTorrent() m_statusbarAction->setChecked(!statusbar_hidden); MaximizeLimits(); - connect(&m_status_msg_expire,TQT_SIGNAL(timeout()),this,TQT_SLOT(statusBarMsgExpired())); + connect(&m_status_msg_expire,TQ_SIGNAL(timeout()),this,TQ_SLOT(statusBarMsgExpired())); m_view_man->updateActions(); } @@ -270,36 +270,36 @@ void KTorrent::openView(kt::Group* g) addTabPage(v,g->groupIcon(),v->caption(),m_view_man); - connect(v,TQT_SIGNAL(currentChanged(kt::TorrentInterface* )), - this,TQT_SLOT(currentTorrentChanged(kt::TorrentInterface* ))); + connect(v,TQ_SIGNAL(currentChanged(kt::TorrentInterface* )), + this,TQ_SLOT(currentTorrentChanged(kt::TorrentInterface* ))); - connect(v,TQT_SIGNAL(wantToRemove(kt::TorrentInterface*,bool )), - m_core,TQT_SLOT(remove(kt::TorrentInterface*,bool ))); + connect(v,TQ_SIGNAL(wantToRemove(kt::TorrentInterface*,bool )), + m_core,TQ_SLOT(remove(kt::TorrentInterface*,bool ))); - connect(v->listView(),TQT_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), - this,TQT_SLOT(urlDropped(TQDropEvent*,TQListViewItem*))); + connect(v->listView(),TQ_SIGNAL(dropped(TQDropEvent*,TQListViewItem*)), + this,TQ_SLOT(urlDropped(TQDropEvent*,TQListViewItem*))); - connect(v,TQT_SIGNAL(wantToStart( kt::TorrentInterface* )), - m_core,TQT_SLOT(start( kt::TorrentInterface* ))); + connect(v,TQ_SIGNAL(wantToStart( kt::TorrentInterface* )), + m_core,TQ_SLOT(start( kt::TorrentInterface* ))); - connect(v,TQT_SIGNAL(wantToStop( kt::TorrentInterface*, bool )), - m_core,TQT_SLOT(stop( kt::TorrentInterface*, bool ))); + connect(v,TQ_SIGNAL(wantToStop( kt::TorrentInterface*, bool )), + m_core,TQ_SLOT(stop( kt::TorrentInterface*, bool ))); - connect(v,TQT_SIGNAL(needsDataCheck( kt::TorrentInterface* )), - m_core,TQT_SLOT(doDataCheck( kt::TorrentInterface* ))); + connect(v,TQ_SIGNAL(needsDataCheck( kt::TorrentInterface* )), + m_core,TQ_SLOT(doDataCheck( kt::TorrentInterface* ))); - connect(v,TQT_SIGNAL(updateActions( int )), - this,TQT_SLOT(onUpdateActions( int ))); + connect(v,TQ_SIGNAL(updateActions( int )), + this,TQ_SLOT(onUpdateActions( int ))); //connect Core queue() with queue() from KTView. - connect(v, TQT_SIGNAL(queue( kt::TorrentInterface* )), - m_core, TQT_SLOT(queue( kt::TorrentInterface* ))); + connect(v, TQ_SIGNAL(queue( kt::TorrentInterface* )), + m_core, TQ_SLOT(queue( kt::TorrentInterface* ))); - connect(v,TQT_SIGNAL(updateGroupsSubMenu(TDEPopupMenu*)), - m_group_view,TQT_SLOT(updateGroupsSubMenu(TDEPopupMenu*))); + connect(v,TQ_SIGNAL(updateGroupsSubMenu(TDEPopupMenu*)), + m_group_view,TQ_SLOT(updateGroupsSubMenu(TDEPopupMenu*))); - connect(v,TQT_SIGNAL(groupsSubMenuItemActivated(KTorrentView*, const TQString&)), - m_group_view,TQT_SLOT(onGroupsSubMenuItemActivated(KTorrentView*, const TQString&))); + connect(v,TQ_SIGNAL(groupsSubMenuItemActivated(KTorrentView*, const TQString&)), + m_group_view,TQ_SLOT(onGroupsSubMenuItemActivated(KTorrentView*, const TQString&))); if (m_core) { @@ -497,68 +497,68 @@ void KTorrent::currentTorrentChanged(kt::TorrentInterface* tc) void KTorrent::setupActions() { - KStdAction::openNew(TQT_TQOBJECT(this),TQT_SLOT(fileNew()),actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this,TQ_SLOT(fileNew()),actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - KStdAction::paste(TQT_TQOBJECT(kapp),TQT_SLOT(paste()),actionCollection()); + KStdAction::paste(kapp,TQ_SLOT(paste()),actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); - m_menubarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowMenubar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); + m_menubarAction = KStdAction::showMenubar(this, TQ_SLOT(optionsShowMenubar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - TDEAction* pref = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + TDEAction* pref = KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); m_start = new TDEAction( - i18n("to start", "Start"), "ktstart",0,TQT_TQOBJECT(this), TQT_SLOT(startDownload()), + i18n("to start", "Start"), "ktstart",0,this, TQ_SLOT(startDownload()), actionCollection(), "Start"); m_stop = new TDEAction( - i18n("to stop", "Stop"), "ktstop",0,TQT_TQOBJECT(this), TQT_SLOT(stopDownload()), + i18n("to stop", "Stop"), "ktstop",0,this, TQ_SLOT(stopDownload()), actionCollection(), "Stop"); m_remove = new TDEAction( - i18n("Remove"), "ktremove",0,TQT_TQOBJECT(this), TQT_SLOT(removeDownload()), + i18n("Remove"), "ktremove",0,this, TQ_SLOT(removeDownload()), actionCollection(), "Remove"); m_startall = new TDEAction( - i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloadsCurrentView()), + i18n("to start all", "Start All"), "ktstart_all",0,this, TQ_SLOT(startAllDownloadsCurrentView()), actionCollection(), "Start all"); - m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,TQT_TQOBJECT(this), TQT_SLOT(startAllDownloads()),actionCollection()); + m_startall_systray = new TDEAction(i18n("to start all", "Start All"), "ktstart_all",0,this, TQ_SLOT(startAllDownloads()),actionCollection()); m_stopall = new TDEAction( - i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloadsCurrentView()), + i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQ_SLOT(stopAllDownloadsCurrentView()), actionCollection(), "Stop all"); - m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,TQT_TQOBJECT(this), TQT_SLOT(stopAllDownloads()),actionCollection()); + m_stopall_systray = new TDEAction(i18n("to stop all", "Stop All"), "ktstop_all",0,this, TQ_SLOT(stopAllDownloads()),actionCollection()); m_pasteurl = new TDEAction( - i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,TQT_TQOBJECT(this), TQT_SLOT(torrentPaste()), + i18n("to paste torrent URL", "Paste Torrent URL..."), "ktstart",0,this, TQ_SLOT(torrentPaste()), actionCollection(), "paste_url"); m_queuemgr = new TDEAction( i18n("to open Queue Manager", "Open Queue Manager..."), - "ktqueuemanager", 0, TQT_TQOBJECT(this), TQT_SLOT(queueManagerShow()), + "ktqueuemanager", 0, this, TQ_SLOT(queueManagerShow()), actionCollection(), "Queue manager"); m_queueaction = new TDEAction( i18n("Enqueue/Dequeue"), - "player_playlist", 0, m_view_man, TQT_SLOT(queueAction()), + "player_playlist", 0, m_view_man, TQ_SLOT(queueAction()), actionCollection(), "queue_action"); m_ipfilter = new TDEAction( i18n("IPFilter"), - "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(showIPFilter()), + "filter", 0, this, TQ_SLOT(showIPFilter()), actionCollection(), "ipfilter_action"); m_datacheck = new TDEAction( i18n("Check Data Integrity"), - TQString(),0,m_view_man,TQT_SLOT(checkDataIntegrity()),actionCollection(),"check_data"); + TQString(),0,m_view_man,TQ_SLOT(checkDataIntegrity()),actionCollection(),"check_data"); - m_find = KStdAction::find(TQT_TQOBJECT(this),TQT_SLOT(find()),actionCollection()); + m_find = KStdAction::find(this,TQ_SLOT(find()),actionCollection()); //Plug actions to systemtray context menu m_startall_systray->plug(m_systray_icon->contextMenu()); @@ -720,7 +720,7 @@ void KTorrent::optionsConfigureToolbars() saveMainWindowSettings(TDEGlobal::config()); #endif KEditToolbar dlg(factory()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig())); dlg.exec(); } diff --git a/apps/ktorrent/ktorrent.h b/apps/ktorrent/ktorrent.h index 7297ac2..6669443 100644 --- a/apps/ktorrent/ktorrent.h +++ b/apps/ktorrent/ktorrent.h @@ -65,7 +65,7 @@ namespace kt */ class KTorrent : public DMainWindow, public kt::GUIInterface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/apps/ktorrent/ktorrentapp.cpp b/apps/ktorrent/ktorrentapp.cpp index 38204fe..db1def7 100644 --- a/apps/ktorrent/ktorrentapp.cpp +++ b/apps/ktorrent/ktorrentapp.cpp @@ -62,7 +62,7 @@ int KTorrentApp::newInstance() TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId()); - KTorrent *widget = ::tqqt_cast<KTorrent*>( mainWidget() ); + KTorrent *widget = ::tqt_cast<KTorrent*>( mainWidget() ); for (int i = 0; i < args->count(); i++) { diff --git a/apps/ktorrent/ktorrentapp.h b/apps/ktorrent/ktorrentapp.h index 5e6d300..753e0bd 100644 --- a/apps/ktorrent/ktorrentapp.h +++ b/apps/ktorrent/ktorrentapp.h @@ -26,7 +26,7 @@ class KTorrentApp : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KTorrentApp(); diff --git a/apps/ktorrent/ktorrentcore.cpp b/apps/ktorrent/ktorrentcore.cpp index c520d60..541bbcc 100644 --- a/apps/ktorrent/ktorrentcore.cpp +++ b/apps/ktorrent/ktorrentcore.cpp @@ -70,7 +70,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin UpdateCurrentTime(); qman = new QueueManager(); - connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*,bool)), TQT_TQOBJECT(this), TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*,bool))); + connect(qman, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*,bool)), this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*,bool))); data_dir = Settings::tempDir(); @@ -91,7 +91,7 @@ KTorrentCore::KTorrentCore(kt::GUIInterface* gui) : max_downloads(0),keep_seedin data_dir += bt::DirSeparator(); // downloads.setAutoDelete(true); - connect(&update_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect(&update_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); update_timer.start(CORE_UPDATE_INTERVAL); Uint16 port = Settings::port(); @@ -328,7 +328,7 @@ void KTorrentCore::load(const KURL& url) else { TDEIO::Job* j = TDEIO::storedGet(url,false,true); - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinished( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinished( TDEIO::Job* ))); } } @@ -395,7 +395,7 @@ void KTorrentCore::loadSilently(const KURL& url) { // download to a random file in tmp TDEIO::Job* j = TDEIO::storedGet(url,false,true); - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinishedSilently( TDEIO::Job* ))); } } @@ -427,7 +427,7 @@ void KTorrentCore::loadSilentlyDir(const KURL& url, const KURL& savedir) // download to a random file in tmp TDEIO::Job* j = TDEIO::storedGet(url,false,true); custom_save_locations.insert(j,savedir); // keep track of save location - connect(j,TQT_SIGNAL(result(TDEIO::Job*)),this,TQT_SLOT(downloadFinishedSilently( TDEIO::Job* ))); + connect(j,TQ_SIGNAL(result(TDEIO::Job*)),this,TQ_SLOT(downloadFinishedSilently( TDEIO::Job* ))); } } @@ -1097,20 +1097,20 @@ void KTorrentCore::emitCorruptedData(kt::TorrentInterface* tc) void KTorrentCore::connectSignals(kt::TorrentInterface* tc) { - connect(tc,TQT_SIGNAL(finished(kt::TorrentInterface*)), - this,TQT_SLOT(torrentFinished(kt::TorrentInterface* ))); - connect(tc, TQT_SIGNAL(stoppedByError(kt::TorrentInterface*, TQString )), - TQT_TQOBJECT(this), TQT_SLOT(slotStoppedByError(kt::TorrentInterface*, TQString ))); - connect(tc, TQT_SIGNAL(seedingAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)), - TQT_TQOBJECT(this), TQT_SLOT(torrentSeedAutoStopped(kt::TorrentInterface*, kt::AutoStopReason))); - connect(tc,TQT_SIGNAL(aboutToBeStarted( kt::TorrentInterface*,bool & )), - TQT_TQOBJECT(this), TQT_SLOT(aboutToBeStarted( kt::TorrentInterface*,bool & ))); - connect(tc,TQT_SIGNAL(corruptedDataFound( kt::TorrentInterface* )), - TQT_TQOBJECT(this), TQT_SLOT(emitCorruptedData( kt::TorrentInterface* ))); - connect(qman, TQT_SIGNAL(queuingNotPossible(kt::TorrentInterface*)), - TQT_TQOBJECT(this), TQT_SLOT(enqueueTorrentOverMaxRatio( kt::TorrentInterface* ))); - connect(qman, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)), - TQT_TQOBJECT(this), TQT_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool))); + connect(tc,TQ_SIGNAL(finished(kt::TorrentInterface*)), + this,TQ_SLOT(torrentFinished(kt::TorrentInterface* ))); + connect(tc, TQ_SIGNAL(stoppedByError(kt::TorrentInterface*, TQString )), + this, TQ_SLOT(slotStoppedByError(kt::TorrentInterface*, TQString ))); + connect(tc, TQ_SIGNAL(seedingAutoStopped(kt::TorrentInterface*, kt::AutoStopReason)), + this, TQ_SLOT(torrentSeedAutoStopped(kt::TorrentInterface*, kt::AutoStopReason))); + connect(tc,TQ_SIGNAL(aboutToBeStarted( kt::TorrentInterface*,bool & )), + this, TQ_SLOT(aboutToBeStarted( kt::TorrentInterface*,bool & ))); + connect(tc,TQ_SIGNAL(corruptedDataFound( kt::TorrentInterface* )), + this, TQ_SLOT(emitCorruptedData( kt::TorrentInterface* ))); + connect(qman, TQ_SIGNAL(queuingNotPossible(kt::TorrentInterface*)), + this, TQ_SLOT(enqueueTorrentOverMaxRatio( kt::TorrentInterface* ))); + connect(qman, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)), + this, TQ_SLOT(onLowDiskSpace(kt::TorrentInterface*, bool))); } diff --git a/apps/ktorrent/ktorrentcore.h b/apps/ktorrent/ktorrentcore.h index 8e25653..4c79ad5 100644 --- a/apps/ktorrent/ktorrentcore.h +++ b/apps/ktorrent/ktorrentcore.h @@ -62,7 +62,7 @@ class KProgress; */ class KTorrentCore : public kt::CoreInterface { - Q_OBJECT + TQ_OBJECT public: KTorrentCore(kt::GUIInterface* gui); diff --git a/apps/ktorrent/ktorrentdcop.h b/apps/ktorrent/ktorrentdcop.h index 2e0f7e0..14f30ba 100644 --- a/apps/ktorrent/ktorrentdcop.h +++ b/apps/ktorrent/ktorrentdcop.h @@ -29,7 +29,7 @@ class KTorrent; */ class KTorrentDCOP : public TQObject,virtual public DCOPInterface { - Q_OBJECT + TQ_OBJECT KTorrent* app; public: diff --git a/apps/ktorrent/ktorrentview.cpp b/apps/ktorrent/ktorrentview.cpp index a22afcb..4d3983b 100644 --- a/apps/ktorrent/ktorrentview.cpp +++ b/apps/ktorrent/ktorrentview.cpp @@ -69,7 +69,7 @@ bool TorrentView::eventFilter(TQObject* watched, TQEvent* e) { case TQEvent::MouseButtonPress: { - if(TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton) + if(static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton) ktview->m_headerMenu->popup(TQCursor::pos()); break; @@ -93,21 +93,21 @@ KTorrentView::KTorrentView(TQWidget *parent) setupColumns(); - connect(view,TQT_SIGNAL(executed(TQListViewItem* )), - this,TQT_SLOT(onExecuted(TQListViewItem* ))); + connect(view,TQ_SIGNAL(executed(TQListViewItem* )), + this,TQ_SLOT(onExecuted(TQListViewItem* ))); - connect(view,TQT_SIGNAL(currentChanged(TQListViewItem* )), - this,TQT_SLOT(onExecuted(TQListViewItem* ))); + connect(view,TQ_SIGNAL(currentChanged(TQListViewItem* )), + this,TQ_SLOT(onExecuted(TQListViewItem* ))); - connect(view,TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), - this,TQT_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); + connect(view,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint& )), + this,TQ_SLOT(showContextMenu(TDEListView*, TQListViewItem*, const TQPoint& ))); - connect(view,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(onSelectionChanged())); + connect(view,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(onSelectionChanged())); menu = new KTorrentViewMenu(this); - connect(menu,TQT_SIGNAL(groupItemActivated(const TQString&)),this,TQT_SLOT(gsmItemActived(const TQString&))); + connect(menu,TQ_SIGNAL(groupItemActivated(const TQString&)),this,TQ_SLOT(gsmItemActived(const TQString&))); - connect(m_headerMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(onColumnVisibilityChange( int ))); + connect(m_headerMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(onColumnVisibilityChange( int ))); view->setFrameShape(TQFrame::NoFrame); } diff --git a/apps/ktorrent/ktorrentview.h b/apps/ktorrent/ktorrentview.h index a388c87..bf52598 100644 --- a/apps/ktorrent/ktorrentview.h +++ b/apps/ktorrent/ktorrentview.h @@ -65,7 +65,7 @@ private: */ class KTorrentView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum ActionEnableFlags diff --git a/apps/ktorrent/ktorrentviewmenu.cpp b/apps/ktorrent/ktorrentviewmenu.cpp index 2f2d42f..5dca77e 100644 --- a/apps/ktorrent/ktorrentviewmenu.cpp +++ b/apps/ktorrent/ktorrentviewmenu.cpp @@ -35,69 +35,69 @@ KTorrentViewMenu::KTorrentViewMenu (KTorrentView *parent, const char *name ) stop_id = insertItem( iload->loadIconSet("ktstop",TDEIcon::Small),i18n("to stop", "Stop"), - parent,TQT_SLOT(stopDownloads())); + parent,TQ_SLOT(stopDownloads())); start_id = insertItem( iload->loadIconSet("ktstart",TDEIcon::Small),i18n("to start", "Start"), - parent,TQT_SLOT(startDownloads())); + parent,TQ_SLOT(startDownloads())); remove_id = insertItem( iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent"), - parent,TQT_SLOT(removeDownloads())); + parent,TQ_SLOT(removeDownloads())); remove_all_id = insertItem( iload->loadIconSet("ktremove",TDEIcon::Small),i18n("Remove Torrent and Data"), - parent,TQT_SLOT(removeDownloadsAndData())); + parent,TQ_SLOT(removeDownloadsAndData())); queue_id = insertItem( iload->loadIconSet("player_playlist",TDEIcon::Small),i18n("Enqueue/Dequeue"), - parent,TQT_SLOT(queueSlot())); + parent,TQ_SLOT(queueSlot())); insertSeparator(); add_peer_id = insertItem( iload->loadIconSet("add", TDEIcon::Small), i18n("Add Peers"), - parent, TQT_SLOT(showAddPeersWidget())); + parent, TQ_SLOT(showAddPeersWidget())); peer_sources_menu = new TDEPopupMenu(this); peer_sources_id = insertItem(i18n("Additional Peer Sources"), peer_sources_menu); peer_sources_menu->insertTitle(i18n("Torrent Peer Sources:")); peer_sources_menu->setCheckable(true); - dht_id = peer_sources_menu->insertItem(i18n("DHT"), parent, TQT_SLOT(dhtSlot())); - ut_pex_id = peer_sources_menu->insertItem(i18n("Peer Exchange"), parent, TQT_SLOT(utPexSlot())); + dht_id = peer_sources_menu->insertItem(i18n("DHT"), parent, TQ_SLOT(dhtSlot())); + ut_pex_id = peer_sources_menu->insertItem(i18n("Peer Exchange"), parent, TQ_SLOT(utPexSlot())); insertSeparator(); announce_id = insertItem( iload->loadIconSet("apply",TDEIcon::Small),i18n("Manual Announce"), - parent,TQT_SLOT(manualAnnounce())); + parent,TQ_SLOT(manualAnnounce())); preview_id = insertItem( iload->loadIconSet("frame_image",TDEIcon::Small),i18n("Preview"), - parent, TQT_SLOT(previewFiles())); + parent, TQ_SLOT(previewFiles())); insertSeparator(); dirs_sub_menu = new TDEPopupMenu(this); dirs_id = insertItem(i18n("Open Directory"), dirs_sub_menu); outputdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Data Directory"), - parent, TQT_SLOT(openOutputDirectory())); + parent, TQ_SLOT(openOutputDirectory())); torxdir_id = dirs_sub_menu->insertItem(iload->loadIconSet("folder",TDEIcon::Small), i18n("Temporary Directory"), - parent, TQT_SLOT(openTorXDirectory())); + parent, TQ_SLOT(openTorXDirectory())); - downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQT_SLOT(setDownloadLocationSlot())); + downloaddir_id = insertItem(i18n("Set Download Location"), parent, TQ_SLOT(setDownloadLocationSlot())); insertSeparator(); - remove_from_group_id = insertItem(i18n("Remove From Group"),parent, TQT_SLOT(removeFromGroup())); + remove_from_group_id = insertItem(i18n("Remove From Group"),parent, TQ_SLOT(removeFromGroup())); groups_sub_menu = new TDEPopupMenu(this); add_to_group_id = insertItem(i18n("Add to Group"),groups_sub_menu); insertSeparator(); - scan_id = insertItem(i18n("Check Data Integrity"),parent, TQT_SLOT(checkDataIntegrity())); + scan_id = insertItem(i18n("Check Data Integrity"),parent, TQ_SLOT(checkDataIntegrity())); - connect(groups_sub_menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(gsmItemActived(int))); + connect(groups_sub_menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(gsmItemActived(int))); - traffic_lim_id = insertItem(i18n("Speed Limits"),parent,TQT_SLOT(speedLimits())); + traffic_lim_id = insertItem(i18n("Speed Limits"),parent,TQ_SLOT(speedLimits())); } diff --git a/apps/ktorrent/ktorrentviewmenu.h b/apps/ktorrent/ktorrentviewmenu.h index fd850a6..75c5112 100644 --- a/apps/ktorrent/ktorrentviewmenu.h +++ b/apps/ktorrent/ktorrentviewmenu.h @@ -29,7 +29,7 @@ class KTorrentView; */ class KTorrentViewMenu : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: KTorrentViewMenu(KTorrentView *parent, const char *name = 0 ); diff --git a/apps/ktorrent/main.cpp b/apps/ktorrent/main.cpp index 748001a..a6b67c8 100644 --- a/apps/ktorrent/main.cpp +++ b/apps/ktorrent/main.cpp @@ -116,7 +116,7 @@ int main(int argc, char **argv) // ignore SIGPIPE's signal(SIGPIPE,SIG_IGN); signal(SIGXFSZ,SIG_IGN); - tqInstallMsgHandler( StupidWarningMessagesFromTQt ); + qInstallMsgHandler( StupidWarningMessagesFromTQt ); TDEAboutData about("ktorrent", I18N_NOOP("KTorrent"), kt::VERSION_STRING, description, TDEAboutData::License_GPL, "(C) 2005 -2008 Joris Guisson and Ivan Vasic", 0); about.addAuthor("Joris Guisson", 0, "joris.guisson@gmail.com" ); diff --git a/apps/ktorrent/newui/button.cpp b/apps/ktorrent/newui/button.cpp index 4754cd0..4009271 100644 --- a/apps/ktorrent/newui/button.cpp +++ b/apps/ktorrent/newui/button.cpp @@ -47,7 +47,7 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, hide(); setFlat(true); setToggleButton(true); - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setDescription(m_description); setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); resize(sizeHint()); @@ -56,9 +56,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, TQToolTip::add(this, m_realText); m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0, - TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(assignAccel()), this); m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, - TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); + this, TQ_SLOT(clearAccel()), this); TDEConfig *config = kapp->config(); config->setGroup("UI"); @@ -229,7 +229,7 @@ TQSize Button::sizeHint(const TQString &text) const h = TQMAX(h, sz.height()); } - return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/apps/ktorrent/newui/button.h b/apps/ktorrent/newui/button.h index 00a31de..23c45c1 100644 --- a/apps/ktorrent/newui/button.h +++ b/apps/ktorrent/newui/button.h @@ -38,7 +38,7 @@ A TQPushButton derivative with a size of a TQToolBar. Button can be rotated (placed onto different places in ideal mode). */ class Button : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: Button(ButtonBar *parent, const TQString text, const TQIconSet &icon = TQIconSet(), diff --git a/apps/ktorrent/newui/buttonbar.h b/apps/ktorrent/newui/buttonbar.h index 97e162d..3f23957 100644 --- a/apps/ktorrent/newui/buttonbar.h +++ b/apps/ktorrent/newui/buttonbar.h @@ -52,7 +52,7 @@ Looks like a toolbar but has another behaviour. It is suitable for placing on the left(right, bottom, top) corners of a window as a bar with slider. */ class ButtonBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ButtonBar(Place place, ButtonMode mode = IconsAndText, diff --git a/apps/ktorrent/newui/ddockwindow.cpp b/apps/ktorrent/newui/ddockwindow.cpp index 7234038..29f59cf 100644 --- a/apps/ktorrent/newui/ddockwindow.cpp +++ b/apps/ktorrent/newui/ddockwindow.cpp @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); - m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); - m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); + m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this ); + m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this ); + m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this ); setVisible(m_visible); @@ -192,8 +192,8 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc m_bar->addButton(button); m_widgetStack->addWidget(widget); - connect(button, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(selectWidget())); - connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPopupMenu*)) ); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget())); + connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) ); if (!skipActivation) { @@ -294,7 +294,7 @@ void DDockWindow::selectWidget(Ideal::Button *button) void DDockWindow::selectWidget() { - selectWidget((Ideal::Button*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))); + selectWidget((Ideal::Button*)sender()); } void DDockWindow::hideWidget(TQWidget *widget) @@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget() void DDockWindow::contextMenu(TQPopupMenu * menu) { - m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) ); + m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) ); menu->insertSeparator(); diff --git a/apps/ktorrent/newui/ddockwindow.h b/apps/ktorrent/newui/ddockwindow.h index 3012e02..84b5163 100644 --- a/apps/ktorrent/newui/ddockwindow.h +++ b/apps/ktorrent/newui/ddockwindow.h @@ -39,7 +39,7 @@ namespace Ideal { } class DDockWindow : public TQDockWindow { - Q_OBJECT + TQ_OBJECT public: enum Position { Bottom, Left, Right }; diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp index 8f946b2..9134404 100644 --- a/apps/ktorrent/newui/dmainwindow.cpp +++ b/apps/ktorrent/newui/dmainwindow.cpp @@ -34,7 +34,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name) { loadSettings(); createToolWindows(); - m_central = new Ideal::DockSplitter(Qt::Horizontal, this); + m_central = new Ideal::DockSplitter(TQt::Horizontal, this); m_activeTabWidget = createTab(); m_central->addDock(0, 0, m_activeTabWidget); setCentralWidget(m_central); @@ -213,10 +213,10 @@ DTabWidget *DMainWindow::createTab() DTabWidget *tab = new DTabWidget(m_central); m_tabs.append(tab); if (tab->closeButton()) - connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab())); - connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); - connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), - this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &))); + connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab())); + connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); + connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), + this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &))); return tab; } @@ -280,7 +280,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view, DDockWindow* dock = toolWindow(position); dock->addWidget(title, view); m_docks[view] = position; - connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed())); + connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed())); if (dock->isHidden()) dock->show(); } @@ -306,7 +306,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view) void DMainWindow::widgetDestroyed() { - TQWidget *w = TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender())); if (m_docks.contains(w)) { diff --git a/apps/ktorrent/newui/dmainwindow.h b/apps/ktorrent/newui/dmainwindow.h index ab98207..7483971 100644 --- a/apps/ktorrent/newui/dmainwindow.h +++ b/apps/ktorrent/newui/dmainwindow.h @@ -32,7 +32,7 @@ namespace Ideal { /**Main window which provides simplified IDEA mode.*/ class DMainWindow: public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: DMainWindow(TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/newui/docksplitter.cpp b/apps/ktorrent/newui/docksplitter.cpp index bb6a68d..115abf2 100644 --- a/apps/ktorrent/newui/docksplitter.cpp +++ b/apps/ktorrent/newui/docksplitter.cpp @@ -23,16 +23,16 @@ namespace Ideal { -DockSplitter::DockSplitter(Qt::Orientation orientation, TQWidget *parent, const char *name) +DockSplitter::DockSplitter(TQt::Orientation orientation, TQWidget *parent, const char *name) :TQSplitter(parent, name), m_orientation(orientation) { switch (m_orientation) { - case Qt::Horizontal: - setOrientation(Qt::Vertical); + case TQt::Horizontal: + setOrientation(TQt::Vertical); break; - case Qt::Vertical: - setOrientation(Qt::Horizontal); + case TQt::Vertical: + setOrientation(TQt::Horizontal); break; } setOpaqueResize(true); @@ -73,11 +73,11 @@ void DockSplitter::appendSplitter() { switch (m_orientation) { - case Qt::Horizontal: - m_splitters.append(new TQSplitter(Qt::Horizontal, this)); + case TQt::Horizontal: + m_splitters.append(new TQSplitter(TQt::Horizontal, this)); break; - case Qt::Vertical: - m_splitters.append(new TQSplitter(Qt::Vertical, this)); + case TQt::Vertical: + m_splitters.append(new TQSplitter(TQt::Vertical, this)); break; } m_splitters[m_splitters.size()-1]->setOpaqueResize(true); @@ -166,8 +166,8 @@ TQPair<uint, uint> DockSplitter::indexOf(TQWidget *dock) for (uint i = 0; i < m_docks.count(); ++i) for (uint j = 0; j < m_docks[i].count(); ++j) if (dock == m_docks[i][j]) - return tqMakePair(i, j); - return tqMakePair(0u, 0u); + return qMakePair(i, j); + return qMakePair(0u, 0u); } } diff --git a/apps/ktorrent/newui/docksplitter.h b/apps/ktorrent/newui/docksplitter.h index c167a5b..3856c4c 100644 --- a/apps/ktorrent/newui/docksplitter.h +++ b/apps/ktorrent/newui/docksplitter.h @@ -31,10 +31,10 @@ class DockWidget; @short Splitter for docks */ class DockSplitter: public TQSplitter { - Q_OBJECT + TQ_OBJECT public: - DockSplitter(Qt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); + DockSplitter(TQt::Orientation orientation, TQWidget *parent = 0, const char *name = 0); ~DockSplitter(); void addDock(uint row, uint col, TQWidget *dock); @@ -53,7 +53,7 @@ protected: bool isRowEmpty(int row); private: - Qt::Orientation m_orientation; + TQt::Orientation m_orientation; TQValueList<TQSplitter*> m_splitters; TQValueList<TQValueList<TQWidget*> > m_docks; }; diff --git a/apps/ktorrent/newui/dtabwidget.cpp b/apps/ktorrent/newui/dtabwidget.cpp index 50cf9cd..f1148a5 100644 --- a/apps/ktorrent/newui/dtabwidget.cpp +++ b/apps/ktorrent/newui/dtabwidget.cpp @@ -29,7 +29,7 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) :KTabWidget(parent, name), m_closeButton(0) { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setMargin(0); loadSettings(); @@ -49,8 +49,8 @@ DTabWidget::DTabWidget(TQWidget *parent, const char *name) setTabReorderingEnabled(true); } - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(setFocus(TQWidget*))); -// connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(updateHistory(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(setFocus(TQWidget*))); +// connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(updateHistory(TQWidget*))); } void DTabWidget::loadSettings() diff --git a/apps/ktorrent/newui/dtabwidget.h b/apps/ktorrent/newui/dtabwidget.h index f312554..529a42d 100644 --- a/apps/ktorrent/newui/dtabwidget.h +++ b/apps/ktorrent/newui/dtabwidget.h @@ -25,7 +25,7 @@ class TQToolButton; class DTabWidget: public KTabWidget { - Q_OBJECT + TQ_OBJECT public: DTabWidget(TQWidget *parent=0, const char *name=0); diff --git a/apps/ktorrent/pastedialog.h b/apps/ktorrent/pastedialog.h index c40cf43..cb31cd2 100644 --- a/apps/ktorrent/pastedialog.h +++ b/apps/ktorrent/pastedialog.h @@ -30,7 +30,7 @@ class KTorrentCore; **/ class PasteDialog: public PasteDlgBase { - Q_OBJECT + TQ_OBJECT public slots: virtual void btnOK_clicked(); diff --git a/apps/ktorrent/pastedlgbase.ui b/apps/ktorrent/pastedlgbase.ui index c847cb9..4c9539a 100644 --- a/apps/ktorrent/pastedlgbase.ui +++ b/apps/ktorrent/pastedlgbase.ui @@ -132,9 +132,9 @@ <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>btnOK_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/apps/ktorrent/pref.cpp b/apps/ktorrent/pref.cpp index ee08bdc..bbf86ba 100644 --- a/apps/ktorrent/pref.cpp +++ b/apps/ktorrent/pref.cpp @@ -226,12 +226,12 @@ void GeneralPrefPage::createWidget(TQWidget* parent) { gp = new GeneralPref(parent); updateData(); - connect(gp->custom_ip_check, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(customIPChecked(bool))); - connect(gp->use_dht, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(dhtChecked(bool))); - connect(gp->use_encryption, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(useEncryptionChecked(bool))); + connect(gp->custom_ip_check, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(customIPChecked(bool))); + connect(gp->use_dht, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(dhtChecked(bool))); + connect(gp->use_encryption, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(useEncryptionChecked(bool))); } bool GeneralPrefPage::apply() @@ -463,14 +463,14 @@ void AdvancedPrefPage::createWidget(TQWidget* parent) { ap = new AdvancedPref(parent); updateData(); - connect(ap->no_recheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(noDataCheckChecked(bool))); - connect(ap->auto_recheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(autoRecheckChecked(bool))); - connect(ap->do_not_use_kde_proxy, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(doNotUseKDEProxyChecked(bool))); - connect(ap->prealloc_disabled,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(preallocDisabledChecked(bool))); + connect(ap->no_recheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(noDataCheckChecked(bool))); + connect(ap->auto_recheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(autoRecheckChecked(bool))); + connect(ap->do_not_use_kde_proxy, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(doNotUseKDEProxyChecked(bool))); + connect(ap->prealloc_disabled,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(preallocDisabledChecked(bool))); preallocDisabledChecked(ap->prealloc_disabled->isChecked()); } diff --git a/apps/ktorrent/pref.h b/apps/ktorrent/pref.h index e1108d5..f9a4331 100644 --- a/apps/ktorrent/pref.h +++ b/apps/ktorrent/pref.h @@ -50,7 +50,7 @@ public: class GeneralPrefPage : public TQObject,public kt::PrefPageInterface { - Q_OBJECT + TQ_OBJECT GeneralPref* gp; public: @@ -71,7 +71,7 @@ private slots: class AdvancedPrefPage : public TQObject,public kt::PrefPageInterface { - Q_OBJECT + TQ_OBJECT AdvancedPref* ap; @@ -94,7 +94,7 @@ private slots: class KTorrentPreferences : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KTorrentPreferences(KTorrent & ktor); diff --git a/apps/ktorrent/queuedialog.cpp b/apps/ktorrent/queuedialog.cpp index 79c06d1..69bb1ea 100644 --- a/apps/ktorrent/queuedialog.cpp +++ b/apps/ktorrent/queuedialog.cpp @@ -105,8 +105,8 @@ QueueDialog::QueueDialog(bt::QueueManager* qm, TQWidget *parent, const char *nam logo->setPixmap(iload->loadIcon("ktqueuemanager", TDEIcon::Desktop)); - connect(downloadList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(downloadList_currentChanged( TQListViewItem* ))); - connect(seedList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(seedList_currentChanged( TQListViewItem* ))); + connect(downloadList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(downloadList_currentChanged( TQListViewItem* ))); + connect(seedList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(seedList_currentChanged( TQListViewItem* ))); if(downloadList->firstChild()) downloadList->setCurrentItem(downloadList->firstChild()); diff --git a/apps/ktorrent/queuedialog.h b/apps/ktorrent/queuedialog.h index a6900e4..ae8629c 100644 --- a/apps/ktorrent/queuedialog.h +++ b/apps/ktorrent/queuedialog.h @@ -50,7 +50,7 @@ class QueueItem: public TQListViewItem class QueueDialog: public QueueDlg { - Q_OBJECT + TQ_OBJECT public: QueueDialog(bt::QueueManager* qm, TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/queuedlg.ui b/apps/ktorrent/queuedlg.ui index 04b0d1c..9bd5532 100644 --- a/apps/ktorrent/queuedlg.ui +++ b/apps/ktorrent/queuedlg.ui @@ -699,7 +699,7 @@ <tabstop>btnDequeue</tabstop> <tabstop>seedList</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>btnMoveUp_clicked()</slot> <slot>btnMoveDown_clicked()</slot> <slot>btnEnqueue_clicked()</slot> @@ -711,7 +711,7 @@ <slot>btnClose_clicked()</slot> <slot>btnMoveTop_clicked()</slot> <slot>btnMoveBottom_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/apps/ktorrent/scandialog.cpp b/apps/ktorrent/scandialog.cpp index 5c9ef8a..834539d 100644 --- a/apps/ktorrent/scandialog.cpp +++ b/apps/ktorrent/scandialog.cpp @@ -40,8 +40,8 @@ ScanDialog::ScanDialog(KTorrentCore* core,bool auto_import, : ScanDlgBase(parent,name, modal,fl),DataCheckerListener(auto_import),mutex(true),core(core) { m_cancel->setGuiItem(KStdGuiItem::cancel()); - connect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCancelPressed())); - connect(&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCancelPressed())); + connect(&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); tc = 0; silently = false; restart = false; @@ -127,8 +127,8 @@ void ScanDialog::finished() { // cancel now becomes a close button m_cancel->setGuiItem(KStdGuiItem::close()); - disconnect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCancelPressed())); - connect(m_cancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); + disconnect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCancelPressed())); + connect(m_cancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); } } else diff --git a/apps/ktorrent/scandialog.h b/apps/ktorrent/scandialog.h index 62a3d7b..b22e1b8 100644 --- a/apps/ktorrent/scandialog.h +++ b/apps/ktorrent/scandialog.h @@ -36,7 +36,7 @@ class KTorrentCore; class ScanDialog : public ScanDlgBase, public bt::DataCheckerListener { - Q_OBJECT + TQ_OBJECT public: ScanDialog(KTorrentCore* core,bool auto_import,TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = WDestructiveClose ); diff --git a/apps/ktorrent/speedlimitsdlg.h b/apps/ktorrent/speedlimitsdlg.h index e1b8b60..01d3e31 100644 --- a/apps/ktorrent/speedlimitsdlg.h +++ b/apps/ktorrent/speedlimitsdlg.h @@ -30,7 +30,7 @@ namespace kt class SpeedLimitsDlg : public SpeedLimitsDlgBase { - Q_OBJECT + TQ_OBJECT kt::TorrentInterface* tor; diff --git a/apps/ktorrent/torrentcreatordlg.cpp b/apps/ktorrent/torrentcreatordlg.cpp index fb3af47..25c5e37 100644 --- a/apps/ktorrent/torrentcreatordlg.cpp +++ b/apps/ktorrent/torrentcreatordlg.cpp @@ -38,8 +38,8 @@ TorrentCreatorDlg::TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent, const KComboBox* cb = m_chunk_size; cb->setCurrentItem(3); - connect(m_create_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCreate())); - connect(m_cancel_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(m_create_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCreate())); + connect(m_cancel_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); m_nodes->setHidden(true); diff --git a/apps/ktorrent/torrentcreatordlg.h b/apps/ktorrent/torrentcreatordlg.h index b19c2fb..76ce111 100644 --- a/apps/ktorrent/torrentcreatordlg.h +++ b/apps/ktorrent/torrentcreatordlg.h @@ -18,7 +18,7 @@ class KTorrentCore; class TorrentCreatorDlg: public TorrentCreatorDlgBase { - Q_OBJECT + TQ_OBJECT public: TorrentCreatorDlg(KTorrentCore* core,TQWidget *parent = 0, const char *name = 0); diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui index fcd100d..97488be 100644 --- a/apps/ktorrent/torrentcreatordlgbase.ui +++ b/apps/ktorrent/torrentcreatordlgbase.ui @@ -508,12 +508,12 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>btnRemoveNode_clicked()</slot> <slot>btnAddNode_clicked()</slot> <slot>m_node_textChanged(const TQString&)</slot> <slot>m_nodeList_selectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/apps/ktorrent/trayhoverpopup.cpp b/apps/ktorrent/trayhoverpopup.cpp index 5cce261..b325184 100644 --- a/apps/ktorrent/trayhoverpopup.cpp +++ b/apps/ktorrent/trayhoverpopup.cpp @@ -33,8 +33,8 @@ TrayHoverPopup::TrayHoverPopup(const TQPixmap & pix,TQWidget *parent, const char { setTimeout(0); setAutoDelete(false); - connect(&hover_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onHoverTimeout())); - connect(&show_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(onShowTimeout())); + connect(&hover_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onHoverTimeout())); + connect(&show_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(onShowTimeout())); create(); setPalette(TQToolTip::palette()); setLineWidth(1); diff --git a/apps/ktorrent/trayhoverpopup.h b/apps/ktorrent/trayhoverpopup.h index f052424..c3cf9fb 100644 --- a/apps/ktorrent/trayhoverpopup.h +++ b/apps/ktorrent/trayhoverpopup.h @@ -33,7 +33,7 @@ class TQPixmap; */ class TrayHoverPopup : public KPassivePopup { - Q_OBJECT + TQ_OBJECT public: TrayHoverPopup(const TQPixmap & pix,TQWidget *parent = 0, const char *name = 0 ); diff --git a/apps/ktorrent/trayicon.cpp b/apps/ktorrent/trayicon.cpp index ab4f2b2..884db94 100644 --- a/apps/ktorrent/trayicon.cpp +++ b/apps/ktorrent/trayicon.cpp @@ -49,26 +49,26 @@ TrayIcon::TrayIcon( KTorrentCore* tc, TQWidget *parent, const char *name) m_hover_popup = new TrayHoverPopup(m_kt_pix,this); - connect(this,TQT_SIGNAL(quitSelected()),kapp,TQT_SLOT(quit())); - connect(m_core, TQT_SIGNAL(finished(kt::TorrentInterface* )), - this, TQT_SLOT(finished(kt::TorrentInterface* ))); - connect(m_core,TQT_SIGNAL(torrentStoppedByError(kt::TorrentInterface*, TQString )), - this,TQT_SLOT(torrentStoppedByError(kt::TorrentInterface*, TQString ))); - connect(m_core,TQT_SIGNAL(maxShareRatioReached( kt::TorrentInterface* )), - this,TQT_SLOT(maxShareRatioReached( kt::TorrentInterface* ))); - connect(m_core,TQT_SIGNAL(maxSeedTimeReached(kt::TorrentInterface*)), - this, TQT_SLOT(maxSeedTimeReached(kt::TorrentInterface*))); - connect(m_core,TQT_SIGNAL(corruptedData( kt::TorrentInterface* )), - this,TQT_SLOT(corruptedData( kt::TorrentInterface* ))); - connect(m_core, TQT_SIGNAL(queuingNotPossible( kt::TorrentInterface* )), - this, TQT_SLOT(queuingNotPossible( kt::TorrentInterface* ))); - connect(m_core,TQT_SIGNAL(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse)), - this,TQT_SLOT(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse))); - connect(m_core, TQT_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)), - this, TQT_SLOT(lowDiskSpace(kt::TorrentInterface*, bool))); + connect(this,TQ_SIGNAL(quitSelected()),kapp,TQ_SLOT(quit())); + connect(m_core, TQ_SIGNAL(finished(kt::TorrentInterface* )), + this, TQ_SLOT(finished(kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(torrentStoppedByError(kt::TorrentInterface*, TQString )), + this,TQ_SLOT(torrentStoppedByError(kt::TorrentInterface*, TQString ))); + connect(m_core,TQ_SIGNAL(maxShareRatioReached( kt::TorrentInterface* )), + this,TQ_SLOT(maxShareRatioReached( kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(maxSeedTimeReached(kt::TorrentInterface*)), + this, TQ_SLOT(maxSeedTimeReached(kt::TorrentInterface*))); + connect(m_core,TQ_SIGNAL(corruptedData( kt::TorrentInterface* )), + this,TQ_SLOT(corruptedData( kt::TorrentInterface* ))); + connect(m_core, TQ_SIGNAL(queuingNotPossible( kt::TorrentInterface* )), + this, TQ_SLOT(queuingNotPossible( kt::TorrentInterface* ))); + connect(m_core,TQ_SIGNAL(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse)), + this,TQ_SLOT(canNotStart(kt::TorrentInterface*, kt::TorrentStartResponse))); + connect(m_core, TQ_SIGNAL(lowDiskSpace(kt::TorrentInterface*, bool)), + this, TQ_SLOT(lowDiskSpace(kt::TorrentInterface*, bool))); - connect(this->contextMenu(),TQT_SIGNAL(aboutToShow()),m_hover_popup,TQT_SLOT(contextMenuAboutToShow())); - connect(this->contextMenu(),TQT_SIGNAL(aboutToHide()),m_hover_popup,TQT_SLOT(contextMenuAboutToHide())); + connect(this->contextMenu(),TQ_SIGNAL(aboutToShow()),m_hover_popup,TQ_SLOT(contextMenuAboutToShow())); + connect(this->contextMenu(),TQ_SIGNAL(aboutToHide()),m_hover_popup,TQ_SLOT(contextMenuAboutToHide())); } TrayIcon::~TrayIcon() @@ -287,7 +287,7 @@ SetMaxRate::SetMaxRate( KTorrentCore* tc, int t, TQWidget *parent, const char *n m_core = tc; type=t; makeMenu(); - connect(this,TQT_SIGNAL(activated (int)),this,TQT_SLOT(rateSelected(int ))); + connect(this,TQ_SIGNAL(activated (int)),this,TQ_SLOT(rateSelected(int ))); } void SetMaxRate::makeMenu() { diff --git a/apps/ktorrent/trayicon.h b/apps/ktorrent/trayicon.h index a277f79..f31767d 100644 --- a/apps/ktorrent/trayicon.h +++ b/apps/ktorrent/trayicon.h @@ -49,7 +49,7 @@ struct TrayStats */ class TrayIcon : public KSystemTray { - Q_OBJECT + TQ_OBJECT public: TrayIcon(KTorrentCore* tc, TQWidget *parent = 0, const char *name = 0); @@ -123,7 +123,7 @@ private: class SetMaxRate : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: SetMaxRate(KTorrentCore* tc, int t, TQWidget *parent=0, const char *name=0); // type: 0 Upload; 1 Download diff --git a/apps/ktorrent/viewmanager.h b/apps/ktorrent/viewmanager.h index 67025aa..e402a92 100644 --- a/apps/ktorrent/viewmanager.h +++ b/apps/ktorrent/viewmanager.h @@ -34,7 +34,7 @@ class KTorrent; */ class ViewManager : public TQObject, public kt::CloseTabListener { - Q_OBJECT + TQ_OBJECT public: ViewManager(TQObject *parent = 0, const char *name = 0); diff --git a/apps/ktupnptest/upnptestapp.cpp b/apps/ktupnptest/upnptestapp.cpp index f38c419..d85f08a 100644 --- a/apps/ktupnptest/upnptestapp.cpp +++ b/apps/ktupnptest/upnptestapp.cpp @@ -33,11 +33,11 @@ UPnPTestApp::UPnPTestApp(TQWidget *parent, const char *name) : TDEMainWindow(parent, name) { sock = new UPnPMCastSocket(true); - connect(sock,TQT_SIGNAL(discovered( UPnPRouter* )),this,TQT_SLOT(discovered( UPnPRouter* ))); + connect(sock,TQ_SIGNAL(discovered( UPnPRouter* )),this,TQ_SLOT(discovered( UPnPRouter* ))); mwnd = new MainWidget(this); setCentralWidget(mwnd); - connect(mwnd->test_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onTestBtn())); - connect(mwnd->close_btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(onCloseBtn())); + connect(mwnd->test_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onTestBtn())); + connect(mwnd->close_btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(onCloseBtn())); bt::Log & lg = bt::Globals::instance().getLog(0); lg.addMonitor(this); Out() << "UPnPTestApp started up !" << endl; diff --git a/apps/ktupnptest/upnptestapp.h b/apps/ktupnptest/upnptestapp.h index 17aae8d..7c5ac98 100644 --- a/apps/ktupnptest/upnptestapp.h +++ b/apps/ktupnptest/upnptestapp.h @@ -37,7 +37,7 @@ using kt::UPnPRouter; */ class UPnPTestApp : public TDEMainWindow, public kt::LogMonitorInterface { - Q_OBJECT + TQ_OBJECT public: UPnPTestApp(TQWidget *parent = 0, const char *name = 0); |