diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-11 10:35:25 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-11 10:35:25 +0900 |
| commit | 7e9d8ea45280ad6657796da9536ccf6218111f22 (patch) | |
| tree | 67d57c480b89c5967466e39bf60f7e4f05434f15 /konq-plugins | |
| parent | 1ecb90ecaf66e1cc8ddeacad21e71640477d9767 (diff) | |
| download | tdeaddons-7e9d8ea45280ad6657796da9536ccf6218111f22.tar.gz tdeaddons-7e9d8ea45280ad6657796da9536ccf6218111f22.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'konq-plugins')
50 files changed, 477 insertions, 477 deletions
diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 204faf6..1c75d0c 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -64,10 +64,10 @@ AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : m_menu = new TDEPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Adblock")); - m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showTDECModule())); - m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue())); + m_menu->insertItem(i18n("Configure"), this, TQ_SLOT(showTDECModule())); + m_menu->insertItem(i18n("Show Elements"), this, TQ_SLOT(showDialogue())); - connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(initLabel())); + connect(m_part, TQ_SIGNAL(completed()), this, TQ_SLOT(initLabel())); } AdBlock::~AdBlock() @@ -100,8 +100,8 @@ void AdBlock::initLabel() statusBarEx->addStatusBarItem(m_label, 0, false); - connect(m_label, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(showDialogue())); - connect(m_label, TQT_SIGNAL(rightClickedURL()), this, TQT_SLOT(contextMenu())); + connect(m_label, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(showDialogue())); + connect(m_label, TQ_SIGNAL(rightClickedURL()), this, TQ_SLOT(contextMenu())); } void AdBlock::showDialogue() @@ -119,9 +119,9 @@ void AdBlock::showDialogue() fillBlockableElements(elements); AdBlockDlg *dialogue = new AdBlockDlg(m_part->widget(), elements); - connect(dialogue, TQT_SIGNAL( notEmptyFilter(const TQString&) ), this, TQT_SLOT( addAdFilter(const TQString&) )); - connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); - connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); + connect(dialogue, TQ_SIGNAL( notEmptyFilter(const TQString&) ), this, TQ_SLOT( addAdFilter(const TQString&) )); + connect(dialogue, TQ_SIGNAL( cancelClicked() ), dialogue, TQ_SLOT( delayedDestruct() )); + connect(dialogue, TQ_SIGNAL( closeClicked() ), dialogue, TQ_SLOT( delayedDestruct() )); dialogue->show(); } @@ -129,8 +129,8 @@ void AdBlock::showTDECModule() { KCMultiDialog* dialogue = new KCMultiDialog(m_part->widget()); dialogue->addModule("tdehtml_filter"); - connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); - connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); + connect(dialogue, TQ_SIGNAL( cancelClicked() ), dialogue, TQ_SLOT( delayedDestruct() )); + connect(dialogue, TQ_SIGNAL( closeClicked() ), dialogue, TQ_SLOT( delayedDestruct() )); dialogue->show(); } diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index 1eab9ac..875ac20 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -67,17 +67,17 @@ AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) : m_filter = new TQLineEdit( "", page, "lineedit" ); - connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validateFilter() )); - connect(m_list, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(updateFilter(TQListViewItem *)) ); + connect(this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( validateFilter() )); + connect(m_list, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(updateFilter(TQListViewItem *)) ); m_menu = new TDEPopupMenu(this); - m_menu->insertItem(i18n("Filter this item"), this, TQT_SLOT(filterItem())); - m_menu->insertItem(i18n("Filter all items at same path"), this, TQT_SLOT(filterPath())); + m_menu->insertItem(i18n("Filter this item"), this, TQ_SLOT(filterItem())); + m_menu->insertItem(i18n("Filter all items at same path"), this, TQ_SLOT(filterPath())); connect(m_list, - TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), + TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), this, - TQT_SLOT( showContextMenu(TQListViewItem *, const TQPoint &) ) ); + TQ_SLOT( showContextMenu(TQListViewItem *, const TQPoint &) ) ); } void AdBlockDlg::updateFilter(TQListViewItem *selected) diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 93453e0..6aafbec 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -84,7 +84,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const if (isFeedUrl(it)) { kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl; - TDEAction *action = new TDEAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); + TDEAction *action = new TDEAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQ_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); addAction( action ); addSeparator(); m_feedURL = it->url().url(); diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 4304c57..a5e26e3 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -63,15 +63,15 @@ KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringLis m_part = dynamic_cast<TDEHTMLPart*>(parent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } // FIXME: need to do this because of a bug in tdehtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?) - //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); - TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad())); + //connect(m_part->view(), TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(addFeedIcon())); + TQTimer::singleShot(0, this, TQ_SLOT(waitPartToLoad())); } void KonqFeedIcon::waitPartToLoad() { - connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addFeedIcon())); - connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addFeedIcon())); // to make pages with metarefresh to work - connect(m_part, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(removeFeedIcon())); + connect(m_part, TQ_SIGNAL(completed()), this, TQ_SLOT(addFeedIcon())); + connect(m_part, TQ_SIGNAL(completed(bool)), this, TQ_SLOT(addFeedIcon())); // to make pages with metarefresh to work + connect(m_part, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(removeFeedIcon())); addFeedIcon(); } @@ -126,19 +126,19 @@ void KonqFeedIcon::contextMenu() m_menu = new TDEPopupMenu(m_part->widget()); if(m_feedList.count() == 1) { m_menu->insertTitle(m_feedList.first().title()); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQT_SLOT(addFeeds()) ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQ_SLOT(addFeeds()) ); } else { m_menu->insertTitle(i18n("Add Feeds to Akregator")); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addFeed(int))); int id = 0; for(FeedDetectorEntryList::Iterator it = m_feedList.begin(); it != m_feedList.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).title(), id); id++; } - //disconnect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addFeed(int))); + //disconnect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addFeed(int))); m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, TQT_SLOT(addFeeds()), 0, 50000 ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add All Found Feeds to Akregator"), this, TQ_SLOT(addFeeds()), 0, 50000 ); } m_menu->popup(TQCursor::pos()); } @@ -166,7 +166,7 @@ void KonqFeedIcon::addFeedIcon() m_statusBarEx->addStatusBarItem(m_feedIcon, 0, true); - connect(m_feedIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu())); + connect(m_feedIcon, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(contextMenu())); } void KonqFeedIcon::removeFeedIcon() diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp index 1194f39..cf8f473 100644 --- a/konq-plugins/arkplugin/arkplugin.cpp +++ b/konq-plugins/arkplugin/arkplugin.cpp @@ -100,13 +100,13 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis item = itemList.first(); m_name = itemList.first()->name(); action = new TDEAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this, - TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); + TQ_SLOT( slotCompressAsDefault() ), actionCollection() ); } else { action = new TDEAction( KMimeType::mimeType( m_conf->readEntry( "LastMimeType", "application/x-txz" ) )->comment(), - 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); + 0, this, TQ_SLOT( slotCompressAsDefault() ), actionCollection() ); } actionMenu->insert( action ); @@ -118,14 +118,14 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis if ( itemList.first()->url().isLocalFile() ) actionMenu->insert( m_addToMenu ); - connect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPrepareCompAsMenu() ) ); - connect( m_addToMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPrepareAddToMenu() ) ); + connect( m_compAsMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPrepareCompAsMenu() ) ); + connect( m_addToMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPrepareAddToMenu() ) ); action = new TDEAction( i18n( "Add to Archive..." ), 0, this, - TQT_SLOT( slotAdd() ), actionCollection() ); + TQ_SLOT( slotAdd() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } @@ -137,7 +137,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis actionMenu = new TDEActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" ); action = new TDEAction( i18n( "Extract Here" ), 0, this, - TQT_SLOT( slotExtractHere() ), actionCollection() ); + TQ_SLOT( slotExtractHere() ), actionCollection() ); actionMenu->insert( action ); // stolen from arkwidget.cpp if ( itemCount == 1 ) @@ -145,22 +145,22 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis TQString targetName = itemList.first()->name(); stripExtension( targetName ); action = new TDEAction( i18n( "Extract to %1" ).arg( targetName ), 0, this, - TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); + TQ_SLOT( slotExtractToSubfolders() ), actionCollection() ); } else { action = new TDEAction( i18n( "Extract to Subfolders" ), 0, this, - TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); + TQ_SLOT( slotExtractToSubfolders() ), actionCollection() ); } actionMenu->insert( action ); action = new TDEAction( i18n( "Extract To..." ), 0 , this, - TQT_SLOT( slotExtractTo() ), actionCollection() ); + TQ_SLOT( slotExtractTo() ), actionCollection() ); actionMenu->insert( action ); addAction( actionMenu ); } else { - action = new TDEAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); + action = new TDEAction( i18n( "Extract To..." ), "ark", 0, this, TQ_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); addAction( action ); } } @@ -174,8 +174,8 @@ ArkMenu::~ArkMenu() void ArkMenu::slotPrepareCompAsMenu() { - disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPrepareCompAsMenu() ) ); + disconnect( m_compAsMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPrepareCompAsMenu() ) ); TDEAction * action; m_compAsMapper = new TQSignalMapper( this, "compAsMapper" ); @@ -196,13 +196,13 @@ void ArkMenu::slotPrepareCompAsMenu() if ( m_urlList.count() == 1 ) { action = new TDEAction( m_name + (*eit), 0, m_compAsMapper, - TQT_SLOT( map() ), actionCollection() ); + TQ_SLOT( map() ), actionCollection() ); } else { ext = KMimeType::mimeType(*mit)->comment(); action = new TDEAction( ext, 0, m_compAsMapper, - TQT_SLOT( map() ), actionCollection() ); + TQ_SLOT( map() ), actionCollection() ); } m_compAsMenu->insert( action ); @@ -219,13 +219,13 @@ void ArkMenu::slotPrepareCompAsMenu() m_extensionList += newExt; } - connect( m_compAsMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( slotCompressAs( int ) ) ); + connect( m_compAsMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( slotCompressAs( int ) ) ); } void ArkMenu::slotPrepareAddToMenu() { - disconnect( m_addToMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPrepareAddToMenu() ) ); + disconnect( m_addToMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPrepareAddToMenu() ) ); if ( m_extensionList.isEmpty() ) // is filled in slotPrepareCompAsMenu @@ -246,7 +246,7 @@ void ArkMenu::slotPrepareAddToMenu() if ( (*uit).endsWith(*mit) ) { action = new TDEAction( *uit, 0, m_addToMapper, - TQT_SLOT( map() ), actionCollection() ); + TQ_SLOT( map() ), actionCollection() ); m_addToMenu->insert( action ); m_addToMapper->setMapping( action, counter ); archive.setPath( *uit ); @@ -255,7 +255,7 @@ void ArkMenu::slotPrepareAddToMenu() break; } } - connect( m_addToMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( slotAddTo( int ) ) ); + connect( m_addToMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( slotAddTo( int ) ) ); } void ArkMenu::compMimeTypes() diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index cd53587..0650424 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -18,11 +18,11 @@ AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList : Plugin( parent, name ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRefresh() ) ); refresher = new TDESelectAction( i18n("&Auto Refresh"), "reload", 0, - this, TQT_SLOT(slotIntervalChanged()), + this, TQ_SLOT(slotIntervalChanged()), actionCollection(), "autorefresh" ); TQStringList sl; sl << i18n("None"); diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index c95dd7e..8d432c9 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -60,104 +60,104 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, actionCollection(), "translatewebpage_nl" ); m_en->insert( new TDEAction( i18n("&Chinese (Simplified)"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_zh") ); m_en->insert( new TDEAction( i18n("Chinese (&Traditional)"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_zhTW") ); m_en->insert( new TDEAction( i18n("&Dutch"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_nl") ); m_en->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_fr") ); m_en->insert( new TDEAction( i18n("&German"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_de") ); m_en->insert( new TDEAction( i18n("&Italian"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_it") ); m_en->insert( new TDEAction( i18n("&Japanese"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_ja") ); m_en->insert( new TDEAction( i18n("&Korean"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_ko") ); m_en->insert( new TDEAction( i18n("&Norwegian"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_no") ); m_en->insert( new TDEAction( i18n("&Portuguese"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_pt") ); m_en->insert( new TDEAction( i18n("&Russian"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_ru") ); m_en->insert( new TDEAction( i18n("&Spanish"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_es") ); m_en->insert( new TDEAction( i18n("T&hai"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "en_th") ); m_fr->insert( new TDEAction( i18n("&Dutch"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_nl") ); m_fr->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_en") ); m_fr->insert( new TDEAction( i18n("&German"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_de") ); m_fr->insert( new TDEAction( i18n("&Italian"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_it") ); m_fr->insert( new TDEAction( i18n("&Portuguese"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_pt") ); m_fr->insert( new TDEAction( i18n("&Spanish"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "fr_es") ); m_de->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "de_en") ); m_de->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "de_fr") ); m_es->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "es_en") ); m_es->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "es_fr") ); m_pt->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "pt_en") ); m_pt->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "pt_fr") ); m_it->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "it_en") ); m_it->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "it_fr") ); m_nl->insert( new TDEAction( i18n("&English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "nl_en") ); m_nl->insert( new TDEAction( i18n("&French"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "nl_fr") ); m_menu->insert( new TDEAction( i18n("&Chinese (Simplified) to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "zh_en") ); m_menu->insert( new TDEAction( i18n("Chinese (&Traditional) to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "zhTW_en") ); m_menu->insert( m_nl ); m_menu->insert( m_en ); @@ -165,14 +165,14 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, m_menu->insert( m_de ); m_menu->insert( m_it ); m_menu->insert( new TDEAction( i18n("&Japanese to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "ja_en") ); m_menu->insert( new TDEAction( i18n("&Korean to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "ko_en") ); m_menu->insert( m_pt ); m_menu->insert( new TDEAction( i18n("&Russian to English"), 0, - this, TQT_SLOT(translateURL()), + this, TQ_SLOT(translateURL()), actionCollection(), "ru_en") ); m_menu->insert( m_es ); m_menu->setEnabled( true ); @@ -181,8 +181,8 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, if ( parent && parent->inherits( "TDEHTMLPart" ) ) { KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent); - connect( part, TQT_SIGNAL(started(TDEIO::Job*)), this, - TQT_SLOT(slotStarted(TDEIO::Job*)) ); + connect( part, TQ_SIGNAL(started(TDEIO::Job*)), this, + TQ_SLOT(slotStarted(TDEIO::Job*)) ); } } diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index 8314e95..a14cff5 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -48,8 +48,8 @@ CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQString m_pCrashesMenu->setDelayed( false ); m_pCrashesMenu->setEnabled( true ); - connect( m_pCrashesMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotAboutToShow() ) ); + connect( m_pCrashesMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotAboutToShow() ) ); } CrashesPlugin::~CrashesPlugin() @@ -62,10 +62,10 @@ void CrashesPlugin::slotAboutToShow() TDECrashBookmarkImporter importer(TDECrashBookmarkImporter::crashBookmarksDir()); - connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), - TQT_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), + TQ_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolderCallback() ) ); + connect( &importer, TQ_SIGNAL( endFolder() ), TQ_SLOT( endFolderCallback() ) ); int count = m_pCrashesMenu->popupMenu()->count(); @@ -89,7 +89,7 @@ void CrashesPlugin::slotAboutToShow() m_crashRangesList.append( CrashRange(firstItem, count) ); m_pCrashesMenu->popupMenu()->insertItem( i18n("All Pages of This Crash"), this, - TQT_SLOT(slotGroupSelected(int)), + TQ_SLOT(slotGroupSelected(int)), 0, crashGroup--); } m_pCrashesMenu->popupMenu()->insertSeparator(); @@ -104,7 +104,7 @@ void CrashesPlugin::slotAboutToShow() } m_pCrashesMenu->popupMenu()->insertItem( str, this, - TQT_SLOT(slotItemSelected(int)), + TQ_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; } @@ -113,13 +113,13 @@ void CrashesPlugin::slotAboutToShow() m_crashRangesList.append( CrashRange(firstItem, count) ); m_pCrashesMenu->popupMenu()->insertItem( i18n("All Pages of This Crash"), this, - TQT_SLOT(slotGroupSelected(int)), + TQ_SLOT(slotGroupSelected(int)), 0, crashGroup--); } } else { m_pCrashesMenu->popupMenu()->insertItem( i18n("No Recovered Crashes"), this, - TQT_SLOT(slotItemSelected(int)), + TQ_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; enable = false; @@ -131,7 +131,7 @@ void CrashesPlugin::slotAboutToShow() } int id =m_pCrashesMenu->popupMenu()->insertItem( i18n("&Clear List of Crashes"), this, - TQT_SLOT(slotClearCrashes()), + TQ_SLOT(slotClearCrashes()), 0, ++count ); m_pCrashesMenu->popupMenu()->setItemEnabled( id, enable); } diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index 5b9a8e7..d70b6cf 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -156,18 +156,18 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, m_pFilterMenu->setDelayed (false); m_pFilterMenu->setWhatsThis(i18n("Allow to filter the currently displayed items by filetype.")); - connect (m_pFilterMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), - TQT_SLOT (slotShowPopup())); - - connect (m_part, TQT_SIGNAL(itemRemoved(const KFileItem*)), - TQT_SLOT( slotItemRemoved (const KFileItem*))); - connect (m_part, TQT_SIGNAL(itemsAdded(const KFileItemList&)), - TQT_SLOT (slotItemsAdded(const KFileItemList&))); - connect (m_part, TQT_SIGNAL(itemsFilteredByMime(const KFileItemList&)), - TQT_SLOT (slotItemsAdded(const KFileItemList&))); - connect (m_part, TQT_SIGNAL(itemsRefresh(const KFileItemList&)), - TQT_SLOT (slotItemsRefresh(const KFileItemList&))); - connect (m_part, TQT_SIGNAL(aboutToOpenURL()), TQT_SLOT(slotOpenURL())); + connect (m_pFilterMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowPopup())); + + connect (m_part, TQ_SIGNAL(itemRemoved(const KFileItem*)), + TQ_SLOT( slotItemRemoved (const KFileItem*))); + connect (m_part, TQ_SIGNAL(itemsAdded(const KFileItemList&)), + TQ_SLOT (slotItemsAdded(const KFileItemList&))); + connect (m_part, TQ_SIGNAL(itemsFilteredByMime(const KFileItemList&)), + TQ_SLOT (slotItemsAdded(const KFileItemList&))); + connect (m_part, TQ_SIGNAL(itemsRefresh(const KFileItemList&)), + TQ_SLOT (slotItemsRefresh(const KFileItemList&))); + connect (m_part, TQ_SIGNAL(aboutToOpenURL()), TQ_SLOT(slotOpenURL())); // add a searchline filter for konqis icons/list views TQHBox *hbox = new TQHBox(m_part->widget()); @@ -197,8 +197,8 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, if ( m_searchWidget ) { TQWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown.")); - connect(clear, TQT_SIGNAL(activated()), m_searchWidget, TQT_SLOT(clear())); - connect(m_searchWidget, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(searchTextChanged(const TQString&))); + connect(clear, TQ_SIGNAL(activated()), m_searchWidget, TQ_SLOT(clear())); + connect(m_searchWidget, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(searchTextChanged(const TQString&))); } KWidgetAction *filterAction = new KWidgetAction(hbox, i18n("Filter Field"), @@ -210,9 +210,9 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, // Really the broken TQt3 iconview should just be modified to include a hidden list; it would make things *so* much easier! m_refreshTimer = new TQTimer( this ); m_reactivateRefreshTimer = new TQTimer( this ); - connect( m_refreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(activateSearch()) ); + connect( m_refreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(activateSearch()) ); m_refreshTimer->start( 200, FALSE ); // 200 millisecond continuous timer - connect( m_reactivateRefreshTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reactivateRefreshTimer()) ); + connect( m_reactivateRefreshTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reactivateRefreshTimer()) ); } @@ -302,7 +302,7 @@ void DirFilterPlugin::slotShowPopup() m_pMimeInfo[it.key()].id = m_pFilterMenu->popupMenu()->insertItem ( SmallIconSet(it.data().iconName), label, - this, TQT_SLOT(slotItemSelected(int)), 0, ++id); + this, TQ_SLOT(slotItemSelected(int)), 0, ++id); if (it.data().useAsFilter) { @@ -333,7 +333,7 @@ void DirFilterPlugin::slotShowPopup() m_pMimeInfo[(*it)].id = m_pFilterMenu->popupMenu()->insertItem ( SmallIconSet(m_pMimeInfo[(*it)].iconName), label, - this, TQT_SLOT(slotItemSelected(int)), 0, ++id); + this, TQ_SLOT(slotItemSelected(int)), 0, ++id); if (m_pMimeInfo[(*it)].useAsFilter) { @@ -345,16 +345,16 @@ void DirFilterPlugin::slotShowPopup() m_pFilterMenu->popupMenu()->insertSeparator (); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Use Multiple Filters"), - this, TQT_SLOT(slotMultipleFilters())); + this, TQ_SLOT(slotMultipleFilters())); m_pFilterMenu->popupMenu()->setItemEnabled (id, enableReset <= 1); m_pFilterMenu->popupMenu()->setItemChecked (id, SessionManager::self()->useMultipleFilters); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Show Count"), this, - TQT_SLOT(slotShowCount())); + TQ_SLOT(slotShowCount())); m_pFilterMenu->popupMenu()->setItemChecked (id, SessionManager::self()->showCount); id = m_pFilterMenu->popupMenu()->insertItem (i18n("Reset"), this, - TQT_SLOT(slotReset())); + TQ_SLOT(slotReset())); m_pFilterMenu->popupMenu()->setItemEnabled (id, enableReset); } @@ -481,7 +481,7 @@ void DirFilterPlugin::slotItemRemoved(const KFileItem* item) m_part->setMimeFilter(filters); SessionManager::self()->save(m_part->url(), filters); // Use 1ms delay to avoid possible race conditions - TQTimer::singleShot(1, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1, this, TQ_SLOT(slotTimeout())); } m_pMimeInfo.remove(mimeType); } @@ -547,7 +547,7 @@ void DirFilterPlugin::slotItemsRefresh(const KFileItemList &list) m_part->setMimeFilter(filters); SessionManager::self()->save(m_part->url(), filters); // Use 1ms delay to avoid possible race conditions - TQTimer::singleShot(1, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1, this, TQ_SLOT(slotTimeout())); } MimeInfoIterator del_mit = it; ++it; diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index f91bfd3..362e5c7 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -77,32 +77,32 @@ DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving* m_rootListView = m_listView; m_pureCheckBox->setChecked(m_bPure); - connect(m_pureCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPureToggled(bool))); + connect(m_pureCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPureToggled(bool))); m_showAttributesCheckBox->setChecked(m_bShowAttributes); - connect(m_showAttributesCheckBox, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(slotShowAttributesToggled(bool))); + connect(m_showAttributesCheckBox, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(slotShowAttributesToggled(bool))); m_highlightHTMLCheckBox->setChecked(m_bHighlightHTML); - connect(m_highlightHTMLCheckBox, TQT_SIGNAL(toggled(bool)), this, - TQT_SLOT(slotHighlightHTMLToggled(bool))); + connect(m_highlightHTMLCheckBox, TQ_SIGNAL(toggled(bool)), this, + TQ_SLOT(slotHighlightHTMLToggled(bool))); - connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)), this, - TQT_SLOT(slotItemClicked(TQListViewItem *))); - connect(m_listView, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int))); - connect(m_listView, TQT_SIGNAL(moved(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)), - TQT_SLOT(slotMovedItems(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &))); + connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem *)), this, + TQ_SLOT(slotItemClicked(TQListViewItem *))); + connect(m_listView, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(showDOMTreeContextMenu(TQListViewItem *, const TQPoint &, int))); + connect(m_listView, TQ_SIGNAL(moved(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &)), + TQ_SLOT(slotMovedItems(TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &, TQPtrList<TQListViewItem> &))); // set up message line messageLinePane->hide(); - connect(messageHideBtn, TQT_SIGNAL(clicked()), TQT_SLOT(hideMessageLine())); - connect(messageListBtn, TQT_SIGNAL(clicked()), mainWindow(), TQT_SLOT(showMessageLog())); + connect(messageHideBtn, TQ_SIGNAL(clicked()), TQ_SLOT(hideMessageLine())); + connect(messageListBtn, TQ_SIGNAL(clicked()), mainWindow(), TQ_SLOT(showMessageLog())); installEventFilter(m_listView); - ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(slotRefreshNode(const DOM::Node &))); - ManipulationCommand::connect(TQT_SIGNAL(structureChanged()), this, TQT_SLOT(refresh())); + ManipulationCommand::connect(TQ_SIGNAL(nodeChanged(const DOM::Node &)), this, TQ_SLOT(slotRefreshNode(const DOM::Node &))); + ManipulationCommand::connect(TQ_SIGNAL(structureChanged()), this, TQ_SLOT(refresh())); initDOMNodeInfo(); @@ -126,7 +126,7 @@ void DOMTreeView::setHtmlPart(TDEHTMLPart *_part) parentWidget()->setCaption( part ? i18n( "DOM Tree for %1" ).arg(part->url().prettyURL()) : i18n("DOM Tree") ); - TQTimer::singleShot(0, this, TQT_SLOT(slotSetHtmlPartDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetHtmlPartDelayed())); } DOMTreeWindow *DOMTreeView::mainWindow() const @@ -436,7 +436,7 @@ void DOMTreeView::slotFindClicked() { if (m_findDialog == 0) { m_findDialog = new KEdFind(this); - connect(m_findDialog, TQT_SIGNAL(search()), this, TQT_SLOT(slotSearch())); + connect(m_findDialog, TQ_SIGNAL(search()), this, TQ_SLOT(slotSearch())); } m_findDialog->show(); } @@ -652,7 +652,7 @@ void DOMTreeView::refresh() m_listView->setUpdatesEnabled(false); slotShowTree(part->document()); - TQTimer::singleShot(0, this, TQT_SLOT(slotRestoreScrollOffset())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestoreScrollOffset())); _refreshed = true; } @@ -805,9 +805,9 @@ void DOMTreeView::disconnectFromTornDownPart() void DOMTreeView::connectToPart() { if (part) { - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, - TQT_SLOT(activateNode(const DOM::Node &))); - connect(part, TQT_SIGNAL(completed()), this, TQT_SLOT(refresh())); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, + TQ_SLOT(activateNode(const DOM::Node &))); + connect(part, TQ_SIGNAL(completed()), this, TQ_SLOT(refresh())); // insert a style rule to indicate activated nodes try { @@ -871,7 +871,7 @@ void DOMTreeView::slotAddElementDlg() { ElementEditDialog dlg(this, "ElementEditDialog", true); - connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot())); + connect(dlg.insBeforeBtn, TQ_SIGNAL(clicked()), &addBefore, TQ_SLOT(slot())); // ### activate when namespaces are supported dlg.elemNamespace->setEnabled(false); @@ -911,7 +911,7 @@ void DOMTreeView::slotAddTextDlg() { TextEditDialog dlg(this, "TextEditDialog", true); - connect(dlg.insBeforeBtn, TQT_SIGNAL(clicked()), &addBefore, TQT_SLOT(slot())); + connect(dlg.insBeforeBtn, TQ_SIGNAL(clicked()), &addBefore, TQ_SLOT(slot())); if (dlg.exec() != TQDialog::Accepted) return; @@ -1003,19 +1003,19 @@ protected: void DOMTreeView::initDOMNodeInfo() { - connect(m_listView, TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_SLOT(initializeOptionsFromListItem(TQListViewItem *))); + connect(m_listView, TQ_SIGNAL(clicked(TQListViewItem *)), + TQ_SLOT(initializeOptionsFromListItem(TQListViewItem *))); - connect(nodeAttributes, TQT_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), - TQT_SLOT(slotItemRenamed(TQListViewItem *, const TQString &, int))); - connect(nodeAttributes, TQT_SIGNAL(executed(TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(slotEditAttribute(TQListViewItem *, const TQPoint &, int))); - connect(nodeAttributes, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int))); + connect(nodeAttributes, TQ_SIGNAL(itemRenamed(TQListViewItem *, const TQString &, int)), + TQ_SLOT(slotItemRenamed(TQListViewItem *, const TQString &, int))); + connect(nodeAttributes, TQ_SIGNAL(executed(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(slotEditAttribute(TQListViewItem *, const TQPoint &, int))); + connect(nodeAttributes, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(showInfoPanelContextMenu(TQListViewItem *, const TQPoint &, int))); - connect(applyContent, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyContent())); + connect(applyContent, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyContent())); - ManipulationCommand::connect(TQT_SIGNAL(nodeChanged(const DOM::Node &)), this, TQT_SLOT(initializeOptionsFromNode(const DOM::Node &))); + ManipulationCommand::connect(TQ_SIGNAL(nodeChanged(const DOM::Node &)), this, TQ_SLOT(initializeOptionsFromNode(const DOM::Node &))); nodeAttributes->setRenameable(0, true); nodeAttributes->setRenameable(1, true); diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index 1b59ba3..e7f6bb0 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -84,16 +84,16 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) // allow the view to change the statusbar and caption #if 0 - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); #endif - connect(view(), TQT_SIGNAL(htmlPartChanged(TDEHTMLPart *)), - TQT_SLOT(slotHtmlPartChanged(TDEHTMLPart *))); + connect(view(), TQ_SIGNAL(htmlPartChanged(TDEHTMLPart *)), + TQ_SLOT(slotHtmlPartChanged(TDEHTMLPart *))); - ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(addMessage(int, const TQString &))); + ManipulationCommand::connect(TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SLOT(addMessage(int, const TQString &))); infopanel_ctx = createInfoPanelAttrContextMenu(); domtree_ctx = createDOMTreeViewContextMenu(); @@ -119,57 +119,57 @@ void DOMTreeWindow::executeAndAddCommand(ManipulationCommand *cmd) void DOMTreeWindow::setupActions() { - KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + KStdAction::close(this, TQ_SLOT(close()), actionCollection()); - KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection())->setEnabled(false); - KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection())->setEnabled(false); - KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection())->setEnabled(false); + KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection())->setEnabled(false); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection())->setEnabled(false); + KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection())->setEnabled(false); m_commandHistory = new KCommandHistory(actionCollection()); - KStdAction::find(this, TQT_SLOT(slotFind()), actionCollection()); + KStdAction::find(this, TQ_SLOT(slotFind()), actionCollection()); - KStdAction::redisplay(m_view, TQT_SLOT(refresh()), actionCollection()); + KStdAction::redisplay(m_view, TQ_SLOT(refresh()), actionCollection()); // toggle manipulation dialog TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"), CTRL+Key_E, actionCollection(), "show_msg_dlg"); - connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog())); + connect(showMsgDlg, TQ_SIGNAL(activated()), TQ_SLOT(showMessageLog())); // TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, -// this, TQT_SLOT(optionsPreferences()), +// this, TQ_SLOT(optionsPreferences()), // actionCollection(), "custom_action"); // actions for the dom tree list view toolbar - KStdAction::up(view(), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); + KStdAction::up(view(), TQ_SLOT(moveToParent()), actionCollection(), "tree_up"); TDEAction *tree_inc_level = new TDEAction(i18n("Expand"), "1rightarrow", CTRL+Key_Greater, view(), - TQT_SLOT(increaseExpansionDepth()), actionCollection(), + TQ_SLOT(increaseExpansionDepth()), actionCollection(), "tree_inc_level"); tree_inc_level->setToolTip(i18n("Increase expansion level")); TDEAction *tree_dec_level = new TDEAction(i18n("Collapse"), "1leftarrow", CTRL+Key_Less, view(), - TQT_SLOT(decreaseExpansionDepth()), actionCollection(), + TQ_SLOT(decreaseExpansionDepth()), actionCollection(), "tree_dec_level"); tree_dec_level->setToolTip(i18n("Decrease expansion level")); // actions for the dom tree list view context menu del_tree = new TDEAction(i18n("&Delete"), "edit-delete", - Key_Delete, view(), TQT_SLOT(deleteNodes()), + Key_Delete, view(), TQ_SLOT(deleteNodes()), actionCollection(), "tree_delete"); del_tree->setToolTip(i18n("Delete nodes")); /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."), "bookmark", TDEShortcut(), view(), - TQT_SLOT(slotAddElementDlg()), actionCollection(), + TQ_SLOT(slotAddElementDlg()), actionCollection(), "tree_add_element"); /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."), - "text", TDEShortcut(), view(), TQT_SLOT(slotAddTextDlg()), + "text", TDEShortcut(), view(), TQ_SLOT(slotAddTextDlg()), actionCollection(), "tree_add_text"); // actions for the info panel attribute list context menu del_attr = new TDEAction(i18n("&Delete"), "edit-delete", - Key_Delete, view(), TQT_SLOT(deleteAttributes()), + Key_Delete, view(), TQ_SLOT(deleteAttributes()), actionCollection(), "attr_delete"); del_attr->setToolTip(i18n("Delete attributes")); @@ -292,7 +292,7 @@ void DOMTreeWindow::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } @@ -339,13 +339,13 @@ void DOMTreeWindow::slotHtmlPartChanged(TDEHTMLPart *p) part_manager = p->manager(); - connect(part_manager, TQT_SIGNAL(activePartChanged(KParts::Part *)), - TQT_SLOT(slotActivePartChanged(KParts::Part *))); - connect(part_manager, TQT_SIGNAL(partRemoved(KParts::Part *)), - TQT_SLOT(slotPartRemoved(KParts::Part *))); + connect(part_manager, TQ_SIGNAL(activePartChanged(KParts::Part *)), + TQ_SLOT(slotActivePartChanged(KParts::Part *))); + connect(part_manager, TQ_SIGNAL(partRemoved(KParts::Part *)), + TQ_SLOT(slotPartRemoved(KParts::Part *))); // set up browser extension connections - connect(p, TQT_SIGNAL(docCreated()), TQT_SLOT(slotClosePart())); + connect(p, TQ_SIGNAL(docCreated()), TQ_SLOT(slotClosePart())); } } diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index d0e8862..958c2ca 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -21,7 +21,7 @@ PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, { (void) new TDEAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, - this, TQT_SLOT(slotShowDOMTree()), + this, TQ_SLOT(slotShowDOMTree()), actionCollection(), "viewdomtree" ); } @@ -41,7 +41,7 @@ void PluginDomtreeviewer::slotShowDOMTree() if (TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(parent())) { m_dialog = new DOMTreeWindow(this); - connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( m_dialog, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); m_dialog->view()->setHtmlPart(part); m_dialog->show(); } diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h index 7f66842..d550cc0 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.h +++ b/konq-plugins/domtreeviewer/signalreceiver.h @@ -32,7 +32,7 @@ * Use as follows: * \code * SignalReceiver sr; - * sr.connect(some_obj, TQT_SIGNAL(someSignal()), TQT_SLOT(slot())); + * sr.connect(some_obj, TQ_SIGNAL(someSignal()), TQ_SLOT(slot())); * <do something with some_obj> ... * if (sr.receivedSignal()) { // yes, signal was received * } diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index 8ad2ed0..fe669cd 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -203,8 +203,8 @@ void FSView::requestUpdate(Inode* i) i->clear(); if (!_sm.scanRunning()) { - TQTimer::singleShot(0, this, TQT_SLOT(doUpdate())); - TQTimer::singleShot(100, this, TQT_SLOT(doRedraw())); + TQTimer::singleShot(0, this, TQ_SLOT(doUpdate())); + TQTimer::singleShot(100, this, TQ_SLOT(doRedraw())); /* start new progress chunk */ _progressPhase = 1; @@ -381,8 +381,8 @@ void FSView::addColorItems(TQPopupMenu* popup, int id) _colorID = id; popup->setCheckable(true); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(colorActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(colorActivated(int))); popup->insertItem(i18n("None"), id); popup->insertItem(i18n("Depth"), id+1); @@ -458,7 +458,7 @@ void FSView::doRedraw() redo = true; if (redo) { - TQTimer::singleShot(500, this, TQT_SLOT(doRedraw())); + TQTimer::singleShot(500, this, TQ_SLOT(doRedraw())); redrawCounter++; } } @@ -532,7 +532,7 @@ void FSView::doUpdate() } if (_sm.scanRunning()) - TQTimer::singleShot(0, this, TQT_SLOT(doUpdate())); + TQTimer::singleShot(0, this, TQ_SLOT(doUpdate())); else emit completed(_dirsFinished); } diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 4f7b592..86f7f16 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -57,8 +57,8 @@ FSJob::FSJob(FSView* v) : TDEIO::Job(false) { _view = v; - TQObject::connect(v, TQT_SIGNAL(progress(int,int,const TQString&)), - this, TQT_SLOT(progressSlot(int,int,const TQString&))); + TQObject::connect(v, TQ_SIGNAL(progress(int,int,const TQString&)), + this, TQ_SLOT(progressSlot(int,int,const TQString&))); } void FSJob::kill(bool quietly) @@ -129,40 +129,40 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, TDEAction* action; action = new TDEAction( i18n( "&FSView Manual" ), "fsview", - TDEShortcut(), this, TQT_SLOT(showHelp()), + TDEShortcut(), this, TQ_SLOT(showHelp()), actionCollection(), "help_fsview" ); action->setToolTip(i18n("Show FSView manual")); action->setWhatsThis(i18n("Opens the help browser with the " "FSView documentation")); - TQObject::connect (_visMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), - TQT_SLOT (slotShowVisMenu())); - TQObject::connect (_areaMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), - TQT_SLOT (slotShowAreaMenu())); - TQObject::connect (_depthMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), - TQT_SLOT (slotShowDepthMenu())); - TQObject::connect (_colorMenu->popupMenu(), TQT_SIGNAL (aboutToShow()), - TQT_SLOT (slotShowColorMenu())); + TQObject::connect (_visMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowVisMenu())); + TQObject::connect (_areaMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowAreaMenu())); + TQObject::connect (_depthMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowDepthMenu())); + TQObject::connect (_colorMenu->popupMenu(), TQ_SIGNAL (aboutToShow()), + TQ_SLOT (slotShowColorMenu())); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), - TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), + TQ_SLOT( slotSettingsChanged(int) ) ); - TQObject::connect(_view,TQT_SIGNAL(returnPressed(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); - TQObject::connect(_view,TQT_SIGNAL(selectionChanged()), - _ext,TQT_SLOT(updateActions())); + TQObject::connect(_view,TQ_SIGNAL(returnPressed(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQ_SIGNAL(selectionChanged()), + _ext,TQ_SLOT(updateActions())); TQObject::connect(_view, - TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), + TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), _ext, - TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); + TQ_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); - TQObject::connect(_view, TQT_SIGNAL(started()), this, TQT_SLOT(startedSlot())); - TQObject::connect(_view, TQT_SIGNAL(completed(int)), - this, TQT_SLOT(completedSlot(int))); + TQObject::connect(_view, TQ_SIGNAL(started()), this, TQ_SLOT(startedSlot())); + TQObject::connect(_view, TQ_SIGNAL(completed(int)), + this, TQ_SLOT(completedSlot(int))); - TQTimer::singleShot(1, this, TQT_SLOT(showInfo())); + TQTimer::singleShot(1, this, TQ_SLOT(showInfo())); setXMLFile( "fsview_part.rc" ); } @@ -180,17 +180,17 @@ void FSViewPart::slotSettingsChanged(int category) { if (category != TDEApplication::SETTINGS_MOUSE) return; - TQObject::disconnect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); - TQObject::disconnect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::disconnect(_view,TQ_SIGNAL(clicked(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); + TQObject::disconnect(_view,TQ_SIGNAL(doubleClicked(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); if (TDEGlobalSettings::singleClick()) - TQObject::connect(_view,TQT_SIGNAL(clicked(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQ_SIGNAL(clicked(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); else - TQObject::connect(_view,TQT_SIGNAL(doubleClicked(TreeMapItem*)), - _ext,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(_view,TQ_SIGNAL(doubleClicked(TreeMapItem*)), + _ext,TQ_SLOT(selected(TreeMapItem*))); } void FSViewPart::showInfo() @@ -331,14 +331,14 @@ void FSViewBrowserExtension::del() // - search for the KonqOperations child of _view (name "KonqOperations") // - connect to destroyed signal KonqOperations* o = (KonqOperations*) _view->child("KonqOperations"); - if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh())); + if (o) connect(o, TQ_SIGNAL(destroyed()), TQ_SLOT(refresh())); } void FSViewBrowserExtension::trash() { KonqOperations::del(_view, KonqOperations::TRASH, _view->selectedUrls()); KonqOperations* o = (KonqOperations*) _view->child("KonqOperations"); - if (o) connect(o, TQT_SIGNAL(destroyed()), TQT_SLOT(refresh())); + if (o) connect(o, TQ_SIGNAL(destroyed()), TQ_SLOT(refresh())); } void FSViewBrowserExtension::copySelection( bool move ) diff --git a/konq-plugins/fsview/main.cpp b/konq-plugins/fsview/main.cpp index 1f6f268..3beb941 100644 --- a/konq-plugins/fsview/main.cpp +++ b/konq-plugins/fsview/main.cpp @@ -40,17 +40,17 @@ int main(int argc, char* argv[]) // TreeMap Widget as toplevel window FSView w(new Inode()); - TQObject::connect(&w,TQT_SIGNAL(clicked(TreeMapItem*)), - &w,TQT_SLOT(selected(TreeMapItem*))); - TQObject::connect(&w,TQT_SIGNAL(returnPressed(TreeMapItem*)), - &w,TQT_SLOT(selected(TreeMapItem*))); + TQObject::connect(&w,TQ_SIGNAL(clicked(TreeMapItem*)), + &w,TQ_SLOT(selected(TreeMapItem*))); + TQObject::connect(&w,TQ_SIGNAL(returnPressed(TreeMapItem*)), + &w,TQ_SLOT(selected(TreeMapItem*))); TQObject::connect(&w, - TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), - &w,TQT_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); + TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint&)), + &w,TQ_SLOT(contextMenu(TreeMapItem*, const TQPoint&))); w.setPath(path); w.show(); - a.connect( &a, TQT_SIGNAL( lastWindowClosed() ), &w, TQT_SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &w, TQ_SLOT( quit() ) ); return a.exec(); } diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index 97041a9..bff8641 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -1768,7 +1768,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) + if ( receivers( TQ_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { @@ -2774,8 +2774,8 @@ void TreeMapWidget::addSplitDirectionItems(TQPopupMenu* popup, int id) _splitID = id; popup->setCheckable(true); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(splitActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(splitActivated(int))); popup->insertItem(i18n("Recursive Bisection"), id); popup->insertItem(i18n("Columns"), id+1); @@ -2833,10 +2833,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) TQPopupMenu* bpopup = new TQPopupMenu(); bpopup->setCheckable(true); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); - connect(bpopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); + connect(bpopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); TQPopupMenu* spopup = new TQPopupMenu(); addSplitDirectionItems(spopup, id+100); @@ -2896,8 +2896,8 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) tpopup->setItemChecked(id+7,_attr[f].pos == DrawParams::BottomCenter); tpopup->setItemChecked(id+8,_attr[f].pos == DrawParams::BottomRight); - connect(tpopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); + connect(tpopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); } } @@ -2921,8 +2921,8 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, _selectionID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(selectionActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(selectionActivated(int))); while (i) { TQString name = i->text(0); @@ -2952,8 +2952,8 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, { _fieldStopID = id; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(fieldStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(fieldStopActivated(int))); popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); @@ -3002,8 +3002,8 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, _areaStopID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(areaStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(areaStopActivated(int))); bool foundArea = false; @@ -3067,8 +3067,8 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, _depthStopID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(depthStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(depthStopActivated(int))); bool foundDepth = false; diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index e86dd57..b6be06d 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -191,8 +191,8 @@ void KIGPDialog::setupDirectoryPage(const TQString& path) { m_imageNameReq = new KURLRequester(path + "images.html", page); label->setBuddy( m_imageNameReq ); dvlay->addWidget(m_imageNameReq); - connect( m_imageNameReq, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(imageUrlChanged(const TQString&)) ); + connect( m_imageNameReq, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(imageUrlChanged(const TQString&)) ); TQWhatsThis::add( m_imageNameReq, whatsThis ); const bool recurseSubDir = m_config->readBoolEntry("RecurseSubDirectories", false); @@ -215,8 +215,8 @@ void KIGPDialog::setupDirectoryPage(const TQString& path) { TQWhatsThis::add( m_recursionLevel, whatsThis ); - connect(m_recurseSubDir, TQT_SIGNAL( toggled(bool) ), - m_recursionLevel, TQT_SLOT( setEnabled(bool) ) ); + connect(m_recurseSubDir, TQ_SIGNAL( toggled(bool) ), + m_recursionLevel, TQ_SLOT( setEnabled(bool) ) ); dvlay->addWidget(m_recurseSubDir); dvlay->addWidget(m_recursionLevel); @@ -262,10 +262,10 @@ void KIGPDialog::setupDirectoryPage(const TQString& path) { dvlay->addWidget(m_commentFileReq); TQWhatsThis::add( m_commentFileReq, whatsThis ); - connect(m_useCommentFile, TQT_SIGNAL(toggled(bool)), - label, TQT_SLOT(setEnabled(bool))); - connect(m_useCommentFile, TQT_SIGNAL(toggled(bool)), - m_commentFileReq, TQT_SLOT(setEnabled(bool))); + connect(m_useCommentFile, TQ_SIGNAL(toggled(bool)), + label, TQ_SLOT(setEnabled(bool))); + connect(m_useCommentFile, TQ_SIGNAL(toggled(bool)), + m_commentFileReq, TQ_SLOT(setEnabled(bool))); dvlay->addStretch(1); } @@ -317,8 +317,8 @@ void KIGPDialog::setupThumbnailPage(const TQString& path) { m_colorDepth->setEnabled(colorDepthSet); hlay4->addWidget( m_colorDepth ); - connect(m_colorDepthSet, TQT_SIGNAL( toggled(bool) ), - m_colorDepth, TQT_SLOT( setEnabled(bool) ) ); + connect(m_colorDepthSet, TQ_SIGNAL( toggled(bool) ), + m_colorDepth, TQ_SLOT( setEnabled(bool) ) ); vlay->addStretch(1); diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index a4d255c..6d4b6f1 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -52,7 +52,7 @@ KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQ : KParts::Plugin( parent, name ), m_commentMap(0) { new TDEAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, - TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); + TQ_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); } void KImGalleryPlugin::slotExecute() @@ -82,7 +82,7 @@ void KImGalleryPlugin::slotExecute() KURL url(m_configDlg->getImageName()); if ( !url.isEmpty() && url.isValid()) { m_progressDlg = new TQProgressDialog(m_part->widget(), "progressDlg", true ); - TQObject::connect(m_progressDlg, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( slotCancelled() ) ); + TQObject::connect(m_progressDlg, TQ_SIGNAL( cancelled() ), this, TQ_SLOT( slotCancelled() ) ); m_progressDlg->setLabelText( i18n("Creating thumbnails") ); m_progressDlg->setCancelButton(new KPushButton(KStdGuiItem::cancel(),m_progressDlg)); diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index c32d46e..89a6c4b 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -47,11 +47,11 @@ KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) topLayout->add(dialog); topLayout->addStretch(); - connect( dialog->m_sbCopy, TQT_SIGNAL(valueChanged(int) ), TQT_SLOT(configChanged() ) ); - connect( dialog->m_sbMove, TQT_SIGNAL(valueChanged(int) ), TQT_SLOT(configChanged() ) ); - connect( dialog->pbCopyClear, TQT_SIGNAL(pressed() ), TQT_SLOT(slotClearCopyCache() ) ); - connect( dialog->pbMoveClear, TQT_SIGNAL(pressed() ), TQT_SLOT(slotClearMoveCache() ) ); - connect( dialog->m_chkShow, TQT_SIGNAL(clicked() ), TQT_SLOT(slotShowToggled() ) ); + connect( dialog->m_sbCopy, TQ_SIGNAL(valueChanged(int) ), TQ_SLOT(configChanged() ) ); + connect( dialog->m_sbMove, TQ_SIGNAL(valueChanged(int) ), TQ_SLOT(configChanged() ) ); + connect( dialog->pbCopyClear, TQ_SIGNAL(pressed() ), TQ_SLOT(slotClearCopyCache() ) ); + connect( dialog->pbMoveClear, TQ_SIGNAL(pressed() ), TQ_SLOT(slotClearMoveCache() ) ); + connect( dialog->m_chkShow, TQ_SIGNAL(clicked() ), TQ_SLOT(slotShowToggled() ) ); load(); } diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 6b98470..beba6d0 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -44,13 +44,13 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, { children.setAutoDelete( true ); initIconMap( ); - connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); - connect( this, TQT_SIGNAL( aboutToHide( ) ), this, TQT_SLOT( slotAboutToHide( ) ) ); + connect( this, TQ_SIGNAL( aboutToShow( ) ), this, TQ_SLOT( slotAboutToShow( ) ) ); + connect( this, TQ_SIGNAL( aboutToHide( ) ), this, TQ_SLOT( slotAboutToHide( ) ) ); children.clear(); // just in case TQFileInfo fileInfo(path); if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) - action = new TDEAction(name, 0, this, TQT_SLOT(new_slot( ) ), this); + action = new TDEAction(name, 0, this, TQ_SLOT(new_slot( ) ), this); } KDirMenu::~KDirMenu( ) { delete action; @@ -81,8 +81,8 @@ void KDirMenu::insert( KDirMenu *submenu, const TQString &_path ) { else insertItem( folder, escapedPath.replace( "&", "&&" ), submenu ); children.append( submenu ); - connect(submenu, TQT_SIGNAL(fileChosen(const TQString &)), - this, TQT_SLOT(slotFileSelected(const TQString &))); + connect(submenu, TQ_SIGNAL(fileChosen(const TQString &)), + this, TQ_SLOT(slotFileSelected(const TQString &))); } void KDirMenu::slotAboutToShow( ) { diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index 9b3c1df..a32736f 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -40,8 +40,8 @@ KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy ) #ifdef KIMCONTACTS_USE_KABC m_addressBook = TDEABC::StdAddressBook::self( false ); #endif - connect( this, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotItemActivated( int ) ) ); - connect( this, TQT_SIGNAL( aboutToShow( ) ), this, TQT_SLOT( slotAboutToShow( ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotItemActivated( int ) ) ); + connect( this, TQ_SIGNAL( aboutToShow( ) ), this, TQ_SLOT( slotAboutToShow( ) ) ); } KIMContactMenu::~KIMContactMenu() diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index aaec725..8346a0a 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -55,8 +55,8 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home); dirList << u.path(); - connect(m_home, TQT_SIGNAL(fileChosen(const TQString &)), - TQT_SLOT(slotFileChosen(const TQString &) ) ); + connect(m_home, TQ_SIGNAL(fileChosen(const TQString &)), + TQ_SLOT(slotFileChosen(const TQString &) ) ); } u.setPath(TQDir::rootDirPath()); @@ -66,8 +66,8 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root); dirList << u.path(); - connect(m_root, TQT_SIGNAL(fileChosen(const TQString &)), - TQT_SLOT(slotFileChosen(const TQString &) ) ); + connect(m_root, TQ_SIGNAL(fileChosen(const TQString &)), + TQ_SLOT(slotFileChosen(const TQString &) ) ); } TQString confDir = TQDir::rootDirPath()+ "etc"; @@ -80,8 +80,8 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, i18n("&System Configuration"), m_etc); dirList << confDir; - connect(m_etc , TQT_SIGNAL(fileChosen(const TQString &)), - TQT_SLOT(slotFileChosen(const TQString &) ) ); + connect(m_etc , TQ_SIGNAL(fileChosen(const TQString &)), + TQ_SLOT(slotFileChosen(const TQString &) ) ); } if ( url.isLocalFile() @@ -97,21 +97,21 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ), m_current ); - connect(m_current, TQT_SIGNAL(fileChosen(const TQString &)), - TQT_SLOT(slotFileChosen(const TQString &) ) ); + connect(m_current, TQ_SIGNAL(fileChosen(const TQString &)), + TQ_SLOT(slotFileChosen(const TQString &) ) ); } if ( imProxy ) { m_contacts = new KIMContactMenu( parent, imProxy ); int item = insertItem( SmallIconSet( "preferences-desktop-personal" ), i18n( "C&ontact" ), m_contacts ); - connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) ); + connect ( m_contacts, TQ_SIGNAL( contactChosen( const TQString &) ), TQ_SIGNAL( contactChosen( const TQString & ) ) ); if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() ) setItemEnabled( item, false ); } - m_browse = new TDEAction(i18n("&Browse..."), 0, this, TQT_SLOT(slotBrowse()), this ); + m_browse = new TDEAction(i18n("&Browse..."), 0, this, TQ_SLOT(slotBrowse()), this ); m_browse->plug(this); // read the last chosen dirs // first set the group according to our parameter @@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, continue; } TQString escapedDir = *it; - TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, this, TQT_SLOT(slotFastPath()), this); + TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, this, TQ_SLOT(slotFastPath()), this); action->plug(this ); actions.append( action ); ++it; diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp index 6545366..b58acc3 100644 --- a/konq-plugins/kuick/kuick_plugin.cpp +++ b/konq-plugins/kuick/kuick_plugin.cpp @@ -42,11 +42,11 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString popup= popupmenu ; meta_copy_mmu = 0L; meta_move_mmu = 0L; - my_action = new TDEAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); + my_action = new TDEAction( "kuick_plugin", 0, this, TQ_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); addAction( my_action ); addSeparator(); //popupmenu->addMerge(); - connect( popup, TQT_SIGNAL(aboutToShow() ), this, TQT_SLOT(slotPrepareMenu( ) ) ); + connect( popup, TQ_SIGNAL(aboutToShow() ), this, TQ_SLOT(slotPrepareMenu( ) ) ); m_imProxy = KIMProxy::instance( kapp->dcopClient() ); } KTestMenu::~KTestMenu( ){ @@ -95,18 +95,18 @@ void KTestMenu::slotPrepareMenu( ) { // now it's time to set up the menu... meta_copy_mmu = new KMetaMenu(popup, popup->url(), i18n("&Copy Here") , "kuick-copy", m_imProxy ); popup->insertItem(i18n("Copy To"), meta_copy_mmu, -1, i ); - connect( meta_copy_mmu, TQT_SIGNAL(fileChosen(const TQString &) ), - TQT_SLOT(slotStartCopyJob(const TQString & )) ); + connect( meta_copy_mmu, TQ_SIGNAL(fileChosen(const TQString &) ), + TQ_SLOT(slotStartCopyJob(const TQString & )) ); - connect( meta_copy_mmu, TQT_SIGNAL( contactChosen( const TQString & ) ), - TQT_SLOT( slotFileTransfer( const TQString & )) ); + connect( meta_copy_mmu, TQ_SIGNAL( contactChosen( const TQString & ) ), + TQ_SLOT( slotFileTransfer( const TQString & )) ); if( popup->protocolInfo().supportsMoving() ){ meta_move_mmu = new KMetaMenu(popup, popup->url(), i18n("&Move Here"), "kuick-move"); popup->insertItem(i18n("Move To"), meta_move_mmu, -1, i+1 ); - connect( meta_move_mmu, TQT_SIGNAL(fileChosen(const TQString &) ), - TQT_SLOT(slotStartMoveJob(const TQString & )) ); + connect( meta_move_mmu, TQ_SIGNAL(fileChosen(const TQString &) ), + TQ_SLOT(slotStartMoveJob(const TQString & )) ); } break; } diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index b0ce649..1a81aa5 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -50,14 +50,14 @@ KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) kdDebug() << "couldn't get part" << endl; return; } - TQTimer::singleShot(0, this, TQT_SLOT(waitPartToLoad())); + TQTimer::singleShot(0, this, TQ_SLOT(waitPartToLoad())); } void KonqMFIcon::waitPartToLoad() { - connect(m_part, TQT_SIGNAL(completed()), this, TQT_SLOT(addMFIcon())); - connect(m_part, TQT_SIGNAL(completed(bool)), this, TQT_SLOT(addMFIcon())); // to make pages with metarefresh to work - connect(m_part, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(removeMFIcon())); + connect(m_part, TQ_SIGNAL(completed()), this, TQ_SLOT(addMFIcon())); + connect(m_part, TQ_SIGNAL(completed(bool)), this, TQ_SLOT(addMFIcon())); // to make pages with metarefresh to work + connect(m_part, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(removeMFIcon())); } @@ -247,7 +247,7 @@ void KonqMFIcon::contextMenu() { delete m_menu; m_menu = new TDEPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Microformats")); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(addMF(int))); int id = 0; for (TQValueList<TQPair<TQString, TQString> >::ConstIterator it = _events.begin(); it != _events.end(); ++it) { m_menu->insertItem(SmallIcon("bookmark_add"), (*it).first, id); @@ -258,7 +258,7 @@ void KonqMFIcon::contextMenu() { id++; } m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Import All Microformats"), this, TQT_SLOT(addMFs()), 0, 50000 ); + m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Import All Microformats"), this, TQ_SLOT(addMFs()), 0, 50000 ); m_menu->popup(TQCursor::pos()); } @@ -285,7 +285,7 @@ void KonqMFIcon::addMFIcon() { m_statusBarEx->addStatusBarItem(m_mfIcon, 0, true); - connect(m_mfIcon, TQT_SIGNAL(leftClickedURL()), this, TQT_SLOT(contextMenu())); + connect(m_mfIcon, TQ_SIGNAL(leftClickedURL()), this, TQ_SLOT(contextMenu())); } diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 9b5610f..e1e439c 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -51,8 +51,8 @@ MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStr m_pMinitoolsMenu->setDelayed(false); m_pMinitoolsMenu->setEnabled(true); - connect(m_pMinitoolsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotAboutToShow() )); + connect(m_pMinitoolsMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotAboutToShow() )); } MinitoolsPlugin::~MinitoolsPlugin() { @@ -63,10 +63,10 @@ void MinitoolsPlugin::slotAboutToShow() { m_minitoolsList.clear(); KXBELBookmarkImporterImpl importer; - connect(&importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), - TQT_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) )); - connect(&importer, TQT_SIGNAL( endFolder() ), - TQT_SLOT( endFolderCallback() )); + connect(&importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString &) ), + TQ_SLOT( newBookmarkCallback( const TQString &, const TQCString &, const TQString & ) )); + connect(&importer, TQ_SIGNAL( endFolder() ), + TQ_SLOT( endFolderCallback() )); TQString filename = minitoolsFilename(true); if (!filename.isEmpty() && TQFile::exists(filename)) { importer.setFilename(filename); @@ -102,7 +102,7 @@ void MinitoolsPlugin::slotAboutToShow() { } m_pMinitoolsMenu->popupMenu()->insertItem( str, this, - TQT_SLOT(slotItemSelected(int)), + TQ_SLOT(slotItemSelected(int)), 0, ++count ); gotSep = false; } @@ -116,7 +116,7 @@ void MinitoolsPlugin::slotAboutToShow() { m_pMinitoolsMenu->popupMenu() ->insertItem(i18n("&Edit Minitools"), - this, TQT_SLOT(slotEditBookmarks()), + this, TQ_SLOT(slotEditBookmarks()), 0, ++count ); } @@ -147,10 +147,10 @@ void MinitoolsPlugin::slotItemSelected(int id) { return; TQString tmp = m_minitoolsList[id-1].second; TQString script = KURL::decode_string(tmp.right(tmp.length() - 11)); // sizeof("javascript:") - connect(this, TQT_SIGNAL( executeScript(const TQString &) ), - m_part, TQT_SLOT( executeScript(const TQString &) )); + connect(this, TQ_SIGNAL( executeScript(const TQString &) ), + m_part, TQ_SLOT( executeScript(const TQString &) )); emit executeScript(script); - disconnect(this, TQT_SIGNAL( executeScript(const TQString &) ), 0, 0); + disconnect(this, TQ_SIGNAL( executeScript(const TQString &) ), 0, 0); } #include "minitoolsplugin.moc" diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 8b646c3..48e3f95 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -70,28 +70,28 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin setInstance(RelLinksFactory::instance()); // ------------- Navigation links -------------- - tdeaction_map["home"] = new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" ); + tdeaction_map["home"] = new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQ_SLOT(goHome()), actionCollection(), "rellinks_top" ); tdeaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") ); - tdeaction_map["up"] = new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); + tdeaction_map["up"] = new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQ_SLOT(goUp()), actionCollection(), "rellinks_up" ); tdeaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") ); bool isRTL = TQApplication::reverseLayout(); - tdeaction_map["begin"] = new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" ); + tdeaction_map["begin"] = new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this, TQ_SLOT(goFirst()), actionCollection(), "rellinks_first" ); tdeaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") ); - tdeaction_map["prev"] = new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); + tdeaction_map["prev"] = new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this, TQ_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); tdeaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") ); - tdeaction_map["next"] = new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" ); + tdeaction_map["next"] = new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this, TQ_SLOT(goNext()), actionCollection(), "rellinks_next" ); tdeaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") ); - tdeaction_map["last"] = new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" ); + tdeaction_map["last"] = new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this, TQ_SLOT(goLast()), actionCollection(), "rellinks_last" ); tdeaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") ); // ------------ special items -------------------------- - tdeaction_map["search"] = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); + tdeaction_map["search"] = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQ_SLOT(goSearch()), actionCollection(), "rellinks_search" ); tdeaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") ); // ------------ Document structure links --------------- @@ -99,39 +99,39 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") ); m_document->setDelayed(false); - tdeaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" ); + tdeaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"), this, TQ_SLOT(goContents()), actionCollection(), "rellinks_toc" ); m_document->insert(tdeaction_map["contents"]); tdeaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") ); tdeactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "document-open", actionCollection(), "rellinks_chapters" ); m_document->insert(tdeactionmenu_map["chapter"]); - connect( tdeactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int))); + connect( tdeactionmenu_map["chapter"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT(goChapter(int))); tdeactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") ); tdeactionmenu_map["chapter"]->setDelayed(false); tdeactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "document-open", actionCollection(), "rellinks_sections" ); m_document->insert(tdeactionmenu_map["section"]); - connect( tdeactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) ); + connect( tdeactionmenu_map["section"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goSection( int ) ) ); tdeactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") ); tdeactionmenu_map["section"]->setDelayed(false); tdeactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "document-open", actionCollection(), "rellinks_subsections" ); m_document->insert(tdeactionmenu_map["subsection"]); - connect( tdeactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) ); + connect( tdeactionmenu_map["subsection"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goSubsection( int ) ) ); tdeactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") ); tdeactionmenu_map["subsection"]->setDelayed(false); tdeactionmenu_map["appendix"] = new TDEActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" ); m_document->insert(tdeactionmenu_map["appendix"]); - connect( tdeactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) ); + connect( tdeactionmenu_map["appendix"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goAppendix( int ) ) ); tdeactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") ); tdeactionmenu_map["appendix"]->setDelayed(false); - tdeaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); + tdeaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQ_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); m_document->insert(tdeaction_map["glossary"]); tdeaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") ); - tdeaction_map["index"] = new TDEAction( i18n("&Index"), "application-vnd.tde.info", TDEShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" ); + tdeaction_map["index"] = new TDEAction( i18n("&Index"), "application-vnd.tde.info", TDEShortcut("Ctrl+Alt+I"), this, TQ_SLOT(goIndex()), actionCollection(), "rellinks_index" ); m_document->insert(tdeaction_map["index"]); tdeaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") ); @@ -140,35 +140,35 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") ); m_more->setDelayed(false); - tdeaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" ); + tdeaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQ_SLOT(goHelp()), actionCollection(), "rellinks_help" ); m_more->insert(tdeaction_map["help"]); tdeaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") ); - tdeaction_map["author"] = new TDEAction( i18n("&Authors"), "mail-message-new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); + tdeaction_map["author"] = new TDEAction( i18n("&Authors"), "mail-message-new", TDEShortcut("Ctrl+Alt+A"), this, TQ_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); m_more->insert(tdeaction_map["author"]); tdeaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") ); - tdeaction_map["copyright"] = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); + tdeaction_map["copyright"] = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQ_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); m_more->insert(tdeaction_map["copyright"]); tdeaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") ); tdeactionmenu_map["bookmark"] = new TDEActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" ); m_more->insert(tdeactionmenu_map["bookmark"]); tdeactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") ); - connect( tdeactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) ); + connect( tdeactionmenu_map["bookmark"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goBookmark( int ) ) ); tdeactionmenu_map["bookmark"]->setDelayed(false); tdeactionmenu_map["alternate"] = new TDEActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" ); m_more->insert(tdeactionmenu_map["alternate"]); tdeactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") ); - connect( tdeactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) ); + connect( tdeactionmenu_map["alternate"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goAlternate( int ) ) ); tdeactionmenu_map["alternate"]->setDelayed(false); // Unclassified menu m_links = new TDEActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" ); tdeactionmenu_map["unclassified"] = m_links; tdeactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") ); - connect( tdeactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) ); + connect( tdeactionmenu_map["unclassified"]->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( goAllElements( int ) ) ); tdeactionmenu_map["unclassified"]->setDelayed(false); // We unactivate all the possible actions @@ -179,15 +179,15 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin if (!m_part) return; - connect( m_part, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( newDocument() ) ); - connect( m_part, TQT_SIGNAL( completed() ), this, TQT_SLOT( loadingFinished() ) ); + connect( m_part, TQ_SIGNAL( docCreated() ), this, TQ_SLOT( newDocument() ) ); + connect( m_part, TQ_SIGNAL( completed() ), this, TQ_SLOT( loadingFinished() ) ); // create polling timer and connect it m_pollTimer = new TQTimer(this, "polling timer"); - connect( m_pollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateToolbar() ) ); + connect( m_pollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateToolbar() ) ); // delay access to our part's members until it has finished its initialisation - TQTimer::singleShot(0, this, TQT_SLOT(delayedSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(delayedSetup())); } /** Destructor */ diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index 7e53571..741dc18 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -88,13 +88,13 @@ RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, m_rSync = new KRsync(parent, name); - connect (m_part, TQT_SIGNAL(aboutToOpenURL()), TQT_SLOT(slotOpenURL())); + connect (m_part, TQ_SIGNAL(aboutToOpenURL()), TQ_SLOT(slotOpenURL())); - connect(m_pSyncNow, TQT_SIGNAL(activated()), this, TQT_SLOT(slotSync())); - connect(m_pSyncSetup, TQT_SIGNAL(activated()), this, TQT_SLOT(slotSetup())); + connect(m_pSyncNow, TQ_SIGNAL(activated()), this, TQ_SLOT(slotSync())); + connect(m_pSyncSetup, TQ_SIGNAL(activated()), this, TQ_SLOT(slotSetup())); - connect(m_rSync, TQT_SIGNAL(setupDone()), this, TQT_SLOT(slotSetupDone())); - connect(m_rSync, TQT_SIGNAL(transferDone()), this, TQT_SLOT(slotTransferDone())); + connect(m_rSync, TQ_SIGNAL(setupDone()), this, TQ_SLOT(slotSetupDone())); + connect(m_rSync, TQ_SIGNAL(transferDone()), this, TQ_SLOT(slotTransferDone())); m_rSync->loadSettings(); } diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index 65eba0b..ab20a38 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -81,15 +81,15 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, 0, 0, actionCollection(), "toolbar_search_bar"); m_searchComboAction->setShortcutConfigurable(false); - connect(m_searchCombo, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(startSearch(const TQString &))); - connect(m_searchCombo, TQT_SIGNAL(iconClicked()), TQT_SLOT(showSelectionMenu())); + connect(m_searchCombo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(startSearch(const TQString &))); + connect(m_searchCombo, TQ_SIGNAL(iconClicked()), TQ_SLOT(showSelectionMenu())); TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>" "Enter a search term. Click on the icon to change search mode or provider.")); new TDEAction( i18n( "Focus Searchbar" ), CTRL+Key_S, - this, TQT_SLOT(focusSearchbar()), + this, TQ_SLOT(focusSearchbar()), actionCollection(), "focus_search_bar"); configurationChanged(); @@ -100,15 +100,15 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager")); if (partMan) { - connect(partMan, TQT_SIGNAL(activePartChanged(KParts::Part*)), - TQT_SLOT (partChanged (KParts::Part*))); + connect(partMan, TQ_SIGNAL(activePartChanged(KParts::Part*)), + TQ_SLOT (partChanged (KParts::Part*))); partChanged(partMan->activePart()); } - connect(this, TQT_SIGNAL(gsCompleteDelayed()), TQT_SLOT(gsStartDelay())); - connect(&m_gsTimer, TQT_SIGNAL(timeout()), TQT_SLOT(gsMakeCompletionList())); - connect(m_searchCombo->listBox(), TQT_SIGNAL(highlighted(const TQString&)), TQT_SLOT(gsSetCompletedText(const TQString&))); - connect(m_searchCombo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(gsPutTextInBox(const TQString&))); + connect(this, TQ_SIGNAL(gsCompleteDelayed()), TQ_SLOT(gsStartDelay())); + connect(&m_gsTimer, TQ_SIGNAL(timeout()), TQ_SLOT(gsMakeCompletionList())); + connect(m_searchCombo->listBox(), TQ_SIGNAL(highlighted(const TQString&)), TQ_SLOT(gsSetCompletedText(const TQString&))); + connect(m_searchCombo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(gsPutTextInBox(const TQString&))); } SearchBarPlugin::~SearchBarPlugin() @@ -382,7 +382,7 @@ void SearchBarPlugin::showSelectionMenu() list << "kurisearchfilter" << "kuriikwsfilter"; m_popupMenu = new TQPopupMenu(m_searchCombo, "search selection menu"); - m_popupMenu->insertItem(SmallIcon("edit-find"), i18n("Find in This Page"), this, TQT_SLOT(useFindInThisPage()), 0, 999); + m_popupMenu->insertItem(SmallIcon("edit-find"), i18n("Find in This Page"), this, TQ_SLOT(useFindInThisPage()), 0, 999); m_popupMenu->insertSeparator(); int i=-1; @@ -413,14 +413,14 @@ void SearchBarPlugin::showSelectionMenu() } m_popupMenu->insertSeparator(); - m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQT_SLOT(selectGoogleSuggestMode()), m_popupMenu); + m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, this, TQ_SLOT(selectGoogleSuggestMode()), m_popupMenu); TQStringList google_modes; google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never"); m_googleMenu->setItems(google_modes); m_googleMenu->plug(m_popupMenu); m_popupMenu->insertItem(SmallIcon("enhanced_browsing"), i18n("Select Search Engines..."), - this, TQT_SLOT(selectSearchEngines()), 0, 1000); - connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(useSearchProvider(int))); + this, TQ_SLOT(selectSearchEngines()), 0, 1000); + connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(useSearchProvider(int))); } m_googleMenu->setCurrentItem(m_googleMode); m_popupMenu->popup(m_searchCombo->mapToGlobal(TQPoint(0, m_searchCombo->height() + 1)), 0); @@ -450,7 +450,7 @@ void SearchBarPlugin::selectSearchEngines() *process << "tdecmshell" << "ebrowsing"; - connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(searchEnginesSelected(TDEProcess *))); + connect(process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(searchEnginesSelected(TDEProcess *))); if(!process->start()) { @@ -518,7 +518,7 @@ void SearchBarPlugin::partChanged(KParts::Part *newPart) m_part = ::tqt_cast<TDEHTMLPart*>(newPart); //Delay since when destroying tabs part 0 gets activated for a bit, before the proper part - TQTimer::singleShot(0, this, TQT_SLOT(updateComboVisibility())); + TQTimer::singleShot(0, this, TQ_SLOT(updateComboVisibility())); } void SearchBarPlugin::updateComboVisibility() @@ -546,7 +546,7 @@ SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) : KHistoryCombo(parent, name), m_pluginActive(true) { - connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared())); + connect(this, TQ_SIGNAL(cleared()), TQ_SLOT(historyCleared())); } const TQPixmap &SearchBarCombo::icon() const @@ -649,8 +649,8 @@ void SearchBarPlugin::gsMakeCompletionList() { TDEIO::TransferJob* tj = TDEIO::get(KURL("http://www.google.com/complete/search?hl=en&js=true&qu=" + m_searchCombo->currentText()), false, false); - connect(tj, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQT_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&))); - connect(tj, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(gsJobFinished(TDEIO::Job*))); + connect(tj, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), this, TQ_SLOT(gsDataArrived(TDEIO::Job*, const TQByteArray&))); + connect(tj, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(gsJobFinished(TDEIO::Job*))); } } diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 775d371..28a929f 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -52,28 +52,28 @@ MainWidget::MainWidget( TDEConfig * config, TQWidget * parent ) btnRefreshBookmarks->setIconSet( il->loadIconSet( "reload", TDEIcon::Small ) ); btnNew->setIconSet( il->loadIconSet( "bookmark_add", TDEIcon::Small ) ); - connect( ( TQWidget * ) btnRefreshTags, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotGetTags() ) ); + connect( ( TQWidget * ) btnRefreshTags, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotGetTags() ) ); - connect( ( TQWidget * ) btnRefreshBookmarks, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotGetBookmarks() ) ); + connect( ( TQWidget * ) btnRefreshBookmarks, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotGetBookmarks() ) ); - connect( ( TQWidget * ) btnNew, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotNewBookmark() ) ); + connect( ( TQWidget * ) btnNew, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotNewBookmark() ) ); - connect( lvBookmarks, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( slotBookmarkExecuted( TQListViewItem * ) ) ); - connect( lvBookmarks, TQT_SIGNAL( mouseButtonClicked ( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( slotBookmarkClicked( int, TQListViewItem *, const TQPoint &, int ) ) ); + connect( lvBookmarks, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotBookmarkExecuted( TQListViewItem * ) ) ); + connect( lvBookmarks, TQ_SIGNAL( mouseButtonClicked ( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( slotBookmarkClicked( int, TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvTags, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( slotTagsContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( lvTags, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( slotTagsContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); - connect( lvBookmarks, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( slotBookmarksContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); + connect( lvBookmarks, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( slotBookmarksContextMenu( TQListViewItem *, const TQPoint &, int ) ) ); m_updateTimer = new TQTimer( this ); - connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotGetBookmarks() ) ); + connect( m_updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotGetBookmarks() ) ); slotGetTags(); } @@ -93,8 +93,8 @@ void MainWidget::slotGetTags() kdDebug() << k_funcinfo << endl; TDEIO::StoredTransferJob * job = TDEIO::storedGet( "http://del.icio.us/api/tags/get" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotFillTags( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotFillTags( TDEIO::Job * ) ) ); } void MainWidget::slotFillTags( TDEIO::Job * job ) @@ -121,7 +121,7 @@ void MainWidget::slotFillTags( TDEIO::Job * job ) { TagListItem *item = new TagListItem( lvTags, tag.attribute( "tag" ), tag.attribute( "count" ).toInt() ); m_tags.append( tag.attribute( "tag" ) ); - connect( item, TQT_SIGNAL( signalItemChecked( TagListItem * ) ), TQT_SLOT( itemToggled() ) ); + connect( item, TQ_SIGNAL( signalItemChecked( TagListItem * ) ), TQ_SLOT( itemToggled() ) ); } } } @@ -134,8 +134,8 @@ void MainWidget::slotGetBookmarks() kdDebug() << k_funcinfo << url.url() << endl; TDEIO::StoredTransferJob * job = TDEIO::storedGet( url ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotFillBookmarks( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotFillBookmarks( TDEIO::Job * ) ) ); } void MainWidget::slotFillBookmarks( TDEIO::Job * job ) @@ -229,12 +229,12 @@ void MainWidget::slotTagsContextMenu( TQListViewItem *, const TQPoint & pos, int TQPopupMenu * tagMenu = new TQPopupMenu( this ); TQ_CHECK_PTR( tagMenu ); - tagMenu->insertItem( i18n( "Check All" ), this, TQT_SLOT( slotCheckAllTags() ) ); - tagMenu->insertItem( i18n( "Uncheck All" ), this, TQT_SLOT( slotUncheckAllTags() ) ); - tagMenu->insertItem( i18n( "Toggle All" ), this, TQT_SLOT( slotToggleTags() ) ); + tagMenu->insertItem( i18n( "Check All" ), this, TQ_SLOT( slotCheckAllTags() ) ); + tagMenu->insertItem( i18n( "Uncheck All" ), this, TQ_SLOT( slotUncheckAllTags() ) ); + tagMenu->insertItem( i18n( "Toggle All" ), this, TQ_SLOT( slotToggleTags() ) ); tagMenu->insertSeparator(); tagMenu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit", TDEIcon::Small ), - i18n( "Rename Tag..." ), this, TQT_SLOT( slotRenameTag() ) ); + i18n( "Rename Tag..." ), this, TQ_SLOT( slotRenameTag() ) ); tagMenu->exec( pos ); } @@ -323,7 +323,7 @@ void MainWidget::slotBookmarksContextMenu( TQListViewItem *, const TQPoint & pos TQ_CHECK_PTR( menu ); menu->insertItem( TDEGlobal::iconLoader()->loadIconSet( "edit-delete", TDEIcon::Small ), - i18n( "Delete Bookmark" ), this, TQT_SLOT( slotDeleteBookmark() ) ); + i18n( "Delete Bookmark" ), this, TQ_SLOT( slotDeleteBookmark() ) ); menu->exec( pos ); } diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index f0783f2..5ab5263 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -35,10 +35,10 @@ KonqSidebarDelicious::KonqSidebarDelicious( TDEInstance *instance, TQObject *par { m_widget = new MainWidget( instance->config(), widgetParent ); - connect( m_widget, TQT_SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( m_widget, TQT_SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQ_SIGNAL( signalURLClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_widget, TQ_SIGNAL( signalURLMidClicked( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); } KonqSidebarDelicious::~KonqSidebarDelicious() diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index eb034ca..6b0dcd0 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -97,11 +97,11 @@ int SliderAction::plug( TQWidget *w, int index ) addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); if (w->inherits( "TDEToolBar" )) - connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition))); + connect(toolBar, TQ_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQ_SLOT(toolbarMoved(TDEToolBar::BarPosition))); emit plugged(); diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index f0945a9..ab2e807 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -42,19 +42,19 @@ KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) labelFont.setBold(true); time->setFont(labelFont); - connect(Play, TQT_SIGNAL(clicked()), player, TQT_SLOT(play())); - connect(Pause, TQT_SIGNAL(clicked()), player, TQT_SLOT(pause())); - connect(Stop, TQT_SIGNAL(clicked()), player, TQT_SLOT(stop())); - - connect(player, TQT_SIGNAL(timeout()), this, TQT_SLOT(playerTimeout())); - connect(player, TQT_SIGNAL(finished()), this, TQT_SLOT(playerFinished())); - connect(player, TQT_SIGNAL(playing()), this, TQT_SLOT(playing())); - connect(player, TQT_SIGNAL(paused()), this, TQT_SLOT(paused())); - connect(player, TQT_SIGNAL(stopped()), this, TQT_SLOT(stopped())); - connect(player, TQT_SIGNAL(empty()), this, TQT_SLOT(empty())); - - connect(Position, TQT_SIGNAL(userChanged(int)), this, TQT_SLOT(skipToWrapper(int))); - connect(this, TQT_SIGNAL(skipTo(unsigned long)), player, TQT_SLOT(skipTo(unsigned long))); + connect(Play, TQ_SIGNAL(clicked()), player, TQ_SLOT(play())); + connect(Pause, TQ_SIGNAL(clicked()), player, TQ_SLOT(pause())); + connect(Stop, TQ_SIGNAL(clicked()), player, TQ_SLOT(stop())); + + connect(player, TQ_SIGNAL(timeout()), this, TQ_SLOT(playerTimeout())); + connect(player, TQ_SIGNAL(finished()), this, TQ_SLOT(playerFinished())); + connect(player, TQ_SIGNAL(playing()), this, TQ_SLOT(playing())); + connect(player, TQ_SIGNAL(paused()), this, TQ_SLOT(paused())); + connect(player, TQ_SIGNAL(stopped()), this, TQ_SLOT(stopped())); + connect(player, TQ_SIGNAL(empty()), this, TQ_SLOT(empty())); + + connect(Position, TQ_SIGNAL(userChanged(int)), this, TQ_SLOT(skipToWrapper(int))); + connect(this, TQ_SIGNAL(skipTo(unsigned long)), player, TQ_SLOT(skipTo(unsigned long))); setAcceptDrops(true); pretty=""; diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index 26904cf..dffe4ee 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -36,7 +36,7 @@ Player::Player(TQObject *parent) { mEngine = new Engine; mLooping = false; - connect(&ticker, TQT_SIGNAL(timeout()), TQT_SLOT(tickerTimeout())); + connect(&ticker, TQ_SIGNAL(timeout()), TQ_SLOT(tickerTimeout())); ticker.start(500); stop(); } diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index 35816df..f198b9e 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -66,10 +66,10 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent setIcon(SmallIcon("metabar")); ok = new KPushButton(KStdGuiItem::ok(), this); - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); TQTabWidget *tab = new TQTabWidget(this); @@ -117,7 +117,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent install_theme = new KPushButton(i18n("Install New Theme..."), theme_group); install_theme->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred); - connect(install_theme, TQT_SIGNAL(clicked()), this, TQT_SLOT(installTheme())); + connect(install_theme, TQ_SIGNAL(clicked()), this, TQ_SLOT(installTheme())); loadThemes(); @@ -125,23 +125,23 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent TQWidget *links = new TQWidget; link_create = new KPushButton(i18n("New..."), links); - connect(link_create, TQT_SIGNAL(clicked()), this, TQT_SLOT(createLink())); + connect(link_create, TQ_SIGNAL(clicked()), this, TQ_SLOT(createLink())); link_delete = new KPushButton(i18n("Delete"), links); - connect(link_delete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLink())); + connect(link_delete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteLink())); link_edit = new KPushButton(i18n("Edit..."), links); - connect(link_edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editLink())); + connect(link_edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(editLink())); link_up = new KPushButton(links); link_up->setIconSet(SmallIconSet("go-up")); link_up->setEnabled(false); - connect(link_up, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkUp())); + connect(link_up, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveLinkUp())); link_down = new KPushButton(links); link_down->setIconSet(SmallIconSet("go-down")); link_down->setEnabled(false); - connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); + connect(link_down, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveLinkDown())); link_list = new TDEListView(links); link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); @@ -149,8 +149,8 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent link_list->setItemsMovable(TRUE); link_list->addColumn(i18n("Name")); link_list->addColumn(i18n("Address")); - connect(link_list, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(editLink(TQListViewItem*))); - connect(link_list, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateArrows())); + connect(link_list, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(editLink(TQListViewItem*))); + connect(link_list, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateArrows())); TQWidget *actionPage = new TQWidget; @@ -311,10 +311,10 @@ void ConfigDialog::createLink() main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), main, TQ_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), main, TQ_SLOT(reject())); TQLineEdit *name = new TQLineEdit(i18n("New link"), main); TQLineEdit *url = new TQLineEdit("file:/", main); @@ -394,10 +394,10 @@ void ConfigDialog::editLink(TQListViewItem *item) main->setIcon(SmallIcon("metabar")); KPushButton *ok = new KPushButton(KStdGuiItem::ok(), main); - connect(ok, TQT_SIGNAL(clicked()), main, TQT_SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), main, TQ_SLOT(accept())); KPushButton *cancel = new KPushButton(KStdGuiItem::cancel(), main); - connect(cancel, TQT_SIGNAL(clicked()), main, TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), main, TQ_SLOT(reject())); TQLineEdit *name = new TQLineEdit(linkList[item]->name, main); TQLineEdit *url = new TQLineEdit(linkList[item]->url, main); diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 3677663..79b1ea7 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -336,9 +336,9 @@ void DefaultPlugin::loadPreview(DOM::HTMLElement node) preview_job = TDEIO::filePreview(KURL::List(url), m_html->view()->width() - 30); - connect(preview_job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQT_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&))); - connect(preview_job, TQT_SIGNAL(failed(const KFileItem *)), this, TQT_SLOT(slotPreviewFailed(const KFileItem *))); - connect(preview_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *))); + connect(preview_job, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), this, TQ_SLOT(slotSetPreview(const KFileItem*, const TQPixmap&))); + connect(preview_job, TQ_SIGNAL(failed(const KFileItem *)), this, TQ_SLOT(slotPreviewFailed(const KFileItem *))); + connect(preview_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobFinished(TDEIO::Job *))); } m_functions->show("preview"); diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index 4f9cfd1..12cf134 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -35,7 +35,7 @@ MetabarFunctions::MetabarFunctions(TDEHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) { timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(animate())); } MetabarFunctions::~MetabarFunctions() diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 0645745..c66fc19 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -84,9 +84,9 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare config = new TDEConfig("metabarrc"); dir_watch = new KDirWatch(); - connect(dir_watch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); - connect(dir_watch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); - connect(dir_watch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteCurrentInfo(const TQString&))); + connect(dir_watch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(slotUpdateCurrentInfo(const TQString&))); + connect(dir_watch, TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(slotDeleteCurrentInfo(const TQString&))); html = new TDEHTMLPart(this, "metabarhtmlpart"); html->setJScriptEnabled(true); @@ -97,9 +97,9 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare html->view()->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); html->view()->hide(); - connect(html->browserExtension(), TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); - connect(html, TQT_SIGNAL(completed()), this, TQT_SLOT(loadCompleted())); - connect(html, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotShowPopup(const TQString&, const TQPoint &))); + connect(html->browserExtension(), TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs & )), this, TQ_SLOT(handleURLRequest(const KURL &, const KParts::URLArgs &))); + connect(html, TQ_SIGNAL(completed()), this, TQ_SLOT(loadCompleted())); + connect(html, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotShowPopup(const TQString&, const TQPoint &))); functions = new MetabarFunctions(html, this); @@ -118,10 +118,10 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare layout->addWidget(html->view()); popup = new TDEPopupMenu(0); - TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); + TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), this, TQ_SLOT(slotShowConfig()), html->actionCollection(), "configure"); configAction->plug(popup); - TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), this, TQT_SLOT(setTheme()), html->actionCollection(), "reload"); + TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), this, TQ_SLOT(setTheme()), html->actionCollection(), "reload"); reloadAction->plug(popup); setTheme(); diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index b5186ab..4749f53 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ if(usePopup){ - TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), this, TQT_SLOT(runAction()), popup, idString.utf8()); + TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), this, TQ_SLOT(runAction()), popup, idString.utf8()); action->plug(popup); } else{ diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp index 48b4afc..771668f 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp @@ -58,8 +58,8 @@ void SettingsPlugin::loadActions(DOM::HTMLElement node) if(url.path().endsWith("/")){ list_job = TDEIO::listDir(url, true, false); - connect(list_job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); - connect(list_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobFinished(TDEIO::Job *))); + connect(list_job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQ_SLOT(slotGotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); + connect(list_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotJobFinished(TDEIO::Job *))); m_functions->show("actions"); } diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index 86aa12c..a96adeb 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -44,7 +44,7 @@ namespace KSB_News { KPushButton *btn = new KPushButton(i18n("&Configure"), this); btn->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Minimum); - connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnClicked())); + connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnClicked())); topLayout->addWidget(btn, 0, TQt::AlignHCenter); topLayout->addStretch(); @@ -69,8 +69,8 @@ namespace KSB_News { // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, - TQT_SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQ_SIGNAL(settingsChanged()), this, + TQ_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index 707ba71..88dbe8c 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -86,7 +86,7 @@ namespace KSB_News { // updating of RSS documents m_timeoutinterval = 10 * 60 * 1000; // 10 mins m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(refresh())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(refresh())); m_timer->start(m_timeoutinterval); refresh(); } diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index 8ee0c78..bd1c35d 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -84,19 +84,19 @@ namespace KSB_News { popup = new TDEPopupMenu(this); popup->insertItem(KStdGuiItem::configure().iconSet(), i18n("&Configure Newsticker..."), this, - TQT_SLOT(slotConfigure())); + TQ_SLOT(slotConfigure())); popup->insertItem(SmallIconSet("reload"), i18n("&Reload"), this, - TQT_SLOT(slotRefresh())); + TQ_SLOT(slotRefresh())); popup->insertItem(KStdGuiItem::close().iconSet(), - KStdGuiItem::close().text(), this, TQT_SLOT(slotClose())); + KStdGuiItem::close().text(), this, TQ_SLOT(slotClose())); popup->insertSeparator(); // help menu helpmenu = new TDEPopupMenu(this); helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this, - TQT_SLOT(slotShowAbout())); + TQ_SLOT(slotShowAbout())); helpmenu->insertItem(i18n("&Report Bug..."), this, - TQT_SLOT(slotShowBugreport())); + TQ_SLOT(slotShowBugreport())); popup->insertItem(KStdGuiItem::help().iconSet(), KStdGuiItem::help().text(), helpmenu); @@ -115,7 +115,7 @@ namespace KSB_News { button->width() - 4 )); button->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred)); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonClicked())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonClicked())); TQToolTip::add(button, nsp->title()); // eventFiler for the title button @@ -258,8 +258,8 @@ namespace KSB_News { // User edited the configuration - update your local copies of the // configuration data - connect(m_confdlg, TQT_SIGNAL(settingsChanged()), this, - TQT_SLOT(slotConfigure_okClicked())); + connect(m_confdlg, TQ_SIGNAL(settingsChanged()), this, + TQ_SLOT(slotConfigure_okClicked())); m_confdlg->show(); } diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index 6faaba5..f2c33fe 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -164,19 +164,19 @@ namespace KSB_News { if (! nspanel->listbox()) { TTListBox *listbox = new TTListBox(newswidget, "article_lb"); newswidget->addStackTab(nspanel, listbox); - connect(listbox, TQT_SIGNAL(executed(TQListBoxItem *)), - this, TQT_SLOT(slotArticleItemExecuted(TQListBoxItem *))); + connect(listbox, TQ_SIGNAL(executed(TQListBoxItem *)), + this, TQ_SLOT(slotArticleItemExecuted(TQListBoxItem *))); listbox->insertItem(i18n("Connecting..." )); nspanel->setListbox(listbox); } // listen to updates - connect(nspanel, TQT_SIGNAL(documentUpdated(NSPanel *)), - this, TQT_SLOT(updateArticles(NSPanel *))); - connect(nspanel, TQT_SIGNAL(documentUpdated(NSPanel *)), - this, TQT_SLOT(updateTitle(NSPanel *))); - connect(nspanel, TQT_SIGNAL(pixmapUpdated(NSPanel *)), - this, TQT_SLOT(updatePixmap(NSPanel *))); + connect(nspanel, TQ_SIGNAL(documentUpdated(NSPanel *)), + this, TQ_SLOT(updateArticles(NSPanel *))); + connect(nspanel, TQ_SIGNAL(documentUpdated(NSPanel *)), + this, TQ_SLOT(updateTitle(NSPanel *))); + connect(nspanel, TQ_SIGNAL(pixmapUpdated(NSPanel *)), + this, TQ_SLOT(updatePixmap(NSPanel *))); if (widgets->visibleWidget() != newswidget) widgets->raiseWidget(newswidget); diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp index b83e759..58dc041 100644 --- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp @@ -57,40 +57,40 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, action = new TDEToggleAction( i18n("Java&Script"), 0, - this, TQT_SLOT(toggleJavascript()), + this, TQ_SLOT(toggleJavascript()), actionCollection(), "javascript" ); menu->insert( action ); action = new TDEToggleAction( i18n("&Java"), 0, - this, TQT_SLOT(toggleJava()), + this, TQ_SLOT(toggleJava()), actionCollection(), "java" ); menu->insert( action ); action = new TDEToggleAction( i18n("&Cookies"), 0, - this, TQT_SLOT(toggleCookies()), + this, TQ_SLOT(toggleCookies()), actionCollection(), "cookies" ); menu->insert( action ); action = new TDEToggleAction( i18n("&Plugins"), 0, - this, TQT_SLOT(togglePlugins()), + this, TQ_SLOT(togglePlugins()), actionCollection(), "plugins" ); menu->insert( action ); action = new TDEToggleAction( i18n("Autoload &Images"), 0, - this, TQT_SLOT(toggleImageLoading()), + this, TQ_SLOT(toggleImageLoading()), actionCollection(), "imageloading" ); menu->insert( action ); menu->insert( new TDEActionSeparator(actionCollection()) ); action = new TDEToggleAction( i18n("Enable Pro&xy"), 0, - this, TQT_SLOT(toggleProxy()), + this, TQ_SLOT(toggleProxy()), actionCollection(), "useproxy" ); action->setCheckedState(i18n("Disable Pro&xy")); menu->insert( action ); action = new TDEToggleAction( i18n("Enable Cac&he"), 0, - this, TQT_SLOT(toggleCache()), + this, TQ_SLOT(toggleCache()), actionCollection(), "usecache" ); action->setCheckedState(i18n("Disable Cac&he")); menu->insert( action ); @@ -104,11 +104,11 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, policies += i18n( "&Use Cache if Possible" ); policies += i18n( "&Offline Browsing Mode" ); sAction->setItems( policies ); - connect( sAction, TQT_SIGNAL( activated( int ) ), TQT_SLOT( cachePolicyChanged(int) ) ); + connect( sAction, TQ_SIGNAL( activated( int ) ), TQ_SLOT( cachePolicyChanged(int) ) ); menu->insert( sAction ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( showPopup() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( showPopup() )); } SettingsPlugin::~SettingsPlugin() diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index 5cc89c6..2edeb8d 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -60,16 +60,16 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, m_pUAMenu = new TDEActionMenu( i18n("Change Browser &Identification"), "agent", actionCollection(), "changeuseragent" ); m_pUAMenu->setDelayed( false ); - connect( m_pUAMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotAboutToShow() ) ); + connect( m_pUAMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotAboutToShow() ) ); m_pUAMenu->setEnabled ( false ); if ( parent && parent->inherits( "TDEHTMLPart" ) ) { m_part = static_cast<TDEHTMLPart*>(parent); - connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this, - TQT_SLOT(slotStarted(TDEIO::Job*)) ); + connect( m_part, TQ_SIGNAL(started(TDEIO::Job*)), this, + TQ_SLOT(slotStarted(TDEIO::Job*)) ); } } @@ -217,7 +217,7 @@ void UAChangerPlugin::slotAboutToShow() //kdDebug(90130) << "User Agent: " << m_currentUserAgent << endl; int id = m_pUAMenu->popupMenu()->insertItem( i18n("Default Identification"), this, - TQT_SLOT(slotDefault()), 0, ++count ); + TQ_SLOT(slotDefault()), 0, ++count ); if( m_currentUserAgent == KProtocolManager::defaultUserAgent() ) m_pUAMenu->popupMenu()->setItemChecked(id, true); @@ -230,7 +230,7 @@ void UAChangerPlugin::slotAboutToShow() BrowserGroup::ConstIterator e = map.data().begin(); for( ; e != map.data().end(); ++e ) { - int id = browserMenu->insertItem( m_lstAlias[*e], this, TQT_SLOT(slotItemSelected(int)), 0, *e ); + int id = browserMenu->insertItem( m_lstAlias[*e], this, TQ_SLOT(slotItemSelected(int)), 0, *e ); if (m_lstIdentity[(*e)] == m_currentUserAgent) browserMenu->setItemChecked(id, true); } @@ -241,16 +241,16 @@ void UAChangerPlugin::slotAboutToShow() /* useless here, imho.. m_pUAMenu->popupMenu()->insertItem( i18n("Reload Identifications"), this, - TQT_SLOT(slotReloadDescriptions()), + TQ_SLOT(slotReloadDescriptions()), 0, ++count );*/ m_pUAMenu->popupMenu()->insertItem( i18n("Apply to Entire Site"), this, - TQT_SLOT(slotApplyToDomain()), + TQ_SLOT(slotApplyToDomain()), 0, ++count ); m_pUAMenu->popupMenu()->setItemChecked(count, m_bApplyToDomain); m_pUAMenu->popupMenu()->insertItem( i18n("Configure..."), this, - TQT_SLOT(slotConfigure())); + TQ_SLOT(slotConfigure())); } diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 2ba435a..04a46b9 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -56,17 +56,17 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, m_menu->insert( new TDEAction( i18n( "Validate &HTML" ), "htmlvalidator", 0, - this, TQT_SLOT(slotValidateHTML()), + this, TQ_SLOT(slotValidateHTML()), actionCollection(), "validateHTML") ); m_menu->insert( new TDEAction( i18n( "Validate &CSS" ), "cssvalidator", 0, - this, TQT_SLOT(slotValidateCSS()), + this, TQ_SLOT(slotValidateCSS()), actionCollection(), "validateCSS") ); m_menu->insert( new TDEAction( i18n( "Validate &Links" ), 0, - this, TQT_SLOT(slotValidateLinks()), + this, TQ_SLOT(slotValidateLinks()), actionCollection(), "validateLinks") ); m_menu->setEnabled( false ); @@ -75,15 +75,15 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, { m_menu->insert( new TDEAction( i18n( "C&onfigure Validator..." ), "configure", 0, - this, TQT_SLOT(slotConfigure()), + this, TQ_SLOT(slotConfigure()), actionCollection(), "configure") ); m_part = static_cast<TDEHTMLPart *>( parent ); m_configDialog = new ValidatorsDialog( m_part->widget() ); setURLs(); - connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this, - TQT_SLOT(slotStarted(TDEIO::Job*)) ); + connect( m_part, TQ_SIGNAL(started(TDEIO::Job*)), this, + TQ_SLOT(slotStarted(TDEIO::Job*)) ); } } diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 3af1d50..8ca6951 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -446,7 +446,7 @@ void ArchiveDialog::downloadNext() dsturl.setPath(m_tmpFile->name()); TDEIO::Job *job=TDEIO::file_copy(url, dsturl, -1, false, false, false); job->addMetaData("cache", "cache"); // Use entry from cache if available. - connect(job, TQT_SIGNAL(result( TDEIO::Job *)), this, TQT_SLOT(finishedDownloadingURL( TDEIO::Job *)) ); + connect(job, TQ_SIGNAL(result( TDEIO::Job *)), this, TQ_SLOT(finishedDownloadingURL( TDEIO::Job *)) ); m_currentLVI=new TQListViewItem(m_widget->listView, url.prettyURL()); m_widget->listView->insertItem( m_currentLVI ); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index eaeaadc..eee557c 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -56,7 +56,7 @@ PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name, { (void) new TDEAction( i18n("Archive &Web Page..."), "webarchiver", 0, - this, TQT_SLOT(slotSaveToArchive()), + this, TQ_SLOT(slotSaveToArchive()), actionCollection(), "archivepage" ); } diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp index bbc3859..5b47072 100644 --- a/konq-plugins/webarchiver/webarchivecreator.cpp +++ b/konq-plugins/webarchiver/webarchivecreator.cpp @@ -53,7 +53,7 @@ bool WebArchiveCreator::create(const TQString &path, int width, int height, TQIm if (!m_html) { m_html = new TDEHTMLPart; - connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted())); + connect(m_html, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted())); m_html->setJScriptEnabled(false); m_html->setJavaEnabled(false); m_html->setPluginsEnabled(false); |