From 2375c3f5609f85c421e9acdc6e6626f4e82e83ef Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 5 Jan 2024 10:34:09 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 691489dddc259e7d7c463bde3347d7cea780d54f) --- src/activityviewer.cpp | 18 ++++++++--------- src/configdialog.cpp | 10 +++++----- src/datepicker.cpp | 4 ++-- src/dbviewer.cpp | 44 ++++++++++++++++++++--------------------- src/directorylist.cpp | 28 +++++++++++++------------- src/frame.cpp | 24 +++++++++++----------- src/freshklam.cpp | 20 +++++++++---------- src/klamav.cpp | 42 +++++++++++++++++++-------------------- src/klamav_run.cpp | 2 +- src/klamonacc.cpp | 4 ++-- src/klamscan.cpp | 42 +++++++++++++++++++-------------------- src/klamscanoptions.cpp | 8 ++++---- src/ktview.cpp | 32 +++++++++++++++--------------- src/kuarantine.cpp | 44 ++++++++++++++++++++--------------------- src/pageviewer.cpp | 44 ++++++++++++++++++++--------------------- src/scanviewer.cpp | 42 +++++++++++++++++++-------------------- src/schedule.cpp | 28 +++++++++++++------------- src/sigtool.cpp | 12 +++++------ src/tabwidget.cpp | 12 +++++------ src/viewer.cpp | 34 +++++++++++++++---------------- 20 files changed, 247 insertions(+), 247 deletions(-) diff --git a/src/activityviewer.cpp b/src/activityviewer.cpp index 2a23fa2..891f31f 100644 --- a/src/activityviewer.cpp +++ b/src/activityviewer.cpp @@ -103,7 +103,7 @@ Activityviewer::Activityviewer(TQWidget *parent, const char *name) layout->addWidget(options,0,6); vbox->addWidget(privateLayoutWidget2); - connect( options, SIGNAL(clicked()), SLOT(slotOptions()) ); + connect( options, TQ_SIGNAL(clicked()), TQ_SLOT(slotOptions()) ); @@ -150,8 +150,8 @@ Activityviewer::Activityviewer(TQWidget *parent, const char *name) // qmenu = new TQPopupMenu( currentbox ); -// connect(currentbox, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), -// this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); +// connect(currentbox, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), +// this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); kLineEdit1 = new TDEListViewSearchLine( (TQWidget *)searchToolBar, currentbox,"klinedit1"); /* TQValueList columns; @@ -160,12 +160,12 @@ Activityviewer::Activityviewer(TQWidget *parent, const char *name) columns.append(2);*/ /* kLineEdit1->setSearchColumns();*/ //kLineEdit1->setMaxLength(2); - connect(button, SIGNAL( clicked() ), - kLineEdit1, SLOT(clear()) ); - connect(check_combo, SIGNAL( activated(const TQString &) ), - this, SLOT(allActivityOfType(const TQString &) )); - connect(days_combo, SIGNAL( activated(const TQString &) ), - this, SLOT(allActivityOfDate(const TQString &) )); + connect(button, TQ_SIGNAL( clicked() ), + kLineEdit1, TQ_SLOT(clear()) ); + connect(check_combo, TQ_SIGNAL( activated(const TQString &) ), + this, TQ_SLOT(allActivityOfType(const TQString &) )); + connect(days_combo, TQ_SIGNAL( activated(const TQString &) ), + this, TQ_SLOT(allActivityOfDate(const TQString &) )); searchToolBar->setStretchableWidget( kLineEdit1 ); diff --git a/src/configdialog.cpp b/src/configdialog.cpp index 43a0fe8..3ab3dbb 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -65,7 +65,7 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEC // add pages addPage( m_klambackend, i18n( "Backend" ), "system-run", i18n( "Configure Scanning Backend" ) ); - connect( m_klambackend->kcfg_ScannerClamdscan, SIGNAL(toggled(bool)), this, SLOT(slotToggleClamdscan(bool)) ); + connect( m_klambackend->kcfg_ScannerClamdscan, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleClamdscan(bool)) ); slotToggleClamdscan( m_klambackend->kcfg_ScannerClamdscan->isOn() ); // initial state addPage( m_archives, i18n( "Archives" ), "ark", i18n( "Configure Archive Scanning" ) ); @@ -73,9 +73,9 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEC addPage( m_specialfiletypes, i18n( "File Types" ), "folder", i18n( "Configure File Types" ) ); addPage( m_klamonacc, i18n( "On-Access Scanner" ), "filefind", i18n( "Configure On-Access Scanning" ) ); - connect( m_klamonacc, SIGNAL(directoriesModified()), tdemain->klamonacc, SLOT(restart()) ); - connect( tdemain->klamonacc, SIGNAL(stateUpdated()), this, SLOT(slotToggleKlamOnAccCheckbox()) ); - connect( m_klamonacc->kcfg_EnableOnAccess, SIGNAL(toggled(bool)), this, SLOT(slotToggleKlamOnAcc(bool)) ); + connect( m_klamonacc, TQ_SIGNAL(directoriesModified()), tdemain->klamonacc, TQ_SLOT(restart()) ); + connect( tdemain->klamonacc, TQ_SIGNAL(stateUpdated()), this, TQ_SLOT(slotToggleKlamOnAccCheckbox()) ); + connect( m_klamonacc->kcfg_EnableOnAccess, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggleKlamOnAcc(bool)) ); slotToggleKlamOnAcc( m_klamonacc->kcfg_EnableOnAccess->isOn() ); // initial state addPage( m_logoptions, i18n( "Event Logging" ), "kate", i18n( "Configure Events to Log" ) ); @@ -91,7 +91,7 @@ KlamavConfigDialog::KlamavConfigDialog( TQWidget *parent, const char* name, TDEC static_cast(label)->setMaximumWidth( 250 ); delete list; - connect( this, SIGNAL(settingsChanged()), SLOT(applySettings()) ); + connect( this, TQ_SIGNAL(settingsChanged()), TQ_SLOT(applySettings()) ); } KlamavConfigDialog::~KlamavConfigDialog() diff --git a/src/datepicker.cpp b/src/datepicker.cpp index c881010..6258876 100644 --- a/src/datepicker.cpp +++ b/src/datepicker.cpp @@ -37,8 +37,8 @@ DatePicker::DatePicker(TQWidget *parent, const TQDate& date) KWin::setOnAllDesktops( handle(), true ); picker = new KDatePicker(this, date); picker->setCloseButton(true); - connect( picker, SIGNAL(dateSelected(TQDate)),this, - SLOT(slotEmitSelectedDate(TQDate)) ); + connect( picker, TQ_SIGNAL(dateSelected(TQDate)),this, + TQ_SLOT(slotEmitSelectedDate(TQDate)) ); /* name and icon for kicker's taskbar */ setCaption(i18n("Calendar")); diff --git a/src/dbviewer.cpp b/src/dbviewer.cpp index c085ddd..5216cbd 100644 --- a/src/dbviewer.cpp +++ b/src/dbviewer.cpp @@ -86,8 +86,8 @@ KlamDB::KlamDB( TQWidget* parent, const char* name, bool modal, WFlags fl ) VirusList = new TDEListView( privateLayoutWidget, "VirusList" ); VirusList->addColumn( i18n( "All Known Viruses" ),150 ); - connect(VirusList, SIGNAL( doubleClicked( TQListViewItem * , const TQPoint &, int ) ), - this, SLOT(slotOpenTab(TQListViewItem * , const TQPoint &, int )) ); + connect(VirusList, TQ_SIGNAL( doubleClicked( TQListViewItem * , const TQPoint &, int ) ), + this, TQ_SLOT(slotOpenTab(TQListViewItem * , const TQPoint &, int )) ); menu = new TQPopupMenu( VirusList ); @@ -106,22 +106,22 @@ KlamDB::KlamDB( TQWidget* parent, const char* name, bool modal, WFlags fl ) else ticon = TQPixmap( iconPath ); - menu->insertItem(ticon, i18n("Search with Trend Micro"), this,SLOT(slotTrendMicro()) ); - menu->insertItem(gicon, i18n("Search with Google"), this,SLOT(slotGoogle()) ); + menu->insertItem(ticon, i18n("Search with Trend Micro"), this,TQ_SLOT(slotTrendMicro()) ); + menu->insertItem(gicon, i18n("Search with Google"), this,TQ_SLOT(slotGoogle()) ); googlePrefix = TQString::fromAscii("http://www.google.com/search?ie=ISO-8859-1&q="); tMicroPrefix = TQString::fromAscii("https://www.trendmicro.com/vinfo/us/threat-encyclopedia/search/"); - connect(VirusList, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), - this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); + connect(VirusList, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), + this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); kLineEdit1 = new TDEListViewSearchLine( (TQWidget *)searchToolBar, VirusList,"klinedit1"); TQValueList columns; columns.append(0); kLineEdit1->setSearchColumns(columns); kLineEdit1->setMaxLength(2); - connect(button, SIGNAL( clicked() ), - kLineEdit1, SLOT(clear()) ); + connect(button, TQ_SIGNAL( clicked() ), + kLineEdit1, TQ_SLOT(clear()) ); dblayout->addWidget( searchToolBar, 0, 0 ); @@ -872,14 +872,14 @@ unsigned int KlamDB::getSigNos() void KlamDB::slotOpenTab(TQListViewItem * item, const TQPoint& , int ) { PageViewer* page = new PageViewer(this, "page"); - //connect( m_part, SIGNAL(signalSettingsChanged()), page, SLOT(slotPaletteOrFontChanged())); + //connect( m_part, TQ_SIGNAL(signalSettingsChanged()), page, TQ_SLOT(slotPaletteOrFontChanged())); - //connect( page, SIGNAL(setTabIcon(const TQPixmap&)), - // this, SLOT(setTabIcon(const TQPixmap&))); - //connect( page, SIGNAL(setWindowCaption (const TQString &)), - // this, SLOT(slotTabCaption (const TQString &)) ); - connect( page, SIGNAL(urlClicked(const KURL &,bool)), - this, SLOT(slotOpenTabPlain(const KURL &,bool)) ); + //connect( page, TQ_SIGNAL(setTabIcon(const TQPixmap&)), + // this, TQ_SLOT(setTabIcon(const TQPixmap&))); + //connect( page, TQ_SIGNAL(setWindowCaption (const TQString &)), + // this, TQ_SLOT(slotTabCaption (const TQString &)) ); + connect( page, TQ_SIGNAL(urlClicked(const KURL &,bool)), + this, TQ_SLOT(slotOpenTabPlain(const KURL &,bool)) ); TQString url = item->text(0); @@ -900,14 +900,14 @@ void KlamDB::slotOpenTab(TQListViewItem * item, const TQPoint& , int ) void KlamDB::slotOpenTabPlain(const KURL& url, bool background) { PageViewer* page = new PageViewer(this, "page"); - //connect( m_part, SIGNAL(signalSettingsChanged()), page, SLOT(slotPaletteOrFontChanged())); + //connect( m_part, TQ_SIGNAL(signalSettingsChanged()), page, TQ_SLOT(slotPaletteOrFontChanged())); -/* connect( page, SIGNAL(setTabIcon(const TQPixmap&)), - this, SLOT(setTabIcon(const TQPixmap&)));*/ - connect( page, SIGNAL(setWindowCaption (const TQString &)), - this, SLOT(slotTabCaption (const TQString &)) ); - connect( page, SIGNAL(urlClicked(const KURL &,bool)), - this, SLOT(slotOpenTabPlain(const KURL &,bool)) ); +/* connect( page, TQ_SIGNAL(setTabIcon(const TQPixmap&)), + this, TQ_SLOT(setTabIcon(const TQPixmap&)));*/ + connect( page, TQ_SIGNAL(setWindowCaption (const TQString &)), + this, TQ_SLOT(slotTabCaption (const TQString &)) ); + connect( page, TQ_SIGNAL(urlClicked(const KURL &,bool)), + this, TQ_SLOT(slotOpenTabPlain(const KURL &,bool)) ); Frame *frame=new Frame(this, page, page->widget(), i18n("Untitled")); //connectFrame(frame); diff --git a/src/directorylist.cpp b/src/directorylist.cpp index c401644..71dd70a 100644 --- a/src/directorylist.cpp +++ b/src/directorylist.cpp @@ -90,7 +90,7 @@ Item::Item( TQListView *parent, CollectionSetup *collection, const TQString &nam collectionSetup = collection; m_lister.setDirOnlyMode( true ); m_lister.setShowingDotFiles( true ); - connect( &m_lister, SIGNAL(newItems( const KFileItemList& )), SLOT(newItems( const KFileItemList& )) ); + connect( &m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(newItems( const KFileItemList& )) ); setText( 1, path ); setOpen( true ); if ( !icon.isNull() ) @@ -98,7 +98,7 @@ Item::Item( TQListView *parent, CollectionSetup *collection, const TQString &nam else setPixmap( 0, SmallIcon( "folder" ) ); setVisible( true ); - connect( collectionSetup, SIGNAL(resetDirs()), this, SLOT(reset()) ); + connect( collectionSetup, TQ_SIGNAL(resetDirs()), this, TQ_SLOT(reset()) ); } @@ -113,10 +113,10 @@ Item::Item( TQListViewItem *parent, CollectionSetup *collection, const KURL &url m_lister.setShowingDotFiles( true ); setText( 1, url.fileName() ); setExpandable( true ); - connect( &m_lister, SIGNAL(newItems( const KFileItemList& )), SLOT(newItems( const KFileItemList& )) ); - connect( &m_lister, SIGNAL(completed()), SLOT(completed()) ); - connect( &m_lister, SIGNAL(canceled()), SLOT(completed()) ); - connect( collectionSetup, SIGNAL(resetDirs()), this, SLOT(reset()) ); + connect( &m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(newItems( const KFileItemList& )) ); + connect( &m_lister, TQ_SIGNAL(completed()), TQ_SLOT(completed()) ); + connect( &m_lister, TQ_SIGNAL(canceled()), TQ_SLOT(completed()) ); + connect( collectionSetup, TQ_SIGNAL(resetDirs()), this, TQ_SLOT(reset()) ); } @@ -188,7 +188,7 @@ Item::activate() void -Item::newItems( const KFileItemList &list ) //SLOT +Item::newItems( const KFileItemList &list ) //TQ_SLOT { for( KFileItemListIterator it( list ); *it; ++it ) { @@ -240,8 +240,8 @@ DeviceItem::DeviceItem( TQListView *parent, CollectionSetup *collection ) { collectionSetup = collection; m_lister.setDirOnlyMode( true ); - connect( &m_lister, SIGNAL(newItems( const KFileItemList& )), SLOT(newItems( const KFileItemList& )) ); - connect( collectionSetup, SIGNAL(resetDirs()), this, SLOT(reset()) ); + connect( &m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(newItems( const KFileItemList& )) ); + connect( collectionSetup, TQ_SIGNAL(resetDirs()), this, TQ_SLOT(reset()) ); if ( KDE::versionMajor() == 3 && KDE::versionMinor() < 4 ) { @@ -301,10 +301,10 @@ DeviceItem::DeviceItem( TQListViewItem *parent, CollectionSetup *collection, con kdDebug() << "Device Item: " << name << " " << url.fileName() << " " << text(1) << endl; m_lister.setDirOnlyMode( true ); setExpandable( false ); - connect( &m_lister, SIGNAL(newItems( const KFileItemList& )), SLOT(newItems( const KFileItemList& )) ); - connect( &m_lister, SIGNAL(completed()), SLOT(completed()) ); - connect( &m_lister, SIGNAL(canceled()), SLOT(completed()) ); - connect( collectionSetup, SIGNAL(resetDirs()), this, SLOT(reset()) ); + connect( &m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(newItems( const KFileItemList& )) ); + connect( &m_lister, TQ_SIGNAL(completed()), TQ_SLOT(completed()) ); + connect( &m_lister, TQ_SIGNAL(canceled()), TQ_SLOT(completed()) ); + connect( collectionSetup, TQ_SIGNAL(resetDirs()), this, TQ_SLOT(reset()) ); } @@ -377,7 +377,7 @@ DeviceItem::activate() void -DeviceItem::newItems( const KFileItemList &list ) //SLOT +DeviceItem::newItems( const KFileItemList &list ) //TQ_SLOT { for( KFileItemListIterator it( list ); *it; ++it ) { diff --git a/src/frame.cpp b/src/frame.cpp index f8cc093..fa45dcc 100644 --- a/src/frame.cpp +++ b/src/frame.cpp @@ -25,25 +25,25 @@ Frame::Frame(TQObject * parent, KParts::ReadOnlyPart *p, TQWidget *visWidget, co if (watchSignals) // e.g, articles tab has no part { - connect(m_part, SIGNAL(setWindowCaption (const TQString &)), this, SLOT(setCaption (const TQString &))); - connect(m_part, SIGNAL(setStatusBarText (const TQString &)), this, SLOT(setStatusText (const TQString &))); + connect(m_part, TQ_SIGNAL(setWindowCaption (const TQString &)), this, TQ_SLOT(setCaption (const TQString &))); + connect(m_part, TQ_SIGNAL(setStatusBarText (const TQString &)), this, TQ_SLOT(setStatusText (const TQString &))); KParts::BrowserExtension *ext=KParts::BrowserExtension::childObject( p ); if (ext) - connect( ext, SIGNAL(loadingProgress(int)), this, SLOT(setProgress(int)) ); + connect( ext, TQ_SIGNAL(loadingProgress(int)), this, TQ_SLOT(setProgress(int)) ); - connect(p, SIGNAL(started(TDEIO::Job*)), this, SLOT(setStarted())); - connect(p, SIGNAL(completed()), this, SLOT(setCompleted())); - connect(p, SIGNAL(canceled(const TQString &)), this, SLOT(setCanceled(const TQString&))); - connect(p, SIGNAL(completed(bool)), this, SLOT(setCompleted())); + connect(p, TQ_SIGNAL(started(TDEIO::Job*)), this, TQ_SLOT(setStarted())); + connect(p, TQ_SIGNAL(completed()), this, TQ_SLOT(setCompleted())); + connect(p, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(setCanceled(const TQString&))); + connect(p, TQ_SIGNAL(completed(bool)), this, TQ_SLOT(setCompleted())); /* TDEActionCollection *coll=p->actionCollection(); if (coll) { - connect( coll, SIGNAL( actionStatusText( const TQString & ) ), - this, SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, SIGNAL( clearStatusText() ), - this, SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } */ } @@ -138,7 +138,7 @@ void Frame::setStarted() //if(m_progressId.isNull() || m_progressId.isEmpty()) m_progressId = KPIM::ProgressManager::getUniqueID(); //m_progressItem = KPIM::ProgressManager::createProgressItem(m_progressId, title(), TQString::null, false); //m_progressItem->setStatus(i18n("Loading...")); - //connect(m_progressItem, SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), SLOT(slotAbortFetch())); + //connect(m_progressItem, TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotAbortFetch())); m_state=Started; emit started(); } diff --git a/src/freshklam.cpp b/src/freshklam.cpp index 0501f25..3d19996 100644 --- a/src/freshklam.cpp +++ b/src/freshklam.cpp @@ -389,10 +389,10 @@ void Freshklam::slotSearch() childproc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); - connect( childproc, SIGNAL(processExited(TDEProcess *)), - SLOT(childExited()) ); - connect( childproc, SIGNAL(receivedStdout(TDEProcess *, char *, int)), - SLOT(receivedOutput(TDEProcess *, char *, int)) ); + connect( childproc, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(childExited()) ); + connect( childproc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(receivedOutput(TDEProcess *, char *, int)) ); tdemain->EnableFreshklam->setEnabled(FALSE); tdemain->DisableFreshklam->setEnabled(TRUE); @@ -664,8 +664,8 @@ void Freshklam::initCheckBoxes(){ check_combo->setEnabled(false); } - connect( daemon_box, SIGNAL(toggled(bool)), SLOT(handleChecks()) ); - connect( check_combo, SIGNAL(activated(int)), SLOT(handleChecks()) ); + connect( daemon_box, TQ_SIGNAL(toggled(bool)), TQ_SLOT(handleChecks()) ); + connect( check_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(handleChecks()) ); if (daemon_box->isChecked()) slotSearch(); @@ -850,10 +850,10 @@ Freshklam::getCurrentVersionOfClamAV( ) *versionproc<start(KProcIO::NotifyOnExit); versionproc->closeWhenDone(); diff --git a/src/klamav.cpp b/src/klamav.cpp index 6a96fbc..c2fe4ec 100644 --- a/src/klamav.cpp +++ b/src/klamav.cpp @@ -55,22 +55,22 @@ Klamav::Klamav() fixedTabs << i18n("Scan") << i18n("Update"); tab = new TabWidget(this, "KlamAV", fixedTabs); - connect( tab, SIGNAL(tabClosed(TQString)), this, SLOT(tabClosed(TQString)) ); + connect( tab, TQ_SIGNAL(tabClosed(TQString)), this, TQ_SLOT(tabClosed(TQString)) ); _tray = new KSystemTray(tdemain, "klamav tray"); _tray->setPixmap( KSystemTray::loadIcon("klamav") ); - connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown())); + connect(_tray,TQ_SIGNAL(quitSelected()),TQ_SLOT(shuttingDown())); TDEPopupMenu *conf_menu = _tray->contextMenu(); - EnableFreshklam = new TDEAction(i18n("&Enable Auto-Updates"), "system-software-update", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable"); - DisableFreshklam = new TDEAction(i18n("&Disable Auto-Updates"), 0, 0, this, SLOT(contextDisableFK()),actionCollection(),"fk_disable"); + EnableFreshklam = new TDEAction(i18n("&Enable Auto-Updates"), "system-software-update", 0,this, TQ_SLOT(contextEnableFK()),actionCollection(),"fk_enable"); + DisableFreshklam = new TDEAction(i18n("&Disable Auto-Updates"), 0, 0, this, TQ_SLOT(contextDisableFK()),actionCollection(),"fk_disable"); EnableFreshklam->plug(conf_menu); DisableFreshklam->plug(conf_menu); - EnableKlamOnAcc = new TDEAction(i18n("&Start On-Access Scanner"), "filefind", 0,this, SLOT(contextEnableKOA()),actionCollection(),"koa_enable"); - DisableKlamOnAcc = new TDEAction(i18n("&Stop On-Access Scanner"), 0, 0, this, SLOT(contextDisableKOA()),actionCollection(),"koa_disable"); + EnableKlamOnAcc = new TDEAction(i18n("&Start On-Access Scanner"), "filefind", 0,this, TQ_SLOT(contextEnableKOA()),actionCollection(),"koa_enable"); + DisableKlamOnAcc = new TDEAction(i18n("&Stop On-Access Scanner"), 0, 0, this, TQ_SLOT(contextDisableKOA()),actionCollection(),"koa_disable"); EnableKlamOnAcc->plug(conf_menu); DisableKlamOnAcc->plug(conf_menu); @@ -95,20 +95,20 @@ Klamav::Klamav() // Menus TDEPopupMenu *scanner_menu = new TDEPopupMenu(this); - scanner_menu->insertItem( SmallIcon("document-open"), i18n("Scan &File..."), this, SLOT(slotScanFile()), CTRL+Key_O ); - scanner_menu->insertItem( SmallIcon("folder_open"), i18n("Scan &Directory..."), this, SLOT(slotScanDir()) ); + scanner_menu->insertItem( SmallIcon("document-open"), i18n("Scan &File..."), this, TQ_SLOT(slotScanFile()), CTRL+Key_O ); + scanner_menu->insertItem( SmallIcon("folder_open"), i18n("Scan &Directory..."), this, TQ_SLOT(slotScanDir()) ); scanner_menu->insertSeparator(); - scanner_menu->insertItem( SmallIcon("xclock"), i18n("&Schedule scan..."), this, SLOT(slotScheduleScan()) ); - scanner_menu->insertItem( SmallIcon("configure"), i18n("&Options..."), this, SLOT(slotOptions()) ); + scanner_menu->insertItem( SmallIcon("xclock"), i18n("&Schedule scan..."), this, TQ_SLOT(slotScheduleScan()) ); + scanner_menu->insertItem( SmallIcon("configure"), i18n("&Options..."), this, TQ_SLOT(slotOptions()) ); scanner_menu->insertSeparator(); - scanner_menu->insertItem( SmallIcon("application-exit"), i18n("&Quit"), kapp, SLOT(quit()) ); + scanner_menu->insertItem( SmallIcon("application-exit"), i18n("&Quit"), kapp, TQ_SLOT(quit()) ); tabs_menu = new TDEPopupMenu(this); tabs_menu->setCheckable(true); - showWelcomeTab = tabs_menu->insertItem( SmallIcon("klamav"), i18n("Show &Welcome tab"), this, SLOT(slotToggleWelcome()) ); - showQuarantineTab = tabs_menu->insertItem( SmallIcon("encrypted"), i18n("Show &Quarantine tab"), this, SLOT(slotToggleQuarantine()) ); - showDBViewerTab = tabs_menu->insertItem( SmallIcon("system-search"), i18n("Show &Virus Browser tab"), this, SLOT(slotToggleDBViewer()) ); - showEventsTab = tabs_menu->insertItem( SmallIcon("toggle_log"), i18n("Show &Events tab"), this, SLOT(slotToggleEvents()) ); + showWelcomeTab = tabs_menu->insertItem( SmallIcon("klamav"), i18n("Show &Welcome tab"), this, TQ_SLOT(slotToggleWelcome()) ); + showQuarantineTab = tabs_menu->insertItem( SmallIcon("encrypted"), i18n("Show &Quarantine tab"), this, TQ_SLOT(slotToggleQuarantine()) ); + showDBViewerTab = tabs_menu->insertItem( SmallIcon("system-search"), i18n("Show &Virus Browser tab"), this, TQ_SLOT(slotToggleDBViewer()) ); + showEventsTab = tabs_menu->insertItem( SmallIcon("toggle_log"), i18n("Show &Events tab"), this, TQ_SLOT(slotToggleEvents()) ); // Menu bar @@ -130,8 +130,8 @@ Klamav::Klamav() freshklam = new Freshklam(this); tab->addTab(freshklam, i18n("Update")); - connect(freshklam->search_button,SIGNAL(clicked()),SLOT(contextUpdateFK())); - connect(freshklam->cancel_button,SIGNAL(clicked()),SLOT(contextDisableFK())); + connect(freshklam->search_button,TQ_SIGNAL(clicked()),TQ_SLOT(contextUpdateFK())); + connect(freshklam->cancel_button,TQ_SIGNAL(clicked()),TQ_SLOT(contextDisableFK())); @@ -148,13 +148,13 @@ Klamav::Klamav() // On-Access scanner klamonacc = new KlamOnAcc(this); - connect( klamonacc, SIGNAL(stateUpdated()), this, SLOT(slotKOAStateUpdate()) ); + connect( klamonacc, TQ_SIGNAL(stateUpdated()), this, TQ_SLOT(slotKOAStateUpdate()) ); slotKOAStateUpdate(); // initial state - connect(tab,SIGNAL(currentChanged ( TQWidget * ) ),klamdb,SLOT(shouldIShow(TQWidget *))); + connect(tab,TQ_SIGNAL(currentChanged ( TQWidget * ) ),klamdb,TQ_SLOT(shouldIShow(TQWidget *))); - KStdAction::quit(this, SLOT(shuttingDown()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(shuttingDown()), actionCollection()); if (TDEApplication::kApplication()->isRestored()){ hide(); @@ -488,7 +488,7 @@ void Klamav::slotConfigKlamav( const TQCString& page ) { //TDEConfigDialog didn't find an instance of this dialog, so lets create it : dialog = new KlamavConfigDialog( this, "settings", KlamavConfig::self() ); - //connect( dialog, SIGNAL(settingsChanged()), SLOT(applySettings()) ); + //connect( dialog, TQ_SIGNAL(settingsChanged()), TQ_SLOT(applySettings()) ); } //FIXME it seems that if the dialog is on a different desktop it gets lost diff --git a/src/klamav_run.cpp b/src/klamav_run.cpp index bbbca31..9e04e2a 100644 --- a/src/klamav_run.cpp +++ b/src/klamav_run.cpp @@ -16,7 +16,7 @@ BrowserRun::BrowserRun(Viewer *viewer, TQWidget *parent, KParts::ReadOnlyPart *p : KParts::BrowserRun(url, args, part, parent, false, true) { m_viewer=viewer; - connect(m_viewer, SIGNAL(destroyed()), this, SLOT(killMyself())); + connect(m_viewer, TQ_SIGNAL(destroyed()), this, TQ_SLOT(killMyself())); setEnableExternalBrowser(false); } diff --git a/src/klamonacc.cpp b/src/klamonacc.cpp index 76a41d8..0a6b588 100644 --- a/src/klamonacc.cpp +++ b/src/klamonacc.cpp @@ -150,8 +150,8 @@ void KlamOnAcc::startProcess( TQString command ) *childproc << command; childproc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); - connect( childproc, SIGNAL(receivedStdout(TDEProcess*, char*, int)), SLOT(processOutput(TDEProcess*, char*, int)) ); - connect( childproc, SIGNAL(processExited(TDEProcess*)), SLOT(childExited()) ); + connect( childproc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(processOutput(TDEProcess*, char*, int)) ); + connect( childproc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(childExited()) ); emit stateUpdated(); } diff --git a/src/klamscan.cpp b/src/klamscan.cpp index 7d116d8..44ca38c 100644 --- a/src/klamscan.cpp +++ b/src/klamscan.cpp @@ -108,7 +108,7 @@ Klamscan::Klamscan(TQWidget *parent, const char *name) schedule->adjustSize(); layout->addWidget(schedule,0,4); - connect( schedule, SIGNAL(clicked()), tdemain, SLOT(slotScheduleScan()) ); + connect( schedule, TQ_SIGNAL(clicked()), tdemain, TQ_SLOT(slotScheduleScan()) ); TQToolButton* adv_options = new TQToolButton( privateLayoutWidget2,"play" ); @@ -120,13 +120,13 @@ Klamscan::Klamscan(TQWidget *parent, const char *name) //adv_options->setFixedSize(adv_options->sizeHint()); adv_options->adjustSize(); - connect( adv_options, SIGNAL(clicked()), - SLOT(slotAdvOptions()) ); + connect( adv_options, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAdvOptions()) ); setup = new CollectionSetup( privateLayoutWidget2, recursive_box->isChecked() ); layout->addMultiCellWidget(setup, 1, 6,0,6); - connect( recursive_box, SIGNAL(toggled(bool)),setup, - SLOT(slotRecursiveToggled(bool)) ); + connect( recursive_box, TQ_SIGNAL(toggled(bool)),setup, + TQ_SLOT(slotRecursiveToggled(bool)) ); @@ -159,12 +159,12 @@ Klamscan::Klamscan(TQWidget *parent, const char *name) m_tabsClose->setFixedHeight(m_tabsClose->height() - 1); - connect( play, SIGNAL( clicked() ), this, - SLOT( slotStartAgain() ) ); - connect( stop, SIGNAL( clicked() ), this, - SLOT( slotStopScanning() ) ); - connect( m_tabsClose, SIGNAL( clicked() ), this, - SLOT( slotRemoveTab() ) ); + connect( play, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotStartAgain() ) ); + connect( stop, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotStopScanning() ) ); + connect( m_tabsClose, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotRemoveTab() ) ); controls->adjustSize(); tabBrowser->setCornerWidget( controls, TopRight ); @@ -177,8 +177,8 @@ Klamscan::Klamscan(TQWidget *parent, const char *name) layout->activate(); - connect(tabBrowser, SIGNAL(currentChanged(TQWidget *)),this, - SLOT(slotManageButtons(TQWidget *)) ); + connect(tabBrowser, TQ_SIGNAL(currentChanged(TQWidget *)),this, + TQ_SLOT(slotManageButtons(TQWidget *)) ); // Register with DCOP @@ -212,11 +212,11 @@ bool Klamscan::scanGoingOn() { void Klamscan::scan( TQStringList filepattern ) { ScanViewer* homepage = new ScanViewer(this, "page"); - connect( homepage, SIGNAL( scanFinished(TQWidget *) ), this, - SLOT( slotManageButtons(TQWidget *) ) ); + connect( homepage, TQ_SIGNAL( scanFinished(TQWidget *) ), this, + TQ_SLOT( slotManageButtons(TQWidget *) ) ); - connect( homepage, SIGNAL( scanStartingAgain(TQWidget *) ), this, - SLOT( slotManageButtons(TQWidget *) ) ); + connect( homepage, TQ_SIGNAL( scanStartingAgain(TQWidget *) ), this, + TQ_SLOT( slotManageButtons(TQWidget *) ) ); tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scanning")); @@ -372,10 +372,10 @@ void Klamscan::scanURLs(const TQString &urls) ScanViewer* homepage = new ScanViewer(this, "page"); - connect( homepage, SIGNAL( scanFinished(TQWidget *) ), this, - SLOT( slotManageButtons(TQWidget *) ) ); - connect( homepage, SIGNAL( scanStartingAgain(TQWidget *) ), this, - SLOT( slotManageButtons(TQWidget *) ) ); + connect( homepage, TQ_SIGNAL( scanFinished(TQWidget *) ), this, + TQ_SLOT( slotManageButtons(TQWidget *) ) ); + connect( homepage, TQ_SIGNAL( scanStartingAgain(TQWidget *) ), this, + TQ_SLOT( slotManageButtons(TQWidget *) ) ); TQDate today = TQDate::currentDate(); TQTime now = TQTime::currentTime(); diff --git a/src/klamscanoptions.cpp b/src/klamscanoptions.cpp index cb1140e..4cb0ecf 100644 --- a/src/klamscanoptions.cpp +++ b/src/klamscanoptions.cpp @@ -161,13 +161,13 @@ KlamscanOptions::KlamscanOptions( TQWidget* parent, const char* name, bool modal OK->setGeometry( TQRect( 190, 626, 91, 31 ) ); OK->setDefault( TRUE ); - connect( OK, SIGNAL(clicked()), - SLOT(updateSettings()) ); + connect( OK, TQ_SIGNAL(clicked()), + TQ_SLOT(updateSettings()) ); Cancel = new TQPushButton( this, i18n( "Cancel" ) ); Cancel->setGeometry( TQRect( 300, 626, 91, 31 ) ); - connect( Cancel, SIGNAL(clicked()), - SLOT(close()) ); + connect( Cancel, TQ_SIGNAL(clicked()), + TQ_SLOT(close()) ); languageChange(); resize( TQSize(589, 667).expandedTo(minimumSizeHint()) ); diff --git a/src/ktview.cpp b/src/ktview.cpp index dd018a1..9c8eb95 100644 --- a/src/ktview.cpp +++ b/src/ktview.cpp @@ -63,17 +63,17 @@ KTView::KTView(TQWidget *parent, const char* name) : refresh(); listView->setSelected(listView->firstChild(), true); -// connect(this, SIGNAL(enableModificationButtons(bool)), parent, -// SLOT(slotEnableModificationButtons(bool))); +// connect(this, TQ_SIGNAL(enableModificationButtons(bool)), parent, +// TQ_SLOT(slotEnableModificationButtons(bool))); // -// connect(this, SIGNAL(enablePaste(bool)), parent, -// SLOT(slotEnablePaste(bool))); +// connect(this, TQ_SIGNAL(enablePaste(bool)), parent, +// TQ_SLOT(slotEnablePaste(bool))); // -// connect(this, SIGNAL(enableRunNow(bool)), parent, -// SLOT(slotEnableRunNow(bool))); +// connect(this, TQ_SIGNAL(enableRunNow(bool)), parent, +// TQ_SLOT(slotEnableRunNow(bool))); // -// connect(this, SIGNAL(enableEnabled(bool)), parent, -// SLOT(slotEnableEnabled(bool))); +// connect(this, TQ_SIGNAL(enableEnabled(bool)), parent, +// TQ_SLOT(slotEnableEnabled(bool))); // // emit(enableModificationButtons(false)); // emit(enablePaste(clipboardCTVariable)); @@ -161,17 +161,17 @@ void KTView::refresh() resizeEvent(); - connect(listView, SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), - SLOT(slotMenu(TQListViewItem*, const TQPoint&, int))); + connect(listView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotMenu(TQListViewItem*, const TQPoint&, int))); - connect(listView, SIGNAL(selectionChanged(TQListViewItem*)), - SLOT(slotSetCurrent(TQListViewItem*))); + connect(listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSetCurrent(TQListViewItem*))); - connect(listView, SIGNAL(doubleClicked(TQListViewItem*)), - SLOT(slotEdit(TQListViewItem*))); + connect(listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(slotEdit(TQListViewItem*))); - connect(listView, SIGNAL(returnPressed(TQListViewItem*)), - SLOT(slotEdit(TQListViewItem*))); + connect(listView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotEdit(TQListViewItem*))); // switch to the new view diff --git a/src/kuarantine.cpp b/src/kuarantine.cpp index ac25608..a436ba4 100644 --- a/src/kuarantine.cpp +++ b/src/kuarantine.cpp @@ -102,10 +102,10 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name) dir_layout->addWidget(dir_combo); dir_label->setBuddy(dir_combo); - connect( dir_combo, SIGNAL(urlSelected(const TQString &)), - SLOT(updateLastQuarLocations()) ); - connect( dir_combo, SIGNAL(textChanged(const TQString &)), - SLOT(updateLastQuarLocations()) ); + connect( dir_combo, TQ_SIGNAL(urlSelected(const TQString &)), + TQ_SLOT(updateLastQuarLocations()) ); + connect( dir_combo, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(updateLastQuarLocations()) ); @@ -145,8 +145,8 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name) qmenu = new TQPopupMenu( currentbox ); - connect(currentbox, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), - this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); + connect(currentbox, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), + this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); dir_layout2->addWidget(currentbox); @@ -168,13 +168,13 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name) dir_layout2->addWidget(actionbox); - connect( refresh_button, SIGNAL(clicked()), - SLOT(refresh()) ); + connect( refresh_button, TQ_SIGNAL(clicked()), + TQ_SLOT(refresh()) ); - connect( search_button, SIGNAL(clicked()), - SLOT(slotSearch()) ); - connect( cancel_button, SIGNAL(clicked()), - SLOT(slotCancel()) ); + connect( search_button, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSearch()) ); + connect( cancel_button, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCancel()) ); @@ -213,8 +213,8 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name) hmenu = new TQPopupMenu( historybox ); - connect(historybox, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), - this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); + connect(historybox, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), + this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); dir_layout3->addWidget(historybox); //layout->addMultiCellWidget(historybox, 2, 2, 0, 2); @@ -232,10 +232,10 @@ Kuarantine::Kuarantine(TQWidget *parent, const char *name) refreshhistory(); - connect( search_button3, SIGNAL(clicked()), - SLOT(slotClearHistory()) ); - connect( cancel_button3, SIGNAL(clicked()), - SLOT(slotDeleteHistory()) ); + connect( search_button3, TQ_SIGNAL(clicked()), + TQ_SLOT(slotClearHistory()) ); + connect( cancel_button3, TQ_SIGNAL(clicked()), + TQ_SLOT(slotDeleteHistory()) ); @@ -637,14 +637,14 @@ void Kuarantine::slotRMB( TQListViewItem* Item, const TQPoint & point, int ) if (Item->listView() == currentbox){ qmenu->clear(); - qmenu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicroCurrent()) ); - qmenu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogleCurrent()) ); + qmenu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, TQ_SLOT(slotTrendMicroCurrent()) ); + qmenu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, TQ_SLOT(slotGoogleCurrent()) ); qmenu->popup( point ); }else if (Item->listView() == historybox){ hmenu->clear(); - hmenu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicroHistory()) ); - hmenu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogleHistory()) ); + hmenu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, TQ_SLOT(slotTrendMicroHistory()) ); + hmenu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, TQ_SLOT(slotGoogleHistory()) ); hmenu->popup( point ); } diff --git a/src/pageviewer.cpp b/src/pageviewer.cpp index 34b65a1..4eba168 100644 --- a/src/pageviewer.cpp +++ b/src/pageviewer.cpp @@ -32,42 +32,42 @@ PageViewer::PageViewer(TQWidget *parent, const char *name) s->init(); //setXMLFile(locate("data", "akregator/pageviewer.rc"), true); - m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, SLOT(slotBack()), actionCollection(), "pageviewer_back"); + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQ_SLOT(slotBack()), actionCollection(), "pageviewer_back"); - connect(m_backAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotBackAboutToShow())); - connect(m_backAction->popupMenu(), SIGNAL(activated(int)), - this, SLOT(slotPopupActivated(int))); + connect(m_backAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotBackAboutToShow())); + connect(m_backAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); - m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, SLOT(slotForward()), actionCollection(), "pageviewer_forward"); + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQ_SLOT(slotForward()), actionCollection(), "pageviewer_forward"); - connect(m_forwardAction->popupMenu(), SIGNAL(aboutToShow()), - this, SLOT(slotForwardAboutToShow())); - connect(m_forwardAction->popupMenu(), SIGNAL(activated(int)), - this, SLOT(slotPopupActivated(int))); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotForwardAboutToShow())); + connect(m_forwardAction->popupMenu(), TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPopupActivated(int))); m_reloadAction = new TDEAction(i18n("Reload"), "reload", 0, - this, SLOT(slotReload()), + this, TQ_SLOT(slotReload()), actionCollection(), "pageviewer_reload"); m_stopAction = new TDEAction(i18n("Stop"), "stop", 0, - this, SLOT(slotStop()), + this, TQ_SLOT(slotStop()), actionCollection(), "pageviewer_stop"); - //connect( this, SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, SLOT(slotPopupMenu(const TQString &, const TQPoint &))); + //connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotPopupMenu(const TQString &, const TQPoint &))); m_backAction->setEnabled(false); m_forwardAction->setEnabled(false); m_stopAction->setEnabled(false); - connect(this, SIGNAL(started(TDEIO::Job *)), this, SLOT(slotStarted(TDEIO::Job* ))); - connect(this, SIGNAL(completed()), this, SLOT(slotCompleted())); - connect(this, SIGNAL(canceled(const TQString &)), this, SLOT(slotCancelled(const TQString &))); + connect(this, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(slotStarted(TDEIO::Job* ))); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted())); + connect(this, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotCancelled(const TQString &))); connect(browserExtension(), - SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, - SLOT(formClicked(const KURL&, const KParts::URLArgs&))); + TQ_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); m_current = m_history.end(); m_restoring = false; @@ -300,9 +300,9 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur int idNewWindow = -2; if (isLink) { - idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, SLOT(slotOpenLinkInForegroundTab())); + idNewWindow = popup.insertItem(SmallIcon("tab_new"),i18n("Open Link in New &Tab"), this, TQ_SLOT(slotOpenLinkInForegroundTab())); popup.setWhatsThis(idNewWindow, i18n("Open Link in New Tab

Opens current link in a new tab.")); - popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); popup.insertSeparator(); @@ -339,7 +339,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur popup.insertSeparator(); } - popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Page in External Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); action("viewer_print")->plug(&popup); popup.insertSeparator(); @@ -347,7 +347,7 @@ void PageViewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kur TDEAction *ac = action("setEncoding"); if (ac) ac->plug(&popup); - popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, SLOT(slotGlobalBookmarkArticle())); + popup.insertItem(SmallIcon("bookmark_add"),i18n("Add to Konqueror Bookmarks"), this, TQ_SLOT(slotGlobalBookmarkArticle())); } int r = popup.exec(p); diff --git a/src/scanviewer.cpp b/src/scanviewer.cpp index 2fc6bc3..1985db4 100644 --- a/src/scanviewer.cpp +++ b/src/scanviewer.cpp @@ -70,15 +70,15 @@ ScanViewer::ScanViewer(TQWidget *parent, const char *name) resultview->setAllColumnsShowFocus(true); layout->addMultiCellWidget(resultview, 2, 2, 0, 2); - connect( resultview, SIGNAL(onItem ( TQListViewItem * )), - SLOT(slotOnItem ( TQListViewItem * ))); - connect( resultview, SIGNAL(onViewport ( )), - SLOT(slotOffItem ( ))); + connect( resultview, TQ_SIGNAL(onItem ( TQListViewItem * )), + TQ_SLOT(slotOnItem ( TQListViewItem * ))); + connect( resultview, TQ_SIGNAL(onViewport ( )), + TQ_SLOT(slotOffItem ( ))); menu = new TQPopupMenu( resultview ); - connect(resultview, SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), - this, SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); + connect(resultview, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), + this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); status_frame = new TQFrame(this); status_frame->setFrameStyle(TQFrame::Panel | TQFrame::Sunken); @@ -125,8 +125,8 @@ ScanViewer::ScanViewer(TQWidget *parent, const char *name) scan_time->show(); //status_frame->setPaletteBackgroundColor(TQColor::Yellow); - connect( scan_time, SIGNAL(clicked()), - SLOT(slotCancelScanTime()) ); + connect( scan_time, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCancelScanTime()) ); @@ -509,17 +509,17 @@ void ScanViewer::slotScan(const TQStringList & filepattern, int mode, bool recur *childproc << "'" + m_filepattern.join("' '") + "'"; -/* connect( childproc, SIGNAL(processExited(TDEProcess *)), - SLOT(childExited()) ); - connect( childproc, SIGNAL(receivedStdout(TDEProcess *, char *, int)), - SLOT(receivedOutput(TDEProcess *, char *, int)) ); +/* connect( childproc, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(childExited()) ); + connect( childproc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(receivedOutput(TDEProcess *, char *, int)) ); childproc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);*/ - connect( childproc, SIGNAL(readReady(KProcIO *)), - SLOT(receivedOutput(KProcIO *)) ); + connect( childproc, TQ_SIGNAL(readReady(KProcIO *)), + TQ_SLOT(receivedOutput(KProcIO *)) ); childproc->start(KProcIO::NotifyOnExit); - connect( childproc, SIGNAL(processExited(TDEProcess *)), - SLOT(childExited()) ); + connect( childproc, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(childExited()) ); scanInProgress = TRUE; @@ -592,7 +592,7 @@ void ScanViewer::childExited() if (status == 0){ tdemain->_tray->setPixmap(KSystemTray::loadIcon("klamav_scan_safe")); - TQTimer::singleShot( 10000, this, SLOT(resetSysTray()) ); + TQTimer::singleShot( 10000, this, TQ_SLOT(resetSysTray()) ); if (!(errorsEncountered)) KNotifyClient::event(tdemain->_tray->winId(),"Scan Complete - No Virus Found", i18n("Scan Complete - No Viruses Found!")); else @@ -778,11 +778,11 @@ void ScanViewer::slotRMB( TQListViewItem* Item, const TQPoint & point, int ) vlicon = TQPixmap( iconPath ); menu->clear(); - menu->insertItem( "Quarantine Selected", this,SLOT(slotQuarantineSelected()) ); + menu->insertItem( "Quarantine Selected", this,TQ_SLOT(slotQuarantineSelected()) ); - menu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, SLOT(slotTrendMicro()) ); + menu->insertItem( ticon,i18n("Search for %1 with Trend Micro").arg(Item->text(1)), this, TQ_SLOT(slotTrendMicro()) ); - menu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, SLOT(slotGoogle()) ); + menu->insertItem( gicon,i18n("Search for %1 with Google").arg(Item->text(1)), this, TQ_SLOT(slotGoogle()) ); menu->popup( point ); } } @@ -921,7 +921,7 @@ void ScanViewer::startProgressDialog( const TQString & text ) progressDialog->show(); timer = new TQTimer( this ); - connect( timer, SIGNAL( timeout() ), this, SLOT( slotProg() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProg() ) ); timer->start( 200, FALSE ); } diff --git a/src/schedule.cpp b/src/schedule.cpp index 7ea7a22..02d11c4 100644 --- a/src/schedule.cpp +++ b/src/schedule.cpp @@ -80,8 +80,8 @@ Schedule::Schedule( TQWidget* parent, const char* name, bool modal, WFlags fl ) check_combo->insertItem( i18n("Once only on a specific date at")); layout->addWidget(check_combo,1,0); - connect( check_combo, SIGNAL(activated(int)),this, - SLOT(slotQueryDatePicker(int)) ); + connect( check_combo, TQ_SIGNAL(activated(int)),this, + TQ_SLOT(slotQueryDatePicker(int)) ); hour = new HMSTimeWidget( group ); @@ -109,15 +109,15 @@ Schedule::Schedule( TQWidget* parent, const char* name, bool modal, WFlags fl ) layout->addWidget(add,1,5); //add->setFixedSize(add->sizeHint()); - connect( add, SIGNAL(clicked()), - SLOT(slotScheduleScan()) ); + connect( add, TQ_SIGNAL(clicked()), + TQ_SLOT(slotScheduleScan()) ); TQPushButton* del = new TQPushButton ("Delete", group); layout->addWidget(del,1,6); //del->setFixedSize(del->sizeHint()); - connect( del, SIGNAL(clicked()), - SLOT(slotDelete()) ); + connect( del, TQ_SIGNAL(clicked()), + TQ_SLOT(slotDelete()) ); //schedulebox = new TQListView(group); @@ -146,8 +146,8 @@ Schedule::Schedule( TQWidget* parent, const char* name, bool modal, WFlags fl ) // KPushButton *pbCancel = new KPushButton(KStdGuiItem::cancel(), this, "pbCancel"); // h5->addWidget( pbCancel); - connect(pbOk, SIGNAL(clicked()), SLOT(slotOK())); -/* connect(pbCancel, SIGNAL(clicked()), SLOT(slotCancel()));*/ + connect(pbOk, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK())); +/* connect(pbCancel, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancel()));*/ schedulebox->hideCommand(); } @@ -169,8 +169,8 @@ void Schedule::slotQueryDatePicker(int) _calendar->move(TQPoint(x,y)); _calendar->show(); _calendar->setFocus(); - connect( _calendar, SIGNAL(signalSelectedDate(TQDate)),this, - SLOT(slotAddDateToCombo(TQDate)) ); + connect( _calendar, TQ_SIGNAL(signalSelectedDate(TQDate)),this, + TQ_SLOT(slotAddDateToCombo(TQDate)) ); } } @@ -495,10 +495,10 @@ void Schedule::getICEauth() *iceproc<start(KProcIO::NotifyOnExit); iceproc->closeWhenDone(); diff --git a/src/sigtool.cpp b/src/sigtool.cpp index 3568503..c796f56 100644 --- a/src/sigtool.cpp +++ b/src/sigtool.cpp @@ -109,12 +109,12 @@ Sigtool::Sigtool(TQWidget *parent, const char *name) - connect( search_button, SIGNAL(clicked()), - SLOT(configureKMail()) ); - connect( manual_button, SIGNAL(clicked()), - SLOT(manual()) ); - connect( check_combo, SIGNAL(activated(const TQString &)), - SLOT(dobuttons()) ); + connect( search_button, TQ_SIGNAL(clicked()), + TQ_SLOT(configureKMail()) ); + connect( manual_button, TQ_SIGNAL(clicked()), + TQ_SLOT(manual()) ); + connect( check_combo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(dobuttons()) ); diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp index 2c42d55..dc199a5 100644 --- a/src/tabwidget.cpp +++ b/src/tabwidget.cpp @@ -24,9 +24,9 @@ TabWidget::TabWidget(TQWidget * parent, const char *name, TQStringList fixed) { fixedTabs = TQStringList(fixed); setTabReorderingEnabled(true); - connect( this, SIGNAL( currentChanged(TQWidget *) ), this, - SLOT( slotTabChanged(TQWidget *) ) ); - connect(this, SIGNAL(closeRequest(TQWidget*)), this, SLOT(slotCloseRequest(TQWidget*))); + connect( this, TQ_SIGNAL( currentChanged(TQWidget *) ), this, + TQ_SLOT( slotTabChanged(TQWidget *) ) ); + connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(slotCloseRequest(TQWidget*))); //setHoverCloseButton(Settings::closeButtonOnTabs()); } @@ -152,10 +152,10 @@ void TabWidget::contextMenu(int i, const TQPoint &p) currentItem = page(i); TDEPopupMenu popup; - int moveTabLeft = popup.insertItem( SmallIcon("back"), i18n("Move Tab &Left"), this, SLOT(slotMoveTabLeft()) ); - int moveTabRight = popup.insertItem( SmallIcon("forward"), i18n("Move Tab &Right"), this, SLOT(slotMoveTabRight()) ); + int moveTabLeft = popup.insertItem( SmallIcon("back"), i18n("Move Tab &Left"), this, TQ_SLOT(slotMoveTabLeft()) ); + int moveTabRight = popup.insertItem( SmallIcon("forward"), i18n("Move Tab &Right"), this, TQ_SLOT(slotMoveTabRight()) ); popup.insertSeparator(); - int closeTab = popup.insertItem( SmallIcon("tab_remove"), i18n("Close Tab"), this, SLOT(slotCloseTab()) ); + int closeTab = popup.insertItem( SmallIcon("tab_remove"), i18n("Close Tab"), this, TQ_SLOT(slotCloseTab()) ); if(currentItemId == 0) popup.setItemEnabled(moveTabLeft, false); diff --git a/src/viewer.cpp b/src/viewer.cpp index e35463c..3e656cf 100644 --- a/src/viewer.cpp +++ b/src/viewer.cpp @@ -35,29 +35,29 @@ Viewer::Viewer(TQWidget *parent, const char *name) setStatusMessagesEnabled(true); // change the cursor when loading stuff... - connect( this, SIGNAL(started(TDEIO::Job *)), - this, SLOT(slotStarted(TDEIO::Job *))); - connect( this, SIGNAL(completed()), - this, SLOT(slotCompleted())); + connect( this, TQ_SIGNAL(started(TDEIO::Job *)), + this, TQ_SLOT(slotStarted(TDEIO::Job *))); + connect( this, TQ_SIGNAL(completed()), + this, TQ_SLOT(slotCompleted())); - connect( browserExtension(), SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); + connect( browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), this, TQ_SLOT(slotOpenURLRequest(const KURL&, const KParts::URLArgs& )) ); connect( browserExtension(), -SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const - KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const +TQ_SIGNAL(popupMenu (KXMLGUIClient*, const TQPoint&, const KURL&, const + KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t)), this, TQ_SLOT(slotPopupMenu(KXMLGUIClient*, const TQPoint&, const KURL&, const KParts::URLArgs&, KParts::BrowserExtension::PopupFlags, mode_t))); - KStdAction::print(this, SLOT(slotPrint()), actionCollection(), "viewer_print"); - KStdAction::copy(this, SLOT(slotCopy()), actionCollection(), "viewer_copy"); + KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection(), "viewer_print"); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection(), "viewer_copy"); - new TDEAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); - new TDEAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); + new TDEAction( i18n("&Increase Font Sizes"), "viewmag+", "Ctrl+Plus", this, TQ_SLOT(slotZoomIn()), actionCollection(), "incFontSizes" ); + new TDEAction( i18n("&Decrease Font Sizes"), "viewmag-", "Ctrl+Minus", this, TQ_SLOT(slotZoomOut()), actionCollection(), "decFontSizes" ); - connect(this, SIGNAL(selectionChanged()), this, SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); new TDEAction(i18n("Copy &Link Address"), "", 0, - this, SLOT(slotCopyLinkAddress()), + this, TQ_SLOT(slotCopyLinkAddress()), actionCollection(), "copylinkaddress"); } @@ -166,8 +166,8 @@ void Viewer::slotPopupMenu(KXMLGUIClient*, const TQPoint& p, const KURL& kurl, c if (!url.isEmpty()) { - popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, SLOT(slotOpenLinkInForegroundTab())); - popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, SLOT(slotOpenLinkInBrowser())); + popup.insertItem(SmallIcon("tab_new"), i18n("Open Link in New &Tab"), this, TQ_SLOT(slotOpenLinkInForegroundTab())); + popup.insertItem(SmallIcon("window-new"), i18n("Open Link in External &Browser"), this, TQ_SLOT(slotOpenLinkInBrowser())); action("copylinkaddress")->plug(&popup); } else @@ -188,9 +188,9 @@ void Viewer::slotCopy() TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, SIGNAL( selectionChanged() ), this, SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); cb->setText(text); - connect( cb, SIGNAL( selectionChanged() ), this, SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotClearSelection() ) ); } void Viewer::slotCopyLinkAddress()