diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-12 10:51:50 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-16 10:03:43 +0900 |
| commit | a4241b7911d2e0b36edfb02f616b8b282050c0ec (patch) | |
| tree | 316c9a3298857645d5da57b682fce707c8e2a907 | |
| parent | f9d06cee3d2b4ffe415b1d52c9ad5575643a9e34 (diff) | |
| download | tdebase-a4241b79.tar.gz tdebase-a4241b79.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
608 files changed, 6388 insertions, 6388 deletions
diff --git a/doc/khelpcenter/license/TDELicenseDlg.cpp b/doc/khelpcenter/license/TDELicenseDlg.cpp index 2f65ecb68..a572389db 100644 --- a/doc/khelpcenter/license/TDELicenseDlg.cpp +++ b/doc/khelpcenter/license/TDELicenseDlg.cpp @@ -95,7 +95,7 @@ TDELicenseDlg::TDELicenseDlg(TQWidget *parent, const char *name) TQSizePolicy::Minimum); hboxBottom->addItem(spacerHBottom); KPushButton *okButton = new KPushButton(KStdGuiItem::ok(), this); - connect(okButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(okButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); okButton->setDefault(true); okButton->setFocus(); hboxBottom->addWidget(okButton); diff --git a/doc/khelpcenter/license/mainWindow.cpp b/doc/khelpcenter/license/mainWindow.cpp index b6885e92b..78b50f576 100644 --- a/doc/khelpcenter/license/mainWindow.cpp +++ b/doc/khelpcenter/license/mainWindow.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) TDECmdLineArgs::init(argc,argv, &aboutData); TDEApplication::addCmdLineOptions(); TDEApplication app; - TQObject::connect(tqApp, TQT_SIGNAL(lastWindowClosed()), tqApp, TQT_SLOT(quit())); + TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit())); TDELicenseDlg *licenseDlg = new TDELicenseDlg(); app.setMainWidget(licenseDlg); diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook index 45846b761..08ca89534 100644 --- a/doc/ksplashml/index.docbook +++ b/doc/ksplashml/index.docbook @@ -1267,7 +1267,7 @@ c2, int sp ) preparePixmap( i ); m_stepTimer = new QTimer( this ); - connect(m_stepTimer, SIGNAL(timeout()), this, SLOT(stepEvent())); + connect(m_stepTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(stepEvent())); m_stepTimer->start( 50 ); } diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index ac82e4417..813020190 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -148,10 +148,10 @@ void BackTrace::start() *m_proc << "tdesu -t --comment \"" << i18n("Administrative access is required to generate a backtrace") << "\" -c \"" << m_temp_cmd->name() << "\""; } - connect(m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReadInput(TDEProcess*, char*, int))); - connect(m_proc, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReadInput(TDEProcess*, char*, int))); + connect(m_proc, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*))); m_proc->start ( TDEProcess::NotifyOnExit, TDEProcess::All ); } diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp index f1ff70df4..0141b1031 100644 --- a/drkonqi/crashtest.cpp +++ b/drkonqi/crashtest.cpp @@ -21,7 +21,7 @@ void WorkerObject::run() #define SET_UP_WORKER(x, y) \ WorkerObject x; \ x.moveToThread(&y); \ - TQTimer::singleShot(0, &x, SLOT(run())); + TQTimer::singleShot(0, &x, TQ_SLOT(run())); static TDECmdLineOptions options[] = { diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index a9625d44a..2de6fb3f8 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -64,10 +64,10 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent, //m_copyButton = new KPushButton( KStdGuiItem::copy(), w ); KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "edit-copy" ) ); m_copyButton = new KPushButton( item, w ); - connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); + connect( m_copyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopy() ) ); m_copyButton->setEnabled( false ); m_saveButton = new KPushButton( m_krashconf->safeMode() ? KStdGuiItem::save() : KStdGuiItem::saveAs(), w ); - connect( m_saveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSave() ) ); + connect( m_saveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSave() ) ); m_saveButton->setEnabled( false ); } @@ -195,10 +195,10 @@ void KrashDebugger :: startDebugger() m_proctrace = new BackTrace(m_krashconf, this); - connect(m_proctrace, TQT_SIGNAL(append(const TQString &)), - TQT_SLOT(slotAppend(const TQString &))); - connect(m_proctrace, TQT_SIGNAL(done(const TQString&)), TQT_SLOT(slotDone(const TQString&))); - connect(m_proctrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSomeError())); + connect(m_proctrace, TQ_SIGNAL(append(const TQString &)), + TQ_SLOT(slotAppend(const TQString &))); + connect(m_proctrace, TQ_SIGNAL(done(const TQString&)), TQ_SLOT(slotDone(const TQString&))); + connect(m_proctrace, TQ_SIGNAL(someError()), TQ_SLOT(slotSomeError())); m_proctrace->start(); } diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index 969a1a8cd..0e3a38a49 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -89,8 +89,8 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name) showButton( User2, m_krashconf->showDebugger() ); showButton( User3, true ); - connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(accept())); - connect(m_krashconf, TQT_SIGNAL(newDebuggingApplication(const TQString&)), TQT_SLOT(slotNewDebuggingApp(const TQString&))); + connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(accept())); + connect(m_krashconf, TQ_SIGNAL(newDebuggingApplication(const TQString&)), TQ_SLOT(slotNewDebuggingApp(const TQString&))); if ( !m_krashconf->safeMode() && kapp->dcopClient()->attach() ) kapp->dcopClient()->registerAs( kapp->name() ); @@ -160,8 +160,8 @@ void Toplevel :: slotUser1() // generate the backtrace BackTrace *backtrace = new BackTrace(m_krashconf, this); - connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotBacktraceSomeError())); - connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotBacktraceDone(const TQString &))); + connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotBacktraceSomeError())); + connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotBacktraceDone(const TQString &))); backtrace->start(); @@ -199,8 +199,8 @@ void Toplevel :: slotUser3() // generate the backtrace BackTrace *backtrace = new BackTrace(m_krashconf, this); - connect(backtrace, TQT_SIGNAL(someError()), TQT_SLOT(slotSendReportBacktraceSomeError())); - connect(backtrace, TQT_SIGNAL(done(const TQString &)), TQT_SLOT(slotSendReportBacktraceDone(const TQString &))); + connect(backtrace, TQ_SIGNAL(someError()), TQ_SLOT(slotSendReportBacktraceSomeError())); + connect(backtrace, TQ_SIGNAL(done(const TQString &)), TQ_SLOT(slotSendReportBacktraceDone(const TQString &))); backtrace->start(); @@ -399,13 +399,13 @@ int Toplevel::postCrashDataToServer(TQCString data) { TDEIO::TransferJob* job = TDEIO::http_post(url, postData, true); job->addMetaData("content-type", TQString("Content-Type: multipart/form-data; boundary=%1").arg(formDataBoundary)); job->addMetaData("referrer", "http://drkonqi-client.crashreport.trinitydesktop.org"); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(postCrashDataToServerData(TDEIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(postCrashDataToServerResult(TDEIO::Job *))); -// connect(job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), -// TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); -// connect(job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), -// TQT_SLOT(mimetype(TDEIO::Job *, const TQString &))); - connect(job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), TQT_SLOT(postCrashDataToServerDataRedirection(TDEIO::Job *, const KURL&))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(postCrashDataToServerData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(postCrashDataToServerResult(TDEIO::Job *))); +// connect(job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), +// TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); +// connect(job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), +// TQ_SLOT(mimetype(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), TQ_SLOT(postCrashDataToServerDataRedirection(TDEIO::Job *, const KURL&))); return 0; } diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index bcf8e6aef..a5290e531 100644 --- a/kappfinder/toplevel.cpp +++ b/kappfinder/toplevel.cpp @@ -77,23 +77,23 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name layout->addWidget( mSummary ); KButtonBox* bbox = new KButtonBox( this ); - mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), this, TQT_SLOT( slotScan() ) ); + mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "edit-find"), this, TQ_SLOT( slotScan() ) ); bbox->addStretch( 5 ); mSelectButton = bbox->addButton( i18n( "Select All" ), this, - TQT_SLOT( slotSelectAll() ) ); + TQ_SLOT( slotSelectAll() ) ); mSelectButton->setEnabled( false ); mUnSelectButton = bbox->addButton( i18n( "Unselect All" ), this, - TQT_SLOT( slotUnselectAll() ) ); + TQ_SLOT( slotUnselectAll() ) ); mUnSelectButton->setEnabled( false ); bbox->addStretch( 5 ); - mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) ); + mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQ_SLOT( slotCreate() ) ); mApplyButton->setEnabled( false ); - bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) ); + bbox->addButton( KStdGuiItem::close(), kapp, TQ_SLOT( quit() ) ); bbox->layout(); layout->addWidget( bbox ); - connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) ); + connect( kapp, TQ_SIGNAL( lastWindowClosed() ), kapp, TQ_SLOT( quit() ) ); mAppCache.setAutoDelete( true ); @@ -105,7 +105,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name TDEStartupInfo::appStarted(); TQAccel *accel = new TQAccel( this ); - accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQT_SLOT( quit() ) ); + accel->connectItem( accel->insertItem( Key_Q + CTRL ), kapp, TQ_SLOT( quit() ) ); TDEAcceleratorManager::manage( this ); } diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index c2763f73a..1d3cfd5aa 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -110,13 +110,13 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) cb_fullPath = new TQCheckBox(i18n("&Show full path in title"), bgStartup); cb_fullPath->setChecked(mainWindow->viewManager()->getShowFullPath()); TQWhatsThis::add(cb_fullPath, i18n("If this option is checked, the full document path will be shown in the window caption.")); - connect(cb_fullPath, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(cb_fullPath, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); // show session name in title cb_showSessionName = new TQCheckBox(i18n("Show s&ession name in title"), bgStartup); cb_showSessionName->setChecked(parent->showSessionName); TQWhatsThis::add(cb_showSessionName, i18n("If this option is checked, the session name will be shown in the window caption.")); - connect(cb_showSessionName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(cb_showSessionName, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); // sort filelist if desired cb_sortFiles = new TQCheckBox(bgStartup); @@ -124,7 +124,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) cb_sortFiles->setChecked(parent->filelist->sortType() == KateFileList::sortByName); TQWhatsThis::add( cb_sortFiles, i18n( "If this is checked, the files in the file list will be sorted alphabetically.") ); - connect( cb_sortFiles, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cb_sortFiles, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // GROUP with the one below: "Behavior" bgStartup = new TQButtonGroup( 1, TQt::Horizontal, i18n("&Behavior"), frGeneral ); @@ -142,7 +142,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) "some items forgotten.</qt>") ); TQWhatsThis::add( lNrf, numRecentFileHelpString ); TQWhatsThis::add( sb_numRecentFiles, numRecentFileHelpString ); - connect( sb_numRecentFiles, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( sb_numRecentFiles, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); // Use only one instance of kate (MDI) ? cb_useInstance = new TQCheckBox(bgStartup); @@ -151,7 +151,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) TQWhatsThis::add( cb_useInstance, i18n( "When checked, all files opened from outside of Kate will only use the " "currently opened instance of Kate.") ); - connect( cb_useInstance, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cb_useInstance, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // sync the konsole ? cb_syncKonsole = new TQCheckBox(bgStartup); @@ -161,7 +161,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) "If this is checked, the built in Konsole will <code>cd</code> to the directory " "of the active document when started and whenever the active document changes, " "if the document is a local file.") ); - connect( cb_syncKonsole, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cb_syncKonsole, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // modified files notification cb_modNotifications = new TQCheckBox( @@ -172,8 +172,8 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) "files that have been modified on the hard disk. If not enabled, you will " "be asked what to do with a file that has been modified on the hard disk only " "when that file gains focus inside Kate.") ); - connect( cb_modNotifications, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotChanged() ) ); + connect( cb_modNotifications, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotChanged() ) ); // GROUP with the one below: "Meta-informations" bgStartup = new TQButtonGroup( 2, TQt::Horizontal, i18n("Meta-Information"), frGeneral ); @@ -187,7 +187,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) "Check this if you want document configuration like for example " "bookmarks to be saved past editor sessions. The configuration will be " "restored if the document has not changed when reopened.")); - connect( cb_saveMetaInfos, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cb_saveMetaInfos, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); // meta infos days TQHBox *hbDmf = new TQHBox( bgStartup ); @@ -198,8 +198,8 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) sb_daysMetaInfos->setSuffix(i18n(" day(s)")); sb_daysMetaInfos->setValue( KateDocManager::self()->getDaysMetaInfos() ); lDmf->setBuddy( sb_daysMetaInfos ); - connect( cb_saveMetaInfos, TQT_SIGNAL( toggled( bool ) ), hbDmf, TQT_SLOT( setEnabled( bool ) ) ); - connect( sb_daysMetaInfos, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cb_saveMetaInfos, TQ_SIGNAL( toggled( bool ) ), hbDmf, TQ_SLOT( setEnabled( bool ) ) ); + connect( sb_daysMetaInfos, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); lo->addStretch(1); // :-] works correct without autoadd //END General page @@ -224,7 +224,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) cb_restoreVC->setChecked( config->readBoolEntry("Restore Window Configuration", true) ); TQWhatsThis::add(cb_restoreVC, i18n( "Check this if you want all your views and frames restored each time you open Kate")); - connect( cb_restoreVC, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotChanged() ) ); + connect( cb_restoreVC, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) ); TQRadioButton *rb1, *rb2, *rb3; @@ -245,9 +245,9 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) else sessions_start->setButton (2); - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); sessions_exit = new TQButtonGroup( 1, TQt::Horizontal, i18n("Behavior on Application Exit or Session Switch"), frSessions ); lo->add (sessions_exit); @@ -266,9 +266,9 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) else sessions_exit->setButton (2); - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); lo->addStretch(1); // :-] works correct without autoadd //END Session page @@ -282,7 +282,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) BarIcon("document-open", TDEIcon::SizeSmall) ); fileSelConfigPage = new KFSConfigPage( page, "file selector config page", mainWindow->fileselector ); - connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( fileSelConfigPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); path.clear(); path << i18n("Application") << i18n("Document List"); @@ -290,14 +290,14 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) BarIcon("view_text", TDEIcon::SizeSmall) ); filelistConfigPage = new KFLConfigPage( page, "file list config page", mainWindow->filelist ); - connect( filelistConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( filelistConfigPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); path.clear(); path << i18n("Application") << i18n("Plugins"); /*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"), BarIcon("connect_established",TDEIcon::SizeSmall)); KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this); - connect( configPluginPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( configPluginPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); // Tools->External Tools menu path.clear(); @@ -305,7 +305,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) page = addVBoxPage( path, i18n("External Tools"), BarIcon("configure", TDEIcon::SizeSmall) ); configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page"); - connect( configExternalToolsPage, TQT_SIGNAL(changed()), this, TQT_SLOT(slotChanged()) ); + connect( configExternalToolsPage, TQ_SIGNAL(changed()), this, TQ_SLOT(slotChanged()) ); // editor widgets from kwrite/kwdialog path.clear(); @@ -320,7 +320,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, TDEIcon::SizeSmall) ); KTextEditor::ConfigPage *cPage = KTextEditor::configInterfaceExtension (v->document())->configPage(i, page); - connect( cPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( cPage, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); editorPages.append (cPage); } @@ -356,7 +356,7 @@ void KateConfigDialog::addPluginPage (Kate::Plugin *plugin) PluginPageListItem *info=new PluginPageListItem; info->plugin = plugin; info->page = Kate::pluginConfigInterfaceExtension(plugin)->configPage (i, page); - connect( info->page, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) ); + connect( info->page, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) ); pluginPages.append(info); } } diff --git a/kate/app/kateconfigplugindialogpage.cpp b/kate/app/kateconfigplugindialogpage.cpp index 90d7262e5..d2b17eb52 100644 --- a/kate/app/kateconfigplugindialogpage.cpp +++ b/kate/app/kateconfigplugindialogpage.cpp @@ -82,7 +82,7 @@ KateConfigPluginPage::KateConfigPluginPage(TQWidget *parent, KateConfigDialog *d listView->addColumn(i18n("Comment")); TQWhatsThis::add(listView,i18n("Here you can see all available Kate plugins. Those with a check mark are loaded, and will be loaded again the next time Kate is started.")); - connect(listView, TQT_SIGNAL(stateChange(KatePluginListItem *, bool)), this, TQT_SLOT(stateChange(KatePluginListItem *, bool))); + connect(listView, TQ_SIGNAL(stateChange(KatePluginListItem *, bool)), this, TQ_SLOT(stateChange(KatePluginListItem *, bool))); KatePluginList &pluginList (KatePluginManager::self()->pluginList()); for (unsigned int i=0; i < pluginList.size(); ++i) diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp index 84d2cb22c..1e87a59d8 100644 --- a/kate/app/kateconsole.cpp +++ b/kate/app/kateconsole.cpp @@ -50,7 +50,7 @@ KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent) KateConsole::~KateConsole () { if (m_part) - disconnect ( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + disconnect ( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); } void KateConsole::loadConsoleIfNeeded() @@ -74,7 +74,7 @@ void KateConsole::loadConsoleIfNeeded() m_part->widget()->show(); - connect ( m_part, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect ( m_part, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); if (m_mw->viewManager()->activeView()) if (m_mw->viewManager()->activeView()->getDoc()->url().isValid()) diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index 9e568ca2f..d592edd13 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -116,7 +116,7 @@ Kate::Document *KateDocManager::createDoc () emit documentCreated ((Kate::Document *)doc); emit m_documentManager->documentCreated ((Kate::Document *)doc); - connect(doc,TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); + connect(doc,TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQ_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); return (Kate::Document *)doc; } @@ -256,7 +256,7 @@ Kate::Document *KateDocManager::openURL (const KURL& url,const TQString &encodin } } - connect(doc, TQT_SIGNAL(modStateChanged(Kate::Document *)), this, TQT_SLOT(slotModChanged(Kate::Document *))); + connect(doc, TQ_SIGNAL(modStateChanged(Kate::Document *)), this, TQ_SLOT(slotModChanged(Kate::Document *))); emit initialDocumentReplaced(); diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp index dcfc6494e..e93e758ea 100644 --- a/kate/app/kateexternaltools.cpp +++ b/kate/app/kateexternaltools.cpp @@ -225,7 +225,7 @@ KateExternalToolAction::KateExternalToolAction( TQObject *parent, if ( ! t->icon.isEmpty() ) setIconSet( SmallIconSet( t->icon ) ); - connect( this ,TQT_SIGNAL(activated()), this, TQT_SLOT(slotRun()) ); + connect( this ,TQ_SIGNAL(activated()), this, TQ_SLOT(slotRun()) ); } bool KateExternalToolAction::expandMacro( const TQString &str, TQStringList &ret ) @@ -300,7 +300,7 @@ KateExternalToolsMenuAction::KateExternalToolsMenuAction( const TQString &text, m_actionCollection = new TDEActionCollection( mainwindow ); - connect(KateDocManager::self(),TQT_SIGNAL(documentChanged()),this,TQT_SLOT(slotDocumentChanged())); + connect(KateDocManager::self(),TQ_SIGNAL(documentChanged()),this,TQ_SLOT(slotDocumentChanged())); reload(); } @@ -498,7 +498,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool * TQToolButton *btnMTW = new TQToolButton(w); lo->addWidget( btnMTW, 4, 3 ); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); TQWhatsThis::add( btnMTW, i18n( "Click for a dialog that can help you creating a list of mimetypes.") ); @@ -562,33 +562,33 @@ KateExternalToolsConfigWidget::KateExternalToolsConfigWidget( TQWidget *parent, lbTools = new TDEListBox( this ); lo->addMultiCellWidget( lbTools, 1, 4, 0, 3 ); - connect( lbTools, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( lbTools, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); btnNew = new TQPushButton( i18n("&New..."), this ); lo->addWidget( btnNew, 5, 0 ); - connect( btnNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()) ); + connect( btnNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()) ); btnRemove = new TQPushButton( i18n("&Remove"), this ); lo->addWidget( btnRemove, 5, 2 ); - connect( btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemove()) ); + connect( btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemove()) ); btnEdit = new TQPushButton( i18n("&Edit..."), this ); lo->addWidget( btnEdit, 5, 1 ); - connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()) ); + connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()) ); TQPushButton *b = new TQPushButton( i18n("Insert &Separator"), this ); lo->addWidget( b, 5, 3 ); - connect( b, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInsertSeparator()) ); + connect( b, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInsertSeparator()) ); btnMoveUp = new TQPushButton( SmallIconSet("go-up"), "", this ); lo->addWidget( btnMoveUp, 2, 4 ); - connect( btnMoveUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveUp()) ); + connect( btnMoveUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveUp()) ); btnMoveDwn = new TQPushButton( SmallIconSet("go-down"), "", this ); lo->addWidget( btnMoveDwn, 3, 4 ); - connect( btnMoveDwn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveDown()) ); + connect( btnMoveDwn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveDown()) ); - connect( lbTools, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this, TQT_SLOT( slotEdit() ) ); + connect( lbTools, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), this, TQ_SLOT( slotEdit() ) ); lo->setRowStretch( 1, 1 ); lo->setRowStretch( 4, 1 ); diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 6304a8657..b33d0149b 100644 --- a/kate/app/katefilelist.cpp +++ b/kate/app/katefilelist.cpp @@ -107,7 +107,7 @@ KateFileList::KateFileList (KateMainWindow *main, setupActions (); - connect(this,TQT_SIGNAL(moved()),this,TQT_SLOT(updateFileListLocations())); + connect(this,TQ_SIGNAL(moved()),this,TQ_SLOT(updateFileListLocations())); for (uint i = 0; i < KateDocManager::self()->documents(); i++) { @@ -115,18 +115,18 @@ KateFileList::KateFileList (KateMainWindow *main, slotModChanged (KateDocManager::self()->document(i)); } - connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)), - this,TQT_SLOT(slotDocumentCreated(Kate::Document *))); - connect(KateDocManager::self(),TQT_SIGNAL(documentDeleted(uint)), - this,TQT_SLOT(slotDocumentDeleted(uint))); + connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)), + this,TQ_SLOT(slotDocumentCreated(Kate::Document *))); + connect(KateDocManager::self(),TQ_SIGNAL(documentDeleted(uint)), + this,TQ_SLOT(slotDocumentDeleted(uint))); // don't Honour KDE single/double click setting, this files are already open, // no need for hassle of considering double-click - connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this,TQT_SLOT(slotActivateView(TQListViewItem *))); - connect(viewManager,TQT_SIGNAL(viewChanged()), this,TQT_SLOT(slotViewChanged())); - connect(this,TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )), - this,TQT_SLOT(slotMenu ( TQListViewItem *, const TQPoint &, int ))); + connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this,TQ_SLOT(slotActivateView(TQListViewItem *))); + connect(viewManager,TQ_SIGNAL(viewChanged()), this,TQ_SLOT(slotViewChanged())); + connect(this,TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )), + this,TQ_SLOT(slotMenu ( TQListViewItem *, const TQPoint &, int ))); } KateFileList::~KateFileList () @@ -136,20 +136,20 @@ KateFileList::~KateFileList () void KateFileList::setupActions () { - windowNext = KStdAction::back(this, TQT_SLOT(slotPrevDocument()), m_main->actionCollection()); - windowPrev = KStdAction::forward(this, TQT_SLOT(slotNextDocument()), m_main->actionCollection()); + windowNext = KStdAction::back(this, TQ_SLOT(slotPrevDocument()), m_main->actionCollection()); + windowPrev = KStdAction::forward(this, TQ_SLOT(slotNextDocument()), m_main->actionCollection()); sortAction = new TDESelectAction( i18n("Sort &By"), 0, m_main->actionCollection(), "filelist_sortby" ); listMoveFileUp = new TDEAction( i18n("Move File Up"), 0, m_main->actionCollection(), "filelist_move_up" ); //listMoveFileUp->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Comma)); listMoveFileDown = new TDEAction( i18n("Move File Down"), 0, m_main->actionCollection(), "filelist_move_down" ); //listMoveFileDown->setShortcut(TDEShortcut(CTRL + SHIFT + Key_Period)); - connect( listMoveFileUp, TQT_SIGNAL(activated()), this, TQT_SLOT(moveFileUp()) ); - connect( listMoveFileDown, TQT_SIGNAL(activated()), this, TQT_SLOT(moveFileDown()) ); + connect( listMoveFileUp, TQ_SIGNAL(activated()), this, TQ_SLOT(moveFileUp()) ); + connect( listMoveFileDown, TQ_SIGNAL(activated()), this, TQ_SLOT(moveFileDown()) ); TQStringList l; l << i18n("Opening Order") << i18n("Document Name") << i18n("URL") << i18n("Manual Placement"); sortAction->setItems( l ); - connect( sortAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setSortType(int)) ); + connect( sortAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setSortType(int)) ); } void KateFileList::updateActions () @@ -227,9 +227,9 @@ void KateFileList::slotPrevDocument() void KateFileList::slotDocumentCreated (Kate::Document *doc) { new KateFileListItem( this, doc/*, doc->documentNumber()*/ ); - connect(doc,TQT_SIGNAL(modStateChanged(Kate::Document *)),this,TQT_SLOT(slotModChanged(Kate::Document *))); - connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotNameChanged(Kate::Document *))); - connect(doc,TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQT_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); + connect(doc,TQ_SIGNAL(modStateChanged(Kate::Document *)),this,TQ_SLOT(slotModChanged(Kate::Document *))); + connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotNameChanged(Kate::Document *))); + connect(doc,TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)),this,TQ_SLOT(slotModifiedOnDisc(Kate::Document *, bool, unsigned char))); sort(); updateFileListLocations(); @@ -707,11 +707,11 @@ KFLConfigPage::KFLConfigPage( TQWidget* parent, const char *name, KateFileList * reload(); slotEnableChanged(); - connect( cbEnableShading, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotMyChanged()) ); - connect( cbEnableShading, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChanged()) ); - connect( kcbViewShade, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotMyChanged()) ); - connect( kcbEditShade, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(slotMyChanged()) ); - connect( cmbSort, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMyChanged()) ); + connect( cbEnableShading, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotMyChanged()) ); + connect( cbEnableShading, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChanged()) ); + connect( kcbViewShade, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotMyChanged()) ); + connect( kcbEditShade, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(slotMyChanged()) ); + connect( cmbSort, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMyChanged()) ); } void KFLConfigPage::apply() diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index 640e901a7..a9c9d2c16 100644 --- a/kate/app/katefileselector.cpp +++ b/kate/app/katefileselector.cpp @@ -132,8 +132,8 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, dir = new KDirOperator(KURL(), this, "operator"); dir->setView(KFile::/* Simple */Detail); dir->view()->setSelectionMode(KFile::Extended); - connect ( dir, TQT_SIGNAL( viewChanged(KFileView *) ), - this, TQT_SLOT( selectorViewChanged(KFileView *) ) ); + connect ( dir, TQ_SIGNAL( viewChanged(KFileView *) ), + this, TQ_SLOT( selectorViewChanged(KFileView *) ) ); setStretchFactor(dir, 2); TDEActionCollection *coll = dir->actionCollection(); @@ -159,37 +159,37 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow, filter = new KHistoryCombo( true, filterBox, "filter"); filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); - connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) ); + connect( btnFilter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( btnFilterClick() ) ); - connect( filter, TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotFilterChange(const TQString&) ) ); - connect( filter, TQT_SIGNAL( returnPressed(const TQString&) ), - filter, TQT_SLOT( addToHistory(const TQString&) ) ); + connect( filter, TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotFilterChange(const TQString&) ) ); + connect( filter, TQ_SIGNAL( returnPressed(const TQString&) ), + filter, TQ_SLOT( addToHistory(const TQString&) ) ); // tdeaction for the dir sync method acSyncDir = new TDEAction( i18n("Current Document Folder"), "curfiledir", 0, - this, TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); + this, TQ_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); toolbar->setIconText( TDEToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); - connect( cmbPath, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( cmbPathActivated( const KURL& ) )); - connect( cmbPath, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( cmbPathReturnPressed( const TQString& ) )); - connect(dir, TQT_SIGNAL(urlEntered(const KURL&)), - this, TQT_SLOT(dirUrlEntered(const KURL&)) ); + connect( cmbPath, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( cmbPathActivated( const KURL& ) )); + connect( cmbPath, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( cmbPathReturnPressed( const TQString& ) )); + connect(dir, TQ_SIGNAL(urlEntered(const KURL&)), + this, TQ_SLOT(dirUrlEntered(const KURL&)) ); - connect(dir, TQT_SIGNAL(finishedLoading()), - this, TQT_SLOT(dirFinishedLoading()) ); + connect(dir, TQ_SIGNAL(finishedLoading()), + this, TQ_SLOT(dirFinishedLoading()) ); // enable dir sync button if current doc has a valid URL - connect ( viewmanager, TQT_SIGNAL( viewChanged() ), - this, TQT_SLOT( kateViewChanged() ) ); + connect ( viewmanager, TQ_SIGNAL( viewChanged() ), + this, TQ_SLOT( kateViewChanged() ) ); // Connect the bookmark handler - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - this, TQT_SLOT( setDir( const TQString& ) ) ); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + this, TQ_SLOT( setDir( const TQString& ) ) ); waitingUrl = TQString::null; @@ -234,7 +234,7 @@ void KateFileSelector::readConfig(TDEConfig *config, const TQString & name) TQString loc( config->readPathEntry( "location" ) ); if ( ! loc.isEmpty() ) { // waitingDir = loc; -// TQTimer::singleShot(0, this, TQT_SLOT(initialDirChangeHack())); +// TQTimer::singleShot(0, this, TQ_SLOT(initialDirChangeHack())); setDir( loc ); } } @@ -537,18 +537,18 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); lo->addWidget( gbToolbar ); - connect( acSel, TQT_SIGNAL( added( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) ); - connect( acSel, TQT_SIGNAL( removed( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) ); - connect( acSel, TQT_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) ); - connect( acSel, TQT_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( acSel, TQ_SIGNAL( added( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) ); + connect( acSel, TQ_SIGNAL( removed( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) ); + connect( acSel, TQ_SIGNAL( movedUp( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) ); + connect( acSel, TQ_SIGNAL( movedDown( TQListBoxItem * ) ), this, TQ_SLOT( slotMyChanged() ) ); // Sync TQGroupBox *gbSync = new TQGroupBox( 1, TQt::Horizontal, i18n("Auto Synchronization"), this ); cbSyncActive = new TQCheckBox( i18n("When a docu&ment becomes active"), gbSync ); cbSyncShow = new TQCheckBox( i18n("When the file selector becomes visible"), gbSync ); lo->addWidget( gbSync ); - connect( cbSyncActive, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) ); - connect( cbSyncShow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( cbSyncActive, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) ); + connect( cbSyncShow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) ); // Histories TQHBox *hbPathHist = new TQHBox ( this ); @@ -556,22 +556,22 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KateFileSelect sbPathHistLength = new TQSpinBox( hbPathHist ); lbPathHist->setBuddy( sbPathHistLength ); lo->addWidget( hbPathHist ); - connect( sbPathHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( sbPathHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotMyChanged() ) ); TQHBox *hbFilterHist = new TQHBox ( this ); TQLabel *lbFilterHist = new TQLabel( i18n("Remember &filters:"), hbFilterHist ); sbFilterHistLength = new TQSpinBox( hbFilterHist ); lbFilterHist->setBuddy( sbFilterHistLength ); lo->addWidget( hbFilterHist ); - connect( sbFilterHistLength, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( sbFilterHistLength, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotMyChanged() ) ); // Session TQGroupBox *gbSession = new TQGroupBox( 1, TQt::Horizontal, i18n("Session"), this ); cbSesLocation = new TQCheckBox( i18n("Restore loca&tion"), gbSession ); cbSesFilter = new TQCheckBox( i18n("Restore last f&ilter"), gbSession ); lo->addWidget( gbSession ); - connect( cbSesLocation, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) ); - connect( cbSesFilter, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotMyChanged() ) ); + connect( cbSesLocation, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) ); + connect( cbSesFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotMyChanged() ) ); // make it look nice lo->addStretch( 1 ); diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index c32043104..00bd1dcd6 100644 --- a/kate/app/kategrepdialog.cpp +++ b/kate/app/kategrepdialog.cpp @@ -262,16 +262,16 @@ GrepTool::GrepTool(TQWidget *parent, const char *name) cmbFiles->installEventFilter( this ); cmbDir->comboBox()->installEventFilter( this ); - connect( cmbTemplate, TQT_SIGNAL(activated(int)), - TQT_SLOT(templateActivated(int)) ); - connect( lbResult, TQT_SIGNAL(selected(const TQString&)), - TQT_SLOT(itemSelected(const TQString&)) ); - connect( btnSearch, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSearch()) ); - connect( btnClear, TQT_SIGNAL(clicked()), - TQT_SLOT(slotClear()) ); - connect( cmbPattern->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )), - TQT_SLOT( patternTextChanged( const TQString & ))); + connect( cmbTemplate, TQ_SIGNAL(activated(int)), + TQ_SLOT(templateActivated(int)) ); + connect( lbResult, TQ_SIGNAL(selected(const TQString&)), + TQ_SLOT(itemSelected(const TQString&)) ); + connect( btnSearch, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSearch()) ); + connect( btnClear, TQ_SIGNAL(clicked()), + TQ_SLOT(slotClear()) ); + connect( cmbPattern->lineEdit(), TQ_SIGNAL(textChanged ( const TQString & )), + TQ_SLOT( patternTextChanged( const TQString & ))); patternTextChanged( cmbPattern->lineEdit()->text()); } @@ -389,12 +389,12 @@ void GrepTool::slotSearch() *childproc << "/dev/null"; //trick to have grep always display the filename *childproc << ";"; - connect( childproc, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(childExited()) ); - connect( childproc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(receivedOutput(TDEProcess *, char *, int)) ); - connect( childproc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - TQT_SLOT(receivedErrOutput(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)) ); + connect( childproc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + TQ_SLOT(receivedErrOutput(TDEProcess *, char *, int)) ); // actually it should be checked whether the process was started successfully lbResult->setCursor( TQCursor(TQt::WaitCursor) ); diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp index 2d933669a..9afa644cb 100644 --- a/kate/app/katemailfilesdialog.cpp +++ b/kate/app/katemailfilesdialog.cpp @@ -77,7 +77,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow *mainwin ) i++; } list->hide(); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotShowButton()) ); mw->setMinimumSize( lInfo->sizeHint() ); } diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index c08b18d0a..811145182 100644 --- a/kate/app/katemainwindow.cpp +++ b/kate/app/katemainwindow.cpp @@ -168,13 +168,13 @@ KateMainWindow::KateMainWindow (TDEConfig *sconfig, const TQString &sgroup) // connect documents menu aboutToshow documentMenu = (TQPopupMenu*)factory()->container("documents", this); - connect(documentMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(documentMenuAboutToShow())); + connect(documentMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(documentMenuAboutToShow())); // caption update for (uint i = 0; i < KateDocManager::self()->documents(); i++) slotDocumentCreated (KateDocManager::self()->document(i)); - connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),this,TQT_SLOT(slotDocumentCreated(Kate::Document *))); + connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)),this,TQ_SLOT(slotDocumentCreated(Kate::Document *))); readOptions(); @@ -216,7 +216,7 @@ void KateMainWindow::setupMainWindow () KateMDI::ToolView *t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("document-open"), i18n("Filesystem Browser")); fileselector = new KateFileSelector( this, m_viewManager, t, "operator"); - connect(fileselector->dirOperator(),TQT_SIGNAL(fileSelected(const KFileItem*)),this,TQT_SLOT(fileSelected(const KFileItem*))); + connect(fileselector->dirOperator(),TQ_SIGNAL(fileSelected(const KFileItem*)),this,TQ_SLOT(fileSelected(const KFileItem*))); KateMDI::ToolView *st = createToolView("kate_sessionpanel", KMultiTabBar::Left, SmallIcon("view_choose"), i18n("Sessions")); m_sessionpanel = new KateSessionPanel( this, m_viewManager, st, "sessionpanel"); @@ -226,8 +226,8 @@ void KateMainWindow::setupMainWindow () { t = createToolView("kate_greptool", KMultiTabBar::Bottom, SmallIcon("filefind"), i18n("Find in Files") ); greptool = new GrepTool( t, "greptool" ); - connect(greptool, TQT_SIGNAL(itemSelected(const TQString &,int)), this, TQT_SLOT(slotGrepToolItemSelected(const TQString &,int))); - connect(t,TQT_SIGNAL(visibleChanged(bool)),this, TQT_SLOT(updateGrepDir (bool))); + connect(greptool, TQ_SIGNAL(itemSelected(const TQString &,int)), this, TQ_SLOT(slotGrepToolItemSelected(const TQString &,int))); + connect(t,TQ_SIGNAL(visibleChanged(bool)),this, TQ_SLOT(updateGrepDir (bool))); // WARNING HACK - anders: showing the greptool seems to make the menu accels work greptool->show(); @@ -243,25 +243,25 @@ void KateMainWindow::setupActions() { TDEAction *a; - KStdAction::openNew( m_viewManager, TQT_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document")); - KStdAction::open( m_viewManager, TQT_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing")); + KStdAction::openNew( m_viewManager, TQ_SLOT( slotDocumentNew() ), actionCollection(), "file_new" )->setWhatsThis(i18n("Create a new document")); + KStdAction::open( m_viewManager, TQ_SLOT( slotDocumentOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Open an existing document for editing")); - fileOpenRecent = KStdAction::openRecent (m_viewManager, TQT_SLOT(openURL (const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent (m_viewManager, TQ_SLOT(openURL (const KURL&)), actionCollection()); fileOpenRecent->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); - a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQT_SLOT( saveAll() ), actionCollection(), "file_save_all" ); + a=new TDEAction( i18n("Save A&ll"),"save_all", CTRL+Key_L, KateDocManager::self(), TQ_SLOT( saveAll() ), actionCollection(), "file_save_all" ); a->setWhatsThis(i18n("Save all open, modified documents to disk.")); - KStdAction::close( m_viewManager, TQT_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); + KStdAction::close( m_viewManager, TQ_SLOT( slotDocumentClose() ), actionCollection(), "file_close" )->setWhatsThis(i18n("Close the current document.")); - a=new TDEAction( i18n( "Clos&e All" ), 0, this, TQT_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); + a=new TDEAction( i18n( "Clos&e All" ), 0, this, TQ_SLOT( slotDocumentCloseAll() ), actionCollection(), "file_close_all" ); a->setWhatsThis(i18n("Close all open documents.")); - KStdAction::mail( this, TQT_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); + KStdAction::mail( this, TQ_SLOT(slotMail()), actionCollection() )->setWhatsThis(i18n("Send one or more of the open documents as email attachments.")); - KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); + KStdAction::quit( this, TQ_SLOT( slotFileQuit() ), actionCollection(), "file_quit" )->setWhatsThis(i18n("Close this window")); - a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQT_SLOT(newWindow()), actionCollection(), "view_new_view"); + a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQ_SLOT(newWindow()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create a new Kate view (a new window with the same document list).")); if ( KateApp::self()->authorize("shell_access") ) @@ -271,64 +271,64 @@ void KateMainWindow::setupActions() } TDEToggleAction* showFullScreenAction = KStdAction::fullScreen( 0, 0, actionCollection(),this); - connect( showFullScreenAction,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(slotFullScreen(bool))); + connect( showFullScreenAction,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(slotFullScreen(bool))); documentOpenWith = new TDEActionMenu(i18n("Open W&ith"), actionCollection(), "file_open_with"); documentOpenWith->setWhatsThis(i18n("Open the current document using another application registered for its file type, or an application of your choice.")); - connect(documentOpenWith->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(mSlotFixOpenWithMenu())); - connect(documentOpenWith->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenWithMenuAction(int))); + connect(documentOpenWith->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(mSlotFixOpenWithMenu())); + connect(documentOpenWith->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenWithMenuAction(int))); - a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection()); + a=KStdAction::keyBindings(this, TQ_SLOT(editKeys()), actionCollection()); a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments.")); - a=KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection()); + a=KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); - TDEAction* settingsConfigure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection(), "settings_configure"); + TDEAction* settingsConfigure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection(), "settings_configure"); settingsConfigure->setWhatsThis(i18n("Configure various aspects of this application and the editing component.")); // pipe to terminal action if (KateApp::self()->authorize("shell_access")) - new TDEAction(i18n("&Pipe to Console"), "pipe", 0, console, TQT_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); + new TDEAction(i18n("&Pipe to Console"), "pipe", 0, console, TQ_SLOT(slotPipeToConsole()), actionCollection(), "tools_pipe_to_terminal"); // tip of the day :-) - KStdAction::tipOfDay( this, TQT_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); + KStdAction::tipOfDay( this, TQ_SLOT( tipOfTheDay() ), actionCollection() )->setWhatsThis(i18n("This shows useful tips on the use of this application.")); if (KatePluginManager::self()->pluginList().count() > 0) { - a=new TDEAction(i18n("&Plugins Handbook"), 0, this, TQT_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); + a=new TDEAction(i18n("&Plugins Handbook"), 0, this, TQ_SLOT(pluginHelp()), actionCollection(), "help_plugins_contents"); a->setWhatsThis(i18n("This shows help files for various available plugins.")); } - connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotWindowActivated())); - connect(m_viewManager,TQT_SIGNAL(viewChanged()),this,TQT_SLOT(slotUpdateOpenWith())); + connect(m_viewManager,TQ_SIGNAL(viewChanged()),this,TQ_SLOT(slotWindowActivated())); + connect(m_viewManager,TQ_SIGNAL(viewChanged()),this,TQ_SLOT(slotUpdateOpenWith())); slotWindowActivated (); // session actions new TDEAction(i18n("&New"), "list-add", 0, - m_sessionpanel, TQT_SLOT(slotNewSession()), actionCollection(), "session_new"); + m_sessionpanel, TQ_SLOT(slotNewSession()), actionCollection(), "session_new"); new TDEAction(i18n("&Save"), "document-save", 0, - m_sessionpanel, TQT_SLOT(slotSaveSession()), actionCollection(), "session_save"); + m_sessionpanel, TQ_SLOT(slotSaveSession()), actionCollection(), "session_save"); new TDEAction(i18n("Save &As..."), "document-save-as", 0, - m_sessionpanel, TQT_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as"); + m_sessionpanel, TQ_SLOT(slotSaveSessionAs()), actionCollection(), "session_save_as"); new TDEAction(i18n("&Rename"), "edit_user", 0, - m_sessionpanel, TQT_SLOT(slotRenameSession()), actionCollection(), "session_rename"); + m_sessionpanel, TQ_SLOT(slotRenameSession()), actionCollection(), "session_rename"); new TDEAction(i18n("&Delete"), "edit-delete", 0, - m_sessionpanel, TQT_SLOT(slotDeleteSession()), actionCollection(), "session_delete"); + m_sessionpanel, TQ_SLOT(slotDeleteSession()), actionCollection(), "session_delete"); new TDEAction(i18n("Re&load"), "reload", 0, - m_sessionpanel, TQT_SLOT(slotReloadSession()), actionCollection(), "session_reload"); + m_sessionpanel, TQ_SLOT(slotReloadSession()), actionCollection(), "session_reload"); new TDEAction(i18n("Acti&vate"), "forward", 0, - m_sessionpanel, TQT_SLOT(slotActivateSession()), actionCollection(), "session_activate"); + m_sessionpanel, TQ_SLOT(slotActivateSession()), actionCollection(), "session_activate"); new TDEToggleAction(i18n("Toggle read &only"), "encrypted", 0, - m_sessionpanel, TQT_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only"); + m_sessionpanel, TQ_SLOT(slotSessionToggleReadOnly()), actionCollection(), "session_toggle_read_only"); new TDEAction(i18n("Move &Up"), "go-up", 0, - m_sessionpanel, TQT_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up"); + m_sessionpanel, TQ_SLOT(slotSessionMoveUp()), actionCollection(), "session_move_up"); new TDEAction(i18n("Move Do&wn"), "go-down", 0, - m_sessionpanel, TQT_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down"); + m_sessionpanel, TQ_SLOT(slotSessionMoveDown()), actionCollection(), "session_move_down"); new KateSessionListActionMenu(this, i18n("Sele&ct session"), actionCollection(), "session_list"); - connect(m_sessionpanel, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(m_sessionpanel, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); } KateTabWidget *KateMainWindow::tabWidget () @@ -412,7 +412,7 @@ void KateMainWindow::slotEditToolbars() { saveMainWindowSettings( KateApp::self()->config(), "MainWindow" ); KEditToolbar dlg( factory() ); - connect( &dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) ); + connect( &dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) ); dlg.exec(); } @@ -514,7 +514,7 @@ void KateMainWindow::documentMenuAboutToShow() Kate::Document* doc = ((KateFileListItem *)item)->document(); documentMenu->insertItem ( doc->isModified() ? i18n("'document name [*]', [*] means modified", "%1 [*]").arg(name) : name, - m_viewManager, TQT_SLOT (activateView (int)), 0, + m_viewManager, TQ_SLOT (activateView (int)), 0, ((KateFileListItem *)item)->documentNumber () ); item = item->nextSibling(); @@ -816,9 +816,9 @@ bool KateMainWindow::showModOnDiskPrompt() void KateMainWindow::slotDocumentCreated (Kate::Document *doc) { - connect(doc,TQT_SIGNAL(modStateChanged(Kate::Document *)),this,TQT_SLOT(updateCaption(Kate::Document *))); - connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotNameChanged(Kate::Document *))); - connect(doc,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotUpdateOpenWith())); + connect(doc,TQ_SIGNAL(modStateChanged(Kate::Document *)),this,TQ_SLOT(updateCaption(Kate::Document *))); + connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotNameChanged(Kate::Document *))); + connect(doc,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotUpdateOpenWith())); updateCaption (doc); } @@ -937,7 +937,7 @@ void KateMainWindow::activateSession(int sessionId) KateSessionListActionMenu::KateSessionListActionMenu(KateMainWindow *mw, const TQString &text, TQObject *parent, const char *name) : TDEActionMenu(text, parent, name), m_mainWindow(mw) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotAboutToShow())); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotAboutToShow())); } //------------------------------------------- @@ -948,6 +948,6 @@ void KateSessionListActionMenu::slotAboutToShow() TQPtrList<KateSession> &sessions = KateApp::self()->sessionManager()->getSessionsList(); for (int idx = 0; idx < (int)sessions.count(); ++idx) { - popupMenu()->insertItem(sessions[idx]->getSessionName(), m_mainWindow, TQT_SLOT(activateSession(int)), 0, idx); + popupMenu()->insertItem(sessions[idx]->getSessionName(), m_mainWindow, TQ_SLOT(activateSession(int)), 0, idx); } } diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 43c2f8925..15b4e62d1 100644 --- a/kate/app/katemdi.cpp +++ b/kate/app/katemdi.cpp @@ -71,8 +71,8 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor : TDEToggleAction(text,cut,parent,name) , m_tv(tv) { - connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); - connect(m_tv,TQT_SIGNAL(visibleChanged(bool)),this,TQT_SLOT(visibleChanged(bool))); + connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); + connect(m_tv,TQ_SIGNAL(visibleChanged(bool)),this,TQ_SLOT(visibleChanged(bool))); setChecked(m_tv->visible()); } @@ -123,8 +123,8 @@ GUIClient::GUIClient ( MainWindow *mw ) , KXMLGUIClient ( mw ) , m_mw (mw) { - connect( m_mw->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( m_mw->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); if ( domDocument().documentElement().isNull() ) { @@ -142,8 +142,8 @@ GUIClient::GUIClient ( MainWindow *mw ) CTRL|ALT|SHIFT|Key_F, actionCollection(), "kate_mdi_sidebar_visibility" ); m_showSidebarsAction->setCheckedState(i18n("Hide Side&bars")); m_showSidebarsAction->setChecked( m_mw->sidebarsVisible() ); - connect( m_showSidebarsAction, TQT_SIGNAL( toggled( bool ) ), - m_mw, TQT_SLOT( setSidebarsVisible( bool ) ) ); + connect( m_showSidebarsAction, TQ_SIGNAL( toggled( bool ) ), + m_mw, TQ_SLOT( setSidebarsVisible( bool ) ) ); m_toolMenu->insert( m_showSidebarsAction ); m_toolMenu->insert( new TDEActionSeparator( m_toolMenu ) ); @@ -332,7 +332,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi show (); - connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); + connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int))); tab(newId)->installEventFilter(this); return widget; @@ -480,8 +480,8 @@ bool Sidebar::eventFilter(TQObject *obj, TQEvent *ev) if (position() != 3) p->insertItem(SmallIconSet("go-down"), i18n("Bottom Sidebar"),3); - connect(p, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(buttonPopupActivate(int))); + connect(p, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(buttonPopupActivate(int))); p->exec(e->globalPos()); delete p; @@ -596,7 +596,7 @@ void Sidebar::restoreSession (TDEConfig *config) // readd the button int newId = m_widgetToId[tv]; appendTab (tv->icon, newId, tv->text); - connect(tab(newId),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); + connect(tab(newId),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int))); tab(newId)->installEventFilter(this); // reshuffle in splitter diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp index c908b3617..3babd75e8 100644 --- a/kate/app/katemwmodonhddialog.cpp +++ b/kate/app/katemwmodonhddialog.cpp @@ -99,7 +99,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons for ( uint i=0; i < docs.size(); i++ ) new KateDocItem( docs[i], l[ (uint)KateDocManager::self()->documentInfo( docs[i] )->modifiedOnDiscReason ], lvDocuments ); - connect( lvDocuments, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( lvDocuments, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); // diff button TQHBox *lo2 = new TQHBox ( w ); @@ -111,7 +111,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons "Calculates the difference between the the editor contents and the disk " "file for the selected document, and shows the difference with the " "default application. Requires diff(1).") ); - connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) ); + connect( btnDiff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDiff()) ); slotSelectionChanged(); m_tmpfile = 0; @@ -216,8 +216,8 @@ void KateMwModOnHdDialog::slotDiff() KProcIO *p = new KProcIO(); p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << doc->url().path(); - connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) ); - connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); + connect( p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPDone(TDEProcess*)) ); + connect( p, TQ_SIGNAL(readReady(KProcIO*)), this, TQ_SLOT(slotPRead(KProcIO*)) ); setCursor( WaitCursor ); diff --git a/kate/app/katesavemodifieddialog.cpp b/kate/app/katesavemodifieddialog.cpp index 9ff79dfb4..4fca9b763 100644 --- a/kate/app/katesavemodifieddialog.cpp +++ b/kate/app/katesavemodifieddialog.cpp @@ -156,11 +156,11 @@ KateSaveModifiedDialog::KateSaveModifiedDialog(TQWidget *parent, TQPtrList<Kate: } m_documentRoot->setOpen(true); } else m_documentRoot=0; - connect(m_list, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemSelected())); - connect(m_list, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotItemSelected())); - connect(m_list, TQT_SIGNAL(spacePressed(TQListViewItem *)), TQT_SLOT(slotItemSelected())); + connect(m_list, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotItemSelected())); + connect(m_list, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotItemSelected())); + connect(m_list, TQ_SIGNAL(spacePressed(TQListViewItem *)), TQ_SLOT(slotItemSelected())); if(documents.count()>3) { //For 3 or less, it would be quicker just to tick or untick them yourself, so don't clutter the gui. - connect(new TQPushButton(i18n("Se&lect All"),box),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSelectAll())); + connect(new TQPushButton(i18n("Se&lect All"),box),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSelectAll())); } } diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp index bab8dce56..d57101310 100644 --- a/kate/app/katesession.cpp +++ b/kate/app/katesession.cpp @@ -847,8 +847,8 @@ KateSessionChooser::KateSessionChooser(TQWidget *parent) m_listview->setSorting(-1); m_listview->setResizeMode(TQListView::LastColumn); - connect (m_listview, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect (m_listview, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotUser2())); + connect (m_listview, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect (m_listview, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotUser2())); TQPtrList<KateSession> &sessions = KateSessionManager::self()->getSessionsList(); for (int idx = sessions.count()-1; idx >= 0; --idx) diff --git a/kate/app/katesessionpanel.cpp b/kate/app/katesessionpanel.cpp index 2eacc3c59..e05da91cd 100644 --- a/kate/app/katesessionpanel.cpp +++ b/kate/app/katesessionpanel.cpp @@ -64,7 +64,7 @@ KateSessionNameChooser::KateSessionNameChooser(TQWidget *parent, bool showSwitch m_activateCB->setChecked(true); } - connect(m_sessionNameLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotTextChanged())); + connect(m_sessionNameLE, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotTextChanged())); slotTextChanged(); // update button status } @@ -146,28 +146,28 @@ KateSessionPanel::KateSessionPanel(KateMainWindow *mainWindow, KateViewManager * //m_listview->setRootIsDecorated(true); // FIXME disabled until doc list software is developed - connect(m_listview, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(m_listview, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*))); - connect(m_listview, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(slotItemExecuted(TQListViewItem*))); - connect(KateApp::self(), TQT_SIGNAL(optionsChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(m_sessionManager, TQT_SIGNAL(switchOptionChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(m_sessionManager, TQT_SIGNAL(sessionActivated(int, int)), - this, TQT_SLOT(slotSessionActivated(int, int))); - connect(m_sessionManager, TQT_SIGNAL(sessionCreated(int)), - this, TQT_SLOT(slotSessionCreated(int))); - connect(m_sessionManager, TQT_SIGNAL(sessionDeleted(int)), - this, TQT_SLOT(slotSessionDeleted(int))); - connect(m_sessionManager, TQT_SIGNAL(sessionsSwapped(int, int)), - this, TQT_SLOT(slotSessionsSwapped(int, int))); - connect(m_sessionManager, TQT_SIGNAL(sessionRenamed(int)), - this, TQT_SLOT(slotSessionRenamed(int))); - connect(m_listview, TQT_SIGNAL(itemRenamed(TQListViewItem*)), - this, TQT_SLOT(slotLVSessionRenamed(TQListViewItem*))); + connect(m_listview, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(m_listview, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*))); + connect(m_listview, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(slotItemExecuted(TQListViewItem*))); + connect(KateApp::self(), TQ_SIGNAL(optionsChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(m_sessionManager, TQ_SIGNAL(switchOptionChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(m_sessionManager, TQ_SIGNAL(sessionActivated(int, int)), + this, TQ_SLOT(slotSessionActivated(int, int))); + connect(m_sessionManager, TQ_SIGNAL(sessionCreated(int)), + this, TQ_SLOT(slotSessionCreated(int))); + connect(m_sessionManager, TQ_SIGNAL(sessionDeleted(int)), + this, TQ_SLOT(slotSessionDeleted(int))); + connect(m_sessionManager, TQ_SIGNAL(sessionsSwapped(int, int)), + this, TQ_SLOT(slotSessionsSwapped(int, int))); + connect(m_sessionManager, TQ_SIGNAL(sessionRenamed(int)), + this, TQ_SLOT(slotSessionRenamed(int))); + connect(m_listview, TQ_SIGNAL(itemRenamed(TQListViewItem*)), + this, TQ_SLOT(slotLVSessionRenamed(TQListViewItem*))); TQPtrList<KateSession>& sessions = m_sessionManager->getSessionsList(); for (int idx = sessions.count() - 1; idx >= 0; --idx) @@ -199,45 +199,45 @@ void KateSessionPanel::setup_toolbar() TDEAction *a; a = new TDEAction(i18n("New"), SmallIcon("list-add"), 0, - this, TQT_SLOT(slotNewSession()), m_actionCollection, "session_new"); + this, TQ_SLOT(slotNewSession()), m_actionCollection, "session_new"); a->setWhatsThis(i18n("Create a new session and switch to it.")); a->plug(m_toolbar); a = new TDEAction(i18n("Save"), SmallIcon("document-save"), 0, - this, TQT_SLOT(slotSaveSession()), m_actionCollection, "session_save"); + this, TQ_SLOT(slotSaveSession()), m_actionCollection, "session_save"); a->setWhatsThis(i18n("Save the selected session.")); a->plug(m_toolbar); a = new TDEAction(i18n("Save as..."), SmallIcon("document-save-as"), 0, - this, TQT_SLOT(slotSaveSessionAs()), m_actionCollection, "session_save_as"); + this, TQ_SLOT(slotSaveSessionAs()), m_actionCollection, "session_save_as"); a->setWhatsThis(i18n("Save an unsaved session with a new name or clone an already saved session " "into a new session.")); a->plug(m_toolbar); a = new TDEAction(i18n("Rename"), SmallIcon("edit_user"), 0, - this, TQT_SLOT(slotRenameSession()), m_actionCollection, "session_rename"); + this, TQ_SLOT(slotRenameSession()), m_actionCollection, "session_rename"); a->setWhatsThis(i18n("Rename the selected session.")); a->plug(m_toolbar); a = new TDEAction(i18n("Delete"), SmallIcon("edit-delete"), 0, - this, TQT_SLOT(slotDeleteSession()), m_actionCollection, "session_delete"); + this, TQ_SLOT(slotDeleteSession()), m_actionCollection, "session_delete"); a->setWhatsThis(i18n("Delete the selected session.")); a->plug(m_toolbar); a = new TDEAction(i18n("Reload"), SmallIcon("reload"), 0, - this, TQT_SLOT(slotReloadSession()), m_actionCollection, "session_reload"); + this, TQ_SLOT(slotReloadSession()), m_actionCollection, "session_reload"); a->setWhatsThis(i18n("Reload the last saved state of the selected session.")); a->plug(m_toolbar); m_toolbar->insertLineSeparator(); a = new TDEAction(i18n("Activate"), SmallIcon("forward"), 0, - this, TQT_SLOT(slotActivateSession()), m_actionCollection, "session_activate"); + this, TQ_SLOT(slotActivateSession()), m_actionCollection, "session_activate"); a->setWhatsThis(i18n("Activate the selected session.")); a->plug(m_toolbar); TDEToggleAction *tglA = new TDEToggleAction(i18n("Toggle read only"), SmallIcon("encrypted"), 0, - this, TQT_SLOT(slotSessionToggleReadOnly()), m_actionCollection, "session_toggle_read_only"); + this, TQ_SLOT(slotSessionToggleReadOnly()), m_actionCollection, "session_toggle_read_only"); tglA->setWhatsThis(i18n("Toggle read only status for the selected session.<p>" "In a read only session, you can work as usual but the list of documents in the session " "will not be saved when you exit Kate or switch to another session.<p>" @@ -245,12 +245,12 @@ void KateSessionPanel::setup_toolbar() tglA->plug(m_toolbar); a = new TDEAction(i18n("Move Up"), SmallIcon("go-up"), 0, - this, TQT_SLOT(slotSessionMoveUp()), m_actionCollection, "session_move_up"); + this, TQ_SLOT(slotSessionMoveUp()), m_actionCollection, "session_move_up"); a->setWhatsThis(i18n("Move up the selected session.")); a->plug(m_toolbar); a = new TDEAction(i18n("Move Down"), SmallIcon("go-down"), 0, - this, TQT_SLOT(slotSessionMoveDown()), m_actionCollection, "session_move_down"); + this, TQ_SLOT(slotSessionMoveDown()), m_actionCollection, "session_move_down"); a->setWhatsThis(i18n("Move down the selected session.")); a->plug(m_toolbar); } diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp index e2ac7e8b3..20f2a230d 100644 --- a/kate/app/katetabwidget.cpp +++ b/kate/app/katetabwidget.cpp @@ -32,7 +32,7 @@ KateTabWidget::KateTabWidget(TQWidget* parent, const char* name) setHoverCloseButton(true); - connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); + connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); } KateTabWidget::~KateTabWidget() diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 876faec5b..6ae57f2ec 100644 --- a/kate/app/kateviewmanager.cpp +++ b/kate/app/kateviewmanager.cpp @@ -71,7 +71,7 @@ KateViewManager::KateViewManager (KateMainWindow *parent) m_viewManager = new Kate::ViewManager (this); m_currentContainer=0; - connect(m_mainWindow->tabWidget(),TQT_SIGNAL(currentChanged(TQWidget*)),this,TQT_SLOT(tabChanged(TQWidget*))); + connect(m_mainWindow->tabWidget(),TQ_SIGNAL(currentChanged(TQWidget*)),this,TQ_SLOT(tabChanged(TQWidget*))); slotNewTab(); tabChanged(m_mainWindow->tabWidget()->currentPage()); @@ -94,47 +94,47 @@ void KateViewManager::setupActions () /** * tabbing */ - a=new TDEAction ( i18n("New Tab"),"tab_new", 0, this, TQT_SLOT(slotNewTab()), + a=new TDEAction ( i18n("New Tab"),"tab_new", 0, this, TQ_SLOT(slotNewTab()), m_mainWindow->actionCollection(), "view_new_tab" ); - m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQT_SLOT(slotCloseTab()), + m_closeTab = new TDEAction ( i18n("Close Current Tab"),"tab_remove",0,this,TQ_SLOT(slotCloseTab()), m_mainWindow->actionCollection(),"view_close_tab"); m_activateNextTab = new TDEAction( i18n( "Activate Next Tab" ), TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), - this, TQT_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); + this, TQ_SLOT( activateNextTab() ), m_mainWindow->actionCollection(), "view_next_tab" ); m_activatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), - this, TQT_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" ); + this, TQ_SLOT( activatePrevTab() ), m_mainWindow->actionCollection(), "view_prev_tab" ); /** * view splitting */ - a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( + a=new TDEAction ( i18n("Split Ve&rtical"), "view_right", CTRL+SHIFT+Key_L, this, TQ_SLOT( slotSplitViewSpaceVert() ), m_mainWindow->actionCollection(), "view_split_vert"); a->setWhatsThis(i18n("Split the currently active view vertically into two views.")); - a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( + a=new TDEAction ( i18n("Split &Horizontal"), "view_bottom", CTRL+SHIFT+Key_T, this, TQ_SLOT( slotSplitViewSpaceHoriz() ), m_mainWindow->actionCollection(), "view_split_horiz"); a->setWhatsThis(i18n("Split the currently active view horizontally into two views.")); m_closeView = new TDEAction ( i18n("Cl&ose Current View"), "view_remove", CTRL+SHIFT+Key_R, this, - TQT_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(), + TQ_SLOT( slotCloseCurrentViewSpace() ), m_mainWindow->actionCollection(), "view_close_current_space" ); m_closeView->setWhatsThis(i18n("Close the currently active splitted view")); goNext=new TDEAction(i18n("Next View"),Key_F8,this, - TQT_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next"); + TQ_SLOT(activateNextView()),m_mainWindow->actionCollection(),"go_next"); goNext->setWhatsThis(i18n("Make the next split view the active one.")); - goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, this, TQT_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); + goPrev=new TDEAction(i18n("Previous View"),SHIFT+Key_F8, this, TQ_SLOT(activatePrevView()),m_mainWindow->actionCollection(),"go_prev"); goPrev->setWhatsThis(i18n("Make the previous split view the active one.")); @@ -142,16 +142,16 @@ void KateViewManager::setupActions () * buttons for tabbing */ TQToolButton *b = new TQToolButton( m_mainWindow->tabWidget() ); - connect( b, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotNewTab() ) ); + connect( b, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotNewTab() ) ); b->setIconSet( SmallIcon( "tab_new" ) ); b->adjustSize(); TQToolTip::add(b, i18n("Open a new tab")); m_mainWindow->tabWidget()->setCornerWidget( b, TopLeft ); b = m_closeTabButton = new TQToolButton( m_mainWindow->tabWidget() ); - connect( b, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotCloseTab() ) ); + connect( b, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotCloseTab() ) ); b->setIconSet( SmallIcon( "tab_remove" ) ); b->adjustSize(); TQToolTip::add(b, i18n("Close the current tab")); @@ -199,8 +199,8 @@ void KateViewManager::slotNewTab() m_viewSpaceContainerList.append(container); m_mainWindow->tabWidget()->addTab (container, ""); - connect(container,TQT_SIGNAL(viewChanged()),this,TQT_SIGNAL(viewChanged())); - connect(container,TQT_SIGNAL(viewChanged()),m_viewManager,TQT_SIGNAL(viewChanged())); + connect(container,TQ_SIGNAL(viewChanged()),this,TQ_SIGNAL(viewChanged())); + connect(container,TQ_SIGNAL(viewChanged()),m_viewManager,TQ_SIGNAL(viewChanged())); if (!m_init) { diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp index 64e941583..8c552a82f 100644 --- a/kate/app/kateviewspace.cpp +++ b/kate/app/kateviewspace.cpp @@ -139,8 +139,8 @@ void KateViewSpace::addView(Kate::View* v, bool show) void KateViewSpace::removeView(Kate::View* v) { - disconnect( v->getDoc(), TQT_SIGNAL(modifiedChanged()), - mStatusBar, TQT_SLOT(modifiedChanged()) ); + disconnect( v->getDoc(), TQ_SIGNAL(modifiedChanged()), + mStatusBar, TQ_SLOT(modifiedChanged()) ); bool active = ( v == currentView() ); @@ -168,12 +168,12 @@ bool KateViewSpace::showView(uint documentNumber) for( ; it.current(); --it ) { if (((Kate::Document*)it.current()->getDoc())->documentNumber() == documentNumber) { if ( currentView() ) - disconnect( currentView()->getDoc(), TQT_SIGNAL(modifiedChanged()), - mStatusBar, TQT_SLOT(modifiedChanged()) ); + disconnect( currentView()->getDoc(), TQ_SIGNAL(modifiedChanged()), + mStatusBar, TQ_SLOT(modifiedChanged()) ); Kate::View* kv = it.current(); - connect( kv->getDoc(), TQT_SIGNAL(modifiedChanged()), - mStatusBar, TQT_SLOT(modifiedChanged()) ); + connect( kv->getDoc(), TQ_SIGNAL(modifiedChanged()), + mStatusBar, TQ_SLOT(modifiedChanged()) ); mViewList.removeRef( kv ); mViewList.append( kv ); diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index f681180a0..50e0d7ea2 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/kate/app/kateviewspacecontainer.cpp @@ -69,14 +69,14 @@ KateViewSpaceContainer::KateViewSpaceContainer (TQWidget *parent, KateViewManage m_viewSpaceList.setAutoDelete(true); KateViewSpace* vs = new KateViewSpace( this, this ); - connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&))); + connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQ_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&))); vs->setActive( true ); m_viewSpaceList.append(vs); - connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) ); - connect(KateDocManager::self(), TQT_SIGNAL(initialDocumentReplaced()), this, TQT_SIGNAL(viewChanged())); + connect( this, TQ_SIGNAL(viewChanged()), this, TQ_SLOT(slotViewChanged()) ); + connect(KateDocManager::self(), TQ_SIGNAL(initialDocumentReplaced()), this, TQ_SIGNAL(viewChanged())); - connect(KateDocManager::self(),TQT_SIGNAL(documentCreated(Kate::Document *)),this,TQT_SLOT(documentCreated(Kate::Document *))); - connect(KateDocManager::self(),TQT_SIGNAL(documentDeleted(uint)),this,TQT_SLOT(documentDeleted(uint))); + connect(KateDocManager::self(),TQ_SIGNAL(documentCreated(Kate::Document *)),this,TQ_SLOT(documentCreated(Kate::Document *))); + connect(KateDocManager::self(),TQ_SIGNAL(documentDeleted(uint)),this,TQ_SLOT(documentDeleted(uint))); } KateViewSpaceContainer::~KateViewSpaceContainer () @@ -122,17 +122,17 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc ) // popup menu view->installPopup ((TQPopupMenu*)(mainWindow()->factory()->container("tdetexteditor_popup", mainWindow())) ); - connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg())); - connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg())); - connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg())); - connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg())); - connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *))); - connect(view,TQT_SIGNAL(gotFocus(Kate::View *)),this,TQT_SLOT(activateSpace(Kate::View *))); + connect(view->getDoc(),TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(statusMsg())); + connect(view,TQ_SIGNAL(cursorPositionChanged()),this,TQ_SLOT(statusMsg())); + connect(view,TQ_SIGNAL(newStatus()),this,TQ_SLOT(statusMsg())); + connect(view->getDoc(), TQ_SIGNAL(undoChanged()), this, TQ_SLOT(statusMsg())); + connect(view,TQ_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQ_SLOT(slotDropEvent(TQDropEvent *))); + connect(view,TQ_SIGNAL(gotFocus(Kate::View *)),this,TQ_SLOT(activateSpace(Kate::View *))); activeViewSpace()->addView( view ); activateView( view ); - connect( doc, TQT_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)), - activeViewSpace(), TQT_SLOT(modifiedOnDisc(Kate::Document *, bool, unsigned char)) ); + connect( doc, TQ_SIGNAL(modifiedOnDisc(Kate::Document *, bool, unsigned char)), + activeViewSpace(), TQ_SLOT(modifiedOnDisc(Kate::Document *, bool, unsigned char)) ); return true; } @@ -256,7 +256,7 @@ void KateViewSpaceContainer::reactivateActiveView() { activateView(view); } else if (m_pendingViewCreation) { m_pendingViewCreation=false; - disconnect(m_pendingDocument,TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(slotPendingDocumentNameChanged())); + disconnect(m_pendingDocument,TQ_SIGNAL(nameChanged(Kate::Document *)),this,TQ_SLOT(slotPendingDocumentNameChanged())); createView(m_pendingDocument); } } @@ -378,7 +378,7 @@ void KateViewSpaceContainer::closeViews(uint documentNumber) } if (m_blockViewCreationAndActivation) return; - TQTimer::singleShot(0,this,TQT_SIGNAL(viewChanged())); + TQTimer::singleShot(0,this,TQ_SIGNAL(viewChanged())); //emit m_viewManager->viewChanged (); } @@ -481,7 +481,7 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs, sizes << space << space; s->setSizes( sizes ); - connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &))); + connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQ_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &))); m_viewSpaceList.append( vsNew ); activeViewSpace()->setActive( false ); vsNew->setActive( true, true ); @@ -726,7 +726,7 @@ void KateViewSpaceContainer::restoreSplitter( TDEConfig* config, const TQString { KateViewSpace* vs = new KateViewSpace( this, s ); - connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &))); + connect(this, TQ_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQ_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &))); if (m_viewSpaceList.isEmpty()) vs->setActive (true); diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index d2c769f33..dea6c95b6 100644 --- a/kate/app/kwritemain.cpp +++ b/kate/app/kwritemain.cpp @@ -96,11 +96,11 @@ KWrite::KWrite (KTextEditor::Document *doc) setAcceptDrops(true); - connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption())); - connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &))); - connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption())); - connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged())); - connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *))); + connect(m_view,TQ_SIGNAL(newStatus()),this,TQ_SLOT(newCaption())); + connect(m_view,TQ_SIGNAL(viewStatusMsg(const TQString &)),this,TQ_SLOT(newStatus(const TQString &))); + connect(m_view->document(),TQ_SIGNAL(fileNameChanged()),this,TQ_SLOT(newCaption())); + connect(m_view->document(),TQ_SIGNAL(fileNameChanged()),this,TQ_SLOT(slotFileNameChanged())); + connect(m_view,TQ_SIGNAL(dropEventPass(TQDropEvent *)),this,TQ_SLOT(slotDropEvent(TQDropEvent *))); setXMLFile( "kwriteui.rc" ); createShellGUI( true ); @@ -139,41 +139,41 @@ KWrite::~KWrite() void KWrite::setupActions() { - KStdAction::close( this, TQT_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document")); + KStdAction::close( this, TQ_SLOT(slotFlush()), actionCollection(), "file_close" )->setWhatsThis(i18n("Use this to close the current document")); // setup File menu - KStdAction::print(this, TQT_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document")); - KStdAction::openNew( this, TQT_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document")); - KStdAction::open( this, TQT_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing")); + KStdAction::print(this, TQ_SLOT(printDlg()), actionCollection())->setWhatsThis(i18n("Use this command to print the current document")); + KStdAction::openNew( this, TQ_SLOT(slotNew()), actionCollection(), "file_new" )->setWhatsThis(i18n("Use this command to create a new document")); + KStdAction::open( this, TQ_SLOT( slotOpen() ), actionCollection(), "file_open" )->setWhatsThis(i18n("Use this command to open an existing document for editing")); - m_recentFiles = KStdAction::openRecent(this, TQT_SLOT(slotOpen(const KURL&)), + m_recentFiles = KStdAction::openRecent(this, TQ_SLOT(slotOpen(const KURL&)), actionCollection()); m_recentFiles->setWhatsThis(i18n("This lists files which you have opened recently, and allows you to easily open them again.")); - TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQT_SLOT(newView()), + TDEAction *a=new TDEAction(i18n("&New Window"), "window-new", 0, this, TQ_SLOT(newView()), actionCollection(), "view_new_view"); a->setWhatsThis(i18n("Create another view containing the current document")); - a=new TDEAction(i18n("Choose Editor Component..."),0,this,TQT_SLOT(changeEditor()), + a=new TDEAction(i18n("Choose Editor Component..."),0,this,TQ_SLOT(changeEditor()), actionCollection(),"settings_choose_editor"); a->setWhatsThis(i18n("Override the system wide setting for the default editing component")); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view")); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection())->setWhatsThis(i18n("Close the current document view")); // setup Settings menu setStandardToolBarMenuEnabled(true); - m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); + m_paShowStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar"); m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar")); - m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()), + m_paShowPath = new TDEToggleAction(i18n("Sho&w Path"), 0, this, TQ_SLOT(newCaption()), actionCollection(), "set_showPath"); m_paShowPath->setCheckedState(i18n("Hide Path")); m_paShowPath->setWhatsThis(i18n("Show the complete document path in the window caption")); - a=KStdAction::keyBindings(this, TQT_SLOT(editKeys()), actionCollection()); + a=KStdAction::keyBindings(this, TQ_SLOT(editKeys()), actionCollection()); a->setWhatsThis(i18n("Configure the application's keyboard shortcut assignments.")); - a=KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection()); + a=KStdAction::configureToolbars(this, TQ_SLOT(editToolbars()), actionCollection()); a->setWhatsThis(i18n("Configure which items should appear in the toolbar(s).")); } @@ -299,7 +299,7 @@ void KWrite::editToolbars() { saveMainWindowSettings( kapp->config(), "MainWindow" ); KEditToolbar *dlg = new KEditToolbar(guiFactory()); - connect( dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotNewToolbarConfig()) ); + connect( dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotNewToolbarConfig()) ); dlg->exec(); delete dlg; } diff --git a/kate/utils/messageview.cpp b/kate/utils/messageview.cpp index 53c0191a9..a780cc063 100644 --- a/kate/utils/messageview.cpp +++ b/kate/utils/messageview.cpp @@ -26,8 +26,8 @@ Kate::MessageView::MessageView( TQWidget *parent, const char *name ) { m_view = new TQTextBrowser( this ); // m_view->setFormat( TQt::richText ); // should be!! - connect( m_view, TQT_SIGNAL( linkClicked( const TQString & ) ), - TQT_SIGNAL( linkClicked( const TQString & ) ) ); + connect( m_view, TQ_SIGNAL( linkClicked( const TQString & ) ), + TQ_SIGNAL( linkClicked( const TQString & ) ) ); } Kate::MessageView::~MessageView() diff --git a/kcminit/main.cpp b/kcminit/main.cpp index f1fbf8987..de62c9834 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -193,7 +193,7 @@ KCMInit::KCMInit( TDECmdLineArgs* args ) runModules( 0 ); kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)", TQString("kcminit")); sendReady(); - TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case + TQTimer::singleShot( 300 * 1000, tqApp, TQ_SLOT( quit())); // just in case tqApp->exec(); // wait for runPhase1() and runPhase2() } else diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 2cb9281df..3b79f8ce7 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -96,10 +96,10 @@ KAccessApp::KAccessApp(bool allowStyles, bool GUIenabled) overlay(0), wm(0, KWinModule::INFO_DESKTOP) { _activeWindow = wm.activeWindow(); - connect(&wm, TQT_SIGNAL(activeWindowChanged(WId)), this, TQT_SLOT(activeWindowChanged(WId))); + connect(&wm, TQ_SIGNAL(activeWindowChanged(WId)), this, TQ_SLOT(activeWindowChanged(WId))); artsBellTimer = new TQTimer( this ); - connect( artsBellTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotArtsBellTimeout() )); + connect( artsBellTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotArtsBellTimeout() )); features = 0; requestedFeatures = 0; @@ -364,7 +364,7 @@ bool KAccessApp::x11EventFilter(XEvent *event) void VisualBell::paintEvent(TQPaintEvent *event) { TQWidget::paintEvent(event); - TQTimer::singleShot(_pause, this, TQT_SLOT(hide())); + TQTimer::singleShot(_pause, this, TQ_SLOT(hide())); } @@ -605,9 +605,9 @@ void KAccessApp::createDialogContents() { dialog->setMainWidget(topcontents); dialog->enableButtonSeparator(false); - connect (dialog, TQT_SIGNAL(yesClicked()), this, TQT_SLOT(yesClicked())); - connect (dialog, TQT_SIGNAL(noClicked()), this, TQT_SLOT(noClicked())); - connect (dialog, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(dialogClosed())); + connect (dialog, TQ_SIGNAL(yesClicked()), this, TQ_SLOT(yesClicked())); + connect (dialog, TQ_SIGNAL(noClicked()), this, TQ_SLOT(noClicked())); + connect (dialog, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(dialogClosed())); } } diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index e38615ebb..5c6cc68b4 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -55,10 +55,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) { KIntNumInput::setRange (min,max,step, slider); if (slider) { - disconnect(m_slider, TQT_SIGNAL(valueChanged(int)), - m_spin, TQT_SLOT(setValue(int))); - disconnect(m_spin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(spinValueChanged(int))); + disconnect(m_slider, TQ_SIGNAL(valueChanged(int)), + m_spin, TQ_SLOT(setValue(int))); + disconnect(m_spin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(spinValueChanged(int))); this->min = min; this->max = max; @@ -72,10 +72,10 @@ void ExtendedIntNumInput::setRange(int min, int max, int step, bool slider) { double logVal = alpha * (log((double)value())-log((double)min)); m_slider->setValue ((int)floor (0.5 + logVal)); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSliderValueChanged(int))); - connect(m_spin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotSpinValueChanged(int))); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSliderValueChanged(int))); + connect(m_spin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotSpinValueChanged(int))); } } @@ -276,13 +276,13 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) TQWhatsThis::add( soundLabel, wtstr ); TQWhatsThis::add( soundButton, wtstr ); - connect(soundButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectSound())); + connect(soundButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectSound())); - connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); - connect(systemBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(customBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(soundEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(systemBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(customBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(soundEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); // ----------------------------------------------------- @@ -326,16 +326,16 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) hbox->addWidget(durationSlider); TQWhatsThis::add( durationSlider, i18n("Here you can customize the duration of the \"visible bell\" effect being shown.") ); - connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(visibleBell, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(colorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeFlashScreenColor())); + connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(visibleBell, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(colorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeFlashScreenColor())); - connect(invertScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertClicked())); - connect(flashScreen, TQT_SIGNAL(clicked()), this, TQT_SLOT(flashClicked())); + connect(invertScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertClicked())); + connect(flashScreen, TQ_SIGNAL(clicked()), this, TQ_SLOT(flashClicked())); - connect(durationSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(durationSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); vbox->addStretch(); @@ -391,16 +391,16 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyModifiersButton); - connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(stickyKeysLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(stickyKeysAutoOff, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(stickyKeysLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(stickyKeysAutoOff, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(stickyKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); - connect(stickyKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(toggleKeysBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(kNotifyModifiers, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(kNotifyModifiersButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify())); + connect(stickyKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(toggleKeysBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(kNotifyModifiers, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(kNotifyModifiersButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify())); vbox->addStretch(); @@ -465,18 +465,18 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) bounceKeysRejectBeep = new TQCheckBox(i18n("Use the system bell whenever a key is rejected"), grp); hbox->addWidget(bounceKeysRejectBeep); - connect(slowKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(slowKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(slowKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(slowKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); - connect(slowKeysPressBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(slowKeysAcceptBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(slowKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(slowKeysPressBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(slowKeysAcceptBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(slowKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); - connect(bounceKeysDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(bounceKeysRejectBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(bounceKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); + connect(bounceKeysDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(bounceKeysRejectBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(bounceKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); vbox->addStretch(); @@ -539,15 +539,15 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *) kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed); hbox->addWidget(kNotifyAccessXButton); - connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(timeout, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(timeoutDelay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(accessxBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(gestureConfirmation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(kNotifyAccessX, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(kNotifyAccessXButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(configureKNotify())); + connect(gestures, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(timeout, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(timeoutDelay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(accessxBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(gestureConfirmation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(kNotifyAccessX, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(kNotifyAccessXButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(configureKNotify())); vbox->addStretch(); diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 388776bc1..5f78072a1 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -100,10 +100,10 @@ void KArtsModule::initAudioIOList() *artsd << "artsd"; *artsd << "-A"; - connect(artsd, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotArtsdExited(TDEProcess*))); - connect(artsd, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int))); + connect(artsd, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotArtsdExited(TDEProcess*))); + connect(artsd, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotProcessArtsdOutput(TDEProcess*, char*, int))); if (!artsd->start(TDEProcess::Block, TDEProcess::Stderr)) { KMessageBox::error(0, i18n("Unable to start the sound server to " @@ -216,31 +216,31 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name) suspendTime->setRange( 1, 999, 1, true ); - connect(startServer,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); - connect(networkTransparent,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); - connect(startRealtime,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); - connect(fullDuplex,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChanged())); - connect(customDevice, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect(deviceName, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(customRate, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect(samplingRate, TQT_SIGNAL(valueChanged(const TQString&)), TQT_SLOT(slotChanged())); -// connect(general->volumeSystray, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged()) ); - - connect(hardware->audioIO,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged())); - connect(hardware->audioIO,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged())); - connect(hardware->customOptions,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged())); - connect(hardware->addOptions,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotChanged())); - connect(hardware->soundQuality,TQT_SIGNAL(highlighted(int)),TQT_SLOT(slotChanged())); - connect(hardware->soundQuality,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChanged())); - connect(general->latencySlider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged())); - connect(autoSuspend,TQT_SIGNAL(clicked()),TQT_SLOT(slotChanged())); - connect(suspendTime,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotChanged())); - connect(general->testSound,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestSound())); - connect(hardware->midiDevice, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotChanged() ) ); - connect(hardware->midiDevice, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotChanged() ) ); - connect(hardware->midiUseMapper, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect(hardware->midiMapper, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotChanged() ) ); + connect(startServer,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged())); + connect(networkTransparent,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged())); + connect(startRealtime,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged())); + connect(fullDuplex,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChanged())); + connect(customDevice, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect(deviceName, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(customRate, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect(samplingRate, TQ_SIGNAL(valueChanged(const TQString&)), TQ_SLOT(slotChanged())); +// connect(general->volumeSystray, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChanged()) ); + + connect(hardware->audioIO,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotChanged())); + connect(hardware->audioIO,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChanged())); + connect(hardware->customOptions,TQ_SIGNAL(clicked()),TQ_SLOT(slotChanged())); + connect(hardware->addOptions,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotChanged())); + connect(hardware->soundQuality,TQ_SIGNAL(highlighted(int)),TQ_SLOT(slotChanged())); + connect(hardware->soundQuality,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChanged())); + connect(general->latencySlider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotChanged())); + connect(autoSuspend,TQ_SIGNAL(clicked()),TQ_SLOT(slotChanged())); + connect(suspendTime,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotChanged())); + connect(general->testSound,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestSound())); + connect(hardware->midiDevice, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( slotChanged() ) ); + connect(hardware->midiDevice, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotChanged() ) ); + connect(hardware->midiUseMapper, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect(hardware->midiMapper, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotChanged() ) ); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmarts"), I18N_NOOP("The Sound Server Control Module"), @@ -553,8 +553,8 @@ bool KArtsModule::realtimeIsPossible() *checkProcess << "artswrapper"; *checkProcess << "check"; - connect(checkProcess, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(slotArtsdExited(TDEProcess*))); + connect(checkProcess, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(slotArtsdExited(TDEProcess*))); if (!checkProcess->start(TDEProcess::Block)) { delete checkProcess; @@ -672,7 +672,7 @@ KStartArtsProgressDialog::KStartArtsProgressDialog(KArtsModule *parent, const ch const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true), m_module(parent), m_shutdown(false) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -718,7 +718,7 @@ KStartArtsProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - TQTimer::singleShot(1000, this, TQT_SLOT(close())); + TQTimer::singleShot(1000, this, TQ_SLOT(close())); } diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index 3194c2859..03be761d7 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -77,8 +77,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_listPrograms->header()->setStretchEnabled ( true, 1 ); dlg->m_listPrograms->setAllColumnsShowFocus(true); - connect(dlg->m_listPrograms, TQT_SIGNAL(clicked(TQListViewItem *)), - TQT_SLOT(slotProgramItemClicked(TQListViewItem *))); + connect(dlg->m_listPrograms, TQ_SIGNAL(clicked(TQListViewItem *)), + TQ_SLOT(slotProgramItemClicked(TQListViewItem *))); // Load programs TQStringList lst = KBackgroundProgram::list(); @@ -100,15 +100,15 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_spinCache->setSpecialValueText(i18n("Unlimited")); dlg->m_spinCache->setSuffix(i18n(" KB")); - connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAdd())); - connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemove())); - connect(dlg->m_buttonModify, TQT_SIGNAL(clicked()), - TQT_SLOT(slotModify())); + connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemove())); + connect(dlg->m_buttonModify, TQ_SIGNAL(clicked()), + TQ_SLOT(slotModify())); - connect(dlg->m_listPrograms, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_SLOT(slotProgramItemDoubleClicked(TQListViewItem *))); + connect(dlg->m_listPrograms, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + TQ_SLOT(slotProgramItemDoubleClicked(TQListViewItem *))); } else { @@ -119,8 +119,8 @@ BGAdvancedDialog::BGAdvancedDialog(KBackgroundRenderer *_r, dlg->m_groupCache->hide(); } - connect( dlg->m_cbProgram, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotEnableProgram(bool))); + connect( dlg->m_cbProgram, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotEnableProgram(bool))); m_backgroundMode = m_oldBackgroundMode = r->backgroundMode(); if (m_oldBackgroundMode == KBackgroundSettings::Program) diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 66acb0fce..c5d56af0f 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -122,21 +122,21 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_eScreen = 0; } - connect(m_buttonIdentifyScreens, TQT_SIGNAL(clicked()), TQT_SLOT(slotIdentifyScreens())); + connect(m_buttonIdentifyScreens, TQ_SIGNAL(clicked()), TQ_SLOT(slotIdentifyScreens())); // preview monitor m_pMonitorArrangement = new BGMonitorArrangement(m_screenArrangement, "monitor arrangement"); - connect(m_pMonitorArrangement, TQT_SIGNAL(imageDropped(const TQString &)), TQT_SLOT(slotImageDropped(const TQString &))); + connect(m_pMonitorArrangement, TQ_SIGNAL(imageDropped(const TQString &)), TQ_SLOT(slotImageDropped(const TQString &))); if( m_multidesktop) { // desktop - connect(m_comboDesktop, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotSelectDesk(int))); + connect(m_comboDesktop, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotSelectDesk(int))); } if (m_numScreens > 1) { - connect(m_comboScreen, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotSelectScreen(int))); + connect(m_comboScreen, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotSelectScreen(int))); } // background image settings @@ -146,42 +146,42 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); TQToolTip::add(m_urlWallpaperButton, i18n("Open file dialog")); - connect(m_buttonGroupBackground, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotWallpaperTypeChanged(int))); - connect(m_urlWallpaperBox, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotWallpaper(int))); - connect(m_urlWallpaperButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotWallpaperSelection())); - connect(m_comboWallpaperPos, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotWallpaperPos(int))); - connect(m_buttonSetupWallpapers, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSetupMulti())); + connect(m_buttonGroupBackground, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotWallpaperTypeChanged(int))); + connect(m_urlWallpaperBox, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotWallpaper(int))); + connect(m_urlWallpaperButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotWallpaperSelection())); + connect(m_comboWallpaperPos, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotWallpaperPos(int))); + connect(m_buttonSetupWallpapers, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSetupMulti())); // set up the background colour stuff - connect(m_colorPrimary, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotPrimaryColor(const TQColor &))); - connect(m_colorSecondary, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotSecondaryColor(const TQColor &))); - connect(m_comboPattern, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotPattern(int))); + connect(m_colorPrimary, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotPrimaryColor(const TQColor &))); + connect(m_colorSecondary, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotSecondaryColor(const TQColor &))); + connect(m_comboPattern, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotPattern(int))); // blend - connect(m_comboBlend, TQT_SIGNAL(activated(int)), TQT_SLOT(slotBlendMode(int))); - connect(m_sliderBlend, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotBlendBalance(int))); - connect(m_cbBlendReverse, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotBlendReverse(bool))); + connect(m_comboBlend, TQ_SIGNAL(activated(int)), TQ_SLOT(slotBlendMode(int))); + connect(m_sliderBlend, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotBlendBalance(int))); + connect(m_cbBlendReverse, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotBlendReverse(bool))); // Crossfading background - connect(m_cbCrossFadeBg, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotCrossFadeBg(bool))); + connect(m_cbCrossFadeBg, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotCrossFadeBg(bool))); // advanced options - connect(m_buttonAdvanced, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAdvanced())); + connect(m_buttonAdvanced, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAdvanced())); - connect(m_buttonGetNew, TQT_SIGNAL(clicked()), - TQT_SLOT(slotGetNewStuff())); + connect(m_buttonGetNew, TQ_SIGNAL(clicked()), + TQ_SLOT(slotGetNewStuff())); // renderers m_renderer.resize(m_numDesks+1); @@ -198,19 +198,19 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) // Setup the merged-screen renderer KBackgroundRenderer * r = new KBackgroundRenderer(eDesk, 0, false, _config); m_renderer[i].insert( 0, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); // Setup the common-screen renderer r = new KBackgroundRenderer(eDesk, 0, true, _config); m_renderer[i].insert( 1, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); // Setup the remaining renderers for each screen for (unsigned j=0; j < m_numScreens; ++j ) { r = new KBackgroundRenderer(eDesk, j, true, _config); m_renderer[i].insert( j+2, r ); - connect( r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int)) ); } } } @@ -225,14 +225,14 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) // set up the common desktop renderer KBackgroundRenderer * r = new KBackgroundRenderer(0, 0, false, _config); m_renderer[0].insert(0, r); - connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); + connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int))); // set up all the other desktop renderers for (unsigned i = 0; i < m_numDesks; ++i) { r = new KBackgroundRenderer(i, 0, false, _config); m_renderer[i+1].insert(0, r); - connect(r, TQT_SIGNAL(imageDone(int,int)), TQT_SLOT(slotPreviewDone(int,int))); + connect(r, TQ_SIGNAL(imageDone(int,int)), TQ_SLOT(slotPreviewDone(int,int))); } } @@ -285,7 +285,7 @@ BGDialog::BGDialog(TQWidget* parent, TDEConfig* _config, bool _multidesktop) updateUI(); #if (TQT_VERSION-0 >= 0x030200) - connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support + connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support #endif } @@ -447,7 +447,7 @@ void BGDialog::slotIdentifyScreens() screenLabel->setNum(int(s + 1)); // BUGLET: we should not allow the identification to be entered again // until the timer fires. - TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); + TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp index 1cf601bee..c75d42f6c 100644 --- a/kcontrol/background/bgmonitor.cpp +++ b/kcontrol/background/bgmonitor.cpp @@ -47,7 +47,7 @@ BGMonitorArrangement::BGMonitorArrangement(TQWidget *parent, const char *name) BGMonitorLabel * label = new BGMonitorLabel(this); m_pBGMonitor[screen] = label; - connect( label->monitor(), TQT_SIGNAL(imageDropped(const TQString &)), this, TQT_SIGNAL(imageDropped(const TQString &)) ); + connect( label->monitor(), TQ_SIGNAL(imageDropped(const TQString &)), this, TQ_SIGNAL(imageDropped(const TQString &)) ); } parent->setFixedSize(200, 186); diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index ee67beb66..12455b608 100644 --- a/kcontrol/background/bgrender.cpp +++ b/kcontrol/background/bgrender.cpp @@ -63,7 +63,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou m_TilingEnabled = false; m_pTimer = new TQTimer(this); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(render())); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(render())); } @@ -239,8 +239,8 @@ int KBackgroundRenderer::doBackground(bool quit) delete m_pProc; m_pProc = new KShellProcess; *m_pProc << file; - connect(m_pProc, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotBackgroundDone(TDEProcess *))); + connect(m_pProc, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotBackgroundDone(TDEProcess *))); m_pProc->start(KShellProcess::NotifyOnExit); retval = Wait; break; @@ -1228,7 +1228,7 @@ void KVirtualBGRenderer::initRenderers() KCrossBGRender *r = new KCrossBGRender(m_desk, eScreen, m_bDrawBackgroundPerScreen, m_pConfig); m_renderer.insert( i, r ); r->setSize(renderSize(i)); - connect( r, TQT_SIGNAL(imageDone(int,int)), this, TQT_SLOT(screenDone(int,int)) ); + connect( r, TQ_SIGNAL(imageDone(int,int)), this, TQ_SLOT(screenDone(int,int)) ); } } diff --git a/kcontrol/background/bgwallpaper.cpp b/kcontrol/background/bgwallpaper.cpp index b10c3707b..bc7de3e63 100644 --- a/kcontrol/background/bgwallpaper.cpp +++ b/kcontrol/background/bgwallpaper.cpp @@ -114,11 +114,11 @@ BGMultiWallpaperDialog::BGMultiWallpaperDialog(KBackgroundSettings *settings, if (m_pSettings->multiWallpaperMode() == KBackgroundSettings::Random) dlg->m_cbRandom->setChecked(true); - connect(dlg->m_buttonAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - connect(dlg->m_buttonRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - connect(dlg->m_buttonMoveUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); - connect(dlg->m_buttonMoveDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); - connect(dlg->m_listImages, TQT_SIGNAL(clicked ( TQListBoxItem * )), TQT_SLOT(slotItemSelected( TQListBoxItem *))); + connect(dlg->m_buttonAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); + connect(dlg->m_buttonRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); + connect(dlg->m_buttonMoveUp, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp())); + connect(dlg->m_buttonMoveDown, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown())); + connect(dlg->m_listImages, TQ_SIGNAL(clicked ( TQListBoxItem * )), TQ_SLOT(slotItemSelected( TQListBoxItem *))); dlg->m_buttonRemove->setEnabled( false ); dlg->m_buttonMoveUp->setEnabled( false ); dlg->m_buttonMoveDown->setEnabled( false ); diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index 75ed22269..e27aa50ac 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -65,7 +65,7 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList // reparenting that is done. setAcceptDrops(true); - connect(m_base, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(m_base, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmbackground"), I18N_NOOP("TDE Background Control Module"), diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 8b24dac6b..8abc606db 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -84,7 +84,7 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name): "more sophisticated system notification, see the " "\"System Notifications\" control module for the " "\"Something Special Happened in the Program\" event.")); - connect(m_useBell, TQT_SIGNAL( toggled( bool )), TQT_SLOT( useBell( bool ))); + connect(m_useBell, TQ_SIGNAL( toggled( bool )), TQ_SLOT( useBell( bool ))); row++; grid->addMultiCellWidget(m_useBell, row, row, 0, 1); @@ -124,13 +124,13 @@ KBellConfig::KBellConfig(TQWidget *parent, const char *name): m_testButton = new TQPushButton(i18n("&Test"), box, "test"); boxLayout->addWidget(m_testButton, 0, AlignRight); grid->addLayout( boxLayout, ++row, 1 ); - connect( m_testButton, TQT_SIGNAL(clicked()), TQT_SLOT(ringBell())); + connect( m_testButton, TQ_SIGNAL(clicked()), TQ_SLOT(ringBell())); TQWhatsThis::add( m_testButton, i18n("Click \"Test\" to hear how the system bell will sound using your changed settings.") ); // watch for changes - connect(m_volume, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_pitch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_duration, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(m_volume, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_pitch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_duration, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmbell"), I18N_NOOP("TDE Bell Control Module"), diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index a492c9deb..3e45b3b19 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -70,14 +70,14 @@ Dtime::Dtime(TQWidget * parent, const char *name) setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" ); setDateTimeAuto->setText(i18n("Set date and time &automatically:")); - connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck())); - connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); + connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(serverTimeCheck())); + connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged())); layout1->addWidget( setDateTimeAuto ); timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" ); - connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged())); - connect(timeServerList, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(configChanged())); - connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool))); + connect(timeServerList, TQ_SIGNAL(activated(int)), TQ_SLOT(configChanged())); + connect(timeServerList, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(configChanged())); + connect(setDateTimeAuto, TQ_SIGNAL(toggled(bool)), timeServerList, TQ_SLOT(setEnabled(bool))); timeServerList->setEnabled(false); timeServerList->setEditable(true); layout1->addWidget( timeServerList ); @@ -164,12 +164,12 @@ Dtime::Dtime(TQWidget * parent, const char *name) // End Dialog // ************************************************************* - connect( hour, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); - connect( minute, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); - connect( second, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(set_time()) ); - connect( cal, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(changeDate(TQDate))); + connect( hour, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) ); + connect( minute, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) ); + connect( second, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(set_time()) ); + connect( cal, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(changeDate(TQDate))); - connect( &internalTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); + connect( &internalTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); load(); diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index a59599b71..7d791b9f7 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -63,11 +63,11 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis dtime = new Dtime(this); layout->addWidget(dtime); - connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool))); + connect(dtime, TQ_SIGNAL(timeChanged(bool)), this, TQ_SIGNAL(changed(bool))); tzone = new Tzone(this); layout->addWidget(tzone); - connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool))); + connect(tzone, TQ_SIGNAL(zoneChanged(bool)), this, TQ_SIGNAL(changed(bool))); layout->addStretch(); diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 518c6663d..593b9ca1d 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -52,7 +52,7 @@ Tzone::Tzone(TQWidget * parent, const char *name) setTitle(i18n("To change the timezone, select your area from the list below")); tzonelist = new KTimezoneWidget(this, "ComboBox_1", &m_zoneDb); - connect( tzonelist, TQT_SIGNAL(selectionChanged()), TQT_SLOT(handleZoneChange()) ); + connect( tzonelist, TQ_SIGNAL(selectionChanged()), TQ_SLOT(handleZoneChange()) ); m_local = new TQLabel(this); diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index c767836fd..ee4bd087a 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/kcontrol/colors/colorscm.cpp @@ -136,10 +136,10 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " \"Widget color\" box will change to reflect the part of the preview" " image you clicked.") ); - connect( cs, TQT_SIGNAL( widgetSelected( int ) ), - TQT_SLOT( slotWidgetColor( int ) ) ); - connect( cs, TQT_SIGNAL( colorDropped( int, const TQColor&)), - TQT_SLOT( slotColorForWidget( int, const TQColor&))); + connect( cs, TQ_SIGNAL( widgetSelected( int ) ), + TQ_SLOT( slotWidgetColor( int ) ) ); + connect( cs, TQ_SIGNAL( colorDropped( int, const TQColor&)), + TQ_SLOT( slotColorForWidget( int, const TQColor&))); topLayout->addMultiCellWidget( cs, 0, 0, 0, 1 ); TQGroupBox *group = new TQVGroupBox( i18n("Color Scheme"), this ); @@ -149,7 +149,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis mSchemeList = new KColorSchemeList(); readSchemeNames(); sList->setCurrentItem( 0 ); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes," " including any that you may have created. You can preview an existing" @@ -160,7 +160,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " another color scheme.") ); addBt = new TQPushButton(i18n("&Save Scheme..."), group); - connect(addBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); + connect(addBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); TQWhatsThis::add( addBt, i18n("Press this button if you want to save" " the current color settings as a color scheme. You will be" @@ -168,14 +168,14 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis removeBt = new TQPushButton(i18n("R&emove Scheme"), group); removeBt->setEnabled(FALSE); - connect(removeBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); + connect(removeBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); TQWhatsThis::add( removeBt, i18n("Press this button to remove the selected" " color scheme. Note that this button is disabled if you do not have" " permission to delete the color scheme.") ); importBt = new TQPushButton(i18n("I&mport Scheme..."), group); - connect(importBt, TQT_SIGNAL(clicked()),TQT_SLOT(slotImport())); + connect(importBt, TQ_SIGNAL(clicked()),TQ_SLOT(slotImport())); TQWhatsThis::add( importBt, i18n("Press this button to import a new color" " scheme. Note that the color scheme will only be available for the" @@ -221,7 +221,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis setColorName(i18n("Alternate Background in Lists"), CSM_Alternate_background); wcCombo->adjustSize(); - connect(wcCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotWidgetColor(int))); + connect(wcCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotWidgetColor(int))); groupLayout->addWidget(wcCombo); TQWhatsThis::add( wcCombo, i18n("Click here to select an element of" @@ -230,8 +230,8 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis " of the preview image above.") ); colorButton = new KColorButton( group ); - connect( colorButton, TQT_SIGNAL( changed(const TQColor &)), - TQT_SLOT(slotSelectColor(const TQColor &))); + connect( colorButton, TQ_SIGNAL( changed(const TQColor &)), + TQ_SLOT(slotSelectColor(const TQColor &))); groupLayout->addWidget( colorButton ); @@ -241,7 +241,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis cbShadeList = new TQCheckBox(i18n("Shade sorted column in lists"), this); stackLayout->addWidget(cbShadeList); - connect(cbShadeList, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotShadeSortColumnChanged(bool))); + connect(cbShadeList, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotShadeSortColumnChanged(bool))); TQWhatsThis::add(cbShadeList, i18n("Check this box to show the sorted column in a list with a shaded background")); @@ -257,7 +257,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis sb = new TQSlider( TQt::Horizontal,group,"Slider" ); sb->setRange( 0, 10 ); sb->setFocusPolicy( TQWidget::StrongFocus ); - connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderValueChanged(int))); + connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderValueChanged(int))); TQWhatsThis::add(sb, i18n("Use this slider to change the contrast level" " of the current color scheme. Contrast does not affect all of the" @@ -272,7 +272,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis cbExportColors = new TQCheckBox(i18n("Apply colors to &non-TDE applications"), this); topLayout->addMultiCellWidget( cbExportColors, 2, 2, 0, 1 ); - connect(cbExportColors, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); + connect(cbExportColors, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); TQWhatsThis::add(cbExportColors, i18n("Check this box to apply the" " current color scheme to non-TDE applications.")); @@ -550,8 +550,8 @@ void KColorScheme::slotAdd() valid = true; } - disconnect(sList, TQT_SIGNAL(highlighted(int)), this, - TQT_SLOT(slotPreviewScheme(int))); + disconnect(sList, TQ_SIGNAL(highlighted(int)), this, + TQ_SLOT(slotPreviewScheme(int))); if (exists != -1) { @@ -574,7 +574,7 @@ void KColorScheme::slotAdd() TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } @@ -605,7 +605,7 @@ void KColorScheme::slotImport() TQPixmap preview = mkColorPreview(cs); int current = sList->currentItem(); sList->changeItem(preview, sList->text(current), current); - connect(sList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotPreviewScheme(int))); + connect(sList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotPreviewScheme(int))); slotPreviewScheme(current); } } diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index e7b807327..b469fc001 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/kcontrol/componentchooser/componentchooser.cpp @@ -53,7 +53,7 @@ public: CfgComponent::CfgComponent(TQWidget *parent):ComponentConfig_UI(parent),CfgPlugin(){ m_lookupDict.setAutoDelete(true); m_revLookupDict.setAutoDelete(true); - connect(ComponentSelector,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(slotComponentChanged(const TQString&))); + connect(ComponentSelector,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(slotComponentChanged(const TQString&))); } CfgComponent::~CfgComponent(){} @@ -126,9 +126,9 @@ void CfgComponent::defaults() CfgEmailClient::CfgEmailClient(TQWidget *parent):EmailClientConfig_UI(parent),CfgPlugin(){ pSettings = new KEMailSettings(); - connect(kmailCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) ); - connect(txtEMailClient, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) ); - connect(chkRunTerminal, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); + connect(kmailCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) ); + connect(txtEMailClient, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()) ); + connect(chkRunTerminal, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); } CfgEmailClient::~CfgEmailClient() { @@ -252,9 +252,9 @@ void CfgFileManager::selectFileAssociations() //BEGIN Terminal Emulator Configuration CfgTerminalEmulator::CfgTerminalEmulator(TQWidget *parent):TerminalEmulatorConfig_UI(parent),CfgPlugin(){ - connect(terminalLE,TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(configChanged())); - connect(terminalCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); - connect(otherCB,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); + connect(terminalLE,TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(configChanged())); + connect(terminalCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged())); + connect(otherCB,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged())); } CfgTerminalEmulator::~CfgTerminalEmulator() { @@ -323,9 +323,9 @@ void CfgTerminalEmulator::selectTerminalApp() //BEGIN Browser Configuration CfgBrowser::CfgBrowser(TQWidget *parent) : BrowserConfig_UI(parent),CfgPlugin(){ - connect(lineExec,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(configChanged())); - connect(radioKIO,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); - connect(radioExec,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(configChanged())); + connect(lineExec,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(configChanged())); + connect(radioKIO,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged())); + connect(radioExec,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(configChanged())); } CfgBrowser::~CfgBrowser() { @@ -431,7 +431,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name): } ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width()); ServiceChooser->sort(); - connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*))); + connect(ServiceChooser,TQ_SIGNAL(highlighted(TQListBoxItem*)),this,TQ_SLOT(slotServiceSelected(TQListBoxItem*))); ServiceChooser->setSelected(0,true); slotServiceSelected(ServiceChooser->item(0)); @@ -504,7 +504,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) { configContainer->removeWidget(configWidget); delete configWidget; configWidget=newConfigWidget; - connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool))); + connect(configWidget,TQ_SIGNAL(changed(bool)),this,TQ_SLOT(emitChanged(bool))); configContainer->setMinimumSize(configWidget->sizeHint()); } diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 30750bdd5..6c71f8a42 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/kcontrol/componentchooser/kcm_componentchooser.cpp @@ -27,7 +27,7 @@ KCMComponentChooser::KCMComponentChooser( TQWidget *parent, const char *name ): (new TQVBoxLayout(this))->setAutoAdd(true); m_chooser=new ComponentChooser(this,"ComponentChooser"); - connect(m_chooser,TQT_SIGNAL(changed(bool)),this,TQT_SIGNAL(changed(bool))); + connect(m_chooser,TQ_SIGNAL(changed(bool)),this,TQ_SIGNAL(changed(bool))); setButtons( Help | Apply ); TDEAboutData *about = diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp index 034d69897..d289f4aed 100644 --- a/kcontrol/crypto/certexport.cpp +++ b/kcontrol/crypto/certexport.cpp @@ -55,21 +55,21 @@ TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint()); _filename = new KLineEdit(this); grid->addMultiCellWidget(_filename, 6, 6, 0, 4); - connect(_filename, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &))); - connect(_filename, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotExport())); + connect(_filename, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &))); + connect(_filename, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotExport())); _choose = new TQPushButton("...", this); grid->addWidget(_choose, 6, 5); - connect(_choose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChoose())); + connect(_choose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChoose())); _export = new TQPushButton(i18n("&Export"), this); grid->addWidget(_export, 8, 4); - connect(_export, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExport())); + connect(_export, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExport())); _export->setEnabled(false); _cancel = new TQPushButton(i18n("&Cancel"), this); grid->addWidget(_cancel, 8, 5); - connect(_cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(_cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); } diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index 71521af04..53a73f4a1 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/kcontrol/crypto/crypto.cpp @@ -265,7 +265,7 @@ TQString whatstr; grid = new TQGridLayout(tabSSL, 7, 2, KDialog::marginHint(), KDialog::spacingHint() ); mUseTLS = new TQCheckBox(i18n("Enable &TLS support if supported by the server"), tabSSL); - connect(mUseTLS, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mUseTLS, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mUseTLS, 0, 0); whatstr = i18n("TLS is the newest revision of the SSL protocol." " It integrates better with other protocols and has" @@ -273,14 +273,14 @@ TQString whatstr; TQWhatsThis::add(mUseTLS, whatstr); mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL); - connect(mUseSSLv2, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mUseSSLv2, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mUseSSLv2, 1, 0); whatstr = i18n("SSL v2 is the second revision of the SSL protocol." " It is most common to enable v2 and v3."); TQWhatsThis::add(mUseSSLv2, whatstr); mUseSSLv3 = new TQCheckBox(i18n("Enable SSLv&3"), tabSSL); - connect(mUseSSLv3, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mUseSSLv3, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mUseSSLv3, 1, 1); whatstr = i18n("SSL v3 is the third revision of the SSL protocol." " It is most common to enable v2 and v3."); @@ -296,8 +296,8 @@ TQString whatstr; SSLv2Box->setSelectionMode(TQListView::NoSelection); grid->addWidget( SSLv2Box, 2, 0 ); - connect( mUseSSLv2, TQT_SIGNAL( toggled( bool ) ), - SSLv2Box, TQT_SLOT( setEnabled( bool ))); + connect( mUseSSLv2, TQ_SIGNAL( toggled( bool ) ), + SSLv2Box, TQ_SLOT( setEnabled( bool ))); #else TQLabel *nossllabel = new TQLabel(i18n("SSL ciphers cannot be configured" " because this module was not linked" @@ -321,8 +321,8 @@ TQString whatstr; TQWhatsThis::add(SSLv3Box, whatstr); SSLv3Box->setSelectionMode(TQListView::NoSelection); grid->addWidget(SSLv3Box, 2, 1); - connect( mUseSSLv3, TQT_SIGNAL( toggled( bool ) ), - SSLv3Box, TQT_SLOT( setEnabled( bool ))); + connect( mUseSSLv3, TQ_SIGNAL( toggled( bool ) ), + SSLv3Box, TQ_SLOT( setEnabled( bool ))); loadCiphers(); @@ -346,7 +346,7 @@ TQString whatstr; TQWhatsThis::add(cwcb, whatStr); - connect(cwcb, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectCipher(int))); + connect(cwcb, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectCipher(int))); @@ -354,21 +354,21 @@ TQString whatstr; #endif mWarnOnEnter = new TQCheckBox(i18n("Warn on &entering SSL mode"), tabSSL); - connect(mWarnOnEnter, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnOnEnter, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mWarnOnEnter, 5, 0); whatstr = i18n("If selected, you will be notified when entering an SSL" " enabled site"); TQWhatsThis::add(mWarnOnEnter, whatstr); mWarnOnLeave = new TQCheckBox(i18n("Warn on &leaving SSL mode"), tabSSL); - connect(mWarnOnLeave, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnOnLeave, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mWarnOnLeave, 5, 1); whatstr = i18n("If selected, you will be notified when leaving an SSL" " based site."); TQWhatsThis::add(mWarnOnLeave, whatstr); mWarnOnUnencrypted = new TQCheckBox(i18n("Warn on sending &unencrypted data"), tabSSL); - connect(mWarnOnUnencrypted, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnOnUnencrypted, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mWarnOnUnencrypted, 6, 0); whatstr = i18n("If selected, you will be notified before sending" " unencrypted data via a web browser."); @@ -376,7 +376,7 @@ TQString whatstr; #if 0 // NOT IMPLEMENTED IN KDE 3.0 mWarnOnMixed = new TQCheckBox(i18n("Warn on &mixed SSL/non-SSL pages"), tabSSL); - connect(mWarnOnMixed, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnOnMixed, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addWidget(mWarnOnMixed, 6, 1); whatstr = i18n("If selected, you will be notified if you view a page" " that has both encrypted and non-encrypted parts."); @@ -396,9 +396,9 @@ TQString whatstr; oPath = new KURLRequester(oInfo); oPath->setMode(KFile::Directory); oTest = new TQPushButton(i18n("&Test"), oInfo); - connect(oTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTestOSSL())); + connect(oTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTestOSSL())); - connect(oPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged())); + connect(oPath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged())); // // Settings for the EGD @@ -406,9 +406,9 @@ TQString whatstr; TQFrame *eFrame = new TQFrame(tabOSSL); TQVBoxLayout *egrid = new TQVBoxLayout(eFrame); mUseEGD = new TQCheckBox(i18n("Use EGD"), eFrame); - connect(mUseEGD, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEGD())); + connect(mUseEGD, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseEGD())); mUseEFile = new TQCheckBox(i18n("Use entropy file"), eFrame); - connect(mUseEFile, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseEFile())); + connect(mUseEFile, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseEFile())); vbox->addWidget(eFrame); egrid->addWidget(mUseEGD); egrid->addWidget(mUseEFile); @@ -419,7 +419,7 @@ TQString whatstr; grid2->addWidget(mEGDLabel, 0, 0); mEGDPath = new KURLRequester(egdframe); grid2->addWidget(mEGDPath, 0, 1); - connect(mEGDPath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged())); + connect(mEGDPath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged())); vbox->addWidget(egdframe); whatstr = i18n("If selected, OpenSSL will be asked to use the entropy gathering" " daemon (EGD) for initializing the pseudo-random number generator."); @@ -454,35 +454,35 @@ TQString whatstr; grid->addMultiCellWidget(yourSSLBox, 0, 5, 0, 4); yourSSLBox->addColumn(i18n("Common Name")); yourSSLBox->addColumn(i18n("Email Address")); - connect(yourSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotYourCertSelect())); + connect(yourSSLBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotYourCertSelect())); yourSSLImport = new TQPushButton(i18n("I&mport..."), tabYourSSLCert); - connect(yourSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourImport())); + connect(yourSSLImport, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourImport())); grid->addWidget(yourSSLImport, 0, 5); yourSSLExport = new TQPushButton(i18n("&Export..."), tabYourSSLCert); yourSSLExport->setEnabled(false); - connect(yourSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourExport())); + connect(yourSSLExport, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourExport())); grid->addWidget(yourSSLExport, 1, 5); yourSSLRemove = new TQPushButton(i18n("Remo&ve"), tabYourSSLCert); yourSSLRemove->setEnabled(false); - connect(yourSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourRemove())); + connect(yourSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourRemove())); grid->addWidget(yourSSLRemove, 2, 5); yourSSLUnlock = new TQPushButton(i18n("&Unlock"), tabYourSSLCert); yourSSLUnlock->setEnabled(false); - connect(yourSSLUnlock, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourUnlock())); + connect(yourSSLUnlock, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourUnlock())); grid->addWidget(yourSSLUnlock, 3, 5); yourSSLVerify = new TQPushButton(i18n("Verif&y"), tabYourSSLCert); yourSSLVerify->setEnabled(false); - connect(yourSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourVerify())); + connect(yourSSLVerify, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourVerify())); grid->addWidget(yourSSLVerify, 4, 5); yourSSLPass = new TQPushButton(i18n("Chan&ge Password..."), tabYourSSLCert); yourSSLPass->setEnabled(false); - connect(yourSSLPass, TQT_SIGNAL(clicked()), TQT_SLOT(slotYourPass())); + connect(yourSSLPass, TQ_SIGNAL(clicked()), TQ_SLOT(slotYourPass())); grid->addWidget(yourSSLPass, 5, 5); grid->addMultiCellWidget(new KSeparator(KSeparator::HLine, tabYourSSLCert), 6, 6, 0, 5); @@ -579,14 +579,14 @@ TQString whatstr; hostCertBG->setEnabled(false); authRemove->setEnabled(false); - connect(defCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); - connect(defCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); - connect(hostAuthList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotAuthItemChanged())); - connect(authAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewHostAuth())); - connect(authRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveHostAuth())); - connect(authHost, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotAuthText(const TQString &))); - connect(hostCertBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAuthButtons())); - connect(hostCertBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotAuthCombo())); + connect(defCertBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); + connect(defCertBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged())); + connect(hostAuthList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotAuthItemChanged())); + connect(authAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewHostAuth())); + connect(authRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveHostAuth())); + connect(authHost, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotAuthText(const TQString &))); + connect(hostCertBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAuthButtons())); + connect(hostCertBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAuthCombo())); #else nossllabel = new TQLabel(i18n("SSL certificates cannot be managed" @@ -607,7 +607,7 @@ TQString whatstr; otherSSLBox = new TQListView(tabOtherSSLCert); otherSSLBox->setAllColumnsShowFocus(true); - connect(otherSSLBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotOtherCertSelect())); + connect(otherSSLBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotOtherCertSelect())); whatstr = i18n("This list box shows which site and person certificates TDE" " knows about. You can easily manage them from here."); TQWhatsThis::add(otherSSLBox, whatstr); @@ -616,21 +616,21 @@ TQString whatstr; grid->addMultiCellWidget(otherSSLBox, 0, 7, 0, 4); otherSSLExport = new TQPushButton(i18n("&Export..."), tabOtherSSLCert); - connect(otherSSLExport, TQT_SIGNAL(clicked()), TQT_SLOT(slotExportCert())); + connect(otherSSLExport, TQ_SIGNAL(clicked()), TQ_SLOT(slotExportCert())); grid->addWidget(otherSSLExport, 0, 5); whatstr = i18n("This button allows you to export the selected certificate" " to a file of various formats."); TQWhatsThis::add(otherSSLExport, whatstr); otherSSLRemove = new TQPushButton(i18n("&Remove"), tabOtherSSLCert); - connect(otherSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveCert())); + connect(otherSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveCert())); grid->addWidget(otherSSLRemove, 1, 5); whatstr = i18n("This button removes the selected certificate" " from the certificate cache."); TQWhatsThis::add(otherSSLRemove, whatstr); otherSSLVerify = new TQPushButton(i18n("&Verify"), tabOtherSSLCert); - connect(otherSSLVerify, TQT_SIGNAL(clicked()), TQT_SLOT(slotVerifyCert())); + connect(otherSSLVerify, TQ_SIGNAL(clicked()), TQ_SLOT(slotVerifyCert())); grid->addWidget(otherSSLVerify, 2, 5); whatstr = i18n("This button tests the selected certificate" " for validity."); @@ -675,9 +675,9 @@ TQString whatstr; cachePerm->setEnabled(false); cacheUntil->setEnabled(false); untilDate->setEnabled(false); - connect(cachePerm, TQT_SIGNAL(clicked()), TQT_SLOT(slotPermanent())); - connect(cacheUntil, TQT_SIGNAL(clicked()), TQT_SLOT(slotUntil())); - connect(untilDate, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotDatePick())); + connect(cachePerm, TQ_SIGNAL(clicked()), TQ_SLOT(slotPermanent())); + connect(cacheUntil, TQ_SIGNAL(clicked()), TQ_SLOT(slotUntil())); + connect(untilDate, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(slotDatePick())); whatstr = i18n("Select here to make the cache entry permanent."); TQWhatsThis::add(cachePerm, whatstr); whatstr = i18n("Select here to make the cache entry temporary."); @@ -691,7 +691,7 @@ TQString whatstr; policyPrompt = new TQRadioButton(i18n("&Prompt"), policyGroup); policyGroup->setEnabled(false); grid->addMultiCellWidget(policyGroup, 16, 19, 3, 5); - connect(policyGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPolicyChanged(int))); + connect(policyGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPolicyChanged(int))); whatstr = i18n("Select this to always accept this certificate."); TQWhatsThis::add(policyAccept, whatstr); whatstr = i18n("Select this to always reject this certificate."); @@ -729,19 +729,19 @@ TQString whatstr; caList->addColumn(i18n("Organization")); caList->addColumn(i18n("Organizational Unit")); caList->addColumn(i18n("Common Name")); - connect(caList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotCAItemChanged())); + connect(caList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotCAItemChanged())); caSSLImport = new TQPushButton(i18n("I&mport..."), tabSSLCA); - connect(caSSLImport, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAImport())); + connect(caSSLImport, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAImport())); grid->addWidget(caSSLImport, 0, 7); caSSLRemove = new TQPushButton(i18n("&Remove"), tabSSLCA); - connect(caSSLRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARemove())); + connect(caSSLRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotCARemove())); grid->addWidget(caSSLRemove, 1, 7); caSSLRemove->setEnabled(false); caSSLRestore = new TQPushButton(i18n("Res&tore"), tabSSLCA); - connect(caSSLRestore, TQT_SIGNAL(clicked()), TQT_SLOT(slotCARestore())); + connect(caSSLRestore, TQ_SIGNAL(clicked()), TQ_SLOT(slotCARestore())); grid->addWidget(caSSLRestore, 2, 7); caSubject = KSSLInfoDlg::certInfoWidget(tabSSLCA, TQString(TQString())); @@ -754,11 +754,11 @@ TQString whatstr; caEmail = new TQCheckBox(i18n("Accept for email signing"), tabSSLCA); caCode = new TQCheckBox(i18n("Accept for code signing"), tabSSLCA); grid->addMultiCellWidget(caSite, 7, 7, 0, 3); - connect(caSite, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); + connect(caSite, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked())); grid->addMultiCellWidget(caEmail, 8, 8, 0, 3); - connect(caEmail, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); + connect(caEmail, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked())); grid->addMultiCellWidget(caCode, 9, 9, 0, 3); - connect(caCode, TQT_SIGNAL(clicked()), TQT_SLOT(slotCAChecked())); + connect(caCode, TQ_SIGNAL(clicked()), TQ_SLOT(slotCAChecked())); caSite->setEnabled(false); caEmail->setEnabled(false); caCode->setEnabled(false); @@ -785,11 +785,11 @@ TQString whatstr; #ifdef HAVE_SSL grid = new TQGridLayout(tabSSLCOpts, 9, 4, KDialog::marginHint(), KDialog::spacingHint()); mWarnSelfSigned = new TQCheckBox(i18n("Warn on &self-signed certificates or unknown CA's"), tabSSLCOpts); - connect(mWarnSelfSigned, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnSelfSigned, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); mWarnExpired = new TQCheckBox(i18n("Warn on &expired certificates"), tabSSLCOpts); - connect(mWarnExpired, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnExpired, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); mWarnRevoked = new TQCheckBox(i18n("Warn on re&voked certificates"), tabSSLCOpts); - connect(mWarnRevoked, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged())); + connect(mWarnRevoked, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged())); grid->addMultiCellWidget(mWarnSelfSigned, 0, 0, 0, 3); grid->addMultiCellWidget(mWarnExpired, 1, 1, 0, 3); grid->addMultiCellWidget(mWarnRevoked, 2, 2, 0, 3); @@ -807,15 +807,15 @@ TQString whatstr; grid->addMultiCellWidget(macBox, 5, 8, 0, 2); macAdd = new TQPushButton(i18n("&Add"), tabSSLCOpts); - //connect(macAdd, TQT_SIGNAL(), TQT_SLOT()); + //connect(macAdd, TQ_SIGNAL(), TQ_SLOT()); grid->addWidget(macAdd, 4, 3); macRemove = new TQPushButton(i18n("&Remove"), tabSSLCOpts); - //connect(macRemove, TQT_SIGNAL(), TQT_SLOT()); + //connect(macRemove, TQ_SIGNAL(), TQ_SLOT()); grid->addWidget(macRemove, 5, 3); macClear = new KPushButton(KGuiItem::clear(), tabSSLCOpts); - //connect(macAdd, TQT_SIGNAL(), TQT_SLOT()); + //connect(macAdd, TQ_SIGNAL(), TQ_SLOT()); grid->addWidget(macClear, 6, 3); #else diff --git a/kcontrol/crypto/kdatetimedlg.cpp b/kcontrol/crypto/kdatetimedlg.cpp index b5cfe00a9..335e5e634 100644 --- a/kcontrol/crypto/kdatetimedlg.cpp +++ b/kcontrol/crypto/kdatetimedlg.cpp @@ -58,11 +58,11 @@ TQGridLayout *grid = new TQGridLayout(this, 9, 6, marginHint(), spacingHint()); _ok = new KPushButton(KStdGuiItem::ok(), this); grid->addWidget(_ok, 8, 4); - connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); _cancel = new KPushButton(KStdGuiItem::cancel(), this); grid->addWidget(_cancel, 8, 5); - connect(_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index 65748686a..d22c90e3e 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/kcontrol/css/kcmcss.cpp @@ -50,46 +50,46 @@ CSSConfig::CSSConfig(TQWidget *parent, const char *name, const TQStringList &) TDEFontChooser::getFontList(fonts, 0); customDialog->fontFamily->insertStringList(fonts); - connect(configDialog->useDefault, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->useAccess, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->useUser, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(configDialog->urlRequester, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(configDialog->customize, TQT_SIGNAL(clicked()), - TQT_SLOT(slotCustomize())); - connect(customDialog->basefontsize, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(changed())); - connect(customDialog->basefontsize, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(customDialog->dontScale, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->blackOnWhite, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->whiteOnBlack, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->customColor, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->foregroundColor, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(changed())); - connect(customDialog->backgroundColor, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(changed())); - connect(customDialog->fontFamily, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(changed())); - connect(customDialog->fontFamily, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); - connect(customDialog->sameFamily, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->preview, TQT_SIGNAL(clicked()), - TQT_SLOT(slotPreview())); - connect(customDialog->sameColor, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->hideImages, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); - connect(customDialog->hideBackground, TQT_SIGNAL(clicked()), - TQT_SLOT(changed())); + connect(configDialog->useDefault, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->useAccess, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->useUser, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(configDialog->urlRequester, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(configDialog->customize, TQ_SIGNAL(clicked()), + TQ_SLOT(slotCustomize())); + connect(customDialog->basefontsize, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(changed())); + connect(customDialog->basefontsize, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(customDialog->dontScale, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->blackOnWhite, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->whiteOnBlack, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->customColor, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->foregroundColor, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(changed())); + connect(customDialog->backgroundColor, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(changed())); + connect(customDialog->fontFamily, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(changed())); + connect(customDialog->fontFamily, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); + connect(customDialog->sameFamily, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->preview, TQ_SIGNAL(clicked()), + TQ_SLOT(slotPreview())); + connect(customDialog->sameColor, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->hideImages, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); + connect(customDialog->hideBackground, TQ_SIGNAL(clicked()), + TQ_SLOT(changed())); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, 0); vbox->addWidget(configDialog); diff --git a/kcontrol/display/display.cpp b/kcontrol/display/display.cpp index 3555d0ddc..30e940550 100644 --- a/kcontrol/display/display.cpp +++ b/kcontrol/display/display.cpp @@ -63,7 +63,7 @@ void KCMDisplay::addTab( const TQString &name, const TQString &label ) top->addWidget( kcm ); m_tabs->addTab( page, label ); - connect( kcm, TQT_SIGNAL( changed(bool) ), TQT_SLOT( moduleChanged(bool) ) ); + connect( kcm, TQ_SIGNAL( changed(bool) ), TQ_SLOT( moduleChanged(bool) ) ); m_modules.insert(kcm, false); } else diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 02a4d4e82..af1744692 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -745,7 +745,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin { #ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); #endif m_randrsimple = new KRandrSimpleAPI(); @@ -769,7 +769,7 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin setAboutData( about ); m_gammaApplyTimer = new TQTimer(); - connect(m_gammaApplyTimer, SIGNAL(timeout()), this, SLOT(applyGamma())); + connect(m_gammaApplyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(applyGamma())); base = new DisplayConfigBase(this); profileRulesGrid = new TQGridLayout(base->profileRulesGridWidget, 1, 1, KDialog::marginHint()); @@ -792,54 +792,54 @@ KDisplayConfig::KDisplayConfig(TQWidget *parent, const char *name, const TQStrin base->nonRootWarningLabel->hide(); } - connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(processLockoutControls())); - connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile())); - connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile())); - connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile())); - connect(base->activateProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateProfile())); - connect(base->reloadProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reloadProfileFromDisk())); - connect(base->saveProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveProfile())); - connect(base->systemEnableStartupProfile, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(base->systemEnableStartupProfile, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockoutControls())); - connect(base->startupDisplayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(base->startupDisplayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectDefaultProfile(int))); - connect(base->displayProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int))); - - connect(base->monitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect(base->gammamonitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect(base->gammaTargetSelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(gammaTargetChanged(int))); - connect(base->rotationSelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(rotationInfoChanged())); - connect(base->refreshRateDD, TQT_SIGNAL(activated(int)), TQT_SLOT(refreshInfoChanged())); - connect(base->orientationHFlip, TQT_SIGNAL(clicked()), TQT_SLOT(rotationInfoChanged())); - connect(base->orientationVFlip, TQT_SIGNAL(clicked()), TQT_SLOT(rotationInfoChanged())); - connect(base->resolutionSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resolutionSliderChanged(int))); - connect(base->gammaAllSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaAllSliderChanged(int))); - connect(base->gammaRedSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaRedSliderChanged(int))); - connect(base->gammaGreenSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaGreenSliderChanged(int))); - connect(base->gammaBlueSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(gammaBlueSliderChanged(int))); - connect(base->monitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(selectScreen(int))); - connect(base->gammamonitorDisplaySelectDD, TQT_SIGNAL(activated(int)), TQT_SLOT(gammaselectScreen(int))); - connect(base->systemEnableDPMS, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged())); - connect(base->systemEnableDPMSStandby, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged())); - connect(base->systemEnableDPMSSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged())); - connect(base->systemEnableDPMSPowerDown, TQT_SIGNAL(clicked()), TQT_SLOT(dpmsChanged())); - connect(base->dpmsStandbyTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged())); - connect(base->dpmsSuspendTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged())); - connect(base->dpmsPowerDownTimeout, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dpmsChanged())); - connect(base->monitorPhyArrange, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay())); - - connect(base->isPrimaryMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->isPrimaryMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(ensurePrimaryMonitorIsAvailable())); - connect(base->isExtendedMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->isExtendedMonitorCB, TQT_SIGNAL(clicked()), TQT_SLOT(updateExtendedMonitorInformation())); - - connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->monitorDisplaySelectDD, TQT_SLOT(setEnabled(bool))); - - connect(base->rescanHardware, TQT_SIGNAL(clicked()), TQT_SLOT(rescanHardware())); - connect(base->loadExistingProfile, TQT_SIGNAL(clicked()), TQT_SLOT(reloadProfile())); - connect(base->previewConfiguration, TQT_SIGNAL(clicked()), TQT_SLOT(activatePreview())); - connect(base->identifyMonitors, TQT_SIGNAL(clicked()), TQT_SLOT(identifyMonitors())); + connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(processLockoutControls())); + connect(base->addProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addProfile())); + connect(base->renameProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameProfile())); + connect(base->deleteProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfile())); + connect(base->activateProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateProfile())); + connect(base->reloadProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(reloadProfileFromDisk())); + connect(base->saveProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveProfile())); + connect(base->systemEnableStartupProfile, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(base->systemEnableStartupProfile, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockoutControls())); + connect(base->startupDisplayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(base->startupDisplayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectDefaultProfile(int))); + connect(base->displayProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectProfile(int))); + + connect(base->monitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect(base->gammamonitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect(base->gammaTargetSelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(gammaTargetChanged(int))); + connect(base->rotationSelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(rotationInfoChanged())); + connect(base->refreshRateDD, TQ_SIGNAL(activated(int)), TQ_SLOT(refreshInfoChanged())); + connect(base->orientationHFlip, TQ_SIGNAL(clicked()), TQ_SLOT(rotationInfoChanged())); + connect(base->orientationVFlip, TQ_SIGNAL(clicked()), TQ_SLOT(rotationInfoChanged())); + connect(base->resolutionSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resolutionSliderChanged(int))); + connect(base->gammaAllSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaAllSliderChanged(int))); + connect(base->gammaRedSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaRedSliderChanged(int))); + connect(base->gammaGreenSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaGreenSliderChanged(int))); + connect(base->gammaBlueSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(gammaBlueSliderChanged(int))); + connect(base->monitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(selectScreen(int))); + connect(base->gammamonitorDisplaySelectDD, TQ_SIGNAL(activated(int)), TQ_SLOT(gammaselectScreen(int))); + connect(base->systemEnableDPMS, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged())); + connect(base->systemEnableDPMSStandby, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged())); + connect(base->systemEnableDPMSSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged())); + connect(base->systemEnableDPMSPowerDown, TQ_SIGNAL(clicked()), TQ_SLOT(dpmsChanged())); + connect(base->dpmsStandbyTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged())); + connect(base->dpmsSuspendTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged())); + connect(base->dpmsPowerDownTimeout, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(dpmsChanged())); + connect(base->monitorPhyArrange, TQ_SIGNAL(workspaceRelayoutNeeded()), this, TQ_SLOT(layoutDragDropDisplay())); + + connect(base->isPrimaryMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->isPrimaryMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(ensurePrimaryMonitorIsAvailable())); + connect(base->isExtendedMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->isExtendedMonitorCB, TQ_SIGNAL(clicked()), TQ_SLOT(updateExtendedMonitorInformation())); + + connect(base->systemEnableSupport, TQ_SIGNAL(toggled(bool)), base->monitorDisplaySelectDD, TQ_SLOT(setEnabled(bool))); + + connect(base->rescanHardware, TQ_SIGNAL(clicked()), TQ_SLOT(rescanHardware())); + connect(base->loadExistingProfile, TQ_SIGNAL(clicked()), TQ_SLOT(reloadProfile())); + connect(base->previewConfiguration, TQ_SIGNAL(clicked()), TQ_SLOT(activatePreview())); + connect(base->identifyMonitors, TQ_SIGNAL(clicked()), TQ_SLOT(identifyMonitors())); load(); @@ -926,7 +926,7 @@ void KDisplayConfig::identifyMonitors () { idWidget->setPaletteBackgroundColor(TQt::black); idWidget->show(); KDialog::centerOnScreen(idWidget, i); - TQTimer::singleShot(3000, idWidget, SLOT(close())); + TQTimer::singleShot(3000, idWidget, TQ_SLOT(close())); } m_randrsimple->freeScreenInfoStructure(randr_screen_info); @@ -1349,9 +1349,9 @@ void KDisplayConfig::updateDragDropDisplay() { if (((j==0) && (screendata->is_primary==true)) || ((j==1) && (screendata->is_primary==false))) { // This ensures that the primary monitor is always the first one created and placed on the configuration widget bool isvisiblyrotated = ((screendata->current_rotation_index == ROTATION_90_DEGREES_INDEX) || (screendata->current_rotation_index == ROTATION_270_DEGREES_INDEX)); DraggableMonitor *m = new DraggableMonitor( base->monitorPhyArrange, 0, WStyle_Customize | WDestructiveClose | WStyle_NoBorder | WX11BypassWM ); - connect(m, TQT_SIGNAL(workspaceRelayoutNeeded()), this, TQT_SLOT(layoutDragDropDisplay())); - connect(m, TQT_SIGNAL(monitorSelected(int)), this, TQT_SLOT(selectScreen(int))); - connect(m, TQT_SIGNAL(monitorDragComplete(int)), this, TQT_SLOT(updateDraggableMonitorInformation(int))); + connect(m, TQ_SIGNAL(workspaceRelayoutNeeded()), this, TQ_SLOT(layoutDragDropDisplay())); + connect(m, TQ_SIGNAL(monitorSelected(int)), this, TQ_SLOT(selectScreen(int))); + connect(m, TQ_SIGNAL(monitorDragComplete(int)), this, TQ_SLOT(updateDraggableMonitorInformation(int))); m->screen_id = i; if (isvisiblyrotated) m->setFixedSize(screendata->current_y_pixel_count*base->monitorPhyArrange->resize_factor, screendata->current_x_pixel_count*base->monitorPhyArrange->resize_factor); @@ -1670,8 +1670,8 @@ void KDisplayConfig::createHotplugRulesGrid() { int index = (*it2).outputs.findIndex(m_hardwareScreenInfoArray.at(j)->screenUniqueName); TQCheckBox* cb = new TQCheckBox(base->profileRulesGridWidget, (TQString("%1:%2").arg(i).arg(j)).ascii()); - connect(cb, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(profileRuleCheckBoxStateChanged(int))); - connect(cb, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(changed())); + connect(cb, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(profileRuleCheckBoxStateChanged(int))); + connect(cb, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(changed())); cb->setTristate(true); if (index < 0) { cb->setNoChange(); @@ -1693,7 +1693,7 @@ void KDisplayConfig::createHotplugRulesGrid() { cb->show(); } KComboBox* combo = new KComboBox(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii()); - connect(combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); combo->insertItem(i18n("<default>")); for (TQStringList::Iterator it3 = availableProfileNames.begin(); it3 != availableProfileNames.end(); ++it3) { combo->insertItem(*it3); @@ -1703,8 +1703,8 @@ void KDisplayConfig::createHotplugRulesGrid() { combo->show(); TQPushButton* button = new TQPushButton(base->profileRulesGridWidget, (TQString("%1").arg(i)).ascii()); button->setText(i18n("Delete Rule")); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfileRule())); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfileRule())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); profileRulesGrid->addWidget(button, i+1, j+2); button->show(); i++; @@ -1712,8 +1712,8 @@ void KDisplayConfig::createHotplugRulesGrid() { TQPushButton* button = new TQPushButton(base->profileRulesGridWidget); button->setText(i18n("Add New Rule")); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewProfileRule())); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewProfileRule())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); profileRulesGrid->addMultiCellWidget(button, i+2, i+2, 0, numberOfScreens+2); button->show(); } @@ -1921,7 +1921,7 @@ TDECModule* KDisplayConfig::addTab( const TQString name, const TQString label ) top->addWidget( kcm ); base->mainTabContainerWidget->addTab( page, label ); - connect( kcm, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( changed() ) ); + connect( kcm, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( changed() ) ); //m_modules.insert(kcm, false); return kcm; } @@ -2020,7 +2020,7 @@ void KDisplayConfig::save() else { // Signal that settings were NOT applied TQTimer *t = new TQTimer( this ); - connect(t, SIGNAL(timeout()), SLOT(changed()) ); + connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(changed()) ); t->start( 100, FALSE ); } } diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 0ce36a463..08ca18e95 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/kcontrol/dnssd/kcmdnssd.cpp @@ -68,10 +68,10 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&) domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" )); domain->setGroup("publishing"); load(); - connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(secretedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(domainedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged())); - connect(enableZeroconf,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableZeroconfChanged(bool))); + connect(hostedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(secretedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(domainedit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(wdchanged())); + connect(enableZeroconf,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableZeroconfChanged(bool))); m_enableZeroconfChanged=false; if (DNSSD::Configuration::self()->publishDomain().isEmpty()) WANButton->setEnabled(false); kcfg_PublishType->hide(); //unused with Avahi diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp index 9eeec46e1..f6117ed17 100644 --- a/kcontrol/ebrowsing/main.cpp +++ b/kcontrol/ebrowsing/main.cpp @@ -61,7 +61,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS #if 0 opts = new FilterOptions(this); tab->addTab(opts, i18n("&Filters")); - connect(opts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(opts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); #endif modules.setAutoDelete(true); @@ -75,7 +75,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS { modules.append(module); helper.insert(it.current()->configName(), module); - connect(module, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(module, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); } } diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index eb96f682a..507af5993 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp @@ -147,35 +147,35 @@ void FilterOptions::load( bool useDefaults ) m_dlg->lvSearchProviders->setSelected(m_dlg->lvSearchProviders->firstChild(), true); // Connect all the signals/slots... - connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this, - TQT_SLOT(setWebShortcutState())); - connect(m_dlg->cbEnableShortcuts, TQT_SIGNAL(clicked()), this, - TQT_SLOT(configChanged())); - - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(updateSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(spacePressed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(pressed(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - connect(m_dlg->lvSearchProviders, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(checkFavoritesChanged())); - - - connect(m_dlg->cmbDefaultEngine, TQT_SIGNAL(activated(const TQString &)), this, - TQT_SLOT(configChanged())); - connect(m_dlg->cmbDelimiter, TQT_SIGNAL(activated(const TQString &)), this, - TQT_SLOT(configChanged())); - - connect(m_dlg->pbNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(addSearchProvider())); - connect(m_dlg->pbChange, TQT_SIGNAL(clicked()), this, TQT_SLOT(changeSearchProvider())); - connect(m_dlg->pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSearchProvider())); + connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this, + TQ_SLOT(setWebShortcutState())); + connect(m_dlg->cbEnableShortcuts, TQ_SIGNAL(clicked()), this, + TQ_SLOT(configChanged())); + + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(updateSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(spacePressed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(pressed(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + connect(m_dlg->lvSearchProviders, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(checkFavoritesChanged())); + + + connect(m_dlg->cmbDefaultEngine, TQ_SIGNAL(activated(const TQString &)), this, + TQ_SLOT(configChanged())); + connect(m_dlg->cmbDelimiter, TQ_SIGNAL(activated(const TQString &)), this, + TQ_SLOT(configChanged())); + + connect(m_dlg->pbNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(addSearchProvider())); + connect(m_dlg->pbChange, TQ_SIGNAL(clicked()), this, TQ_SLOT(changeSearchProvider())); + connect(m_dlg->pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSearchProvider())); emit changed( useDefaults ); } diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index a1f6ca619..b6029cf36 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp @@ -45,9 +45,9 @@ SearchProviderDialog::SearchProviderDialog(SearchProvider *provider, m_dlg->leQuery->setMinimumWidth(kapp->fontMetrics().maxWidth() * 40); - connect(m_dlg->leName, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); - connect(m_dlg->leQuery, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); - connect(m_dlg->leShortcut, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); + connect(m_dlg->leName, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); + connect(m_dlg->leQuery, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); + connect(m_dlg->leShortcut, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); // Data init TQStringList charsets = TDEGlobal::charsets()->availableEncodingNames(); diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp index c2e3af8fa..0fb8b8149 100644 --- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp +++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp @@ -84,8 +84,8 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const TDEProcess proc; proc << helper << host; - connect( &proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(receiveOutput(TDEProcess *, char *, int)) ); + connect( &proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(receiveOutput(TDEProcess *, char *, int)) ); if( !proc.start( TDEProcess::NotifyOnExit, TDEProcess::Stdout )) return last_result = false; diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp index 34a9404a4..f967387e8 100644 --- a/kcontrol/energy/energy.cpp +++ b/kcontrol/energy/energy.cpp @@ -176,7 +176,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name) TDEGlobal::locale()->insertCatalogue("kpowersave"); // ### these i18n strings need to be synced with kpowersave !! m_pCBEnable= new TQCheckBox(i18n("&Enable display power management" ), this); - connect(m_pCBEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeEnable(bool))); + connect(m_pCBEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeEnable(bool))); hbox->addWidget(m_pCBEnable); TQWhatsThis::add( m_pCBEnable, i18n("Check this option to enable the" @@ -198,7 +198,7 @@ KEnergy::KEnergy(TQWidget *parent, const char *name) logo->setPixmap(TQPixmap(locate("data", "kcontrol/pics/energybig.png"))); logo->setTipText(i18n("Learn more about the Energy Star program")); logo->setUseTips(true); -connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString &))); +connect(logo, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(openURL(const TQString &))); hbox->addStretch(); hbox->addWidget(logo); @@ -210,7 +210,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons m_pStandbySlider->setRange(0, 120, 10); m_pStandbySlider->setSuffix(i18n(" min")); m_pStandbySlider->setSpecialValueText(i18n("Disabled")); - connect(m_pStandbySlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeStandby(int))); + connect(m_pStandbySlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeStandby(int))); top->addWidget(m_pStandbySlider); TQWhatsThis::add( m_pStandbySlider, i18n("Choose the period of inactivity" " after which the display should enter \"standby\" mode. This is the" @@ -221,7 +221,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons m_pSuspendSlider->setRange(0, 120, 10); m_pSuspendSlider->setSuffix(i18n(" min")); m_pSuspendSlider->setSpecialValueText(i18n("Disabled")); - connect(m_pSuspendSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeSuspend(int))); + connect(m_pSuspendSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeSuspend(int))); top->addWidget(m_pSuspendSlider); TQWhatsThis::add( m_pSuspendSlider, i18n("Choose the period of inactivity" " after which the display should enter \"suspend\" mode. This is the" @@ -233,7 +233,7 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons m_pOffSlider->setRange(0, 120, 10); m_pOffSlider->setSuffix(i18n(" min")); m_pOffSlider->setSpecialValueText(i18n("Disabled")); - connect(m_pOffSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChangeOff(int))); + connect(m_pOffSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChangeOff(int))); top->addWidget(m_pOffSlider); TQWhatsThis::add( m_pOffSlider, i18n("Choose the period of inactivity" " after which the display should be powered off. This is the" @@ -247,13 +247,13 @@ connect(logo, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(cons if(m_bKPowersave) { TQPushButton* btnKPowersave = new TQPushButton(this); btnKPowersave->setText(i18n("Configure KPowersave...")); - connect(btnKPowersave, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunchKPowersave())); + connect(btnKPowersave, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchKPowersave())); top->addWidget(btnKPowersave); } if(m_bTDEPowersave) { TQPushButton* btnTDEPowersave = new TQPushButton(this); btnTDEPowersave->setText(i18n("Configure TDEPowersave...")); - connect(btnTDEPowersave, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunchTDEPowersave())); + connect(btnTDEPowersave, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunchTDEPowersave())); top->addWidget(btnTDEPowersave); } } diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp index 7000a97e5..e9cb1fbf9 100644 --- a/kcontrol/filetypes/filegroupdetails.cpp +++ b/kcontrol/filetypes/filegroupdetails.cpp @@ -37,7 +37,7 @@ FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name ) // The order of those two items is very important. If you change it, fix typeslistitem.cpp ! new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed ); - connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) )); + connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) )); TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager" " will do when you click on a file belonging to this group. Konqueror can display the file in" diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index 589677b58..7928cef73 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/kcontrol/filetypes/filetypedetails.cpp @@ -30,7 +30,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) iconButton = new TDEIconButton(firstWidget); iconButton->setIconType(TDEIcon::Desktop, TDEIcon::MimeType); - connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString))); + connect(iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(updateIcon(TQString))); iconButton->setFixedSize(70, 70); hBox->addWidget(iconButton); @@ -46,7 +46,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) grid->addRowSpacing(0, fontMetrics().lineSpacing()); extensionLB = new TQListBox(gb); - connect(extensionLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableExtButtons(int))); + connect(extensionLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableExtButtons(int))); grid->addMultiCellWidget(extensionLB, 1, 2, 0, 0); grid->setRowStretch(0, 0); grid->setRowStretch(1, 1); @@ -59,16 +59,16 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) addExtButton = new TQPushButton(i18n("Add..."), gb); addExtButton->setEnabled(false); - connect(addExtButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addExtension())); + connect(addExtButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addExtension())); grid->addWidget(addExtButton, 1, 1); TQWhatsThis::add( addExtButton, i18n("Add a new pattern for the selected file type.") ); removeExtButton = new TQPushButton(i18n("Remove"), gb); removeExtButton->setEnabled(false); - connect(removeExtButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(removeExtension())); + connect(removeExtButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(removeExtension())); grid->addWidget(removeExtButton, 2, 1); TQWhatsThis::add( removeExtButton, i18n("Remove the selected filename pattern.") ); @@ -78,8 +78,8 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) gb->setColumnLayout(1, TQt::Horizontal); description = new KLineEdit(gb); - connect(description, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(updateDescription(const TQString &))); + connect(description, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(updateDescription(const TQString &))); wtstr = i18n("You can enter a short description for files of the selected" " file type (e.g. 'HTML Page'). This description will be used by applications" @@ -88,7 +88,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) TQWhatsThis::add( description, wtstr ); serviceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_APPLICATIONS, firstWidget ); - connect( serviceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect( serviceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); firstLayout->addWidget(serviceListWidget, 5); // Second tab - Embedding @@ -106,10 +106,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed ); new TQRadioButton( i18n("Show file in separate viewer"), m_autoEmbed ); m_rbGroupSettings = new TQRadioButton( i18n("Use settings for '%1' group"), m_autoEmbed ); - connect(m_autoEmbed, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotAutoEmbedClicked( int ) )); + connect(m_autoEmbed, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotAutoEmbedClicked( int ) )); m_chkAskSave = new TQCheckBox( i18n("Ask whether to save to disk instead"), m_autoEmbed); - connect(m_chkAskSave, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAskSaveToggled(bool) )); + connect(m_chkAskSave, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAskSaveToggled(bool) )); TQWhatsThis::add( m_autoEmbed, i18n("Here you can configure what the Konqueror file manager" " will do when you click on a file of this type. Konqueror can display the file in" @@ -121,7 +121,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name ) embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget ); embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() ); - connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect( embedServiceListWidget, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); secondLayout->addWidget(embedServiceListWidget, 3); addTab( firstWidget, i18n("&General") ); diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 3dfa28c50..43b53540a 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -66,8 +66,8 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) patternFilterLBL->setBuddy( patternFilterLE ); leftLayout->addMultiCellWidget(patternFilterLE, 1, 1, 0, 2); - connect(patternFilterLE, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotFilter(const TQString &))); + connect(patternFilterLE, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotFilter(const TQString &))); wtstr = i18n("Enter a part of a filename pattern. Only file types with a " "matching file pattern will appear in the list."); @@ -81,10 +81,10 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) typesLV->addColumn(i18n("Known Types")); leftLayout->addMultiCellWidget(typesLV, 2, 2, 0, 2); - connect(typesLV, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(updateDisplay(TQListViewItem *))); - connect(typesLV, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect(typesLV, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(updateDisplay(TQListViewItem *))); + connect(typesLV, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem *))); TQWhatsThis::add( typesLV, i18n("Here you can see a hierarchical list of" " the file types which are known on your system. Click on the '+' sign" @@ -93,13 +93,13 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) " file type using the controls on the right.") ); TQPushButton *addTypeB = new TQPushButton(i18n("Add..."), this); - connect(addTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(addType())); + connect(addTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(addType())); leftLayout->addWidget(addTypeB, 3, 0); TQWhatsThis::add( addTypeB, i18n("Click here to add a new file type.") ); m_removeTypeB = new TQPushButton(i18n("&Remove"), this); - connect(m_removeTypeB, TQT_SIGNAL(clicked()), TQT_SLOT(removeType())); + connect(m_removeTypeB, TQ_SIGNAL(clicked()), TQ_SLOT(removeType())); leftLayout->addWidget(m_removeTypeB, 3, 2); m_removeTypeB->setEnabled(false); @@ -112,16 +112,16 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) // File Type Details m_details = new FileTypeDetails( m_widgetStack ); - connect( m_details, TQT_SIGNAL( changed(bool) ), - this, TQT_SLOT( setDirty(bool) ) ); - connect( m_details, TQT_SIGNAL( embedMajor(const TQString &, bool &) ), - this, TQT_SLOT( slotEmbedMajor(const TQString &, bool &))); + connect( m_details, TQ_SIGNAL( changed(bool) ), + this, TQ_SLOT( setDirty(bool) ) ); + connect( m_details, TQ_SIGNAL( embedMajor(const TQString &, bool &) ), + this, TQ_SLOT( slotEmbedMajor(const TQString &, bool &))); m_widgetStack->addWidget( m_details, 1 /*id*/ ); // File Group Details m_groupDetails = new FileGroupDetails( m_widgetStack ); - connect( m_groupDetails, TQT_SIGNAL( changed(bool) ), - this, TQT_SLOT( setDirty(bool) ) ); + connect( m_groupDetails, TQ_SIGNAL( changed(bool) ), + this, TQ_SLOT( setDirty(bool) ) ); m_widgetStack->addWidget( m_groupDetails, 2 /*id*/ ); // Widget shown on startup @@ -132,9 +132,9 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) m_widgetStack->raiseWidget( m_emptyWidget ); - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); // this takes some time + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); // this takes some time - connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) ); } FileTypesView::~FileTypesView() diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index 19aa01a59..a7412438b 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -58,11 +58,11 @@ void FileTypeDialog::init( KMimeType::Ptr mime, bool newItem ) // This code is very similar to kcdialog.cpp setMainWidget( m_details ); - connect(m_details, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); + connect(m_details, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); // TODO setHelp() enableButton(Apply, false); - connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), TQT_SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), TQ_SLOT( slotDatabaseChanged() ) ); } void FileTypeDialog::save() diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp index d0463d7ad..16669168a 100644 --- a/kcontrol/filetypes/kservicelistwidget.cpp +++ b/kcontrol/filetypes/kservicelistwidget.cpp @@ -74,9 +74,9 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n grid->setRowStretch(6, 1); servicesLB = new TQListBox(gb); - connect(servicesLB, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); + connect(servicesLB, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int))); grid->addMultiCellWidget(servicesLB, 1, 6, 0, 0); - connect( servicesLB, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQT_SLOT( editService())); + connect( servicesLB, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), this, TQ_SLOT( editService())); TQString wtstr = (kind == SERVICELIST_APPLICATIONS ? @@ -96,7 +96,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servUpButton = new TQPushButton(i18n("Move &Up"), gb); servUpButton->setEnabled(false); - connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(promoteService())); + connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(promoteService())); grid->addWidget(servUpButton, 2, 1); TQWhatsThis::add( servUpButton, kind == SERVICELIST_APPLICATIONS ? @@ -109,7 +109,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servDownButton = new TQPushButton(i18n("Move &Down"), gb); servDownButton->setEnabled(false); - connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(demoteService())); + connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(demoteService())); grid->addWidget(servDownButton, 3, 1); TQWhatsThis::add( servDownButton, kind == SERVICELIST_APPLICATIONS ? @@ -122,7 +122,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servNewButton = new TQPushButton(i18n("Add..."), gb); servNewButton->setEnabled(false); - connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addService())); + connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addService())); grid->addWidget(servNewButton, 1, 1); TQWhatsThis::add( servNewButton, i18n( "Add a new application for this file type." ) ); @@ -130,7 +130,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servEditButton = new TQPushButton(i18n("Edit..."), gb); servEditButton->setEnabled(false); - connect(servEditButton, TQT_SIGNAL(clicked()), TQT_SLOT(editService())); + connect(servEditButton, TQ_SIGNAL(clicked()), TQ_SLOT(editService())); grid->addWidget(servEditButton, 4, 1); TQWhatsThis::add( servEditButton, i18n( "Edit command line of the selected application." ) ); @@ -138,7 +138,7 @@ KServiceListWidget::KServiceListWidget(int kind, TQWidget *parent, const char *n servRemoveButton = new TQPushButton(i18n("Remove"), gb); servRemoveButton->setEnabled(false); - connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeService())); + connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeService())); grid->addWidget(servRemoveButton, 5, 1); TQWhatsThis::add( servRemoveButton, i18n( "Remove the selected application from the list." ) ); diff --git a/kcontrol/filetypes/kserviceselectdlg.cpp b/kcontrol/filetypes/kserviceselectdlg.cpp index f8c4f0dd4..e9618683d 100644 --- a/kcontrol/filetypes/kserviceselectdlg.cpp +++ b/kcontrol/filetypes/kserviceselectdlg.cpp @@ -50,7 +50,7 @@ KServiceSelectDlg::KServiceSelectDlg( const TQString& /*serviceType*/, const TQS m_listbox->sort(); m_listbox->setMinimumHeight(350); m_listbox->setMinimumWidth(300); - connect(m_listbox,TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotOk())); + connect(m_listbox,TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotOk())); setMainWidget(vbox); } diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 7239b62ac..5913662ce 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/kcontrol/fonts/fonts.cpp @@ -270,13 +270,13 @@ FontAASettings::FontAASettings(TQWidget *parent) enableWidgets(); setMainWidget(mw); - connect(excludeRange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useSubPixel, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(excludeFrom, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed())); - connect(excludeTo, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(changed())); - connect(subPixelType, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + connect(excludeRange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useSubPixel, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(excludeFrom, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed())); + connect(excludeTo, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(changed())); + connect(subPixelType, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed())); #ifdef HAVE_FONTCONFIG - connect(hintingStyle, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + connect(hintingStyle, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed())); #endif } @@ -596,7 +596,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) ); fontUseList.append(i); - connect(i, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(fontSelected())); + connect(i, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(fontSelected())); TQLabel * fontUse = new TQLabel(name+":", this); TQWhatsThis::add(fontUse, *quickHelpIt++); @@ -612,7 +612,7 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this); TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts")); hblay->addWidget( fontAdjustButton ); - connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff())); + connect(fontAdjustButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyFontDiff())); layout->addSpacing(KDialog::spacingHint()); @@ -627,11 +627,11 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) TQWhatsThis::add(cbAA, i18n("If this option is selected, TDE will smooth the edges of curves in " "fonts.")); aaSettingsButton = new TQPushButton( i18n( "Configure..." ), this); - connect(aaSettingsButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotCfgAa())); + connect(aaSettingsButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotCfgAa())); label->setBuddy( cbAA ); lay->addWidget( cbAA, 0, 1 ); lay->addWidget( aaSettingsButton, 0, 2 ); - connect(cbAA, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseAntiAliasing())); + connect(cbAA, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseAntiAliasing())); label = new TQLabel( i18n( "Force fonts DPI:" ), this ); lay->addWidget( label, 1, 0 ); @@ -645,10 +645,10 @@ TDEFonts::TDEFonts(TQWidget *parent, const char *name, const TQStringList &) " is also often misused when poor quality fonts are used that do not" " look well with DPI values other than 96 or 120 DPI.</p>"); TQWhatsThis::add(comboForceDpi, whatsthis); - connect(comboForceDpi, TQT_SIGNAL(activated(int)), TQT_SLOT(slotUseFontDPI())); + connect(comboForceDpi, TQ_SIGNAL(activated(int)), TQ_SLOT(slotUseFontDPI())); sbDpiValue = new KIntSpinBox(64, 512, 1, 96, 10, this); TQWhatsThis::add(sbDpiValue, whatsthis); - connect(sbDpiValue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(sbDpiValue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); lay->addWidget( comboForceDpi, 1, 1 ); lay->addWidget( sbDpiValue, 1, 2 ); diff --git a/kcontrol/hwmanager/cryptpassworddlg.cpp b/kcontrol/hwmanager/cryptpassworddlg.cpp index b0f0e1cd8..c7cd083af 100644 --- a/kcontrol/hwmanager/cryptpassworddlg.cpp +++ b/kcontrol/hwmanager/cryptpassworddlg.cpp @@ -73,11 +73,11 @@ CryptPasswordDialog::CryptPasswordDialog(TQWidget *parent, TQString passwordProm } } - connect(m_base->textPasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->filePasswordButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->cardKeyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_base->textPasswordEntry, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts())); - connect(m_base->filePasswordURL, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(processLockouts())); + connect(m_base->textPasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->filePasswordButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->cardKeyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_base->textPasswordEntry, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts())); + connect(m_base->filePasswordURL, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(processLockouts())); m_base->textPasswordEntry->setFocus(); diff --git a/kcontrol/hwmanager/deviceiconview.cpp b/kcontrol/hwmanager/deviceiconview.cpp index 44a71b3a3..a5e41ba83 100644 --- a/kcontrol/hwmanager/deviceiconview.cpp +++ b/kcontrol/hwmanager/deviceiconview.cpp @@ -43,8 +43,8 @@ DeviceIconView::DeviceIconView(TQWidget * parent, const char * name) header()->hide(); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); } void DeviceIconView::slotItemSelected(TQListViewItem* item) diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 8145017a4..4baabe29a 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/kcontrol/hwmanager/devicepropsdlg.cpp @@ -299,20 +299,20 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge } if (m_device->type() == TDEGenericDeviceType::CPU) { - connect(base->comboCPUGovernor, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(setCPUGovernor(const TQString &))); + connect(base->comboCPUGovernor, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(setCPUGovernor(const TQString &))); } if (m_device->type() == TDEGenericDeviceType::Disk) { TDEStorageDevice* sdevice = static_cast<TDEStorageDevice*>(m_device); - connect(base->buttonDiskMount, TQT_SIGNAL(clicked()), this, TQT_SLOT(mountDisk())); - connect(base->buttonDiskUnmount, TQT_SIGNAL(clicked()), this, TQT_SLOT(unmountDisk())); - connect(base->buttonDiskUnlock, TQT_SIGNAL(clicked()), this, TQT_SLOT(unlockDisk())); - connect(base->buttonDiskLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(lockDisk())); - connect(base->buttonDiskEject, TQT_SIGNAL(clicked()), this, TQT_SLOT(ejectDisk())); - connect(base->buttonDiskSafeRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(safeRemoveDisk())); + connect(base->buttonDiskMount, TQ_SIGNAL(clicked()), this, TQ_SLOT(mountDisk())); + connect(base->buttonDiskUnmount, TQ_SIGNAL(clicked()), this, TQ_SLOT(unmountDisk())); + connect(base->buttonDiskUnlock, TQ_SIGNAL(clicked()), this, TQ_SLOT(unlockDisk())); + connect(base->buttonDiskLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(lockDisk())); + connect(base->buttonDiskEject, TQ_SIGNAL(clicked()), this, TQ_SLOT(ejectDisk())); + connect(base->buttonDiskSafeRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(safeRemoveDisk())); if (sdevice->isDiskOfType(TDEDiskDeviceType::LUKS)) { - connect(base->cryptLUKSAddKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSAddKey())); - connect(base->cryptLUKSDelKey, TQT_SIGNAL(clicked()), this, TQT_SLOT(cryptLUKSDelKey())); - connect(base->cryptLUKSKeySlotList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(processLockouts())); + connect(base->cryptLUKSAddKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSAddKey())); + connect(base->cryptLUKSDelKey, TQ_SIGNAL(clicked()), this, TQ_SLOT(cryptLUKSDelKey())); + connect(base->cryptLUKSKeySlotList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(processLockouts())); base->cryptLUKSKeySlotList->setAllColumnsShowFocus(true); base->cryptLUKSKeySlotList->setFullWidth(true); cryptLUKSPopulateList(); @@ -332,10 +332,10 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge m_sensorDataGridWidgets.setAutoDelete(true); } if (m_device->type() == TDEGenericDeviceType::Backlight) { - connect(base->sliderBacklightBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setBacklightBrightness(int))); + connect(base->sliderBacklightBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setBacklightBrightness(int))); } if (m_device->type() == TDEGenericDeviceType::RootSystem) { - connect(base->comboSystemHibernationMethod, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setHibernationMethod(int))); + connect(base->comboSystemHibernationMethod, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setHibernationMethod(int))); } TQGridLayout *mainGrid = new TQGridLayout(plainPage(), 1, 1, 0, spacingHint()); @@ -345,8 +345,8 @@ DevicePropertiesDialog::DevicePropertiesDialog(TDEGenericDevice* device, TQWidge TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(processHardwareRemoved(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(processHardwareUpdated(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(processHardwareRemoved(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(processHardwareUpdated(TDEGenericDevice*))); populateDeviceInformation(); } @@ -881,8 +881,8 @@ void DevicePropertiesDialog::populateDeviceInformation() if (m_device->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(m_device); - connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted())); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved())); + connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted())); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved())); updateCryptographicCardStatusDisplay(); } diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp index 7d5048c55..6c8949275 100644 --- a/kcontrol/hwmanager/hwdevicetray.cpp +++ b/kcontrol/hwmanager/hwdevicetray.cpp @@ -149,13 +149,13 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name) { // Create notifier d->m_hardwareNotifierContainer = new TDEPassivePopupStackContainer(); - connect(d->m_hardwareNotifierContainer, TQT_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQT_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString))); + connect(d->m_hardwareNotifierContainer, TQ_SIGNAL(popupClicked(KPassivePopup*, TQPoint, TQString)), this, TQ_SLOT(devicePopupClicked(KPassivePopup*, TQPoint, TQString))); initMenus(); setPixmap(KSystemTray::loadIcon("hwinfo")); setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitApp())); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(quitApp())); TQToolTip::add(this, i18n("Device monitor")); globalKeys = new TDEGlobalAccel(this); @@ -166,13 +166,13 @@ HwDeviceSystemTray::HwDeviceSystemTray(TQWidget *parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); doDiskNotifications(true); - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(deviceAdded(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(deviceRemoved(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(deviceAdded(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(deviceRemoved(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); } HwDeviceSystemTray::~HwDeviceSystemTray() @@ -182,7 +182,7 @@ HwDeviceSystemTray::~HwDeviceSystemTray() } /*! - * \b TQT_SLOT which called if hwdevicetray is exited by the user. In this case the user + * \b TQ_SLOT which called if hwdevicetray is exited by the user. In this case the user * is asked through a yes/no box if "HwDeviceTray should start automatically on log in" and the * result is written to the KDE configfile. */ @@ -231,7 +231,7 @@ void HwDeviceSystemTray::mousePressEvent(TQMouseEvent* e) break; case TQt::MidButton: - TQTimer::singleShot(0, this, TQT_SLOT(slotHardwareConfig())); + TQTimer::singleShot(0, this, TQ_SLOT(slotHardwareConfig())); break; case TQt::RightButton: @@ -301,13 +301,13 @@ void HwDeviceSystemTray::initMenus() // Global Configuration d->m_deviceManagerAction = new TDEAction(i18n("Show Device Manager..."), SmallIconSet("kcmpci"), - TDEShortcut(), this, TQT_SLOT(slotHardwareConfig()), actionCollection()); + TDEShortcut(), this, TQ_SLOT(slotHardwareConfig()), actionCollection()); d->m_shortcutKeysAction = new TDEAction(i18n("Configure Shortcut Keys..."), SmallIconSet("configure"), - TDEShortcut(), this, TQT_SLOT(slotEditShortcutKeys()), actionCollection()); + TDEShortcut(), this, TQ_SLOT(slotEditShortcutKeys()), actionCollection()); // Help & Quit d->m_helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection()); - d->m_helpMenu->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents())); + d->m_helpMenu->menu()->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents())); d->m_quitAction = actionCollection()->action(KStdAction::name(KStdAction::Quit)); // LMB menu @@ -352,7 +352,7 @@ void HwDeviceSystemTray::addDeviceToLMBMenu(TDEStorageDevice *sdevice, const int SDActions::Details ad = SDActions::Data[actionType]; actionMenu->popupMenu()->insertItem(SmallIcon(ad.iconName), i18n(ad.actionName), actionMenuIdx); actionMenu->popupMenu()->connectItem(actionMenuIdx, this, - TQT_SLOT(slotExecuteDeviceAction(int))); + TQ_SLOT(slotExecuteDeviceAction(int))); d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid }; } @@ -364,7 +364,7 @@ void HwDeviceSystemTray::addDeviceToRMBMenu(TDEStorageDevice *sdevice, const int actionMenu->popupMenu()->insertItem(sdevice->icon(TDEIcon::SizeSmall), getDeviceLabel(sdevice), actionMenuIdx); actionMenu->popupMenu()->connectItem(actionMenuIdx, this, - TQT_SLOT(slotExecuteDeviceAction(int))); + TQ_SLOT(slotExecuteDeviceAction(int))); actionMenu->setEnabled(true); d->m_actionMenuEntryMap[actionMenuIdx++] = { actionType, uuid }; } diff --git a/kcontrol/hwmanager/hwdevicetray_bindings.cpp b/kcontrol/hwmanager/hwdevicetray_bindings.cpp index f8d8271bb..09974ac68 100644 --- a/kcontrol/hwmanager/hwdevicetray_bindings.cpp +++ b/kcontrol/hwmanager/hwdevicetray_bindings.cpp @@ -18,7 +18,7 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index f5b0206c3..97251cb89 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -95,11 +95,11 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); hwdevices->setTriggerlessHardwareUpdatesEnabled(true); - connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView())); + connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(scheduleDeviceUpdate())); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(scheduleDeviceUpdate())); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate())); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate())); load(); @@ -138,7 +138,7 @@ void TDEHWManager::scheduleDeviceUpdate() if (!deviceUpdateScheduled) { deviceUpdateScheduled = true; - TQTimer::singleShot(1000, this, TQT_SLOT(populateTreeView())); + TQTimer::singleShot(1000, this, TQ_SLOT(populateTreeView())); } } @@ -166,7 +166,7 @@ void TDEHWManager::populateTreeView() for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -188,7 +188,7 @@ void TDEHWManager::populateTreeView() for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -211,7 +211,7 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } diff --git a/kcontrol/hwmanager/passworddlg.cpp b/kcontrol/hwmanager/passworddlg.cpp index 07b6027ae..22b82648f 100644 --- a/kcontrol/hwmanager/passworddlg.cpp +++ b/kcontrol/hwmanager/passworddlg.cpp @@ -30,7 +30,7 @@ PasswordDlg::PasswordDlg() : enableButton( User1, false ); unlockDialog->encryptedIcon->setPixmap(TDEGlobal::iconLoader()->loadIcon("drive-harddisk-locked", TDEIcon::NoGroup, TDEIcon::SizeLarge)); - connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &))); + connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &))); setMainWidget(unlockDialog); } diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 2ca108e3f..218c3e615 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -87,23 +87,23 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &) setRootOnlyMsg(i18n("<b>The global color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global profile, click on the \"Administrator Mode\" button below.")); // setUseRootOnlyMsg(true); // Setting this hides the Apply button! - connect(base->systemEnableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->systemEnableSupport, TQT_SIGNAL(toggled(bool)), base->systemIccFile, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccFile, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->randrScreenList, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->iccProfileList, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->addProfileButton, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->renameProfileButton, TQT_SLOT(setEnabled(bool))); - connect(base->enableSupport, TQT_SIGNAL(toggled(bool)), base->deleteProfileButton, TQT_SLOT(setEnabled(bool))); - connect(base->iccProfileList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectProfile(int))); - connect(base->randrScreenList, TQT_SIGNAL(activated(int)), this, TQT_SLOT(selectScreen(int))); - connect(base->iccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateArray())); - connect(base->systemIccFile, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); - - connect(base->addProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addProfile())); - connect(base->renameProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(renameProfile())); - connect(base->deleteProfileButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteProfile())); + connect(base->systemEnableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->systemEnableSupport, TQ_SIGNAL(toggled(bool)), base->systemIccFile, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->iccFile, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->randrScreenList, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->iccProfileList, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->addProfileButton, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->renameProfileButton, TQ_SLOT(setEnabled(bool))); + connect(base->enableSupport, TQ_SIGNAL(toggled(bool)), base->deleteProfileButton, TQ_SLOT(setEnabled(bool))); + connect(base->iccProfileList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectProfile(int))); + connect(base->randrScreenList, TQ_SIGNAL(activated(int)), this, TQ_SLOT(selectScreen(int))); + connect(base->iccFile, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateArray())); + connect(base->systemIccFile, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); + + connect(base->addProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addProfile())); + connect(base->renameProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(renameProfile())); + connect(base->deleteProfileButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteProfile())); load(); diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index c271d4419..57fe2669f 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -52,7 +52,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name) KDialog::spacingHint()); g_vlay->addSpacing(fontMetrics().lineSpacing()); mpUsageList = new TQListBox(gbox); - connect(mpUsageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsage(int))); + connect(mpUsageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsage(int))); g_vlay->addWidget(mpUsageList); KSeparator *sep = new KSeparator( KSeparator::HLine, this ); @@ -65,11 +65,11 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name) TQPushButton *push; mPreviewButton1 = addPreviewIcon(0, i18n("Default"), this, g_lay); - connect(mPreviewButton1, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup0())); + connect(mPreviewButton1, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup0())); mPreviewButton2 = addPreviewIcon(1, i18n("Active"), this, g_lay); - connect(mPreviewButton2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup1())); + connect(mPreviewButton2, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup1())); mPreviewButton3 = addPreviewIcon(2, i18n("Disabled"), this, g_lay); - connect(mPreviewButton3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEffectSetup2())); + connect(mPreviewButton3, TQ_SIGNAL(clicked()), TQ_SLOT(slotEffectSetup2())); m_pTab1 = new TQWidget(this, "General Tab"); top->addWidget(m_pTab1, 0, 1); @@ -83,24 +83,24 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name) lbl->setFixedSize(lbl->sizeHint()); grid->addWidget(lbl, 0, 0, TQt::AlignLeft); mpSizeBox = new TQComboBox(m_pTab1); - connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int))); + connect(mpSizeBox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSize(int))); lbl->setBuddy(mpSizeBox); grid->addWidget(mpSizeBox, 0, 1, TQt::AlignLeft); mpDPCheck = new TQCheckBox(i18n("Double-sized pixels"), m_pTab1); - connect(mpDPCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDPCheck(bool))); + connect(mpDPCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDPCheck(bool))); grid->addMultiCellWidget(mpDPCheck, 1, 1, 0, 1, TQt::AlignLeft); mpAnimatedCheck = new TQCheckBox(i18n("Animate icons"), m_pTab1); - connect(mpAnimatedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAnimatedCheck(bool))); + connect(mpAnimatedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAnimatedCheck(bool))); grid->addMultiCellWidget(mpAnimatedCheck, 2, 2, 0, 1, TQt::AlignLeft); mpRoundedCheck = new TQCheckBox(i18n("Rounded text selection"), m_pTab1); - connect(mpRoundedCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRoundedCheck(bool))); + connect(mpRoundedCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRoundedCheck(bool))); grid->addMultiCellWidget(mpRoundedCheck, 3, 3, 0, 1, TQt::AlignLeft); mpActiveEffectCheck = new TQCheckBox(i18n("Show icon activation effect"), m_pTab1); - connect(mpActiveEffectCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveEffect(bool))); + connect(mpActiveEffectCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveEffect(bool))); grid->addMultiCellWidget(mpActiveEffectCheck, 4, 4, 0, 1, TQt::AlignLeft); top->activate(); @@ -698,12 +698,12 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect, mpEffectBox->insertItem(i18n("Desaturate")); mpEffectBox->insertItem(i18n("To Monochrome")); mpEffectBox->setMinimumWidth( 100 ); - connect(mpEffectBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotEffectType(int))); + connect(mpEffectBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotEffectType(int))); top->addMultiCellWidget(mpEffectBox, 1, 2, 0, 0, TQt::AlignLeft); lbl->setBuddy(mpEffectBox); mpSTCheck = new TQCheckBox(i18n("&Semi-transparent"), page); - connect(mpSTCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSTCheck(bool))); + connect(mpSTCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSTCheck(bool))); top->addWidget(mpSTCheck, 3, 0, TQt::AlignLeft); frame = new TQGroupBox(i18n("Preview"), page); @@ -726,23 +726,23 @@ TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect, grid->addWidget(mpEffectLabel, 1, 0); mpEffectSlider = new TQSlider(0, 100, 5, 10, TQt::Horizontal, mpEffectGroup); mpEffectLabel->setBuddy( mpEffectSlider ); - connect(mpEffectSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotEffectValue(int))); + connect(mpEffectSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotEffectValue(int))); grid->addWidget(mpEffectSlider, 1, 1); mpEffectColor = new TQLabel(i18n("Co&lor:"), mpEffectGroup); grid->addWidget(mpEffectColor, 2, 0); mpEColButton = new KColorButton(mpEffectGroup); mpEffectColor->setBuddy( mpEColButton ); - connect(mpEColButton, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotEffectColor(const TQColor &))); + connect(mpEColButton, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotEffectColor(const TQColor &))); grid->addWidget(mpEColButton, 2, 1); mpEffectColor2 = new TQLabel(i18n("&Second color:"), mpEffectGroup); grid->addWidget(mpEffectColor2, 3, 0); mpECol2Button = new KColorButton(mpEffectGroup); mpEffectColor2->setBuddy( mpECol2Button ); - connect(mpECol2Button, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(slotEffectColor2(const TQColor &))); + connect(mpECol2Button, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(slotEffectColor2(const TQColor &))); grid->addWidget(mpECol2Button, 3, 1); init(); diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 826f6300d..86d782a1b 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -82,15 +82,15 @@ IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name) m_iconThemes->addColumn(i18n("Description")); m_iconThemes->setAllColumnsShowFocus( true ); m_iconThemes->setFullWidth(true); - connect(m_iconThemes,TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(themeSelected(TQListViewItem *))); + connect(m_iconThemes,TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(themeSelected(TQListViewItem *))); TQPushButton *installButton=new TQPushButton( i18n("Install New Theme..."), this, "InstallNewTheme"); - connect(installButton,TQT_SIGNAL(clicked()),TQT_SLOT(installNewTheme())); + connect(installButton,TQ_SIGNAL(clicked()),TQ_SLOT(installNewTheme())); m_removeButton=new TQPushButton( i18n("Remove Theme"), this, "RemoveTheme"); - connect(m_removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeSelectedTheme())); + connect(m_removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeSelectedTheme())); topLayout->addWidget( new TQLabel(i18n("Select the icon theme you want to use:"), this)); diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp index 359bfec91..214e85a70 100644 --- a/kcontrol/icons/main.cpp +++ b/kcontrol/icons/main.cpp @@ -45,11 +45,11 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &) tab1 = new IconThemesConfig(this, "themes"); tab->addTab(tab1, i18n("&Theme")); - connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(tab1, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); tab2 = new TDEIconConfig(this, "effects"); tab->addTab(tab2, i18n("Ad&vanced")); - connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(tab2, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); TDEAboutData* about = new TDEAboutData("kcmicons", I18N_NOOP("Icons"), "3.0", I18N_NOOP("Icons Control Panel Module"), diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index 76d68d675..93da5ea20 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -252,8 +252,8 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name) timer = new TQTimer(this); timer->start(100); - TQObject::connect(timer, TQT_SIGNAL(timeout()), this, - TQT_SLOT(update_Values())); + TQObject::connect(timer, TQ_SIGNAL(timeout()), this, + TQ_SLOT(update_Values())); update(); } diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index 48b6711d9..8e2f4ad43 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -66,8 +66,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) listview->addColumn( i18n("Name") ); listview->addColumn( i18n("Description") ); - connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(selectionChanged(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(selectionChanged(TQListViewItem*)) ); insertThemes(); } diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 2798ce1de..78c37d717 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -70,8 +70,8 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag updateResolution(); resolutionSelector->setEnabled( TRUE ); - connect( button400cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); - connect( button800cpi, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); + connect( button400cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); + connect( button800cpi, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); if ( 4 == resolution() ) { button800cpi->setChecked( TRUE ); @@ -100,12 +100,12 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag // if the channel is changed, we need to turn off the timer, otherwise it // just resets the button to reflect the current status. The timer is // started again when we applyChanges() - connect( channel1, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) ); - connect( channel1, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); + connect( channel1, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) ); + connect( channel1, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); if ( isDualChannelCapable() ) { channel2->setEnabled( TRUE ); - connect( channel2, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopTimerForNow() ) ); - connect( channel2, TQT_SIGNAL( clicked() ), parent, TQT_SLOT( changed() ) ); + connect( channel2, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopTimerForNow() ) ); + connect( channel2, TQ_SIGNAL( clicked() ), parent, TQ_SLOT( changed() ) ); } updateGUI(); @@ -124,7 +124,7 @@ void LogitechMouse::initCordlessStatusReporting() { updateCordlessStatus(); doUpdate = new TQTimer( this ); // will be automatically deleted - connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) ); + connect( doUpdate, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateGUI() ) ); doUpdate->start( 20000 ); } diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 0d07e782e..224b90cc4 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -102,8 +102,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) tabwidget->addTab(tab1, i18n("&General")); - connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); - connect(tab1->handedBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotHandedChanged(int))); + connect(tab1->handedBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); + connect(tab1->handedBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotHandedChanged(int))); wtstr = i18n("If you are left-handed, you may prefer to swap the" " functions of the left and right buttons on your pointing device" @@ -113,7 +113,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) " a three-button mouse, the middle button is unaffected."); TQWhatsThis::add( tab1->handedBox, wtstr ); - connect(tab1->doubleClick, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(tab1->doubleClick, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); wtstr = i18n("The default behavior in TDE is to select and activate" " icons with a single click of the left button on your pointing" @@ -127,7 +127,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) TQWhatsThis::add( tab1->singleClick, wtstr ); - connect(tab1->cbAutoSelect, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cbAutoSelect, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); wtstr = i18n("If you check this option, pausing the mouse pointer" " over an icon on the screen will automatically select that icon." @@ -149,16 +149,16 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) wtstr = i18n("Show feedback when clicking an icon"); TQWhatsThis::add( tab1->cbVisualActivate, wtstr ); - connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->slAutoSelect, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(tab1->cbVisualActivate, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); - connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(tab1->cb_pointershape, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); - connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick())); + connect(tab1->singleClick, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(tab1->singleClick, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClick())); - connect( tab1->doubleClick, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) ); - connect( tab1->cbAutoSelect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClick() ) ); + connect( tab1->doubleClick, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) ); + connect( tab1->cbAutoSelect, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClick() ) ); // Only allow setting reversing scroll polarity if we have scroll buttons unsigned char map[20]; @@ -172,12 +172,12 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) tab1->cbScrollPolarity->setEnabled( false ); tab1->cbScrollPolarity->hide(); } - connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(tab1->cbScrollPolarity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotScrollPolarityChanged())); + connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(tab1->cbScrollPolarity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotScrollPolarityChanged())); // Cursor theme tab themetab = new ThemePage(this); - connect(themetab, TQT_SIGNAL(changed(bool)), TQT_SLOT(changed())); + connect(themetab, TQ_SIGNAL(changed(bool)), TQ_SLOT(changed())); tabwidget->addTab(themetab, i18n("&Cursor Theme")); // Advanced tab @@ -191,7 +191,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) accel->setLabel(i18n("Pointer acceleration:")); accel->setSuffix("x"); lay->addWidget(accel); - connect(accel, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); + connect(accel, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed())); wtstr = i18n("This option allows you to change the relationship" " between the distance that the mouse pointer moves on the" @@ -210,8 +210,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) thresh->setRange(0,20,1); thresh->setSteps(1,1); lay->addWidget(thresh); - connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(thresh, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotThreshChanged(int))); + connect(thresh, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(thresh, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotThreshChanged(int))); slotThreshChanged(thresh->value()); wtstr = i18n("The threshold is the smallest distance that the" @@ -231,7 +231,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) doubleClickInterval->setSuffix(i18n(" msec")); doubleClickInterval->setSteps(100, 100); lay->addWidget(doubleClickInterval); - connect(doubleClickInterval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(doubleClickInterval, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); wtstr = i18n("The double click interval is the maximal time" " (in milliseconds) between two mouse clicks which" @@ -267,9 +267,9 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) lay->addWidget(doubleClickButton); // Use the same What's This help for the pushbutton. TQWhatsThis::add( doubleClickButton, wtstr ); - connect(doubleClickButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotDoubleClickButtonPressed())); + connect(doubleClickButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotDoubleClickButtonPressed())); doubleClickTimer=new TQTimer(); - connect(doubleClickTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDoubleClickTimerDone()) ); + connect(doubleClickTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDoubleClickTimerDone()) ); lay->addSpacing(10); @@ -279,7 +279,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) dragStartTime->setSuffix(i18n(" msec")); dragStartTime->setSteps(100, 100); lay->addWidget(dragStartTime); - connect(dragStartTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(dragStartTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); wtstr = i18n("If you click with the mouse (e.g. in a multi-line" " editor) and begin to move the mouse within the" @@ -291,8 +291,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) dragStartDist->setRange(1, 20, 1); dragStartDist->setSteps(1,1); lay->addWidget(dragStartDist); - connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(dragStartDist, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDragStartDistChanged(int))); + connect(dragStartDist, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(dragStartDist, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDragStartDistChanged(int))); slotDragStartDistChanged(dragStartDist->value()); wtstr = i18n("If you click with the mouse and begin to move the" @@ -305,8 +305,8 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) wheelScrollLines->setRange(1, 12, 1); wheelScrollLines->setSteps(1,1); lay->addWidget(wheelScrollLines); - connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(wheelScrollLines, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWheelScrollLinesChanged(int))); + connect(wheelScrollLines, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(wheelScrollLines, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWheelScrollLinesChanged(int))); slotWheelScrollLinesChanged(wheelScrollLines->value()); wtstr = i18n("If you use the wheel of a mouse, this value determines the number of lines to scroll for each wheel movement. Note that if this number exceeds the number of visible lines, it will be ignored and the wheel movement will be handled as a page up/down movement."); @@ -365,13 +365,13 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name) mk_curve->setRange(-1000, 1000, 100); hbox->addWidget(mk_curve); - connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAccess())); - connect(mouseKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(mk_delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(mk_interval, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(mk_time_to_max, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(mk_max_speed, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(mk_curve, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect(mouseKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAccess())); + connect(mouseKeys, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(mk_delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(mk_interval, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(mk_time_to_max, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(mk_max_speed, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(mk_curve, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); vbox->addStretch(); } diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index d131aca8c..e575b6cd2 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -100,8 +100,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) listview->addColumn( i18n("Name") ); listview->addColumn( i18n("Description") ); - connect( listview, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(selectionChanged(TQListViewItem*)) ); + connect( listview, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(selectionChanged(TQListViewItem*)) ); themeDirs = getThemeBaseDirs(); insertThemes(); @@ -111,8 +111,8 @@ ThemePage::ThemePage( TQWidget* parent, const char* name ) installButton = new TQPushButton( i18n("Install New Theme..."), hbox ); removeButton = new TQPushButton( i18n("Remove Theme"), hbox ); - connect( installButton, TQT_SIGNAL( clicked() ), TQT_SLOT( installClicked() ) ); - connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeClicked() ) ); + connect( installButton, TQ_SIGNAL( clicked() ), TQ_SLOT( installClicked() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeClicked() ) ); // Disable the install button if ~/.icons isn't writable TQString path = TQDir::homeDirPath() + "/.icons"; diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index 5d104006b..c88f6d217 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -65,7 +65,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) new TQLabel(i18n("Device:"), devHbox); device = new TQComboBox(true, devHbox); device->setInsertionPolicy(TQComboBox::NoInsertion); - connect(device, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(deviceChanged(const TQString &))); + connect(device, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(deviceChanged(const TQString &))); devHbox->setStretchFactor(device, 3); TQHBox *hbox = new TQHBox(mainVbox); @@ -77,7 +77,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) new TQLabel(i18n("Position:"), vboxLeft); xyPos = new PosWidget(vboxLeft); trace = new TQCheckBox(i18n("Show trace"), mainVbox); - connect(trace, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(traceChanged(bool))); + connect(trace, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(traceChanged(bool))); TQVBox *vboxMid = new TQVBox(hbox); vboxMid->setSpacing(KDialog::spacingHint()); @@ -111,12 +111,12 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name) // calibrate button calibrate = new TQPushButton(i18n("Calibrate"), mainVbox); - connect(calibrate, TQT_SIGNAL(clicked()), this, TQT_SLOT(calibrateDevice())); + connect(calibrate, TQ_SIGNAL(clicked()), this, TQ_SLOT(calibrateDevice())); calibrate->setEnabled(false); // set up a timer for idle processing of joystick events idle = new TQTimer(this); - connect(idle, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkDevice())); + connect(idle, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkDevice())); // check which devicefiles we have init(); diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index c1ba4fecf..485f11442 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/kcontrol/kcontrol/aboutwidget.cpp @@ -84,8 +84,8 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca _viewer = new TDEHTMLPart( this, "_viewer" ); _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ); connect( _viewer->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), - this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) ); + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + this, TQ_SLOT(slotModuleLinkClicked(const KURL&)) ); updatePixmap(); } diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index be3ede802..67584a74d 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/kcontrol/kcontrol/dockcontainer.cpp @@ -105,7 +105,7 @@ ModuleWidget::ModuleWidget( TQWidget *parent, const char *name ) m_title = new ModuleTitle( titleLine, "m_title" ); TQPushButton *helpButton = new TQPushButton( titleLine ); helpButton->setIconSet( SmallIconSet("help") ); - connect (helpButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpRequest() ) ); + connect (helpButton, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpRequest() ) ); m_body = new TQVBox( this, "m_body" ); setStretchFactor( m_body, 10 ); } @@ -137,7 +137,7 @@ DockContainer::DockContainer(TQWidget *parent) addWidget( _busyw ); _modulew = new ModuleWidget( this, "_modulew" ); - connect (_modulew, TQT_SIGNAL( helpRequest() ), TQT_SLOT( slotHelpRequest() ) ); + connect (_modulew, TQ_SIGNAL( helpRequest() ), TQ_SLOT( slotHelpRequest() ) ); addWidget( _modulew ); } @@ -170,10 +170,10 @@ ProxyWidget* DockContainer::loadModule( ConfigModule *module ) if (widget) { _module = module; - connect(_module, TQT_SIGNAL(childClosed()), TQT_SLOT(removeModule())); - connect(_module, TQT_SIGNAL(changed(ConfigModule *)), - TQT_SIGNAL(changedModule(ConfigModule *))); - connect(widget, TQT_SIGNAL(quickHelpChanged()), TQT_SLOT(quickHelpChanged())); + connect(_module, TQ_SIGNAL(childClosed()), TQ_SLOT(removeModule())); + connect(_module, TQ_SIGNAL(changed(ConfigModule *)), + TQ_SIGNAL(changedModule(ConfigModule *))); + connect(widget, TQ_SIGNAL(quickHelpChanged()), TQ_SLOT(quickHelpChanged())); raiseWidget( _modulew ); emit newModule(widget->caption(), module->docPath(), widget->quickHelp()); diff --git a/kcontrol/kcontrol/indexwidget.cpp b/kcontrol/kcontrol/indexwidget.cpp index cf57dc0e4..293c5e1d8 100644 --- a/kcontrol/kcontrol/indexwidget.cpp +++ b/kcontrol/kcontrol/indexwidget.cpp @@ -69,19 +69,19 @@ void IndexWidget::moduleSelected(ConfigModule *m) { _tree->makeVisible(m); - _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(m); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } else if (obj->inherits("ModuleTreeView") && _icon) { _icon->makeVisible(m); - _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(m); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } } @@ -89,17 +89,17 @@ void IndexWidget::makeSelected(ConfigModule *module) { if (_icon) { - _icon->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _icon->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _icon->makeSelected(module); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } if (_tree) { - _tree->disconnect(TQT_SIGNAL(moduleSelected(ConfigModule*))); + _tree->disconnect(TQ_SIGNAL(moduleSelected(ConfigModule*))); _tree->makeSelected(module); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } } @@ -121,8 +121,8 @@ void IndexWidget::activateView(IndexViewMode mode) { _icon=new ModuleIconView(_modules, this); _icon->fill(); - connect(_icon, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); + connect(_icon, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); } raiseWidget( _icon ); } @@ -132,10 +132,10 @@ void IndexWidget::activateView(IndexViewMode mode) { _tree=new ModuleTreeView(_modules, this); _tree->fill(); - connect(_tree, TQT_SIGNAL(moduleSelected(ConfigModule*)), - this, TQT_SLOT(moduleSelected(ConfigModule*))); - connect(_tree, TQT_SIGNAL(categorySelected(TQListViewItem*)), - this, TQT_SIGNAL(categorySelected(TQListViewItem*))); + connect(_tree, TQ_SIGNAL(moduleSelected(ConfigModule*)), + this, TQ_SLOT(moduleSelected(ConfigModule*))); + connect(_tree, TQ_SIGNAL(categorySelected(TQListViewItem*)), + this, TQ_SIGNAL(categorySelected(TQListViewItem*))); } raiseWidget( _tree ); } diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index a3912c5da..aa5227532 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/kcontrol/kcontrol/main.cpp @@ -61,8 +61,8 @@ KControlApp::KControlApp() // KUniqueApplication does dcop regitration for us ModuleIface *modIface = new ModuleIface(toplevel, "moduleIface"); - connect (modIface, TQT_SIGNAL(helpClicked()), toplevel, TQT_SLOT(slotHelpRequest())); - connect (modIface, TQT_SIGNAL(handbookClicked()), toplevel, TQT_SLOT(slotHandbookRequest())); + connect (modIface, TQ_SIGNAL(helpClicked()), toplevel, TQ_SLOT(slotHelpRequest())); + connect (modIface, TQ_SIGNAL(handbookClicked()), toplevel, TQ_SLOT(slotHandbookRequest())); TQRect desk = TDEGlobalSettings::desktopGeometry(toplevel); TDEConfig *config = TDEGlobal::config(); diff --git a/kcontrol/kcontrol/moduleiconview.cpp b/kcontrol/kcontrol/moduleiconview.cpp index 45be8a1ac..7c171f676 100644 --- a/kcontrol/kcontrol/moduleiconview.cpp +++ b/kcontrol/kcontrol/moduleiconview.cpp @@ -51,8 +51,8 @@ ModuleIconView::ModuleIconView(ConfigModuleList *list, TQWidget * parent, const // This is intentionally _not_ connected with executed(), since // honoring doubleclick doesn't make any sense here (changed by // large user demand) - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleIconView::makeSelected(ConfigModule *m) diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp index f203e6b57..2d1af0879 100644 --- a/kcontrol/kcontrol/modulemenu.cpp +++ b/kcontrol/kcontrol/modulemenu.cpp @@ -49,7 +49,7 @@ ModuleMenu::ModuleMenu(ConfigModuleList *list, TQWidget * parent, const char * n fill(this, KCGlobal::baseGroup()); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int))); } void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) @@ -65,7 +65,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath) // create new menu TDEPopupMenu *menu = new TDEPopupMenu(parentMenu); - connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int))); + connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(moduleSelected(int))); // Item names may contain ampersands. To avoid them being converted to // accelators, replace them with two ampersands. diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index e40d62568..c419e0d4e 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/kcontrol/kcontrol/modules.cpp @@ -75,11 +75,11 @@ ProxyWidget *ConfigModule::module() { _module = new ProxyWidget(modWidget, moduleName(), "", run_as_root); - connect(_module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); - connect(_module, TQT_SIGNAL(closed()), this, TQT_SLOT(clientClosed())); - connect(_module, TQT_SIGNAL(handbookRequest()), this, TQT_SIGNAL(handbookRequest())); - connect(_module, TQT_SIGNAL(helpRequest()), this, TQT_SIGNAL(helpRequest())); - connect(_module, TQT_SIGNAL(runAsRoot()), this, TQT_SLOT(runAsRoot())); + connect(_module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); + connect(_module, TQ_SIGNAL(closed()), this, TQ_SLOT(clientClosed())); + connect(_module, TQ_SIGNAL(handbookRequest()), this, TQ_SIGNAL(handbookRequest())); + connect(_module, TQ_SIGNAL(helpRequest()), this, TQ_SIGNAL(helpRequest())); + connect(_module, TQ_SIGNAL(runAsRoot()), this, TQ_SLOT(runAsRoot())); return _module; } @@ -157,7 +157,7 @@ void ConfigModule::runAsRoot() _busy->setGeometry(0,0, _module->width(), _module->height()); _busy->show(); _embedStack->raiseWidget(_busy); - connect(_embedWidget, TQT_SIGNAL( windowEmbedded(WId)), TQT_SLOT( embedded())); + connect(_embedWidget, TQ_SIGNAL( windowEmbedded(WId)), TQ_SLOT( embedded())); // prepare the process to run the tdecmshell TQString cmd = service()->exec().stripWhiteSpace(); @@ -198,7 +198,7 @@ void ConfigModule::runAsRoot() *_rootProcess << TQString("%1 --embed %2 --lang %3").arg(cmd).arg(_embedWidget->winId()).arg( TDEGlobal::locale()->language() ); } - connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(rootExited(TDEProcess*))); + connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(rootExited(TDEProcess*))); if ( !_rootProcess->start(TDEProcess::NotifyOnExit) ) { diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp index 4b25e4be3..a226cbc89 100644 --- a/kcontrol/kcontrol/moduletreeview.cpp +++ b/kcontrol/kcontrol/moduletreeview.cpp @@ -85,8 +85,8 @@ ModuleTreeView::ModuleTreeView(ConfigModuleList *list, TQWidget * parent, const new ModuleTreeWhatsThis( this ); - connect(this, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); } void ModuleTreeView::fill() diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index da8d0173d..05040b3dd 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/kcontrol/kcontrol/proxywidget.cpp @@ -200,8 +200,8 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, view = new ProxyView(client, title, this, run_as_root, "proxyview"); (void) new WhatsThis( this ); - connect(_client, TQT_SIGNAL(changed(bool)), TQT_SLOT(clientChanged(bool))); - connect(_client, TQT_SIGNAL(quickHelpChanged()), TQT_SIGNAL(quickHelpChanged())); + connect(_client, TQ_SIGNAL(changed(bool)), TQ_SLOT(clientChanged(bool))); + connect(_client, TQ_SIGNAL(quickHelpChanged()), TQ_SIGNAL(quickHelpChanged())); _sep = new KSeparator(KSeparator::HLine, this); @@ -225,11 +225,11 @@ ProxyWidget::ProxyWidget(TDECModule *client, TQString title, const char *name, _apply->setEnabled( false ); _reset->setEnabled( false ); - connect(_handbook, TQT_SIGNAL(clicked()), TQT_SLOT(handbookClicked())); - connect(_default, TQT_SIGNAL(clicked()), TQT_SLOT(defaultClicked())); - connect(_apply, TQT_SIGNAL(clicked()), TQT_SLOT(applyClicked())); - connect(_reset, TQT_SIGNAL(clicked()), TQT_SLOT(resetClicked())); - connect(_root, TQT_SIGNAL(clicked()), TQT_SLOT(rootClicked())); + connect(_handbook, TQ_SIGNAL(clicked()), TQ_SLOT(handbookClicked())); + connect(_default, TQ_SIGNAL(clicked()), TQ_SLOT(defaultClicked())); + connect(_apply, TQ_SIGNAL(clicked()), TQ_SLOT(applyClicked())); + connect(_reset, TQ_SIGNAL(clicked()), TQ_SLOT(resetClicked())); + connect(_root, TQ_SIGNAL(clicked()), TQ_SLOT(rootClicked())); TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); diff --git a/kcontrol/kcontrol/searchwidget.cpp b/kcontrol/kcontrol/searchwidget.cpp index 0dc0045d5..663a8744c 100644 --- a/kcontrol/kcontrol/searchwidget.cpp +++ b/kcontrol/kcontrol/searchwidget.cpp @@ -87,13 +87,13 @@ SearchWidget::SearchWidget(TQWidget *parent , const char *name) l->addWidget(_resultList); - connect(_keyList, TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT(slotKeywordSelected(const TQString&))); + connect(_keyList, TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT(slotKeywordSelected(const TQString&))); - connect(_resultList, TQT_SIGNAL(selected(TQListBoxItem*)), - this, TQT_SLOT(slotModuleSelected(TQListBoxItem *))); - connect(_resultList, TQT_SIGNAL(clicked(TQListBoxItem *)), - this, TQT_SLOT(slotModuleClicked(TQListBoxItem *))); + connect(_resultList, TQ_SIGNAL(selected(TQListBoxItem*)), + this, TQ_SLOT(slotModuleSelected(TQListBoxItem *))); + connect(_resultList, TQ_SIGNAL(clicked(TQListBoxItem *)), + this, TQ_SLOT(slotModuleClicked(TQListBoxItem *))); } void SearchWidget::populateKeywordList(ConfigModuleList *list) diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index bf7cc6f65..d3b2a3c2f 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -81,8 +81,8 @@ TopLevel::TopLevel(const char* name) _modules->readDesktopEntries(); for ( ConfigModule* m = _modules->first(); m; m = _modules->next() ) { - connect( m, TQT_SIGNAL( handbookRequest() ), this, TQT_SLOT( slotHandbookRequest() ) ); - connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) ); + connect( m, TQ_SIGNAL( handbookRequest() ), this, TQ_SLOT( slotHandbookRequest() ) ); + connect( m, TQ_SIGNAL( helpRequest() ), this, TQ_SLOT( slotHelpRequest() ) ); } // create the layout box @@ -109,11 +109,11 @@ TopLevel::TopLevel(const char* name) KLineEdit *searchEdit = new KLineEdit( mSearchFrame ); clearButton->setFixedHeight( searchEdit->height() ); - connect( clearButton, TQT_SIGNAL( clicked() ), searchEdit, TQT_SLOT( clear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), searchEdit, TQ_SLOT( clear() ) ); label->setBuddy( searchEdit ); searchLayout->addWidget( searchEdit ); - connect( searchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotSearchChanged(const TQString &) ) ); + connect( searchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotSearchChanged(const TQString &) ) ); // create the left hand side under search _stack = new TQWidgetStack( leftFrame ); @@ -121,18 +121,18 @@ TopLevel::TopLevel(const char* name) // index tab _index = new IndexWidget(_modules, this); - connect(_index, TQT_SIGNAL(moduleActivated(ConfigModule*)), - this, TQT_SLOT(activateModule(ConfigModule*))); + connect(_index, TQ_SIGNAL(moduleActivated(ConfigModule*)), + this, TQ_SLOT(activateModule(ConfigModule*))); _stack->addWidget( _index ); - connect(_index, TQT_SIGNAL(categorySelected(TQListViewItem*)), - this, TQT_SLOT(categorySelected(TQListViewItem*))); + connect(_index, TQ_SIGNAL(categorySelected(TQListViewItem*)), + this, TQ_SLOT(categorySelected(TQListViewItem*))); // search tab _search = new SearchWidget(this); _search->populateKeywordList(_modules); - connect(_search, TQT_SIGNAL(moduleSelected(ConfigModule *)), - this, TQT_SLOT(activateModule(ConfigModule *))); + connect(_search, TQ_SIGNAL(moduleSelected(ConfigModule *)), + this, TQ_SLOT(activateModule(ConfigModule *))); _stack->addWidget( _search ); @@ -153,10 +153,10 @@ TopLevel::TopLevel(const char* name) // That one does the trick ... _splitter->setResizeMode( leftFrame, TQSplitter::KeepSize ); - connect(_dock, TQT_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(newModule(const TQString&, const TQString&, const TQString&))); - connect(_dock, TQT_SIGNAL(changedModule(ConfigModule*)), - TQT_SLOT(changedModule(ConfigModule*))); + connect(_dock, TQ_SIGNAL(newModule(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(newModule(const TQString&, const TQString&, const TQString&))); + connect(_dock, TQ_SIGNAL(changedModule(ConfigModule*)), + TQ_SLOT(changedModule(ConfigModule*))); // set the main view setCentralWidget( _splitter ); @@ -178,8 +178,8 @@ TopLevel::TopLevel(const char* name) if (KCGlobal::isInfoCenter()) { AboutWidget *aw = new AboutWidget( this, 0, _index->firstTreeViewItem()); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); KWin::setIcons( winId(), TDEGlobal::iconLoader()->loadIcon("hwinfo", TDEIcon::NoGroup, 32 ), @@ -188,8 +188,8 @@ TopLevel::TopLevel(const char* name) else { AboutWidget *aw = new AboutWidget(this); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget(aw); } } @@ -234,40 +234,40 @@ bool TopLevel::queryClose() void TopLevel::setupActions() { - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); icon_view = new TDERadioAction - (i18n("&Icon View"), 0, this, TQT_SLOT(activateIconView()), + (i18n("&Icon View"), 0, this, TQ_SLOT(activateIconView()), actionCollection(), "activate_iconview"); icon_view->setExclusiveGroup( "viewmode" ); tree_view = new TDERadioAction - (i18n("&Tree View"), 0, this, TQT_SLOT(activateTreeView()), + (i18n("&Tree View"), 0, this, TQ_SLOT(activateTreeView()), actionCollection(), "activate_treeview"); tree_view->setExclusiveGroup( "viewmode" ); icon_small = new TDERadioAction - (i18n("&Small"), 0, this, TQT_SLOT(activateSmallIcons()), + (i18n("&Small"), 0, this, TQ_SLOT(activateSmallIcons()), actionCollection(), "activate_smallicons"); icon_small->setExclusiveGroup( "iconsize" ); icon_medium = new TDERadioAction - (i18n("&Medium"), 0, this, TQT_SLOT(activateMediumIcons()), + (i18n("&Medium"), 0, this, TQ_SLOT(activateMediumIcons()), actionCollection(), "activate_mediumicons"); icon_medium->setExclusiveGroup( "iconsize" ); icon_large = new TDERadioAction - (i18n("&Large"), 0, this, TQT_SLOT(activateLargeIcons()), + (i18n("&Large"), 0, this, TQ_SLOT(activateLargeIcons()), actionCollection(), "activate_largeicons"); icon_large->setExclusiveGroup( "iconsize" ); icon_huge = new TDERadioAction - (i18n("&Huge"), 0, this, TQT_SLOT(activateHugeIcons()), + (i18n("&Huge"), 0, this, TQ_SLOT(activateHugeIcons()), actionCollection(), "activate_hugeicons"); icon_huge->setExclusiveGroup( "iconsize" ); - about_module = new TDEAction(i18n("About Current Module"), 0, this, TQT_SLOT(aboutModule()), actionCollection(), "help_about_module"); + about_module = new TDEAction(i18n("About Current Module"), 0, this, TQ_SLOT(aboutModule()), actionCollection(), "help_about_module"); about_module->setEnabled(false); createGUI("kcontrolui.rc"); @@ -275,7 +275,7 @@ actionCollection()); report_bug = actionCollection()->action("help_report_bug"); report_bug->setText(i18n("&Report Bug...")); report_bug->disconnect(); - connect(report_bug, TQT_SIGNAL(activated()), TQT_SLOT(reportBug())); + connect(report_bug, TQ_SIGNAL(activated()), TQ_SLOT(reportBug())); } void TopLevel::activateIconView() @@ -399,8 +399,8 @@ void TopLevel::categorySelected(TQListViewItem *category) else { AboutWidget *aw = new AboutWidget( this, 0, firstItem, caption ); - connect( aw, TQT_SIGNAL( moduleSelected( ConfigModule * ) ), - TQT_SLOT( activateModule( ConfigModule * ) ) ); + connect( aw, TQ_SIGNAL( moduleSelected( ConfigModule * ) ), + TQ_SLOT( activateModule( ConfigModule * ) ) ); _dock->setBaseWidget( aw ); } } @@ -495,7 +495,7 @@ void TopLevel::reportBug() } KBugReport *br = new KBugReport(this, false, dummyAbout); if (deleteit) - connect(br, TQT_SIGNAL(finished()), TQT_SLOT(deleteDummyAbout())); + connect(br, TQ_SIGNAL(finished()), TQ_SLOT(deleteDummyAbout())); else dummyAbout = 0; br->show(); diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index a560183eb..bbae08ad6 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -103,9 +103,9 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &) _pbStart->setEnabled( false ); _pbStop->setEnabled( false ); - connect(_pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartService())); - connect(_pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(slotStopService())); - connect(_lvStartup, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotEvalItem(TQListViewItem*)) ); + connect(_pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartService())); + connect(_pbStop, TQ_SIGNAL(clicked()), TQ_SLOT(slotStopService())); + connect(_lvStartup, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotEvalItem(TQListViewItem*)) ); load(); } @@ -161,7 +161,7 @@ void KDEDConfig::load( bool useDefaults ) { if ( file.readBoolEntry("X-TDE-Kded-autoload") ) { clitem = new CheckListItem(_lvStartup, TQString::null); - connect(clitem, TQT_SIGNAL(changed(TQCheckListItem*)), TQT_SLOT(slotItemChecked(TQCheckListItem*))); + connect(clitem, TQ_SIGNAL(changed(TQCheckListItem*)), TQ_SLOT(slotItemChecked(TQCheckListItem*))); clitem->setOn(autoloadEnabled(&kdedrc, *it)); item = clitem; item->setText(1, file.readName()); @@ -212,7 +212,7 @@ void KDEDConfig::save() { kdedrc.sync(); DCOPRef( "kded", "kded" ).call( "reconfigure" ); - TQTimer::singleShot(0, this, TQT_SLOT(slotServiceRunningToggled())); + TQTimer::singleShot(0, this, TQ_SLOT(slotServiceRunningToggled())); } diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index 4ae379a50..31e1b0500 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/kcontrol/keys/commandShortcuts.cpp @@ -84,8 +84,8 @@ void CommandShortcutsModule::initGUI() "To edit, add or remove entries from this list use the " "<a href=\"launchMenuEditor\">TDE menu editor</a>.</qt>")); label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum); - disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &))); - connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor())); + disconnect(label, TQ_SIGNAL(linkClicked(const TQString &)), label, TQ_SLOT(openLink(const TQString &))); + connect(label, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(launchMenuEditor())); mainLayout->addWidget(label); m_tree = new AppTreeView(this, "appTreeView"); @@ -97,10 +97,10 @@ void CommandShortcutsModule::initGUI() "currently defined on this system. Click to select a command to " "assign a keyboard shortcut to. Complete management of these " "entries can be done via the menu editor program.")); - connect(m_tree, TQT_SIGNAL(entrySelected(const TQString&, const TQString &, bool)), - this, TQT_SLOT(commandSelected(const TQString&, const TQString &, bool))); - connect(m_tree, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int))); + connect(m_tree, TQ_SIGNAL(entrySelected(const TQString&, const TQString &, bool)), + this, TQ_SLOT(commandSelected(const TQString&, const TQString &, bool))); + connect(m_tree, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(commandDoubleClicked(TQListViewItem *, const TQPoint &, int))); m_shortcutBox = new TQButtonGroup(i18n("Shortcut for Selected Command"), this); mainLayout->addWidget(m_shortcutBox); TQHBoxLayout* buttonLayout = new TQHBoxLayout(m_shortcutBox, KDialog::marginHint() * 2); @@ -121,10 +121,10 @@ void CommandShortcutsModule::initGUI() "to the currently selected command.")); buttonLayout->addSpacing(KDialog::spacingHint() * 2); buttonLayout->addWidget(m_shortcutButton); - connect(m_shortcutButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), - this, TQT_SLOT(shortcutChanged(const TDEShortcut&))); - connect(m_customRadio, TQT_SIGNAL(toggled(bool)), m_shortcutButton, TQT_SLOT(setEnabled(bool))); - connect(m_noneRadio, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shortcutRadioToggled(bool))); + connect(m_shortcutButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), + this, TQ_SLOT(shortcutChanged(const TDEShortcut&))); + connect(m_customRadio, TQ_SIGNAL(toggled(bool)), m_shortcutButton, TQ_SLOT(setEnabled(bool))); + connect(m_noneRadio, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shortcutRadioToggled(bool))); buttonLayout->addStretch(1); } diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index ee39447a1..90fa59f82 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -112,8 +112,8 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) //readSchemeNames(); sList->setCurrentItem( 0 ); - connect( sList, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( slotPreviewScheme( int ) ) ); + connect( sList, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( slotPreviewScheme( int ) ) ); TQLabel *label = new TQLabel( sList, i18n("&Key Scheme"), this ); @@ -124,12 +124,12 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) TQWhatsThis::add( sList, wtstr ); addBt = new TQPushButton( i18n("&Save Scheme..."), this ); - connect( addBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() ) ); + connect( addBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() ) ); TQWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.")); removeBt = new TQPushButton( i18n("&Remove Scheme"), this ); removeBt->setEnabled(FALSE); - connect( removeBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() ) ); + connect( removeBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() ) ); TQWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not" " remove the standard system wide schemes, 'Current scheme' and 'TDE default'.") ); @@ -143,7 +143,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) if( !KKeySequence::keyboardHasMetaKey() ) preferMetaBt->setEnabled( false ); preferMetaBt->setChecked( KKeySequence::useFourModifierKeys() ); - connect( preferMetaBt, TQT_SIGNAL(clicked()), TQT_SLOT(slotPreferMeta()) ); + connect( preferMetaBt, TQ_SIGNAL(clicked()), TQ_SLOT(slotPreferMeta()) ); TQWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would " "like TDE to prefer the 3-modifier configuration defaults, then this option " "should be unchecked.") ); @@ -153,7 +153,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) KSeparator* line = new KSeparator( KSeparator::HLine, this ); kc = new KeyChooserSpec( actions, this, isGlobal ); - connect( kc, TQT_SIGNAL(keyChange()), this, TQT_SLOT(slotKeyChange()) ); + connect( kc, TQ_SIGNAL(keyChange()), this, TQ_SLOT(slotKeyChange()) ); readScheme(); @@ -356,8 +356,8 @@ void KKeyModule::readScheme( int index ) } while ( nameValid == FALSE ); - disconnect( sList, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SLOT( slotPreviewScheme( int ) ) ); + disconnect( sList, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SLOT( slotPreviewScheme( int ) ) ); TQString kksPath = TDEGlobal::dirs()->saveLocation("data", "kcmkeys/"); @@ -403,8 +403,8 @@ void KKeyModule::readScheme( int index ) slotSave(); - connect( sList, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SLOT( slotPreviewScheme( int ) ) ); + connect( sList, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SLOT( slotPreviewScheme( int ) ) ); slotPreviewScheme( sList->currentItem() ); }*/ diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index eccc5210a..de0cc2dbc 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -75,16 +75,16 @@ void KeyModule::initGUI() m_pShortcuts = new ShortcutsModule( this ); m_pTab->addTab( m_pShortcuts, i18n("Shortcut Schemes") ); - connect( m_pShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); + connect( m_pShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); m_pCommandShortcuts = new CommandShortcutsModule ( this ); m_pTab->addTab( m_pCommandShortcuts, i18n("Command Shortcuts") ); - connect( m_pCommandShortcuts, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); - connect( m_pTab, TQT_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQT_SLOT(showing(TQWidget*)) ); + connect( m_pCommandShortcuts, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); + connect( m_pTab, TQ_SIGNAL(currentChanged(TQWidget*)), m_pCommandShortcuts, TQ_SLOT(showing(TQWidget*)) ); m_pModifiers = new ModifiersModule( this ); m_pTab->addTab( m_pModifiers, i18n("Modifier Keys") ); - connect( m_pModifiers, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); + connect( m_pModifiers, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); } void KeyModule::load() diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index 349bd492d..bc182f944 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/kcontrol/keys/modifiers.cpp @@ -207,7 +207,7 @@ void ModifiersModule::initGUI() m_pchkMacKeyboard = new TQCheckBox( i18n("Macintosh keyboard"), this ); m_pchkMacKeyboard->setChecked( m_bMacKeyboardOrig ); - connect( m_pchkMacKeyboard, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacKeyboardClicked()) ); + connect( m_pchkMacKeyboard, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacKeyboardClicked()) ); pLayoutTop->addWidget( m_pchkMacKeyboard, 1, 0 ); m_pchkMacSwap = new TQCheckBox( i18n("MacOS-style modifier usage"), this ); @@ -220,7 +220,7 @@ void ModifiersModule::initGUI() "<b>Command</b> will be used for application and console commands, " "<b>Option</b> as a command modifier and for navigating menus and dialogs, " "and <b>Control</b> for window manager commands.") ); - connect( m_pchkMacSwap, TQT_SIGNAL(clicked()), TQT_SLOT(slotMacSwapClicked()) ); + connect( m_pchkMacSwap, TQ_SIGNAL(clicked()), TQ_SLOT(slotMacSwapClicked()) ); pLayoutTop->addWidget( m_pchkMacSwap, 2, 0 ); //------------------ diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index e7f599dda..18f6803ab 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -139,21 +139,21 @@ void ShortcutsModule::initGUI() pGroup->hide(); m_prbPre = new TQRadioButton( "", this ); - connect( m_prbPre, TQT_SIGNAL(clicked()), TQT_SLOT(slotSchemeCur()) ); + connect( m_prbPre, TQ_SIGNAL(clicked()), TQ_SLOT(slotSchemeCur()) ); pGroup->insert( m_prbPre ); pHLayout->addWidget( m_prbPre ); m_pcbSchemes = new KComboBox( this ); m_pcbSchemes->setMinimumWidth( 100 ); m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); - connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); + connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) ); pHLayout->addWidget( m_pcbSchemes ); pHLayout->addSpacing( KDialog::marginHint() ); m_pbtnRemove = new TQPushButton( i18n("&Remove"), this ); m_pbtnRemove->setEnabled( false ); - connect( m_pbtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveScheme()) ); + connect( m_pbtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveScheme()) ); TQWhatsThis::add( m_pbtnRemove, i18n("Click here to remove the selected key bindings scheme. You cannot" " remove the standard system-wide schemes 'Current scheme' and 'TDE default'.") ); pHLayout->addWidget( m_pbtnRemove ); @@ -168,7 +168,7 @@ void ShortcutsModule::initGUI() m_pbtnSave = new TQPushButton( i18n("&Save..."), this ); m_pbtnSave->setEnabled( false ); TQWhatsThis::add( m_pbtnSave, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.") ); - connect( m_pbtnSave, TQT_SIGNAL(clicked()), TQT_SLOT(slotSaveSchemeAs()) ); + connect( m_pbtnSave, TQ_SIGNAL(clicked()), TQ_SLOT(slotSaveSchemeAs()) ); pHLayout->addWidget( m_pbtnSave ); pHLayout->addStretch( 1 ); @@ -196,20 +196,20 @@ void ShortcutsModule::initGUI() m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() ); m_useRmWinKeys->setChecked( m_bUseRmWinKeys ); pVLayout->addWidget( m_useRmWinKeys, 1, 0 ); - connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) ); + connect( m_useRmWinKeys, TQ_SIGNAL(clicked()), TQ_SLOT(slotUseRmWinKeysClicked()) ); } m_pTab->addTab( m_pkcGeneral, i18n("&Global Shortcuts") ); - connect( m_pkcGeneral, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); + connect( m_pkcGeneral, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) ); m_pListSequence = new TDEAccelShortcutList( m_actionsSequence, true ); m_pkcSequence = new KKeyChooser( m_pListSequence, this, KKeyChooser::Global, false ); m_pTab->addTab( m_pkcSequence, i18n("Shortcut Se&quences") ); - connect( m_pkcSequence, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); + connect( m_pkcSequence, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) ); m_pListApplication = new TDEStdAccel::ShortcutList; m_pkcApplication = new KKeyChooser( m_pListApplication, this, KKeyChooser::Standard, false ); m_pTab->addTab( m_pkcApplication, i18n("App&lication Shortcuts") ); - connect( m_pkcApplication, TQT_SIGNAL(keyChange()), TQT_SLOT(slotKeyChange()) ); + connect( m_pkcApplication, TQ_SIGNAL(keyChange()), TQ_SLOT(slotKeyChange()) ); kdDebug(125) << "G-----------" << endl; readSchemeNames(); @@ -404,7 +404,7 @@ void ShortcutsModule::slotSaveSchemeAs() return; } while( !bNameValid ); - disconnect( m_pcbSchemes, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectScheme(int)) ); + disconnect( m_pcbSchemes, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelectScheme(int)) ); TQString kksPath = TDEGlobal::dirs()->saveLocation( "data", "kcmkeys/" ); @@ -434,7 +434,7 @@ void ShortcutsModule::slotSaveSchemeAs() saveScheme(); - connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) ); + connect( m_pcbSchemes, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSelectScheme(int)) ); slotSelectScheme(); } diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp index 06d01e317..31879e2f2 100644 --- a/kcontrol/keys/treeview.cpp +++ b/kcontrol/keys/treeview.cpp @@ -109,11 +109,11 @@ AppTreeView::AppTreeView( TQWidget *parent, const char *name ) addColumn(i18n("Shortcut")); addColumn(i18n("Alternate")); - connect(this, TQT_SIGNAL(clicked( TQListViewItem* )), - TQT_SLOT(itemSelected( TQListViewItem* ))); + connect(this, TQ_SIGNAL(clicked( TQListViewItem* )), + TQ_SLOT(itemSelected( TQListViewItem* ))); - connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )), - TQT_SLOT(itemSelected( TQListViewItem* ))); + connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )), + TQ_SLOT(itemSelected( TQListViewItem* ))); } AppTreeView::~AppTreeView() diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp index f2ba15680..dadb70f39 100644 --- a/kcontrol/kicker/advancedDialog.cpp +++ b/kcontrol/kicker/advancedDialog.cpp @@ -40,10 +40,10 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) name, false, false) { - connect(this, TQT_SIGNAL(applyClicked()), - this, TQT_SLOT(save())); - connect(this, TQT_SIGNAL(okClicked()), - this, TQT_SLOT(save())); + connect(this, TQ_SIGNAL(applyClicked()), + this, TQ_SLOT(save())); + connect(this, TQ_SIGNAL(okClicked()), + this, TQ_SLOT(save())); TQFrame* page = plainPage(); TQVBoxLayout* layout = new TQVBoxLayout(page); @@ -53,22 +53,22 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name) setMinimumSize( sizeHint() ); - connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->hideButtonSize, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->tintColorB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->tintSlider, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->menubarPanelTransparent, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->menubarPanelBlurred, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->kickerResizeHandle, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); - connect(m_advancedWidget->kickerDeepButtons, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changed())); + connect(m_advancedWidget->handles, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->hideButtonSize, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->tintColorB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->tintSlider, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->menubarPanelTransparent, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->menubarPanelBlurred, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->kickerResizeHandle, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); + connect(m_advancedWidget->kickerDeepButtons, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changed())); load(); } diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp index c2f488550..7c5436b52 100644 --- a/kcontrol/kicker/applettab_impl.cpp +++ b/kcontrol/kicker/applettab_impl.cpp @@ -42,16 +42,16 @@ AppletTab::AppletTab( TQWidget *parent, const char* name ) : AppletTabBase (parent, name) { - connect(level_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(level_changed(int))); + connect(level_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(level_changed(int))); - connect(lb_trusted, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(trusted_selection_changed(TQListViewItem*))); + connect(lb_trusted, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(trusted_selection_changed(TQListViewItem*))); - connect(pb_add, TQT_SIGNAL(clicked()), TQT_SLOT(add_clicked())); - connect(pb_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove_clicked())); + connect(pb_add, TQ_SIGNAL(clicked()), TQ_SLOT(add_clicked())); + connect(pb_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove_clicked())); - connect(lb_available, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(available_selection_changed(TQListViewItem*))); + connect(lb_available, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(available_selection_changed(TQListViewItem*))); pb_add->setEnabled(false); pb_remove->setEnabled(false); diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp index 506eebdfb..d94f18bfa 100644 --- a/kcontrol/kicker/hidingconfig.cpp +++ b/kcontrol/kicker/hidingconfig.cpp @@ -41,13 +41,13 @@ HidingConfig::HidingConfig(TQWidget *parent, const char *name) //addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void HidingConfig::notChanged() @@ -90,7 +90,7 @@ void HidingConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString HidingConfig::handbookSection() const diff --git a/kcontrol/kicker/hidingtab_impl.cpp b/kcontrol/kicker/hidingtab_impl.cpp index 8c340bd5d..382c1a84e 100644 --- a/kcontrol/kicker/hidingtab_impl.cpp +++ b/kcontrol/kicker/hidingtab_impl.cpp @@ -38,33 +38,33 @@ HidingTab::HidingTab(TQWidget *parent, const char* name) m_panelInfo(0) { // connections - connect(m_manual,TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_automatic, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked())); - connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_background, TQT_SIGNAL(toggled(bool)), TQT_SLOT(backgroundModeClicked())); - connect(m_xineramaHide, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_hideSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_animateHiding, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_delaySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_autoHideSwitch, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_backgroundRaise, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_backgroundPos, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_lHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - connect(m_rHB, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); - - connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()), - TQT_SLOT(infoUpdated())); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)), - TQT_SLOT(extensionAdded(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)), - TQT_SLOT(extensionRemoved(ExtensionInfo*))); + connect(m_manual,TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_automatic, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked())); + connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_background, TQ_SIGNAL(toggled(bool)), TQ_SLOT(backgroundModeClicked())); + connect(m_xineramaHide, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_hideSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_animateHiding, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_delaySpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_autoHideSwitch, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_backgroundRaise, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_backgroundPos, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_lHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + connect(m_rHB, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); + + connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()), + TQ_SLOT(infoUpdated())); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)), + TQ_SLOT(extensionAdded(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)), + TQ_SLOT(extensionRemoved(ExtensionInfo*))); // position tab tells hiding tab about extension selections and vice versa - connect(KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int)), - TQT_SLOT(switchPanel(int))); - connect(m_panelList, TQT_SIGNAL(activated(int)), - KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int))); + connect(KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int)), + TQ_SLOT(switchPanel(int))); + connect(m_panelList, TQ_SIGNAL(activated(int)), + KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int))); } void HidingTab::load() diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp index d7cbadf28..082753cb9 100644 --- a/kcontrol/kicker/lookandfeelconfig.cpp +++ b/kcontrol/kicker/lookandfeelconfig.cpp @@ -41,13 +41,13 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void LookAndFeelConfig::notChanged() @@ -90,7 +90,7 @@ void LookAndFeelConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString LookAndFeelConfig::handbookSection() const diff --git a/kcontrol/kicker/lookandfeeltab_impl.cpp b/kcontrol/kicker/lookandfeeltab_impl.cpp index 674b1cd04..858cc2cb3 100644 --- a/kcontrol/kicker/lookandfeeltab_impl.cpp +++ b/kcontrol/kicker/lookandfeeltab_impl.cpp @@ -48,21 +48,21 @@ LookAndFeelTab::LookAndFeelTab( TQWidget *parent, const char* name ) : LookAndFeelTabBase(parent, name), m_advDialog(0) { - connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); + connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); - connect(m_kmenuTile, TQT_SIGNAL(activated(int)), TQT_SLOT(kmenuTileChanged(int))); - connect(m_desktopTile, TQT_SIGNAL(activated(int)), TQT_SLOT(desktopTileChanged(int))); - connect(m_browserTile, TQT_SIGNAL(activated(int)), TQT_SLOT(browserTileChanged(int))); - connect(m_urlTile, TQT_SIGNAL(activated(int)), TQT_SLOT(urlTileChanged(int))); - connect(m_windowListTile, TQT_SIGNAL(activated(int)), TQT_SLOT(wlTileChanged(int))); + connect(m_kmenuTile, TQ_SIGNAL(activated(int)), TQ_SLOT(kmenuTileChanged(int))); + connect(m_desktopTile, TQ_SIGNAL(activated(int)), TQ_SLOT(desktopTileChanged(int))); + connect(m_browserTile, TQ_SIGNAL(activated(int)), TQ_SLOT(browserTileChanged(int))); + connect(m_urlTile, TQ_SIGNAL(activated(int)), TQ_SLOT(urlTileChanged(int))); + connect(m_windowListTile, TQ_SIGNAL(activated(int)), TQ_SLOT(wlTileChanged(int))); - connect(kcfg_ColorizeBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(browseTheme())); + connect(kcfg_ColorizeBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(browseTheme())); - connect(kcfg_BackgroundTheme->lineEdit(), TQT_SIGNAL(lostFocus()), TQT_SLOT(browseTheme())); + connect(kcfg_BackgroundTheme->lineEdit(), TQ_SIGNAL(lostFocus()), TQ_SLOT(browseTheme())); kcfg_BackgroundTheme->setFilter(KImageIO::pattern(KImageIO::Reading)); kcfg_BackgroundTheme->setCaption(i18n("Select Image File")); @@ -92,7 +92,7 @@ void LookAndFeelTab::launchAdvancedDialog() if (!m_advDialog) { m_advDialog = new advancedDialog(this, "advancedDialog"); - connect(m_advDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(finishAdvancedDialog())); + connect(m_advDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(finishAdvancedDialog())); m_advDialog->show(); } m_advDialog->setActiveWindow(); diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index 5695e3869..a703ea966 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp @@ -48,7 +48,7 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name) layout->addWidget(lookandfeeltab); layout->addStretch(); - connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged())); + connect(lookandfeeltab, TQ_SIGNAL(changed()), TQ_SLOT(configChanged())); load(); } diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index da73da7c3..a0e14ba17 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -68,10 +68,10 @@ KickerConfig::KickerConfig(TQWidget *parent, const char *name) "jumpToPanel(TQString)", false); kapp->dcopClient()->send("kicker", "kicker", "configLaunched()", TQByteArray()); - connect(this, TQT_SIGNAL(hidingPanelChanged(int)), - this, TQT_SLOT(setCurrentPanelIndex(int))); - connect(this, TQT_SIGNAL(positionPanelChanged(int)), - this, TQT_SLOT(setCurrentPanelIndex(int))); + connect(this, TQ_SIGNAL(hidingPanelChanged(int)), + this, TQ_SLOT(setCurrentPanelIndex(int))); + connect(this, TQ_SIGNAL(positionPanelChanged(int)), + this, TQ_SLOT(setCurrentPanelIndex(int))); } KickerConfig::~KickerConfig() @@ -90,7 +90,7 @@ KickerConfig::~KickerConfig() // this method may get called multiple times during the life of the control panel! void KickerConfig::init() { - disconnect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&))); + disconnect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&))); configFileWatch->stopScan(); for (ExtensionInfoList::iterator it = m_extensionInfo.begin(); it != m_extensionInfo.end(); @@ -128,7 +128,7 @@ void KickerConfig::init() setupExtensionInfo(*config, true, true); - connect(configFileWatch, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(configChanged(const TQString&))); + connect(configFileWatch, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(configChanged(const TQString&))); configFileWatch->startScan(); } diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp index 4f8a68605..6773105c6 100644 --- a/kcontrol/kicker/menuconfig.cpp +++ b/kcontrol/kicker/menuconfig.cpp @@ -41,13 +41,13 @@ MenuConfig::MenuConfig(TQWidget *parent, const char *name) addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void MenuConfig::notChanged() @@ -90,7 +90,7 @@ void MenuConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changedm, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString MenuConfig::handbookSection() const diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index fbd15cd8d..259027a0b 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/kcontrol/kicker/menutab_impl.cpp @@ -79,12 +79,12 @@ MenuTab::MenuTab( TQWidget *parent, const char* name ) m_kmenu_button_changed(false) { // connections - connect(m_editKMenuButton, TQT_SIGNAL(clicked()), TQT_SLOT(launchMenuEditor())); - connect(btnCustomKMenuIcon, TQT_SIGNAL(clicked()), TQT_SLOT(launchIconEditor())); - connect(kcfg_KMenuText, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(kmenuChanged())); - connect(kcfg_ShowKMenuText, TQT_SIGNAL(toggled(bool)), TQT_SLOT(kmenuChanged())); - //connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged())); - connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged())); + connect(m_editKMenuButton, TQ_SIGNAL(clicked()), TQ_SLOT(launchMenuEditor())); + connect(btnCustomKMenuIcon, TQ_SIGNAL(clicked()), TQ_SLOT(launchIconEditor())); + connect(kcfg_KMenuText, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(kmenuChanged())); + connect(kcfg_ShowKMenuText, TQ_SIGNAL(toggled(bool)), TQ_SLOT(kmenuChanged())); + //connect(kcfg_ButtonFont, TQ_SIGNAL(fontSelected(const TQFont &)), TQ_SLOT(kmenuChanged())); + connect(maxrecentdocs, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(kmenuChanged())); // FIXME // When top pixmap support is ready for end-user visibility, replace @@ -129,7 +129,7 @@ void MenuTab::load( bool useDefaults ) TQString::null, SmallIcon("bookmark"), c->readBoolEntry("UseBookmarks", false)); - connect(m_bookmarkMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_bookmarkMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); // show the quick menus menu? m_quickBrowserMenu = new kSubMenuItem(m_subMenus, @@ -137,7 +137,7 @@ void MenuTab::load( bool useDefaults ) TQString::null, SmallIcon("kdisknav"), c->readBoolEntry("UseBrowser", false)); - connect(m_quickBrowserMenu, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(m_quickBrowserMenu, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); TQStringList ext_default; ext_default << "prefmenu.desktop" << "systemmenu.desktop"; @@ -156,7 +156,7 @@ void MenuTab::load( bool useDefaults ) *it, SmallIcon(df.readIcon()), tqFind(ext.begin(), ext.end(), *it) != ext.end()); - connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed())); + connect(menuItem, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed())); } } @@ -165,16 +165,16 @@ void MenuTab::load( bool useDefaults ) m_openOnHover->setChecked( c->readBoolEntry("OpenOnHover", true) ); menuStyleChanged(); - connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); - connect(m_comboMenuStyle, TQT_SIGNAL(activated(int)), TQT_SLOT(menuStyleChanged())); - connect(m_openOnHover, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed())); + connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed())); + connect(m_comboMenuStyle, TQ_SIGNAL(activated(int)), TQ_SLOT(menuStyleChanged())); + connect(m_openOnHover, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed())); m_showFrequent->setChecked(true); c->setGroup("KMenu"); m_searchShortcut->setShortcut(TDEShortcut(c->readEntry("SearchShortcut", "/")), false); - connect(m_searchShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SIGNAL(changed())); - connect(m_searchShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(setSearchShortcut(const TDEShortcut&))); + connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SIGNAL(changed())); + connect(m_searchShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(setSearchShortcut(const TDEShortcut&))); if ( useDefaults ) emit changed(); diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp index 00b571d13..cd871ae22 100644 --- a/kcontrol/kicker/positionconfig.cpp +++ b/kcontrol/kicker/positionconfig.cpp @@ -41,13 +41,13 @@ PositionConfig::PositionConfig(TQWidget *parent, const char *name) //addConfig(KickerSettings::self(), m_widget); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); - connect(KickerConfig::the(), TQT_SIGNAL(aboutToNotifyKicker()), - this, TQT_SLOT(aboutToNotifyKicker())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(aboutToNotifyKicker()), + this, TQ_SLOT(aboutToNotifyKicker())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void PositionConfig::notChanged() @@ -90,7 +90,7 @@ void PositionConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } TQString PositionConfig::handbookSection() const diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 5fdb22983..b8a2d7ea9 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -104,10 +104,10 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) } // connections - connect(m_locationGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); - connect(m_xineramaScreenComboBox, TQT_SIGNAL(highlighted(int)), TQT_SIGNAL(changed())); + connect(m_locationGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed())); + connect(m_xineramaScreenComboBox, TQ_SIGNAL(highlighted(int)), TQ_SIGNAL(changed())); - connect(m_identifyButton,TQT_SIGNAL(clicked()),TQT_SLOT(showIdentify())); + connect(m_identifyButton,TQ_SIGNAL(clicked()),TQ_SLOT(showIdentify())); for(int s=0; s < TQApplication::desktop()->numScreens(); s++) { /* populate the combobox for the available screens */ @@ -123,38 +123,38 @@ PositionTab::PositionTab(TQWidget *parent, const char* name) m_xineramaScreenLabel->hide(); } - connect(m_percentSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_percentSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_expandCheckBox, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed())); + connect(m_percentSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_percentSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_expandCheckBox, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed())); - connect(m_sizeGroup, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(changed())); - connect(m_customSlider, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); - connect(m_customSpinbox, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed())); + connect(m_sizeGroup, TQ_SIGNAL(clicked(int)), TQ_SIGNAL(changed())); + connect(m_customSlider, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); + connect(m_customSpinbox, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed())); m_desktopPreview = new KVirtualBGRenderer(0); - connect(m_desktopPreview, TQT_SIGNAL(imageDone(int)), - TQT_SLOT(slotBGPreviewReady(int))); - - connect(KickerConfig::the(), TQT_SIGNAL(extensionInfoChanged()), - TQT_SLOT(infoUpdated())); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAdded(ExtensionInfo*)), - TQT_SLOT(extensionAdded(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionRemoved(ExtensionInfo*)), - TQT_SLOT(extensionRemoved(ExtensionInfo*))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionChanged(const TQString&)), - TQT_SLOT(extensionChanged(const TQString&))); - connect(KickerConfig::the(), TQT_SIGNAL(extensionAboutToChange(const TQString&)), - TQT_SLOT(extensionAboutToChange(const TQString&))); + connect(m_desktopPreview, TQ_SIGNAL(imageDone(int)), + TQ_SLOT(slotBGPreviewReady(int))); + + connect(KickerConfig::the(), TQ_SIGNAL(extensionInfoChanged()), + TQ_SLOT(infoUpdated())); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAdded(ExtensionInfo*)), + TQ_SLOT(extensionAdded(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionRemoved(ExtensionInfo*)), + TQ_SLOT(extensionRemoved(ExtensionInfo*))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionChanged(const TQString&)), + TQ_SLOT(extensionChanged(const TQString&))); + connect(KickerConfig::the(), TQ_SIGNAL(extensionAboutToChange(const TQString&)), + TQ_SLOT(extensionAboutToChange(const TQString&))); // position tab tells hiding tab about extension selections and vice versa - connect(KickerConfig::the(), TQT_SIGNAL(hidingPanelChanged(int)), - TQT_SLOT(jumpToPanel(int))); - connect(m_panelList, TQT_SIGNAL(activated(int)), - KickerConfig::the(), TQT_SIGNAL(positionPanelChanged(int))); - - connect(m_panelSize, TQT_SIGNAL(activated(int)), - TQT_SLOT(sizeChanged(int))); - connect(m_panelSize, TQT_SIGNAL(activated(int)), - TQT_SIGNAL(changed())); + connect(KickerConfig::the(), TQ_SIGNAL(hidingPanelChanged(int)), + TQ_SLOT(jumpToPanel(int))); + connect(m_panelList, TQ_SIGNAL(activated(int)), + KickerConfig::the(), TQ_SIGNAL(positionPanelChanged(int))); + + connect(m_panelSize, TQ_SIGNAL(activated(int)), + TQ_SLOT(sizeChanged(int))); + connect(m_panelSize, TQ_SIGNAL(activated(int)), + TQ_SIGNAL(changed())); } PositionTab::~PositionTab() @@ -700,7 +700,7 @@ void PositionTab::showIdentify() screenLabel->setNum(s + 1); // BUGLET: we should not allow the identification to be entered again // until the timer fires. - TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close())); + TQTimer::singleShot(1500, screenLabel, TQ_SLOT(close())); TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center()); TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint()); diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index b703b9b35..6e198659a 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/kcontrol/knotify/knotify.cpp @@ -74,15 +74,15 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList & hbox->addWidget( m_appCombo, 10 ); m_notifyWidget = new KNotifyWidget( this, "knotify widget", true ); - connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool))); + connect( m_notifyWidget, TQ_SIGNAL( changed( bool )), TQ_SIGNAL( changed(bool))); layout->addWidget( m_notifyWidget ); - connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotAppActivated( const TQString& )) ); + connect( m_appCombo, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotAppActivated( const TQString& )) ); - connect( m_notifyWidget->m_playerButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotPlayerSettings())); + connect( m_notifyWidget->m_playerButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotPlayerSettings())); TDEAboutData* ab = new TDEAboutData( "kcmknotify", I18N_NOOP("KNotify"), "3.0", @@ -231,10 +231,10 @@ PlayerSettingsDialog::PlayerSettingsDialog( TQWidget *parent, bool modal ) dataChanged = false; enableButton(Apply, false); - connect( m_ui->cbExternal, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( externalToggled( bool ) ) ); - connect( m_ui->grpPlayers, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotChanged() ) ); - connect( m_ui->volumeSlider, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); - connect( m_ui->reqExternal, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( slotChanged() ) ); + connect( m_ui->cbExternal, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( externalToggled( bool ) ) ); + connect( m_ui->grpPlayers, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotChanged() ) ); + connect( m_ui->volumeSlider, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); + connect( m_ui->reqExternal, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotChanged() ) ); } void PlayerSettingsDialog::load( bool useDefaults ) diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 1b477d0e3..55eb642fe 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/kcontrol/konq/behaviour.cpp @@ -66,13 +66,13 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget cbNewWin = new TQCheckBox(i18n("Open folders in separate &windows"), vbox); TQWhatsThis::add( cbNewWin, i18n("If this option is checked, Konqueror will open a new window when " "you open a folder, rather than showing that folder's contents in the current window.")); - connect(cbNewWin, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(cbNewWin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateWinPixmap(bool))); + connect(cbNewWin, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(cbNewWin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateWinPixmap(bool))); // ---- cbListProgress = new TQCheckBox( i18n( "&Show network operations in a single window" ), vbox ); - connect(cbListProgress, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbListProgress, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbListProgress, i18n("Checking this option will group the" " progress information for all network file transfers into a single window" @@ -83,7 +83,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget // ---- cbShowArchivesAsFolders = new TQCheckBox( i18n( "Show archived &files as folders" ), vbox ); - connect(cbShowArchivesAsFolders, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbShowArchivesAsFolders, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbShowArchivesAsFolders, i18n("Checking this option will list archived" " files as folders when using tree view.") ); @@ -92,16 +92,16 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget // -- cbShowTips = new TQCheckBox( i18n( "Show file &tips" ), vbox ); - connect(cbShowTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbShowTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbShowTips, i18n("Here you can control if, when moving the mouse over a file, you want to see a " "small popup window with additional information about that file." "This feature requires 'Enable tooltips' in KControl, Appearance & Themes, Style.")); - connect(cbShowTips, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotShowTips(bool))); + connect(cbShowTips, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotShowTips(bool))); /* - //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), sbToolTip, TQT_SLOT(setEnabled(bool))); - //connect(cbShowTips, TQT_SIGNAL(toggled(bool)), fileTips, TQT_SLOT(setEnabled(bool))); + //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), sbToolTip, TQ_SLOT(setEnabled(bool))); + //connect(cbShowTips, TQ_SIGNAL(toggled(bool)), fileTips, TQ_SLOT(setEnabled(bool))); fileTips->setBuddy(sbToolTip); TQString tipstr = i18n("If you move the mouse over a file, you usually see a small popup window that shows some " "additional information about that file. Here, you can set how many items of information " @@ -116,7 +116,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ); cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview ); - connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbShowPreviewsInTips, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbShowPreviewsInTips, i18n("Here you can control if you want the " "popup window to contain a larger preview for the file, when moving the mouse over it.")); @@ -124,12 +124,12 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget cbRenameDirectlyIcon = new TQCheckBox(i18n("Rename icons in&line"), vbox); TQWhatsThis::add(cbRenameDirectlyIcon, i18n("Checking this option will allow files to be " "renamed by clicking directly on the icon name. ")); - connect(cbRenameDirectlyIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbRenameDirectlyIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); cbDoubleClickMoveToParent = new TQCheckBox(i18n("Double click on empty area to move to parent folder"), vbox); TQWhatsThis::add(cbDoubleClickMoveToParent, i18n("When this option is enabled, double clicking an " "empty area will navigate to the parent folder.")); - connect(cbDoubleClickMoveToParent, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbDoubleClickMoveToParent, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQHBoxLayout *hlay = new TQHBoxLayout( lay ); @@ -140,7 +140,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget homeURL->setMode(KFile::Directory); homeURL->setCaption(i18n("Select Home Folder")); hlay->addWidget( homeURL ); - connect(homeURL, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(homeURL, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); label->setBuddy(homeURL); TQString homestr = i18n("This is the URL (e.g. a folder or a web page) where " @@ -153,7 +153,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget cbShowDeleteCommand = new TQCheckBox( i18n( "Show 'Delete' context me&nu entries which bypass the trashcan" ), this ); lay->addWidget( cbShowDeleteCommand ); - connect(cbShowDeleteCommand, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbShowDeleteCommand, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbShowDeleteCommand, i18n("Check this if you want 'Delete' menu commands to be displayed " "on the desktop and in the file manager's context menus. " @@ -169,7 +169,7 @@ KBehaviourOptions::KBehaviourOptions(TDEConfig *config, TQString group, TQWidget " <li><em>Delete:</em> simply deletes the file.</li>" " </li></ul>") ); - connect(bg, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( changed() )); + connect(bg, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( changed() )); cbMoveToTrash = new TQCheckBox( i18n("&Move to trash"), bg ); diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp index 49587f2dc..4a8496eac 100644 --- a/kcontrol/konq/browser.cpp +++ b/kcontrol/konq/browser.cpp @@ -57,14 +57,14 @@ KBrowserOptions::KBrowserOptions(TDEConfig *config, TQString group, TQWidget *pa tab->addTab(kuick, i18n("&Quick Copy && Move")); } - connect(appearance, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); - connect(behavior, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); - connect(previews, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(appearance, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); + connect(behavior, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); + connect(previews, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); if (kuick) - connect(kuick, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(kuick, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); - connect(tab, TQT_SIGNAL(currentChanged(TQWidget *)), - this, TQT_SIGNAL(quickHelpChanged())); + connect(tab, TQ_SIGNAL(currentChanged(TQWidget *)), + this, TQ_SIGNAL(quickHelpChanged())); m_tab = tab; } diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index d7af32f8b..5125a03f1 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -70,8 +70,8 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) TQLabel *label = new TQLabel(i18n("N&umber of desktops: "), number_group); _numInput = new KIntNumInput(4, number_group); _numInput->setRange(1, maxDesktops, 1, true); - connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int))); - connect(_numInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); + connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int))); + connect(_numInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() )); label->setBuddy( _numInput ); TQString wtstr = i18n( "Here you can set how many virtual desktops you want on your TDE desktop. Move the slider to change the value." ); TQWhatsThis::add( label, wtstr ); @@ -99,10 +99,10 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) TQWhatsThis::add( _nameLabel[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); TQWhatsThis::add( _nameInput[i+(maxDesktops/2)], i18n( "Here you can enter the name for desktop %1" ).arg( i+(maxDesktops/2)+1 ) ); - connect(_nameInput[i], TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT( changed() )); - connect(_nameInput[i+(maxDesktops/2)], TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT( changed() )); + connect(_nameInput[i], TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT( changed() )); + connect(_nameInput[i+(maxDesktops/2)], TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT( changed() )); } for(int i = 1; i < maxDesktops; i++) @@ -111,7 +111,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/) layout->addWidget(name_group); _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this); - connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); + connect(_wheelOption,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); layout->addWidget(_wheelOption); layout->addStretch(1); diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 5c5fe2b95..3d149ef39 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -53,7 +53,7 @@ DesktopBehaviorModule::DesktopBehaviorModule(TDEConfig *config, TQWidget *parent TQVBoxLayout* layout = new TQVBoxLayout(this); m_behavior = new DesktopBehavior(config, this); layout->addWidget(m_behavior); - connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed())); + connect(m_behavior, TQ_SIGNAL(changed()), this, TQ_SLOT(changed())); } void DesktopBehaviorModule::changed() @@ -127,16 +127,16 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")); - connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed())); - connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); - connect(showHiddenBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); - connect(vrootBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); - connect(lockInPlaceBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged())); - connect(autoLineupIconsBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableGridChanged())); - connect(toolTipBox, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); - connect(mediaListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(mediaListViewChanged(TQListViewItem *))); - connect(spacingValue, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(spacingChanged(int))); - connect(spacingCtrlScroll, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(changed())); + connect(desktopMenuGroup, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL(changed())); + connect(iconsEnabledBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged())); + connect(showHiddenBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed())); + connect(vrootBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed())); + connect(lockInPlaceBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged())); + connect(autoLineupIconsBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableGridChanged())); + connect(toolTipBox, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed())); + connect(mediaListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(mediaListViewChanged(TQListViewItem *))); + connect(spacingValue, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(spacingChanged(int))); + connect(spacingCtrlScroll, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(changed())); strMouseButton1 = i18n("&Left button:"); strButtonTxt1 = i18n( "You can choose what happens when" @@ -155,9 +155,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char leftLabel->setText( strMouseButton1 ); leftLabel->setBuddy( leftComboBox ); fillMenuCombo( leftComboBox ); - connect(leftEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); - connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); - connect(leftComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); + connect(leftEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed())); + connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed())); + connect(leftComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged())); TQString wtstr = strButtonTxt1 + i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" " <li><em>Window list menu:</em> a menu showing all windows on all" @@ -177,9 +177,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char middleLabel->setBuddy( middleComboBox ); fillMenuCombo( middleComboBox ); - connect(middleEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); - connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); - connect(middleComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); + connect(middleEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed())); + connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed())); + connect(middleComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged())); wtstr = i18n("You can choose what happens when" " you click the middle button of your pointing device on the desktop:" " <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" @@ -201,9 +201,9 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char rightLabel->setText( strMouseButton3 ); rightLabel->setBuddy( rightComboBox ); fillMenuCombo( rightComboBox ); - connect(rightEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editButtonPressed())); - connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(changed())); - connect(rightComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboBoxChanged())); + connect(rightEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editButtonPressed())); + connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(changed())); + connect(rightComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboBoxChanged())); wtstr = strButtonTxt3 + i18n(" <ul><li><em>No action:</em> as you might guess, nothing happens!</li>" " <li><em>Window list menu:</em> a menu showing all windows on all" @@ -223,8 +223,8 @@ DesktopBehavior::DesktopBehavior(TDEConfig *config, TQWidget *parent, const char if (m_bHasMedia) { - connect(enableMediaBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); - connect(enableMediaFreeSpaceOverlayBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); + connect(enableMediaBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged())); + connect(enableMediaFreeSpaceOverlayBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged())); } else { diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index 94f866b1a..e8a99297d 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/kcontrol/konq/fontopts.cpp @@ -66,22 +66,22 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQWhatsThis::add( m_pStandard, wtstr ); row++; - connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotStandardFont(const TQString&) ) ); - connect( m_pStandard, TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT(changed() ) ); - connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotStandardFont(const TQString&) ) ); - connect( m_pStandard, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pStandard, TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT(changed() ) ); + connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pStandard, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); m_pSize = new TQSpinBox( 4,18,1,this ); label = new TQLabel( m_pSize, i18n("Font si&ze:"), this ); lay->addWidget(label,row,0); lay->addMultiCellWidget(m_pSize,row,row,1,1); - connect( m_pSize, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( slotFontSize(int) ) ); + connect( m_pSize, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( slotFontSize(int) ) ); row+=2; wtstr = i18n("This is the font size used to display text in Konqueror windows."); @@ -100,8 +100,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pNormalText, wtstr ); - connect( m_pNormalText, TQT_SIGNAL( changed( const TQColor & ) ), - TQT_SLOT( slotNormalTextColorChanged( const TQColor & ) ) ); + connect( m_pNormalText, TQ_SIGNAL( changed( const TQColor & ) ), + TQ_SLOT( slotNormalTextColorChanged( const TQColor & ) ) ); /* row++; @@ -115,8 +115,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pHighlightedText, wtstr ); - connect( m_pHighlightedText, TQT_SIGNAL( changed( const TQColor & ) ), - TQT_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) ); + connect( m_pHighlightedText, TQ_SIGNAL( changed( const TQColor & ) ), + TQ_SLOT( slotHighlightedTextColorChanged( const TQColor & ) ) ); */ row++; @@ -125,8 +125,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop { m_cbTextBackground = new TQCheckBox( i18n("&Text background color:"), this ); lay->addWidget(m_cbTextBackground,row,0); - connect( m_cbTextBackground, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotTextBackgroundClicked() ) ); + connect( m_cbTextBackground, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotTextBackgroundClicked() ) ); m_pTextBackground = new KColorButton( textBackgroundColor, this ); lay->addWidget(m_pTextBackground,row,COLOR_BUTTON_COL,(TQt::AlignmentFlags)hAlign); @@ -135,8 +135,8 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pTextBackground, wtstr ); - connect( m_pTextBackground, TQT_SIGNAL( changed( const TQColor & ) ), - TQT_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) ); + connect( m_pTextBackground, TQ_SIGNAL( changed( const TQColor & ) ), + TQ_SLOT( slotTextBackgroundColorChanged( const TQColor & ) ) ); row++; } @@ -146,10 +146,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop TQLabel* label = new TQLabel( m_pNbLines, i18n("H&eight for icon text:"), this ); lay->addWidget( label, row, 0 ); lay->addWidget( m_pNbLines, row, 1 ); - connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( changed() ) ); - connect( m_pNbLines, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotPNbLinesChanged(int)) ); + connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( changed() ) ); + connect( m_pNbLines, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotPNbLinesChanged(int)) ); TQString thwt = i18n("This is the maximum number of lines that can be" " used to draw icon text. Long file names are" @@ -165,10 +165,10 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop label = new TQLabel( m_pNbWidth, i18n("&Width for icon text:"), this ); lay->addWidget( label, row, 0 ); lay->addWidget( m_pNbWidth, row, 1 ); - connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ), - this, TQT_SLOT( changed() ) ); - connect( m_pNbWidth, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotPNbWidthChanged(int)) ); + connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ), + this, TQ_SLOT( changed() ) ); + connect( m_pNbWidth, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotPNbWidthChanged(int)) ); thwt = i18n( "This is the maximum width for the icon text when konqueror " "is used in multi column view mode." ); @@ -180,7 +180,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop cbUnderline = new TQCheckBox(i18n("&Underline filenames"), this); lay->addMultiCellWidget(cbUnderline,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign); - connect(cbUnderline, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(cbUnderline, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); TQWhatsThis::add( cbUnderline, i18n("Checking this option will result in filenames" " being underlined, so that they look like links on a web page. Note:" @@ -193,7 +193,7 @@ KonqFontOptions::KonqFontOptions(TDEConfig *config, TQString group, bool desktop m_pSizeInBytes = new TQCheckBox(i18n("Display file sizes in b&ytes"), this); lay->addMultiCellWidget( m_pSizeInBytes,row,row,0,LASTCOLUMN,(TQt::AlignmentFlags)hAlign ); - connect( m_pSizeInBytes, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()) ); + connect( m_pSizeInBytes, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed()) ); TQWhatsThis::add( m_pSizeInBytes, i18n("Checking this option will result in file sizes" " being displayed in bytes. Otherwise file sizes are" diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index 3b2349fc7..309651dbb 100644 --- a/kcontrol/konq/previews.cpp +++ b/kcontrol/konq/previews.cpp @@ -130,14 +130,14 @@ KPreviewOptions::KPreviewOptions( TQWidget *parent, const char */*name*/ ) m_maxSize->setRange( 0.2, 100, 0.2, true ); label->setBuddy( m_maxSize ); lay->addWidget( m_maxSize ); - connect( m_maxSize, TQT_SIGNAL( valueChanged(double) ), TQT_SLOT( changed() ) ); + connect( m_maxSize, TQ_SIGNAL( valueChanged(double) ), TQ_SLOT( changed() ) ); m_boostSize = new TQCheckBox(i18n("&Increase size of previews relative to icons"), this); - connect( m_boostSize, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) ); + connect( m_boostSize, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) ); lay->addWidget(m_boostSize); m_useFileThumbnails = new TQCheckBox(i18n("&Use thumbnails embedded in files"), this); - connect( m_useFileThumbnails, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( changed() ) ); + connect( m_useFileThumbnails, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( changed() ) ); lay->addWidget(m_useFileThumbnails); diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 5da14f2f5..be73dcb7a 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/kcontrol/konq/rootopts.cpp @@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urDesktop->setMode( KFile::Directory ); tmpLabel->setBuddy( urDesktop ); lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL); - connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urDesktop, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); TQString wtstr = i18n("This folder contains all the files" " which you see on your desktop. You can change the location of this" " folder if you want to, and the contents will move automatically" @@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urAutostart->setMode( KFile::Directory ); tmpLabel->setBuddy( urAutostart ); lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL); - connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urAutostart, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder contains applications or" " links to applications (shortcuts) that you want to have started" " automatically whenever TDE starts. You can change the location of this" @@ -109,7 +109,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urDocument->setMode( KFile::Directory ); tmpLabel->setBuddy( urDocument ); lay->addMultiCellWidget(urDocument, row, row, 1, RO_LASTCOL); - connect(urDocument, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urDocument, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save documents from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urDocument, wtstr ); @@ -121,7 +121,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urDownload->setMode( KFile::Directory ); tmpLabel->setBuddy( urDownload ); lay->addMultiCellWidget(urDownload, row, row, 1, RO_LASTCOL); - connect(urDownload, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urDownload, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save downloads from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urDownload, wtstr ); @@ -133,7 +133,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urMusic->setMode( KFile::Directory ); tmpLabel->setBuddy( urMusic ); lay->addMultiCellWidget(urMusic, row, row, 1, RO_LASTCOL); - connect(urMusic, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urMusic, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save music from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urMusic, wtstr ); @@ -145,7 +145,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urPictures->setMode( KFile::Directory ); tmpLabel->setBuddy( urPictures ); lay->addMultiCellWidget(urPictures, row, row, 1, RO_LASTCOL); - connect(urPictures, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urPictures, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save pictures from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urPictures, wtstr ); @@ -157,7 +157,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urPublicShare->setMode( KFile::Directory ); tmpLabel->setBuddy( urPublicShare ); lay->addMultiCellWidget(urPublicShare, row, row, 1, RO_LASTCOL); - connect(urPublicShare, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urPublicShare, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save public shared files from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urPublicShare, wtstr ); @@ -169,7 +169,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urTemplates->setMode( KFile::Directory ); tmpLabel->setBuddy( urTemplates ); lay->addMultiCellWidget(urTemplates, row, row, 1, RO_LASTCOL); - connect(urTemplates, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urTemplates, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save templates from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urTemplates, wtstr ); @@ -181,7 +181,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) urVideos->setMode( KFile::Directory ); tmpLabel->setBuddy( urVideos ); lay->addMultiCellWidget(urVideos, row, row, 1, RO_LASTCOL); - connect(urVideos, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed())); + connect(urVideos, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changed())); wtstr = i18n("This folder will be used by default to load or save videos from or to."); TQWhatsThis::add( tmpLabel, wtstr ); TQWhatsThis::add( urVideos, wtstr ); @@ -190,7 +190,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * ) Q_ASSERT( row == RO_LASTROW-1 ); // if it fails here, check the row++ and RO_LASTROW above loadTmr = new TQTimer(this); - connect(loadTmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(loadTimerDone())); + connect(loadTmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(loadTimerDone())); load(); } @@ -543,8 +543,8 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt m_copyToDest = dest; m_copyFromSrc = src; TDEIO::ListJob* job = TDEIO::listDir( src ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), - this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ) ); tqApp->enter_loop(); if (m_ok) @@ -555,7 +555,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt else { TDEIO::Job * job = TDEIO::move( src, dest ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); // wait for job tqApp->enter_loop(); } @@ -583,7 +583,7 @@ void DesktopPathConfig::slotEntries( TDEIO::Job * job, const TDEIO::UDSEntryList } TDEIO::Job * moveJob = TDEIO::move( file.url(), m_copyToDest ); - connect( moveJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( moveJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); tqApp->enter_loop(); } tqApp->exit_loop(); diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index c921ef64d..ed0dfbc01 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/kcontrol/konqhtml/appearance.cpp @@ -48,16 +48,16 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg m_minSize = new KIntNumInput( fMinSize, gb ); m_minSize->setLabel( i18n( "M&inimum font size:" ) ); m_minSize->setRange( 2, 30 ); - connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotMinimumFontSize( int ) ) ); - connect( m_minSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) ); + connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotMinimumFontSize( int ) ) ); + connect( m_minSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) ); TQWhatsThis::add( m_minSize, i18n( "Konqueror will never display text smaller than " "this size,<br>overriding any other settings" ) ); m_MedSize = new KIntNumInput( m_minSize, fSize, gb ); m_MedSize->setLabel( i18n( "&Medium font size:" ) ); m_MedSize->setRange( 2, 30 ); - connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotFontSize( int ) ) ); - connect( m_MedSize, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changed() ) ); + connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotFontSize( int ) ) ); + connect( m_MedSize, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changed() ) ); TQWhatsThis::add( m_MedSize, i18n("This is the relative font size Konqueror uses " "to display web sites.") ); @@ -76,14 +76,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[0], wtstr ); - connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotStandardFont(const TQString&) ) ); - connect( m_pFonts[0], TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT(changed() ) ); - connect( m_pFonts[0]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotStandardFont(const TQString&) ) ); - connect( m_pFonts[0], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pFonts[0], TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT(changed() ) ); + connect( m_pFonts[0]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotStandardFont(const TQString&) ) ); + connect( m_pFonts[0], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "&Fixed font:"), this ); lay->addWidget( label, ++r, E ); @@ -97,14 +97,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[1], wtstr ); - connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT( slotFixedFont(const TQString&) ) ); - connect( m_pFonts[1], TQT_SIGNAL( activated(const TQString&) ), - TQT_SLOT(changed() ) ); - connect( m_pFonts[1]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotFixedFont(const TQString&) ) ); - connect( m_pFonts[1], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT( slotFixedFont(const TQString&) ) ); + connect( m_pFonts[1], TQ_SIGNAL( activated(const TQString&) ), + TQ_SLOT(changed() ) ); + connect( m_pFonts[1]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotFixedFont(const TQString&) ) ); + connect( m_pFonts[1], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "S&erif font:" ), this ); lay->addWidget( label, ++r, E ); @@ -118,14 +118,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[2], wtstr ); - connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotSerifFont( const TQString& ) ) ); - connect( m_pFonts[2], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( changed() ) ); - connect( m_pFonts[2]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotSerifFont(const TQString&) ) ); - connect( m_pFonts[2], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotSerifFont( const TQString& ) ) ); + connect( m_pFonts[2], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( changed() ) ); + connect( m_pFonts[2]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotSerifFont(const TQString&) ) ); + connect( m_pFonts[2], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "Sa&ns serif font:" ), this ); lay->addWidget( label, ++r, E ); @@ -139,14 +139,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[3], wtstr ); - connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotSansSerifFont( const TQString& ) ) ); - connect( m_pFonts[3], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( changed() ) ); - connect( m_pFonts[3]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotSansSerifFont(const TQString&) ) ); - connect( m_pFonts[3], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotSansSerifFont( const TQString& ) ) ); + connect( m_pFonts[3], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( changed() ) ); + connect( m_pFonts[3]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotSansSerifFont(const TQString&) ) ); + connect( m_pFonts[3], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "C&ursive font:" ), this ); @@ -161,14 +161,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[4], wtstr ); - connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotCursiveFont( const TQString& ) ) ); - connect( m_pFonts[4], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( changed() ) ); - connect( m_pFonts[4]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotCursiveFont(const TQString&) ) ); - connect( m_pFonts[4], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotCursiveFont( const TQString& ) ) ); + connect( m_pFonts[4], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( changed() ) ); + connect( m_pFonts[4]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotCursiveFont(const TQString&) ) ); + connect( m_pFonts[4], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "Fantas&y font:" ), this ); @@ -183,14 +183,14 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pFonts[5], wtstr ); - connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( slotFantasyFont( const TQString& ) ) ); - connect( m_pFonts[5], TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( changed() ) ); - connect( m_pFonts[5]->lineEdit(), TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotFantasyFont(const TQString&) ) ); - connect( m_pFonts[5], TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT(changed() ) ); + connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( slotFantasyFont( const TQString& ) ) ); + connect( m_pFonts[5], TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( changed() ) ); + connect( m_pFonts[5]->lineEdit(), TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotFantasyFont(const TQString&) ) ); + connect( m_pFonts[5], TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT(changed() ) ); label = new TQLabel( i18n( "Font &size adjustment for this encoding:" ), this ); @@ -200,10 +200,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg label->setBuddy( m_pFontSizeAdjust ); lay->addMultiCellWidget( m_pFontSizeAdjust, r, r, M+1, W ); - connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( slotFontSizeAdjust( int ) ) ); - connect( m_pFontSizeAdjust, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( changed() ) ); + connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( slotFontSizeAdjust( int ) ) ); + connect( m_pFontSizeAdjust, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( changed() ) ); label = new TQLabel( i18n( "Default encoding:"), this ); //++r; @@ -222,10 +222,10 @@ KAppearanceOptions::KAppearanceOptions(TDEConfig *config, TQString group, TQWidg TQWhatsThis::add( label, wtstr ); TQWhatsThis::add( m_pEncoding, wtstr ); - connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ), - TQT_SLOT( slotEncoding(const TQString&) ) ); - connect( m_pEncoding, TQT_SIGNAL( activated(const TQString& ) ), - TQT_SLOT( changed() ) ); + connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ), + TQ_SLOT( slotEncoding(const TQString&) ) ); + connect( m_pEncoding, TQ_SIGNAL( activated(const TQString& ) ), + TQ_SLOT( changed() ) ); ++r; lay->setRowStretch(r, 8); diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp index e6521b3b8..53433264f 100644 --- a/kcontrol/konqhtml/domainlistview.cpp +++ b/kcontrol/konqhtml/domainlistview.cpp @@ -46,33 +46,33 @@ DomainListView::DomainListView(TDEConfig *config,const TQString &title, domainSpecificLV = new TDEListView(this); domainSpecificLV->addColumn(i18n("Host/Domain")); domainSpecificLV->addColumn(i18n("Policy"), 100); - connect(domainSpecificLV,TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(changePressed())); - connect(domainSpecificLV,TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(changePressed())); - connect(domainSpecificLV, TQT_SIGNAL( executed( TQListViewItem *)), TQT_SLOT( updateButton())); - connect(domainSpecificLV, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButton())); + connect(domainSpecificLV,TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(changePressed())); + connect(domainSpecificLV,TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(changePressed())); + connect(domainSpecificLV, TQ_SIGNAL( executed( TQListViewItem *)), TQ_SLOT( updateButton())); + connect(domainSpecificLV, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButton())); thisLayout->addMultiCellWidget(domainSpecificLV, 0, 5, 0, 0); addDomainPB = new TQPushButton(i18n("&New..."), this); thisLayout->addWidget(addDomainPB, 0, 1); - connect(addDomainPB, TQT_SIGNAL(clicked()), TQT_SLOT(addPressed())); + connect(addDomainPB, TQ_SIGNAL(clicked()), TQ_SLOT(addPressed())); changeDomainPB = new TQPushButton( i18n("Chan&ge..."), this); thisLayout->addWidget(changeDomainPB, 1, 1); - connect(changeDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(changePressed())); + connect(changeDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(changePressed())); deleteDomainPB = new TQPushButton(i18n("De&lete"), this); thisLayout->addWidget(deleteDomainPB, 2, 1); - connect(deleteDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(deletePressed())); + connect(deleteDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(deletePressed())); importDomainPB = new TQPushButton(i18n("&Import..."), this); thisLayout->addWidget(importDomainPB, 3, 1); - connect(importDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(importPressed())); + connect(importDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(importPressed())); importDomainPB->setEnabled(false); importDomainPB->hide(); exportDomainPB = new TQPushButton(i18n("&Export..."), this); thisLayout->addWidget(exportDomainPB, 4, 1); - connect(exportDomainPB, TQT_SIGNAL(clicked()), this, TQT_SLOT(exportPressed())); + connect(exportDomainPB, TQ_SIGNAL(clicked()), this, TQ_SLOT(exportPressed())); exportDomainPB->setEnabled(false); exportDomainPB->hide(); diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 6603c06ca..9b7f520ec 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/kcontrol/konqhtml/filteropts.cpp @@ -67,20 +67,20 @@ KCMFilter::KCMFilter(TDEConfig *config, TQString group, buttonBox->setSpacing( KDialog::spacingHint() ); mInsertButton = new TQPushButton( i18n("Insert"), buttonBox ); - connect( mInsertButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertFilter() ) ); + connect( mInsertButton, TQ_SIGNAL( clicked() ), TQ_SLOT( insertFilter() ) ); mUpdateButton = new TQPushButton( i18n("Update"), buttonBox ); - connect( mUpdateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateFilter() ) ); + connect( mUpdateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( updateFilter() ) ); mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeFilter() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeFilter() ) ); mImportButton = new TQPushButton(i18n("Import..."),buttonBox); - connect( mImportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( importFilters() ) ); + connect( mImportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( importFilters() ) ); mExportButton = new TQPushButton(i18n("Export..."),buttonBox); - connect( mExportButton, TQT_SIGNAL( clicked() ), TQT_SLOT( exportFilters() ) ); + connect( mExportButton, TQ_SIGNAL( clicked() ), TQ_SLOT( exportFilters() ) ); - connect( mEnableCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotEnableChecked())); - connect( mKillCheck, TQT_SIGNAL( clicked()), this, TQT_SLOT( slotKillChecked())); - connect( mListBox, TQT_SIGNAL( selectionChanged ()),this, TQT_SLOT( slotItemSelected())); + connect( mEnableCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotEnableChecked())); + connect( mKillCheck, TQ_SIGNAL( clicked()), this, TQ_SLOT( slotKillChecked())); + connect( mListBox, TQ_SIGNAL( selectionChanged ()),this, TQ_SLOT( slotItemSelected())); /* * Whats this items diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index ed87ea349..14cf39a36 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -51,12 +51,12 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * m_pAdvancedAddBookmarkCheckBox = new TQCheckBox(i18n( "Ask for name and folder when adding bookmarks" ), bgBookmarks); TQWhatsThis::add( m_pAdvancedAddBookmarkCheckBox, i18n( "If this box is checked, Konqueror will allow you to" " change the title of the bookmark and choose a folder in which to store it when you add a new bookmark." ) ); - connect(m_pAdvancedAddBookmarkCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pAdvancedAddBookmarkCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); m_pOnlyMarkedBookmarksCheckBox = new TQCheckBox(i18n( "Show only marked bookmarks in bookmark toolbar" ), bgBookmarks); TQWhatsThis::add( m_pOnlyMarkedBookmarksCheckBox, i18n( "If this box is checked, Konqueror will show only those" " bookmarks in the bookmark toolbar which you have marked to do so in the bookmark editor." ) ); - connect(m_pOnlyMarkedBookmarksCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pOnlyMarkedBookmarksCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( bgBookmarks, row, row, 0, 1 ); row++; @@ -67,14 +67,14 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * m_pFormCompletionCheckBox = new TQCheckBox(i18n( "Enable com&pletion of forms" ), bgForm); TQWhatsThis::add( m_pFormCompletionCheckBox, i18n( "If this box is checked, Konqueror will remember" " the data you enter in web forms and suggest it in similar fields for all forms." ) ); - connect(m_pFormCompletionCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pFormCompletionCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); m_pMaxFormCompletionItems = new KIntNumInput( bgForm ); m_pMaxFormCompletionItems->setLabel( i18n( "&Maximum completions:" ) ); m_pMaxFormCompletionItems->setRange( 0, 100 ); TQWhatsThis::add( m_pMaxFormCompletionItems, i18n( "Here you can select how many values Konqueror will remember for a form field." ) ); - connect(m_pMaxFormCompletionItems, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(m_pMaxFormCompletionItems, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( bgForm, row, row, 0, 1 ); row++; @@ -86,19 +86,19 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse ); TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change " "(usually to a hand) if it is moved over a hyperlink.") ); - connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_cbCursor, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); m_pOpenMiddleClick = new TQCheckBox( i18n ("M&iddle click opens URL in selection" ), bgMouse ); TQWhatsThis::add( m_pOpenMiddleClick, i18n ( "If this box is checked, you can open the URL in the selection by middle clicking on a " "Konqueror view." ) ); - connect(m_pOpenMiddleClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pOpenMiddleClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); m_pBackRightClick = new TQCheckBox( i18n( "Right click goes &back in history" ), bgMouse ); TQWhatsThis::add( m_pBackRightClick, i18n( "If this box is checked, you can go back in history by right clicking on a Konqueror view. " "To access the context menu, press the right mouse button and move." ) ); - connect(m_pBackRightClick, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pBackRightClick, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( bgMouse, row, row, 0, 1 ); row++; @@ -107,26 +107,26 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * m_pAutoLoadImagesCheckBox = new TQCheckBox( i18n( "A&utomatically load images"), this ); TQWhatsThis::add( m_pAutoLoadImagesCheckBox, i18n( "If this box is checked, Konqueror will automatically load any images that are embedded in a web page. Otherwise, it will display placeholders for the images, and you can then manually load the images by clicking on the image button.<br>Unless you have a very slow network connection, you will probably want to check this box to enhance your browsing experience." ) ); - connect(m_pAutoLoadImagesCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pAutoLoadImagesCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( m_pAutoLoadImagesCheckBox, row, row, 0, 1 ); row++; m_pEnableFavIconCheckBox = new TQCheckBox( i18n( "Enable &favicons"), this ); TQWhatsThis::add( m_pEnableFavIconCheckBox, i18n( "If this box is checked, Konqueror will automatically load and display favicon images that are associated with a web page. These images appear in the Location bar. Otherwise a generic image will appear." ) ); - connect(m_pEnableFavIconCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pEnableFavIconCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( m_pEnableFavIconCheckBox, row, row, 0, 1 ); row++; m_pUnfinishedImageFrameCheckBox = new TQCheckBox( i18n( "Dra&w frame around not completely loaded images"), this ); TQWhatsThis::add( m_pUnfinishedImageFrameCheckBox, i18n( "If this box is checked, Konqueror will draw a frame as placeholder around not yet fully loaded images that are embedded in a web page.<br>Especially if you have a slow network connection, you will probably want to check this box to enhance your browsing experience." ) ); - connect(m_pUnfinishedImageFrameCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pUnfinishedImageFrameCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( m_pUnfinishedImageFrameCheckBox, row, row, 0, 1 ); row++; m_pAutoRedirectCheckBox = new TQCheckBox( i18n( "Allow automatic delayed &reloading/redirecting"), this ); TQWhatsThis::add( m_pAutoRedirectCheckBox, i18n( "Some web pages request an automatic reload or redirection after a certain period of time. By unchecking this box Konqueror will ignore these requests." ) ); - connect(m_pAutoRedirectCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(m_pAutoRedirectCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); lay->addMultiCellWidget( m_pAutoRedirectCheckBox, row, row, 0, 1 ); row++; @@ -153,7 +153,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * "</ul><br><i>Note: The site's CSS definitions can override this value</i>"); TQWhatsThis::add( label, whatsThis); TQWhatsThis::add( m_pUnderlineCombo, whatsThis); - connect(m_pUnderlineCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); + connect(m_pUnderlineCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); @@ -172,7 +172,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * "<li><b>Show only once</b>: Show all animations completely but do not repeat them.</li></ul>"); TQWhatsThis::add( label, whatsThis); TQWhatsThis::add( m_pAnimationsCombo, whatsThis); - connect(m_pAnimationsCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); + connect(m_pAnimationsCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); label = new TQLabel( i18n("Sm&ooth scrolling"), this); m_pSmoothScrollingCombo = new TQComboBox( false, this ); @@ -190,7 +190,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(TDEConfig *config, TQString group, TQWidget * "</ul>"); TQWhatsThis::add( label, whatsThis); TQWhatsThis::add( m_pSmoothScrollingCombo, whatsThis); - connect(m_pSmoothScrollingCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); + connect(m_pSmoothScrollingCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); lay->setRowStretch(row, 1); diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 6a702559e..2a0c15069 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -62,15 +62,15 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group, TQVGroupBox* globalGB = new TQVGroupBox( i18n( "Global Settings" ), this ); toplevel->addWidget( globalGB ); enableJavaGloballyCB = new TQCheckBox( i18n( "Enable Ja&va globally" ), globalGB ); - connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( enableJavaGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( toggleJavaControls() ) ); + connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( enableJavaGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( toggleJavaControls() ) ); /*************************************************************************** ***************** Domain Specific Settings ******************************** **************************************************************************/ domainSpecific = new JavaDomainListView(m_pConfig,m_groupname,this,this); - connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged())); + connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged())); toplevel->addWidget( domainSpecific, 2 ); /*************************************************************************** @@ -84,37 +84,37 @@ KJavaOptions::KJavaOptions( TDEConfig* config, TQString group, javaSecurityManagerCB = new TQCheckBox( i18n("&Use security manager" ), checkboxes ); grid->addWidget( javaSecurityManagerCB, 0, 0 ); - connect( javaSecurityManagerCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); + connect( javaSecurityManagerCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) ); useKioCB = new TQCheckBox( i18n("Use &TDEIO"), checkboxes ); grid->addWidget( useKioCB, 0, 1 ); - connect( useKioCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); + connect( useKioCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) ); enableShutdownCB = new TQCheckBox( i18n("Shu&tdown applet server when inactive"), checkboxes ); grid->addWidget( enableShutdownCB, 1, 0 ); - connect( enableShutdownCB, TQT_SIGNAL(toggled( bool )), this, TQT_SLOT(slotChanged()) ); - connect( enableShutdownCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleJavaControls()) ); + connect( enableShutdownCB, TQ_SIGNAL(toggled( bool )), this, TQ_SLOT(slotChanged()) ); + connect( enableShutdownCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleJavaControls()) ); TQHBox* secondsHB = new TQHBox( javartGB ); serverTimeoutSB = new KIntNumInput( secondsHB ); serverTimeoutSB->setRange( 0, 1000, 5 ); serverTimeoutSB->setLabel( i18n("App&let server timeout:"), AlignLeft ); serverTimeoutSB->setSuffix(i18n(" sec")); - connect(serverTimeoutSB, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged())); + connect(serverTimeoutSB, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged())); TQHBox* pathHB = new TQHBox( javartGB ); pathHB->setSpacing( 10 ); TQLabel* pathLA = new TQLabel( i18n( "&Path to Java executable, or 'java':" ), pathHB ); pathED = new KURLRequester( pathHB ); - connect( pathED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) ); + connect( pathED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) ); pathLA->setBuddy( pathED ); TQHBox* addArgHB = new TQHBox( javartGB ); addArgHB->setSpacing( 10 ); TQLabel* addArgLA = new TQLabel( i18n( "Additional Java a&rguments:" ), addArgHB ); addArgED = new TQLineEdit( addArgHB ); - connect( addArgED, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotChanged()) ); + connect( addArgED, TQ_SIGNAL(textChanged( const TQString& )), this, TQ_SLOT(slotChanged()) ); addArgLA->setBuddy( addArgED ); /*************************************************************************** diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp index ebbf7c4aa..33fc33a7a 100644 --- a/kcontrol/konqhtml/jsopts.cpp +++ b/kcontrol/konqhtml/jsopts.cpp @@ -52,21 +52,21 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid TQWhatsThis::add( enableJavaScriptGloballyCB, i18n("Enables the execution of scripts written in ECMA-Script " "(also known as JavaScript) that can be contained in HTML pages. " "Note that, as with any browser, enabling scripting languages can be a security problem.") ); - connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); - connect( enableJavaScriptGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeJSEnabled() ) ); + connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) ); + connect( enableJavaScriptGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeJSEnabled() ) ); reportErrorsCB = new TQCheckBox( i18n( "Report &errors" ), globalGB ); TQWhatsThis::add( reportErrorsCB, i18n("Enables the reporting of errors that occur when JavaScript " "code is executed.") ); - connect( reportErrorsCB, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); + connect( reportErrorsCB, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) ); jsDebugWindow = new TQCheckBox( i18n( "Enable debu&gger" ), globalGB ); TQWhatsThis::add( jsDebugWindow, i18n( "Enables builtin JavaScript debugger." ) ); - connect( jsDebugWindow, TQT_SIGNAL( clicked() ), TQT_SLOT( changed() ) ); + connect( jsDebugWindow, TQ_SIGNAL( clicked() ), TQ_SLOT( changed() ) ); // the domain-specific listview domainSpecific = new JSDomainListView(m_pConfig,m_groupname,this,this); - connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(changed())); + connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(changed())); toplevel->addWidget( domainSpecific, 2 ); TQWhatsThis::add( domainSpecific, i18n("Here you can set specific JavaScript policies for any particular " @@ -97,7 +97,7 @@ KJavaScriptOptions::KJavaScriptOptions( TDEConfig* config, TQString group, TQWid js_policies_frame = new JSPoliciesFrame(&js_global_policies, i18n("Global JavaScript Policies"),this); toplevel->addWidget(js_policies_frame); - connect(js_policies_frame, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(js_policies_frame, TQ_SIGNAL(changed()), TQ_SLOT(changed())); // Finally do the loading load(); diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp index 07a0cbea6..c24cd356e 100644 --- a/kcontrol/konqhtml/jspolicies.cpp +++ b/kcontrol/konqhtml/jspolicies.cpp @@ -197,7 +197,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "window.open()</i> for proper operation. Use " "this feature carefully."); TQWhatsThis::add(label, wtstr); - connect(js_popup, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowOpenPolicy(int))); + connect(js_popup, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowOpenPolicy(int))); // === window.resizeBy/resizeTo ================================ colIdx = 0; @@ -235,7 +235,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_resize, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowResizePolicy(int))); + connect(js_resize, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowResizePolicy(int))); // === window.moveBy/moveTo ================================ colIdx = 0; @@ -273,7 +273,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_move, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowMovePolicy(int))); + connect(js_move, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowMovePolicy(int))); // === window.focus ================================ colIdx = 0; @@ -314,7 +314,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_focus, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowFocusPolicy(int))); + connect(js_focus, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowFocusPolicy(int))); // === window.status ================================ colIdx = 0; @@ -354,7 +354,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title, "This option specifies the treatment of such " "attempts."); TQWhatsThis::add(label, wtstr); - connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int))); + connect(js_statusbar, TQ_SIGNAL(clicked(int)), TQ_SLOT(setWindowStatusPolicy(int))); } JSPoliciesFrame::~JSPoliciesFrame() { diff --git a/kcontrol/konqhtml/khttpoptdlg.cpp b/kcontrol/konqhtml/khttpoptdlg.cpp index 7272e6e93..68bbcab92 100644 --- a/kcontrol/konqhtml/khttpoptdlg.cpp +++ b/kcontrol/konqhtml/khttpoptdlg.cpp @@ -17,16 +17,16 @@ KHTTPOptions::KHTTPOptions(TDEConfig *config, TQString group, TQWidget *parent, le_languages = new TQLineEdit(this); lay->addWidget( le_languages ); - connect(le_languages, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChanged())); + connect(le_languages, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChanged())); lay->addSpacing(10); lay->addWidget( new TQLabel(i18n("Accept character sets:"), this) ); le_charsets = new TQLineEdit(this); lay->addWidget( le_charsets ); - connect(le_charsets, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChanged())); + connect(le_charsets, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChanged())); lay->addStretch(10); diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index a752a3a88..0794b390b 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/kcontrol/konqhtml/main.cpp @@ -111,11 +111,11 @@ KJSParts::KJSParts(TDEConfig *config, TQWidget *parent, const char *name) // ### the groupname is duplicated in KJSParts::save java = new KJavaOptions( config, "Java/JavaScript Settings", this, name ); tab->addTab( java, i18n( "&Java" ) ); - connect( java, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( java, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); javascript = new KJavaScriptOptions( config, "Java/JavaScript Settings", this, name ); tab->addTab( javascript, i18n( "Java&Script" ) ); - connect( javascript, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( javascript, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); } KJSParts::~KJSParts() diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index 547182f2d..b36f7f1a7 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/kcontrol/konqhtml/pluginopts.cpp @@ -63,12 +63,12 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par enableUserDemand = new TQCheckBox( i18n( "&Load plugins on demand only" ), globalGB ); priorityLabel = new TQLabel(i18n("CPU priority for plugins: %1").arg(TQString()), globalGB); priority = new TQSlider(5, 100, 5, 100, TQt::Horizontal, globalGB); - connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( enablePluginsGloballyCB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTogglePluginsEnabled() ) ); - connect( enableHTTPOnly, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( enableUserDemand, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( updatePLabel(int) ) ); + connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( enablePluginsGloballyCB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTogglePluginsEnabled() ) ); + connect( enableHTTPOnly, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( enableUserDemand, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( updatePLabel(int) ) ); TQFrame *hrule = new TQFrame(globalGB); hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); @@ -80,7 +80,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"), globalGB); domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed); - connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg())); + connect(domainSpecPB,TQ_SIGNAL(clicked()),TQ_SLOT(slotShowDomainDlg())); domainSpecificDlg = new KDialogBase(KDialogBase::Swallow, i18n("Domain-Specific Policies"),KDialogBase::Close, @@ -88,7 +88,7 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par domainSpecific = new PluginDomainListView(config,group,this,domainSpecificDlg); domainSpecific->setMinimumSize(320,200); - connect(domainSpecific,TQT_SIGNAL(changed(bool)),TQT_SLOT(slotChanged())); + connect(domainSpecific,TQ_SIGNAL(changed(bool)),TQ_SLOT(slotChanged())); domainSpecificDlg->setMainWidget(domainSpecific); @@ -134,8 +134,8 @@ KPluginOptions::KPluginOptions( TDEConfig* config, TQString group, TQWidget *par m_widget->dirEdit->setMode(KFile::ExistingOnly | KFile::LocalOnly | KFile::Directory); // setup widgets - connect( m_widget->scanAtStartup, TQT_SIGNAL(clicked()), TQT_SLOT(change()) ); - connect( m_widget->scanButton, TQT_SIGNAL(clicked()), TQT_SLOT(scan()) ); + connect( m_widget->scanAtStartup, TQ_SIGNAL(clicked()), TQ_SLOT(change()) ); + connect( m_widget->scanButton, TQ_SIGNAL(clicked()), TQ_SLOT(scan()) ); m_changed = false; @@ -312,11 +312,11 @@ void KPluginOptions::scan() // start nspluginscan *m_nspluginscan << scanExe << "--verbose"; kdDebug() << "Running nspluginscan" << endl; - connect(m_nspluginscan, TQT_SIGNAL(readReady(KProcIO*)), - this, TQT_SLOT(progress(KProcIO*))); - connect(m_nspluginscan, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(scanDone())); - connect(m_progress, TQT_SIGNAL(cancelled()), this, TQT_SLOT(scanDone())); + connect(m_nspluginscan, TQ_SIGNAL(readReady(KProcIO*)), + this, TQ_SLOT(progress(KProcIO*))); + connect(m_nspluginscan, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(scanDone())); + connect(m_progress, TQ_SIGNAL(cancelled()), this, TQ_SLOT(scanDone())); m_nspluginscan->start(); } @@ -345,22 +345,22 @@ void KPluginOptions::scanDone() void KPluginOptions::dirInit() { m_widget->dirEdit->setCaption(i18n("Select Plugin Scan Folder")); - connect( m_widget->dirNew, TQT_SIGNAL(clicked()), TQT_SLOT(dirNew())); - connect( m_widget->dirRemove, TQT_SIGNAL(clicked()), TQT_SLOT(dirRemove())); - connect( m_widget->dirUp, TQT_SIGNAL(clicked()), TQT_SLOT(dirUp())); - connect( m_widget->dirDown, TQT_SIGNAL(clicked()), TQT_SLOT(dirDown()) ); - connect( m_widget->useArtsdsp, TQT_SIGNAL(clicked()),TQT_SLOT(change())); + connect( m_widget->dirNew, TQ_SIGNAL(clicked()), TQ_SLOT(dirNew())); + connect( m_widget->dirRemove, TQ_SIGNAL(clicked()), TQ_SLOT(dirRemove())); + connect( m_widget->dirUp, TQ_SIGNAL(clicked()), TQ_SLOT(dirUp())); + connect( m_widget->dirDown, TQ_SIGNAL(clicked()), TQ_SLOT(dirDown()) ); + connect( m_widget->useArtsdsp, TQ_SIGNAL(clicked()),TQ_SLOT(change())); connect( m_widget->dirEdit, - TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(dirEdited(const TQString &)) ); + TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(dirEdited(const TQString &)) ); connect( m_widget->dirList, - TQT_SIGNAL(executed(TQListBoxItem*)), - TQT_SLOT(dirSelect(TQListBoxItem*)) ); + TQ_SIGNAL(executed(TQListBoxItem*)), + TQ_SLOT(dirSelect(TQListBoxItem*)) ); connect( m_widget->dirList, - TQT_SIGNAL(selectionChanged(TQListBoxItem*)), - TQT_SLOT(dirSelect(TQListBoxItem*)) ); + TQ_SIGNAL(selectionChanged(TQListBoxItem*)), + TQ_SLOT(dirSelect(TQListBoxItem*)) ); } @@ -605,7 +605,7 @@ PluginDomainDialog::PluginDomainDialog(TQWidget *parent) : hl->addStretch(10); TQPushButton *closePB = new KPushButton(KStdGuiItem::close(),this); - connect(closePB,TQT_SIGNAL(clicked()),TQT_SLOT(slotClose())); + connect(closePB,TQ_SIGNAL(clicked()),TQ_SLOT(slotClose())); hl->addWidget(closePB); thisLayout->addLayout(hl); } diff --git a/kcontrol/konqhtml/policydlg.cpp b/kcontrol/konqhtml/policydlg.cpp index 9409023c1..03720f140 100644 --- a/kcontrol/konqhtml/policydlg.cpp +++ b/kcontrol/konqhtml/policydlg.cpp @@ -34,8 +34,8 @@ PolicyDialog::PolicyDialog( Policies *policies, TQWidget *parent, const char *na le_domain = new TQLineEdit(main); l->setBuddy( le_domain ); grid->addWidget(le_domain, 0, 1); - connect( le_domain,TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotTextChanged( const TQString &))); + connect( le_domain,TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotTextChanged( const TQString &))); TQWhatsThis::add(le_domain, i18n("Enter the name of a host (like www.trinitydesktop.org) " "or a domain, starting with a dot (like .trinitydesktop.org or .org)") ); diff --git a/kcontrol/konqhtml/userInterConfig.cpp b/kcontrol/konqhtml/userInterConfig.cpp index 4e18c6d38..d63512590 100644 --- a/kcontrol/konqhtml/userInterConfig.cpp +++ b/kcontrol/konqhtml/userInterConfig.cpp @@ -36,11 +36,11 @@ userInterConfig::userInterConfig(TDEConfig *config, TQString groupName, layout->addWidget(m_widget); layout->addStretch(); - connect(m_widget, TQT_SIGNAL(changed()), - this, TQT_SLOT(changed())); + connect(m_widget, TQ_SIGNAL(changed()), + this, TQ_SLOT(changed())); load(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } void userInterConfig::notChanged() @@ -68,5 +68,5 @@ void userInterConfig::defaults() // TDEConfigDialogManager may queue an changed(false) signal, // so we make sure, that the module is labeled as changed, // while we manage some of the widgets ourselves - TQTimer::singleShot(0, this, TQT_SLOT(changed())); + TQTimer::singleShot(0, this, TQ_SLOT(changed())); } diff --git a/kcontrol/konqhtml/userInterOpts_impl.cpp b/kcontrol/konqhtml/userInterOpts_impl.cpp index efe3c7343..26eac0f60 100644 --- a/kcontrol/konqhtml/userInterOpts_impl.cpp +++ b/kcontrol/konqhtml/userInterOpts_impl.cpp @@ -39,17 +39,17 @@ userInterOpts::userInterOpts(TDEConfig *config, TQString groupName, : userInterOptsBase(parent, name), m_pConfig(config), m_groupName(groupName) { // connections - connect(m_pShowMMBInTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pDynamicTabbarHide, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pDynamicTabbarCycle, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pNewTabsInBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pOpenAfterCurrentPage, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pTabConfirm, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pPermanentCloseButton, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pHoverCloseButton, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pKonquerorTabforExternalURL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pPopupsWithinTabs, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_pTabCloseActivatePrevious, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(m_pShowMMBInTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pDynamicTabbarHide, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pDynamicTabbarCycle, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pNewTabsInBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pOpenAfterCurrentPage, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pTabConfirm, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pPermanentCloseButton, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pHoverCloseButton, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pKonquerorTabforExternalURL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pPopupsWithinTabs, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_pTabCloseActivatePrevious, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); } void userInterOpts::load() diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 7dfb77dae..87487fbe0 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -60,28 +60,28 @@ KCMKonsole::KCMKonsole(TQWidget * parent, const char *name, const TQStringList&) ab->addAuthor("Andrea Rizzi",0, "rizzi@kde.org"); setAboutData( ab ); - connect(dialog->terminalSizeHintCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->warnCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->ctrldragCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->cutToBeginningOfLineCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->allowResizeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->bidiCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->xonXoffCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->blinkingCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->frameCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->line_spacingSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); - connect(dialog->matchTabWinTitleCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->tabsCycleWheelCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->menuAcceleratorsCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->metaAsAltModeCB,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->realTransparency,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() )); - connect(dialog->silence_secondsSB,TQT_SIGNAL(valueChanged(int)), TQT_SLOT( changed() )); - connect(dialog->word_connectorLE,TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT( changed() )); - connect(dialog->SchemaEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() )); - connect(dialog->SessionEditor1, TQT_SIGNAL(changed()), TQT_SLOT( changed() )); - connect(dialog->SchemaEditor1, TQT_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)), - dialog->SessionEditor1, TQT_SLOT(schemaListChanged(const TQStringList &,const TQStringList &))); - connect(dialog->SessionEditor1, TQT_SIGNAL(getList()), dialog->SchemaEditor1, TQT_SLOT(getList())); + connect(dialog->terminalSizeHintCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->warnCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->ctrldragCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->cutToBeginningOfLineCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->allowResizeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->bidiCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->xonXoffCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->blinkingCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->frameCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->line_spacingSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() )); + connect(dialog->matchTabWinTitleCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->tabsCycleWheelCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->menuAcceleratorsCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->metaAsAltModeCB,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->realTransparency,TQ_SIGNAL(toggled(bool)), TQ_SLOT( changed() )); + connect(dialog->silence_secondsSB,TQ_SIGNAL(valueChanged(int)), TQ_SLOT( changed() )); + connect(dialog->word_connectorLE,TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT( changed() )); + connect(dialog->SchemaEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() )); + connect(dialog->SessionEditor1, TQ_SIGNAL(changed()), TQ_SLOT( changed() )); + connect(dialog->SchemaEditor1, TQ_SIGNAL(schemaListChanged(const TQStringList &,const TQStringList &)), + dialog->SessionEditor1, TQ_SLOT(schemaListChanged(const TQStringList &,const TQStringList &))); + connect(dialog->SessionEditor1, TQ_SIGNAL(getList()), dialog->SchemaEditor1, TQ_SLOT(getList())); } void KCMKonsole::load() diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index dfa4dbefe..801880b8b 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -75,7 +75,7 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name) defaultSchema = ""; spix = new TDESharedPixmap; - connect(spix, TQT_SIGNAL(done(bool)), TQT_SLOT(previewLoaded(bool))); + connect(spix, TQ_SIGNAL(done(bool)), TQ_SLOT(previewLoaded(bool))); DCOPClient *client = kapp->dcopClient(); if (!client->isAttached()) @@ -94,29 +94,29 @@ SchemaEditor::SchemaEditor(TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("konsole"); // For schema translations - connect(imageBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(imageSelect())); - connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent())); - connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent())); - connect(colorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotColorChanged(int))); - connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTypeChanged(int))); - connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); - connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(updatePreview())); - connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updatePreview())); - connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updatePreview())); - connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updatePreview())); - - connect(titleLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified())); - connect(shadeColor, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified())); - connect(shadeSlide, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(schemaModified())); - connect(transparencyCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); - connect(modeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(schemaModified())); - connect(backgndLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(schemaModified())); - connect(transparentCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); - connect(boldCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(schemaModified())); - connect(colorButton, TQT_SIGNAL(changed(const TQColor&)), this, TQT_SLOT(schemaModified())); - connect(backgndLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(schemaModified())); - - connect(defaultSchemaCB, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(changed())); + connect(imageBrowse, TQ_SIGNAL(clicked()), this, TQ_SLOT(imageSelect())); + connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent())); + connect(colorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotColorChanged(int))); + connect(typeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTypeChanged(int))); + connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); + connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(updatePreview())); + connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updatePreview())); + connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updatePreview())); + connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(updatePreview())); + + connect(titleLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified())); + connect(shadeColor, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified())); + connect(shadeSlide, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(schemaModified())); + connect(transparencyCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified())); + connect(modeCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(schemaModified())); + connect(backgndLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(schemaModified())); + connect(transparentCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified())); + connect(boldCheck, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(schemaModified())); + connect(colorButton, TQ_SIGNAL(changed(const TQColor&)), this, TQ_SLOT(schemaModified())); + connect(backgndLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(schemaModified())); + + connect(defaultSchemaCB, TQ_SIGNAL(toggled(bool)), this, TQ_SIGNAL(changed())); removeButton->setEnabled( schemaList->currentItem() ); } @@ -230,7 +230,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile) { TQStringList list = TDEGlobal::dirs()->findAllResources("data", "konsole/*.schema"); TQStringList::ConstIterator it; - disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); schemaList->clear(); TQListBoxItem* currentItem = 0; @@ -253,7 +253,7 @@ void SchemaEditor::loadAllSchema(TQString currentFile) schemaList->sort(); schemaList->setCurrentItem(0); // select the first added item correctly too schemaList->setCurrentItem(currentItem); - connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); schemaListChanged(); } @@ -528,11 +528,11 @@ void SchemaEditor::readSchema(int num) } if(schMod) { - disconnect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + disconnect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); schemaList->setCurrentItem(oldSchema); querySave(); schemaList->setCurrentItem(num); - connect(schemaList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSchema(int))); + connect(schemaList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSchema(int))); schMod=false; } diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index 290541d12..e6ed3ee4c 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -60,20 +60,20 @@ SessionEditor::SessionEditor(TQWidget * parent, const char *name) TDEGlobal::iconLoader()->addAppDir( "konsole" ); directoryLine->setMode(KFile::Directory); - connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); - connect(saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveCurrent())); - connect(removeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeCurrent())); + connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int))); + connect(saveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeCurrent())); - connect(nameLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); - connect(directoryLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); - connect(executeLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); - connect(termLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(sessionModified())); + connect(nameLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified())); + connect(directoryLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified())); + connect(executeLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified())); + connect(termLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(sessionModified())); - connect(previewIcon, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(sessionModified())); + connect(previewIcon, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(sessionModified())); - connect(fontCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); - connect(keytabCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); - connect(schemaCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(sessionModified())); + connect(fontCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified())); + connect(keytabCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified())); + connect(schemaCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(sessionModified())); } SessionEditor::~SessionEditor() @@ -190,12 +190,12 @@ void SessionEditor::readSession(int num) KSimpleConfig* co; if(sesMod) { - disconnect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); + disconnect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int))); sessionList->setCurrentItem(oldSession); querySave(); sessionList->setCurrentItem(num); - connect(sessionList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(readSession(int))); + connect(sessionList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(readSession(int))); sesMod=false; } if( sessionList->item(num) ) diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp index 76af5490a..220408ab9 100644 --- a/kcontrol/kthememanager/knewthemedlg.cpp +++ b/kcontrol/kthememanager/knewthemedlg.cpp @@ -28,7 +28,7 @@ KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name ) { m_base = new NewThemeWidget( this, "new_theme_base" ); setMainWidget( m_base ); - connect( m_base->leName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotThemeNameChanged( const TQString & ) ) ); + connect( m_base->leName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotThemeNameChanged( const TQString & ) ) ); slotThemeNameChanged( m_base->leName->text() ); } diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 6a4132745..4d3791511 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -66,26 +66,26 @@ kthememanager::kthememanager( TQWidget *parent, const char *name ) dlg->lvThemes->setColumnWidthMode( 0, TQListView::Maximum ); - connect( ( TQObject * )dlg->btnInstall, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotInstallTheme() ) ); + connect( ( TQObject * )dlg->btnInstall, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotInstallTheme() ) ); - connect( ( TQObject * )dlg->btnRemove, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveTheme() ) ); + connect( ( TQObject * )dlg->btnRemove, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveTheme() ) ); - connect( ( TQObject * )dlg->btnCreate, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotCreateTheme() ) ); + connect( ( TQObject * )dlg->btnCreate, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotCreateTheme() ) ); - connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) ); + connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) ); - connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotThemeChanged( TQListViewItem * ) ) ); + connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotThemeChanged( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( filesDropped( const KURL::List& ) ), - this, TQT_SLOT( updateButton() ) ); + connect( this, TQ_SIGNAL( filesDropped( const KURL::List& ) ), + this, TQ_SLOT( updateButton() ) ); - connect( ( TQObject * )dlg->lvThemes, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( updateButton() ) ); + connect( ( TQObject * )dlg->lvThemes, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( updateButton() ) ); m_origTheme = new KTheme( this, true ); // stores the defaults to get back to m_origTheme->setName( ORIGINAL_THEME ); diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index 33f78e18e..06c41eaba 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/kcontrol/launch/kcmlaunch.cpp @@ -71,9 +71,9 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL cb_busyCursor->insertItem( i18n( "Blinking Cursor" ), 2 ); cb_busyCursor->insertItem( i18n( "Bouncing Cursor" ), 3 ); GroupBox1Layout->addWidget( cb_busyCursor, 0, 0 ); - connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), - TQT_SLOT ( slotBusyCursor(int))); - connect( cb_busyCursor, TQT_SIGNAL( activated(int) ), TQT_SLOT( checkChanged() ) ); + connect( cb_busyCursor, TQ_SIGNAL( activated(int) ), + TQ_SLOT ( slotBusyCursor(int))); + connect( cb_busyCursor, TQ_SIGNAL( activated(int) ), TQ_SLOT( checkChanged() ) ); lbl_cursorTimeout = new TQLabel( GroupBox1, "TextLabel1" ); lbl_cursorTimeout->setText( i18n( "&Startup indication timeout:" ) ); @@ -83,8 +83,8 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL sb_cursorTimeout->setSuffix( i18n(" sec") ); GroupBox1Layout->addWidget( sb_cursorTimeout, 2, 1 ); lbl_cursorTimeout->setBuddy( sb_cursorTimeout ); - connect( sb_cursorTimeout, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( checkChanged() ) ); + connect( sb_cursorTimeout, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( checkChanged() ) ); TQGroupBox* GroupBox2 = new TQGroupBox( this, "GroupBox2" ); GroupBox2->setTitle( i18n( "Taskbar &Notification" ) ); @@ -108,9 +108,9 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL cb_taskbarButton = new TQCheckBox( GroupBox2, "cb_taskbarButton" ); cb_taskbarButton->setText( i18n( "Enable &taskbar notification" ) ); GroupBox2Layout->addMultiCellWidget( cb_taskbarButton, 0, 0, 0, 1 ); - connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotTaskbarButton(bool))); - connect( cb_taskbarButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( checkChanged())); + connect( cb_taskbarButton, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotTaskbarButton(bool))); + connect( cb_taskbarButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( checkChanged())); lbl_taskbarTimeout = new TQLabel( GroupBox2, "TextLabel2" ); lbl_taskbarTimeout->setText( i18n( "Start&up indication timeout:" ) ); @@ -120,8 +120,8 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL sb_taskbarTimeout->setSuffix( i18n(" sec") ); GroupBox2Layout->addWidget( sb_taskbarTimeout, 1, 1 ); lbl_taskbarTimeout->setBuddy( sb_taskbarTimeout ); - connect( sb_taskbarTimeout, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( checkChanged() ) ); + connect( sb_taskbarTimeout, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( checkChanged() ) ); Form1Layout->addStretch(); diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp index 3d1736676..be2b1d16f 100644 --- a/kcontrol/locale/kcmlocale.cpp +++ b/kcontrol/locale/kcmlocale.cpp @@ -55,34 +55,34 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale, m_labCountry = new TQLabel(this, I18N_NOOP("Country or region:")); m_comboCountry = new KLanguageButton( this ); m_labCountry->setBuddy(m_comboCountry); - connect( m_comboCountry, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(changedCountry(const TQString &)) ); + connect( m_comboCountry, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(changedCountry(const TQString &)) ); m_labLang = new TQLabel(this, I18N_NOOP("Languages:")); m_labLang->setAlignment( AlignTop ); m_languages = new TQListBox(this); - connect(m_languages, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotCheckButtons())); + connect(m_languages, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotCheckButtons())); TQWidget * vb = new TQWidget(this); TQVBoxLayout * boxlay = new TQVBoxLayout(vb, 0, KDialog::spacingHint()); m_addLanguage = new KLanguageButton(TQString::null, vb, I18N_NOOP("Add Language")); boxlay->add(m_addLanguage); - connect(m_addLanguage, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(slotAddLanguage(const TQString &))); + connect(m_addLanguage, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(slotAddLanguage(const TQString &))); m_removeLanguage = new TQPushButton(vb, I18N_NOOP("Remove Language")); m_upButton = new TQPushButton(vb, I18N_NOOP("Move Up")); m_downButton = new TQPushButton(vb, I18N_NOOP("Move Down")); boxlay->add(m_removeLanguage); boxlay->add(m_upButton); boxlay->add(m_downButton); - connect(m_removeLanguage, TQT_SIGNAL(clicked()), - TQT_SLOT(slotRemoveLanguage())); - connect(m_upButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotLanguageUp())); - connect(m_downButton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotLanguageDown())); + connect(m_removeLanguage, TQ_SIGNAL(clicked()), + TQ_SLOT(slotRemoveLanguage())); + connect(m_upButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotLanguageUp())); + connect(m_downButton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotLanguageDown())); boxlay->insertStretch(-1); // #### HPB: This should be implemented for KDE 3 @@ -113,9 +113,9 @@ TDELocaleConfig::TDELocaleConfig(TDELocale *locale, languageSelectorLayout->addStretch(); lay->addMultiCellLayout(languageSelectorLayout, 3, 3, 0, 2); - connect( installLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallLanguage()) ); - connect( uninstallLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallLanguage()) ); - connect( selectLanguage, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectLanguage()) ); + connect( installLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallLanguage()) ); + connect( uninstallLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallLanguage()) ); + connect( selectLanguage, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectLanguage()) ); #endif } @@ -126,8 +126,8 @@ void TDELocaleConfig::slotInstallLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode install"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } @@ -138,8 +138,8 @@ void TDELocaleConfig::slotUninstallLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode uninstall"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } @@ -150,8 +150,8 @@ void TDELocaleConfig::slotSelectLanguage() *proc << "tdesu"; *proc << "qt-language-selector --mode select"; - TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotLanguageSelectorExited(TDEProcess *))); + TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotLanguageSelectorExited(TDEProcess *))); setEnabled(false); proc->start(); } diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index 4e09726b4..aac454061 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -78,7 +78,7 @@ TDELocaleSample::TDELocaleSample(TDELocale *locale, lay->setColStretch(1, 3); TQTimer *timer = new TQTimer(this, "clock_timer"); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateTime())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateTime())); timer->start(1000); } diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp index 6d37cb15f..85bb44195 100644 --- a/kcontrol/locale/localemon.cpp +++ b/kcontrol/locale/localemon.cpp @@ -55,22 +55,22 @@ TDELocaleConfigMoney::TDELocaleConfigMoney(TDELocale *locale, lay->addWidget(m_labMonCurSym, 0, 0); m_edMonCurSym = new TQLineEdit(this); lay->addWidget(m_edMonCurSym, 0, 1); - connect( m_edMonCurSym, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotMonCurSymChanged(const TQString &) ) ); + connect( m_edMonCurSym, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotMonCurSymChanged(const TQString &) ) ); m_labMonDecSym = new TQLabel(this, I18N_NOOP("Decimal symbol:")); lay->addWidget(m_labMonDecSym, 1, 0); m_edMonDecSym = new TQLineEdit(this); lay->addWidget(m_edMonDecSym, 1, 1); - connect( m_edMonDecSym, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotMonDecSymChanged(const TQString &) ) ); + connect( m_edMonDecSym, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotMonDecSymChanged(const TQString &) ) ); m_labMonThoSep = new TQLabel(this, I18N_NOOP("Thousands separator:")); lay->addWidget(m_labMonThoSep, 2, 0); m_edMonThoSep = new TQLineEdit(this); lay->addWidget(m_edMonThoSep, 2, 1); - connect( m_edMonThoSep, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotMonThoSepChanged(const TQString &) ) ); + connect( m_edMonThoSep, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotMonThoSepChanged(const TQString &) ) ); m_labMonFraDig = new TQLabel(this, I18N_NOOP("Fract digits:")); lay->addWidget(m_labMonFraDig, 3, 0); @@ -78,34 +78,34 @@ TDELocaleConfigMoney::TDELocaleConfigMoney(TDELocale *locale, m_inMonFraDig->setRange(0, 10, 1, false); lay->addWidget(m_inMonFraDig, 3, 1); - connect( m_inMonFraDig, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotMonFraDigChanged(int) ) ); + connect( m_inMonFraDig, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotMonFraDigChanged(int) ) ); TQWidget *vbox = new TQVBox(this); lay->addMultiCellWidget(vbox, 4, 4, 0, 1); TQVGroupBox *vgrp; vgrp = new TQVGroupBox( vbox, I18N_NOOP("Positive") ); m_chMonPosPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); - connect( m_chMonPosPreCurSym, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotMonPosPreCurSymChanged() ) ); + connect( m_chMonPosPreCurSym, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotMonPosPreCurSymChanged() ) ); TQHBox *hbox; hbox = new TQHBox( vgrp ); m_labMonPosMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:")); m_cmbMonPosMonSignPos = new TQComboBox(hbox, "signpos"); - connect( m_cmbMonPosMonSignPos, TQT_SIGNAL( activated(int) ), - TQT_SLOT( slotMonPosMonSignPosChanged(int) ) ); + connect( m_cmbMonPosMonSignPos, TQ_SIGNAL( activated(int) ), + TQ_SLOT( slotMonPosMonSignPosChanged(int) ) ); vgrp = new TQVGroupBox( vbox, I18N_NOOP("Negative") ); m_chMonNegPreCurSym = new TQCheckBox(vgrp, I18N_NOOP("Prefix currency symbol")); - connect( m_chMonNegPreCurSym, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotMonNegPreCurSymChanged() ) ); + connect( m_chMonNegPreCurSym, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotMonNegPreCurSymChanged() ) ); hbox = new TQHBox( vgrp ); m_labMonNegMonSignPos = new TQLabel(hbox, I18N_NOOP("Sign position:")); m_cmbMonNegMonSignPos = new TQComboBox(hbox, "signpos"); - connect( m_cmbMonNegMonSignPos, TQT_SIGNAL( activated(int) ), - TQT_SLOT( slotMonNegMonSignPosChanged(int) ) ); + connect( m_cmbMonNegMonSignPos, TQ_SIGNAL( activated(int) ), + TQ_SLOT( slotMonNegMonSignPosChanged(int) ) ); // insert some items int i = 5; diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp index ca523d2e9..dcec347b1 100644 --- a/kcontrol/locale/localenum.cpp +++ b/kcontrol/locale/localenum.cpp @@ -47,32 +47,32 @@ TDELocaleConfigNumber::TDELocaleConfigNumber(TDELocale *locale, m_labDecSym = new TQLabel(this, I18N_NOOP("&Decimal symbol:")); m_edDecSym = new TQLineEdit(this); - connect( m_edDecSym, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotDecSymChanged(const TQString &) ) ); + connect( m_edDecSym, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotDecSymChanged(const TQString &) ) ); m_labDecSym->setBuddy(m_edDecSym); m_labThoSep = new TQLabel(this, I18N_NOOP("Tho&usands separator:")); m_edThoSep = new TQLineEdit(this); - connect( m_edThoSep, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotThoSepChanged(const TQString &) ) ); + connect( m_edThoSep, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotThoSepChanged(const TQString &) ) ); m_labThoSep->setBuddy(m_edThoSep); m_labMonPosSign = new TQLabel(this, I18N_NOOP("Positive si&gn:")); m_edMonPosSign = new TQLineEdit(this); - connect( m_edMonPosSign, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotMonPosSignChanged(const TQString &) ) ); + connect( m_edMonPosSign, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotMonPosSignChanged(const TQString &) ) ); m_labMonPosSign->setBuddy(m_edMonPosSign); m_labMonNegSign = new TQLabel(this, I18N_NOOP("&Negative sign:")); m_edMonNegSign = new TQLineEdit(this); - connect( m_edMonNegSign, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotMonNegSignChanged(const TQString &) ) ); + connect( m_edMonNegSign, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotMonNegSignChanged(const TQString &) ) ); m_labMonNegSign->setBuddy(m_edMonNegSign); lay->setColStretch(1, 1); - connect(this, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotLocaleChanged())); } TDELocaleConfigNumber::~TDELocaleConfigNumber() diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 6cb8e9a8d..e2fdd910e 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -49,15 +49,15 @@ TDELocaleConfigOther::TDELocaleConfigOther(TDELocale *locale, lay->addWidget(m_labPageSize, 0, 0); m_combPageSize = new TQComboBox(this); lay->addWidget(m_combPageSize, 0, 1); - connect( m_combPageSize, TQT_SIGNAL( activated(int) ), - TQT_SLOT( slotPageSizeChanged(int) ) ); + connect( m_combPageSize, TQ_SIGNAL( activated(int) ), + TQ_SLOT( slotPageSizeChanged(int) ) ); m_labMeasureSystem = new TQLabel(this, I18N_NOOP("Measure system:")); lay->addWidget(m_labMeasureSystem, 1, 0); m_combMeasureSystem = new TQComboBox(this); lay->addWidget(m_combMeasureSystem, 1, 1); - connect( m_combMeasureSystem, TQT_SIGNAL( activated(int) ), - TQT_SLOT( slotMeasureSystemChanged(int) ) ); + connect( m_combMeasureSystem, TQ_SIGNAL( activated(int) ), + TQ_SLOT( slotMeasureSystemChanged(int) ) ); m_combPageSize->insertItem(TQString::null); m_combPageSize->insertItem(TQString::null); diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp index 1e31f14f7..f9622dde5 100644 --- a/kcontrol/locale/localetime.cpp +++ b/kcontrol/locale/localetime.cpp @@ -202,8 +202,8 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale, m_labCalendarSystem = new TQLabel(this, I18N_NOOP("Calendar system:")); m_comboCalendarSystem = new TQComboBox(false, this); - connect(m_comboCalendarSystem, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotCalendarSystemChanged(int))); + connect(m_comboCalendarSystem, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotCalendarSystemChanged(int))); TQStringList tmpCalendars; tmpCalendars << TQString::null << TQString::null; m_comboCalendarSystem->insertStringList(tmpCalendars); @@ -212,29 +212,29 @@ TDELocaleConfigTime::TDELocaleConfigTime(TDELocale *_locale, m_comboTimeFmt = new TQComboBox(true, this); //m_edTimeFmt = m_comboTimeFmt->lineEdit(); //m_edTimeFmt = new TQLineEdit(this); - connect( m_comboTimeFmt, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotTimeFmtChanged(const TQString &) ) ); + connect( m_comboTimeFmt, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotTimeFmtChanged(const TQString &) ) ); m_labDateFmt = new TQLabel(this, I18N_NOOP("Date format:")); m_comboDateFmt = new TQComboBox(true, this); - connect( m_comboDateFmt, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotDateFmtChanged(const TQString &) ) ); + connect( m_comboDateFmt, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotDateFmtChanged(const TQString &) ) ); m_labDateFmtShort = new TQLabel(this, I18N_NOOP("Short date format:")); m_comboDateFmtShort = new TQComboBox(true, this); - connect( m_comboDateFmtShort, TQT_SIGNAL( textChanged(const TQString &) ), - this, TQT_SLOT( slotDateFmtShortChanged(const TQString &) ) ); + connect( m_comboDateFmtShort, TQ_SIGNAL( textChanged(const TQString &) ), + this, TQ_SLOT( slotDateFmtShortChanged(const TQString &) ) ); m_labWeekStartDay = new TQLabel(this, I18N_NOOP("First day of the week:")); m_comboWeekStartDay = new TQComboBox(false, this); - connect (m_comboWeekStartDay, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotWeekStartDayChanged(int))); + connect (m_comboWeekStartDay, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotWeekStartDayChanged(int))); updateWeekDayNames(); m_chDateMonthNamePossessive = new TQCheckBox(this, I18N_NOOP("Use declined form of month name")); - connect( m_chDateMonthNamePossessive, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDateMonthNamePossChanged() ) ); + connect( m_chDateMonthNamePossessive, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDateMonthNamePossChanged() ) ); lay->setColStretch(1, 1); } diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 339405461..a0562c5fa 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -84,64 +84,64 @@ TDELocaleApplication::TDELocaleApplication(TQWidget *parent, const char* /*name* m_sample = new TDELocaleSample(m_locale, m_gbox); // getting signals from childs - connect(m_localemain, TQT_SIGNAL(localeChanged()), - this, TQT_SIGNAL(localeChanged())); - connect(m_localemain, TQT_SIGNAL(languageChanged()), - this, TQT_SIGNAL(languageChanged())); + connect(m_localemain, TQ_SIGNAL(localeChanged()), + this, TQ_SIGNAL(localeChanged())); + connect(m_localemain, TQ_SIGNAL(languageChanged()), + this, TQ_SIGNAL(languageChanged())); // run the slots on the childs - connect(this, TQT_SIGNAL(localeChanged()), - m_localemain, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_localenum, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_localemon, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_localetime, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_localeother, TQT_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localemain, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localenum, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localemon, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localetime, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_localeother, TQ_SLOT(slotLocaleChanged())); // keep the example up to date // NOTE: this will make the sample be updated 6 times the first time // because combo boxes++ emits the change signal not only when the user changes // it, but also when it's changed by the program. - connect(m_localenum, TQT_SIGNAL(localeChanged()), - m_sample, TQT_SLOT(slotLocaleChanged())); - connect(m_localemon, TQT_SIGNAL(localeChanged()), - m_sample, TQT_SLOT(slotLocaleChanged())); - connect(m_localetime, TQT_SIGNAL(localeChanged()), - m_sample, TQT_SLOT(slotLocaleChanged())); + connect(m_localenum, TQ_SIGNAL(localeChanged()), + m_sample, TQ_SLOT(slotLocaleChanged())); + connect(m_localemon, TQ_SIGNAL(localeChanged()), + m_sample, TQ_SLOT(slotLocaleChanged())); + connect(m_localetime, TQ_SIGNAL(localeChanged()), + m_sample, TQ_SLOT(slotLocaleChanged())); // No examples for this yet - //connect(m_localeother, TQT_SIGNAL(slotLocaleChanged()), - //m_sample, TQT_SLOT(slotLocaleChanged())); - connect(this, TQT_SIGNAL(localeChanged()), - m_sample, TQT_SLOT(slotLocaleChanged())); + //connect(m_localeother, TQ_SIGNAL(slotLocaleChanged()), + //m_sample, TQ_SLOT(slotLocaleChanged())); + connect(this, TQ_SIGNAL(localeChanged()), + m_sample, TQ_SLOT(slotLocaleChanged())); // make sure we always have translated interface - connect(this, TQT_SIGNAL(languageChanged()), - this, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localemain, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localenum, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localemon, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localetime, TQT_SLOT(slotTranslate())); - connect(this, TQT_SIGNAL(languageChanged()), - m_localeother, TQT_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + this, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localemain, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localenum, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localemon, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localetime, TQ_SLOT(slotTranslate())); + connect(this, TQ_SIGNAL(languageChanged()), + m_localeother, TQ_SLOT(slotTranslate())); // mark it as changed when we change it. - connect(m_localemain, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); - connect(m_localenum, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); - connect(m_localemon, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); - connect(m_localetime, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); - connect(m_localeother, TQT_SIGNAL(localeChanged()), - TQT_SLOT(slotChanged())); + connect(m_localemain, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); + connect(m_localenum, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); + connect(m_localemon, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); + connect(m_localetime, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); + connect(m_localeother, TQ_SIGNAL(localeChanged()), + TQ_SLOT(slotChanged())); load(); } diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index 2ff9d2c3c..41512a183 100644 --- a/kcontrol/nics/nic.cpp +++ b/kcontrol/nics/nic.cpp @@ -103,8 +103,8 @@ KCMNic::KCMNic(TQWidget *parent, const char * name, const TQStringList &) hbox->addStretch(1); TQTimer* timer=new TQTimer(this); timer->start(60000); - connect(m_updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(update())); - connect(timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect(m_updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(update())); + connect(timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); update(); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcminfo"), diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp index 84959e34d..c6d1d9068 100644 --- a/kcontrol/performance/kcmperformance.cpp +++ b/kcontrol/performance/kcmperformance.cpp @@ -52,11 +52,11 @@ Config::Config( TQWidget* parent_P, const char* ) tabs = new TQTabWidget( this ); konqueror_widget = new Konqueror( tabs ); konqueror_widget->layout()->setMargin( KDialog::marginHint() ); - connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); + connect( konqueror_widget, TQ_SIGNAL( changed()), TQ_SLOT( changed())); tabs->addTab( konqueror_widget, i18n( "Konqueror" )); system_widget = new SystemWidget( tabs ); system_widget->layout()->setMargin( KDialog::marginHint() ); - connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); + connect( system_widget, TQ_SIGNAL( changed()), TQ_SLOT( changed())); tabs->addTab( system_widget, i18n( "System" )); topLayout->add( tabs ); load(); @@ -110,7 +110,7 @@ KonquerorConfig::KonquerorConfig( TQWidget* parent_P, const char* ) TQVBoxLayout *topLayout = new TQVBoxLayout( this ); widget = new Konqueror( this ); - connect( widget, TQT_SIGNAL( changed()), TQT_SLOT( changed())); + connect( widget, TQ_SIGNAL( changed()), TQ_SLOT( changed())); topLayout->add( widget ); load(); } diff --git a/kcontrol/performance/konqueror.cpp b/kcontrol/performance/konqueror.cpp index 8cd82699b..199522729 100644 --- a/kcontrol/performance/konqueror.cpp +++ b/kcontrol/performance/konqueror.cpp @@ -51,9 +51,9 @@ Konqueror::Konqueror( TQWidget* parent_P ) "thus reducing resource requirements." "<p>Be aware that this also means that, if something goes wrong, " "all your browsing windows will be closed simultaneously." )); - connect( rb_never_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); - connect( rb_file_browsing_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); - connect( rb_always_reuse, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( rb_never_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); + connect( rb_file_browsing_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); + connect( rb_always_reuse, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); rb_file_browsing_reuse->setChecked( true ); TQString tmp = @@ -77,10 +77,10 @@ Konqueror::Konqueror( TQWidget* parent_P ) "so that windows will always open quickly." "<p><b>Warning:</b> In some cases, it is actually possible that this will " "reduce perceived performance." )); - connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SLOT( preload_count_changed( int ))); - connect( sb_preload_count, TQT_SIGNAL( valueChanged( int )), TQT_SIGNAL( changed())); - connect( cb_preload_on_startup, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); - connect( cb_always_have_preloaded, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( sb_preload_count, TQ_SIGNAL( valueChanged( int )), TQ_SLOT( preload_count_changed( int ))); + connect( sb_preload_count, TQ_SIGNAL( valueChanged( int )), TQ_SIGNAL( changed())); + connect( cb_preload_on_startup, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); + connect( cb_always_have_preloaded, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); defaults(); } diff --git a/kcontrol/performance/system.cpp b/kcontrol/performance/system.cpp index 056e78193..43e8c4c43 100644 --- a/kcontrol/performance/system.cpp +++ b/kcontrol/performance/system.cpp @@ -51,7 +51,7 @@ SystemWidget::SystemWidget( TQWidget* parent_P ) " or turn on the developer mode for the crash handler).</p>" ); TQWhatsThis::add( cb_disable_tdebuildsycoca, tmp ); TQWhatsThis::add( label_tdebuildsycoca, tmp ); - connect( cb_disable_tdebuildsycoca, TQT_SIGNAL( clicked()), TQT_SIGNAL( changed())); + connect( cb_disable_tdebuildsycoca, TQ_SIGNAL( clicked()), TQ_SIGNAL( changed())); defaults(); } diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index 71fc3313b..0aa05a90e 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/kcontrol/privacy/privacy.cpp @@ -126,7 +126,7 @@ Privacy::Privacy(TQWidget *parent, const char *name) clearFavIcons->setText(1, i18n("Clears the FavIcons cached from visited websites")); clearKPDFDocData->setText(1, i18n("Clears all KPDF document data files")); - connect(sw, TQT_SIGNAL(selectionChanged()), TQT_SLOT(changed())); + connect(sw, TQ_SIGNAL(selectionChanged()), TQ_SLOT(changed())); // store all entries in a list for easy access later on checklist.append(clearThumbnails); @@ -141,9 +141,9 @@ Privacy::Privacy(TQWidget *parent, const char *name) checklist.append(clearFavIcons); checklist.append(clearKPDFDocData); - connect(cleaningDialog->cleanupButton, TQT_SIGNAL(clicked()), TQT_SLOT(cleanup())); - connect(cleaningDialog->selectAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectAll())); - connect(cleaningDialog->selectNoneButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectNone())); + connect(cleaningDialog->cleanupButton, TQ_SIGNAL(clicked()), TQ_SLOT(cleanup())); + connect(cleaningDialog->selectAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectAll())); + connect(cleaningDialog->selectNoneButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectNone())); load(); } diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index 1c72b1ccc..140234a90 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); - connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); + connect( totalTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotInternalTimeout() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new QVBox( this, "mainWidget" ); diff --git a/kcontrol/randr/tderandrapp.cpp b/kcontrol/randr/tderandrapp.cpp index e2a4b46f2..97e602496 100644 --- a/kcontrol/randr/tderandrapp.cpp +++ b/kcontrol/randr/tderandrapp.cpp @@ -28,7 +28,7 @@ KRandRApp::KRandRApp() : m_tray(new KRandRSystemTray(0L, "RANDRTray")) { - connect(&m_eventMergingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(handleX11ConfigChangeEvent())); + connect(&m_eventMergingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(handleX11ConfigChangeEvent())); m_tray->show(); } diff --git a/kcontrol/randr/tderandrbindings.cpp b/kcontrol/randr/tderandrbindings.cpp index 5df10af1f..a5ad3fe6d 100644 --- a/kcontrol/randr/tderandrbindings.cpp +++ b/kcontrol/randr/tderandrbindings.cpp @@ -18,7 +18,7 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kcontrol/randr/tderandrmodule.cpp b/kcontrol/randr/tderandrmodule.cpp index 39e00980d..f13a863b9 100644 --- a/kcontrol/randr/tderandrmodule.cpp +++ b/kcontrol/randr/tderandrmodule.cpp @@ -100,7 +100,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis screenLabel->setBuddy( m_screenSelector ); TQWhatsThis::add(m_screenSelector, i18n("The screen whose settings you would like to change can be selected using this drop-down list.")); - connect(m_screenSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenChanged(int))); + connect(m_screenSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenChanged(int))); if (numScreens() <= 1) m_screenSelector->setEnabled(false); @@ -110,7 +110,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis TQLabel *sizeLabel = new TQLabel(i18n("Screen size:"), sizeBox); m_sizeCombo = new KComboBox(sizeBox); TQWhatsThis::add(m_sizeCombo, i18n("The size, otherwise known as the resolution, of your screen can be selected from this drop-down list.")); - connect(m_sizeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeChanged(int))); + connect(m_sizeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeChanged(int))); sizeLabel->setBuddy( m_sizeCombo ); TQHBox* refreshBox = new TQHBox(this); @@ -118,7 +118,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis TQLabel *rateLabel = new TQLabel(i18n("Refresh rate:"), refreshBox); m_refreshRates = new KComboBox(refreshBox); TQWhatsThis::add(m_refreshRates, i18n("The refresh rate of your screen can be selected from this drop-down list.")); - connect(m_refreshRates, TQT_SIGNAL(activated(int)), TQT_SLOT(slotRefreshChanged(int))); + connect(m_refreshRates, TQ_SIGNAL(activated(int)), TQ_SLOT(slotRefreshChanged(int))); rateLabel->setBuddy( m_refreshRates ); m_rotationGroup = new TQButtonGroup(2, TQt::Horizontal, i18n("Orientation (degrees counterclockwise)"), this); @@ -129,14 +129,14 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis m_applyOnStartup = new TQCheckBox(i18n("Apply settings on TDE startup"), this); topLayout->addWidget(m_applyOnStartup); TQWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when TDE starts.")); - connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); + connect(m_applyOnStartup, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged())); TQHBox* syncBox = new TQHBox(this); syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum)); m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox); topLayout->addWidget(syncBox); TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when TDE starts instead of being temporary.")); - connect(m_syncTrayApp, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged())); + connect(m_syncTrayApp, TQ_SIGNAL(clicked()), TQ_SLOT(setChanged())); topLayout->addStretch(1); @@ -155,11 +155,11 @@ void KRandRModule::addRotationButton(int thisRotation, bool checkbox) if (!checkbox) { TQRadioButton* thisButton = new TQRadioButton(RandRScreen::rotationName(thisRotation), m_rotationGroup); thisButton->setEnabled(thisRotation & currentScreen()->rotations()); - connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged())); + connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged())); } else { TQCheckBox* thisButton = new TQCheckBox(RandRScreen::rotationName(thisRotation), m_rotationGroup); thisButton->setEnabled(thisRotation & currentScreen()->rotations()); - connect(thisButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotRotationChanged())); + connect(thisButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotRotationChanged())); } } diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp index c938a31fc..b0e78087c 100644 --- a/kcontrol/randr/tderandrpassivepopup.cpp +++ b/kcontrol/randr/tderandrpassivepopup.cpp @@ -28,7 +28,7 @@ KRandrPassivePopup::KRandrPassivePopup( TQWidget *parent, const char *name, WFlags f ) : KPassivePopup( parent, name, f ) { - connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( slotPositionSelf())); + connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( slotPositionSelf())); } KRandrPassivePopup* KRandrPassivePopup::message( const TQString &caption, const TQString &text, @@ -95,7 +95,7 @@ bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e ) { if( e->type() == TQEvent::Move && o->isWidgetType() && watched_widgets.contains( static_cast<TQWidget*>( o ))) - TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf())); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPositionSelf())); return false; } diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index 6d44c3914..a5613eb2e 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/kcontrol/randr/tderandrtray.cpp @@ -59,10 +59,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) , m_help(new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false, actionCollection())) { TDEPopupMenu *help = m_help->menu(); - help->connectItem(KHelpMenu::menuHelpContents, this, TQT_SLOT(slotHelpContents())); + help->connectItem(KHelpMenu::menuHelpContents, this, TQ_SLOT(slotHelpContents())); setPixmap(KSystemTray::loadIcon("randr")); setAlignment(TQt::AlignHCenter | TQt::AlignVCenter); - connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit())); + connect(this, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(_quit())); TQToolTip::add(this, i18n("Screen resize & rotate")); my_parent = parent; @@ -75,10 +75,10 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) globalKeys->setEnabled(true); globalKeys->updateConnections(); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support -// connect(this, TQT_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQT_SLOT( desktopResized())); +// connect(this, TQ_SIGNAL(screenSizeChanged(int, int)), kapp->desktop(), TQ_SLOT( desktopResized())); #endif randr_display = XOpenDisplay(NULL); @@ -98,12 +98,12 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name) #ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); #endif } /*! - * \b TQT_SLOT which called if tderandrtray is exited by the user. In this case the user + * \b TQ_SLOT which called if tderandrtray is exited by the user. In this case the user * is asked through a yes/no box if "KRandRTray should start automatically on log in" and the * result is written to the KDE configfile. */ @@ -271,7 +271,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) m_screenPopups.append(subMenu); populateMenu(subMenu); lastIndex = menu->insertItem(i18n("Screen %1").arg(s+1), subMenu); - connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotScreenActivated())); + connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotScreenActivated())); } } @@ -293,7 +293,7 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) menu->setItemChecked(lastIndex, true); } menu->setItemEnabled(lastIndex, t_config->readBoolEntry("EnableICC", false)); - menu->connectItem(lastIndex, this, TQT_SLOT(slotColorProfileChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotColorProfileChanged(int))); } if (valid) { @@ -303,10 +303,10 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) if (!displayProfiles.isEmpty()) { menu->insertTitle(SmallIcon("background"), i18n("Display Profiles")); lastIndex = menu->insertItem(SmallIcon("bookmark"), "<default>"); - menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int))); for (TQStringList::Iterator t(displayProfiles.begin()); t != displayProfiles.end(); ++t) { lastIndex = menu->insertItem(SmallIcon("bookmark"), *t); - menu->connectItem(lastIndex, this, TQT_SLOT(slotDisplayProfileChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotDisplayProfileChanged(int))); } } } @@ -314,17 +314,17 @@ void KRandRSystemTray::contextMenuAboutToShow(TDEPopupMenu* menu) menu->insertTitle(SmallIcon("randr"), i18n("Global Configuration")); TDEAction *actColors = new TDEAction( i18n( "Configure Displays..." ), - SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotDisplayConfig() ), + SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotDisplayConfig() ), actionCollection() ); actColors->plug( menu ); // TDEAction *actPrefs = new TDEAction( i18n( "Configure Display..." ), -// SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotPrefs() ), +// SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotPrefs() ), // actionCollection() ); // actPrefs->plug( menu ); TDEAction *actSKeys = new TDEAction( i18n( "Configure Shortcut Keys..." ), - SmallIconSet( "configure" ), TDEShortcut(), this, TQT_SLOT( slotSKeys() ), + SmallIconSet( "configure" ), TDEShortcut(), this, TQ_SLOT( slotSKeys() ), actionCollection() ); actSKeys->plug( menu ); @@ -442,7 +442,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu) menu->setItemChecked(lastIndex, true); menu->setItemParameter(lastIndex, highestIndex); - menu->connectItem(lastIndex, this, TQT_SLOT(slotResolutionChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotResolutionChanged(int))); } delete [] sizeSort; sizeSort = 0L; @@ -460,7 +460,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu) menu->setItemChecked(lastIndex, true); menu->setItemParameter(lastIndex, 1 << i); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOrientationChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotOrientationChanged(int))); } } } @@ -478,7 +478,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu) menu->setItemChecked(lastIndex, true); menu->setItemParameter(lastIndex, i); - menu->connectItem(lastIndex, this, TQT_SLOT(slotRefreshRateChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotRefreshRateChanged(int))); } } @@ -764,7 +764,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name)); menu->setItemChecked(lastIndex, true); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); menu->setItemParameter(lastIndex, i); connected_displays++; @@ -786,7 +786,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name)); menu->setItemChecked(lastIndex, false); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); menu->setItemParameter(lastIndex, i); connected_displays++; @@ -809,7 +809,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name)); menu->setItemChecked(lastIndex, false); menu->setItemEnabled(lastIndex, false); - menu->connectItem(lastIndex, this, TQT_SLOT(slotOutputChanged(int))); + menu->connectItem(lastIndex, this, TQ_SLOT(slotOutputChanged(int))); menu->setItemParameter(lastIndex, i); } @@ -817,7 +817,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu) if (connected_displays < 2) { menu->setItemEnabled(lastIndex, false); } - menu->connectItem(lastIndex, this, TQT_SLOT(slotCycleDisplays())); + menu->connectItem(lastIndex, this, TQ_SLOT(slotCycleDisplays())); } } diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp index c25867fa5..b4553c6a8 100644 --- a/kcontrol/samba/kcmsambaimports.cpp +++ b/kcontrol/samba/kcmsambaimports.cpp @@ -56,7 +56,7 @@ ImportsView::ImportsView(TQWidget * parent, TDEConfig *config, const char * name " resource is mounted.") ); timer.start(10000); - TQObject::connect(&timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateList())); + TQObject::connect(&timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateList())); updateList(); } diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp index 4ba0ceb74..a2a03fed3 100644 --- a/kcontrol/samba/kcmsambalog.cpp +++ b/kcontrol/samba/kcmsambalog.cpp @@ -113,7 +113,7 @@ LogView::LogView(TQWidget *parent,TDEConfig *config, const char *name) showFileOpen.setChecked(FALSE); showFileClose.setChecked(FALSE); - connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList())); + connect(&updateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(updateList())); emit contentsChanged(&viewHistory,0,0); label.setMinimumSize(label.sizeHint()); diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp index 34de75d9b..faeb54702 100644 --- a/kcontrol/samba/kcmsambastatistics.cpp +++ b/kcontrol/samba/kcmsambastatistics.cpp @@ -116,8 +116,8 @@ StatisticsView::StatisticsView(TQWidget *parent,TDEConfig *config, const char *n subLayout->addWidget(expandedInfoCb,3,1); subLayout->addWidget(expandedUserCb,3,2); - connect(clearButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearStatistics())); - connect(calcButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(calculate())); + connect(clearButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(clearStatistics())); + connect(calcButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(calculate())); setListInfo(0,0,0); } diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp index abd423d13..e51a3c137 100644 --- a/kcontrol/samba/ksmbstatus.cpp +++ b/kcontrol/samba/ksmbstatus.cpp @@ -70,7 +70,7 @@ NetMon::NetMon( TQWidget * parent, TDEConfig *config, const char * name ) timer = new TQTimer(this); timer->start(15000); - TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); + TQObject::connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(update())); update(); } @@ -175,8 +175,8 @@ void NetMon::update() nrpid=0; process->setEnvironment("PATH", path); connect(process, - TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotReceivedData(TDEProcess *, char *, int))); + TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotReceivedData(TDEProcess *, char *, int))); *process << "smbstatus"; if (!process->start(TDEProcess::Block,TDEProcess::Stdout)) version->setText(i18n("Error: Unable to run smbstatus")); @@ -200,12 +200,12 @@ void NetMon::update() showmountProc=new TDEProcess(); showmountProc->setEnvironment("PATH", path); *showmountProc<<"showmount"<<"-a"<<"localhost"; - connect(showmountProc,TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQT_SLOT(slotReceivedData(TDEProcess *, char *, int))); + connect(showmountProc,TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),TQ_SLOT(slotReceivedData(TDEProcess *, char *, int))); //without this timer showmount hangs up to 5 minutes //if the portmapper daemon isn't running - TQTimer::singleShot(5000,this,TQT_SLOT(killShowmount())); + TQTimer::singleShot(5000,this,TQ_SLOT(killShowmount())); //kdDebug()<<"starting kill timer with 5 seconds"<<endl; - connect(showmountProc,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(killShowmount())); + connect(showmountProc,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(killShowmount())); if (!showmountProc->start(TDEProcess::NotifyOnExit,TDEProcess::Stdout)) // run showmount { delete showmountProc; diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index d5af28c1a..4bb099fae 100644 --- a/kcontrol/samba/main.cpp +++ b/kcontrol/samba/main.cpp @@ -66,7 +66,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin tabs.addTab(&imports,i18n("&Imports")); tabs.addTab(&logView,i18n("&Log")); tabs.addTab(&statisticsView,i18n("&Statistics")); - connect(&logView,TQT_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQT_SLOT(setListInfo(TQListView *, int, int))); + connect(&logView,TQ_SIGNAL(contentsChanged(TQListView* , int, int)),&statisticsView,TQ_SLOT(setListInfo(TQListView *, int, int))); setButtons(Help); load(); diff --git a/kcontrol/screensaver/advanceddialog.cpp b/kcontrol/screensaver/advanceddialog.cpp index 7a28178d5..e277a8853 100644 --- a/kcontrol/screensaver/advanceddialog.cpp +++ b/kcontrol/screensaver/advanceddialog.cpp @@ -24,17 +24,17 @@ KScreenSaverAdvancedDialog::KScreenSaverAdvancedDialog(TQWidget *parent, const c readSettings(); - connect(dialog->qcbPriority, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotPriorityChanged(int))); - - connect(dialog->qcbTopLeft, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbTopRight, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbBottomLeft, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChangeTopLeftCorner(int))); - connect(dialog->qcbBottomRight, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbPriority, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotPriorityChanged(int))); + + connect(dialog->qcbTopLeft, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbTopRight, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbBottomLeft, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChangeTopLeftCorner(int))); + connect(dialog->qcbBottomRight, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChangeTopLeftCorner(int))); #ifndef HAVE_SETPRIORITY dialog->qgbPriority->setEnabled(false); diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 67a93a5e2..70cf3f469 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -124,12 +124,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis readSettings( false ); mSetupProc = new TDEProcess; - connect(mSetupProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotSetupDone(TDEProcess *))); + connect(mSetupProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotSetupDone(TDEProcess *))); mPreviewProc = new TDEProcess; - connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotPreviewExited(TDEProcess *))); + connect(mPreviewProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotPreviewExited(TDEProcess *))); TQBoxLayout *topLayout = new TQHBoxLayout(this, 0, KDialog::spacingHint()); @@ -153,18 +153,18 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mSaverListView->header()->hide(); mSelected = -1; groupLayout->addWidget( mSaverListView, 10 ); - connect( mSaverListView, TQT_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotSetup())); + connect( mSaverListView, TQ_SIGNAL(doubleClicked ( TQListViewItem *)), this, TQ_SLOT( slotSetup())); TQWhatsThis::add( mSaverListView, i18n("Select the screen saver to use.") ); TQBoxLayout* hlay = new TQHBoxLayout(groupLayout, KDialog::spacingHint()); mSetupBt = new TQPushButton( i18n("&Setup..."), mSaverGroup ); - connect( mSetupBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetup() ) ); + connect( mSetupBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetup() ) ); mSetupBt->setEnabled(false); hlay->addWidget( mSetupBt ); TQWhatsThis::add( mSetupBt, i18n("Configure the screen saver's options, if any.") ); mTestBt = new TQPushButton( i18n("&Test"), mSaverGroup ); - connect( mTestBt, TQT_SIGNAL( clicked() ), TQT_SLOT( slotTest() ) ); + connect( mTestBt, TQ_SIGNAL( clicked() ), TQ_SLOT( slotTest() ) ); mTestBt->setEnabled(false); hlay->addWidget( mTestBt ); TQWhatsThis::add( mTestBt, i18n("Show a full screen preview of the screen saver.") ); @@ -177,7 +177,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mEnabledCheckBox = new TQCheckBox(i18n("Start a&utomatically"), mSettingsGroup); mEnabledCheckBox->setChecked(mEnabled); TQWhatsThis::add( mEnabledCheckBox, i18n("Automatically start the screen saver after a period of inactivity.") ); - connect(mEnabledCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnable(bool))); + connect(mEnabledCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnable(bool))); settingsGroupLayout->addWidget(mEnabledCheckBox, 0, 0); TQBoxLayout *hbox = new TQHBoxLayout(); @@ -192,8 +192,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitEdit->setSuffix(i18n(" min")); mWaitEdit->setValue(mTimeout/60); mWaitEdit->setEnabled(mEnabled); - connect(mWaitEdit, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotTimeoutChanged(int))); + connect(mWaitEdit, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotTimeoutChanged(int))); mActivateLbl->setBuddy(mWaitEdit); hbox->addWidget(mWaitEdit); hbox->addStretch(1); @@ -204,7 +204,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mLockCheckBox = new TQCheckBox( i18n("&Require password to stop"), mSettingsGroup ); mLockCheckBox->setEnabled( mEnabled ); mLockCheckBox->setChecked( mLock ); - connect( mLockCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotLock( bool ) ) ); + connect( mLockCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotLock( bool ) ) ); settingsGroupLayout->addWidget(mLockCheckBox, 2, 0); TQWhatsThis::add( mLockCheckBox, i18n("Prevent potential unauthorized use by requiring a password to stop the screen saver.") ); @@ -230,7 +230,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() ); } - connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLockTimeoutChanged(int))); + connect(mWaitLockEdit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLockTimeoutChanged(int))); mLockLbl->setBuddy(mWaitLockEdit); hbox->addWidget(mWaitLockEdit); hbox->addStretch(1); @@ -241,35 +241,35 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis mDelaySaverStartCheckBox = new TQCheckBox( i18n("&Delay saver start after lock"), mSettingsGroup ); mDelaySaverStartCheckBox->setEnabled( true ); mDelaySaverStartCheckBox->setChecked( mDelaySaverStart ); - connect( mDelaySaverStartCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotDelaySaverStart( bool ) ) ); + connect( mDelaySaverStartCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotDelaySaverStart( bool ) ) ); settingsGroupLayout->addWidget(mDelaySaverStartCheckBox, 0, 1); TQWhatsThis::add( mDelaySaverStartCheckBox, i18n("When manually locking the screen, wait to start the screen saver until the configured start delay has elapsed.") ); mUseTSAKCheckBox = new TQCheckBox( i18n("&Use Secure Attention Key"), mSettingsGroup ); mUseTSAKCheckBox->setEnabled( true ); mUseTSAKCheckBox->setChecked( mUseTSAK ); - connect( mUseTSAKCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseTSAK( bool ) ) ); + connect( mUseTSAKCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseTSAK( bool ) ) ); settingsGroupLayout->addWidget(mUseTSAKCheckBox, 1, 1); TQWhatsThis::add( mUseTSAKCheckBox, i18n("Require Secure Attention Key prior to displaying the unlock dialog.") ); mUseUnmanagedLockWindowsCheckBox = new TQCheckBox( i18n("Use &legacy lock windows"), mSettingsGroup ); mUseUnmanagedLockWindowsCheckBox->setEnabled( true ); mUseUnmanagedLockWindowsCheckBox->setChecked( mUseUnmanagedLockWindows ); - connect( mUseUnmanagedLockWindowsCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotUseUnmanagedLockWindows( bool ) ) ); + connect( mUseUnmanagedLockWindowsCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotUseUnmanagedLockWindows( bool ) ) ); settingsGroupLayout->addWidget(mUseUnmanagedLockWindowsCheckBox, 2, 1); TQWhatsThis::add( mUseUnmanagedLockWindowsCheckBox, i18n("Use old-style unmanaged X11 lock windows.") ); mHideActiveWindowsFromSaverCheckBox = new TQCheckBox( i18n("Hide active &windows from saver"), mSettingsGroup ); mHideActiveWindowsFromSaverCheckBox->setEnabled( true ); mHideActiveWindowsFromSaverCheckBox->setChecked( mHideActiveWindowsFromSaver ); - connect( mHideActiveWindowsFromSaverCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotHideActiveWindowsFromSaver( bool ) ) ); + connect( mHideActiveWindowsFromSaverCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotHideActiveWindowsFromSaver( bool ) ) ); settingsGroupLayout->addWidget(mHideActiveWindowsFromSaverCheckBox, 3, 1); TQWhatsThis::add( mHideActiveWindowsFromSaverCheckBox, i18n("Hide all active windows from the screen saver and use the desktop background as the screen saver input.") ); mHideCancelButtonCheckBox = new TQCheckBox( i18n("Hide &cancel button"), mSettingsGroup ); mHideCancelButtonCheckBox->setEnabled( true ); mHideCancelButtonCheckBox->setChecked( mHideCancelButton ); - connect( mHideCancelButtonCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotHideCancelButton(bool)) ); + connect( mHideCancelButtonCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotHideCancelButton(bool)) ); settingsGroupLayout->addWidget(mHideCancelButtonCheckBox, 4, 1); TQWhatsThis::add(mHideCancelButtonCheckBox, i18n("Hide Cancel button from the \"Desktop Session Locked\" dialog.")); @@ -288,8 +288,8 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis i18n( "Advanced &Options" ), this, "advancedBtn" ); advancedBt->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed) ); - connect( advancedBt, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAdvanced() ) ); + connect( advancedBt, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAdvanced() ) ); advancedLayout->addWidget( advancedBt ); advancedLayout->addWidget( new TQWidget( this ) ); @@ -306,7 +306,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis // we've started up. mNumLoaded = 0; mLoadTimer = new TQTimer( this ); - connect( mLoadTimer, TQT_SIGNAL(timeout()), TQT_SLOT(findSavers()) ); + connect( mLoadTimer, TQ_SIGNAL(timeout()), TQ_SLOT(findSavers()) ); mLoadTimer->start( 100 ); mChanged = false; emit changed(false); @@ -615,8 +615,8 @@ void KScreenSaver::findSavers() mTestBt->setEnabled(true); } - connect( mSaverListView, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotScreenSaver( TQListViewItem * ) ) ); + connect( mSaverListView, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotScreenSaver( TQListViewItem * ) ) ); setMonitor(); } diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index f0891db16..1e53bc3d9 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -72,19 +72,19 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name) _popUpKardChooser = new TDEPopupMenu(this,"KpopupKardChooser"); _popUpKardChooser->insertItem(i18n("Change Module..."), this, - TQT_SLOT(slotLaunchChooser())); + TQ_SLOT(slotLaunchChooser())); // The config backend - connect(base->launchManager, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); - connect(base->beepOnInsert, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); - connect(base->enableSupport, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); + connect(base->launchManager, TQ_SIGNAL(clicked()), TQ_SLOT( changed() )); + connect(base->beepOnInsert, TQ_SIGNAL(clicked()), TQ_SLOT( changed() )); + connect(base->enableSupport, TQ_SIGNAL(clicked()), TQ_SLOT( changed() )); - connect(base->enablePolling, TQT_SIGNAL(clicked()), TQT_SLOT( changed() )); + connect(base->enablePolling, TQ_SIGNAL(clicked()), TQ_SLOT( changed() )); connect(base->_readerHostsListView, - TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)), + TQ_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)), this, - TQT_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int))); + TQ_SLOT(slotShowPopup(TQListViewItem *,const TQPoint &,int))); diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 99f1b729a..5bf35dbac 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/kcontrol/smserver/kcmsmserver.cpp @@ -48,7 +48,7 @@ SMServerConfig::SMServerConfig( TQWidget *parent, const char* name, const TQStri TQVBoxLayout *topLayout = new TQVBoxLayout(this); dialog = new SMServerConfigImpl(this); - connect(dialog, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(dialog, TQ_SIGNAL(changed()), TQ_SLOT(changed())); dialog->show(); topLayout->add(dialog); diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index 805a98d6b..0b9611575 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/kcontrol/spellchecking/spellchecking.cpp @@ -41,7 +41,7 @@ KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, c spellConfig = new KSpellConfig(box, 0L ,0L, false ); layout->addStretch(1); - connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() )); + connect(spellConfig,TQ_SIGNAL(configChanged()), TQ_SLOT( changed() )); setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the TDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The TDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between TDE applications and non-TDE applications.</p>")); diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 2a751f14e..27a599b09 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -216,9 +216,9 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) page1Layout->addWidget( gbPreview ); // Connect all required stuff - connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(styleChanged()) ); - connect( cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateConfigButton())); - connect( pbConfigStyle, TQT_SIGNAL(clicked()), this, TQT_SLOT(styleSpecificConfig())); + connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(styleChanged()) ); + connect( cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateConfigButton())); + connect( pbConfigStyle, TQ_SIGNAL(clicked()), this, TQ_SLOT(styleSpecificConfig())); // Add Page2 (Effects) // ------------------- @@ -338,13 +338,13 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) page2Layout->addItem( sp1 ); // Data flow stuff. - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), containerFrame, TQT_SLOT(setEnabled(bool)) ); - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(menuEffectChanged(bool)) ); - connect( slOpacity, TQT_SIGNAL(valueChanged(int)),menuPreview, TQT_SLOT(setOpacity(int)) ); - connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectChanged()) ); - connect( comboMenuEffect, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectChanged()) ); - connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); - connect( comboMenuEffectType, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(menuEffectTypeChanged()) ); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), containerFrame, TQ_SLOT(setEnabled(bool)) ); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(menuEffectChanged(bool)) ); + connect( slOpacity, TQ_SIGNAL(valueChanged(int)),menuPreview, TQ_SLOT(setOpacity(int)) ); + connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectChanged()) ); + connect( comboMenuEffect, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectChanged()) ); + connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuEffectTypeChanged()) ); + connect( comboMenuEffectType, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(menuEffectTypeChanged()) ); // Add Page3 (Miscellaneous) // ------------------------- @@ -379,29 +379,29 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name ) load(); // Do all the setDirty connections. - connect(cbStyle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); + connect(cbStyle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); // Page2 - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbEnableEffects, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); - connect( comboTooltipEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); - connect( comboRubberbandEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboComboEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEffectsDirty())); - connect( comboMenuEffect, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboMenuHandle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( comboMenuEffectType, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setStyleDirty())); - connect( slOpacity, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); - connect( cbMenuShadow, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setStyleDirty())); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbEnableEffects, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty())); + connect( comboTooltipEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty())); + connect( comboRubberbandEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboComboEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEffectsDirty())); + connect( comboMenuEffect, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboMenuHandle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( comboMenuEffectType, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setStyleDirty())); + connect( slOpacity, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty())); + connect( cbMenuShadow, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setStyleDirty())); // Page1 & Page3 - connect( cbHoverButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); - connect( cbTransparentToolbars, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setToolbarsDirty())); - connect( cbEnableTooltips, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbIconsOnButtons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbScrollablePopupMenus,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbAutoHideAccelerators,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbMenuAltKeyNavigation,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( cbTearOffHandles, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setEffectsDirty())); - connect( comboToolbarIcons, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setToolbarsDirty())); - connect( m_popupMenuDelay, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setStyleDirty())); + connect( cbHoverButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty())); + connect( cbTransparentToolbars, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setToolbarsDirty())); + connect( cbEnableTooltips, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbIconsOnButtons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbScrollablePopupMenus,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbAutoHideAccelerators,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbMenuAltKeyNavigation,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( cbTearOffHandles, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setEffectsDirty())); + connect( comboToolbarIcons, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setToolbarsDirty())); + connect( m_popupMenuDelay, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setStyleDirty())); addWhatsThis(); @@ -479,9 +479,9 @@ void KCMStyle::styleSpecificConfig() dial->setMainWidget( pluginConfig ); //..and connect it to the wrapper - connect(pluginConfig, TQT_SIGNAL(changed(bool)), dial, TQT_SLOT(setDirty(bool))); - connect(dial, TQT_SIGNAL(defaults()), pluginConfig, TQT_SLOT(defaults())); - connect(dial, TQT_SIGNAL(save()), pluginConfig, TQT_SLOT(save())); + connect(pluginConfig, TQ_SIGNAL(changed(bool)), dial, TQ_SLOT(setDirty(bool))); + connect(dial, TQ_SIGNAL(defaults()), pluginConfig, TQ_SLOT(defaults())); + connect(dial, TQ_SIGNAL(save()), pluginConfig, TQ_SLOT(save())); if (dial->exec() == TQDialog::Accepted && dial->isDirty() ) { // Force re-rendering of the preview, to apply settings diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp index 7fa6ef698..6ac4e6d4c 100644 --- a/kcontrol/style/keramik/keramikconf.cpp +++ b/kcontrol/style/keramik/keramikconf.cpp @@ -63,9 +63,9 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent) origAnimProgressBar = s.readBoolEntry("/keramik/Settings/animateProgressBar", false); animateProgressBar->setChecked(origAnimProgressBar); - //connect(highlightLineEdits, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(highlightScrollBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); + //connect(highlightLineEdits, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(highlightScrollBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); } KeramikStyleConfig::~KeramikStyleConfig() diff --git a/kcontrol/style/styleconfdialog.cpp b/kcontrol/style/styleconfdialog.cpp index 8cb426b3f..feb5deba7 100644 --- a/kcontrol/style/styleconfdialog.cpp +++ b/kcontrol/style/styleconfdialog.cpp @@ -29,8 +29,8 @@ StyleConfigDialog::StyleConfigDialog(TQWidget* parent, TQString styleName): KDialogBase::Cancel) { m_dirty = false; - connect( this, TQT_SIGNAL( defaultClicked() ), this, TQT_SIGNAL( defaults() )); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SIGNAL( save() )); + connect( this, TQ_SIGNAL( defaultClicked() ), this, TQ_SIGNAL( defaults() )); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SIGNAL( save() )); } bool StyleConfigDialog::isDirty() const diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 570544a72..2eb7cf376 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -192,10 +192,10 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL { m_isGlobalConfig = true; } - connect(m_widget->globalConfigReload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReloadConfigurationFromGlobals())); - connect(m_widget->globalConfigEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditGlobalConfiguration())); - connect(m_widget->kcfg_UseGlobalSettings, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); - connect(m_widget->kcfg_SortByApp, TQT_SIGNAL(clicked()), this, TQT_SLOT(processLockouts())); + connect(m_widget->globalConfigReload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReloadConfigurationFromGlobals())); + connect(m_widget->globalConfigEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditGlobalConfiguration())); + connect(m_widget->kcfg_UseGlobalSettings, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); + connect(m_widget->kcfg_SortByApp, TQ_SIGNAL(clicked()), this, TQ_SLOT(processLockouts())); TQFile configFile(locateLocal("config", m_configFileName)); if (!configFile.exists()) @@ -222,10 +222,10 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL } m_widget->appearance->insertItem(i18n("Custom")); - connect(m_widget->appearance, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(appearanceChanged(int))); - connect(m_widget->kcfg_DisplayIconsNText, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(displayIconsNTextChanged(int))); + connect(m_widget->appearance, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(appearanceChanged(int))); + connect(m_widget->kcfg_DisplayIconsNText, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(displayIconsNTextChanged(int))); addConfig(m_settingsObject, m_widget); setQuickHelp(i18n("<h1>Taskbar</h1> You can configure the taskbar here." @@ -241,9 +241,9 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL m_widget->kcfg_GroupTasks->insertStringList(i18nGroupModeList()); m_widget->kcfg_ShowTaskStates->insertStringList(i18nShowTaskStatesList()); - connect(m_widget->kcfg_GroupTasks, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotUpdateComboBox())); - connect(m_widget->kcfg_UseCustomColors, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotUpdateCustomColors())); + connect(m_widget->kcfg_GroupTasks, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotUpdateComboBox())); + connect(m_widget->kcfg_UseCustomColors, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotUpdateCustomColors())); slotUpdateCustomColors(); updateAppearanceCombo(); @@ -263,8 +263,8 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL { m_widget->showAllScreens->show(); } - connect( m_widget->showAllScreens, TQT_SIGNAL( stateChanged( int )), TQT_SLOT( changed())); - connect( m_widget->smallIcons, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( m_widget->showAllScreens, TQ_SIGNAL( stateChanged( int )), TQ_SLOT( changed())); + connect( m_widget->smallIcons, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtaskbar"), I18N_NOOP("TDE Taskbar Control Module"), @@ -279,7 +279,7 @@ TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringL load(); processLockouts(); - TQTimer::singleShot(0, this, TQT_SLOT(notChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(notChanged())); } TaskbarConfig::~TaskbarConfig() diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index bb166bdc4..1298677b6 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -156,7 +156,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1); KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(addFonts())); button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); @@ -182,15 +182,15 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsViewMenuAct=dynamic_cast<TDEActionMenu *>(itsDirOp->actionCollection()->action("view menu")); topMnu->popupMenu()->clear(); - connect(topMnu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupMenu())); + connect(topMnu->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupMenu())); if((act=itsDirOp->actionCollection()->action("up"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(cdUp())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(cdUp())); if((act=itsDirOp->actionCollection()->action("home"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(home())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(home())); if((act=itsDirOp->actionCollection()->action("back"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(back())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(back())); if((act=itsDirOp->actionCollection()->action("forward"))) - act->disconnect(TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(forward())); + act->disconnect(TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(forward())); if((act=itsDirOp->actionCollection()->action("reload"))) act->plug(toolbar); @@ -199,26 +199,26 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) if((itsIconAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("short view")))) { - disconnect(itsIconAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotSimpleView())); - connect(itsIconAct, TQT_SIGNAL(activated()), TQT_SLOT(iconView())); + disconnect(itsIconAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotSimpleView())); + connect(itsIconAct, TQ_SIGNAL(activated()), TQ_SLOT(iconView())); itsIconAct->plug(toolbar); } if((itsListAct=dynamic_cast<TDERadioAction *>(itsDirOp->actionCollection()->action("detailed view")))) { - disconnect(itsListAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(slotDetailedView())); - connect(itsListAct, TQT_SIGNAL(activated()), TQT_SLOT(listView())); + disconnect(itsListAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(slotDetailedView())); + connect(itsListAct, TQ_SIGNAL(activated()), TQ_SLOT(listView())); itsListAct->plug(toolbar); } - itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQT_SLOT(filterFonts()), + itsShowBitmapAct=new TDEToggleAction(i18n("Show Bitmap Fonts"), "application-x-font-snf", 0, this, TQ_SLOT(filterFonts()), itsDirOp->actionCollection(), "showbitmap"); itsShowBitmapAct->setChecked(showBitmap); itsShowBitmapAct->plug(toolbar); toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQT_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); + act=new TDEAction(i18n("Add Fonts..."), "newfont", 0, this, TQ_SLOT(addFonts()), itsDirOp->actionCollection(), "addfonts"); act->plug(toolbar); topMnu->insert(act); @@ -227,24 +227,24 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDeleteAct->plug(toolbar); itsDeleteAct->setEnabled(false); topMnu->insert(itsDeleteAct); - disconnect(itsDeleteAct, TQT_SIGNAL(activated()), itsDirOp, TQT_SLOT(deleteSelected())); - connect(itsDeleteAct, TQT_SIGNAL(activated()), this, TQT_SLOT(removeFonts())); + disconnect(itsDeleteAct, TQ_SIGNAL(activated()), itsDirOp, TQ_SLOT(deleteSelected())); + connect(itsDeleteAct, TQ_SIGNAL(activated()), this, TQ_SLOT(removeFonts())); } toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQT_SLOT(configure()), itsDirOp->actionCollection(), "configure"); + act=new TDEAction(i18n("Configure..."), "configure", 0, this, TQ_SLOT(configure()), itsDirOp->actionCollection(), "configure"); act->plug(toolbar); #ifdef HAVE_XFT toolbar->insertLineSeparator(); - act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQT_SLOT(print()), itsDirOp->actionCollection(), "print"); + act=new TDEAction(i18n("Print..."), "document-print", 0, this, TQ_SLOT(print()), itsDirOp->actionCollection(), "print"); act->plug(toolbar); #endif if( (itsSepDirsAct=itsDirOp->actionCollection()->action("separate dirs")) && (itsShowHiddenAct=itsDirOp->actionCollection()->action("show hidden"))) { - //disconnect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), itsDirOp, TQT_SLOT(insertViewDependentActions())); - connect(itsViewMenuAct->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(setupViewMenu())); + //disconnect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), itsDirOp, TQ_SLOT(insertViewDependentActions())); + connect(itsViewMenuAct->popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(setupViewMenu())); setupViewMenu(); } @@ -267,12 +267,12 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) itsDirOp->dirLister()->setShowingDotFiles(true); - connect(itsDirOp, TQT_SIGNAL(fileHighlighted(const KFileItem *)), TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(itsDirOp, TQT_SIGNAL(finishedLoading()), TQT_SLOT(loadingFinished())); - connect(itsDirOp, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)), - TQT_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &))); - connect(itsDirOp->dirLister(), TQT_SIGNAL(infoMessage(const TQString &)), TQT_SLOT(infoMessage(const TQString &))); - connect(itsDirOp, TQT_SIGNAL(updateInformation(int, int)), TQT_SLOT(updateInformation(int, int))); + connect(itsDirOp, TQ_SIGNAL(fileHighlighted(const KFileItem *)), TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(itsDirOp, TQ_SIGNAL(finishedLoading()), TQ_SLOT(loadingFinished())); + connect(itsDirOp, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent *, const KURL::List &)), + TQ_SLOT(dropped(const KFileItem *, TQDropEvent *, const KURL::List &))); + connect(itsDirOp->dirLister(), TQ_SIGNAL(infoMessage(const TQString &)), TQ_SLOT(infoMessage(const TQString &))); + connect(itsDirOp, TQ_SIGNAL(updateInformation(int, int)), TQ_SLOT(updateInformation(int, int))); } CKCmFontInst::~CKCmFontInst() @@ -465,7 +465,7 @@ void CKCmFontInst::removeFonts() if(doIt) { TDEIO::DeleteJob *job = TDEIO::del(urls, false, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(delResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(delResult(TDEIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } @@ -637,7 +637,7 @@ void CKCmFontInst::addFonts(const KURL::List &src, const KURL &dest) } TDEIO::CopyJob *job=TDEIO::copy(copy, dest, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(jobResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(jobResult(TDEIO::Job *))); job->setWindow(this); job->setAutoErrorHandlingEnabled(true, this); } diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp index 559c8c4c5..e9f5b7dae 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp @@ -79,15 +79,15 @@ CKFileFontView::CKFileFontView(TQWidget *parent, const char *name) setAllColumnsShowFocus(true); setDragEnabled(false); - connect(header(), TQT_SIGNAL(sectionClicked(int)), TQT_SLOT(slotSortingChanged(int))); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(slotActivate(TQListViewItem *))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(selected( TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotActivate(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &))); + connect(header(), TQ_SIGNAL(sectionClicked(int)), TQ_SLOT(slotSortingChanged(int))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(selected( TQListViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(slotActivate(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotActivateMenu(TQListViewItem *, const TQPoint &))); // DND - connect(&(d->itsAutoOpenTimer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoOpen())); + connect(&(d->itsAutoOpenTimer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoOpen())); setSelectionMode(KFileView::selectionMode()); itsResolver = new KMimeTypeResolver<CFontListViewItem, CKFileFontView>(this); } @@ -211,8 +211,8 @@ void CKFileFontView::highlighted( TQListViewItem *item ) void CKFileFontView::setSelectionMode(KFile::SelectionMode sm) { - disconnect(TQT_SIGNAL(selectionChanged()), this); - disconnect(TQT_SIGNAL(selectionChanged(TQListViewItem *)), this); + disconnect(TQ_SIGNAL(selectionChanged()), this); + disconnect(TQ_SIGNAL(selectionChanged(TQListViewItem *)), this); switch (sm) { @@ -233,9 +233,9 @@ void CKFileFontView::setSelectionMode(KFile::SelectionMode sm) // for highlighting if (KFile::Multi==sm || KFile::Extended==sm) - connect(this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); else - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(highlighted(TQListViewItem * ))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), TQ_SLOT(highlighted(TQListViewItem * ))); } bool CKFileFontView::isSelected(const KFileItem *i) const diff --git a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp index 3dc0f62b6..c2437ef1a 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPart.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewPart.cpp @@ -103,14 +103,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name) toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum)); toolsLayout->addWidget(itsInstallButton); itsToolsFrame->hide(); - connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool))); - connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install())); - connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int))); + connect(itsPreview, TQ_SIGNAL(status(bool)), TQ_SLOT(previewStatus(bool))); + connect(itsInstallButton, TQ_SIGNAL(clicked()), TQ_SLOT(install())); + connect(itsFaceSelector, TQ_SIGNAL(valueChanged(int)), itsPreview, TQ_SLOT(showFace(int))); itsChangeTextAction=new TDEAction(i18n("Change Text..."), "text", TDEShortcut(), - this, TQT_SLOT(changeText()), actionCollection(), "changeText"); + this, TQ_SLOT(changeText()), actionCollection(), "changeText"); itsChangeTextAction->setEnabled(false); - itsPrintAction=KStdAction::print(this, TQT_SLOT(print()), actionCollection(), "print"); + itsPrintAction=KStdAction::print(this, TQ_SLOT(print()), actionCollection(), "print"); itsPrintAction->setEnabled(false); setXMLFile("tdefontviewpart.rc"); @@ -143,7 +143,7 @@ bool CFontViewPart::openFile() { // NOTE: Cant do the real open here, as dont seem to be able to use TDEIO::NetAccess functions during initial start-up. // Bug report 111535 indicates that calling "konqueror <font>" crashes. - TQTimer::singleShot(0, this, TQT_SLOT(timeout())); + TQTimer::singleShot(0, this, TQ_SLOT(timeout())); return true; } diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index ddb483e5e..d5ca2eba5 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -49,8 +49,8 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() if(factory) { - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); itsPreview=(KParts::ReadOnlyPart *)factory->create(this, "fontvier", "KParts::ReadOnlyPart"); diff --git a/kcontrol/tdeio/cache.cpp b/kcontrol/tdeio/cache.cpp index 42c0fc28f..1f7a57a85 100644 --- a/kcontrol/tdeio/cache.cpp +++ b/kcontrol/tdeio/cache.cpp @@ -66,10 +66,10 @@ void KCacheConfigDialog::load() m_dlg->rbCacheIfPossible->setChecked( true ); // Config changed notifications... - connect ( m_dlg->cbUseCache, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()) ); - connect ( m_dlg->bgCachePolicy, TQT_SIGNAL(clicked (int)), TQT_SLOT(configChanged()) ); - connect ( m_dlg->sbMaxCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(configChanged()) ); - connect ( m_dlg->pbClearCache, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearCache()) ); + connect ( m_dlg->cbUseCache, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged()) ); + connect ( m_dlg->bgCachePolicy, TQ_SIGNAL(clicked (int)), TQ_SLOT(configChanged()) ); + connect ( m_dlg->sbMaxCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(configChanged()) ); + connect ( m_dlg->pbClearCache, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearCache()) ); emit changed( false ); } diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp index 9869c6c92..10ed75d26 100644 --- a/kcontrol/tdeio/kcookiesmain.cpp +++ b/kcontrol/tdeio/kcookiesmain.cpp @@ -46,7 +46,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent) tab->addTab(policies, i18n("&Policy")); policiesTabNumber = currentTabNumber; currentTabNumber++; - connect(policies, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(policies, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); if( managerOK ) { @@ -54,7 +54,7 @@ KCookiesMain::KCookiesMain(TQWidget *parent) tab->addTab(management, i18n("&Management")); managementTabNumber = currentTabNumber; currentTabNumber++; - connect(management, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(management, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); } } diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp index 1a9314d91..e3737ff6b 100644 --- a/kcontrol/tdeio/kcookiesmanagement.cpp +++ b/kcontrol/tdeio/kcookiesmanagement.cpp @@ -114,15 +114,15 @@ KCookiesManagement::KCookiesManagement(TQWidget *parent) mainLayout->addWidget(dlg); dlg->lvCookies->setSorting(0); - connect(dlg->lvCookies, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(getCookies(TQListViewItem*)) ); - connect(dlg->lvCookies, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(showCookieDetails(TQListViewItem*)) ); + connect(dlg->lvCookies, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(getCookies(TQListViewItem*)) ); + connect(dlg->lvCookies, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(showCookieDetails(TQListViewItem*)) ); - connect(dlg->pbDelete, TQT_SIGNAL(clicked()), TQT_SLOT(deleteCookie())); - connect(dlg->pbDeleteAll, TQT_SIGNAL(clicked()), TQT_SLOT(deleteAllCookies())); - connect(dlg->pbReload, TQT_SIGNAL(clicked()), TQT_SLOT(getDomains())); - connect(dlg->pbPolicy, TQT_SIGNAL(clicked()), TQT_SLOT(doPolicy())); + connect(dlg->pbDelete, TQ_SIGNAL(clicked()), TQ_SLOT(deleteCookie())); + connect(dlg->pbDeleteAll, TQ_SIGNAL(clicked()), TQ_SLOT(deleteAllCookies())); + connect(dlg->pbReload, TQ_SIGNAL(clicked()), TQ_SLOT(getDomains())); + connect(dlg->pbPolicy, TQ_SIGNAL(clicked()), TQ_SLOT(doPolicy())); - connect(dlg->lvCookies, TQT_SIGNAL(doubleClicked (TQListViewItem *)), TQT_SLOT(doPolicy())); + connect(dlg->lvCookies, TQ_SIGNAL(doubleClicked (TQListViewItem *)), TQ_SLOT(doPolicy())); deletedCookies.setAutoDelete(true); m_bDeleteAll = false; mainWidget = parent; diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp index a39773cf1..6febd106e 100644 --- a/kcontrol/tdeio/kcookiespolicies.cpp +++ b/kcontrol/tdeio/kcookiespolicies.cpp @@ -323,40 +323,40 @@ void KCookiesPolicies::load() } // Connect the main swicth :) Enable/disable cookie support - connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( cookiesEnabled(bool) ) ); - connect( dlg->cbEnableCookies, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( configChanged() ) ); + connect( dlg->cbEnableCookies, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( cookiesEnabled(bool) ) ); + connect( dlg->cbEnableCookies, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( configChanged() ) ); // Connect the preference check boxes... - connect ( dlg->cbRejectCrossDomainCookies, TQT_SIGNAL(clicked()), - TQT_SLOT(configChanged())); - connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(configChanged())); - connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(configChanged())); - - connect ( dlg->cbAutoAcceptSessionCookies, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(autoAcceptSessionCookies(bool))); - connect ( dlg->cbIgnoreCookieExpirationDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(ignoreCookieExpirationDate(bool))); + connect ( dlg->cbRejectCrossDomainCookies, TQ_SIGNAL(clicked()), + TQ_SLOT(configChanged())); + connect ( dlg->cbAutoAcceptSessionCookies, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(configChanged())); + connect ( dlg->cbIgnoreCookieExpirationDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(configChanged())); + + connect ( dlg->cbAutoAcceptSessionCookies, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(autoAcceptSessionCookies(bool))); + connect ( dlg->cbIgnoreCookieExpirationDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(ignoreCookieExpirationDate(bool))); // Connect the default cookie policy radio buttons... - connect(dlg->bgDefault, TQT_SIGNAL(clicked(int)), TQT_SLOT(configChanged())); + connect(dlg->bgDefault, TQ_SIGNAL(clicked(int)), TQ_SLOT(configChanged())); // Connect signals from the domain specific policy listview. - connect( dlg->lvDomainPolicy, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged()) ); - connect( dlg->lvDomainPolicy, TQT_SIGNAL(doubleClicked (TQListViewItem *)), - TQT_SLOT(changePressed() ) ); - connect( dlg->lvDomainPolicy, TQT_SIGNAL(returnPressed ( TQListViewItem * )), - TQT_SLOT(changePressed() ) ); + connect( dlg->lvDomainPolicy, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged()) ); + connect( dlg->lvDomainPolicy, TQ_SIGNAL(doubleClicked (TQListViewItem *)), + TQ_SLOT(changePressed() ) ); + connect( dlg->lvDomainPolicy, TQ_SIGNAL(returnPressed ( TQListViewItem * )), + TQ_SLOT(changePressed() ) ); // Connect the buttons... - connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) ); - connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); - connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); - connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); + connect( dlg->pbNew, TQ_SIGNAL(clicked()), TQ_SLOT( addPressed() ) ); + connect( dlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) ); + connect( dlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) ); + connect( dlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) ); } void KCookiesPolicies::save() diff --git a/kcontrol/tdeio/kenvvarproxydlg.cpp b/kcontrol/tdeio/kenvvarproxydlg.cpp index e8d1c0e47..2a8b348c7 100644 --- a/kcontrol/tdeio/kenvvarproxydlg.cpp +++ b/kcontrol/tdeio/kenvvarproxydlg.cpp @@ -83,9 +83,9 @@ void KEnvVarProxyDlg::init() { m_bHasValidData = false; - connect( mDlg->cbShowValue, TQT_SIGNAL( clicked() ), TQT_SLOT( showValuePressed() ) ); - connect( mDlg->pbVerify, TQT_SIGNAL( clicked() ), TQT_SLOT( verifyPressed() ) ); - connect( mDlg->pbDetect, TQT_SIGNAL( clicked() ), TQT_SLOT( autoDetectPressed() ) ); + connect( mDlg->cbShowValue, TQ_SIGNAL( clicked() ), TQ_SLOT( showValuePressed() ) ); + connect( mDlg->pbVerify, TQ_SIGNAL( clicked() ), TQ_SLOT( verifyPressed() ) ); + connect( mDlg->pbDetect, TQ_SIGNAL( clicked() ), TQ_SLOT( autoDetectPressed() ) ); } void KEnvVarProxyDlg::setProxyData( const KProxyData& data ) diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp index 01d2b584c..0d785025d 100644 --- a/kcontrol/tdeio/kmanualproxydlg.cpp +++ b/kcontrol/tdeio/kmanualproxydlg.cpp @@ -63,19 +63,19 @@ void KManualProxyDlg::init() mDlg->sbHttps->setRange( 0, MAX_PORT_VALUE ); mDlg->sbFtp->setRange( 0, MAX_PORT_VALUE ); - connect( mDlg->pbNew, TQT_SIGNAL( clicked() ), TQT_SLOT( newPressed() ) ); - connect( mDlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); - connect( mDlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); - connect( mDlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); + connect( mDlg->pbNew, TQ_SIGNAL( clicked() ), TQ_SLOT( newPressed() ) ); + connect( mDlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) ); + connect( mDlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) ); + connect( mDlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) ); - connect( mDlg->lbExceptions, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateButtons()) ); - connect( mDlg->lbExceptions, TQT_SIGNAL(doubleClicked (TQListBoxItem *)), TQT_SLOT(changePressed())); + connect( mDlg->lbExceptions, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateButtons()) ); + connect( mDlg->lbExceptions, TQ_SIGNAL(doubleClicked (TQListBoxItem *)), TQ_SLOT(changePressed())); - connect( mDlg->cbSameProxy, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( sameProxy(bool) ) ); - connect( mDlg->pbCopyDown, TQT_SIGNAL( clicked() ), TQT_SLOT( copyDown() ) ); + connect( mDlg->cbSameProxy, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( sameProxy(bool) ) ); + connect( mDlg->pbCopyDown, TQ_SIGNAL( clicked() ), TQ_SLOT( copyDown() ) ); - connect( mDlg->leHttp, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( mDlg->sbHttp, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(valueChanged (int)) ); + connect( mDlg->leHttp, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( mDlg->sbHttp, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(valueChanged (int)) ); } void KManualProxyDlg::setProxyData( const KProxyData &data ) diff --git a/kcontrol/tdeio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp index 9253916d7..344392b91 100644 --- a/kcontrol/tdeio/kproxydlg.cpp +++ b/kcontrol/tdeio/kproxydlg.cpp @@ -54,9 +54,9 @@ KProxyOptions::KProxyOptions (TQWidget* parent ) mTab->addTab(mProxy, i18n("&Proxy")); mTab->addTab(mSocks, i18n("&SOCKS")); - connect(mProxy, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(mSocks, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(mTab, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SIGNAL(quickHelpChanged())); + connect(mProxy, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(mSocks, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(mTab, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SIGNAL(quickHelpChanged())); } KProxyOptions::~KProxyOptions() @@ -121,27 +121,27 @@ KProxyDialog::KProxyDialog( TQWidget* parent) mainLayout->addStretch(); // signals and slots connections - connect( mDlg->rbNoProxy, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotUseProxyChanged() ) ); + connect( mDlg->rbNoProxy, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotUseProxyChanged() ) ); - connect( mDlg->rbAutoDiscover, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); - connect( mDlg->rbAutoScript, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); + connect( mDlg->rbAutoDiscover, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); + connect( mDlg->rbAutoScript, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); - connect( mDlg->rbPrompt, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); - connect( mDlg->rbPresetLogin, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); + connect( mDlg->rbPrompt, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); + connect( mDlg->rbPresetLogin, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); - connect( mDlg->cbPersConn, TQT_SIGNAL( toggled(bool) ), - TQT_SLOT( slotChanged() ) ); + connect( mDlg->cbPersConn, TQ_SIGNAL( toggled(bool) ), + TQ_SLOT( slotChanged() ) ); - connect( mDlg->location, TQT_SIGNAL( textChanged(const TQString&) ), - TQT_SLOT( slotChanged() ) ); + connect( mDlg->location, TQ_SIGNAL( textChanged(const TQString&) ), + TQ_SLOT( slotChanged() ) ); - connect( mDlg->pbEnvSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupEnvProxy() ) ); - connect( mDlg->pbManSetup, TQT_SIGNAL( clicked() ), TQT_SLOT( setupManProxy() ) ); + connect( mDlg->pbEnvSetup, TQ_SIGNAL( clicked() ), TQ_SLOT( setupEnvProxy() ) ); + connect( mDlg->pbManSetup, TQ_SIGNAL( clicked() ), TQ_SLOT( setupManProxy() ) ); load(); } diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp index c0770af9e..0116764c8 100644 --- a/kcontrol/tdeio/main.cpp +++ b/kcontrol/tdeio/main.cpp @@ -110,7 +110,7 @@ LanBrowser::LanBrowser(TQWidget *parent) tabs.addTab(smbPage, i18n("&Windows Shares")); smbPageTabNumber = currentTabNumber; currentTabNumber++; - connect(smbPage,TQT_SIGNAL(changed(bool)), TQT_SLOT( changed() )); + connect(smbPage,TQ_SIGNAL(changed(bool)), TQ_SLOT( changed() )); lisaPage = TDECModuleLoader::loadModule("kcmlisa", TDECModuleLoader::None, &tabs); if (lisaPage) @@ -118,14 +118,14 @@ LanBrowser::LanBrowser(TQWidget *parent) tabs.addTab(lisaPage,i18n("&LISa Daemon")); lisaPageTabNumber = currentTabNumber; currentTabNumber++; - connect(lisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); + connect(lisaPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() )); } // resLisaPage = TDECModuleLoader::loadModule("kcmreslisa", &tabs); // if (resLisaPage) // { // tabs.addTab(resLisaPage,i18n("R&esLISa Daemon")); -// connect(resLisaPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); +// connect(resLisaPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() )); // } tdeioLanPage = TDECModuleLoader::loadModule("kcmtdeiolan", TDECModuleLoader::None, &tabs); @@ -134,7 +134,7 @@ LanBrowser::LanBrowser(TQWidget *parent) tabs.addTab(tdeioLanPage,i18n("lan:/ Iosla&ve")); tdeioLanPageTabNumber = currentTabNumber; currentTabNumber++; - connect(tdeioLanPage,TQT_SIGNAL(changed()), TQT_SLOT( changed() )); + connect(tdeioLanPage,TQ_SIGNAL(changed()), TQ_SLOT( changed() )); } setButtons(Apply|Help); diff --git a/kcontrol/tdeio/netpref.cpp b/kcontrol/tdeio/netpref.cpp index acde5635e..2cf465977 100644 --- a/kcontrol/tdeio/netpref.cpp +++ b/kcontrol/tdeio/netpref.cpp @@ -29,29 +29,29 @@ KIOPreferences::KIOPreferences( TQWidget* parent ) sb_socketRead = new KIntNumInput( gb_Timeout, "sb_socketRead" ); sb_socketRead->setSuffix( i18n( " sec" ) ); sb_socketRead->setLabel( i18n( "Soc&ket read:" ), AlignVCenter); - connect(sb_socketRead, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(configChanged())); + connect(sb_socketRead, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(configChanged())); sb_proxyConnect = new KIntNumInput( sb_socketRead, 0, gb_Timeout, 10, "sb_proxyConnect" ); sb_proxyConnect->setSuffix( i18n( " sec" ) ); sb_proxyConnect->setLabel( i18n( "Pro&xy connect:" ), AlignVCenter); - connect(sb_proxyConnect, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(configChanged())); + connect(sb_proxyConnect, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(configChanged())); sb_serverConnect = new KIntNumInput( sb_proxyConnect, 0, gb_Timeout, 10, "sb_serverConnect" ); sb_serverConnect->setSuffix( i18n( " sec" ) ); sb_serverConnect->setLabel( i18n("Server co&nnect:"), AlignVCenter); - connect(sb_serverConnect, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(configChanged())); + connect(sb_serverConnect, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(configChanged())); sb_serverResponse = new KIntNumInput( sb_serverConnect, 0, gb_Timeout, 10, "sb_serverResponse" ); sb_serverResponse->setSuffix( i18n( " sec" ) ); sb_serverResponse->setLabel( i18n("&Server response:"), AlignVCenter); - connect(sb_serverResponse, TQT_SIGNAL(valueChanged ( int )), - this, TQT_SLOT(configChanged())); + connect(sb_serverResponse, TQ_SIGNAL(valueChanged ( int )), + this, TQ_SLOT(configChanged())); gb_Ftp = new TQVGroupBox( i18n( "FTP Options" ), this, "gb_Ftp" ); cb_ftpEnablePasv = new TQCheckBox( i18n( "Enable passive &mode (PASV)" ), gb_Ftp ); @@ -64,8 +64,8 @@ KIOPreferences::KIOPreferences( TQWidget* parent ) mainLayout->addWidget( gb_Ftp ); - connect(cb_ftpEnablePasv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); - connect(cb_ftpMarkPartial, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged())); + connect(cb_ftpEnablePasv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged())); + connect(cb_ftpMarkPartial, TQ_SIGNAL(toggled(bool)), TQ_SLOT(configChanged())); mainLayout->addStretch(); diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp index 385bc4a04..77c818cf2 100644 --- a/kcontrol/tdeio/policydlg.cpp +++ b/kcontrol/tdeio/policydlg.cpp @@ -67,8 +67,8 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent, m_dlgUI->cbPolicy->setMinimumWidth( m_dlgUI->cbPolicy->fontMetrics().maxWidth() * 25 ); enableButtonOK( false ); - connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&))); + connect(m_dlgUI->leDomain, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&))); setFixedSize (sizeHint()); m_dlgUI->leDomain->setFocus (); diff --git a/kcontrol/tdeio/smbrodlg.cpp b/kcontrol/tdeio/smbrodlg.cpp index ccb070e33..4df8ff396 100644 --- a/kcontrol/tdeio/smbrodlg.cpp +++ b/kcontrol/tdeio/smbrodlg.cpp @@ -73,11 +73,11 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent) layout->addWidget(new TQWidget(this),4,0); -// connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); - connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); - connect(m_passwordLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); -// connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed())); -// connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) ); +// connect(m_showHiddenShares, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + connect(m_userLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed())); + connect(m_passwordLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed())); +// connect(m_workgroupLe, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(changed())); +// connect( m_encodingList, TQ_SIGNAL( activated( const TQString & ) ), this , TQ_SLOT( changed() ) ); layout->setRowStretch(4, 1); diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp index 91d8cfd5c..8ac02dcfd 100644 --- a/kcontrol/tdeio/socks.cpp +++ b/kcontrol/tdeio/socks.cpp @@ -52,26 +52,26 @@ KSocksConfig::KSocksConfig(TQWidget *parent) base = new SocksBase(this); layout->add(base); - connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged())); - connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int))); + connect(base->_c_enableSocks, TQ_SIGNAL(clicked()), this, TQ_SLOT(enableChanged())); + connect(base->bg, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(methodChanged(int))); // The custom library - connect(base->_c_customPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *))); - connect(base->_c_customPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(customPathChanged(const TQString&))); + connect(base->_c_customPath, TQ_SIGNAL(openFileDialog(KURLRequester *)), this, TQ_SLOT(chooseCustomLib(KURLRequester *))); + connect(base->_c_customPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(customPathChanged(const TQString&))); // Additional libpaths - connect(base->_c_newPath, TQT_SIGNAL(openFileDialog(KURLRequester *)), this, TQT_SLOT(chooseCustomLib(KURLRequester *))); - connect(base->_c_newPath, TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(addThisLibrary(const TQString&))); - connect(base->_c_newPath, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(libTextChanged(const TQString&))); - connect(base->_c_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(addLibrary())); - connect(base->_c_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeLibrary())); - connect(base->_c_libs, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(libSelection())); + connect(base->_c_newPath, TQ_SIGNAL(openFileDialog(KURLRequester *)), this, TQ_SLOT(chooseCustomLib(KURLRequester *))); + connect(base->_c_newPath, TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(addThisLibrary(const TQString&))); + connect(base->_c_newPath, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(libTextChanged(const TQString&))); + connect(base->_c_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(addLibrary())); + connect(base->_c_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeLibrary())); + connect(base->_c_libs, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(libSelection())); // The "Test" button - connect(base->_c_test, TQT_SIGNAL(clicked()), this, TQT_SLOT(testClicked())); + connect(base->_c_test, TQ_SIGNAL(clicked()), this, TQ_SLOT(testClicked())); // The config backend load(); diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp index 821d2e8e4..430261a45 100644 --- a/kcontrol/tdeio/uagentproviderdlg.cpp +++ b/kcontrol/tdeio/uagentproviderdlg.cpp @@ -82,14 +82,14 @@ UAProviderDlg::~UAProviderDlg() void UAProviderDlg::init() { - connect( dlg->pbOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( dlg->pbCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( dlg->pbOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( dlg->pbCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); - connect( dlg->leSite, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged( const TQString&)) ); + connect( dlg->leSite, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged( const TQString&)) ); - connect( dlg->cbAlias, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotActivated(const TQString&)) ); + connect( dlg->cbAlias, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotActivated(const TQString&)) ); dlg->cbAlias->clear(); dlg->cbAlias->insertStringList( m_provider->userAgentAliasList() ); diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp index 7b1f4b3d7..9ee0b58c6 100644 --- a/kcontrol/tdeio/useragentdlg.cpp +++ b/kcontrol/tdeio/useragentdlg.cpp @@ -56,22 +56,22 @@ UserAgentDlg::UserAgentDlg( TQWidget * parent ) dlg->lvDomainPolicyList->setSorting(0); - connect( dlg->cbSendUAString, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); - - connect( dlg->gbDefaultId, TQT_SIGNAL(clicked(int)), - TQT_SLOT(changeDefaultUAModifiers(int))); - - connect( dlg->lvDomainPolicyList, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged()) ); - connect( dlg->lvDomainPolicyList, TQT_SIGNAL(doubleClicked (TQListViewItem *)), - TQT_SLOT(changePressed()) ); - connect( dlg->lvDomainPolicyList, TQT_SIGNAL( returnPressed ( TQListViewItem * ) ), - TQT_SLOT( changePressed() )); - - connect( dlg->pbNew, TQT_SIGNAL(clicked()), TQT_SLOT( addPressed() ) ); - connect( dlg->pbChange, TQT_SIGNAL( clicked() ), TQT_SLOT( changePressed() ) ); - connect( dlg->pbDelete, TQT_SIGNAL( clicked() ), TQT_SLOT( deletePressed() ) ); - connect( dlg->pbDeleteAll, TQT_SIGNAL( clicked() ), TQT_SLOT( deleteAllPressed() ) ); + connect( dlg->cbSendUAString, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); + + connect( dlg->gbDefaultId, TQ_SIGNAL(clicked(int)), + TQ_SLOT(changeDefaultUAModifiers(int))); + + connect( dlg->lvDomainPolicyList, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged()) ); + connect( dlg->lvDomainPolicyList, TQ_SIGNAL(doubleClicked (TQListViewItem *)), + TQ_SLOT(changePressed()) ); + connect( dlg->lvDomainPolicyList, TQ_SIGNAL( returnPressed ( TQListViewItem * ) ), + TQ_SLOT( changePressed() )); + + connect( dlg->pbNew, TQ_SIGNAL(clicked()), TQ_SLOT( addPressed() ) ); + connect( dlg->pbChange, TQ_SIGNAL( clicked() ), TQ_SLOT( changePressed() ) ); + connect( dlg->pbDelete, TQ_SIGNAL( clicked() ), TQ_SLOT( deletePressed() ) ); + connect( dlg->pbDeleteAll, TQ_SIGNAL( clicked() ), TQ_SLOT( deleteAllPressed() ) ); load(); } diff --git a/kcontrol/tdm/background.cpp b/kcontrol/tdm/background.cpp index 832940d7d..c1f459924 100644 --- a/kcontrol/tdm/background.cpp +++ b/kcontrol/tdm/background.cpp @@ -54,14 +54,14 @@ KBackground::KBackground(TQWidget *parent, const char *name) m_simpleConf=new KSimpleConfig(config->readEntry( "BackgroundCfg",KDE_CONFDIR "/tdm/backgroundrc" ) ); m_background = new BGDialog( this, m_simpleConf, false ); - connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(m_background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); // Top layout TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() ); top->addWidget(m_pCBEnable); top->addWidget(m_background); top->addStretch(); - connect( m_pCBEnable, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotEnableChanged()) ); + connect( m_pCBEnable, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotEnableChanged()) ); } KBackground::~KBackground() diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index be0ee58a7..71e09cb0d 100644 --- a/kcontrol/tdm/main.cpp +++ b/kcontrol/tdm/main.cpp @@ -190,34 +190,34 @@ TDModule::TDModule(TQWidget *parent, const char *name, const TQStringList &) appearance = new TDMAppearanceWidget(this); tab->addTab(appearance, i18n("A&ppearance")); - connect(appearance, TQT_SIGNAL(changed(bool)), TQT_SIGNAL( changed(bool))); + connect(appearance, TQ_SIGNAL(changed(bool)), TQ_SIGNAL( changed(bool))); font = new TDMFontWidget(this); tab->addTab(font, i18n("&Font")); - connect(font, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(font, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); background = new KBackground(this); tab->addTab(background, i18n("&Background")); - connect(background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(background, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); sessions = new TDMSessionsWidget(this); tab->addTab(sessions, i18n("&Shutdown")); - connect(sessions, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(sessions, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); users = new TDMUsersWidget(this, 0); tab->addTab(users, i18n("&Users")); - connect(users, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(users, TQT_SIGNAL(setMinMaxUID(int,int)), TQT_SLOT(slotMinMaxUID(int,int))); - connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(clearUsers()), users, TQT_SLOT(slotClearUsers())); + connect(users, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(users, TQ_SIGNAL(setMinMaxUID(int,int)), TQ_SLOT(slotMinMaxUID(int,int))); + connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), users, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(clearUsers()), users, TQ_SLOT(slotClearUsers())); convenience = new TDMConvenienceWidget(this, 0); tab->addTab(convenience, i18n("Con&venience")); - connect(convenience, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); - connect(this, TQT_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotAddUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQT_SLOT(slotDelUsers(const TQMap<TQString,int> &))); - connect(this, TQT_SIGNAL(clearUsers()), convenience, TQT_SLOT(slotClearUsers())); + connect(convenience, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); + connect(this, TQ_SIGNAL(addUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotAddUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(delUsers(const TQMap<TQString,int> &)), convenience, TQ_SLOT(slotDelUsers(const TQMap<TQString,int> &))); + connect(this, TQ_SIGNAL(clearUsers()), convenience, TQ_SLOT(slotClearUsers())); load(); if (getuid() != 0 || !config->checkConfigFilesWritable( true )) { diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp index 5b8ede62e..973d1dc35 100644 --- a/kcontrol/tdm/tdm-appear.cpp +++ b/kcontrol/tdm/tdm-appear.cpp @@ -76,8 +76,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) greetstr_lined = new KLineEdit(group); TQLabel *label = new TQLabel(greetstr_lined, i18n("&Greeting:"), group); hlay->addWidget(label); - connect(greetstr_lined, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); + connect(greetstr_lined, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); hlay->addWidget(greetstr_lined); wtstr = i18n("This is the \"headline\" for TDM's login window. You may want to " "put some nice greeting or information about the operating system here.<p>" @@ -107,8 +107,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) logoRadio = new TQRadioButton( i18n("Sho&w logo"), group ); TQButtonGroup *buttonGroup = new TQButtonGroup( group ); label->setBuddy( buttonGroup ); - connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotAreaRadioClicked(int)) ); - connect( buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed()) ); + connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotAreaRadioClicked(int)) ); + connect( buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed()) ); buttonGroup->hide(); buttonGroup->insert(noneRadio, KdmNone); buttonGroup->insert(clockRadio, KdmClock); @@ -128,7 +128,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) logobutton->setAutoDefault(false); logobutton->setAcceptDrops(true); logobutton->installEventFilter(this); // for drag and drop - connect(logobutton, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogoButtonClicked())); + connect(logobutton, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogoButtonClicked())); hglay->addWidget(logoLabel, 1, 0); hglay->addWidget(logobutton, 1, 1, TQt::AlignCenter); hglay->addRowSpacing(1, 110); @@ -150,14 +150,14 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) TQLabel *xLineLabel = new TQLabel(i18n("&X:"), group); hglay->addWidget(xLineLabel, 0, 1); xLineEdit = new TQLineEdit (group); - connect( xLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() )); + connect( xLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() )); hglay->addWidget(xLineEdit, 0, 2); xLineLabel->setBuddy(xLineEdit); xLineEdit->setValidator(posValidator); TQLabel *yLineLabel = new TQLabel(i18n("&Y:"), group); hglay->addWidget(yLineLabel, 1, 1); yLineEdit = new TQLineEdit (group); - connect( yLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( changed() )); + connect( yLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( changed() )); hglay->addWidget(yLineEdit, 1, 2); yLineLabel->setBuddy(yLineEdit); yLineEdit->setValidator(posValidator); @@ -179,7 +179,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) compositorcombo->insertItem( "", i18n("None") ); compositorcombo->insertItem( TDE_COMPOSITOR_BINARY, i18n("Trinity compositor") ); label = new TQLabel(compositorcombo, i18n("Compositor:"), group); - connect(compositorcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(compositorcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hglay->addWidget(label, 0, 0); hglay->addWidget(compositorcombo, 0, 1); wtstr = i18n("Choose a compositor to be used in TDM. Note that the chosen compositor will continue to run after login."); @@ -191,7 +191,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) loadGuiStyles(guicombo); guicombo->listBox()->sort(); label = new TQLabel(guicombo, i18n("GUI s&tyle:"), group); - connect(guicombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(guicombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hglay->addWidget(label, 1, 0); hglay->addWidget(guicombo, 1, 1); wtstr = i18n("You can choose a basic GUI style here that will be " @@ -204,7 +204,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) loadColorSchemes(colcombo); colcombo->listBox()->sort(); label = new TQLabel(colcombo, i18n("&Color scheme:"), group); - connect(colcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(colcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hglay->addWidget(label, 2, 0); hglay->addWidget(colcombo, 2, 1); wtstr = i18n("You can choose a basic Color Scheme here that will be " @@ -217,7 +217,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) echocombo->insertItem("OneStar", i18n("One Star")); echocombo->insertItem("ThreeStars", i18n("Three Stars")); label = new TQLabel(echocombo, i18n("Echo &mode:"), group); - connect(echocombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(echocombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hglay->addWidget(label, 3, 0); hglay->addWidget(echocombo, 3, 1); wtstr = i18n("You can choose whether and how TDM shows your password when you type it."); @@ -231,7 +231,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) langcombo = new KLanguageButton(group); loadLanguageList(langcombo); - connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed())); + connect(langcombo, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(changed())); label = new TQLabel(langcombo, i18n("Languag&e:"), group); TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); hbox->setColStretch(1, 1); @@ -247,7 +247,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) vbox->addWidget(group); sakbox = new TQCheckBox( i18n("Enable Secure Attention Key"), group ); - connect( sakbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( sakbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); TQGridLayout *hbox2 = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); hbox2->setColStretch(1, 1); hbox2->addWidget(sakbox, 1, 0); @@ -266,7 +266,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) vbox->addWidget(group); kbdledbox = new TQCheckBox(i18n("Sync keyboard led status"), group); - connect(kbdledbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(kbdledbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); TQGridLayout *hbox3 = new TQGridLayout(group->layout(), 2, 2, KDialog::spacingHint()); hbox3->setColStretch(1, 1); hbox3->addWidget(kbdledbox, 1, 0); @@ -277,8 +277,8 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name) void TDMAppearanceWidget::makeReadOnly() { - disconnect( logobutton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLogoButtonClicked()) ); + disconnect( logobutton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLogoButtonClicked()) ); logobutton->setAcceptDrops(false); greetstr_lined->setReadOnly(true); noneRadio->setEnabled(false); diff --git a/kcontrol/tdm/tdm-conv.cpp b/kcontrol/tdm/tdm-conv.cpp index 487e8adbb..a324e866a 100644 --- a/kcontrol/tdm/tdm-conv.cpp +++ b/kcontrol/tdm/tdm-conv.cpp @@ -55,7 +55,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature." " This applies only to TDM's graphical login." " Think twice before enabling this!") ); - connect(alGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(alGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); TQWidget *hlpw1 = new TQWidget( alGroup ); userlb = new KComboBox( hlpw1 ); @@ -64,7 +64,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) hlpl1->setColStretch(2, 1); hlpl1->addWidget(u_label, 0, 0); hlpl1->addWidget(userlb, 0, 1); - connect(userlb, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotChanged())); + connect(userlb, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotChanged())); wtstr = i18n("Select the user to be logged in automatically."); TQWhatsThis::add( u_label, wtstr ); TQWhatsThis::add( userlb, wtstr ); @@ -74,18 +74,18 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) d_label = new TQLabel( delaysb, i18n("D&elay:"), hlpw1 ); hlpl1->addWidget(d_label, 1, 0); hlpl1->addWidget(delaysb, 1, 1); - connect(delaysb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(delaysb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); wtstr = i18n("The delay (in seconds) before the automatic login kicks in. " "This feature is also known as \"timed login\"."); TQWhatsThis::add( d_label, wtstr ); TQWhatsThis::add( delaysb, wtstr ); againcb = new TQCheckBox( i18n("P&ersistent"), alGroup ); - connect( againcb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); + connect( againcb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( againcb, i18n("Normally, automatic login is performed only " "when TDM starts up. If this is checked, automatic login will kick in " "after finishing a session as well.") ); autoLockCheck = new TQCheckBox( i18n("Loc&k session"), alGroup ); - connect( autoLockCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged()) ); + connect( autoLockCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( autoLockCheck, i18n("If checked, the automatically started session " "will be locked immediately (provided it is a TDE session). This can " "be used to obtain a super-fast login restricted to one user.") ); @@ -94,8 +94,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) puGroup = new TQVButtonGroup(i18n("Preselect User"), this ); puGroup->setSizePolicy( vpref ); - connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged())); - connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged())); + connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPresChanged())); + connect(puGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotChanged())); npRadio = new TQRadioButton(i18n("preselected user", "&None"), puGroup); ppRadio = new TQRadioButton(i18n("Prev&ious"), puGroup); TQWhatsThis::add( ppRadio, i18n("Preselect the user that logged in previously. " @@ -106,7 +106,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) TQWidget *hlpw = new TQWidget(puGroup); puserlb = new KComboBox(true, hlpw); pu_label = new TQLabel(puserlb, i18n("Us&er:"), hlpw); - connect(puserlb, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotChanged())); + connect(puserlb, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotChanged())); wtstr = i18n("Select the user to be preselected for login. " "This box is editable, so you can specify an arbitrary non-existent " "user to mislead possible attackers."); @@ -121,7 +121,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) "in the password field instead of the user field after preselecting a user. " "Use this to save one key press per login, if the preselection usually does not need to " "be changed.") ); - connect(cbjumppw, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(cbjumppw, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); npGroup = new TQVGroupBox(i18n("Enable Password-&Less Logins"), this ); npGroup->setCheckable( true ); @@ -131,7 +131,7 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) " password. This applies only to TDM's graphical login." " Think twice before enabling this!") ); - connect(npGroup, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(npGroup, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); pl_label = new TQLabel(i18n("No password re&quired for:"), npGroup); npuserlv = new TDEListView(npGroup); @@ -141,8 +141,8 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) npuserlv->setResizeMode(TQListView::LastColumn); TQWhatsThis::add(npuserlv, i18n("Check all users you want to allow a password-less login for." " Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.")); - connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); btGroup = new TQVGroupBox( i18n("Miscellaneous"), this ); @@ -152,12 +152,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) " X server crash; note that this can open a security hole: if you use" " a screen locker than TDE's integrated one, this will make" " circumventing a password-secured screen lock possible.") ); - connect(cbarlen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(cbarlen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); allowRootLogin = new TQCheckBox(i18n("Allow &Root Login"), btGroup); TQWhatsThis::add( allowRootLogin, i18n("When set this allows root logins directly in TDM. " "This is discouraged by some people. Use with caution.") ); - connect(allowRootLogin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(allowRootLogin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); TQGridLayout *main = new TQGridLayout(this, 5, 2, 10); main->addWidget(paranoia, 0, 0); @@ -169,12 +169,12 @@ TDMConvenienceWidget::TDMConvenienceWidget(TQWidget *parent, const char *name) main->setColStretch(1, 2); main->setRowStretch(3, 1); - connect( userlb, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotSetAutoUser( const TQString & )) ); - connect( puserlb, TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotSetPreselUser( const TQString & )) ); - connect( npuserlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateNoPassUser( TQListViewItem * )) ); + connect( userlb, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotSetAutoUser( const TQString & )) ); + connect( puserlb, TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotSetPreselUser( const TQString & )) ); + connect( npuserlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateNoPassUser( TQListViewItem * )) ); } diff --git a/kcontrol/tdm/tdm-font.cpp b/kcontrol/tdm/tdm-font.cpp index 65dbea179..0aa2e4a70 100644 --- a/kcontrol/tdm/tdm-font.cpp +++ b/kcontrol/tdm/tdm-font.cpp @@ -47,7 +47,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) stdFontChooser = new TDEFontRequester(this); label->setBuddy(stdFontChooser); TQWhatsThis::add( stdFontChooser, i18n("This changes the font which is used for all the text in the login manager except for the greeting and failure messages.") ); - connect(stdFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(stdFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 1, 0); ml->addWidget(stdFontChooser, 1, 1); @@ -55,7 +55,7 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) failFontChooser = new TDEFontRequester(this); label->setBuddy(failFontChooser); TQWhatsThis::add( failFontChooser, i18n("This changes the font which is used for failure messages in the login manager.") ); - connect(failFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(failFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 2, 0); ml->addWidget(failFontChooser, 2, 1); @@ -63,14 +63,14 @@ TDMFontWidget::TDMFontWidget(TQWidget *parent, const char *name) greetingFontChooser = new TDEFontRequester(this); label->setBuddy(greetingFontChooser); TQWhatsThis::add( greetingFontChooser, i18n("This changes the font which is used for the login manager's greeting.") ); - connect(greetingFontChooser, TQT_SIGNAL(fontSelected(const TQFont&)),this,TQT_SLOT(configChanged())); + connect(greetingFontChooser, TQ_SIGNAL(fontSelected(const TQFont&)),this,TQ_SLOT(configChanged())); ml->addWidget(label, 3, 0); ml->addWidget(greetingFontChooser, 3, 1); aacb = new TQCheckBox (i18n("Use anti-aliasing for fonts"), this); TQWhatsThis::add( aacb, i18n("If you check this box and your X-Server has the Xft extension, " "fonts will be antialiased (smoothed) in the login dialog.") ); - connect(aacb, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(configChanged())); + connect(aacb, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(configChanged())); ml->addMultiCellWidget(aacb, 4, 4, 0, 1); ml->setRowStretch(5, 10); } diff --git a/kcontrol/tdm/tdm-shut.cpp b/kcontrol/tdm/tdm-shut.cpp index da120ae4c..6d6ed8cd7 100644 --- a/kcontrol/tdm/tdm-shut.cpp +++ b/kcontrol/tdm/tdm-shut.cpp @@ -54,13 +54,13 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) sdlcombo->insertItem(i18n("Everybody"), SdAll); sdlcombo->insertItem(i18n("Only Root"), SdRoot); sdlcombo->insertItem(i18n("Nobody"), SdNone); - connect(sdlcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(sdlcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); sdrcombo = new TQComboBox( FALSE, group0 ); sdrlabel = new TQLabel (sdrcombo, i18n ("&Remote:"), group0); sdrcombo->insertItem(i18n("Everybody"), SdAll); sdrcombo->insertItem(i18n("Only Root"), SdRoot); sdrcombo->insertItem(i18n("Nobody"), SdNone); - connect(sdrcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(sdrcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); TQWhatsThis::add( group0, i18n("Here you can select who is allowed to shutdown" " the computer using TDM. You can specify different values for local (console) and remote displays. " "Possible values are:<ul>" @@ -73,16 +73,16 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) shutdown_lined = new KURLRequester(group1); TQLabel *shutdown_label = new TQLabel(shutdown_lined, i18n("H&alt:"), group1); - connect(shutdown_lined, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); + connect(shutdown_lined, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/halt"); TQWhatsThis::add( shutdown_label, wtstr ); TQWhatsThis::add( shutdown_lined, wtstr ); restart_lined = new KURLRequester(group1); TQLabel *restart_label = new TQLabel(restart_lined, i18n("Reb&oot:"), group1); - connect(restart_lined, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(changed())); + connect(restart_lined, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(changed())); wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/reboot"); TQWhatsThis::add( restart_label, wtstr ); TQWhatsThis::add( restart_lined, wtstr ); @@ -97,13 +97,13 @@ TDMSessionsWidget::TDMSessionsWidget(TQWidget *parent, const char *name) bm_combo->insertItem("Lilo", i18n("Lilo")); #endif TQLabel *bm_label = new TQLabel( bm_combo, i18n("Boot manager:"), group4 ); - connect(bm_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(bm_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog."); TQWhatsThis::add( bm_label, wtstr ); TQWhatsThis::add( bm_combo, wtstr ); tsbox = new TQCheckBox( i18n("Restart X-Server with session exit"), this ); - connect( tsbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( tsbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); wtstr = i18n("Whether the login manager should restart the local X-Server after a session exit instead of resetting. Use this option when the X-Server leaks memory, crashes the system on reset attempts, or otherwise exhibits display issues or artifacts."); TQWhatsThis::add( tsbox, wtstr ); diff --git a/kcontrol/tdm/tdm-users.cpp b/kcontrol/tdm/tdm-users.cpp index aeaeb9347..5195c3bfd 100644 --- a/kcontrol/tdm/tdm-users.cpp +++ b/kcontrol/tdm/tdm-users.cpp @@ -104,19 +104,19 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) minlab->setBuddy( leminuid ); leminuid->setSizePolicy( sp_ign_fix ); leminuid->setValidator( valid ); - connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); - connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); + connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) ); + connect( leminuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) ); TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup ); lemaxuid = new KLineEdit( minGroup ); maxlab->setBuddy( lemaxuid ); lemaxuid->setSizePolicy( sp_ign_fix ); lemaxuid->setValidator( valid ); - connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) ); - connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) ); + connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotChanged()) ); + connect(lemaxuid, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotMinMaxChanged()) ); usrGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("Users"), this ); - connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotShowOpts()) ); - connect( usrGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); + connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotShowOpts()) ); + connect( usrGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) ); cbshowlist = new TQCheckBox( i18n("Show list"), usrGroup ); TQWhatsThis::add( cbshowlist, i18n("If this option is checked, TDM will show a list of users," " so users can click on their name or image rather than typing in their login.") ); @@ -129,7 +129,7 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) "If not checked, select only the checked users. " "If checked, select all non-system users, except the checked ones.")); cbusrsrt = new TQCheckBox( i18n("Sor&t users"), usrGroup ); - connect( cbusrsrt, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotChanged()) ); + connect( cbusrsrt, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotChanged()) ); TQWhatsThis::add( cbusrsrt, i18n("If this is checked, TDM will alphabetically sort the user list." " Otherwise users are listed in the order they appear in the password file.") ); @@ -140,27 +140,27 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) optinlv->setResizeMode( TQListView::LastColumn ); TQWhatsThis::add( optinlv, i18n("TDM will show all checked users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); wstack->addWidget( optinlv ); - connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateOptIn( TQListViewItem * )) ); - connect( optinlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateOptIn( TQListViewItem * )) ); + connect( optinlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); optoutlv = new TDEListView( this ); optoutlv->addColumn( i18n("Hidden Users") ); optoutlv->setResizeMode( TQListView::LastColumn ); TQWhatsThis::add( optoutlv, i18n("TDM will show all non-checked non-system users. Entries denoted with '@' are user groups. Checking a group is like checking all users in that group.") ); wstack->addWidget( optoutlv ); - connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUpdateOptOut( TQListViewItem * )) ); - connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotChanged()) ); + connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUpdateOptOut( TQListViewItem * )) ); + connect( optoutlv, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotChanged()) ); faceGroup = new TQButtonGroup( 5, TQt::Vertical, i18n("User Image Source"), this ); TQWhatsThis::add( faceGroup, i18n("Here you can specify where TDM will obtain the images that represent users." " \"Admin\" represents the global folder; these are the pictures you can set below." " \"User\" means that TDM should read the user's $HOME/.face.icon file." " The two selections in the middle define the order of preference if both sources are available.") ); - connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) ); - connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) ); + connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotFaceOpts()) ); + connect( faceGroup, TQ_SIGNAL(clicked( int )), TQ_SLOT(slotChanged()) ); rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup ); rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup ); rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup ); @@ -170,23 +170,23 @@ TDMUsersWidget::TDMUsersWidget(TQWidget *parent, const char *name) TQWidget *hlpw = new TQWidget( picGroup ); usercombo = new KComboBox( hlpw ); TQWhatsThis::add( usercombo, i18n("The user the image below belongs to.") ); - connect( usercombo, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotUserSelected()) ); + connect( usercombo, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotUserSelected()) ); TQLabel *userlabel = new TQLabel( usercombo, i18n("User:"), hlpw ); userbutton = new TQPushButton( hlpw ); userbutton->setAcceptDrops( true ); userbutton->installEventFilter( this ); // for drag and drop uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48; userbutton->setFixedSize( sz, sz ); - connect( userbutton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotUserButtonClicked()) ); + connect( userbutton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotUserButtonClicked()) ); TQToolTip::add( userbutton, i18n("Click or drop an image here") ); TQWhatsThis::add( userbutton, i18n("Here you can see the image assigned to the user selected in the combo box above. Click on the image button to select from a list" " of images or drag and drop your own image on to the button (e.g. from Konqueror).") ); rstuserbutton = new TQPushButton( i18n("Unset"), hlpw ); TQWhatsThis::add( rstuserbutton, i18n("Click this button to make TDM use the default image for the selected user.") ); - connect( rstuserbutton, TQT_SIGNAL(clicked()), - TQT_SLOT(slotUnsetUserPix()) ); + connect( rstuserbutton, TQ_SIGNAL(clicked()), + TQ_SLOT(slotUnsetUserPix()) ); TQGridLayout *hlpl = new TQGridLayout( hlpw, 3, 2, 0, KDialog::spacingHint() ); hlpl->addWidget( userlabel, 0, 0 ); // hlpl->addSpacing( KDialog::spacingHint() ); @@ -227,7 +227,7 @@ void TDMUsersWidget::makeReadOnly() rbprefusr->setEnabled(false); rbusronly->setEnabled(false); wstack->setEnabled(false); - disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) ); + disconnect( userbutton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUserButtonClicked()) ); userbutton->setAcceptDrops(false); rstuserbutton->setEnabled(false); } diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index 223a201d1..de61a61b2 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/kcontrol/usbview/kcmusb.cpp @@ -63,9 +63,9 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &) // 1 sec seems to be a good compromise between latency and polling load. refreshTimer->start(1000); - connect(refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refresh())); - connect(_devices, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(refreshTimer, TQ_SIGNAL(timeout()), TQ_SLOT(refresh())); + connect(_devices, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmusb"), I18N_NOOP("TDE USB Viewer"), diff --git a/kcontrol/view1394/view1394.cpp b/kcontrol/view1394/view1394.cpp index d6f879fd4..a3815b90f 100644 --- a/kcontrol/view1394/view1394.cpp +++ b/kcontrol/view1394/view1394.cpp @@ -85,8 +85,8 @@ View1394::View1394(TQWidget *parent, const char *name) m_view->m_listview->setColumnAlignment(8, AlignRight); m_view->m_listview->setColumnAlignment(9, AlignRight); box->addWidget(m_view); - connect(m_view->m_busResetPb, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateBusReset())); - connect(&m_rescanTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(rescanBus())); + connect(m_view->m_busResetPb, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateBusReset())); + connect(&m_rescanTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(rescanBus())); m_notifiers.setAutoDelete(true); rescanBus(); } @@ -188,7 +188,7 @@ void View1394::rescanBus() raw1394_set_userdata(handle, this); raw1394_set_bus_reset_handler(handle, my_reset_handler); TQSocketNotifier *notif=new TQSocketNotifier(raw1394_get_fd(handle),TQSocketNotifier::Read); - connect(notif, TQT_SIGNAL(activated(int)), this, TQT_SLOT(callRaw1394EventLoop(int))); + connect(notif, TQ_SIGNAL(activated(int)), this, TQ_SLOT(callRaw1394EventLoop(int))); m_notifiers.append(notif); m_handles.append(handle); diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index f5d74a191..2c0fd2bba 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -59,7 +59,7 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name) config = new TDEConfig("kdeglobals", false, false); ksplashrc = new TDEConfig("ksplashrc", false, false); - connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearIndicator())); + connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearIndicator())); TQGridLayout *grid = new TQGridLayout(this, 1, 1, KDialog::marginHint(), KDialog::spacingHint()); @@ -91,14 +91,14 @@ KCMXinerama::KCMXinerama(TQWidget *parent, const char *name) xw->headTable->setRowLabels(dpyList); - connect(xw->_ksplashDisplay, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(windowIndicator(int))); - connect(xw->_unmanagedDisplay, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(windowIndicator(int))); - connect(xw->_identify, TQT_SIGNAL(clicked()), - this, TQT_SLOT(indicateWindows())); + connect(xw->_ksplashDisplay, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(windowIndicator(int))); + connect(xw->_unmanagedDisplay, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(windowIndicator(int))); + connect(xw->_identify, TQ_SIGNAL(clicked()), + this, TQ_SLOT(indicateWindows())); - connect(xw, TQT_SIGNAL(configChanged()), this, TQT_SLOT(changed())); + connect(xw, TQ_SIGNAL(configChanged()), this, TQ_SLOT(changed())); } else { // no Xinerama TQLabel *ql = new TQLabel(i18n("<qt><p>This module is only for configuring systems with a single desktop spread across multiple monitors. You do not appear to have this configuration.</p></qt>"), this); grid->addWidget(ql, 0, 0); diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index f95bb2ff2..0870432fc 100644 --- a/kdcop/kdcopwindow.cpp +++ b/kdcop/kdcopwindow.cpp @@ -133,7 +133,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem TQString mainWindowName= rx.cap(1) + "-mainwindow#1" ; TQByteArray data; - int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&))); + int callId=kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&))); if(!callId) { @@ -142,7 +142,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem TQDataStream arg(data, IO_WriteOnly); arg << TQCString( "MainWindow" ); - kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQT_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& ))); + kapp->dcopClient()->callAsync( app_, "qt", "find(TQCString)", data, this, TQ_SLOT(slotGotWindowName(int, const TQCString&, const TQByteArray& ))); } } @@ -192,7 +192,7 @@ void DCOPBrowserApplicationItem::slotGotWindowName(int /*callId*/, const TQCStri { TQByteArray data; kapp->dcopClient()->callAsync( app_, mainWindowName.utf8(), "icon()", data, - this, TQT_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&))); + this, TQ_SLOT(retreiveIcon(int, const TQCString&, const TQByteArray&))); } } } @@ -297,18 +297,18 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) // mainView->lv->addColumn(i18n("Function")); mainView->lv->setDragAutoScroll( FALSE ); mainView->lv->setRootIsDecorated( TRUE ); - connect(mainView->lv, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotCallFunction(TQListViewItem *))); - connect(mainView->lv, TQT_SIGNAL(currentChanged(TQListViewItem *)), TQT_SLOT(slotCurrentChanged(TQListViewItem *))); - connect(mainView->lb_replyData, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - TQT_SLOT(slotResultListContextMenu(TQListBoxItem*, const TQPoint&))); + connect(mainView->lv, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotCallFunction(TQListViewItem *))); + connect(mainView->lv, TQ_SIGNAL(currentChanged(TQListViewItem *)), TQ_SLOT(slotCurrentChanged(TQListViewItem *))); + connect(mainView->lb_replyData, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + TQ_SLOT(slotResultListContextMenu(TQListBoxItem*, const TQPoint&))); // set up the actions - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - KStdAction::copy( this, TQT_SLOT( slotCopy()), actionCollection() ); - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); + KStdAction::copy( this, TQ_SLOT( slotCopy()), actionCollection() ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); - (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQT_SLOT( slotReload() ), actionCollection(), "reload" ); + (void) new TDEAction( i18n( "&Reload" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQ_SLOT( slotReload() ), actionCollection(), "reload" ); exeaction = new TDEAction @@ -317,7 +317,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) "application-x-executable", CTRL + Key_E, this, - TQT_SLOT(slotItemExecuted()), + TQ_SLOT(slotItemExecuted()), actionCollection(), "execute" ); @@ -328,7 +328,7 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) langmode = new TDESelectAction ( i18n("Language Mode"), CTRL + Key_M, this, - TQT_SLOT(slotMode()), + TQ_SLOT(slotMode()), actionCollection(), "langmode"); langmode->setEditable(false); @@ -339,22 +339,22 @@ KDCOPWindow::KDCOPWindow(TQWidget *parent, const char * name) connect ( dcopClient, - TQT_SIGNAL(applicationRegistered(const TQCString &)), - TQT_SLOT(slotApplicationRegistered(const TQCString &)) + TQ_SIGNAL(applicationRegistered(const TQCString &)), + TQ_SLOT(slotApplicationRegistered(const TQCString &)) ); connect ( dcopClient, - TQT_SIGNAL(applicationRemoved(const TQCString &)), - TQT_SLOT(slotApplicationUnregistered(const TQCString &)) + TQ_SIGNAL(applicationRemoved(const TQCString &)), + TQ_SLOT(slotApplicationUnregistered(const TQCString &)) ); dcopClient->setNotifications(true); createGUI(); setCaption(i18n("DCOP Browser")); mainView->lb_replyData->hide(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFillApplications())); + TQTimer::singleShot(0, this, TQ_SLOT(slotFillApplications())); } @@ -1233,7 +1233,7 @@ void KDCOPWindow::slotMode() void KDCOPWindow::slotResultListContextMenu(TQListBoxItem *item, const TQPoint &point) { TQPopupMenu* contextMenu = new TQPopupMenu(this); - contextMenu->insertItem(i18n("&Copy"), this, TQT_SLOT(slotCopy())); + contextMenu->insertItem(i18n("&Copy"), this, TQ_SLOT(slotCopy())); contextMenu->exec(point); } diff --git a/kdesktop/bgmanager.cpp b/kdesktop/bgmanager.cpp index 7f524ae26..a7078f12e 100644 --- a/kdesktop/bgmanager.cpp +++ b/kdesktop/bgmanager.cpp @@ -97,40 +97,40 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule m_Cache[i]->hash = 0; m_Cache[i]->exp_from = -1; m_Renderer.insert (i, new KVirtualBGRenderer(i,m_pConfig)); - connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int))); + connect(m_Renderer[i], TQ_SIGNAL(imageDone(int)), TQ_SLOT(slotImageDone(int))); m_Renderer[i]->enableTiling( true ); // optimize } #ifdef COMPOSITE m_tPixmap = new KPixmap(kapp->desktop()->size()); m_tPixmap->fill(TQColor(0, 0x0)); - connect(myApp, TQT_SIGNAL(cmBackgroundChanged( bool )), - TQT_SLOT(slotCmBackgroundChanged( bool ))); + connect(myApp, TQ_SIGNAL(cmBackgroundChanged( bool )), + TQ_SLOT(slotCmBackgroundChanged( bool ))); #endif configure(); m_pTimer = new TQTimer(this); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); m_pTimer->start( 60000 ); /*CrossFade's config*/ m_crossTimer = new TQTimer(this); - connect(m_crossTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCrossFadeTimeout())); + connect(m_crossTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCrossFadeTimeout())); resizingDesktop = true; /*Ends here*/ - connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopChanged(int)), - TQT_SLOT(slotChangeDesktop(int))); - connect(m_pKwinmodule, TQT_SIGNAL(numberOfDesktopsChanged(int)), - TQT_SLOT(slotChangeNumberOfDesktops(int))); - connect(m_pKwinmodule, TQT_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)), - TQT_SLOT(slotChangeViewport(int, const TQPoint&))); + connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopChanged(int)), + TQ_SLOT(slotChangeDesktop(int))); + connect(m_pKwinmodule, TQ_SIGNAL(numberOfDesktopsChanged(int)), + TQ_SLOT(slotChangeNumberOfDesktops(int))); + connect(m_pKwinmodule, TQ_SIGNAL(currentDesktopViewportChanged(int, const TQPoint&)), + TQ_SLOT(slotChangeViewport(int, const TQPoint&))); #if (TQT_VERSION-0 >= 0x030200) - connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support + connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); // RANDR support #endif TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop())); @@ -338,7 +338,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num) m_Cache[i]->hash = 0; m_Cache[i]->exp_from = -1; m_Renderer.insert(i, new KVirtualBGRenderer(i,m_pConfig)); - connect(m_Renderer[i], TQT_SIGNAL(imageDone(int)), TQT_SLOT(slotImageDone(int))); + connect(m_Renderer[i], TQ_SIGNAL(imageDone(int)), TQ_SLOT(slotImageDone(int))); m_Renderer[i]->enableTiling( true ); // optimize } } @@ -542,7 +542,7 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk) if( !root_cleared ) { // clear the root window pixmap set by tdm root_cleared = true; - TQTimer::singleShot( 0, this, TQT_SLOT( clearRoot())); + TQTimer::singleShot( 0, this, TQ_SLOT( clearRoot())); // but make the pixmap visible until m_pDesktop is visible TDEApplication::desktop()->screen()->setErasePixmap(*ep); TDEApplication::desktop()->screen()->erase(); @@ -681,7 +681,7 @@ void KBackgroundManager::slotImageDone(int desk) { m_bBgInitDone = true; emit initDone(); - TQTimer::singleShot( 30000, this, TQT_SLOT( saveImages())); + TQTimer::singleShot( 30000, this, TQ_SLOT( saveImages())); do_cleanup = false; } } diff --git a/kdesktop/desktop.cpp b/kdesktop/desktop.cpp index fef324797..e7681b1f2 100644 --- a/kdesktop/desktop.cpp +++ b/kdesktop/desktop.cpp @@ -184,28 +184,28 @@ KDesktop::KDesktop( SaverEngine* saver, bool x_root_hack, bool wait_for_kded ) : setGeometry( TQApplication::desktop()->geometry() ); lower(); - connect( kapp, TQT_SIGNAL( shutDown() ), - this, TQT_SLOT( slotShutdown() ) ); + connect( kapp, TQ_SIGNAL( shutDown() ), + this, TQ_SLOT( slotShutdown() ) ); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), - this, TQT_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), + this, TQ_SLOT(slotSettingsChanged(int))); kapp->addKipcEventMask(KIPC::SettingsChanged); kapp->addKipcEventMask(KIPC::IconChanged); - connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int))); + connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int))); - connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), - this, TQT_SLOT(slotDatabaseChanged())); + connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()), + this, TQ_SLOT(slotDatabaseChanged())); m_pIconView = 0; m_pRootWidget = 0; bgMgr = 0; initRoot(); - TQTimer::singleShot(0, this, TQT_SLOT( slotStart() )); + TQTimer::singleShot(0, this, TQ_SLOT( slotStart() )); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support - connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); + connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); #endif } @@ -238,21 +238,21 @@ KDesktop::initRoot() XSelectInput(dpy, root, attrs.your_event_mask | ButtonPressMask); m_pRootWidget = new KRootWidget; - connect(m_pRootWidget, TQT_SIGNAL(wheelRolled(int)), this, TQT_SLOT(slotSwitchDesktops(int))); - connect(m_pRootWidget, TQT_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQT_SLOT(handleColorDropEvent(TQDropEvent*)) ); - connect(m_pRootWidget, TQT_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQT_SLOT(handleImageDropEvent(TQDropEvent*)) ); - connect(m_pRootWidget, TQT_SIGNAL(newWallpaper(const KURL&)), this, TQT_SLOT(slotNewWallpaper(const KURL&)) ); + connect(m_pRootWidget, TQ_SIGNAL(wheelRolled(int)), this, TQ_SLOT(slotSwitchDesktops(int))); + connect(m_pRootWidget, TQ_SIGNAL(colorDropEvent(TQDropEvent*)), this, TQ_SLOT(handleColorDropEvent(TQDropEvent*)) ); + connect(m_pRootWidget, TQ_SIGNAL(imageDropEvent(TQDropEvent*)), this, TQ_SLOT(handleImageDropEvent(TQDropEvent*)) ); + connect(m_pRootWidget, TQ_SIGNAL(newWallpaper(const KURL&)), this, TQ_SLOT(slotNewWallpaper(const KURL&)) ); // Geert Jansen: backgroundmanager belongs here // TODO tell KBackgroundManager if we change widget() bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule ); bgMgr->setExport(1); - connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone())); + connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone())); if (!m_bInit) { delete KRootWm::self(); KRootWm* krootwm = new KRootWm( m_pSaver, this ); // handler for root menu (used by kdesktop on RMB click) - keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock())); + keys->setSlot("Lock Session", krootwm, TQ_SLOT(slotLock())); keys->updateConnections(); } } @@ -263,14 +263,14 @@ KDesktop::initRoot() delete m_pRootWidget; m_pRootWidget = 0; m_pIconView = new KDIconView( this, 0 ); - connect( m_pIconView, TQT_SIGNAL( imageDropEvent( TQDropEvent * ) ), - this, TQT_SLOT( handleImageDropEvent( TQDropEvent * ) ) ); - connect( m_pIconView, TQT_SIGNAL( colorDropEvent( TQDropEvent * ) ), - this, TQT_SLOT( handleColorDropEvent( TQDropEvent * ) ) ); - connect( m_pIconView, TQT_SIGNAL( newWallpaper( const KURL & ) ), - this, TQT_SLOT( slotNewWallpaper( const KURL & ) ) ); - connect( m_pIconView, TQT_SIGNAL( wheelRolled( int ) ), - this, TQT_SLOT( slotSwitchDesktops( int ) ) ); + connect( m_pIconView, TQ_SIGNAL( imageDropEvent( TQDropEvent * ) ), + this, TQ_SLOT( handleImageDropEvent( TQDropEvent * ) ) ); + connect( m_pIconView, TQ_SIGNAL( colorDropEvent( TQDropEvent * ) ), + this, TQ_SLOT( handleColorDropEvent( TQDropEvent * ) ) ); + connect( m_pIconView, TQ_SIGNAL( newWallpaper( const KURL & ) ), + this, TQ_SLOT( slotNewWallpaper( const KURL & ) ) ); + connect( m_pIconView, TQ_SIGNAL( wheelRolled( int ) ), + this, TQ_SLOT( slotSwitchDesktops( int ) ) ); // All the QScrollView/TQWidget-specific stuff should go here, so that we can use // another qscrollview/widget instead of the iconview and use the same code @@ -288,7 +288,7 @@ KDesktop::initRoot() // TODO tell KBackgroundManager if we change widget() bgMgr = new KBackgroundManager( m_pIconView, m_pKwinmodule ); bgMgr->setExport(1); - connect( bgMgr, TQT_SIGNAL( initDone()), TQT_SLOT( backgroundInitDone())); + connect( bgMgr, TQ_SIGNAL( initDone()), TQ_SLOT( backgroundInitDone())); // make sure it is initialized before we first call updateWorkArea() m_pIconView->initConfig( m_bInit ); @@ -315,7 +315,7 @@ KDesktop::initRoot() // if we failed to get the information from kicker wait a little - probably // this is the KDE startup and kicker is simply not running yet m_waitForKicker = new TQTimer(this); - connect(m_waitForKicker, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotNoKicker())); + connect(m_waitForKicker, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotNoKicker())); m_waitForKicker->start(15000, true); } else // we are not called from the ctor, so kicker should already run @@ -330,7 +330,7 @@ KDesktop::initRoot() m_pIconView->start(); delete KRootWm::self(); KRootWm* krootwm = new KRootWm( m_pSaver, this ); // handler for root menu (used by kdesktop on RMB click) - keys->setSlot("Lock Session", krootwm, TQT_SLOT(slotLock())); + keys->setSlot("Lock Session", krootwm, TQ_SLOT(slotLock())); keys->updateConnections(); } } else { @@ -404,9 +404,9 @@ KDesktop::slotStart() keys->readSettings(); keys->updateConnections(); - connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotConfigure())); + connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotConfigure())); - TQTimer::singleShot(300, this, TQT_SLOT( slotUpAndRunning() )); + TQTimer::singleShot(300, this, TQ_SLOT( slotUpAndRunning() )); } void @@ -648,21 +648,21 @@ void KDesktop::setShowDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - TQT_SLOT(slotCurrentDesktopChanged(int))); - connect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - TQT_SLOT(slotWindowChanged(WId,unsigned int))); - connect(twinModule(), TQT_SIGNAL(windowAdded(WId)), - TQT_SLOT(slotWindowAdded(WId))); + connect(twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + TQ_SLOT(slotCurrentDesktopChanged(int))); + connect(twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + TQ_SLOT(slotWindowChanged(WId,unsigned int))); + connect(twinModule(), TQ_SIGNAL(windowAdded(WId)), + TQ_SLOT(slotWindowAdded(WId))); } else { - disconnect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(slotCurrentDesktopChanged(int))); - disconnect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(twinModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(slotWindowAdded(WId))); + disconnect(twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(slotCurrentDesktopChanged(int))); + disconnect(twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + this, TQ_SLOT(slotWindowChanged(WId,unsigned int))); + disconnect(twinModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(slotWindowAdded(WId))); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); @@ -851,7 +851,7 @@ void KDesktop::slotSetVRoot() return; if (KWin::windowInfo(winId()).mappingState() == NET::Withdrawn) { - TQTimer::singleShot(100, this, TQT_SLOT(slotSetVRoot())); + TQTimer::singleShot(100, this, TQ_SLOT(slotSetVRoot())); return; } diff --git a/kdesktop/kcustommenu.cpp b/kdesktop/kcustommenu.cpp index 2e825c0d9..cd1287d3d 100644 --- a/kdesktop/kcustommenu.cpp +++ b/kdesktop/kcustommenu.cpp @@ -57,7 +57,7 @@ KCustomMenu::KCustomMenu(const TQString &configfile, TQWidget *parent) insertMenuItem( menuItem, -1 ); } - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); } KCustomMenu::~KCustomMenu() diff --git a/kdesktop/kdesktopbindings.cpp b/kdesktop/kdesktopbindings.cpp index 71f01abc4..17b27fc65 100644 --- a/kdesktop/kdesktopbindings.cpp +++ b/kdesktop/kdesktopbindings.cpp @@ -1,6 +1,6 @@ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) # define DEF2( name, key3, key4, receiver, slot ) \ keys->insert( name, i18n(name), TQString(), key3, key4, receiver, slot ); #else @@ -28,14 +28,14 @@ if (kapp->authorize("lock_screen")) { #endif - DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQT_SLOT(slotLock()) ); - DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQT_SLOT(slotLock()) ); + DEF2( I18N_NOOP("Lock Session"), ALT+CTRL+TQt::Key_L, WIN+TQt::Key_ScrollLock, KRootWm::self(), TQ_SLOT(slotLock()) ); + DEF2( I18N_NOOP("Lock Session (Hotkey)"), TDEShortcut(TQString("XF86ScreenSaver")), TDEShortcut(TQString("XF86ScreenSaver")), KRootWm::self(), TQ_SLOT(slotLock()) ); #ifndef NOSLOTS } if (kapp->authorize("start_screensaver")) { #endif - DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQT_SLOT(slotSave()) ); + DEF2( I18N_NOOP("Start Screen Saver"), ALT+CTRL+TQt::Key_S, WIN+TQt::Key_S, KRootWm::self(), TQ_SLOT(slotSave()) ); #ifndef NOSLOTS } if (kapp->authorize("logout")) diff --git a/kdesktop/kdiconview.cpp b/kdesktop/kdiconview.cpp index 2c2d0fe0f..7d79d12cf 100644 --- a/kdesktop/kdiconview.cpp +++ b/kdesktop/kdiconview.cpp @@ -162,32 +162,32 @@ KDIconView::KDIconView( TQWidget *parent, const char* name ) // Initialize media handler mMediaListView = new TQListView(); - connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) ); setURL( desktopURL() ); // sets m_url m_desktopDirs = TDEGlobal::dirs()->findDirs( "appdata", "Desktop" ); initDotDirectories(); - connect( this, TQT_SIGNAL( executed( TQIconViewItem * ) ), - TQT_SLOT( slotExecuted( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), - TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), - TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), - TQT_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), - TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL( executed( TQIconViewItem * ) ), + TQ_SLOT( slotExecuted( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), + TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), + TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), + TQ_SLOT( slotMouseButtonClickedKDesktop(int, TQIconViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), + TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); - connect( this, TQT_SIGNAL( enableAction( const char * , bool ) ), - TQT_SLOT( slotEnableAction( const char * , bool ) ) ); + connect( this, TQ_SIGNAL( enableAction( const char * , bool ) ), + TQ_SLOT( slotEnableAction( const char * , bool ) ) ); // Hack: KonqIconViewWidget::slotItemRenamed is not virtual :-( - disconnect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), - this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) ); - connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), - this, TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) ); + disconnect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), + this, TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) ); + connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), + this, TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) ); if (!m_bEditableDesktopIcons) { @@ -370,12 +370,12 @@ void KDIconView::start() m_bNeedSave = false; - connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) ); - connect( m_dirLister, TQT_SIGNAL( started(const KURL&) ), this, TQT_SLOT( slotStarted(const KURL&) ) ); - connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( slotClear() ) ); + connect( m_dirLister, TQ_SIGNAL( started(const KURL&) ), this, TQ_SLOT( slotStarted(const KURL&) ) ); + connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); // Start the directory lister ! m_dirLister->setShowingDotFiles( m_bShowDot ); @@ -420,35 +420,35 @@ void KDIconView::createActions() { if (m_bEditableDesktopIcons) { - TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), &m_actionCollection, "undo" ); - connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ), - undo, TQT_SLOT( setEnabled( bool ) ) ); - connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ), - undo, TQT_SLOT( setText( const TQString & ) ) ); + TDEAction *undo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), &m_actionCollection, "undo" ); + connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ), + undo, TQ_SLOT( setEnabled( bool ) ) ); + connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ), + undo, TQ_SLOT( setText( const TQString & ) ) ); undo->setEnabled( KonqUndoManager::self()->undoAvailable() ); - TDEAction* paCut = KStdAction::cut( this, TQT_SLOT( slotCut() ), &m_actionCollection, "cut" ); + TDEAction* paCut = KStdAction::cut( this, TQ_SLOT( slotCut() ), &m_actionCollection, "cut" ); TDEShortcut cutShortCut = paCut->shortcut(); cutShortCut.remove( KKey( SHIFT + Key_Delete ) ); // used for deleting files paCut->setShortcut( cutShortCut ); - KStdAction::copy( this, TQT_SLOT( slotCopy() ), &m_actionCollection, "copy" ); - KStdAction::paste( this, TQT_SLOT( slotPaste() ), &m_actionCollection, "paste" ); - TDEAction *pasteTo = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" ); + KStdAction::copy( this, TQ_SLOT( slotCopy() ), &m_actionCollection, "copy" ); + KStdAction::paste( this, TQ_SLOT( slotPaste() ), &m_actionCollection, "paste" ); + TDEAction *pasteTo = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &m_actionCollection, "pasteto" ); pasteTo->setEnabled( false ); // only enabled during popupMenu() TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); - new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( refreshIcons() ), &m_actionCollection, "reload" ); + new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( refreshIcons() ), &m_actionCollection, "reload" ); - (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQT_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" ); - (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, this, TQT_SLOT( slotProperties() ), &m_actionCollection, "properties" ); + (void) new TDEAction( i18n( "&Rename" ), /*"editrename",*/ Key_F2, this, TQ_SLOT( renameSelectedItem() ), &m_actionCollection, "rename" ); + (void) new TDEAction( i18n( "&Properties" ), ALT+Key_Return, this, TQ_SLOT( slotProperties() ), &m_actionCollection, "properties" ); TDEAction* trash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, &m_actionCollection, "trash" ); - connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); TDEConfig config("kdeglobals", true, false); config.setGroup( "KDE" ); - (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, this, TQT_SLOT( slotDelete() ), &m_actionCollection, "del" ); + (void) new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, this, TQ_SLOT( slotDelete() ), &m_actionCollection, "del" ); // Initial state of the actions (cut/copy/paste/...) slotSelectionChanged(); @@ -526,8 +526,8 @@ void KDIconView::setAutoAlign( bool b ) else { KRootWm::self()->startup = false; } - connect( this, TQT_SIGNAL( iconMoved() ), - this, TQT_SLOT( lineupIcons() ) ); + connect( this, TQ_SIGNAL( iconMoved() ), + this, TQ_SLOT( lineupIcons() ) ); } else { // change maxItemWidth, because when grid-align was active, it changed this for the grid @@ -535,8 +535,8 @@ void KDIconView::setAutoAlign( bool b ) setMaxItemWidth( TQMAX( TQMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) ); setFont( font() ); // Force calcRect() - disconnect( this, TQT_SIGNAL( iconMoved() ), - this, TQT_SLOT( lineupIcons() ) ); + disconnect( this, TQ_SIGNAL( iconMoved() ), + this, TQ_SLOT( lineupIcons() ) ); } } @@ -1446,7 +1446,7 @@ void KDIconView::showFreeSpaceOverlay(KFileIVI* item) if (!m_paOutstandingFreeSpaceOverlaysTimer) { m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this); - connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotFreeSpaceOverlayStart())); + connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotFreeSpaceOverlayStart())); } m_paOutstandingFreeSpaceOverlaysTimer->start(20, true); } @@ -1466,7 +1466,7 @@ void KDIconView::slotFreeSpaceOverlayStart() if (overlay) { - connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) ); + connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) ); overlay->start(); // Watch out, may emit finished() immediately!! return; // Let it run.... } diff --git a/kdesktop/krootwm.cpp b/kdesktop/krootwm.cpp index 1d7894a93..b33ef60d4 100644 --- a/kdesktop/krootwm.cpp +++ b/kdesktop/krootwm.cpp @@ -89,10 +89,10 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop), if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons")) { menuNew = new KNewMenu( m_actionCollection, "new_menu" ); - connect(menuNew->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotFileNewAboutToShow() ) ); - connect( menuNew, TQT_SIGNAL( activated() ), - m_pDesktop->iconView(), TQT_SLOT( slotNewMenuActivated() ) ); + connect(menuNew->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotFileNewAboutToShow() ) ); + connect( menuNew, TQ_SIGNAL( activated() ), + m_pDesktop->iconView(), TQ_SLOT( slotNewMenuActivated() ) ); } if (kapp->authorizeTDEAction("bookmarks")) @@ -114,8 +114,8 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop), // so we create them here desktopMenu = new TQPopupMenu; windowListMenu = new KWindowListMenu; - connect( windowListMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotWindowListAboutToShow() ) ); + connect( windowListMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotWindowListAboutToShow() ) ); // Create the actions #if 0 @@ -134,80 +134,80 @@ KRootWm::KRootWm(SaverEngine* _saver, KDesktop* _desktop) : TQObject(_desktop), if (kapp->authorize("run_command")) { - new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQT_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" ); - new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQT_SLOT( slotOpenTerminal() ), + new TDEAction(i18n("Run Command..."), "system-run", 0, m_pDesktop, TQ_SLOT( slotExecuteCommand() ), m_actionCollection, "exec" ); + new TDEAction(i18n("Open Terminal Here..." ), "terminal", CTRL+Key_T, this, TQ_SLOT( slotOpenTerminal() ), m_actionCollection, "open_terminal" ); } if (!TDEGlobal::config()->isImmutable()) { - new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQT_SLOT( slotConfigureDesktop() ), + new TDEAction(i18n("Configure Desktop..."), "configure", 0, this, TQ_SLOT( slotConfigureDesktop() ), m_actionCollection, "configdesktop" ); - new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQT_SLOT( slotToggleDesktopMenu() ), + new TDEAction(i18n("Disable Desktop Menu"), 0, this, TQ_SLOT( slotToggleDesktopMenu() ), m_actionCollection, "togglemenubar" ); } - new TDEAction(i18n("Unclutter Windows"), 0, this, TQT_SLOT( slotUnclutterWindows() ), + new TDEAction(i18n("Unclutter Windows"), 0, this, TQ_SLOT( slotUnclutterWindows() ), m_actionCollection, "unclutter" ); - new TDEAction(i18n("Cascade Windows"), 0, this, TQT_SLOT( slotCascadeWindows() ), + new TDEAction(i18n("Cascade Windows"), 0, this, TQ_SLOT( slotCascadeWindows() ), m_actionCollection, "cascade" ); // arrange menu actions if (m_bDesktopEnabled && kapp->authorize("editable_desktop_icons")) { - new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCS() ), + new TDEAction(i18n("By Name (Case Sensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCS() ), m_actionCollection, "sort_ncs"); - new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQT_SLOT( slotArrangeByNameCI() ), + new TDEAction(i18n("By Name (Case Insensitive)"), 0, this, TQ_SLOT( slotArrangeByNameCI() ), m_actionCollection, "sort_nci"); - new TDEAction(i18n("By Size"), 0, this, TQT_SLOT( slotArrangeBySize() ), + new TDEAction(i18n("By Size"), 0, this, TQ_SLOT( slotArrangeBySize() ), m_actionCollection, "sort_size"); - new TDEAction(i18n("By Type"), 0, this, TQT_SLOT( slotArrangeByType() ), + new TDEAction(i18n("By Type"), 0, this, TQ_SLOT( slotArrangeByType() ), m_actionCollection, "sort_type"); - new TDEAction(i18n("By Date"), 0, this, TQT_SLOT( slotArrangeByDate() ), + new TDEAction(i18n("By Date"), 0, this, TQ_SLOT( slotArrangeByDate() ), m_actionCollection, "sort_date"); TDEToggleAction *aSortDirsFirst = new TDEToggleAction( i18n("Directories First"), 0, m_actionCollection, "sort_directoriesfirst" ); - connect( aSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleDirFirst( bool ) ) ); + connect( aSortDirsFirst, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleDirFirst( bool ) ) ); new TDEAction(i18n("Line Up Horizontally"), 0, - this, TQT_SLOT( slotLineupIconsHoriz() ), + this, TQ_SLOT( slotLineupIconsHoriz() ), m_actionCollection, "lineupHoriz" ); new TDEAction(i18n("Line Up Vertically"), 0, - this, TQT_SLOT( slotLineupIconsVert() ), + this, TQ_SLOT( slotLineupIconsVert() ), m_actionCollection, "lineupVert" ); TDEToggleAction *aAutoAlign = new TDEToggleAction(i18n("Align to Grid"), 0, m_actionCollection, "realign" ); - connect( aAutoAlign, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleAutoAlign( bool ) ) ); + connect( aAutoAlign, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleAutoAlign( bool ) ) ); TDEToggleAction *aLockIcons = new TDEToggleAction(i18n("Lock in Place"), 0, m_actionCollection, "lock_icons"); - connect( aLockIcons, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleLockIcons( bool ) ) ); + connect( aLockIcons, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleLockIcons( bool ) ) ); } if (m_bDesktopEnabled) { - new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQT_SLOT( slotRefreshDesktop() ), + new TDEAction(i18n("Refresh Desktop"), "desktop", 0, this, TQ_SLOT( slotRefreshDesktop() ), m_actionCollection, "refresh" ); } // Icons in sync with kicker if (kapp->authorize("lock_screen")) { - new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQT_SLOT( slotLock() ), + new TDEAction(i18n("Lock Session"), "system-lock-screen", 0, this, TQ_SLOT( slotLock() ), m_actionCollection, "lock" ); } if (kapp->authorize("logout")) { new TDEAction(i18n("Log Out \"%1\"...").arg(KUser().loginName()), "system-log-out", 0, - this, TQT_SLOT( slotLogout() ), m_actionCollection, "logout" ); + this, TQ_SLOT( slotLogout() ), m_actionCollection, "logout" ); } if (kapp->authorize("start_new_session") && DM().isSwitchable()) { new TDEAction(i18n("Start New Session"), "fork", 0, this, - TQT_SLOT( slotNewSession() ), m_actionCollection, "newsession" ); + TQ_SLOT( slotNewSession() ), m_actionCollection, "newsession" ); if (kapp->authorize("lock_screen")) { new TDEAction(i18n("Lock Current && Start New Session"), "system-lock-screen", 0, this, - TQT_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" ); + TQ_SLOT( slotLockNNewSession() ), m_actionCollection, "lockNnewsession" ); } } @@ -314,8 +314,8 @@ void KRootWm::buildMenus() if (m_actionCollection->action("newsession")) { sessionsMenu = new TQPopupMenu; - connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) ); - connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) ); + connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) ); + connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) ); } if (menuBar) { @@ -489,7 +489,7 @@ void KRootWm::buildMenus() desktopMenu->removeItem(lastSep); } - connect( desktopMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotFileNewAboutToShow() ) ); + connect( desktopMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotFileNewAboutToShow() ) ); if (menuBar) { menuBar->insertItem(i18n("File"), file); @@ -637,13 +637,13 @@ void KRootWm::slotWindowList() { else r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos())); windowListMenu->init(); - disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice + disconnect( windowListMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice // windowListMenu->rect() is not valid before showing, use sizeHint() windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center()); windowListMenu->selectActiveWindow(); // make the popup more useful - connect( windowListMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotWindowListAboutToShow() ) ); + connect( windowListMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotWindowListAboutToShow() ) ); } void KRootWm::slotSwitchUser() { @@ -657,11 +657,11 @@ void KRootWm::slotSwitchUser() { else r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos())); slotPopulateSessions(); - disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice + disconnect( sessionsMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center()); - connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotPopulateSessions() ) ); + connect( sessionsMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotPopulateSessions() ) ); } void KRootWm::slotArrangeByNameCS() @@ -786,7 +786,7 @@ void KRootWm::slotConfigureDesktop() { if (!m_configDialog) { m_configDialog = new KCMultiDialog( (TQWidget*)0, "configureDialog" ); - connect(m_configDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigClosed())); + connect(m_configDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigClosed())); TQStringList modules = configModules(); for (TQStringList::const_iterator it = modules.constBegin(); it != modules.constEnd(); ++it) diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 1e2499ea2..67a55192f 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/kdesktop/kwebdesktop/kwebdesktop.cpp @@ -52,10 +52,10 @@ KWebDesktopRun::KWebDesktopRun( KWebDesktop* webDesktop, const KURL & url ) { kdDebug() << "KWebDesktopRun::KWebDesktopRun starting get" << endl; TDEIO::Job * job = TDEIO::get(m_url, false, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotFinished(TDEIO::Job *))); - connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), - this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &))); + connect( job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotFinished(TDEIO::Job *))); + connect( job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &))); } void KWebDesktopRun::slotMimetype( TDEIO::Job *job, const TQString &_type ) @@ -166,7 +166,7 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType ) ((TQScrollView *)htmlPart->widget())->setHScrollBarMode( TQScrollView::AlwaysOff ); ((TQScrollView *)htmlPart->widget())->setVScrollBarMode( TQScrollView::AlwaysOff ); - connect( htmlPart, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); + connect( htmlPart, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) ); m_part = htmlPart; } else { // Try to find an appropriate viewer component @@ -176,13 +176,13 @@ KParts::ReadOnlyPart* KWebDesktop::createPart( const TQString& mimeType ) kdWarning() << "No handler found for " << mimeType << endl; else { kdDebug() << "Loaded " << m_part->className() << endl; - connect( m_part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); + connect( m_part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); } } if ( m_part ) { - connect( m_part, TQT_SIGNAL( canceled(const TQString &) ), - this, TQT_SLOT( slotCompleted() ) ); + connect( m_part, TQ_SIGNAL( canceled(const TQString &) ), + this, TQ_SLOT( slotCompleted() ) ); } return m_part; } diff --git a/kdesktop/lock/autologout.cpp b/kdesktop/lock/autologout.cpp index 19c6d1e28..ee1d8e1db 100644 --- a/kdesktop/lock/autologout.cpp +++ b/kdesktop/lock/autologout.cpp @@ -83,7 +83,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog" mCountdownTimerId = startTimer(1000/25); - connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity())); + connect(tqApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity())); setFixedSize( sizeHint() ); } diff --git a/kdesktop/lock/lockdlg.cpp b/kdesktop/lock/lockdlg.cpp index 969dcb77a..c8d82e8d9 100644 --- a/kdesktop/lock/lockdlg.cpp +++ b/kdesktop/lock/lockdlg.cpp @@ -237,12 +237,12 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) } setTabOrder( mNewSessButton, mLayoutButton ); - connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked())); + connect(mLayoutButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(layoutClicked())); if (show_cancel_button) { - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK())); - connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK())); + connect(mNewSessButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSwitchUser())); if (!DM().isSwitchable() || !kapp->authorize("switch_user")) { mNewSessButton->hide(); @@ -253,7 +253,7 @@ void PasswordDlg::init(GreeterPluginHandle *plugin) mFailedTimerId = 0; mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT); - connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) ); + connect(tqApp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) ); greet->setInfoMessageDisplay(showInfoMessages); greet->start(); @@ -568,7 +568,7 @@ void PasswordDlg::handleVerify() TQString autoPIN = cdevice->autoPIN(); if (autoPIN != TQString::null) { greet->setPassword(autoPIN); - TQTimer::singleShot(0, this, SLOT(slotOK())); + TQTimer::singleShot(0, this, TQ_SLOT(slotOK())); } } mCardLoginInProgress = false; @@ -712,7 +712,7 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text ) KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); button->setDefault( true ); button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( accept() ) ); TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 ); grid->addWidget( label1, 0, 0, TQt::AlignCenter ); @@ -783,9 +783,9 @@ void PasswordDlg::slotStartNewSession() TQLabel *label2 = new TQLabel( qt_text, winFrame ); KPushButton *okbutton = new KPushButton( KGuiItem(i18n("&Start New Session"), "fork"), winFrame ); okbutton->setDefault( true ); - connect( okbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( accept() ) ); + connect( okbutton, TQ_SIGNAL( clicked() ), dialog, TQ_SLOT( accept() ) ); KPushButton *cbutton = new KPushButton( KStdGuiItem::cancel(), winFrame ); - connect( cbutton, TQT_SIGNAL( clicked() ), dialog, TQT_SLOT( reject() ) ); + connect( cbutton, TQ_SIGNAL( clicked() ), dialog, TQ_SLOT( reject() ) ); TQBoxLayout *mbox = new TQVBoxLayout( winFrame, KDialog::marginHint(), KDialog::spacingHint() ); @@ -901,8 +901,8 @@ void PasswordDlg::slotSwitchUser() SessList sess; if (dm.localSessions( sess )) { lv = new TQListView( winFrame ); - connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQT_SLOT(slotSessionActivated()) ); - connect( lv, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQT_SLOT(accept()) ); + connect( lv, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), TQ_SLOT(slotSessionActivated()) ); + connect( lv, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint&, int)), &dialog, TQ_SLOT(accept()) ); lv->setAllColumnsShowFocus( true ); lv->addColumn( i18n("Session") ); lv->addColumn( i18n("Location") ); @@ -933,16 +933,16 @@ void PasswordDlg::slotSwitchUser() vbox1->addWidget( lv ); btn = new KPushButton( KGuiItem(i18n("session", "&Activate"), "fork"), winFrame ); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSessionActivated()) ); - connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSessionActivated()) ); + connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) ); vbox2->addWidget( btn ); vbox2->addStretch( 2 ); } if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0) { btn = new KPushButton( KGuiItem(i18n("Start &New Session"), "fork"), winFrame ); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartNewSession()) ); - connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(accept()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartNewSession()) ); + connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(accept()) ); if (!p) btn->setEnabled( false ); vbox2->addWidget( btn ); @@ -950,7 +950,7 @@ void PasswordDlg::slotSwitchUser() } btn = new KPushButton( KStdGuiItem::cancel(), winFrame ); - connect( btn, TQT_SIGNAL(clicked()), &dialog, TQT_SLOT(reject()) ); + connect( btn, TQ_SIGNAL(clicked()), &dialog, TQ_SLOT(reject()) ); vbox2->addWidget( btn ); dialog.setFixedSize( dialog.sizeHint() ); @@ -1015,7 +1015,7 @@ void PasswordDlg::attemptCardLogin() { // Bypass initial password prompt greet->start(); greet->setPassword(""); - TQTimer::singleShot(0, this, SLOT(slotOK())); + TQTimer::singleShot(0, this, TQ_SLOT(slotOK())); #endif } diff --git a/kdesktop/lock/lockprocess.cpp b/kdesktop/lock/lockprocess.cpp index f493649f1..0a343d88e 100644 --- a/kdesktop/lock/lockprocess.cpp +++ b/kdesktop/lock/lockprocess.cpp @@ -256,7 +256,7 @@ LockProcess::LockProcess() if (!argb_visual) { // Try to get the root pixmap if (!m_rootPixmap) m_rootPixmap = new KRootPixmap(this); - connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotPaintBackground(const TQPixmap &))); + connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotPaintBackground(const TQPixmap &))); m_rootPixmap->setCustomPainting(true); m_rootPixmap->start(); } @@ -305,9 +305,9 @@ LockProcess::LockProcess() TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - // connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + // connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); // cdevice->enablePINEntryCallbacks(true); } @@ -388,12 +388,12 @@ void LockProcess::init(bool child, bool useBlankOnly) generateBackingImages(); // Connect all signals - connect( mForceContinualLockDisplayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(displayLockDialogIfNeeded()) ); - connect( mHackDelayStartupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(closeDialogAndStartHack()) ); - connect( mEnsureVRootWindowSecurityTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repaintRootWindowIfNeeded()) ); - connect(tqApp, TQT_SIGNAL(mouseInteraction(XEvent *)), TQT_SLOT(slotMouseActivity(XEvent *))); - connect(&mHackProc, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(hackExited(TDEProcess *))); - connect(&mSuspendTimer, TQT_SIGNAL(timeout()), TQT_SLOT(suspend())); + connect( mForceContinualLockDisplayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(displayLockDialogIfNeeded()) ); + connect( mHackDelayStartupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(closeDialogAndStartHack()) ); + connect( mEnsureVRootWindowSecurityTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repaintRootWindowIfNeeded()) ); + connect(tqApp, TQ_SIGNAL(mouseInteraction(XEvent *)), TQ_SLOT(slotMouseActivity(XEvent *))); + connect(&mHackProc, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(hackExited(TDEProcess *))); + connect(&mSuspendTimer, TQ_SIGNAL(timeout()), TQ_SLOT(suspend())); #ifdef HAVE_DPMS //if the user decided that the screensaver should run independent from @@ -403,7 +403,7 @@ void LockProcess::init(bool child, bool useBlankOnly) CARD16 state; if (DPMSInfo(tqt_xdisplay(), &state, &on)) { if (on) { - connect(&mCheckDPMS, TQT_SIGNAL(timeout()), TQT_SLOT(checkDPMSActive())); + connect(&mCheckDPMS, TQ_SIGNAL(timeout()), TQ_SLOT(checkDPMSActive())); // we can save CPU if we stop it as quickly as possible // but we waste CPU if we check too often -> so take 10s mCheckDPMS.start(10000); @@ -413,7 +413,7 @@ void LockProcess::init(bool child, bool useBlankOnly) #endif #if (TQT_VERSION-0 >= 0x030200) // XRANDR support - connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); + connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); #endif if (!trinity_desktop_lock_use_system_modal_dialogs) { @@ -435,8 +435,8 @@ void LockProcess::init(bool child, bool useBlankOnly) mControlPipeHandler = new ControlPipeHandlerObject(); mControlPipeHandler->mParent = this; mControlPipeHandler->moveToThread(mControlPipeHandlerThread); - TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString))); - TQTimer::singleShot(0, mControlPipeHandler, SLOT(run())); + TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString))); + TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run())); mControlPipeHandlerThread->start(); } @@ -534,7 +534,7 @@ void LockProcess::setupSignals() // Error handler to shut up gcc warnings } TQSocketNotifier* notif = new TQSocketNotifier(signal_pipe[0], TQSocketNotifier::Read, this ); - connect( notif, TQT_SIGNAL(activated(int)), TQT_SLOT(signalPipeSignal())); + connect( notif, TQ_SIGNAL(activated(int)), TQ_SLOT(signalPipeSignal())); } @@ -577,7 +577,7 @@ bool LockProcess::lock() // selecting "lock screen", that looks really untidy. mBusy = true; if (startLock()) { - TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed())); return true; } stopSaver(); @@ -598,7 +598,7 @@ bool LockProcess::defaultSave() mOverrideHackStartupEnabled = true; if (startSaver()) { if (mLockGrace >= 0) { - TQTimer::singleShot(mLockGrace, this, TQT_SLOT(startLock())); + TQTimer::singleShot(mLockGrace, this, TQ_SLOT(startLock())); } return true; } @@ -618,7 +618,7 @@ void LockProcess::quitSaver() { DISABLE_CONTINUOUS_LOCKDLG_DISPLAY if (closeCurrentWindow()) { - TQTimer::singleShot( 0, this, SLOT(quitSaver()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(quitSaver()) ); return; } stopSaver(); @@ -629,7 +629,7 @@ void LockProcess::quitSaver() void LockProcess::startSecureDialog() { if ((backingPixmap.isNull()) && (mBackingStartupDelayTimer < 100)) { - TQTimer::singleShot(10, this, TQT_SLOT(startSecureDialog())); + TQTimer::singleShot(10, this, TQ_SLOT(startSecureDialog())); mBackingStartupDelayTimer++; return; } @@ -668,7 +668,7 @@ void LockProcess::startSecureDialog() mBusy = false; } else { - TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed())); } if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced && trinity_desktop_lock_use_system_modal_dialogs) { ENABLE_CONTINUOUS_LOCKDLG_DISPLAY @@ -728,7 +728,7 @@ bool LockProcess::runSecureDialog() mInSecureDialog = true; if (startSaver()) { mBackingStartupDelayTimer = 0; - TQTimer::singleShot(0, this, TQT_SLOT(startSecureDialog())); + TQTimer::singleShot(0, this, TQ_SLOT(startSecureDialog())); return true; } else { @@ -1040,7 +1040,7 @@ void LockProcess::desktopResized() } else { mEnsureScreenHiddenTimer = new TQTimer( this ); - connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) ); + connect( mEnsureScreenHiddenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForcePaintBackground()) ); } mEnsureScreenHiddenTimer->start(DESKTOP_WALLPAPER_OBTAIN_TIMEOUT_MS, true); } @@ -1063,7 +1063,7 @@ void LockProcess::desktopResized() // being displayed, so we finish the hack restarting/display prettying operations in a separate timed slot if (resizeTimer == NULL) { resizeTimer = new TQTimer( this ); - connect( resizeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doDesktopResizeFinish()) ); + connect( resizeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doDesktopResizeFinish()) ); } resizeTimer->start( 100, TRUE ); // 100 millisecond single shot timer; should allow display switching operations to finish before hack is started } @@ -1075,7 +1075,7 @@ void LockProcess::doDesktopResizeFinish() } mDialogControlLock = true; if (closeCurrentWindow()) { - TQTimer::singleShot( 0, this, SLOT(doDesktopResizeFinish()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(doDesktopResizeFinish()) ); mDialogControlLock = false; return; } @@ -1354,7 +1354,7 @@ bool LockProcess::startSaver(bool notify_ready) if (mParent) { TQSocketNotifier *notifier = new TQSocketNotifier(mParent, TQSocketNotifier::Read, this, "notifier"); - connect(notifier, TQT_SIGNAL( activated (int)), TQT_SLOT( quitSaver())); + connect(notifier, TQ_SIGNAL( activated (int)), TQ_SLOT( quitSaver())); } createSaverWindow(); move(0, 0); @@ -1542,7 +1542,7 @@ void LockProcess::closeDialogAndStartHack() DISABLE_CONTINUOUS_LOCKDLG_DISPLAY mSuspended = true; if (closeCurrentWindow()) { - TQTimer::singleShot( 0, this, SLOT(closeDialogAndStartHack()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(closeDialogAndStartHack()) ); } else { resume(true); @@ -1669,7 +1669,7 @@ bool LockProcess::startHack() if (trinity_desktop_lock_delay_screensaver_start && trinity_desktop_lock_forced) { // Close any active dialogs if (closeCurrentWindow()) { - TQTimer::singleShot( 0, this, SLOT(closeCurrentWindow()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(closeCurrentWindow()) ); } } if (m_startupStatusDialog) { m_startupStatusDialog->closeSMDialog(); m_startupStatusDialog=NULL; } @@ -2026,7 +2026,7 @@ int LockProcess::execDialog( TQDialog *dlg ) // Slight delay before screensaver resume to allow the dialog window to fully disappear if (hackResumeTimer == NULL) { hackResumeTimer = new TQTimer( this ); - connect( hackResumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resumeUnforced()) ); + connect( hackResumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resumeUnforced()) ); } if (mResizingDesktopLock == false) { hackResumeTimer->start( 10, TRUE ); @@ -2065,7 +2065,7 @@ void LockProcess::slotPaintBackground(const TQPixmap &rpm) } else { mEnsureScreenHiddenTimer = new TQTimer( this ); - connect( mEnsureScreenHiddenTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForcePaintBackground()) ); + connect( mEnsureScreenHiddenTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForcePaintBackground()) ); } // Only remove the mask widget once the resize is 100% complete! @@ -2127,7 +2127,7 @@ void LockProcess::doFunctionKeyBroadcast() { // This does NOT work with the SAK or system modal dialogs! if ((!trinity_desktop_lock_use_system_modal_dialogs) && (!trinity_desktop_lock_use_sak)) { mBusy=true; - TQTimer::singleShot(1000, this, TQT_SLOT(slotDeadTimePassed())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDeadTimePassed())); if (mkeyCode == XKeysymToKeycode(tqt_xdisplay(), XF86XK_Display)) { while (mDialogControlLock == true) { usleep(100000); @@ -2167,7 +2167,7 @@ bool LockProcess::x11Event(XEvent *event) (event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioRaiseVolume)) || \ (event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_AudioLowerVolume))) { mkeyCode = event->xkey.keycode; - TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(doFunctionKeyBroadcast()) ); return true; } // ACPI power keys @@ -2176,7 +2176,7 @@ bool LockProcess::x11Event(XEvent *event) (event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_Suspend)) || \ (event->xkey.keycode == XKeysymToKeycode(event->xkey.display, XF86XK_Hibernate))) { mkeyCode = event->xkey.keycode; - TQTimer::singleShot( 100, this, TQT_SLOT(doFunctionKeyBroadcast()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(doFunctionKeyBroadcast()) ); return true; } } @@ -2442,7 +2442,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt ) KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame ); button->setDefault( true ); button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); - connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) ); + connect( button, TQ_SIGNAL( clicked() ), &box, TQ_SLOT( accept() ) ); TQVBoxLayout *vbox = new TQVBoxLayout( &box ); vbox->addWidget( winFrame ); @@ -2464,7 +2464,7 @@ void LockProcess::showVkbd() mVkbdWindows.clear(); mVkbdLastEventWindow = None; mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS ); - connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId ))); + connect( mKWinModule, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId ))); mVkbdProcess = new TDEProcess; *mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm"; mVkbdProcess->start(); @@ -2849,11 +2849,11 @@ void LockProcess::cryptographicCardInserted(TDECryptographicCardDevice* cdevice) m_loginCardDevice = cdevice; if (dynamic_cast<SAKDlg*>(currentDialog)) { dynamic_cast<SAKDlg*>(currentDialog)->closeDialogForced(); - TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin())); + TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin())); } else if (dynamic_cast<SecureDlg*>(currentDialog)) { dynamic_cast<SecureDlg*>(currentDialog)->closeDialogForced(); - TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin())); + TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin())); } else if (dynamic_cast<PasswordDlg*>(currentDialog)) { signalPassDlgToAttemptCardLogin(); @@ -2871,7 +2871,7 @@ void LockProcess::cryptographicCardRemoved(TDECryptographicCardDevice* cdevice) } else { m_loginCardDevice = NULL; - TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort())); + TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort())); } #endif } @@ -2886,7 +2886,7 @@ void LockProcess::signalPassDlgToAttemptCardLogin() else { if (currentDialog && m_loginCardDevice) { // Try again later - TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardLogin())); + TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardLogin())); } } #endif @@ -2902,7 +2902,7 @@ void LockProcess::signalPassDlgToAttemptCardAbort() else { if (currentDialog) { // Try again later - TQTimer::singleShot(0, this, SLOT(signalPassDlgToAttemptCardAbort())); + TQTimer::singleShot(0, this, TQ_SLOT(signalPassDlgToAttemptCardAbort())); } } #endif diff --git a/kdesktop/lock/querydlg.cpp b/kdesktop/lock/querydlg.cpp index 9d594ecba..edab1fd97 100644 --- a/kdesktop/lock/querydlg.cpp +++ b/kdesktop/lock/querydlg.cpp @@ -117,7 +117,7 @@ QueryDlg::QueryDlg(LockProcess *parent) frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 ); frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 ); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotOK())); installEventFilter(this); setFixedSize( sizeHint() ); diff --git a/kdesktop/lock/sakdlg.cpp b/kdesktop/lock/sakdlg.cpp index 274826e69..a9bb25f40 100644 --- a/kdesktop/lock/sakdlg.cpp +++ b/kdesktop/lock/sakdlg.cpp @@ -108,7 +108,7 @@ SAKDlg::SAKDlg(LockProcess *parent) mSAKProcess = new TDEProcess; *mSAKProcess << "tdmtsak"; - connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited())); + connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited())); mSAKProcess->start(); } diff --git a/kdesktop/lock/securedlg.cpp b/kdesktop/lock/securedlg.cpp index fca79a707..5be274660 100644 --- a/kdesktop/lock/securedlg.cpp +++ b/kdesktop/lock/securedlg.cpp @@ -137,11 +137,11 @@ SecureDlg::SecureDlg(LockProcess *parent) frameLayout->addMultiCellWidget( sep, 2, 2, 0, 1 ); frameLayout->addMultiCellLayout( layPBGrid, 3, 3, 0, 1, AlignLeft | AlignVCenter); - connect(mCancelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnCancel())); - connect(mLockButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnLock())); - connect(mTaskButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnTask())); - connect(mShutdownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnShutdown())); - connect(mSwitchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBtnSwitchUser())); + connect(mCancelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnCancel())); + connect(mLockButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnLock())); + connect(mTaskButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnTask())); + connect(mShutdownButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnShutdown())); + connect(mSwitchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBtnSwitchUser())); TQSize dlgSz = sizeHint(); int btnSize = dlgSz.width(); diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp index 5e32fd0f6..e22fc4c7a 100644 --- a/kdesktop/lockeng.cpp +++ b/kdesktop/lockeng.cpp @@ -134,12 +134,12 @@ SaverEngine::SaverEngine() m_helperThread->start(); m_threadHelperObject = new SaverEngineThreadHelperObject; m_threadHelperObject->moveToThread(m_helperThread); - connect(this, TQT_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQT_SLOT(terminateThread())); - connect(m_threadHelperObject, TQT_SIGNAL(lockProcessWaiting()), this, TQT_SLOT(lockProcessWaiting())); - connect(m_threadHelperObject, TQT_SIGNAL(lockProcessFullyActivated()), this, TQT_SLOT(lockProcessFullyActivated())); + connect(this, TQ_SIGNAL(terminateHelperThread()), m_threadHelperObject, TQ_SLOT(terminateThread())); + connect(m_threadHelperObject, TQ_SIGNAL(lockProcessWaiting()), this, TQ_SLOT(lockProcessWaiting())); + connect(m_threadHelperObject, TQ_SIGNAL(lockProcessFullyActivated()), this, TQ_SLOT(lockProcessFullyActivated())); - connect(&mLockProcess, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(lockProcessExited())); + connect(&mLockProcess, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(lockProcessExited())); configure(); @@ -160,8 +160,8 @@ SaverEngine::SaverEngine() if (useSAKProcess) { mSAKProcess = new TDEProcess; *mSAKProcess << "tdmtsak"; - connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited())); - TQTimer::singleShot( 0, this, TQT_SLOT(handleSecureDialog()) ); + connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited())); + TQTimer::singleShot( 0, this, TQ_SLOT(handleSecureDialog()) ); } mLockProcess.clearArguments(); @@ -207,8 +207,8 @@ SaverEngine::SaverEngine() TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } @@ -220,7 +220,7 @@ SaverEngine::SaverEngine() TQTextStream stream(&flagFile); if (stream.readLine().startsWith("1")) { // Card was likely used to log in - TQTimer::singleShot(5000, this, SLOT(cardStartupTimeout())); + TQTimer::singleShot(5000, this, TQ_SLOT(cardStartupTimeout())); } flagFile.close(); } @@ -409,7 +409,7 @@ bool SaverEngine::enable( bool e ) if (mEnabled) { if ( !mXAutoLock ) { mXAutoLock = new XAutoLock(); - connect(mXAutoLock, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout())); + connect(mXAutoLock, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout())); } mXAutoLock->setTimeout(mTimeout); mXAutoLock->setDPMS(true); @@ -702,7 +702,7 @@ void SaverEngine::lockProcessExited() // PROBABLE HACKING ATTEMPT DETECTED restartDesktopLockProcess(); mState = Waiting; - TQTimer::singleShot( 100, this, SLOT(recoverFromHackingAttempt()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(recoverFromHackingAttempt()) ); } else { // Restart the lock process @@ -849,19 +849,19 @@ bool SaverEngine::dBusConnect() { dBusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus, DBUS_CONN_NAME); if( !dBusConn.isConnected() ) { kdError() << "Failed to open connection to system message bus: " << dBusConn.lastError().message() << endl; - TQTimer::singleShot(4000, this, TQT_SLOT(dBusReconnect())); + TQTimer::singleShot(4000, this, TQ_SLOT(dBusReconnect())); return false; } // watcher for Disconnect signal dBusLocal = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_LOCAL, DBUS_INTERFACE_LOCAL, dBusConn); - TQObject::connect(dBusLocal, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(dBusLocal, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); // watcher for NameOwnerChanged signals dBusWatch = new TQT_DBusProxy(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn); - TQObject::connect(dBusWatch, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(dBusWatch, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); // find already running SystemD TQT_DBusProxy checkSystemD(DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, dBusConn); @@ -895,8 +895,8 @@ void SaverEngine::onDBusServiceRegistered(const TQString& service) { // wather for systemd session signals if( systemdSessionPath.isValid() ) { systemdSession = new TQT_DBusProxy(SYSTEMD_LOGIN1_SERVICE, systemdSessionPath, SYSTEMD_LOGIN1_SESSION_IFACE, dBusConn); - TQObject::connect(systemdSession, TQT_SIGNAL(dbusSignal(const TQT_DBusMessage&)), - this, TQT_SLOT(handleDBusSignal(const TQT_DBusMessage&))); + TQObject::connect(systemdSession, TQ_SIGNAL(dbusSignal(const TQT_DBusMessage&)), + this, TQ_SLOT(handleDBusSignal(const TQT_DBusMessage&))); } return; } @@ -924,7 +924,7 @@ void SaverEngine::handleDBusSignal(const TQT_DBusMessage& msg) { && msg.interface() == DBUS_INTERFACE_LOCAL && msg.member() == "Disconnected" ) { dBusClose(); - TQTimer::singleShot(1000, this, TQT_SLOT(dBusReconnect())); + TQTimer::singleShot(1000, this, TQ_SLOT(dBusReconnect())); return; } diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index da4d18d30..1192a0292 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -131,34 +131,34 @@ Minicli::Minicli( TQWidget *parent, const char *name) m_pURLCompletion = new KURLCompletion(KURLCompletion::FileCompletion); m_pEXECompletion = new KURLCompletion(KURLCompletion::SystemExeCompletion); //m_pURLCompletion->setCompletionMode( TDEGlobalSettings::completionMode() ); - connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotMatch(const TQString&) )); - connect( m_pEXECompletion, TQT_SIGNAL( match(const TQString&) ), TQT_SLOT( slotEXEMatch(const TQString&) )); + connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ), TQ_SLOT( slotMatch(const TQString&) )); + connect( m_pEXECompletion, TQ_SIGNAL( match(const TQString&) ), TQ_SLOT( slotEXEMatch(const TQString&) )); // Main widget buttons... - connect( m_dlg->pbRun, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( m_dlg->pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - connect( m_dlg->pbOptions, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdvanced()) ); - connect( m_parseTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotParseTimer()) ); + connect( m_dlg->pbRun, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( m_dlg->pbCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); + connect( m_dlg->pbOptions, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdvanced()) ); + connect( m_parseTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotParseTimer()) ); - connect( m_dlg->cbCommand, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotCmdChanged(const TQString&) ) ); + connect( m_dlg->cbCommand, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotCmdChanged(const TQString&) ) ); - connect( m_dlg->cbCommand, TQT_SIGNAL( returnPressed() ), - m_dlg->pbRun, TQT_SLOT( animateClick() ) ); + connect( m_dlg->cbCommand, TQ_SIGNAL( returnPressed() ), + m_dlg->pbRun, TQ_SLOT( animateClick() ) ); m_dlg->cbCommand->setHistoryEditorEnabled( true ); - connect( m_dlg->cbCommand, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(saveConfig()) ); + connect( m_dlg->cbCommand, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(saveConfig()) ); // Advanced group box... - connect(m_dlg->cbPriority, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeScheduler(bool))); - connect(m_dlg->slPriority, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotPriority(int))); - connect(m_dlg->cbRealtime, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotRealtime(bool))); - connect(m_dlg->cbAppcomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAppcompleteToggled(bool))); - connect(m_dlg->cbAutocomplete, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutocompleteToggled(bool))); - connect(m_dlg->cbAutohistory, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutohistoryToggled(bool))); - connect(m_dlg->cbRunAsOther, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChangeUid(bool))); - connect(m_dlg->leUsername, TQT_SIGNAL(lostFocus()), TQT_SLOT(updateAuthLabel())); - connect(m_dlg->cbRunInTerminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminal(bool))); + connect(m_dlg->cbPriority, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeScheduler(bool))); + connect(m_dlg->slPriority, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotPriority(int))); + connect(m_dlg->cbRealtime, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotRealtime(bool))); + connect(m_dlg->cbAppcomplete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAppcompleteToggled(bool))); + connect(m_dlg->cbAutocomplete, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutocompleteToggled(bool))); + connect(m_dlg->cbAutohistory, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAutohistoryToggled(bool))); + connect(m_dlg->cbRunAsOther, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChangeUid(bool))); + connect(m_dlg->leUsername, TQ_SIGNAL(lostFocus()), TQ_SLOT(updateAuthLabel())); + connect(m_dlg->cbRunInTerminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminal(bool))); m_dlg->slPriority->setValue(50); diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index d7b1cf75a..7d448c089 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -56,16 +56,16 @@ StartupId::StartupId( TQWidget* parent, const char* name ) XSelectInput( tqt_xdisplay(), tqt_xrootwin(), attrs.your_event_mask | SubstructureNotifyMask); kapp->installX11EventFilter( this ); } - connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( update_startupid())); + connect( &update_timer, TQ_SIGNAL( timeout()), TQ_SLOT( update_startupid())); connect( &startup_info, - TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( &startup_info, - TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( &startup_info, - TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotRemoveStartup( const TDEStartupInfoId& ))); + TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotRemoveStartup( const TDEStartupInfoId& ))); } StartupId::~StartupId() @@ -129,10 +129,10 @@ bool StartupId::x11Event( XEvent* e ) if( startups.count() == 0 ) start_startupid( KDE_STARTUP_ICON ); // 60(?) sec timeout - shouldn't be hopefully needed anyway, ksmserver should have it too - TQTimer::singleShot( 60000, this, TQT_SLOT( finishKDEStartup())); + TQTimer::singleShot( 60000, this, TQ_SLOT( finishKDEStartup())); } else if( strcmp( s, "session ready" ) == 0 && kde_startup_status < StartupDone ) - TQTimer::singleShot( 2000, this, TQT_SLOT( finishKDEStartup())); + TQTimer::singleShot( 2000, this, TQ_SLOT( finishKDEStartup())); } return false; } diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 2313f7c40..c7bfc26f3 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -301,8 +301,8 @@ static int directCommand(TDECmdLineArgs *args) 0, // name duration ); TQTimer *timer = new TQTimer(); - TQObject::connect( timer, TQT_SIGNAL( timeout() ), kapp, TQT_SLOT( quit() ) ); - TQObject::connect( popup, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) ); + TQObject::connect( timer, TQ_SIGNAL( timeout() ), kapp, TQ_SLOT( quit() ) ); + TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) ); timer->start( duration, TRUE ); #ifdef Q_WS_X11 diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index 05e6148a9..4e44f6c91 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -38,7 +38,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) popupFrame->setMainWidget(datePicker); setDate(date); - connect(datePicker, TQT_SIGNAL(dateSelected(TQDate)), this, TQT_SLOT(dateEnteredEvent(TQDate))); + connect(datePicker, TQ_SIGNAL(dateSelected(TQDate)), this, TQ_SLOT(dateEnteredEvent(TQDate))); } KDateCombo::~KDateCombo() @@ -105,7 +105,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e) TQPoint p = mapFromGlobal( me->globalPos() ); if (rect().contains( p ) ) { - TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent())); + TQTimer::singleShot(10, this, TQ_SLOT(dateEnteredEvent())); return true; } } diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index 1675d9d71..bcf1e3cd8 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -71,17 +71,17 @@ Kfind::Kfind(TQWidget *parent, const char *name) mSearch = new KPushButton( KGuiItem(i18n("&Find"), "edit-find"), mButtonBox ); mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4); - connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) ); + connect( mSearch, TQ_SIGNAL(clicked()), this, TQ_SLOT( startSearch() ) ); mStop = new KPushButton( KGuiItem(i18n("Stop"), "process-stop"), mButtonBox ); - connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) ); + connect( mStop, TQ_SIGNAL(clicked()), this, TQ_SLOT( stopSearch() ) ); mSave = new KPushButton( KStdGuiItem::saveAs(), mButtonBox ); - connect( mSave, TQT_SIGNAL(clicked()), this, TQT_SLOT( saveResults() ) ); + connect( mSave, TQ_SIGNAL(clicked()), this, TQ_SLOT( saveResults() ) ); KPushButton * mClose = new KPushButton( KStdGuiItem::close(), mButtonBox ); - connect( mClose, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( destroyMe() ) ); + connect( mClose, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( destroyMe() ) ); // react to search requests from widget - connect( tabWidget, TQT_SIGNAL(startSearch()), this, TQT_SLOT( startSearch() ) ); + connect( tabWidget, TQ_SIGNAL(startSearch()), this, TQ_SLOT( startSearch() ) ); mSearch->setEnabled(true); // Enable "Search" mStop->setEnabled(false); // Disable "Stop" diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index 7fabcecde..f26710ce2 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -62,20 +62,20 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name) vBox->addWidget(win, 1); vBox->addWidget(mStatusBar, 0); - connect(this, TQT_SIGNAL(applyClicked()), - this, TQT_SLOT(startSearch())); - connect(this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(stopSearch())); - connect(this, TQT_SIGNAL(user2Clicked()), - win, TQT_SLOT(saveResults())); + connect(this, TQ_SIGNAL(applyClicked()), + this, TQ_SLOT(startSearch())); + connect(this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(stopSearch())); + connect(this, TQ_SIGNAL(user2Clicked()), + win, TQ_SLOT(saveResults())); - connect(win ,TQT_SIGNAL(resultSelected(bool)), - this,TQT_SIGNAL(resultSelected(bool))); + connect(win ,TQ_SIGNAL(resultSelected(bool)), + this,TQ_SIGNAL(resultSelected(bool))); query = new KQuery(frame); - connect(query, TQT_SIGNAL(addFile(const KFileItem*,const TQString&)), - TQT_SLOT(addFile(const KFileItem*,const TQString&))); - connect(query, TQT_SIGNAL(result(int)), TQT_SLOT(slotResult(int))); + connect(query, TQ_SIGNAL(addFile(const KFileItem*,const TQString&)), + TQ_SLOT(addFile(const KFileItem*,const TQString&))); + connect(query, TQ_SIGNAL(result(int)), TQ_SLOT(slotResult(int))); dirwatch=NULL; } @@ -121,8 +121,8 @@ void KfindDlg::startSearch() if(dirwatch!=NULL) delete dirwatch; dirwatch=new KDirWatch(); - connect(dirwatch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotNewItems(const TQString&))); - connect(dirwatch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteItem(const TQString&))); + connect(dirwatch, TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(slotNewItems(const TQString&))); + connect(dirwatch, TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(slotDeleteItem(const TQString&))); dirwatch->addDir(query->url().path(),true); #if 0 diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 54de01e9b..8fb99fdac 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -53,18 +53,18 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, setWidget( m_kfindWidget ); - connect( m_kfindWidget, TQT_SIGNAL(started()), - this, TQT_SLOT(slotStarted()) ); - connect( m_kfindWidget, TQT_SIGNAL(destroyMe()), - this, TQT_SLOT(slotDestroyMe()) ); - connect(m_kfindWidget->dirlister,TQT_SIGNAL(deleteItem(KFileItem*)), this, TQT_SLOT(removeFile(KFileItem*))); - connect(m_kfindWidget->dirlister,TQT_SIGNAL(newItems(const KFileItemList&)), this, TQT_SLOT(newFiles(const KFileItemList&))); + connect( m_kfindWidget, TQ_SIGNAL(started()), + this, TQ_SLOT(slotStarted()) ); + connect( m_kfindWidget, TQ_SIGNAL(destroyMe()), + this, TQ_SLOT(slotDestroyMe()) ); + connect(m_kfindWidget->dirlister,TQ_SIGNAL(deleteItem(KFileItem*)), this, TQ_SLOT(removeFile(KFileItem*))); + connect(m_kfindWidget->dirlister,TQ_SIGNAL(newItems(const KFileItemList&)), this, TQ_SLOT(newFiles(const KFileItemList&))); //setXMLFile( "kfind.rc" ); query = new KQuery(this); - connect(query, TQT_SIGNAL(addFile(const KFileItem *, const TQString&)), - TQT_SLOT(addFile(const KFileItem *, const TQString&))); - connect(query, TQT_SIGNAL(result(int)), - TQT_SLOT(slotResult(int))); + connect(query, TQ_SIGNAL(addFile(const KFileItem *, const TQString&)), + TQ_SLOT(addFile(const KFileItem *, const TQString&))); + connect(query, TQ_SIGNAL(result(int)), + TQ_SLOT(slotResult(int))); m_kfindWidget->setQuery(query); m_bShowsResult = false; diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 6def97ec6..3820eaead 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -134,11 +134,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) // Signals - connect( browseB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(getDirectory()) ); + connect( browseB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(getDirectory()) ); - connect( nameBox, TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(startSearch())); + connect( nameBox, TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(startSearch())); // ************ Page Two @@ -235,9 +235,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) grid1->setRowStretch(6,1); // Connect - connect( findCreated, TQT_SIGNAL(toggled(bool)), TQT_SLOT(fixLayout()) ); - connect( bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(fixLayout()) ); - connect( sizeBox, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSizeBoxChanged(int))); + connect( findCreated, TQ_SIGNAL(toggled(bool)), TQ_SLOT(fixLayout()) ); + connect( bg, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(fixLayout()) ); + connect( sizeBox, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSizeBoxChanged(int))); // ************ Page Three @@ -250,7 +250,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) textEdit=new KLineEdit(pages[2], "textEdit" ); TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text"); - connect( textEdit, TQT_SIGNAL(returnPressed(const TQString &)), TQT_SIGNAL( startSearch())); + connect( textEdit, TQ_SIGNAL(returnPressed(const TQString &)), TQ_SIGNAL( startSearch())); const TQString containingtext = i18n("<qt>If specified, only files that contain this text" @@ -306,9 +306,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) if ( editRegExp ) { // The editor was available, so lets use it. - connect( regexpContentCb, TQT_SIGNAL(toggled(bool) ), editRegExp, TQT_SLOT(setEnabled(bool)) ); + connect( regexpContentCb, TQ_SIGNAL(toggled(bool) ), editRegExp, TQ_SLOT(setEnabled(bool)) ); editRegExp->setEnabled(false); - connect( editRegExp, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditRegExp() ) ); + connect( editRegExp, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotEditRegExp() ) ); } else regexpContentCb->hide(); diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index f068d031e..c4a19cf94 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -131,14 +131,14 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name ) resetColumns(true); - connect( this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT( selectionHasChanged() )); + connect( this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT( selectionHasChanged() )); - connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&))); - connect(this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotExecute(TQListViewItem*))); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotExecute(TQListViewItem*))); setDragEnabled(true); } @@ -409,21 +409,21 @@ void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoi { //menu = new TDEPopupMenu(item->text(0), this); m_menu->insertTitle(item->text(0)); - m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding())); - m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQT_SLOT(openFolder())); + m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQ_SLOT(openBinding())); + m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQ_SLOT(openFolder())); m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection())); - m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles())); + m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQ_SLOT(copySelection())); + m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQ_SLOT(deleteFiles())); m_menu->insertSeparator(); - m_menu->insertItem(i18n("Open With..."), this, TQT_SLOT(slotOpenWith())); + m_menu->insertItem(i18n("Open With..."), this, TQ_SLOT(slotOpenWith())); m_menu->insertSeparator(); - m_menu->insertItem(i18n("Properties"), this, TQT_SLOT(fileProperties())); + m_menu->insertItem(i18n("Properties"), this, TQ_SLOT(fileProperties())); } else { m_menu->insertTitle(i18n("Selected Files")); - m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection())); - m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles())); + m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQ_SLOT(copySelection())); + m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQ_SLOT(deleteFiles())); } m_menu->popup(p, 1); } diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index 1e3617c70..44fc2a97d 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -21,9 +21,9 @@ KQuery::KQuery(TQObject *parent, const char * name) m_regexps.setAutoDelete(true); m_fileItems.setAutoDelete(true); processLocate = new TDEProcess(this); - connect(processLocate,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(TDEProcess*,char*,int))); - connect(processLocate,TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(TDEProcess*,char*,int))); - connect(processLocate,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(slotendProcessLocate(TDEProcess*))); + connect(processLocate,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQ_SLOT(slotreceivedSdtout(TDEProcess*,char*,int))); + connect(processLocate,TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQ_SLOT(slotreceivedSdterr(TDEProcess*,char*,int))); + connect(processLocate,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(slotendProcessLocate(TDEProcess*))); // Files with these mime types can be ignored, even if // findFormatByFileContent() in some cases may claim that @@ -87,10 +87,10 @@ void KQuery::start() else job = TDEIO::listDir( m_url, false ); - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), - TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(canceled(TDEIO::Job *)), TQT_SLOT(slotCanceled(TDEIO::Job *))); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + TQ_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(canceled(TDEIO::Job *)), TQ_SLOT(slotCanceled(TDEIO::Job *))); } void KQuery::slotResult( TDEIO::Job * _job ) diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index 093fcb8d4..8675466a6 100644 --- a/khelpcenter/glossary.cpp +++ b/khelpcenter/glossary.cpp @@ -73,10 +73,10 @@ Glossary::Glossary( TQWidget *parent ) : TDEListView( parent ) { m_initialized = false; - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( treeItemSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( treeItemSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( treeItemSelected( TQListViewItem * ) ) ); setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); addColumn( TQString::null ); @@ -147,8 +147,8 @@ void Glossary::rebuildGlossaryCache() mainWindow->statusBar()->message( i18n( "Rebuilding cache..." ) ); TDEProcess *meinproc = new TDEProcess; - connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( meinprocExited( TDEProcess * ) ) ); + connect( meinproc, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( meinprocExited( TDEProcess * ) ) ); *meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) ); *meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile; diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index 429fa48a0..69e6521ae 100644 --- a/khelpcenter/history.cpp +++ b/khelpcenter/history.cpp @@ -56,20 +56,20 @@ void History::setupActions( TDEActionCollection *coll ) TQPair<KGuiItem, KGuiItem> backForward = KStdGuiItem::backAndForward(); m_backAction = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left, - this, TQT_SLOT( back() ), coll, "back" ); - connect( m_backAction->popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_SLOT( backActivated( int ) ) ); - connect( m_backAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( fillBackMenu() ) ); + this, TQ_SLOT( back() ), coll, "back" ); + connect( m_backAction->popupMenu(), TQ_SIGNAL( activated( int ) ), + TQ_SLOT( backActivated( int ) ) ); + connect( m_backAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( fillBackMenu() ) ); m_backAction->setEnabled( false ); m_forwardAction = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right, - this, TQT_SLOT( forward() ), coll, + this, TQ_SLOT( forward() ), coll, "forward" ); - connect( m_forwardAction->popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_SLOT( forwardActivated( int ) ) ); - connect( m_forwardAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( fillForwardMenu() ) ); + connect( m_forwardAction->popupMenu(), TQ_SIGNAL( activated( int ) ), + TQ_SLOT( forwardActivated( int ) ) ); + connect( m_forwardAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( fillForwardMenu() ) ); m_forwardAction->setEnabled( false ); } @@ -78,9 +78,9 @@ void History::installMenuBarHook( TDEMainWindow *mainWindow ) TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( "go_web", mainWindow ) ); if ( goMenu ) { - connect( goMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( fillGoMenu() ) ); - connect( goMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( goMenuActivated( int ) ) ); + connect( goMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( fillGoMenu() ) ); + connect( goMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( goMenuActivated( int ) ) ); m_goMenuIndex = goMenu->count(); } } @@ -178,7 +178,7 @@ void History::goHistoryActivated( int steps ) if ( m_goBuffer ) return; m_goBuffer = steps; - TQTimer::singleShot( 0, this, TQT_SLOT( goHistoryDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( goHistoryDelayed() ) ); } void History::goHistoryDelayed() diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index 5fd0f4640..ee8cb5bd4 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/khelpcenter/htmlsearch/htmlsearch.cpp @@ -276,11 +276,11 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) kdDebug() << "Running htdig" << endl; - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htdigStdout(TDEProcess *,char*,int))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htdigStdout(TDEProcess *,char*,int))); - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htdigExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htdigExited(TDEProcess *))); _htdigRunning = true; @@ -340,8 +340,8 @@ bool HTMLSearch::generateIndex(TQString _lang, TQWidget *parent) kdDebug() << "Running htmerge" << endl; - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htmergeExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htmergeExited(TDEProcess *))); _htmergeRunning = true; @@ -444,10 +444,10 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int kdDebug() << "Running htsearch" << endl; - connect(_proc, TQT_SIGNAL(receivedStdout(TDEProcess *,char*,int)), - this, TQT_SLOT(htsearchStdout(TDEProcess *,char*,int))); - connect(_proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(htsearchExited(TDEProcess *))); + connect(_proc, TQ_SIGNAL(receivedStdout(TDEProcess *,char*,int)), + this, TQ_SLOT(htsearchStdout(TDEProcess *,char*,int))); + connect(_proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(htsearchExited(TDEProcess *))); _htsearchRunning = true; _searchResult = ""; diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 3db9c9895..cd4e56021 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp @@ -60,8 +60,8 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) url->setText(i18n("ht://dig home page")); url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); - connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(urlClicked(const TQString&))); + connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(urlClicked(const TQString&))); gb = new TQGroupBox(i18n("Program Locations"), this); @@ -74,7 +74,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htdigBin ); grid->addWidget(l, 1,0); grid->addWidget(htdigBin, 1,1); - connect(htdigBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htdigBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); TQString wtstr = i18n( "Enter the path to your htdig program here, e.g. /usr/local/bin/htdig" ); TQWhatsThis::add( htdigBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -84,7 +84,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htsearchBin ); grid->addWidget(l, 2,0); grid->addWidget(htsearchBin, 2,1); - connect(htsearchBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htsearchBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); wtstr = i18n( "Enter the path to your htsearch program here, e.g. /usr/local/bin/htsearch" ); TQWhatsThis::add( htsearchBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -94,7 +94,7 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) l->setBuddy( htmergeBin ); grid->addWidget(l, 3,0); grid->addWidget(htmergeBin, 3,1); - connect(htmergeBin->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(configChanged())); + connect(htmergeBin->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(configChanged())); wtstr = i18n( "Enter the path to your htmerge program here, e.g. /usr/local/bin/htmerge" ); TQWhatsThis::add( htmergeBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -110,17 +110,17 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) indexKDE = new TQCheckBox(i18n("&TDE help"), gb); vvbox->addWidget(indexKDE); - connect(indexKDE, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexKDE, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); indexMan = new TQCheckBox(i18n("&Man pages"), gb); vvbox->addWidget(indexMan); indexMan->setEnabled(false), - connect(indexMan, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexMan, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); indexInfo = new TQCheckBox(i18n("&Info pages"), gb); vvbox->addWidget(indexInfo); indexInfo->setEnabled(false); - connect(indexInfo, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(indexInfo, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); gb = new TQGroupBox(i18n("Additional Search Paths"), this); hbox->addWidget(gb); @@ -159,12 +159,12 @@ TDEHTMLSearchConfig::TDEHTMLSearchConfig(TQWidget *parent, const char *name) TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) ); runButton->setFixedSize(runButton->sizeHint()); vbox->addWidget(runButton, AlignRight); - connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex())); + connect(runButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(generateIndex())); - connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(addClicked())); - connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(delClicked())); - connect(searchPaths, TQT_SIGNAL(highlighted(const TQString &)), - this, TQT_SLOT(pathSelected(const TQString &))); + connect(addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(addClicked())); + connect(delButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(delClicked())); + connect(searchPaths, TQ_SIGNAL(highlighted(const TQString &)), + this, TQ_SLOT(pathSelected(const TQString &))); checkButtons(); @@ -345,8 +345,8 @@ void TDEHTMLSearchConfig::generateIndex() indexProc = new TDEProcess; *indexProc << exe << "--lang" << language->currentTag(); - connect(indexProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(indexTerminated(TDEProcess *))); + connect(indexProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(indexTerminated(TDEProcess *))); runButton->setEnabled(false); diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp index b3c70915c..be9975d7a 100644 --- a/khelpcenter/htmlsearch/ktagcombobox.cpp +++ b/khelpcenter/htmlsearch/ktagcombobox.cpp @@ -98,10 +98,10 @@ void KTagComboBox::clear() delete old_popup; old_popup = popup; popup = new TQPopupMenu(this); - connect( popup, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( popup, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( popup, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } int KTagComboBox::count() const @@ -176,10 +176,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons checkInsertPos(pi, text, index); pi->insertItem(text, p, count(), index); tags->append(tag); - connect( p, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( p, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::paintEvent( TQPaintEvent * ev) diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index 230a7eb69..d7af38c07 100644 --- a/khelpcenter/htmlsearchconfig.cpp +++ b/khelpcenter/htmlsearchconfig.cpp @@ -61,8 +61,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) url->setText(i18n("ht://dig home page")); url->setAlignment(TQLabel::AlignHCenter); grid->addMultiCellWidget(url, 2,2, 0, 1); - connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), - this, TQT_SLOT(urlClicked(const TQString&))); + connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)), + this, TQ_SLOT(urlClicked(const TQString&))); gb = new TQGroupBox(i18n("Program Locations"), this); @@ -75,8 +75,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) l->setBuddy( mHtsearchUrl ); grid->addWidget(l, 1,0); grid->addWidget(mHtsearchUrl, 1,1); - connect( mHtsearchUrl->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mHtsearchUrl->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); TQString wtstr = i18n( "Enter the URL of the htsearch CGI program." ); TQWhatsThis::add( mHtsearchUrl, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -86,8 +86,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) l->setBuddy( mIndexerBin ); grid->addWidget(l, 2,0); grid->addWidget(mIndexerBin, 2,1); - connect( mIndexerBin->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mIndexerBin->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); wtstr = i18n( "Enter the path to your htdig indexer program here." ); TQWhatsThis::add( mIndexerBin, wtstr ); TQWhatsThis::add( l, wtstr ); @@ -98,8 +98,8 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name) l->setBuddy( mDbDir ); grid->addWidget(l, 3,0); grid->addWidget(mDbDir, 3,1); - connect( mDbDir->lineEdit(), TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); + connect( mDbDir->lineEdit(), TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); wtstr = i18n( "Enter the path to the htdig database folder." ); TQWhatsThis::add( mDbDir, wtstr ); TQWhatsThis::add( l, wtstr ); diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index bb3c69db6..e5b2d0937 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/khelpcenter/kcmhelpcenter.cpp @@ -73,7 +73,7 @@ IndexDirDialog::IndexDirDialog( TQWidget *parent ) urlLayout->addWidget( mIndexUrlRequester ); mIndexUrlRequester->setURL( Prefs::indexDirectory() ); - connect(mIndexUrlRequester->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotUrlChanged( const TQString &))); + connect(mIndexUrlRequester->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotUrlChanged( const TQString &))); slotUrlChanged( mIndexUrlRequester->lineEdit()->text() ); } @@ -120,13 +120,13 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent ) buttonLayout->addStretch( 1 ); mDetailsButton = new TQPushButton( this ); - connect( mDetailsButton, TQT_SIGNAL( clicked() ), TQT_SLOT( toggleDetails() ) ); + connect( mDetailsButton, TQ_SIGNAL( clicked() ), TQ_SLOT( toggleDetails() ) ); buttonLayout->addWidget( mDetailsButton ); hideDetails(); mEndButton = new TQPushButton( this ); - connect( mEndButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEnd() ) ); + connect( mEndButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEnd() ) ); buttonLayout->addWidget( mEndButton ); setFinished( false ); @@ -279,8 +279,8 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent ) mListView->addColumn( i18n("Status") ); mListView->setColumnAlignment( 1, AlignCenter ); topLayout->addWidget( mListView ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( checkSelection() ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( checkSelection() ) ); TQBoxLayout *urlLayout = new TQHBoxLayout( topLayout ); @@ -291,7 +291,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent ) urlLayout->addWidget( mIndexDirLabel, 1 ); TQPushButton *button = new TQPushButton( i18n("Change..."), parent ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( showIndexDirDialog() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( showIndexDirDialog() ) ); urlLayout->addWidget( button ); TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); @@ -446,10 +446,10 @@ bool KCMHelpCenter::buildIndex() if ( !mProgressDialog ) { mProgressDialog = new IndexProgressDialog( this ); - connect( mProgressDialog, TQT_SIGNAL( cancelled() ), - TQT_SLOT( cancelBuildIndex() ) ); - connect( mProgressDialog, TQT_SIGNAL( closed() ), - TQT_SLOT( slotProgressClosed() ) ); + connect( mProgressDialog, TQ_SIGNAL( cancelled() ), + TQ_SLOT( cancelBuildIndex() ) ); + connect( mProgressDialog, TQ_SIGNAL( closed() ), + TQ_SLOT( slotProgressClosed() ) ); } mProgressDialog->setLabelText( name ); mProgressDialog->setTotalSteps( mIndexQueue.count() ); @@ -476,12 +476,12 @@ void KCMHelpCenter::startIndexProcess() *mProcess << mCmdFile->name(); *mProcess << Prefs::indexDirectory(); - connect( mProcess, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( slotIndexFinished( TDEProcess * ) ) ); - connect( mProcess, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) ); - connect( mProcess, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - TQT_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); + connect( mProcess, TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( slotIndexFinished( TDEProcess * ) ) ); + connect( mProcess, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + TQ_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) ); + connect( mProcess, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + TQ_SLOT( slotReceivedStderr( TDEProcess *, char *, int ) ) ); if ( !mProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { kdError() << "KCMHelpcenter::startIndexProcess(): Failed to start process." diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 6fac581c2..dd0ee5811 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -91,12 +91,12 @@ void IndexBuilder::processCmdQueue() *proc << args; - connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); - connect( proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ), - TQT_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) ); - connect( proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ), - TQT_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ), + TQ_SLOT( slotReceivedStdout(TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int ) ), + TQ_SLOT( slotReceivedStderr(TDEProcess *, char *, int ) ) ); mCmdQueue.remove( it ); @@ -211,7 +211,7 @@ int main( int argc, char **argv ) IndexBuilder builder(cmdFile); - TQTimer::singleShot(0, &builder, TQT_SLOT(buildIndices())); + TQTimer::singleShot(0, &builder, TQ_SLOT(buildIndices())); return app.exec(); } diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index 3579b1afe..0bfc80118 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -91,36 +91,36 @@ MainWindow::MainWindow() mSplitter = new TQSplitter( this ); mDoc = new View( mSplitter, 0, this, 0, TDEHTMLPart::DefaultGUI, actionCollection() ); - connect( mDoc, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - TQT_SLOT( setCaption( const TQString & ) ) ); - connect( mDoc, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - TQT_SLOT( statusBarMessage( const TQString & ) ) ); - connect( mDoc, TQT_SIGNAL( onURL( const TQString & ) ), - TQT_SLOT( statusBarMessage( const TQString & ) ) ); - connect( mDoc, TQT_SIGNAL( started( TDEIO::Job * ) ), - TQT_SLOT( slotStarted( TDEIO::Job * ) ) ); - connect( mDoc, TQT_SIGNAL( completed() ), - TQT_SLOT( documentCompleted() ) ); - connect( mDoc, TQT_SIGNAL( searchResultCacheAvailable() ), - TQT_SLOT( enableLastSearchAction() ) ); - - connect( mDoc, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( enableCopyTextAction() ) ); + connect( mDoc, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + TQ_SLOT( setCaption( const TQString & ) ) ); + connect( mDoc, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + TQ_SLOT( statusBarMessage( const TQString & ) ) ); + connect( mDoc, TQ_SIGNAL( onURL( const TQString & ) ), + TQ_SLOT( statusBarMessage( const TQString & ) ) ); + connect( mDoc, TQ_SIGNAL( started( TDEIO::Job * ) ), + TQ_SLOT( slotStarted( TDEIO::Job * ) ) ); + connect( mDoc, TQ_SIGNAL( completed() ), + TQ_SLOT( documentCompleted() ) ); + connect( mDoc, TQ_SIGNAL( searchResultCacheAvailable() ), + TQ_SLOT( enableLastSearchAction() ) ); + + connect( mDoc, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( enableCopyTextAction() ) ); statusBar()->insertItem(i18n("Preparing Index"), 0, 1); statusBar()->setItemAlignment(0, AlignLeft | AlignVCenter); connect( mDoc->browserExtension(), - TQT_SIGNAL( openURLRequest( const KURL &, + TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - TQT_SLOT( slotOpenURLRequest( const KURL &, + TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); mNavigator = new Navigator( mDoc, mSplitter, "nav" ); - connect( mNavigator, TQT_SIGNAL( itemSelected( const TQString & ) ), - TQT_SLOT( viewUrl( const TQString & ) ) ); - connect( mNavigator, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ), - TQT_SLOT( slotGlossSelected( const GlossaryEntry & ) ) ); + connect( mNavigator, TQ_SIGNAL( itemSelected( const TQString & ) ), + TQ_SLOT( viewUrl( const TQString & ) ) ); + connect( mNavigator, TQ_SIGNAL( glossSelected( const GlossaryEntry & ) ), + TQ_SLOT( slotGlossSelected( const GlossaryEntry & ) ) ); mSplitter->moveToFirst(mNavigator); mSplitter->setResizeMode(mNavigator, TQSplitter::KeepSize); @@ -150,10 +150,10 @@ MainWindow::MainWindow() History::self().installMenuBarHook( this ); - connect( &History::self(), TQT_SIGNAL( goInternalUrl( const KURL & ) ), - mNavigator, TQT_SLOT( openInternalUrl( const KURL & ) ) ); - connect( &History::self(), TQT_SIGNAL( goUrl( const KURL & ) ), - mNavigator, TQT_SLOT( selectItem( const KURL & ) ) ); + connect( &History::self(), TQ_SIGNAL( goInternalUrl( const KURL & ) ), + mNavigator, TQ_SLOT( openInternalUrl( const KURL & ) ) ); + connect( &History::self(), TQ_SIGNAL( goUrl( const KURL & ) ), + mNavigator, TQ_SLOT( selectItem( const KURL & ) ) ); statusBarMessage(i18n("Ready")); enableCopyTextAction(); @@ -208,48 +208,48 @@ void MainWindow::writeConfig() void MainWindow::setupActions() { - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); - KStdAction::print( this, TQT_SLOT( print() ), actionCollection(), + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); + KStdAction::print( this, TQ_SLOT( print() ), actionCollection(), "printFrame" ); - TDEAction *prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQT_SLOT( prevPage() ), + TDEAction *prevPage = new TDEAction( i18n( "Previous Page" ), CTRL+Key_PageUp, mDoc, TQ_SLOT( prevPage() ), actionCollection(), "prevPage" ); prevPage->setWhatsThis( i18n( "Moves to the previous page of the document" ) ); - TDEAction *nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQT_SLOT( nextPage() ), + TDEAction *nextPage = new TDEAction( i18n( "Next Page" ), CTRL + Key_PageDown, mDoc, TQ_SLOT( nextPage() ), actionCollection(), "nextPage" ); nextPage->setWhatsThis( i18n( "Moves to the next page of the document" ) ); - TDEAction *home = KStdAction::home( this, TQT_SLOT( slotShowHome() ), actionCollection() ); + TDEAction *home = KStdAction::home( this, TQ_SLOT( slotShowHome() ), actionCollection() ); home->setText(i18n("Table of &Contents")); home->setToolTip(i18n("Table of contents")); home->setWhatsThis(i18n("Go back to the table of contents")); - mCopyText = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), actionCollection(), "copy_text"); + mCopyText = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), actionCollection(), "copy_text"); mLastSearchAction = new TDEAction( i18n("&Last Search Result"), 0, this, - TQT_SLOT( slotLastSearch() ), + TQ_SLOT( slotLastSearch() ), actionCollection(), "lastsearch" ); mLastSearchAction->setEnabled( false ); new TDEAction( i18n("Build Search Index..."), 0, mNavigator, - TQT_SLOT( showIndexDialog() ), actionCollection(), "build_index" ); - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), + TQ_SLOT( showIndexDialog() ), actionCollection(), "build_index" ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); TDEConfig *cfg = TDEGlobal::config(); cfg->setGroup( "Debug" ); if ( cfg->readBoolEntry( "SearchErrorLog", false ) ) { new TDEAction( i18n("Show Search Error Log"), 0, this, - TQT_SLOT( showSearchStderr() ), actionCollection(), + TQ_SLOT( showSearchStderr() ), actionCollection(), "show_search_stderr" ); } History::self().setupActions( actionCollection() ); - new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), this, TQT_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); - new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), this, TQT_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); - new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), this, TQT_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); + new TDEAction( i18n( "Configure Fonts..." ), TDEShortcut(), this, TQ_SLOT( slotConfigureFonts() ), actionCollection(), "configure_fonts" ); + new TDEAction( i18n( "Increase Font Sizes" ), "zoom-in", TDEShortcut(), this, TQ_SLOT( slotIncFontSizes() ), actionCollection(), "incFontSizes" ); + new TDEAction( i18n( "Decrease Font Sizes" ), "zoom-out", TDEShortcut(), this, TQ_SLOT( slotDecFontSizes() ), actionCollection(), "decFontSizes" ); } void MainWindow::slotCopySelectedText() @@ -265,8 +265,8 @@ void MainWindow::print() void MainWindow::slotStarted(TDEIO::Job *job) { if (job) - connect(job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)), - TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString &)), + TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); History::self().updateActions(); } diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 4cb3b2f00..8b10688cd 100644 --- a/khelpcenter/navigator.cpp +++ b/khelpcenter/navigator.cpp @@ -85,8 +85,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name ) mShowMissingDocs = config->readBoolEntry("ShowMissingDocs",false); mSearchEngine = new SearchEngine( view ); - connect( mSearchEngine, TQT_SIGNAL( searchFinished() ), - TQT_SLOT( slotSearchFinished() ) ); + connect( mSearchEngine, TQ_SIGNAL( searchFinished() ), + TQ_SLOT( slotSearchFinished() ) ); DocMetaInfo::self()->scanMetaInfo(); @@ -103,18 +103,18 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name ) clearButton->setIconSet( TDEApplication::reverseLayout() ? SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") ); searchLayout->addWidget( clearButton ); - connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( clearSearch() ) ); TQToolTip::add( clearButton, i18n("Clear search") ); mSearchEdit = new TQLineEdit( mSearchFrame ); searchLayout->addWidget( mSearchEdit ); - connect( mSearchEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotSearch() ) ); - connect( mSearchEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( checkSearchButton() ) ); + connect( mSearchEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotSearch() ) ); + connect( mSearchEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( checkSearchButton() ) ); mSearchButton = new TQPushButton( i18n("&Search"), mSearchFrame ); searchLayout->addWidget( mSearchButton ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSearch() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSearch() ) ); clearButton->setFixedHeight( mSearchButton->height() ); @@ -134,8 +134,8 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name ) mSearchWidget->readConfig( TDEGlobal::config() ); } - connect( mTabWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), - TQT_SLOT( slotTabChanged( TQWidget * ) ) ); + connect( mTabWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), + TQ_SLOT( slotTabChanged( TQWidget * ) ) ); } Navigator::~Navigator() @@ -168,22 +168,22 @@ void Navigator::setupContentsTab() mContentsTree->setRootIsDecorated(false); mContentsTree->setSorting(-1, false); - connect(mContentsTree, TQT_SIGNAL(clicked(TQListViewItem*)), - TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(mContentsTree, TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(mContentsTree, TQ_SIGNAL(clicked(TQListViewItem*)), + TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(mContentsTree, TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(slotItemSelected(TQListViewItem*))); mTabWidget->addTab(mContentsTree, i18n("&Contents")); } void Navigator::setupSearchTab() { mSearchWidget = new SearchWidget( mSearchEngine, mTabWidget ); - connect( mSearchWidget, TQT_SIGNAL( searchResult( const TQString & ) ), - TQT_SLOT( slotShowSearchResult( const TQString & ) ) ); - connect( mSearchWidget, TQT_SIGNAL( scopeCountChanged( int ) ), - TQT_SLOT( checkSearchButton() ) ); - connect( mSearchWidget, TQT_SIGNAL( showIndexDialog() ), - TQT_SLOT( showIndexDialog() ) ); + connect( mSearchWidget, TQ_SIGNAL( searchResult( const TQString & ) ), + TQ_SLOT( slotShowSearchResult( const TQString & ) ) ); + connect( mSearchWidget, TQ_SIGNAL( scopeCountChanged( int ) ), + TQ_SLOT( checkSearchButton() ) ); + connect( mSearchWidget, TQ_SIGNAL( showIndexDialog() ), + TQ_SLOT( showIndexDialog() ) ); mTabWidget->addTab( mSearchWidget, i18n("Search Options")); } @@ -191,8 +191,8 @@ void Navigator::setupSearchTab() void Navigator::setupGlossaryTab() { mGlossaryTree = new Glossary( mTabWidget ); - connect( mGlossaryTree, TQT_SIGNAL( entrySelected( const GlossaryEntry & ) ), - this, TQT_SIGNAL( glossSelected( const GlossaryEntry & ) ) ); + connect( mGlossaryTree, TQ_SIGNAL( entrySelected( const GlossaryEntry & ) ), + this, TQ_SIGNAL( glossSelected( const GlossaryEntry & ) ) ); mTabWidget->addTab( mGlossaryTree, i18n( "G&lossary" ) ); } @@ -643,8 +643,8 @@ void Navigator::showIndexDialog() { if ( !mIndexDialog ) { mIndexDialog = new KCMHelpCenter( mSearchEngine, this ); - connect( mIndexDialog, TQT_SIGNAL( searchIndexUpdated() ), mSearchWidget, - TQT_SLOT( updateScopeList() ) ); + connect( mIndexDialog, TQ_SIGNAL( searchIndexUpdated() ), mSearchWidget, + TQ_SLOT( updateScopeList() ) ); } mIndexDialog->show(); mIndexDialog->raise(); diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index c16da7d50..7d54f0f63 100644 --- a/khelpcenter/scrollkeepertreebuilder.cpp +++ b/khelpcenter/scrollkeepertreebuilder.cpp @@ -61,7 +61,7 @@ NavigatorItem *ScrollKeeperTreeBuilder::build( NavigatorItem *parent, KProcIO proc; proc << "scrollkeeper-get-content-list"; proc << lang; - connect(&proc,TQT_SIGNAL(readReady(KProcIO *)),TQT_SLOT(getContentsList(KProcIO *))); + connect(&proc,TQ_SIGNAL(readReady(KProcIO *)),TQ_SLOT(getContentsList(KProcIO *))); if (!proc.start(TDEProcess::Block)) { kdDebug(1400) << "Could not execute scrollkeeper-get-content-list" << endl; return 0; diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp index 07aa81535..6dde748a9 100644 --- a/khelpcenter/searchengine.cpp +++ b/khelpcenter/searchengine.cpp @@ -97,10 +97,10 @@ void SearchTraverser::connectHandler( SearchHandler *handler ) int count = 0; if ( it != mConnectCount.end() ) count = *it; if ( count == 0 ) { - connect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ), - TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) ); - connect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ), - TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) ); + connect( handler, TQ_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ), + TQ_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) ); + connect( handler, TQ_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ), + TQ_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) ); } mConnectCount[ handler ] = ++count; } @@ -116,10 +116,10 @@ void SearchTraverser::disconnectHandler( SearchHandler *handler ) int count = *it; --count; if ( count == 0 ) { - disconnect( handler, TQT_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ), - this, TQT_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) ); - disconnect( handler, TQT_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ), - this, TQT_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) ); + disconnect( handler, TQ_SIGNAL( searchError( SearchHandler *, DocEntry *, const TQString & ) ), + this, TQ_SLOT( showSearchError( SearchHandler *, DocEntry *, const TQString & ) ) ); + disconnect( handler, TQ_SIGNAL( searchFinished( SearchHandler *, DocEntry *, const TQString & ) ), + this, TQ_SLOT( showSearchResult( SearchHandler *, DocEntry *, const TQString & ) ) ); } mConnectCount[ handler ] = count; } @@ -352,12 +352,12 @@ bool SearchEngine::search( TQString words, TQString method, int matches, *mProc << arg.utf8(); } - connect( mProc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) ); - connect( mProc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) ); - connect( mProc, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( searchExited( TDEProcess * ) ) ); + connect( mProc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + TQ_SLOT( searchStdout( TDEProcess *, char *, int ) ) ); + connect( mProc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + TQ_SLOT( searchStderr( TDEProcess *, char *, int ) ) ); + connect( mProc, TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( searchExited( TDEProcess * ) ) ); mSearchRunning = true; mSearchResult = ""; diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp index 54a0a9a38..a2eab853d 100644 --- a/khelpcenter/searchhandler.cpp +++ b/khelpcenter/searchhandler.cpp @@ -114,12 +114,12 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words, *proc << arg.utf8(); } - connect( proc, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), - TQT_SLOT( searchStdout( TDEProcess *, char *, int ) ) ); - connect( proc, TQT_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), - TQT_SLOT( searchStderr( TDEProcess *, char *, int ) ) ); - connect( proc, TQT_SIGNAL( processExited( TDEProcess * ) ), - TQT_SLOT( searchExited( TDEProcess * ) ) ); + connect( proc, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), + TQ_SLOT( searchStdout( TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( receivedStderr( TDEProcess *, char *, int ) ), + TQ_SLOT( searchStderr( TDEProcess *, char *, int ) ) ); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * ) ), + TQ_SLOT( searchExited( TDEProcess * ) ) ); SearchJob *searchJob = new SearchJob; searchJob->mEntry = entry; @@ -139,10 +139,10 @@ void SearchHandler::search( DocEntry *entry, const TQStringList &words, kdDebug() << "SearchHandler::search() URL: " << urlString << endl; TDEIO::TransferJob *job = TDEIO::get( KURL( urlString ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); SearchJob *searchJob = new SearchJob; searchJob->mEntry = entry; diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp index c4ceb20be..176db92c7 100644 --- a/khelpcenter/searchwidget.cpp +++ b/khelpcenter/searchwidget.cpp @@ -81,8 +81,8 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent ) for (int i=0; i < ScopeNum; ++i ) { mScopeCombo->insertItem( scopeSelectionLabel( i ) ); } - connect( mScopeCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( scopeSelectionChanged( int ) ) ); + connect( mScopeCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( scopeSelectionChanged( int ) ) ); l = new TQLabel( mScopeCombo, i18n("&Scope selection:"), this ); @@ -96,16 +96,16 @@ SearchWidget::SearchWidget( SearchEngine *engine, TQWidget *parent ) TQPushButton *indexButton = new TQPushButton( i18n("Build Search &Index..."), this ); - connect( indexButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( showIndexDialog() ) ); + connect( indexButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( showIndexDialog() ) ); topLayout->addWidget( indexButton ); // FIXME: Use SearchHandler on double-clicked document #if 0 - connect( mScopeListView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( scopeDoubleClicked( TQListViewItem * ) ) ); + connect( mScopeListView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( scopeDoubleClicked( TQListViewItem * ) ) ); #endif - connect( mScopeListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( scopeClicked( TQListViewItem * ) ) ); + connect( mScopeListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( scopeClicked( TQListViewItem * ) ) ); } diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp index 83083da9f..e1aaf10aa 100644 --- a/khelpcenter/toc.cpp +++ b/khelpcenter/toc.cpp @@ -133,8 +133,8 @@ int TOC::cachedCTime() const void TOC::buildCache() { TDEProcess *meinproc = new TDEProcess; - connect( meinproc, TQT_SIGNAL( processExited( TDEProcess * ) ), - this, TQT_SLOT( meinprocExited( TDEProcess * ) ) ); + connect( meinproc, TQ_SIGNAL( processExited( TDEProcess * ) ), + this, TQ_SLOT( meinprocExited( TDEProcess * ) ) ); *meinproc << locate( "exe", "meinproc" ); *meinproc << "--stylesheet" << locate( "data", "khelpcenter/table-of-contents.xslt" ); diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index f7e5940fb..49135e0b0 100644 --- a/khelpcenter/view.cpp +++ b/khelpcenter/view.cpp @@ -35,10 +35,10 @@ View::View( TQWidget *parentWidget, const char *widgetName, m_zoomStepping = 10; - connect( this, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setTitle( const TQString & ) ) ); - connect( this, TQT_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ), - this, TQT_SLOT( showMenu( const TQString &, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setTitle( const TQString & ) ) ); + connect( this, TQ_SIGNAL( popupMenu( const TQString &, const TQPoint& ) ), + this, TQ_SLOT( showMenu( const TQString &, const TQPoint& ) ) ); TQString css = langLookup("common/tde-default.css"); if (!css.isEmpty()) @@ -267,7 +267,7 @@ void View::showMenu( const TQString& url, const TQPoint& pos) } else { - pop->insertItem(i18n("Copy Link Address"), this, TQT_SLOT(slotCopyLink())); + pop->insertItem(i18n("Copy Link Address"), this, TQ_SLOT(slotCopyLink())); mCopyURL = completeURL(url).url(); } diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp index 0fdc48ab9..22732fa97 100644 --- a/khotkeys/arts/soundrecorder_arts.cpp +++ b/khotkeys/arts/soundrecorder_arts.cpp @@ -61,7 +61,7 @@ SoundRecorderArts::SoundRecorderArts(TQObject *parent, const char *name) ( void ) check; m_recStream->usePolling( false ); - connect( m_recStream, TQT_SIGNAL(data (TQByteArray &)), this, TQT_SLOT(slotDataReceived(TQByteArray& ))); + connect( m_recStream, TQ_SIGNAL(data (TQByteArray &)), this, TQ_SLOT(slotDataReceived(TQByteArray& ))); } SoundRecorderArts::~SoundRecorderArts() @@ -80,7 +80,7 @@ void SoundRecorderArts::start() void SoundRecorderArts::stop() { m_recStream->stop(); - TQTimer::singleShot(400,this,TQT_SLOT(slotEmitSignal())); + TQTimer::singleShot(400,this,TQ_SLOT(slotEmitSignal())); } void SoundRecorderArts::abort() diff --git a/khotkeys/kcontrol/action_group_tab.cpp b/khotkeys/kcontrol/action_group_tab.cpp index 1bdeffd75..8ba35f323 100644 --- a/khotkeys/kcontrol/action_group_tab.cpp +++ b/khotkeys/kcontrol/action_group_tab.cpp @@ -36,18 +36,18 @@ Action_group_tab::Action_group_tab( TQWidget* parent_P , const char* name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( disable_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_multilineedit, TQT_SIGNAL( textChanged()), - module, TQT_SLOT( changed())); + connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( disable_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_multilineedit, TQ_SIGNAL( textChanged()), + module, TQ_SLOT( changed())); } void Action_group_tab::clear_data() { - disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this, - TQT_SLOT( action_group_name_changed( const TQString& ))); + disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this, + TQ_SLOT( action_group_name_changed( const TQString& ))); action_name_lineedit->clear(); action_name_lineedit->setReadOnly( false ); disable_checkbox->setChecked( false ); @@ -71,8 +71,8 @@ void Action_group_tab::set_data( const Action_data_group* data_P ) else disable_checkbox->setText( i18n( "&Disable" )); comment_multilineedit->setText( data_P->comment()); - connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), this, - TQT_SLOT( action_group_name_changed( const TQString& ))); + connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), this, + TQ_SLOT( action_group_name_changed( const TQString& ))); system_group = data_P->system_group(); } diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp index d007ab5f5..2f87132d8 100644 --- a/khotkeys/kcontrol/action_list_widget.cpp +++ b/khotkeys/kcontrol/action_list_widget.cpp @@ -50,7 +50,7 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P ) popup->insertItem( i18n( "Keyboard Input..." ), TYPE_KEYBOARD_INPUT_ACTION ); popup->insertItem( i18n( "Activate Window..." ), TYPE_ACTIVATE_WINDOW_ACTION ); popup->insertItem( i18n( "Waiting..." ), TYPE_WAITING_ACTION ); - connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); + connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int ))); new_button->setPopup( popup ); actions_listview->header()->hide(); actions_listview->addColumn( "" ); @@ -60,17 +60,17 @@ Action_list_widget::Action_list_widget( TQWidget* parent_P, const char* name_P ) modify_button->setEnabled( false ); delete_button->setEnabled( false ); clear_data(); - connect( actions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( modify_pressed() ) ); + connect( actions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( modify_pressed() ) ); // KHotKeys::Module::changed() - connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)), module, TQT_SLOT(changed())); + connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)), module, TQ_SLOT(changed())); } Action_list_widget::~Action_list_widget() diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp index 1b6c7a743..9fe4716c2 100644 --- a/khotkeys/kcontrol/actions_listview_widget.cpp +++ b/khotkeys/kcontrol/actions_listview_widget.cpp @@ -39,10 +39,10 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char actions_listview->header()->hide(); actions_listview->addColumn( "" ); actions_listview->setRootIsDecorated( true ); // CHECKME - connect( actions_listview, TQT_SIGNAL( current_changed( TQListViewItem* )), - TQT_SLOT( current_changed( TQListViewItem* ))); - connect( actions_listview, TQT_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )), - TQT_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); + connect( actions_listview, TQ_SIGNAL( current_changed( TQListViewItem* )), + TQ_SLOT( current_changed( TQListViewItem* ))); + connect( actions_listview, TQ_SIGNAL( moved( TQListViewItem*, TQListViewItem*, TQListViewItem* )), + TQ_SLOT( item_moved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); // KHotKeys::Module::changed() } diff --git a/khotkeys/kcontrol/command_url_widget.cpp b/khotkeys/kcontrol/command_url_widget.cpp index 133913360..5d06c1a16 100644 --- a/khotkeys/kcontrol/command_url_widget.cpp +++ b/khotkeys/kcontrol/command_url_widget.cpp @@ -37,8 +37,8 @@ Command_url_widget::Command_url_widget( TQWidget* parent_P, const char* name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( command_url_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( command_url_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } void Command_url_widget::clear_data() diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp index 817602a12..f0a43cb93 100644 --- a/khotkeys/kcontrol/condition_list_widget.cpp +++ b/khotkeys/kcontrol/condition_list_widget.cpp @@ -49,10 +49,10 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na popup->insertItem( i18n( "Not_condition", "Not" ), TYPE_NOT ); popup->insertItem( i18n( "And_condition", "And" ), TYPE_AND ); popup->insertItem( i18n( "Or_condition", "Or" ), TYPE_OR ); - connect( conditions_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( modify_pressed() ) ); + connect( conditions_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( modify_pressed() ) ); - connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); + connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int ))); new_button->setPopup( popup ); conditions_listview->header()->hide(); conditions_listview->addColumn( "" ); @@ -66,14 +66,14 @@ Condition_list_widget::Condition_list_widget( TQWidget* parent_P, const char* na move_down_button->setEnabled( false ); clear_data(); // KHotKeys::Module::changed() - connect(new_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(copy_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(modify_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed())); - connect(delete_button, TQT_SIGNAL(clicked()), module, TQT_SLOT( changed())); - connect(move_up_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(move_down_button, TQT_SIGNAL(clicked()), module, TQT_SLOT(changed())); - connect(comment_lineedit, TQT_SIGNAL(textChanged(const TQString&)), - module, TQT_SLOT(changed())); + connect(new_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(copy_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(modify_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed())); + connect(delete_button, TQ_SIGNAL(clicked()), module, TQ_SLOT( changed())); + connect(move_up_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(move_down_button, TQ_SIGNAL(clicked()), module, TQ_SLOT(changed())); + connect(comment_lineedit, TQ_SIGNAL(textChanged(const TQString&)), + module, TQ_SLOT(changed())); } Condition_list_widget::~Condition_list_widget() diff --git a/khotkeys/kcontrol/dcop_widget.cpp b/khotkeys/kcontrol/dcop_widget.cpp index bee149860..d986e5a51 100644 --- a/khotkeys/kcontrol/dcop_widget.cpp +++ b/khotkeys/kcontrol/dcop_widget.cpp @@ -36,14 +36,14 @@ Dcop_widget::Dcop_widget( TQWidget* parent_P, const char* name_P ) clear_data(); try_button->setText( i18n( "to try", "&Try" )); // Qt designer can't do this // KHotKeys::Module::changed() - connect( remote_app_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( remote_object_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( called_function_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( arguments_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( remote_app_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( remote_object_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( called_function_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( arguments_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } void Dcop_widget::clear_data() diff --git a/khotkeys/kcontrol/general_settings_tab.cpp b/khotkeys/kcontrol/general_settings_tab.cpp index cf2337446..a0e1e84c7 100644 --- a/khotkeys/kcontrol/general_settings_tab.cpp +++ b/khotkeys/kcontrol/general_settings_tab.cpp @@ -27,8 +27,8 @@ General_settings_tab::General_settings_tab( TQWidget* parent_P, const char* name : General_settings_tab_ui( parent_P, name_P ) { // KHotKeys::Module::changed() - connect( disable_daemon_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( disable_daemon_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); } void General_settings_tab::import_clicked() diff --git a/khotkeys/kcontrol/general_tab.cpp b/khotkeys/kcontrol/general_tab.cpp index 1cd98d461..21ca6f952 100644 --- a/khotkeys/kcontrol/general_tab.cpp +++ b/khotkeys/kcontrol/general_tab.cpp @@ -73,22 +73,22 @@ General_tab::General_tab( TQWidget* parent_P, const char* name_P ) } clear_data(); // KHotKeys::Module::changed() - connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( disable_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_multilineedit, TQT_SIGNAL( textChanged()), - module, TQT_SLOT( changed())); - connect( action_type_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); + connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( disable_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_multilineedit, TQ_SIGNAL( textChanged()), + module, TQ_SLOT( changed())); + connect( action_type_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); } void General_tab::clear_data() { - disconnect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - this, TQT_SLOT( action_name_changed( const TQString& ))); - disconnect( action_type_combo, TQT_SIGNAL( activated( int )), - this, TQT_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ? + disconnect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + this, TQ_SLOT( action_name_changed( const TQString& ))); + disconnect( action_type_combo, TQ_SIGNAL( activated( int )), + this, TQ_SIGNAL( action_type_changed( int ))); // CHECKME neodpoji to sloty od nej ? action_name_lineedit->clear(); disable_checkbox->setChecked( false ); disable_checkbox->setText( i18n( "&Disable" )); @@ -113,10 +113,10 @@ void General_tab::set_data( const Action_data* data_P ) comment_multilineedit->setText( data_P->comment()); action_type_combo->setCurrentItem( Tab_widget::type( data_P )); // module->set_action_type( data_P->type()); - connect( action_name_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( action_name_changed( const TQString& ))); - connect( action_type_combo, TQT_SIGNAL( activated( int )), - TQT_SIGNAL( action_type_changed( int ))); + connect( action_name_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( action_name_changed( const TQString& ))); + connect( action_type_combo, TQ_SIGNAL( activated( int )), + TQ_SIGNAL( action_type_changed( int ))); } void General_tab::get_data( TQString& name_O, TQString& comment_O, bool& enabled_O ) diff --git a/khotkeys/kcontrol/gesture_triggers_tab.cpp b/khotkeys/kcontrol/gesture_triggers_tab.cpp index b00f60963..52c41cd9e 100644 --- a/khotkeys/kcontrol/gesture_triggers_tab.cpp +++ b/khotkeys/kcontrol/gesture_triggers_tab.cpp @@ -35,12 +35,12 @@ Gesture_triggers_tab::Gesture_triggers_tab( TQWidget* parent_P, const char* name { clear_data(); // KHotKeys::Module::changed() - connect( gesture_edit_button1, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( gesture_edit_button2, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( gesture_edit_button3, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( gesture_edit_button1, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( gesture_edit_button2, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( gesture_edit_button3, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); } void Gesture_triggers_tab::clear_data() @@ -142,8 +142,8 @@ Gesture_edit_dialog::Gesture_edit_dialog( const TQString& gesture_P ) _page = new GestureRecordPage( _gesture, this, "GestureRecordPage"); -// connect(_page, TQT_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture -// this, TQT_SLOT(enableButtonOK(bool))); +// connect(_page, TQ_SIGNAL(gestureRecorded(bool)), // allow clearing the gesture +// this, TQ_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp index e9e768bb0..bc254a878 100644 --- a/khotkeys/kcontrol/gesturerecordpage.cpp +++ b/khotkeys/kcontrol/gesturerecordpage.cpp @@ -49,8 +49,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, _recorder = new GestureRecorder(this, "recorder"); _recorder->setMinimumHeight(150); setStretchFactor(_recorder, 1); - connect(_recorder, TQT_SIGNAL(recorded(const TQString &)), - this, TQT_SLOT(slotRecorded(const TQString &))); + connect(_recorder, TQ_SIGNAL(recorded(const TQString &)), + this, TQ_SLOT(slotRecorded(const TQString &))); TQHBox *hBox = new TQHBox(this, "hbox"); @@ -62,8 +62,8 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture, hBox->setStretchFactor(spacer, 1); _resetButton = new TQPushButton(i18n("&Reset"), hBox, "resetButton"); - connect(_resetButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotResetClicked())); + connect(_resetButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotResetClicked())); diff --git a/khotkeys/kcontrol/gestures_settings_tab.cpp b/khotkeys/kcontrol/gestures_settings_tab.cpp index 8585fedbc..200fa6b97 100644 --- a/khotkeys/kcontrol/gestures_settings_tab.cpp +++ b/khotkeys/kcontrol/gestures_settings_tab.cpp @@ -39,12 +39,12 @@ Gestures_settings_tab::Gestures_settings_tab( TQWidget* parent_P, const char* na mouse_button_combo->insertItem( i18n( "Button 8 (if available)" ), 6 ); mouse_button_combo->insertItem( i18n( "Button 9 (if available)" ), 7 ); // KHotKeys::Module::changed() - connect( mouse_gestures_globally, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( mouse_button_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); - connect( timeout_input, TQT_SIGNAL( valueChanged( int )), - module, TQT_SLOT( changed())); + connect( mouse_gestures_globally, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( mouse_button_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); + connect( timeout_input, TQ_SIGNAL( valueChanged( int )), + module, TQ_SLOT( changed())); } void Gestures_settings_tab::read_data() diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index cd394a6e6..48349a65c 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -78,12 +78,12 @@ Module::Module( TQWidget* parent_P, const char* ) vbox->addWidget( splt ); buttons_widget = new Main_buttons_widget( this ); vbox->addWidget( buttons_widget ); - connect( actions_listview_widget, TQT_SIGNAL( current_action_changed()), - TQT_SLOT( listview_current_action_changed())); - connect( buttons_widget, TQT_SIGNAL( new_action_pressed()), TQT_SLOT( new_action())); - connect( buttons_widget, TQT_SIGNAL( new_action_group_pressed()), TQT_SLOT( new_action_group())); - connect( buttons_widget, TQT_SIGNAL( delete_action_pressed()), TQT_SLOT( delete_action())); - connect( buttons_widget, TQT_SIGNAL( global_settings_pressed()), TQT_SLOT( global_settings())); + connect( actions_listview_widget, TQ_SIGNAL( current_action_changed()), + TQ_SLOT( listview_current_action_changed())); + connect( buttons_widget, TQ_SIGNAL( new_action_pressed()), TQ_SLOT( new_action())); + connect( buttons_widget, TQ_SIGNAL( new_action_group_pressed()), TQ_SLOT( new_action_group())); + connect( buttons_widget, TQ_SIGNAL( delete_action_pressed()), TQ_SLOT( delete_action())); + connect( buttons_widget, TQ_SIGNAL( global_settings_pressed()), TQ_SLOT( global_settings())); // listview_current_action_changed(); // init TDEAboutData* about = new TDEAboutData("kcmkhotkeys", I18N_NOOP("KHotKeys"), KHOTKEYS_VERSION, diff --git a/khotkeys/kcontrol/keyboard_input_widget.cpp b/khotkeys/kcontrol/keyboard_input_widget.cpp index 4d5727482..a518fa02d 100644 --- a/khotkeys/kcontrol/keyboard_input_widget.cpp +++ b/khotkeys/kcontrol/keyboard_input_widget.cpp @@ -36,16 +36,16 @@ Keyboard_input_widget::Keyboard_input_widget( TQWidget* parent_P, const char* na { clear_data(); // KHotKeys::Module::changed() - connect( action_window_radio, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( active_window_radio, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( specific_window_radio, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( keyboard_input_multilineedit, TQT_SIGNAL( textChanged()), - module, TQT_SLOT( changed())); - connect( modify_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( action_window_radio, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( active_window_radio, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( specific_window_radio, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( keyboard_input_multilineedit, TQ_SIGNAL( textChanged()), + module, TQ_SLOT( changed())); + connect( modify_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); } void Keyboard_input_widget::clear_data() diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp index 3532cc13f..4a1e258b5 100644 --- a/khotkeys/kcontrol/main_buttons_widget.cpp +++ b/khotkeys/kcontrol/main_buttons_widget.cpp @@ -26,18 +26,18 @@ namespace KHotKeys Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P ) : Main_buttons_widget_ui( parent_P, name_P ) { - connect( new_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_pressed())); - connect( new_action_group_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( new_action_group_pressed())); - connect( delete_action_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( delete_action_pressed())); - connect( global_settings_button, TQT_SIGNAL( clicked()), TQT_SIGNAL( global_settings_pressed())); + connect( new_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_pressed())); + connect( new_action_group_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( new_action_group_pressed())); + connect( delete_action_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( delete_action_pressed())); + connect( global_settings_button, TQ_SIGNAL( clicked()), TQ_SIGNAL( global_settings_pressed())); enable_delete( false ); // KHotKeys::Module::changed() - connect( new_action_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( new_action_group_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( delete_action_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( new_action_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( new_action_group_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( delete_action_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why } diff --git a/khotkeys/kcontrol/menuentry_widget.cpp b/khotkeys/kcontrol/menuentry_widget.cpp index 9b313d20d..8fac287b8 100644 --- a/khotkeys/kcontrol/menuentry_widget.cpp +++ b/khotkeys/kcontrol/menuentry_widget.cpp @@ -37,8 +37,8 @@ Menuentry_widget::Menuentry_widget( TQWidget* parent_P, const char* name_P ) { clear_data(); // KHotKeys::Module::changed() - connect( menuentry_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( menuentry_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } void Menuentry_widget::clear_data() diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp index d3ca4afbe..236d755d2 100644 --- a/khotkeys/kcontrol/tab_widget.cpp +++ b/khotkeys/kcontrol/tab_widget.cpp @@ -59,8 +59,8 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P ) pages[ TAB_GESTURES_SETTINGS ] = new Gestures_settings_tab; General_tab* general_tab; pages[ TAB_GENERAL ] = general_tab = new General_tab; - connect( general_tab, TQT_SIGNAL( action_type_changed( int )), - TQT_SLOT( set_action_type_slot( int ))); + connect( general_tab, TQ_SIGNAL( action_type_changed( int )), + TQ_SLOT( set_action_type_slot( int ))); pages[ TAB_GROUP_GENERAL ] = new Action_group_tab; pages[ TAB_CONDITIONS ] = new Condition_list_tab; pages[ TAB_ACTIONS ] = new Action_list_tab; @@ -76,7 +76,7 @@ Tab_widget::Tab_widget( TQWidget* parent_P, const char* name_P ) for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) - connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); + connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data())); #ifdef HAVE_ARTS if( haveArts()) show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS )); @@ -441,18 +441,18 @@ void Tab_widget::show_pages( const Pages_set& pages_P ) { removePage( pages[ i ] ); if( pages_P.is_set( i )) // don't clear page contents if it stays visible - disconnect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); + disconnect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data())); } clear_pages(); // reconnect all pages to this signal - disconnect( this, TQT_SIGNAL( clear_pages_signal()), NULL, NULL ); + disconnect( this, TQ_SIGNAL( clear_pages_signal()), NULL, NULL ); for( tab_pos_t i = TAB_FIRST; i < TAB_END; ++i ) { if( pages_P.is_set( i )) addTab( pages[ i ], i18n( tab_labels[ i ] )); - connect( this, TQT_SIGNAL( clear_pages_signal()), pages[ i ], TQT_SLOT( clear_data())); + connect( this, TQ_SIGNAL( clear_pages_signal()), pages[ i ], TQ_SLOT( clear_data())); } show(); } diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 947a148b8..d3773c3f3 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -55,9 +55,9 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P ) if( haveArts()) popup->insertItem( i18n( "Voice Trigger..." ), TYPE_VOICE_TRIGGER ); #endif - connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); - connect( triggers_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( modify_pressed() ) ); + connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int ))); + connect( triggers_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( modify_pressed() ) ); new_button->setPopup( popup ); copy_button->setEnabled( false ); @@ -69,16 +69,16 @@ Triggers_tab::Triggers_tab( TQWidget* parent_P, const char* name_P ) triggers_listview->setForceSelect( true ); clear_data(); // KHotKeys::Module::changed() - connect( new_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( copy_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( modify_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( delete_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( new_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( copy_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( modify_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( delete_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } Triggers_tab::~Triggers_tab() @@ -230,8 +230,8 @@ Shortcut_trigger_widget::Shortcut_trigger_widget( TQWidget* parent_P, const char lay->addWidget( bt, 0 , TQt::AlignHCenter ); lay->addStretch(); clear_data(); - connect( bt, TQT_SIGNAL( capturedShortcut( const TDEShortcut& )), - this, TQT_SLOT( capturedShortcut( const TDEShortcut& ))); + connect( bt, TQ_SIGNAL( capturedShortcut( const TDEShortcut& )), + this, TQ_SLOT( capturedShortcut( const TDEShortcut& ))); } void Shortcut_trigger_widget::clear_data() @@ -320,8 +320,8 @@ Gesture_trigger_dialog::Gesture_trigger_dialog( Gesture_trigger* trigger_P ) _page = new GestureRecordPage( _trigger->gesturecode(), this, "GestureRecordPage"); - connect(_page, TQT_SIGNAL(gestureRecorded(bool)), - this, TQT_SLOT(enableButtonOK(bool))); + connect(_page, TQ_SIGNAL(gestureRecorded(bool)), + this, TQ_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } @@ -343,7 +343,7 @@ _trigger( trigger_P ), _page( NULL ) { _page = new VoiceRecordPage( _trigger ? _trigger->voicecode() : TQString::null , this, "VoiceRecordPage"); - connect(_page, TQT_SIGNAL(voiceRecorded(bool)), this, TQT_SLOT(enableButtonOK(bool))); + connect(_page, TQ_SIGNAL(voiceRecorded(bool)), this, TQ_SLOT(enableButtonOK(bool))); setMainWidget( _page ); } diff --git a/khotkeys/kcontrol/voice_settings_tab.cpp b/khotkeys/kcontrol/voice_settings_tab.cpp index 1d97d69ab..952cc0dbe 100644 --- a/khotkeys/kcontrol/voice_settings_tab.cpp +++ b/khotkeys/kcontrol/voice_settings_tab.cpp @@ -26,7 +26,7 @@ namespace KHotKeys Voice_settings_tab::Voice_settings_tab( TQWidget* parent_P, const char* name_P ) : Voice_settings_tab_ui( parent_P, name_P ) { - connect( keyButton , TQT_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQT_SLOT(slotCapturedKey( const TDEShortcut& ))); + connect( keyButton , TQ_SIGNAL(capturedShortcut (const TDEShortcut &)) , this, TQ_SLOT(slotCapturedKey( const TDEShortcut& ))); } void Voice_settings_tab::read_data() diff --git a/khotkeys/kcontrol/voicerecorder.cpp b/khotkeys/kcontrol/voicerecorder.cpp index 763e096e8..9af645045 100644 --- a/khotkeys/kcontrol/voicerecorder.cpp +++ b/khotkeys/kcontrol/voicerecorder.cpp @@ -52,7 +52,7 @@ VoiceRecorder::VoiceRecorder(const Sound& sound_P, const TQString &voiceId, TQWi buttonPlay->setEnabled(sound_P.size() > 50); buttonStop->setEnabled(false); - connect (_recorder , TQT_SIGNAL(recorded(const Sound& )) , this , TQT_SLOT(slotSoundRecorded(const Sound& ) )); + connect (_recorder , TQ_SIGNAL(recorded(const Sound& )) , this , TQ_SLOT(slotSoundRecorded(const Sound& ) )); //if(voiceid_P.isEmpty()) emit recorded(false); @@ -168,7 +168,7 @@ bool VoiceRecorder::drawSound() uint lx=0; uint ly=height/2; - /*** DRAW THE TQT_SIGNAL ******/ + /*** DRAW THE TQ_SIGNAL ******/ for(uint f=1; f<length; f++) { uint nx=f*width/length; diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp index 1c7f8c938..c450abe44 100644 --- a/khotkeys/kcontrol/voicerecordpage.cpp +++ b/khotkeys/kcontrol/voicerecordpage.cpp @@ -59,9 +59,9 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c setStretchFactor(spacer, 1); - connect(_recorder1, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged())); - connect(_recorder2, TQT_SIGNAL(recorded(bool)) , this, TQT_SLOT(slotChanged())); - connect(_lineEdit , TQT_SIGNAL( textChanged (const TQString&)) , this , TQT_SLOT(slotChanged())); + connect(_recorder1, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged())); + connect(_recorder2, TQ_SIGNAL(recorded(bool)) , this, TQ_SLOT(slotChanged())); + connect(_lineEdit , TQ_SIGNAL( textChanged (const TQString&)) , this , TQ_SLOT(slotChanged())); } diff --git a/khotkeys/kcontrol/waiting_widget.cpp b/khotkeys/kcontrol/waiting_widget.cpp index 6f1c0c657..135261e30 100644 --- a/khotkeys/kcontrol/waiting_widget.cpp +++ b/khotkeys/kcontrol/waiting_widget.cpp @@ -33,8 +33,8 @@ Waiting_widget::Waiting_widget( TQWidget* parent_P, const char* name_P ) : Waiting_widget_ui( parent_P, name_P ) { // KHotKeys::Module::changed() - connect(waiting_spinbox, TQT_SIGNAL(valueChanged(int)), - module, TQT_SLOT(changed())); + connect(waiting_spinbox, TQ_SIGNAL(valueChanged(int)), + module, TQ_SLOT(changed())); } void Waiting_widget::set_data( const Waiting_action* data_P ) diff --git a/khotkeys/kcontrol/window_trigger_widget.cpp b/khotkeys/kcontrol/window_trigger_widget.cpp index c897cf14a..ad8871504 100644 --- a/khotkeys/kcontrol/window_trigger_widget.cpp +++ b/khotkeys/kcontrol/window_trigger_widget.cpp @@ -33,14 +33,14 @@ Window_trigger_widget::Window_trigger_widget( TQWidget* parent_P, const char* na { clear_data(); // KHotKeys::Module::changed() - connect( window_appears_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( window_disappears_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( window_activates_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( window_deactivates_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); + connect( window_appears_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( window_disappears_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( window_activates_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( window_deactivates_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); } void Window_trigger_widget::clear_data() diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp index dc16d780f..b36e46e0d 100644 --- a/khotkeys/kcontrol/windowdef_list_widget.cpp +++ b/khotkeys/kcontrol/windowdef_list_widget.cpp @@ -43,10 +43,10 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na { TQPopupMenu* popup = new TQPopupMenu; // CHECKME looks like setting parent doesn't work popup->insertItem( i18n( "Simple Window..." ), TYPE_WINDOWDEF_SIMPLE ); - connect( popup, TQT_SIGNAL( activated( int )), TQT_SLOT( new_selected( int ))); + connect( popup, TQ_SIGNAL( activated( int )), TQ_SLOT( new_selected( int ))); - connect( windows_listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( modify_pressed() ) ); + connect( windows_listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( modify_pressed() ) ); new_button->setPopup( popup ); windows_listview->header()->hide(); windows_listview->addColumn( "" ); @@ -57,16 +57,16 @@ Windowdef_list_widget::Windowdef_list_widget( TQWidget* parent_P, const char* na delete_button->setEnabled( false ); clear_data(); // KHotKeys::Module::changed() - connect( new_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( copy_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( modify_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( delete_button, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( new_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( copy_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( modify_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( delete_button, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } Windowdef_list_widget::~Windowdef_list_widget() diff --git a/khotkeys/kcontrol/windowdef_simple_widget.cpp b/khotkeys/kcontrol/windowdef_simple_widget.cpp index f79d81ea1..381287166 100644 --- a/khotkeys/kcontrol/windowdef_simple_widget.cpp +++ b/khotkeys/kcontrol/windowdef_simple_widget.cpp @@ -37,31 +37,31 @@ Windowdef_simple_widget::Windowdef_simple_widget( TQWidget* parent_P, const char window_title_lineedit->setEnabled( false ); window_class_lineedit->setEnabled( false ); window_role_lineedit->setEnabled( false ); - connect( autodetect_button, TQT_SIGNAL( clicked()), TQT_SLOT( autodetect_clicked())); + connect( autodetect_button, TQ_SIGNAL( clicked()), TQ_SLOT( autodetect_clicked())); clear_data(); // KHotKeys::Module::changed() - connect( window_title_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); - connect( window_title_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( window_class_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); - connect( window_class_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( window_role_combo, TQT_SIGNAL( activated( int )), - module, TQT_SLOT( changed())); - connect( window_role_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); - connect( type_normal_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( type_dialog_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( type_dock_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( type_desktop_checkbox, TQT_SIGNAL( clicked()), - module, TQT_SLOT( changed())); - connect( comment_lineedit, TQT_SIGNAL( textChanged( const TQString& )), - module, TQT_SLOT( changed())); + connect( window_title_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); + connect( window_title_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( window_class_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); + connect( window_class_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( window_role_combo, TQ_SIGNAL( activated( int )), + module, TQ_SLOT( changed())); + connect( window_role_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); + connect( type_normal_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( type_dialog_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( type_dock_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( type_desktop_checkbox, TQ_SIGNAL( clicked()), + module, TQ_SLOT( changed())); + connect( comment_lineedit, TQ_SIGNAL( textChanged( const TQString& )), + module, TQ_SLOT( changed())); } void Windowdef_simple_widget::clear_data() @@ -144,9 +144,9 @@ void Windowdef_simple_widget::window_title_combo_changed( int item_P ) void Windowdef_simple_widget::set_autodetect( TQObject* obj_P, const char* slot_P ) { - disconnect( TQT_SIGNAL( autodetect_signal())); + disconnect( TQ_SIGNAL( autodetect_signal())); if( obj_P != NULL ) - connect( this, TQT_SIGNAL( autodetect_signal()), obj_P, slot_P ); + connect( this, TQ_SIGNAL( autodetect_signal()), obj_P, slot_P ); } void Windowdef_simple_widget::autodetect_clicked() @@ -157,7 +157,7 @@ void Windowdef_simple_widget::autodetect_clicked() void Windowdef_simple_widget::autodetect() { - WindowSelector* sel = new WindowSelector( this, TQT_SLOT( autodetect_window_selected( WId ))); + WindowSelector* sel = new WindowSelector( this, TQ_SLOT( autodetect_window_selected( WId ))); sel->select(); } diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp index 3202c2241..d5a1f4859 100644 --- a/khotkeys/kcontrol/windowselector.cpp +++ b/khotkeys/kcontrol/windowselector.cpp @@ -29,7 +29,7 @@ namespace KHotKeys WindowSelector::WindowSelector( TQObject* receiver_P, const char* slot_P ) { - connect( this, TQT_SIGNAL( selected_signal( WId )), receiver_P, slot_P ); + connect( this, TQ_SIGNAL( selected_signal( WId )), receiver_P, slot_P ); } void WindowSelector::select() diff --git a/khotkeys/shared/conditions.cpp b/khotkeys/shared/conditions.cpp index b09284b44..1d9f37b9c 100644 --- a/khotkeys/shared/conditions.cpp +++ b/khotkeys/shared/conditions.cpp @@ -257,8 +257,8 @@ Active_window_condition::Active_window_condition( TDEConfig& cfg_P, Condition_li void Active_window_condition::init() { - connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )), - this, TQT_SLOT( active_window_changed( WId ))); + connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )), + this, TQ_SLOT( active_window_changed( WId ))); } bool Active_window_condition::match() const @@ -323,8 +323,8 @@ Existing_window_condition::Existing_window_condition( TDEConfig& cfg_P, Conditio void Existing_window_condition::init() { - connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId ))); - connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId ))); + connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId ))); + connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId ))); } bool Existing_window_condition::match() const diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp index 9933ba74f..5777f9a4f 100644 --- a/khotkeys/shared/gestures.cpp +++ b/khotkeys/shared/gestures.cpp @@ -49,9 +49,9 @@ Gesture::Gesture( bool /*enabled_P*/, TQObject* parent_P ) (void) new DeleteObject( this, parent_P ); assert( gesture_handler == NULL ); gesture_handler = this; - connect( &nostroke_timer, TQT_SIGNAL( timeout()), TQT_SLOT( stroke_timeout())); - connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )), - TQT_SLOT( active_window_changed( WId ))); + connect( &nostroke_timer, TQ_SIGNAL( timeout()), TQ_SLOT( stroke_timeout())); + connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )), + TQ_SLOT( active_window_changed( WId ))); } Gesture::~Gesture() @@ -108,7 +108,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P ) if( handlers.contains( receiver_P )) return; handlers[ receiver_P ] = true; - connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), + connect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )), receiver_P, slot_P ); if( handlers.count() == 1 ) update_grab(); @@ -119,7 +119,7 @@ void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P ) if( !handlers.contains( receiver_P )) return; handlers.remove( receiver_P ); - disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )), + disconnect( this, TQ_SIGNAL( handle_gesture( const TQString&, WId )), receiver_P, slot_P ); if( handlers.count() == 0 ) update_grab(); diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 7b9696c7e..96338b055 100644 --- a/khotkeys/shared/input.cpp +++ b/khotkeys/shared/input.cpp @@ -106,12 +106,12 @@ void Kbd::grab_shortcut( const TDEShortcut& shortcut_P ) // CHECKME ugly ugly hack TQString name = ' ' + TQString::number( keycode_P ); kga->insertItem( "", name, keycode_P ); - kga->connectItem( name, this, TQT_SLOT( key_slot( int ))); + kga->connectItem( name, this, TQ_SLOT( key_slot( int ))); #endif TQString name = ' ' + shortcut_P.toStringInternal(); kga->insert( name, name, TQString::null, shortcut_P, shortcut_P, - this, TQT_SLOT( key_slot( TQString ))); - TQTimer::singleShot( 0, this, TQT_SLOT( update_connections())); + this, TQ_SLOT( key_slot( TQString ))); + TQTimer::singleShot( 0, this, TQ_SLOT( update_connections())); } } @@ -129,7 +129,7 @@ void Kbd::ungrab_shortcut( const TDEShortcut& shortcut_P ) #endif kga->remove( ' ' + shortcut_P.toStringInternal()); grabs.remove( shortcut_P ); - TQTimer::singleShot( 0, this, TQT_SLOT( update_connections())); + TQTimer::singleShot( 0, this, TQ_SLOT( update_connections())); } } diff --git a/khotkeys/shared/khlistbox.cpp b/khotkeys/shared/khlistbox.cpp index ff6d96221..f0080d6de 100644 --- a/khotkeys/shared/khlistbox.cpp +++ b/khotkeys/shared/khlistbox.cpp @@ -25,15 +25,15 @@ KHListBox::KHListBox( TQWidget* parent_P, const char* name_P ) : TQListBox( parent_P, name_P ), saved_current_item( NULL ), in_clear( false ), force_select( false ) { - connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* )), - TQT_SLOT( slot_selection_changed( TQListBoxItem* ))); - connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem* )), - TQT_SLOT( slot_current_changed( TQListBoxItem* ))); + connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* )), + TQ_SLOT( slot_selection_changed( TQListBoxItem* ))); + connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem* )), + TQ_SLOT( slot_current_changed( TQListBoxItem* ))); // CHECKME grrr - connect( this, TQT_SIGNAL( selectionChanged()), - TQT_SLOT( slot_selection_changed())); - connect( &insert_select_timer, TQT_SIGNAL( timeout()), - TQT_SLOT( slot_insert_select())); + connect( this, TQ_SIGNAL( selectionChanged()), + TQ_SLOT( slot_selection_changed())); + connect( &insert_select_timer, TQ_SIGNAL( timeout()), + TQ_SLOT( slot_insert_select())); } void KHListBox::slot_selection_changed() diff --git a/khotkeys/shared/khlistview.cpp b/khotkeys/shared/khlistview.cpp index ae348af33..a9943996a 100644 --- a/khotkeys/shared/khlistview.cpp +++ b/khotkeys/shared/khlistview.cpp @@ -25,15 +25,15 @@ KHListView::KHListView( TQWidget* parent_P, const char* name_P ) : TDEListView( parent_P, name_P ), saved_current_item( NULL ), in_clear( false ), ignore( false ), force_select( false ) { - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem* )), - TQT_SLOT( slot_selection_changed( TQListViewItem* ))); - connect( this, TQT_SIGNAL( currentChanged( TQListViewItem* )), - TQT_SLOT( slot_current_changed( TQListViewItem* ))); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem* )), + TQ_SLOT( slot_selection_changed( TQListViewItem* ))); + connect( this, TQ_SIGNAL( currentChanged( TQListViewItem* )), + TQ_SLOT( slot_current_changed( TQListViewItem* ))); // CHECKME grrr - connect( this, TQT_SIGNAL( selectionChanged()), - TQT_SLOT( slot_selection_changed())); - connect( &insert_select_timer, TQT_SIGNAL( timeout()), - TQT_SLOT( slot_insert_select())); + connect( this, TQ_SIGNAL( selectionChanged()), + TQ_SLOT( slot_selection_changed())); + connect( &insert_select_timer, TQ_SIGNAL( timeout()), + TQ_SLOT( slot_insert_select())); } void KHListView::slot_selection_changed() diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 5bd8dbe3e..1b6e903b7 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -197,13 +197,13 @@ Window_trigger::~Window_trigger() void Window_trigger::init() { kdDebug( 1217 ) << "Window_trigger::init()" << endl; - connect( windows_handler, TQT_SIGNAL( window_added( WId )), this, TQT_SLOT( window_added( WId ))); - connect( windows_handler, TQT_SIGNAL( window_removed( WId )), this, TQT_SLOT( window_removed( WId ))); + connect( windows_handler, TQ_SIGNAL( window_added( WId )), this, TQ_SLOT( window_added( WId ))); + connect( windows_handler, TQ_SIGNAL( window_removed( WId )), this, TQ_SLOT( window_removed( WId ))); if( window_actions & ( WINDOW_ACTIVATES | WINDOW_DEACTIVATES /*| WINDOW_DISAPPEARS*/ )) - connect( windows_handler, TQT_SIGNAL( active_window_changed( WId )), - this, TQT_SLOT( active_window_changed( WId ))); - connect( windows_handler, TQT_SIGNAL( window_changed( WId, unsigned int )), - this, TQT_SLOT( window_changed( WId, unsigned int ))); + connect( windows_handler, TQ_SIGNAL( active_window_changed( WId )), + this, TQ_SLOT( active_window_changed( WId ))); + connect( windows_handler, TQ_SIGNAL( window_changed( WId, unsigned int )), + this, TQ_SLOT( window_changed( WId, unsigned int ))); } void Window_trigger::activate( bool activate_P ) @@ -335,7 +335,7 @@ Gesture_trigger::Gesture_trigger( TDEConfig& cfg_P, Action_data* data_P ) Gesture_trigger::~Gesture_trigger() { - gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId ))); + gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId ))); } void Gesture_trigger::cfg_write( TDEConfig& cfg_P ) const @@ -368,9 +368,9 @@ void Gesture_trigger::handle_gesture( const TQString &gesture_P, WId window_P ) void Gesture_trigger::activate( bool activate_P ) { if( activate_P ) - gesture_handler->register_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId ))); + gesture_handler->register_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId ))); else - gesture_handler->unregister_handler( this, TQT_SLOT( handle_gesture( const TQString&, WId ))); + gesture_handler->unregister_handler( this, TQ_SLOT( handle_gesture( const TQString&, WId ))); } diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index a31ac8237..031f75c78 100644 --- a/khotkeys/shared/voices.cpp +++ b/khotkeys/shared/voices.cpp @@ -95,7 +95,7 @@ void Voice::record_start() if(!_recorder) { _recorder= SoundRecorder::create(this); - connect(_recorder, TQT_SIGNAL(recorded(const Sound& )), this, TQT_SLOT(slot_sound_recorded(const Sound& ))); + connect(_recorder, TQ_SIGNAL(recorded(const Sound& )), this, TQ_SLOT(slot_sound_recorded(const Sound& ))); } _recorder->start(); @@ -208,7 +208,7 @@ void Voice::set_shortcut( const TDEShortcut &shortcut) _kga = new TDEGlobalAccel( this ); _kga->remove("voice"); - _kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQT_SLOT(slot_key_pressed())) ; + _kga->insert( "voice", i18n("Voice"), TQString::null, shortcut, 0, this, TQ_SLOT(slot_key_pressed())) ; _kga->updateConnections(); } @@ -224,7 +224,7 @@ void Voice::slot_key_pressed() if(!_timer) { _timer=new TQTimer(this); - connect(_timer, TQT_SIGNAL(timeout()) , this, TQT_SLOT(slot_timeout())); + connect(_timer, TQ_SIGNAL(timeout()) , this, TQ_SLOT(slot_timeout())); } _timer->start(1000*20,true); diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index 077bf7b1d..e91e41df3 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -45,10 +45,10 @@ Windows::Windows( bool enable_signal_P, TQObject* parent_P ) windows_handler = this; if( signals_enabled ) { - connect( twin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId ))); - connect( twin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId ))); - connect( twin_module, TQT_SIGNAL( activeWindowChanged( WId )), - TQT_SLOT( active_window_changed_slot( WId ))); + connect( twin_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( window_added_slot( WId ))); + connect( twin_module, TQ_SIGNAL( windowRemoved( WId )), TQ_SLOT( window_removed_slot( WId ))); + connect( twin_module, TQ_SIGNAL( activeWindowChanged( WId )), + TQ_SLOT( active_window_changed_slot( WId ))); } } diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 408349250..7cbb5a6c8 100644 --- a/kicker/applets/clock/clock.cpp +++ b/kicker/applets/clock/clock.cpp @@ -84,7 +84,7 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, setIcon(SmallIcon("date")); settings = new SettingsWidgetImp(prefs, zone, 0, "General"); - connect(settings->kcfg_Type, TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int))); + connect(settings->kcfg_Type, TQ_SIGNAL(activated(int)), TQ_SLOT(selectPage(int))); settings->kcfg_PlainBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); settings->kcfg_DateBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); @@ -104,24 +104,24 @@ TDEConfigDialogSingle::TDEConfigDialogSingle(Zone *zone, TQWidget *parent, settings->widgetStack->addWidget(fuzzyPage, 3); fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(TDEApplication::palette().active().background()); - connect(settings->kcfg_PlainShowDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(settings->kcfg_PlainShowDayOfWeek, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(digitalPage->kcfg_DigitalShowDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(analogPage->kcfg_AnalogShowDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(analogPage->kcfg_AnalogShowDayOfWeek, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(fuzzyPage->kcfg_FuzzyShowDate, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); - connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(dateToggled())); + connect(settings->kcfg_PlainShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(settings->kcfg_PlainShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(digitalPage->kcfg_DigitalShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(analogPage->kcfg_AnalogShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(analogPage->kcfg_AnalogShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(fuzzyPage->kcfg_FuzzyShowDate, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); + connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(dateToggled())); addPage(settings, i18n("General"), TQString::fromLatin1("package_settings")); } @@ -144,7 +144,7 @@ void TDEConfigDialogSingle::updateWidgetsDefault() item->swapDefault(); // This is ugly, but kcfg_Type does not have its correct setting // at this point in time. - TQTimer::singleShot(0, this, TQT_SLOT(dateToggled())); + TQTimer::singleShot(0, this, TQ_SLOT(dateToggled())); } void TDEConfigDialogSingle::selectPage(int p) @@ -743,7 +743,7 @@ FuzzyClock::FuzzyClock(ClockApplet *applet, Prefs *prefs, TQWidget *parent, cons void FuzzyClock::deleteMyself() { if(alreadyDrawing) // try again later - TQTimer::singleShot(1000, this, TQT_SLOT(deleteMyself())); + TQTimer::singleShot(1000, this, TQ_SLOT(deleteMyself())); else delete this; } @@ -917,9 +917,9 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, _date->setBackgroundOrigin(AncestorOrigin); _date->installEventFilter(this); // catch mouse clicks - connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout())); - connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(globalPaletteChange())); + connect(m_layoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(fixupLayout())); + connect(_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdate())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(globalPaletteChange())); reconfigure(); // initialize clock widget slotUpdate(); @@ -927,8 +927,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions, if (kapp->authorizeTDEAction("kicker_rmb")) { menu = new TDEPopupMenu(); - connect(menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); - connect(menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu())); + connect(menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); setCustomMenu(menu); } @@ -1156,7 +1156,7 @@ void ClockApplet::preferences(bool timezone) if (!dialog) { dialog = new TDEConfigDialogSingle(zone, this, configFileName, _prefs, KDialogBase::Swallow); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotReconfigure())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotReconfigure())); } if (timezone) @@ -1242,7 +1242,7 @@ void ClockApplet::reconfigure() m_updateOnTheMinute = updateInterval != shortInterval; if (m_updateOnTheMinute) { - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); updateInterval = ((60 - clockGetTime().second()) * 1000) + 500; } else @@ -1250,7 +1250,7 @@ void ClockApplet::reconfigure() // in case we reconfigure to show seconds but setTimerTo60 is going to be called // we need to make sure to disconnect this so we don't end up updating only once // a minute ;) - disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); } _timer->start(updateInterval); @@ -1300,7 +1300,7 @@ void ClockApplet::reconfigure() void ClockApplet::setTimerTo60() { // kdDebug() << "setTimerTo60" << endl; - disconnect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + disconnect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); _timer->changeInterval(60000); } @@ -1417,7 +1417,7 @@ void ClockApplet::slotUpdate() if (seconds > 2) { - connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTimerTo60())); + connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(setTimerTo60())); _timer->changeInterval(((60 - seconds) * 1000) + 500); } } @@ -1430,7 +1430,7 @@ void ClockApplet::slotCalendarDeleted() _calendar = 0L; // don't reopen the calendar immediately ... _disableCalendar = true; - TQTimer::singleShot(100, this, TQT_SLOT(slotEnableCalendar())); + TQTimer::singleShot(100, this, TQ_SLOT(slotEnableCalendar())); // we are free to show a tip know :) installEventFilter(KickerTip::the()); @@ -1460,7 +1460,7 @@ void ClockApplet::toggleCalendar() removeEventFilter(KickerTip::the()); _calendar = new DatePicker(this, _lastDate, _prefs); - connect(_calendar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted())); + connect(_calendar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted())); TQSize size = _prefs->calendarSize(); @@ -1554,12 +1554,12 @@ void ClockApplet::aboutToShowContextMenu() copyMenu->insertItem(dt.time().toString(), 207); copyMenu->insertItem(dt.toString(), 208); copyMenu->insertItem(dt.toString("yyyy-MM-dd hh:mm:ss"), 209); - connect( copyMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotCopyMenuActivated(int) ) ); + connect( copyMenu, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotCopyMenuActivated(int) ) ); if (!bImmutable) { TDEPopupMenu *zoneMenu = new TDEPopupMenu( menu ); - connect(zoneMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(zoneMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); for (int i = 0; i <= zone->remoteZoneCount(); i++) { if (i == 0) @@ -1576,7 +1576,7 @@ void ClockApplet::aboutToShowContextMenu() zoneMenu->insertItem(SmallIcon("configure"), i18n("&Configure Timezones..."), 110); TDEPopupMenu *type_menu = new TDEPopupMenu(menu); - connect(type_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(type_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); type_menu->insertItem(i18n("&Plain"), Prefs::EnumType::Plain, 1); type_menu->insertItem(i18n("&Digital"), Prefs::EnumType::Digital, 2); type_menu->insertItem(i18n("&Analog"), Prefs::EnumType::Analog, 3); diff --git a/kicker/applets/launcher/configdlg.cpp b/kicker/applets/launcher/configdlg.cpp index d542d2593..88301b7cf 100644 --- a/kicker/applets/launcher/configdlg.cpp +++ b/kicker/applets/launcher/configdlg.cpp @@ -47,8 +47,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, Prefs *config, m_ui->iconDim->insertItem(TQString::number( m_settings->iconDimChoices()[n])); } - connect(m_ui->iconDim, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(updateButtons())); + connect(m_ui->iconDim, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(updateButtons())); updateWidgets(); m_oldIconDimText = m_ui->iconDim->currentText(); updateButtons(); diff --git a/kicker/applets/launcher/quickaddappsmenu.cpp b/kicker/applets/launcher/quickaddappsmenu.cpp index cdbc94dd5..bf496e028 100644 --- a/kicker/applets/launcher/quickaddappsmenu.cpp +++ b/kicker/applets/launcher/quickaddappsmenu.cpp @@ -38,8 +38,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(const TQString &label, const TQString &relPat { _targetObject = target; _sender = sender; - connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), - target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); + connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), + target, TQ_SLOT(addAppBeforeManually(TQString,TQString))); } QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQString &sender, const char *name) @@ -47,8 +47,8 @@ QuickAddAppsMenu::QuickAddAppsMenu(TQWidget *target, TQWidget *parent, const TQS { _targetObject = target; _sender = sender; - connect(this, TQT_SIGNAL(addAppBefore(TQString,TQString)), - target, TQT_SLOT(addAppBeforeManually(TQString,TQString))); + connect(this, TQ_SIGNAL(addAppBefore(TQString,TQString)), + target, TQ_SLOT(addAppBeforeManually(TQString,TQString))); } void QuickAddAppsMenu::slotExec(int id) diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index add317a3b..2b09dac34 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/kicker/applets/launcher/quickbutton.cpp @@ -158,7 +158,7 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction, if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") { setToggleButton(true); setOn( ShowDesktop::the()->desktopShowing() ); - connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); + connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) ); } TQToolTip::add(this, _qurl->name()); @@ -172,18 +172,18 @@ QuickButton::QuickButton(const TQString &u, TDEAction* configAction, configAction->plug(_popup); _popup->insertSeparator(); _popup->insertItem(SmallIcon("remove"), i18n("Remove Application"), - this, TQT_SLOT(removeApp())); + this, TQ_SLOT(removeApp())); m_stickyAction = new TDEToggleAction(i18n("Never Remove Automatically"), TDEShortcut(), this); - connect(m_stickyAction, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotStickyToggled(bool))); + connect(m_stickyAction, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotStickyToggled(bool))); m_stickyAction->plug(_popup, 2); m_stickyId = _popup->idAt(2); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(launch())); - connect(this, TQT_SIGNAL(removeApp(QuickButton *)), parent, - TQT_SLOT(removeAppManually(QuickButton *))); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(launch())); + connect(this, TQ_SIGNAL(removeApp(QuickButton *)), parent, + TQ_SLOT(removeAppManually(QuickButton *))); } QuickButton::~QuickButton() @@ -303,7 +303,7 @@ void QuickButton::removeApp() void QuickButton::flash() { m_flashCounter = 2000; - TQTimer::singleShot(0, this, TQT_SLOT(slotFlash())); + TQTimer::singleShot(0, this, TQ_SLOT(slotFlash())); } void QuickButton::slotFlash() @@ -314,7 +314,7 @@ void QuickButton::slotFlash() m_flashCounter -= timeout; if (m_flashCounter < 0) m_flashCounter = 0; update(); - TQTimer::singleShot(timeout, this, TQT_SLOT(slotFlash())); + TQTimer::singleShot(timeout, this, TQ_SLOT(slotFlash())); } } diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index d0f5d25dd..3f0ee88a8 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/kicker/applets/launcher/quicklauncher.cpp @@ -108,10 +108,10 @@ QuickLauncher::QuickLauncher(const TQString& configFile, Type type, int actions, m_dragButtons = 0; m_configAction = new TDEAction(i18n("Configure Quicklauncher..."), "configure", TDEShortcut(), - this, TQT_SLOT(slotConfigure()), this); + this, TQ_SLOT(slotConfigure()), this); m_saveTimer = new TQTimer(this, "m_saveTimer"); - connect(m_saveTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(saveConfig())); + connect(m_saveTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(saveConfig())); m_popularity = new PopularityStatistics(); @@ -168,15 +168,15 @@ void QuickLauncher::buildPopupMenu() m_appletPopup = new TQPopupMenu(this); m_appletPopup->insertItem(i18n("Add Application"), addAppsMenu); m_removeAppsMenu = new TQPopupMenu(this); - connect(m_removeAppsMenu, TQT_SIGNAL(aboutToShow()), - TQT_SLOT(fillRemoveAppsMenu())); - connect(m_removeAppsMenu, TQT_SIGNAL(activated(int)), - TQT_SLOT(removeAppManually(int))); + connect(m_removeAppsMenu, TQ_SIGNAL(aboutToShow()), + TQ_SLOT(fillRemoveAppsMenu())); + connect(m_removeAppsMenu, TQ_SIGNAL(activated(int)), + TQ_SLOT(removeAppManually(int))); m_appletPopup->insertItem(i18n("Remove Application"), m_removeAppsMenu); m_appletPopup->insertSeparator(); m_appletPopup->setCheckable( true ); - m_appletPopup->insertItem(i18n("About"), this, TQT_SLOT(about())); + m_appletPopup->insertItem(i18n("About"), this, TQ_SLOT(about())); setCustomMenu(m_appletPopup); } @@ -235,8 +235,8 @@ void QuickLauncher::slotConfigure() m_configDialog = new ConfigDlg(this, "configdialog", m_settings, SIZE_AUTO, KDialogBase::Plain, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply | KDialogBase::Default); - connect(m_configDialog, TQT_SIGNAL(settingsChanged()), - this, TQT_SLOT(slotSettingsDialogChanged())); + connect(m_configDialog, TQ_SIGNAL(settingsChanged()), + this, TQ_SLOT(slotSettingsDialogChanged())); } m_configDialog->show(); @@ -392,10 +392,10 @@ void QuickLauncher::addApp(TQString url, bool manuallyAdded) QuickButton* QuickLauncher::createButton(TQString url) { QuickButton* newButton=new QuickButton(url, m_configAction, this); - connect(newButton, TQT_SIGNAL(executed(TQString)), - this, TQT_SLOT(slotOwnServiceExecuted(TQString))); - connect(newButton, TQT_SIGNAL(stickyToggled(bool)), - this, TQT_SLOT(slotStickyToggled())); + connect(newButton, TQ_SIGNAL(executed(TQString)), + this, TQ_SLOT(slotOwnServiceExecuted(TQString))); + connect(newButton, TQ_SIGNAL(stickyToggled(bool)), + this, TQ_SLOT(slotStickyToggled())); newButton->setPopupDirection(popupDirection()); return newButton; } @@ -973,7 +973,7 @@ void QuickLauncher::serviceStartedByStorageId(TQString /*starter*/, TQString sto if (m_settings->autoAdjustEnabled()) { - TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity())); } } @@ -1047,7 +1047,7 @@ void QuickLauncher::slotOwnServiceExecuted(TQString serviceMenuId) m_popularity->useService(serviceMenuId); if (m_settings->autoAdjustEnabled()) { - TQTimer::singleShot(0, this, TQT_SLOT(slotAdjustToCurrentPopularity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotAdjustToCurrentPopularity())); } } diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index 800c9f8a6..fcda62468 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/kicker/applets/lockout/lockout.cpp @@ -82,8 +82,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name bTransparent = conf->readBoolEntry( "Transparent", bTransparent ); - connect( lockButton, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() )); - connect( logoutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( logout() )); + connect( lockButton, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() )); + connect( logoutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( logout() )); lockButton->installEventFilter( this ); logoutButton->installEventFilter( this ); @@ -100,7 +100,7 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() )); + connect( kapp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() )); } Lockout::~Lockout() @@ -201,17 +201,17 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem( SmallIcon( "system-lock-screen" ), i18n("Lock Session"), - this, TQT_SLOT( lock() ) ); + this, TQ_SLOT( lock() ) ); popup->insertSeparator(); i18n("&Transparent"); //popup->insertItem( i18n( "&Transparent" ), 100 ); popup->insertItem( SmallIcon( "configure" ), i18n( "&Configure Screen Saver..." ), - this, TQT_SLOT( slotLockPrefs() ) ); + this, TQ_SLOT( slotLockPrefs() ) ); //popup->setItemChecked( 100, bTransparent ); - //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) ); + //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) ); //if (conf->entryIsImmutable( "Transparent" )) // popup->setItemEnabled( 100, false ); popup->exec( me->globalPos() ); @@ -224,15 +224,15 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e ) TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem( SmallIcon( "system-log-out" ), i18n("&Log Out..."), - this, TQT_SLOT( logout() ) ); + this, TQ_SLOT( logout() ) ); popup->insertSeparator(); //popup->insertItem( i18n( "&Transparent" ), 100 ); popup->insertItem( SmallIcon( "configure" ), i18n( "&Configure Session Manager..." ), - this, TQT_SLOT( slotLogoutPrefs() ) ); + this, TQ_SLOT( slotLogoutPrefs() ) ); //popup->setItemChecked( 100, bTransparent ); - //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) ); + //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) ); //if (conf->entryIsImmutable( "Transparent" )) // popup->setItemEnabled( 100, false ); popup->exec( me->globalPos() ); diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index b50aea3d8..89f836492 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -57,18 +57,18 @@ MediaApplet::MediaApplet(const TQString& configFile, Type type, int actions, TQW mpDirLister = new KDirLister(); - connect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); - connect( mpDirLister, TQT_SIGNAL( started(const KURL&) ), - this, TQT_SLOT( slotStarted(const KURL&) ) ); - connect( mpDirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( mpDirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( mpDirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); + connect( mpDirLister, TQ_SIGNAL( started(const KURL&) ), + this, TQ_SLOT( slotStarted(const KURL&) ) ); + connect( mpDirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); reloadList(); } diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index 5977063d7..be75a3d40 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -48,10 +48,10 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) : PanelPopupButton(parent), mActions(this, this), mFileItem(fileItem), mOpenTimer(0, "MediumButton::mOpenTimer") { - TDEAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()), &mActions, "pasteto"); a->setShortcut(0); - a = KStdAction::copy(this, TQT_SLOT(slotCopy()), &mActions, "copy"); + a = KStdAction::copy(this, TQ_SLOT(slotCopy()), &mActions, "copy"); a->setShortcut(0); setBackgroundOrigin(AncestorOrigin); @@ -64,11 +64,11 @@ MediumButton::MediumButton(TQWidget *parent, const KFileItem &fileItem) refreshType(); - connect(&mOpenTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDragOpen())); + connect(&mOpenTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDragOpen())); // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); setPopup(new TQPopupMenu()); } diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index 37ac216a1..dff03a036 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -89,8 +89,8 @@ Applet::Applet( const TQString& configFile_P, TQWidget* parent_P ) setBackgroundOrigin(AncestorOrigin); dcopclient.registerAs( "menuapplet", false ); // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, TQT_SIGNAL( toolbarAppearanceChanged( int )), - this, TQT_SLOT( readSettings())); + connect( kapp, TQ_SIGNAL( toolbarAppearanceChanged( int )), + this, TQ_SLOT( readSettings())); claimSelection(); readSettings(); updateTopEdgeOffset(); @@ -298,11 +298,11 @@ void Applet::claimSelection() { delete selection_watcher; selection_watcher = NULL; - connect( selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); + connect( selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection())); module = new KWinModule; - connect( module, TQT_SIGNAL( windowAdded( WId )), this, TQT_SLOT( windowAdded( WId ))); - connect( module, TQT_SIGNAL( activeWindowChanged( WId )), - this, TQT_SLOT( activeWindowChanged( WId ))); + connect( module, TQ_SIGNAL( windowAdded( WId )), this, TQ_SLOT( windowAdded( WId ))); + connect( module, TQ_SIGNAL( activeWindowChanged( WId )), + this, TQ_SLOT( activeWindowChanged( WId ))); TQValueList< WId > windows = module->windows(); for( TQValueList< WId >::ConstIterator it = windows.begin(); it != windows.end(); @@ -328,7 +328,7 @@ void Applet::lostSelection() if( selection_watcher == NULL ) { selection_watcher = new TDESelectionWatcher( makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); - connect( selection_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( claimSelection())); + connect( selection_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( claimSelection())); } delete module; module = NULL; diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index be61ad451..437bae679 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -132,22 +132,22 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, drawButtons(); - connect( m_twin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) ); - connect( m_twin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&))); - connect( m_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) ); - connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) ); - connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) ); - connect( m_twin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) ); - connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) ); - connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) ); + connect( m_twin, TQ_SIGNAL( currentDesktopChanged(int)), TQ_SLOT( slotSetDesktop(int) ) ); + connect( m_twin, TQ_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQ_SLOT(slotSetDesktopViewport(int, const TQPoint&))); + connect( m_twin, TQ_SIGNAL( numberOfDesktopsChanged(int)), TQ_SLOT( slotSetDesktopCount(int) ) ); + connect( m_twin, TQ_SIGNAL( desktopGeometryChanged(int)), TQ_SLOT( slotRefreshViewportCount(int) ) ); + connect( m_twin, TQ_SIGNAL( activeWindowChanged(WId)), TQ_SLOT( slotActiveWindowChanged(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowAdded(WId) ), this, TQ_SLOT( slotWindowAdded(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowRemoved(WId) ), this, TQ_SLOT( slotWindowRemoved(WId) ) ); + connect( m_twin, TQ_SIGNAL( windowChanged(WId,unsigned int) ), this, TQ_SLOT( slotWindowChanged(WId,unsigned int) ) ); + connect( m_twin, TQ_SIGNAL( desktopNamesChanged() ), this, TQ_SLOT( slotDesktopNamesChanged() ) ); + connect( kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)) ); if (kapp->authorizeTDEAction("kicker_rmb") && kapp->authorizeControlModule("tde-kcmtaskbar.desktop")) { m_contextMenu = new TQPopupMenu(); - connect(m_contextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShowContextMenu())); - connect(m_contextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(m_contextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShowContextMenu())); + connect(m_contextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); setCustomMenu(m_contextMenu); } @@ -484,10 +484,10 @@ void KMiniPager::drawButtons() m_desktops.append( desk ); m_group->insert( desk, count ); - connect(desk, TQT_SIGNAL(buttonSelected(int)), - TQT_SLOT(slotButtonSelected(int)) ); - connect(desk, TQT_SIGNAL(showMenu(const TQPoint&, int )), - TQT_SLOT(slotShowMenu(const TQPoint&, int )) ); + connect(desk, TQ_SIGNAL(buttonSelected(int)), + TQ_SLOT(slotButtonSelected(int)) ); + connect(desk, TQ_SIGNAL(showMenu(const TQPoint&, int )), + TQ_SLOT(slotShowMenu(const TQPoint&, int )) ); desk->show(); ++count; @@ -727,7 +727,7 @@ void KMiniPager::aboutToShowContextMenu() rowMenu->insertItem(i18n("one row or column", "&1"), 1 + rowOffset); rowMenu->insertItem(i18n("two rows or columns", "&2"), 2 + rowOffset); rowMenu->insertItem( i18n("three rows or columns", "&3"), 3 + rowOffset); - connect(rowMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(rowMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); showMenu->insertItem((orientation()==TQt::Horizontal) ? i18n("&Rows"): i18n("&Columns"), rowMenu); @@ -753,7 +753,7 @@ void KMiniPager::aboutToShowContextMenu() showMenu->insertItem(i18n("&Desktop Wallpaper"), PagerSettings::EnumBackgroundType::BgLive + bgOffset); } - connect(showMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(showMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); m_contextMenu->insertItem(i18n("&Pager Options"),showMenu); m_contextMenu->insertItem(SmallIcon("configure"), @@ -892,7 +892,7 @@ void KMiniPager::showPager() else { // Let's run kpager if it isn't running - connect( dcop, TQT_SIGNAL( applicationRegistered(const TQCString &) ), this, TQT_SLOT(applicationRegistered(const TQCString &)) ); + connect( dcop, TQ_SIGNAL( applicationRegistered(const TQCString &) ), this, TQ_SLOT(applicationRegistered(const TQCString &)) ); dcop->setNotifications(true); TQString strAppPath(locate("exe", "kpager")); if (!strAppPath.isEmpty()) @@ -941,8 +941,8 @@ void KMiniPager::applicationRegistered( const TQCString & appName ) { if (appName == "kpager") { - disconnect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString &) ), - this, TQT_SLOT(applicationRegistered(const TQCString &)) ); + disconnect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString &) ), + this, TQ_SLOT(applicationRegistered(const TQCString &)) ); showKPager(false); } } diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index 71e3f465b..22f59956d 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -83,10 +83,10 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v m_desktopName = m_pager->twin()->desktopName(m_desktop); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); - connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); - connect(&m_dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragSwitch())); - connect(&m_updateCompressor, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked())); + connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool))); + connect(&m_dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragSwitch())); + connect(&m_updateCompressor, TQ_SIGNAL(timeout()), this, TQ_SLOT(update())); if (m_pager->desktopPreview()) { @@ -247,8 +247,8 @@ void KMiniPagerButton::loadBgPixmap() } else if (s_commonSharedPixmap) { // other button is already fetching the pixmap - connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); return; } } @@ -258,8 +258,8 @@ void KMiniPagerButton::loadBgPixmap() if (!s_commonSharedPixmap) { s_commonSharedPixmap = new TDESharedPixmap; - connect(s_commonSharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(s_commonSharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); } retval = s_commonSharedPixmap->loadFromShared(TQString("DESKTOP1")); if (retval == false) { @@ -274,8 +274,8 @@ void KMiniPagerButton::loadBgPixmap() if (!m_sharedPixmap) { m_sharedPixmap = new TDESharedPixmap; - connect(m_sharedPixmap, TQT_SIGNAL(done(bool)), - TQT_SLOT(backgroundLoaded(bool))); + connect(m_sharedPixmap, TQ_SIGNAL(done(bool)), + TQ_SLOT(backgroundLoaded(bool))); } retval = m_sharedPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_desktop)); if (retval == false) { @@ -726,7 +726,7 @@ void KMiniPagerButton::rename() { if ( !m_lineEdit ) { m_lineEdit = new TQLineEdit( this ); - connect( m_lineEdit, TQT_SIGNAL( returnPressed() ), m_lineEdit, TQT_SLOT( hide() ) ); + connect( m_lineEdit, TQ_SIGNAL( returnPressed() ), m_lineEdit, TQ_SLOT( hide() ) ); m_lineEdit->installEventFilter( this ); } m_lineEdit->setGeometry( rect() ); @@ -752,7 +752,7 @@ bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e) { m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() ); m_desktopName = m_lineEdit->text(); - TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, m_lineEdit, TQ_SLOT( deleteLater() ) ); m_lineEdit = 0; return true; } diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index 2e75890d6..83db26d12 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -75,20 +75,20 @@ NaughtyApplet::NaughtyApplet connect ( - button_, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotPreferences()) + button_, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotPreferences()) ); connect ( - monitor_, TQT_SIGNAL(runawayProcess(ulong, const TQString &)), - this, TQT_SLOT(slotWarn(ulong, const TQString &)) + monitor_, TQ_SIGNAL(runawayProcess(ulong, const TQString &)), + this, TQ_SLOT(slotWarn(ulong, const TQString &)) ); connect ( - monitor_, TQT_SIGNAL(load(uint)), - this, TQT_SLOT(slotLoad(uint)) + monitor_, TQ_SIGNAL(load(uint)), + this, TQ_SLOT(slotLoad(uint)) ); loadSettings(); diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp index 0239720fe..63b634e59 100644 --- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp +++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp @@ -111,7 +111,7 @@ NaughtyProcessMonitor::NaughtyProcessMonitor #ifdef __NetBSD__ d->kd = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open"); #endif - connect(d->timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(d->timer_, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } NaughtyProcessMonitor::~NaughtyProcessMonitor() diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index 1121cf45b..638ce93c8 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/kicker/applets/run/runapplet.cpp @@ -69,15 +69,15 @@ RunApplet::RunApplet(const TQString& configFile, Type type, int actions, f = _btn->font(); f.setPixelSize(12); _btn->setFont(f); - connect(_btn, TQT_SIGNAL(clicked()), TQT_SLOT(popup_combo())); + connect(_btn, TQ_SIGNAL(clicked()), TQ_SLOT(popup_combo())); // setup history combo _input = new KHistoryCombo(this); _input->setFocus(); _input->clearEdit(); watchForFocus(_input->lineEdit()); - connect(_input, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(run_command(const TQString&))); + connect(_input, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(run_command(const TQString&))); TDEConfig *c = config(); c->setGroup("General"); diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 1ac34cfec..c30a31cff 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -157,8 +157,8 @@ void SwallowApplet::createApps( SwallowCommandList* list ) while ( (it.current()) ) { app = new SwallowApp( it.current(), this ); app->hide(); - connect( app, TQT_SIGNAL( embedded(SwallowApp *)), - TQT_SLOT( embedded(SwallowApp *))); + connect( app, TQ_SIGNAL( embedded(SwallowApp *)), + TQ_SLOT( embedded(SwallowApp *))); appList->append( app ); ++it; kapp->processEvents(); @@ -179,8 +179,8 @@ void SwallowApplet::embedded( SwallowApp *app ) kdDebug() << "--> ratio: " << app->sizeRatio() << endl; kdDebug() << "**** " << app << " is embedded now, with (" << app->width() << ", " << app->height() << ")" << endl; - disconnect( app, TQT_SIGNAL( embedded(SwallowApp *)), - this, TQT_SLOT( embedded(SwallowApp *))); + disconnect( app, TQ_SIGNAL( embedded(SwallowApp *)), + this, TQ_SLOT( embedded(SwallowApp *))); embeddedList->append( app ); @@ -278,8 +278,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, QXEmbed::initialize(); winTitle = swc->title; - connect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); + connect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); if (!swc->cmdline.isEmpty()) { TDEProcess *process = new TDEProcess; @@ -289,8 +289,8 @@ SwallowApp::SwallowApp(const SwallowCommand *swc, TQWidget* parent, // *process << "-geometry"; // *process << TQString("32x32+%1+%2").arg(kapp->desktop()->width()).arg(kapp->desktop()->height()); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processExited(TDEProcess*))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processExited(TDEProcess*))); process->start(); } @@ -330,8 +330,8 @@ void SwallowApp::windowAdded(WId win) embed(win); XReparentWindow(tqt_xdisplay(), win, winId(), 0, 0); - disconnect(SwallowApplet::winModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); + disconnect(SwallowApplet::winModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); emit embedded( this ); } diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 917382d8b..664dd85ad 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -99,8 +99,8 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac m_clockApplet = new ClockApplet(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, this, "clockapplet"); updateClockGeometry(); - connect(m_clockApplet, TQT_SIGNAL(clockReconfigured()), this, TQT_SLOT(updateClockGeometry())); - connect(m_clockApplet, TQT_SIGNAL(updateLayout()), this, TQT_SLOT(updateClockGeometry())); + connect(m_clockApplet, TQ_SIGNAL(clockReconfigured()), this, TQ_SLOT(updateClockGeometry())); + connect(m_clockApplet, TQ_SIGNAL(updateLayout()), this, TQ_SLOT(updateClockGeometry())); setBackgroundOrigin(AncestorOrigin); @@ -111,7 +111,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac kapp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "loadSettings()", false); - TQTimer::singleShot(0, this, TQT_SLOT(initialize())); + TQTimer::singleShot(0, this, TQ_SLOT(initialize())); } void SystemTrayApplet::updateClockGeometry() @@ -151,10 +151,10 @@ void SystemTrayApplet::initialize() } // the KWinModule notifies us when tray windows are added or removed - connect( twin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ), - this, TQT_SLOT( systemTrayWindowAdded(WId) ) ); - connect( twin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ), - this, TQT_SLOT( updateTrayWindows() ) ); + connect( twin_module, TQ_SIGNAL( systemTrayWindowAdded(WId) ), + this, TQ_SLOT( systemTrayWindowAdded(WId) ) ); + connect( twin_module, TQ_SIGNAL( systemTrayWindowRemoved(WId) ), + this, TQ_SLOT( updateTrayWindows() ) ); TQCString screenstr; screenstr.setNum(tqt_xscreen()); @@ -249,9 +249,9 @@ void SystemTrayApplet::preferences() KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, true); m_settingsDialog->resize(450, 400); - connect(m_settingsDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(applySettings())); - connect(m_settingsDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(applySettings())); - connect(m_settingsDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(settingsDialogFinished())); + connect(m_settingsDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(applySettings())); + connect(m_settingsDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(applySettings())); + connect(m_settingsDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(settingsDialogFinished())); TQGrid *settingsGrid = m_settingsDialog->makeGridMainWidget( 2, TQt::Vertical); @@ -448,12 +448,12 @@ void SystemTrayApplet::showExpandButton(bool show) .width(), height() - 4); } - connect(m_expandButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(toggleExpanded())); + connect(m_expandButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(toggleExpanded())); m_autoRetractTimer = new TQTimer(this, "m_autoRetractTimer"); - connect(m_autoRetractTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkAutoRetract())); + connect(m_autoRetractTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkAutoRetract())); } else { @@ -559,7 +559,7 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray ) return; } - connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); + connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows())); emb->setFixedSize(m_iconSize, m_iconSize); if (shouldHide(w)) @@ -853,7 +853,7 @@ bool SystemTrayApplet::eventFilter(TQObject* watched, TQEvent* e) { TQPopupMenu* contextMenu = new TQPopupMenu(this); contextMenu->insertItem(SmallIcon("configure"), i18n("Configure System Tray..."), - this, TQT_SLOT(configure())); + this, TQ_SLOT(configure())); contextMenu->exec(static_cast<TQContextMenuEvent*>(e)->globalPos()); @@ -913,7 +913,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* ) { layoutTray(); // we need to give ourselves a chance to adjust our size before calling this - TQTimer::singleShot(0, this, TQT_SIGNAL(updateLayout())); + TQTimer::singleShot(0, this, TQ_SIGNAL(updateLayout())); } void SystemTrayApplet::layoutTray() diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 3e76d6a8d..37a78a923 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/kicker/applets/taskbar/taskbarapplet.cpp @@ -59,7 +59,7 @@ TaskbarApplet::TaskbarApplet( const TQString& configFile, Type type, int actions TQHBoxLayout* layout = new TQHBoxLayout( this ); container = new TaskBarContainer( false, configFile, this ); container->setBackgroundOrigin( AncestorOrigin ); - connect(container, TQT_SIGNAL(containerCountChanged()), this, TQT_SIGNAL(updateLayout())); + connect(container, TQ_SIGNAL(containerCountChanged()), this, TQ_SIGNAL(updateLayout())); layout->addWidget( container, 1 ); container->popupDirectionChange(popupDirection()); } diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index 9665d21b9..9fe7eccf6 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -53,12 +53,12 @@ TrashApplet::TrashApplet(const TQString& configFile, Type type, int actions, TQW mpDirLister = new KDirLister(); - connect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); - connect( mpDirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( mpDirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); + connect( mpDirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( mpDirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); mpDirLister->openURL("trash:/"); } @@ -67,8 +67,8 @@ TrashApplet::~TrashApplet() { // disconnect the dir lister before quitting so as not to crash // on kicker exit - disconnect( mpDirLister, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); + disconnect( mpDirLister, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); delete mpDirLister; TDEGlobal::locale()->removeCatalogue("trashapplet"); } diff --git a/kicker/applets/trash/trashbutton.cpp b/kicker/applets/trash/trashbutton.cpp index 3205f6910..96efb7436 100644 --- a/kicker/applets/trash/trashbutton.cpp +++ b/kicker/applets/trash/trashbutton.cpp @@ -39,7 +39,7 @@ TrashButton::TrashButton(TQWidget *parent) TDEIO::NetAccess::stat("trash:/", entry, 0L); mFileItem.assign(KFileItem(entry, "trash:/")); - TDEAction *a = KStdAction::paste(this, TQT_SLOT(slotPaste()), + TDEAction *a = KStdAction::paste(this, TQ_SLOT(slotPaste()), &mActions, "paste"); a->setShortcut(0); @@ -53,7 +53,7 @@ TrashButton::TrashButton(TQWidget *parent) // Activate this code only if we find a way to have both an // action and a popup menu for the same kicker button - //connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClicked())); + //connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClicked())); setPopup(new TQPopupMenu()); } diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 143812e0d..a5aeefa57 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -58,7 +58,7 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, { dragging_container = 0; twin_module = new KWinModule(this); - connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); + connect( twin_module, TQ_SIGNAL( windowAdded(WId) ), TQ_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); @@ -236,10 +236,10 @@ void DockBarExtension::addContainer(DockContainer* c, int pos) containers.insert(it, c); } - connect(c, TQT_SIGNAL(embeddedWindowDestroyed(DockContainer*)), - TQT_SLOT(embeddedWindowDestroyed(DockContainer*))); - connect(c, TQT_SIGNAL(settingsChanged(DockContainer*)), - TQT_SLOT(settingsChanged(DockContainer*))); + connect(c, TQ_SIGNAL(embeddedWindowDestroyed(DockContainer*)), + TQ_SLOT(embeddedWindowDestroyed(DockContainer*))); + connect(c, TQ_SIGNAL(settingsChanged(DockContainer*)), + TQ_SLOT(settingsChanged(DockContainer*))); c->resize(DockContainer::sz(), DockContainer::sz()); c->show(); } diff --git a/kicker/extensions/kasbar/kasaboutdlg.cpp b/kicker/extensions/kasbar/kasaboutdlg.cpp index 54dd1dfd6..e1c9f4afc 100644 --- a/kicker/extensions/kasbar/kasaboutdlg.cpp +++ b/kicker/extensions/kasbar/kasaboutdlg.cpp @@ -129,7 +129,7 @@ void KasAboutDialog::addDemoBar() KasPopup *pop = new KasPopup( ci ); ci->setPopup( pop ); ci->setCustomPopup( true ); - connect( ci, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQT_SLOT(togglePopup()) ); + connect( ci, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), ci, TQ_SLOT(togglePopup()) ); KasBar *groupbar = bar->createChildBar( ( bar->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); KasItem *i = 0; diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index f28d2fd1f..323a58150 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/kicker/extensions/kasbar/kasbar.cpp @@ -102,7 +102,7 @@ KasBar::KasBar( Orientation o, TQWidget *parent, const char *name, WFlags f ) setMouseTracking( true ); setMaxBoxes( 0 ); - connect( this, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( this, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) ); } KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *name, WFlags f ) @@ -130,7 +130,7 @@ KasBar::KasBar( Orientation o, KasBar *master, TQWidget *parent, const char *nam items.setAutoDelete( true ); setMouseTracking( true ); setMaxBoxes( 0 ); - connect( master_, TQT_SIGNAL( configChanged() ), TQT_SLOT( repaint() ) ); + connect( master_, TQ_SIGNAL( configChanged() ), TQ_SLOT( repaint() ) ); } KasBar::~KasBar() @@ -145,8 +145,8 @@ KasResources *KasBar::resources() if ( isTopLevel() ) { res = new KasResources( this ); - connect( res, TQT_SIGNAL( changed() ), TQT_SIGNAL( configChanged() ) ); - connect( this, TQT_SIGNAL( itemSizeChanged(int) ), res, TQT_SLOT( itemSizeChanged() ) ); + connect( res, TQ_SIGNAL( changed() ), TQ_SIGNAL( configChanged() ) ); + connect( this, TQ_SIGNAL( itemSizeChanged(int) ), res, TQ_SLOT( itemSizeChanged() ) ); return res; } @@ -218,8 +218,8 @@ void KasBar::setTransparent( bool enable ) kdDebug(1345) << "KasBar: Enabling transparency" << endl; rootPix = new KRootPixmap( this ); - connect( rootPix, TQT_SIGNAL( backgroundUpdated(const TQPixmap &) ), - this, TQT_SLOT( setBackground(const TQPixmap &) ) ); + connect( rootPix, TQ_SIGNAL( backgroundUpdated(const TQPixmap &) ), + this, TQ_SLOT( setBackground(const TQPixmap &) ) ); rootPix->setCustomPainting( true ); @@ -720,7 +720,7 @@ void KasBar::addTestItems() i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) ); i->setAnimation( resources()->startupAnimation() ); TQTimer *aniTimer = new TQTimer( i, "aniTimer" ); - connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) ); + connect( aniTimer, TQ_SIGNAL( timeout() ), i, TQ_SLOT( advanceAnimation() ) ); aniTimer->start( 100 ); i->setShowAnimation( true ); diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 1dc85038c..a9a5fd68a 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -104,7 +104,7 @@ int main( int argc, char **argv ) kastasker->readConfig(); kastasker->move( kastasker->detachedPosition() ); - kastasker->connect( kastasker->resources(), TQT_SIGNAL(changed()), TQT_SLOT(readConfig()) ); + kastasker->connect( kastasker->resources(), TQ_SIGNAL(changed()), TQ_SLOT(readConfig()) ); kastasker->refreshAll(); } @@ -118,7 +118,7 @@ int main( int argc, char **argv ) TDEApplication::kApplication()->dcopClient()->registerAs( "kasbar" ); - app.connect( &app, TQT_SIGNAL( lastWindowClosed() ), TQT_SLOT(quit()) ); + app.connect( &app, TQ_SIGNAL( lastWindowClosed() ), TQ_SLOT(quit()) ); return app.exec(); } diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index 1aa373d3c..327fd564c 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/kicker/extensions/kasbar/kasbarextension.cpp @@ -97,8 +97,8 @@ KasBarExtension::KasBarExtension( const TQString& configFile, // setBackgroundMode( NoBackground ); kasbar = new KasTasker( orientation(), this, name ); - connect( kasbar, TQT_SIGNAL( layoutChanged() ), this, TQT_SIGNAL( updateLayout() ) ); - connect( kasbar, TQT_SIGNAL( detachedChanged(bool) ), this, TQT_SLOT( setDetached(bool) ) ); + connect( kasbar, TQ_SIGNAL( layoutChanged() ), this, TQ_SIGNAL( updateLayout() ) ); + connect( kasbar, TQ_SIGNAL( detachedChanged(bool) ), this, TQ_SLOT( setDetached(bool) ) ); kasbar->setConfig( config() ); kasbar->readConfig(); diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 249e7c051..a99c5f8ba 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -39,7 +39,7 @@ KasClockItem::KasClockItem( KasBar *parent ) setCustomPopup( true ); TQTimer *t = new TQTimer( this, "t" ); - connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateTime() ) ); + connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateTime() ) ); t->start( 1000 ); lcd = new LCD( parent ); @@ -53,8 +53,8 @@ KasClockItem::KasClockItem( KasBar *parent ) lcd->setAutoMask( true ); updateTime(); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasClockItem::~KasClockItem() diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index 693f912c4..de59f7b88 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -83,10 +83,10 @@ KasGroupItem::KasGroupItem( KasTasker *parent ) setGroupItem( true ); setText( i18n("Group") ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( hidePopup() ) ); - connect( parent, TQT_SIGNAL( layoutChanged() ), this, TQT_SLOT( update() ) ); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(togglePopup()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); + connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( hidePopup() ) ); + connect( parent, TQ_SIGNAL( layoutChanged() ), this, TQ_SLOT( update() ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(togglePopup()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showGroupMenuAt(TQMouseEvent *) ) ); } KasGroupItem::~KasGroupItem() @@ -109,7 +109,7 @@ void KasGroupItem::addTask( Task::Ptr t ) updateIcon(); } - connect( t, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( update() ) ); + connect( t, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( update() ) ); update(); } @@ -257,7 +257,7 @@ KasPopup *KasGroupItem::createPopup() KasPopup *pop = new KasPopup( this ); bar = kasbar()->createChildBar( ( kasbar()->orientation() == TQt::Horizontal ) ? TQt::Vertical : TQt::Horizontal, pop ); - connect( pop, TQT_SIGNAL(shown()), TQT_SLOT(updatePopup()) ); + connect( pop, TQ_SIGNAL(shown()), TQ_SLOT(updatePopup()) ); return pop; @@ -291,7 +291,7 @@ void KasGroupItem::showGroupMenuAt( TQMouseEvent *ev ) void KasGroupItem::showGroupMenuAt( const TQPoint &p ) { TaskRMBMenu *tm = new TaskRMBMenu(items, true, NULL, kasbar()); - tm->insertItem( i18n("&Ungroup" ), this, TQT_SLOT( ungroup() ) ); + tm->insertItem( i18n("&Ungroup" ), this, TQ_SLOT( ungroup() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); diff --git a/kicker/extensions/kasbar/kasitem.cpp b/kicker/extensions/kasbar/kasitem.cpp index 1967465f4..a95dac049 100644 --- a/kicker/extensions/kasbar/kasitem.cpp +++ b/kicker/extensions/kasbar/kasitem.cpp @@ -94,8 +94,8 @@ KasItem::KasItem( KasBar *parent ) frame(true), modified(false), attention_(false), prog( -1 ), anim(), aniFrame( 0 ), drawAnim( false ) { - connect( parent, TQT_SIGNAL( dragStarted() ), TQT_SLOT( hidePopup() ) ); - connect( this, TQT_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQT_SLOT( toggleOrientation() ) ); + connect( parent, TQ_SIGNAL( dragStarted() ), TQ_SLOT( hidePopup() ) ); + connect( this, TQ_SIGNAL( middleButtonClicked(TQMouseEvent *) ), parent, TQ_SLOT( toggleOrientation() ) ); } KasItem::~KasItem() @@ -169,7 +169,7 @@ void KasItem::mouseEnter() if ( (!customPopup) && (popupTimer == 0) ) { popupTimer = new TQTimer( this, "popupTimer" ); - connect( popupTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( showPopup() ) ); + connect( popupTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( showPopup() ) ); popupTimer->start( POPUP_DELAY, true ); } @@ -205,7 +205,7 @@ void KasItem::checkPopup() hidePopup(); } else { - TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) ); } } @@ -215,7 +215,7 @@ void KasItem::dragEnter() if ( dragTimer == 0 ) { dragTimer = new TQTimer( this, "dragTimer" ); - connect( dragTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( dragOverAction() ) ); + connect( dragTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( dragOverAction() ) ); dragTimer->start( DRAG_SWITCH_DELAY, true ); } @@ -268,7 +268,7 @@ void KasItem::showPopup() pop->show(); update(); - TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQT_SLOT( checkPopup() ) ); + TQTimer::singleShot( KASITEM_CHECK_POPUP_DELAY, this, TQ_SLOT( checkPopup() ) ); } void KasItem::hidePopup() diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index 6169d09b1..450d80154 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -34,11 +34,11 @@ KasLoadItem::KasLoadItem( KasBar *parent ) : KasItem( parent ) { TQTimer *t = new TQTimer( this, "KasLoadItem::t" ); - connect( t, TQT_SIGNAL( timeout() ), TQT_SLOT( updateDisplay() ) ); + connect( t, TQ_SIGNAL( timeout() ), TQ_SLOT( updateDisplay() ) ); t->start( 1000 ); updateDisplay(); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showMenuAt(TQMouseEvent *) ) ); } KasLoadItem::~KasLoadItem() diff --git a/kicker/extensions/kasbar/kasprefsdlg.cpp b/kicker/extensions/kasbar/kasprefsdlg.cpp index 6d5255082..cce36b250 100644 --- a/kicker/extensions/kasbar/kasprefsdlg.cpp +++ b/kicker/extensions/kasbar/kasprefsdlg.cpp @@ -134,9 +134,9 @@ void KasPrefsDialog::addLookPage() itemSizeLabel->setBuddy( itemSizeCombo ); - connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), - kasbar, TQT_SLOT( setItemSize( int ) ) ); - connect( itemSizeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( itemSizeChanged( int ) ) ); + connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), + kasbar, TQ_SLOT( setItemSize( int ) ) ); + connect( itemSizeCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( itemSizeChanged( int ) ) ); new TQWidget( itemSizeBox ); @@ -144,10 +144,10 @@ void KasPrefsDialog::addLookPage() customSize->setValue( kasbar->itemExtent() ); - connect( customSize, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setItemExtent( int ) ) ); - connect( customSize, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( customSizeChanged( int ) ) ); + connect( customSize, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setItemExtent( int ) ) ); + connect( customSize, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( customSizeChanged( int ) ) ); int sz = kasbar->itemSize(); itemSizeCombo->setCurrentItem( sz ); @@ -171,7 +171,7 @@ void KasPrefsDialog::addLookPage() conf ? conf->readNumEntry( "MaxBoxes", 0 ) : 11, 10, maxBoxesBox, "maxboxes" ); - connect( maxBoxesSpin, TQT_SIGNAL( valueChanged( int ) ), kasbar, TQT_SLOT( setMaxBoxes( int ) ) ); + connect( maxBoxesSpin, TQ_SIGNAL( valueChanged( int ) ), kasbar, TQ_SLOT( setMaxBoxes( int ) ) ); maxBoxesLabel->setBuddy( maxBoxesSpin ); // @@ -183,7 +183,7 @@ void KasPrefsDialog::addLookPage() detachedCheck->setEnabled( !kasbar->isStandAlone() ); detachedCheck->setChecked( kasbar->isDetached() ); - connect( detachedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setDetached(bool) ) ); + connect( detachedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setDetached(bool) ) ); (void) new TQWidget( lookPage, "spacer" ); (void) new TQWidget( lookPage, "spacer" ); @@ -197,31 +197,31 @@ void KasPrefsDialog::addBackgroundPage() transCheck = new TQCheckBox( i18n("Trans&parent"), bgPage ); TQWhatsThis::add( transCheck, i18n( "Enables pseudo-transparent mode." ) ); transCheck->setChecked( kasbar->isTransparent() ); - connect( transCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTransparent(bool) ) ); + connect( transCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTransparent(bool) ) ); tintCheck = new TQCheckBox( i18n("Enable t&int"), bgPage ); TQWhatsThis::add( tintCheck, i18n( "Enables tinting the background that shows through in transparent mode." ) ); tintCheck->setChecked( kasbar->hasTint() ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setTint(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setTint(bool) ) ); TQHBox *tintColBox = new TQHBox( bgPage ); TQWhatsThis::add( tintColBox, i18n( "Specifies the color used for the background tint." ) ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintColBox, TQT_SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintColBox, TQ_SLOT( setEnabled(bool) ) ); tintColBox->setEnabled( kasbar->hasTint() ); TQLabel *tintLabel = new TQLabel( i18n("Tint &color:"), tintColBox ); tintButton = new KColorButton( kasbar->tintColor(), tintColBox ); - connect( tintButton, TQT_SIGNAL( changed( const TQColor & ) ), - kasbar, TQT_SLOT( setTintColor( const TQColor & ) ) ); + connect( tintButton, TQ_SIGNAL( changed( const TQColor & ) ), + kasbar, TQ_SLOT( setTintColor( const TQColor & ) ) ); tintLabel->setBuddy( tintButton ); TQHBox *tintAmtBox = new TQHBox( bgPage ); TQWhatsThis::add( tintAmtBox, i18n( "Specifies the strength of the background tint." ) ); - connect( tintCheck, TQT_SIGNAL( toggled(bool) ), tintAmtBox, TQT_SLOT( setEnabled(bool) ) ); + connect( tintCheck, TQ_SIGNAL( toggled(bool) ), tintAmtBox, TQ_SLOT( setEnabled(bool) ) ); tintAmtBox->setEnabled( kasbar->hasTint() ); TQLabel *tintStrengthLabel = new TQLabel( i18n("Tint &strength: "), tintAmtBox ); @@ -229,8 +229,8 @@ void KasPrefsDialog::addBackgroundPage() int percent = (int) (kasbar->tintAmount() * 100.0); tintAmount = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, tintAmtBox ); tintAmount->setTracking( true ); - connect( tintAmount, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setTintAmount( int ) ) ); + connect( tintAmount, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setTintAmount( int ) ) ); tintStrengthLabel->setBuddy( tintAmount ); (void) new TQWidget( bgPage, "spacer" ); @@ -249,11 +249,11 @@ void KasPrefsDialog::addThumbsPage() "approximate, and may not reflect the current window contents.\n\n" "Using this option on a slow machine may cause performance problems." ) ); thumbsCheck->setChecked( kasbar->thumbnailsEnabled() ); - connect( thumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setThumbnailsEnabled(bool) ) ); + connect( thumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setThumbnailsEnabled(bool) ) ); embedThumbsCheck = new TQCheckBox( i18n("&Embed thumbnails"), thumbsPage ); embedThumbsCheck->setChecked( kasbar->embedThumbnails() ); - connect( embedThumbsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setEmbedThumbnails(bool) ) ); + connect( embedThumbsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setEmbedThumbnails(bool) ) ); TQHBox *thumbSizeBox = new TQHBox( thumbsPage ); TQWhatsThis::add( thumbSizeBox, @@ -262,8 +262,8 @@ void KasPrefsDialog::addThumbsPage() TQLabel *thumbSizeLabel = new TQLabel( i18n("Thumbnail &size: "), thumbSizeBox ); int percent = (int) (kasbar->thumbnailSize() * 100.0); thumbSizeSlider = new TQSlider( 0, 100, 1, percent, TQt::Horizontal, thumbSizeBox ); - connect( thumbSizeSlider, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setThumbnailSize( int ) ) ); + connect( thumbSizeSlider, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setThumbnailSize( int ) ) ); thumbSizeLabel->setBuddy( thumbSizeSlider ); TQHBox *thumbUpdateBox = new TQHBox( thumbsPage ); @@ -275,8 +275,8 @@ void KasPrefsDialog::addThumbsPage() TQLabel *thumbUpdateLabel = new TQLabel( i18n("&Update thumbnail every: "), thumbUpdateBox ); thumbUpdateSpin = new TQSpinBox( 0, 1000, 1, thumbUpdateBox ); thumbUpdateSpin->setValue( kasbar->thumbnailUpdateDelay() ); - connect( thumbUpdateSpin, TQT_SIGNAL( valueChanged( int ) ), - kasbar, TQT_SLOT( setThumbnailUpdateDelay( int ) ) ); + connect( thumbUpdateSpin, TQ_SIGNAL( valueChanged( int ) ), + kasbar, TQ_SLOT( setThumbnailUpdateDelay( int ) ) ); (void) new TQLabel( i18n("seconds"), thumbUpdateBox ); thumbUpdateLabel->setBuddy( thumbUpdateSpin ); @@ -293,21 +293,21 @@ void KasPrefsDialog::addBehavePage() TQWhatsThis::add( groupWindowsCheck, i18n( "Enables the grouping together of related windows." ) ); groupWindowsCheck->setChecked( kasbar->groupWindows() ); - connect( groupWindowsCheck, TQT_SIGNAL( toggled(bool) ), - kasbar, TQT_SLOT( setGroupWindows(bool) ) ); + connect( groupWindowsCheck, TQ_SIGNAL( toggled(bool) ), + kasbar, TQ_SLOT( setGroupWindows(bool) ) ); showAllWindowsCheck = new TQCheckBox( i18n("Show all &windows"), behavePage ); TQWhatsThis::add( showAllWindowsCheck, i18n( "Enables the display of all windows, not just those on the current desktop." ) ); showAllWindowsCheck->setChecked( kasbar->showAllWindows() ); - connect( showAllWindowsCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAllWindows(bool) ) ); + connect( showAllWindowsCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAllWindows(bool) ) ); groupInactiveCheck = new TQCheckBox( i18n("&Group windows on inactive desktops"), behavePage ); TQWhatsThis::add( groupInactiveCheck, i18n( "Enables the grouping together of windows that are not on the current desktop." ) ); groupInactiveCheck->setChecked( kasbar->groupInactiveDesktops() ); - connect( groupInactiveCheck, TQT_SIGNAL( toggled(bool) ), - kasbar, TQT_SLOT( setGroupInactiveDesktops(bool) ) ); + connect( groupInactiveCheck, TQ_SIGNAL( toggled(bool) ), + kasbar, TQ_SLOT( setGroupInactiveDesktops(bool) ) ); onlyShowMinimizedCheck = new TQCheckBox( i18n("Only show &minimized windows"), behavePage ); TQWhatsThis::add( onlyShowMinimizedCheck, @@ -315,7 +315,7 @@ void KasPrefsDialog::addBehavePage() "This gives Kasbar similar behavior to the icon handling in older environments " \ "like CDE or OpenLook." ) ); onlyShowMinimizedCheck->setChecked( kasbar->onlyShowMinimized() ); - connect( onlyShowMinimizedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setOnlyShowMinimized(bool) ) ); + connect( onlyShowMinimizedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setOnlyShowMinimized(bool) ) ); (void) new TQWidget( behavePage, "spacer" ); (void) new TQWidget( behavePage, "spacer" ); @@ -331,14 +331,14 @@ void KasPrefsDialog::addColorsPage() TQLabel *labelPenLabel = new TQLabel( i18n("Label foreground:"), group ); labelPenButton = new KColorButton( res->labelPenColor(), group ); - connect( labelPenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setLabelPenColor( const TQColor & ) ) ); + connect( labelPenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setLabelPenColor( const TQColor & ) ) ); labelPenLabel->setBuddy( labelPenButton ); TQLabel *labelBackgroundLabel = new TQLabel( i18n("Label background:"), group ); labelBackgroundButton = new KColorButton( res->labelBgColor(), group ); - connect( labelBackgroundButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setLabelBgColor( const TQColor & ) ) ); + connect( labelBackgroundButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setLabelBgColor( const TQColor & ) ) ); labelBackgroundLabel->setBuddy( labelBackgroundButton ); // Inactive colors @@ -346,14 +346,14 @@ void KasPrefsDialog::addColorsPage() TQLabel *inactivePenLabel = new TQLabel( i18n("Inactive foreground:"), group ); inactivePenButton = new KColorButton( res->inactivePenColor(), group ); - connect( inactivePenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setInactivePenColor( const TQColor & ) ) ); + connect( inactivePenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setInactivePenColor( const TQColor & ) ) ); inactivePenLabel->setBuddy( inactivePenButton ); TQLabel *inactiveBgLabel = new TQLabel( i18n("Inactive background:"), group ); inactiveBgButton = new KColorButton( res->inactiveBgColor(), group ); - connect( inactiveBgButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setInactiveBgColor( const TQColor & ) ) ); + connect( inactiveBgButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setInactiveBgColor( const TQColor & ) ) ); inactiveBgLabel->setBuddy( inactiveBgButton ); // Active colors @@ -361,28 +361,28 @@ void KasPrefsDialog::addColorsPage() TQLabel *activePenLabel = new TQLabel( i18n("Active foreground:"), group ); activePenButton = new KColorButton( res->activePenColor(), group ); - connect( activePenButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setActivePenColor( const TQColor & ) ) ); + connect( activePenButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setActivePenColor( const TQColor & ) ) ); activePenLabel->setBuddy( activePenButton ); TQLabel *activeBgLabel = new TQLabel( i18n("Active background:"), group ); activeBgButton = new KColorButton( res->activeBgColor(), group ); - connect( activeBgButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setActiveBgColor( const TQColor & ) ) ); + connect( activeBgButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setActiveBgColor( const TQColor & ) ) ); activeBgLabel->setBuddy( activeBgButton ); group = new TQGrid( 2, colorsPage ); TQLabel *progressLabel = new TQLabel( i18n("&Progress color:"), group ); progressButton = new KColorButton( res->progressColor(), group ); - connect( progressButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setProgressColor( const TQColor & ) ) ); + connect( progressButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setProgressColor( const TQColor & ) ) ); progressLabel->setBuddy( progressButton ); TQLabel *attentionLabel = new TQLabel( i18n("&Attention color:"), group ); attentionButton = new KColorButton( res->attentionColor(), group ); - connect( attentionButton, TQT_SIGNAL( changed( const TQColor & ) ), - res, TQT_SLOT( setAttentionColor( const TQColor & ) ) ); + connect( attentionButton, TQ_SIGNAL( changed( const TQColor & ) ), + res, TQ_SLOT( setAttentionColor( const TQColor & ) ) ); attentionLabel->setBuddy( attentionButton ); (void) new TQWidget( colorsPage, "spacer" ); @@ -406,7 +406,7 @@ void KasPrefsDialog::addAdvancedPage() i18n( "Enables the display of tasks that are starting but have not yet " "created a window." ) ); notifierCheck->setChecked( kasbar->notifierEnabled() ); - connect( notifierCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setNotifierEnabled(bool) ) ); + connect( notifierCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setNotifierEnabled(bool) ) ); // Status advanced modifiedCheck = new TQCheckBox( i18n("Enable &modified indicator"), advancedPage ); @@ -414,26 +414,26 @@ void KasPrefsDialog::addAdvancedPage() i18n( "Enables the display of a floppy disk state icon for windows containing " "a modified document." ) ); modifiedCheck->setChecked( kasbar->showModified() ); - connect( modifiedCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowModified(bool) ) ); + connect( modifiedCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowModified(bool) ) ); progressCheck = new TQCheckBox( i18n("Enable &progress indicator"), advancedPage ); TQWhatsThis::add( progressCheck, i18n( "Enables the display of a progress indicator in the label of windows." ) ); progressCheck->setChecked( kasbar->showProgress() ); - connect( progressCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowProgress(bool) ) ); + connect( progressCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowProgress(bool) ) ); attentionCheck = new TQCheckBox( i18n("Enable &attention indicator"), advancedPage ); TQWhatsThis::add( attentionCheck, i18n( "Enables the display of an icon that indicates a window that needs attention." ) ); attentionCheck->setChecked( kasbar->showAttention() ); - connect( attentionCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setShowAttention(bool) ) ); + connect( attentionCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setShowAttention(bool) ) ); inactiveFramesCheck = new TQCheckBox( i18n("Enable frames for inactive items"), advancedPage ); TQWhatsThis::add( inactiveFramesCheck, i18n( "Enables frames around inactive items, if you want the bar to disappear into " \ "the background you should probably uncheck this option." ) ); inactiveFramesCheck->setChecked( kasbar->paintInactiveFrames() ); - connect( inactiveFramesCheck, TQT_SIGNAL( toggled(bool) ), kasbar, TQT_SLOT( setPaintInactiveFrames(bool) ) ); + connect( inactiveFramesCheck, TQ_SIGNAL( toggled(bool) ), kasbar, TQ_SLOT( setPaintInactiveFrames(bool) ) ); (void) new TQWidget( advancedPage, "spacer" ); (void) new TQWidget( advancedPage, "spacer" ); diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 2f008d0c5..84e17dd21 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -80,7 +80,7 @@ KasStartupItem::KasStartupItem( KasBar *parent, Startup::Ptr startup ) setAnimation( resources()->startupAnimation() ); aniTimer = new TQTimer( this, "aniTimer" ); - connect( aniTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( aniTimerFired() ) ); + connect( aniTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( aniTimerFired() ) ); aniTimer->start( 100 ); } diff --git a/kicker/extensions/kasbar/kastasker.cpp b/kicker/extensions/kasbar/kastasker.cpp index 04d6a8e0f..3d28a723d 100644 --- a/kicker/extensions/kasbar/kastasker.cpp +++ b/kicker/extensions/kasbar/kastasker.cpp @@ -102,17 +102,17 @@ KasTasker::KasTasker( Orientation o, TQWidget* parent, const char* name, WFlags loadItem(0) { setAcceptDrops( true ); - connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), TQT_SLOT(addTask(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), TQT_SLOT(removeTask(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), TQT_SLOT(addStartup(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), TQT_SLOT(removeStartup(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAllLater())); -// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAllLater() ) ); + connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), TQ_SLOT(addTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), TQ_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), TQ_SLOT(addStartup(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), TQ_SLOT(removeStartup(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAllLater())); +// connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAllLater() ) ); - connect( this, TQT_SIGNAL( itemSizeChanged( int ) ), TQT_SLOT( refreshAll() ) ); + connect( this, TQ_SIGNAL( itemSizeChanged( int ) ), TQ_SLOT( refreshAll() ) ); - connect( this, TQT_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQT_SLOT( writeLayout() ) ); - connect( this, TQT_SIGNAL( directionChanged() ), TQT_SLOT( writeLayout() ) ); + connect( this, TQ_SIGNAL( detachedPositionChanged(const TQPoint &) ), TQ_SLOT( writeLayout() ) ); + connect( this, TQ_SIGNAL( directionChanged() ), TQ_SLOT( writeLayout() ) ); } KasTasker::KasTasker( Orientation o, KasTasker *master, TQWidget* parent, const char* name, WFlags f ) @@ -155,27 +155,27 @@ TDEPopupMenu *KasTasker::contextMenu() this, "toggle_show_all_windows" ); showAllWindowsAction->setChecked( showAllWindows() ); showAllWindowsAction->plug( menu ); - connect( showAllWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowAllWindows(bool)) ); - connect( this, TQT_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( showAllWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowAllWindows(bool)) ); + connect( this, TQ_SIGNAL(showAllWindowsChanged(bool)), showAllWindowsAction, TQ_SLOT(setChecked(bool)) ); groupWindowsAction = new TDEToggleAction( i18n("&Group Windows"), TDEShortcut(), this, "toggle_group_windows" ); groupWindowsAction->setChecked( groupWindows() ); groupWindowsAction->plug( menu ); - connect( groupWindowsAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setGroupWindows(bool)) ); - connect( this, TQT_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQT_SLOT(setChecked(bool)) ); + connect( groupWindowsAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setGroupWindows(bool)) ); + connect( this, TQ_SIGNAL(groupWindowsChanged(bool)), groupWindowsAction, TQ_SLOT(setChecked(bool)) ); showClockAction = new TDEToggleAction( i18n("Show &Clock"), TDEShortcut(), this, "toggle_show_clock" ); showClockAction->setChecked( showClock() ); showClockAction->plug( menu ); - connect( showClockAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowClock(bool)) ); - connect( this, TQT_SIGNAL(showClockChanged(bool)), showClockAction, TQT_SLOT(setChecked(bool)) ); + connect( showClockAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowClock(bool)) ); + connect( this, TQ_SIGNAL(showClockChanged(bool)), showClockAction, TQ_SLOT(setChecked(bool)) ); showLoadAction = new TDEToggleAction( i18n("Show &Load Meter"), TDEShortcut(), this, "toggle_show_load" ); showLoadAction->setChecked( showLoad() ); showLoadAction->plug( menu ); - connect( showLoadAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setShowLoad(bool)) ); - connect( this, TQT_SIGNAL(showLoadChanged(bool)), showLoadAction, TQT_SLOT(setChecked(bool)) ); + connect( showLoadAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setShowLoad(bool)) ); + connect( this, TQ_SIGNAL(showLoadChanged(bool)), showLoadAction, TQ_SLOT(setChecked(bool)) ); menu->insertSeparator(); @@ -183,31 +183,31 @@ TDEPopupMenu *KasTasker::contextMenu() toggleDetachedAction = new TDEToggleAction( i18n("&Floating"), TDEShortcut(), this, "toggle_detached" ); toggleDetachedAction->setChecked( isDetached() ); toggleDetachedAction->plug( menu ); - connect( toggleDetachedAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(setDetached(bool)) ); - connect( this, TQT_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQT_SLOT(setChecked(bool)) ); + connect( toggleDetachedAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(setDetached(bool)) ); + connect( this, TQ_SIGNAL(detachedChanged(bool)), toggleDetachedAction, TQ_SLOT(setChecked(bool)) ); } rotateBarAction = new TDEAction( i18n("R&otate Bar"), TQString("rotate"), TDEShortcut(), - this, TQT_SLOT( toggleOrientation() ), + this, TQ_SLOT( toggleOrientation() ), this, "rotate_bar" ); rotateBarAction->plug( menu ); - connect( this, TQT_SIGNAL(detachedChanged(bool)), rotateBarAction, TQT_SLOT(setEnabled(bool)) ); - connect( rotateBarAction, TQT_SIGNAL(activated()), TQT_SLOT(writeConfigLater()) ); + connect( this, TQ_SIGNAL(detachedChanged(bool)), rotateBarAction, TQ_SLOT(setEnabled(bool)) ); + connect( rotateBarAction, TQ_SIGNAL(activated()), TQ_SLOT(writeConfigLater()) ); - menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQT_SLOT( refreshAll() ) ); + menu->insertItem( SmallIcon("reload"), i18n("&Refresh"), this, TQ_SLOT( refreshAll() ) ); menu->insertSeparator(); - menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQT_SLOT( showPreferences() ) ); + menu->insertItem( SmallIcon("configure"), i18n("&Configure Kasbar..."), this, TQ_SLOT( showPreferences() ) ); // Help menu TDEPopupMenu *help = new TDEPopupMenu; - help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQT_SLOT( showAbout() ) ); + help->insertItem( SmallIcon("about"), i18n("&About Kasbar"), this, TQ_SLOT( showAbout() ) ); menu->insertItem( SmallIcon("help"), i18n("&Help"), help ); if ( standalone_ ) { menu->insertSeparator(); - menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQT_SLOT( quit() ) ); + menu->insertItem( SmallIcon("system-log-out"), i18n("&Quit"), tqApp, TQ_SLOT( quit() ) ); } } @@ -294,7 +294,7 @@ KasGroupItem *KasTasker::convertToGroup( Task::Ptr t ) removeTask( t ); insert( i, gi ); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), gi, TQT_SLOT(removeTask(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), gi, TQ_SLOT(removeTask(Task::Ptr))); return gi; } @@ -371,7 +371,7 @@ void KasTasker::refreshAll() void KasTasker::refreshAllLater() { - TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQT_SLOT( refreshAll() ) ); + TQTimer::singleShot( SWITCH_DESKTOPS_REGROUP_DELAY, this, TQ_SLOT( refreshAll() ) ); } void KasTasker::refreshIconGeometry() @@ -432,12 +432,12 @@ void KasTasker::setShowAllWindows( bool enable ) showAllWindows_ = enable; refreshAll(); if ( !showAllWindows_ ) { - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), TQT_SLOT(refreshAll())); -// connect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), TQT_SLOT( refreshAll() ) ); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), TQ_SLOT(refreshAll())); +// connect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), TQ_SLOT( refreshAll() ) ); } else { - disconnect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), this, TQT_SLOT(refreshAll())); -// disconnect( manager, TQT_SIGNAL( windowChanged( Task::Ptr ) ), this, TQT_SLOT( refreshAll() ) ); + disconnect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), this, TQ_SLOT(refreshAll())); +// disconnect( manager, TQ_SIGNAL( windowChanged( Task::Ptr ) ), this, TQ_SLOT( refreshAll() ) ); } emit showAllWindowsChanged( enable ); @@ -551,7 +551,7 @@ void KasTasker::readConfig() void KasTasker::writeConfigLater() { - TQTimer::singleShot( 10, this, TQT_SLOT( writeConfig() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( writeConfig() ) ); } void KasTasker::writeConfig() diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index ee4a0bc7d..b7ab94de6 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/kicker/extensions/kasbar/kastaskitem.cpp @@ -99,17 +99,17 @@ KasTaskItem::KasTaskItem( KasTasker *parent, Task::Ptr task ) setAttention( task->demandsAttention() ); updateTask(false); - connect( task, TQT_SIGNAL( changed(bool) ), this, TQT_SLOT( updateTask(bool) ) ); - connect( task, TQT_SIGNAL( activated() ), this, TQT_SLOT( startAutoThumbnail() ) ); - connect( task, TQT_SIGNAL( deactivated() ), this, TQT_SLOT( stopAutoThumbnail() ) ); - connect( task, TQT_SIGNAL( iconChanged() ), this, TQT_SLOT( iconChanged() ) ); - connect( task, TQT_SIGNAL( thumbnailChanged() ), this, TQT_SLOT( iconChanged() ) ); + connect( task, TQ_SIGNAL( changed(bool) ), this, TQ_SLOT( updateTask(bool) ) ); + connect( task, TQ_SIGNAL( activated() ), this, TQ_SLOT( startAutoThumbnail() ) ); + connect( task, TQ_SIGNAL( deactivated() ), this, TQ_SLOT( stopAutoThumbnail() ) ); + connect( task, TQ_SIGNAL( iconChanged() ), this, TQ_SLOT( iconChanged() ) ); + connect( task, TQ_SIGNAL( thumbnailChanged() ), this, TQ_SLOT( iconChanged() ) ); - connect( this, TQT_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQT_SLOT(toggleActivateAction()) ); - connect( this, TQT_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQT_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); + connect( this, TQ_SIGNAL(leftButtonClicked(TQMouseEvent *)), TQ_SLOT(toggleActivateAction()) ); + connect( this, TQ_SIGNAL(rightButtonClicked(TQMouseEvent *)), TQ_SLOT(showWindowMenuAt(TQMouseEvent *) ) ); attentionTimer = new TQTimer( this, "attentionTimer" ); - connect( attentionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkAttention() ) ); + connect( attentionTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkAttention() ) ); attentionTimer->start( CHECK_ATTENTION_DELAY ); } @@ -295,12 +295,12 @@ void KasTaskItem::startAutoThumbnail() if ( kasbar()->thumbnailUpdateDelay() > 0 ) { thumbTimer = new TQTimer( this, "thumbTimer" ); - connect( thumbTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( refreshThumbnail() ) ); + connect( thumbTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( refreshThumbnail() ) ); thumbTimer->start( kasbar()->thumbnailUpdateDelay() * 1000 ); } - TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) ); } void KasTaskItem::stopAutoThumbnail() @@ -322,7 +322,7 @@ void KasTaskItem::refreshThumbnail() // TODO: Check if the popup obscures the window KasItem *i = kasbar()->itemUnderMouse(); if ( i && i->isShowingPopup() ) { - TQTimer::singleShot( 200, this, TQT_SLOT( refreshThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( refreshThumbnail() ) ); return; } @@ -333,11 +333,11 @@ void KasTaskItem::refreshThumbnail() void KasTaskItem::showWindowMenuAt( TQPoint p ) { TaskRMBMenu *tm = new TaskRMBMenu(task_, true, kasbar()); - tm->insertItem( i18n("To &Tray" ), this, TQT_SLOT( sendToTray() ) ); + tm->insertItem( i18n("To &Tray" ), this, TQ_SLOT( sendToTray() ) ); tm->insertSeparator(); tm->insertItem( i18n("&Kasbar"), kasbar()->contextMenu() ); tm->insertSeparator(); - tm->insertItem( i18n("&Properties" ), this, TQT_SLOT( showPropertiesDialog() ) ); + tm->insertItem( i18n("&Properties" ), this, TQ_SLOT( showPropertiesDialog() ) ); mouseLeave(); kasbar()->updateMouseOver(); diff --git a/kicker/extensions/kasbar/kastaskpopup.cpp b/kicker/extensions/kasbar/kastaskpopup.cpp index 32ef9de81..8905af37a 100644 --- a/kicker/extensions/kasbar/kastaskpopup.cpp +++ b/kicker/extensions/kasbar/kastaskpopup.cpp @@ -94,7 +94,7 @@ KasTaskPopup::KasTaskPopup( KasTaskItem *item, const char *name ) TQt::black, colorGroup().mid(), KPixmapEffect::DiagonalGradient ); - connect( item->task(), TQT_SIGNAL( thumbnailChanged() ), TQT_SLOT( refresh() ) ); + connect( item->task(), TQ_SIGNAL( thumbnailChanged() ), TQ_SLOT( refresh() ) ); } KasTaskPopup::~KasTaskPopup() diff --git a/kicker/extensions/sidebar/sidebarextension.cpp b/kicker/extensions/sidebar/sidebarextension.cpp index d29299939..142b42ee3 100644 --- a/kicker/extensions/sidebar/sidebarextension.cpp +++ b/kicker/extensions/sidebar/sidebarextension.cpp @@ -62,10 +62,10 @@ SidebarExtension::SidebarExtension( const TQString& configFile, KParts::BrowserExtension *be=KParts::BrowserExtension::childObject(p); if (be) { - connect(be,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(be,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(be,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } @@ -74,7 +74,7 @@ SidebarExtension::SidebarExtension( const TQString& configFile, m_resizeHandle->setFrameShadow(TQFrame::Raised); m_resizeHandle->setFixedWidth(6); m_resizeHandle->setCursor(TQCursor(TQt::SizeHorCursor)); - connect(p->widget(),TQT_SIGNAL(panelHasBeenExpanded(bool)),this,TQT_SLOT(needLayoutUpdate(bool))); + connect(p->widget(),TQ_SIGNAL(panelHasBeenExpanded(bool)),this,TQ_SLOT(needLayoutUpdate(bool))); needLayoutUpdate(false); m_resizeHandle->installEventFilter(this); m_resizeHandle->setMouseTracking(true); diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index dbb6c4195..56f33c66d 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/kicker/extensions/taskbar/taskbarextension.cpp @@ -63,17 +63,17 @@ TaskBarExtension::TaskBarExtension(const TQString& configFile, Type type, positionChange(position()); layout->addWidget(m_container); - connect(m_container, TQT_SIGNAL(containerCountChanged()), - TQT_SIGNAL(updateLayout())); + connect(m_container, TQ_SIGNAL(containerCountChanged()), + TQ_SIGNAL(updateLayout())); kapp->dcopClient()->setNotifications(true); connectDCOPSignal("kicker", "kicker", "configurationChanged()", "configure()", false); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - TQT_SLOT(setBackgroundTheme())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + TQ_SLOT(setBackgroundTheme())); - TQTimer::singleShot(0, this, TQT_SLOT(setBackgroundTheme())); + TQTimer::singleShot(0, this, TQ_SLOT(setBackgroundTheme())); } TaskBarExtension::~TaskBarExtension() @@ -150,8 +150,8 @@ void TaskBarExtension::setBackgroundTheme() { m_rootPixmap = new KRootPixmap(this); m_rootPixmap->setCustomPainting(true); - connect(m_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), - TQT_SLOT(updateBackground(const TQPixmap&))); + connect(m_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQ_SLOT(updateBackground(const TQPixmap&))); } else { diff --git a/kicker/kicker/buttons/browserbutton.cpp b/kicker/kicker/buttons/browserbutton.cpp index 71f2d0504..7ab5de6de 100644 --- a/kicker/kicker/buttons/browserbutton.cpp +++ b/kicker/kicker/buttons/browserbutton.cpp @@ -66,7 +66,7 @@ void BrowserButton::initialize( const TQString& icon, const TQString& path ) setPopup(topMenu); _menuTimer = new TQTimer( this, "_menuTimer" ); - connect( _menuTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotDelayedPopup()) ); + connect( _menuTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotDelayedPopup()) ); TQToolTip::add(this, i18n("Browse: %1").arg(path)); setTitle( path ); diff --git a/kicker/kicker/buttons/desktopbutton.cpp b/kicker/kicker/buttons/desktopbutton.cpp index fe70954f9..b548579f6 100644 --- a/kicker/kicker/buttons/desktopbutton.cpp +++ b/kicker/kicker/buttons/desktopbutton.cpp @@ -45,8 +45,8 @@ DesktopButton::DesktopButton( TQWidget* parent ) setTitle(i18n("Desktop Access")); setIcon("desktop"); - connect( this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showDesktop(bool)) ); - connect( ShowDesktop::the(), TQT_SIGNAL(desktopShown(bool)), this, TQT_SLOT(toggle(bool)) ); + connect( this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showDesktop(bool)) ); + connect( ShowDesktop::the(), TQ_SIGNAL(desktopShown(bool)), this, TQ_SLOT(toggle(bool)) ); setOn( ShowDesktop::the()->desktopShowing() ); } diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index adbef9dfc..ee3a942e5 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/kicker/kicker/buttons/knewbutton.cpp @@ -100,7 +100,7 @@ void KNewButton::show() KButton::show(); if (KickerSettings::firstRun()) { - TQTimer::singleShot(0,this,TQT_SLOT(slotExecMenu())); + TQTimer::singleShot(0,this,TQ_SLOT(slotExecMenu())); KickerSettings::setFirstRun(false); KickerSettings::writeConfig(); } diff --git a/kicker/kicker/buttons/nontdeappbutton.cpp b/kicker/kicker/buttons/nontdeappbutton.cpp index 4f88f2d37..972944897 100644 --- a/kicker/kicker/buttons/nontdeappbutton.cpp +++ b/kicker/kicker/buttons/nontdeappbutton.cpp @@ -61,7 +61,7 @@ NonKDEAppButton::NonKDEAppButton(const TQString& name, // to the slotExec() slot // we do this here instead of in initialize(...) since initialize(...) may // get called later, e.g after reconfiguring it - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } // this constructor is used when restoring a button, usually at startup @@ -77,7 +77,7 @@ NonKDEAppButton::NonKDEAppButton( const TDEConfigGroup& config, TQWidget* parent config.readBoolEntry("RunInTerminal")); // see comment on connect in above constructor - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } void NonKDEAppButton::initialize(const TQString& name, @@ -278,8 +278,8 @@ void NonKDEAppButton::properties() // ... connect the signal it emits when it has data for us to save // to our updateSettings slot (see above) ... - connect(dlg, TQT_SIGNAL(updateSettings(PanelExeDialog*)), this, - TQT_SLOT(updateSettings(PanelExeDialog*))); + connect(dlg, TQ_SIGNAL(updateSettings(PanelExeDialog*)), this, + TQ_SLOT(updateSettings(PanelExeDialog*))); // ... and then show it to the user dlg->show(); diff --git a/kicker/kicker/buttons/servicebutton.cpp b/kicker/kicker/buttons/servicebutton.cpp index 716a750ed..9b368407e 100644 --- a/kicker/kicker/buttons/servicebutton.cpp +++ b/kicker/kicker/buttons/servicebutton.cpp @@ -121,7 +121,7 @@ void ServiceButton::loadServiceFromId(const TQString &id) void ServiceButton::initialize() { readDesktopFile(); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec())); } void ServiceButton::readDesktopFile() @@ -192,7 +192,7 @@ void ServiceButton::slotExec() { // this allows the button to return to a non-pressed state // before launching - TQTimer::singleShot(0, this, TQT_SLOT(performExec())); + TQTimer::singleShot(0, this, TQ_SLOT(performExec())); } void ServiceButton::performExec() @@ -223,10 +223,10 @@ void ServiceButton::properties() KPropertiesDialog* dialog = new KPropertiesDialog(serviceURL, 0, 0, false, false); dialog->setFileNameReadOnly(true); - connect(dialog, TQT_SIGNAL(saveAs(const KURL &, KURL &)), - this, TQT_SLOT(slotSaveAs(const KURL &, KURL &))); - connect(dialog, TQT_SIGNAL(propertiesClosed()), - this, TQT_SLOT(slotUpdate())); + connect(dialog, TQ_SIGNAL(saveAs(const KURL &, KURL &)), + this, TQ_SLOT(slotSaveAs(const KURL &, KURL &))); + connect(dialog, TQ_SIGNAL(propertiesClosed()), + this, TQ_SLOT(slotUpdate())); dialog->show(); } diff --git a/kicker/kicker/buttons/urlbutton.cpp b/kicker/kicker/buttons/urlbutton.cpp index 13ff95323..d398b07b0 100644 --- a/kicker/kicker/buttons/urlbutton.cpp +++ b/kicker/kicker/buttons/urlbutton.cpp @@ -90,7 +90,7 @@ void URLButton::initialize( const TQString& _url ) } fileItem = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, url ); setIcon( fileItem->iconName() ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(slotExec()) ); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(slotExec()) ); setToolTip(); if (url.isLocalFile()) @@ -196,6 +196,6 @@ void URLButton::properties() pDlg = new KPropertiesDialog(fileItem, 0L, 0L, false, false); // will delete itself pDlg->setFileNameReadOnly(true); - connect(pDlg, TQT_SIGNAL(applied()), TQT_SLOT(updateURL())); + connect(pDlg, TQ_SIGNAL(applied()), TQ_SLOT(updateURL())); pDlg->show(); } diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 77c64832d..c8f87b02e 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/kicker/kicker/core/applethandle.cpp @@ -64,8 +64,8 @@ AppletHandle::AppletHandle(AppletContainer* parent) m_menuButton->installEventFilter(this); m_layout->addWidget(m_menuButton); - connect(m_menuButton, TQT_SIGNAL(pressed()), - this, TQT_SLOT(menuButtonPressed())); + connect(m_menuButton, TQ_SIGNAL(pressed()), + this, TQ_SLOT(menuButtonPressed())); TQToolTip::add(m_menuButton, i18n("%1 menu").arg(parent->info().name())); } @@ -151,8 +151,8 @@ void AppletHandle::setFadeOutHandle(bool fadeOut) if (!m_handleHoverTimer) { m_handleHoverTimer = new TQTimer(this, "m_handleHoverTimer"); - connect(m_handleHoverTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkHandleHover())); + connect(m_handleHoverTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkHandleHover())); m_applet->installEventFilter(this); } } diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index e72dd1887..e53e831ba 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/kicker/kicker/core/container_applet.cpp @@ -93,9 +93,9 @@ AppletContainer::AppletContainer(const AppletInfo& info, _layout->addSpacing(APPLET_MARGIN); _handle = new AppletHandle(this); _layout->addWidget(_handle, 0); - connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)), - this, TQT_SLOT(moveApplet(const TQPoint&))); - connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu())); + connect(_handle, TQ_SIGNAL(moveApplet(const TQPoint&)), + this, TQ_SLOT(moveApplet(const TQPoint&))); + connect(_handle, TQ_SIGNAL(showAppletMenu()), this, TQ_SLOT(showAppletMenu())); _layout->addWidget(_appletframe, 1); _layout->activate(); @@ -124,12 +124,12 @@ AppletContainer::AppletContainer(const AppletInfo& info, setImmutable(immutable); - connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); - connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(activateWindow())); - connect(_applet, TQT_SIGNAL(requestFocus(bool)), TQT_SLOT(focusRequested(bool))); + connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); + connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(activateWindow())); + connect(_applet, TQ_SIGNAL(requestFocus(bool)), TQ_SLOT(focusRequested(bool))); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(slotReconfigure())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(slotReconfigure())); } void AppletContainer::configure() @@ -321,8 +321,8 @@ TQPopupMenu* AppletContainer::createOpMenu() _info.name(), _info.icon(), this); - connect(opMenu, TQT_SIGNAL(escapePressed()), - _handle, TQT_SLOT(toggleMenuButtonOff())); + connect(opMenu, TQ_SIGNAL(escapePressed()), + _handle, TQ_SLOT(toggleMenuButtonOff())); return opMenu; } diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 3c53d211e..d3a550a07 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/kicker/kicker/core/container_button.cpp @@ -161,13 +161,13 @@ void ButtonContainer::embedButton(PanelButton* b) } _layout = vbox; - connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave())); - connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool))); - connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested())); - connect(_button, TQT_SIGNAL(dragme(const TQPixmap)), - TQT_SLOT(dragButton(const TQPixmap))); - connect(_button, TQT_SIGNAL(dragme(const KURL::List, const TQPixmap)), - TQT_SLOT(dragButton(const KURL::List, const TQPixmap))); + connect(_button, TQ_SIGNAL(requestSave()), TQ_SIGNAL(requestSave())); + connect(_button, TQ_SIGNAL(hideme(bool)), TQ_SLOT(hideRequested(bool))); + connect(_button, TQ_SIGNAL(removeme()), TQ_SLOT(removeRequested())); + connect(_button, TQ_SIGNAL(dragme(const TQPixmap)), + TQ_SLOT(dragButton(const TQPixmap))); + connect(_button, TQ_SIGNAL(dragme(const KURL::List, const TQPixmap)), + TQ_SLOT(dragButton(const KURL::List, const TQPixmap))); } TQPopupMenu* ButtonContainer::createOpMenu() @@ -261,7 +261,7 @@ bool ButtonContainer::eventFilter(TQObject *o, TQEvent *e) } TQPopupMenu* menu = opMenu(); - connect( menu, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotMenuClosed() ) ); + connect( menu, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotMenuClosed() ) ); TQPoint pos = KickerLib::popupPosition(popupDirection(), menu, this, (orientation() == TQt::Horizontal) ? TQPoint(0, 0) : me->pos()); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 9553e0a85..afb786f7f 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -137,20 +137,20 @@ void ExtensionContainer::init() KWin::setState(winId(), NET::Sticky); KWin::setOnAllDesktops(winId(), true); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT( currentDesktopChanged(int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(strutChanged()), this, TQ_SLOT(strutChanged())); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT( currentDesktopChanged(int))); setBackgroundOrigin(AncestorOrigin); setFrameStyle(NoFrame); setLineWidth(0); setMargin(0); - connect(UnhideTrigger::the(), TQT_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), - this, TQT_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); + connect(UnhideTrigger::the(), TQ_SIGNAL(triggerUnhide(UnhideTrigger::Trigger,int)), + this, TQ_SLOT(unhideTriggered(UnhideTrigger::Trigger,int))); _popupWidgetFilter = new PopupWidgetFilter( this ); - connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer())); + connect(_popupWidgetFilter, TQ_SIGNAL(popupWidgetHiding()), TQ_SLOT(maybeStartAutoHideTimer())); // layout _layout = new TQGridLayout(this, 3, 3, 0, 0); @@ -160,15 +160,15 @@ void ExtensionContainer::init() // instantiate the autohide timer _autohideTimer = new TQTimer(this, "_autohideTimer"); - connect(_autohideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoHideTimeout())); + connect(_autohideTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoHideTimeout())); // instantiate the updateLayout event compressor timer _updateLayoutTimer = new TQTimer(this, "_updateLayoutTimer"); - connect(_updateLayoutTimer, TQT_SIGNAL(timeout()), TQT_SLOT(actuallyUpdateLayout())); + connect(_updateLayoutTimer, TQ_SIGNAL(timeout()), TQ_SLOT(actuallyUpdateLayout())); installEventFilter(this); // for mouse event handling - connect(Kicker::the(), TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(updateHighlightColor())); + connect(Kicker::the(), TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(updateHighlightColor())); updateHighlightColor(); // if we were hidden when kicker quit, let's start out hidden as well! @@ -207,9 +207,9 @@ void ExtensionContainer::init() item->setDefaultValue(m_extension->customSize()); } - connect(m_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(updateLayout())); - connect(m_extension, TQT_SIGNAL(maintainFocus(bool)), - TQT_SLOT(maintainFocus(bool))); + connect(m_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(updateLayout())); + connect(m_extension, TQ_SIGNAL(maintainFocus(bool)), + TQ_SLOT(maintainFocus(bool))); _layout->addWidget(m_extension, 1, 1); } @@ -885,7 +885,7 @@ void ExtensionContainer::autoHide(bool hide) _in_autohide = false; - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); } void ExtensionContainer::animatedHide(bool left) @@ -925,7 +925,7 @@ void ExtensionContainer::animatedHide(bool left) !TQApplication::desktop()->screenGeometry(s).intersects(geometry())) { blockUserInput(false); - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); return; } } @@ -988,7 +988,7 @@ void ExtensionContainer::animatedHide(bool left) config->setGroup(extensionId()); config->writeEntry("UserHidden", userHidden()); - TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects())); + TQTimer::singleShot(100, this, TQ_SLOT(enableMouseOverEffects())); } bool ExtensionContainer::reserveStrut() const @@ -1486,7 +1486,7 @@ void ExtensionContainer::unhideIfHidden(int showForAtLeastHowManyMS) { autoHide(false); TQTimer::singleShot(showForAtLeastHowManyMS, - this, TQT_SLOT(maybeStartAutoHideTimer())); + this, TQ_SLOT(maybeStartAutoHideTimer())); return; } @@ -1627,7 +1627,7 @@ void ExtensionContainer::resetLayout() _ltHB = new HideButton(this); _ltHB->installEventFilter(this); _ltHB->setEnabled(true); - connect(_ltHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideLeft())); + connect(_ltHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideLeft())); haveToArrangeButtons = true; } @@ -1658,7 +1658,7 @@ void ExtensionContainer::resetLayout() _rbHB = new HideButton(this); _rbHB->installEventFilter(this); _rbHB->setEnabled(true); - connect(_rbHB, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideRight())); + connect(_rbHB, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideRight())); haveToArrangeButtons = true; } diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index f0e6ca422..234aba375 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/kicker/kicker/core/containerarea.cpp @@ -103,11 +103,11 @@ ContainerArea::ContainerArea(TDEConfig* _c, setBackground(); - connect(&_autoScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(autoScroll())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(setBackground())); - connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), - TQT_SLOT(immutabilityChanged(bool))); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); + connect(&_autoScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(autoScroll())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(setBackground())); + connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), + TQ_SLOT(immutabilityChanged(bool))); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); } ContainerArea::~ContainerArea() @@ -142,7 +142,7 @@ void ContainerArea::initialize(bool useDefaultConfig) } setAcceptDrops(!isImmutable()); - TQTimer::singleShot(0, this, TQT_SLOT(resizeContents())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeContents())); } void ContainerArea::defaultContainerConfig() @@ -377,7 +377,7 @@ void ContainerArea::loadContainers(const TQStringList& containers) // it gets executed too soon. we need to wait until the containers are // actually resized, but we enter the event loop prior to that happening // above. - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } void ContainerArea::saveContainerConfig(bool layoutOnly) @@ -728,20 +728,20 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index) m_layout->add(a); } - connect(a, TQT_SIGNAL(moveme(BaseContainer*)), - TQT_SLOT(startContainerMove(BaseContainer*))); - connect(a, TQT_SIGNAL(removeme(BaseContainer*)), - TQT_SLOT(removeContainer(BaseContainer*))); - connect(a, TQT_SIGNAL(takeme(BaseContainer*)), - TQT_SLOT(takeContainer(BaseContainer*))); - connect(a, TQT_SIGNAL(requestSave()), - TQT_SLOT(slotSaveContainerConfig())); - connect(a, TQT_SIGNAL(maintainFocus(bool)), - this, TQT_SIGNAL(maintainFocus(bool))); + connect(a, TQ_SIGNAL(moveme(BaseContainer*)), + TQ_SLOT(startContainerMove(BaseContainer*))); + connect(a, TQ_SIGNAL(removeme(BaseContainer*)), + TQ_SLOT(removeContainer(BaseContainer*))); + connect(a, TQ_SIGNAL(takeme(BaseContainer*)), + TQ_SLOT(takeContainer(BaseContainer*))); + connect(a, TQ_SIGNAL(requestSave()), + TQ_SLOT(slotSaveContainerConfig())); + connect(a, TQ_SIGNAL(maintainFocus(bool)), + this, TQ_SIGNAL(maintainFocus(bool))); if (dynamic_cast<AppletContainer*>(a)) { - connect(a, TQT_SIGNAL(updateLayout()), TQT_SLOT(resizeContents())); + connect(a, TQ_SIGNAL(updateLayout()), TQ_SLOT(resizeContents())); } a->configure(orientation(), popupDirection()); @@ -824,16 +824,16 @@ void ContainerArea::takeContainer(BaseContainer* a) return; } - disconnect(a, TQT_SIGNAL(moveme(BaseContainer*)), - this, TQT_SLOT(startContainerMove(BaseContainer*))); - disconnect(a, TQT_SIGNAL(removeme(BaseContainer*)), - this, TQT_SLOT(removeContainer(BaseContainer*))); - disconnect(a, TQT_SIGNAL(takeme(BaseContainer*)), - this, TQT_SLOT(takeContainer(BaseContainer*))); - disconnect(a, TQT_SIGNAL(requestSave()), - this, TQT_SLOT(slotSaveContainerConfig())); - disconnect(a, TQT_SIGNAL(maintainFocus(bool)), - this, TQT_SIGNAL(maintainFocus(bool))); + disconnect(a, TQ_SIGNAL(moveme(BaseContainer*)), + this, TQ_SLOT(startContainerMove(BaseContainer*))); + disconnect(a, TQ_SIGNAL(removeme(BaseContainer*)), + this, TQ_SLOT(removeContainer(BaseContainer*))); + disconnect(a, TQ_SIGNAL(takeme(BaseContainer*)), + this, TQ_SLOT(takeContainer(BaseContainer*))); + disconnect(a, TQ_SIGNAL(requestSave()), + this, TQ_SLOT(slotSaveContainerConfig())); + disconnect(a, TQ_SIGNAL(maintainFocus(bool)), + this, TQ_SIGNAL(maintainFocus(bool))); // Just remove the group from our own config file. Leave separate config // files untouched. @@ -1436,8 +1436,8 @@ void ContainerArea::setBackground() { _rootPixmap = new KRootPixmap(this); _rootPixmap->setCustomPainting(true); - connect(_rootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap&)), - TQT_SLOT(updateBackground(const TQPixmap&))); + connect(_rootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap&)), + TQ_SLOT(updateBackground(const TQPixmap&))); } else { @@ -1516,7 +1516,7 @@ void ContainerArea::setBackground() KickerLib::colorize(bgImage); } setPaletteBackgroundPixmap(TQPixmap(bgImage)); - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } } @@ -1538,7 +1538,7 @@ void ContainerArea::immutabilityChanged(bool immutable) } setAcceptDrops(!isImmutable()); - TQTimer::singleShot(0, this, TQT_SLOT(setBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(setBackground())); } TQRect ContainerArea::availableSpaceFollowing(BaseContainer* a) @@ -1663,7 +1663,7 @@ void ContainerArea::resizeContents(int w, int h) if (!m_updateBackgroundsCalled) { m_updateBackgroundsCalled = true; - TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground())); + TQTimer::singleShot(0, this, TQ_SLOT(updateContainersBackground())); } } @@ -1793,7 +1793,7 @@ void ContainerArea::updateContainersBackground() if( !m_cachedGeometry.contains( *it )) { m_cachedGeometry[ *it ] = TQRect(); - connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry())); + connect( *it, TQ_SIGNAL( destroyed()), TQ_SLOT( destroyCachedGeometry())); } if( m_cachedGeometry[ *it ] != (*it)->geometry()) { @@ -1910,7 +1910,7 @@ void ContainerArea::showAddAppletDialog() if (!m_addAppletDialog) { m_addAppletDialog = new AddAppletDialog(this, this, 0); - connect(m_addAppletDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(addAppletDialogDone())); + connect(m_addAppletDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(addAppletDialogDone())); } else { diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 796b98125..cb20c7a58 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -179,7 +179,7 @@ void ExtensionManager::initialize() m_loadingContainers = false; pm->clearUntrustedLists(); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), TQT_SLOT(configurationChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), TQ_SLOT(configurationChanged())); DCOPRef r( "ksmserver", "ksmserver" ); r.send( "resumeStartup", TQCString( "kicker" )); } @@ -222,7 +222,7 @@ void ExtensionManager::configureMenubar(bool duringInit) updateMenubar(); m_menubarPanel->show(); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(updateMenubar())); + connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(updateMenubar())); } else if (m_menubarPanel) { @@ -437,8 +437,8 @@ void ExtensionManager::addContainer(ExtensionContainer* e) _containers.append(e); - connect(e, TQT_SIGNAL(removeme(ExtensionContainer*)), - this, TQT_SLOT(removeContainer(ExtensionContainer*))); + connect(e, TQ_SIGNAL(removeme(ExtensionContainer*)), + this, TQ_SLOT(removeContainer(ExtensionContainer*))); if (!m_loadingContainers) { emit desktopIconsAreaChanged(desktopIconsArea(e->xineramaScreen()), diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 6a92b3899..19c348851 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -77,7 +77,7 @@ Kicker::Kicker() // this means we've most likely crashed once. so let's see if we // stay up for more than 2 minutes time, and if so reset the // crash handler since the crash isn't a frequent offender - TQTimer::singleShot(120000, this, TQT_SLOT(setCrashHandler())); + TQTimer::singleShot(120000, this, TQ_SLOT(setCrashHandler())); } else { @@ -125,19 +125,19 @@ Kicker::Kicker() // set up our global settings configure(); - connect(this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(this, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); - connect(this, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); + connect(this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(this, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); + connect(this, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support - connect(desktop(), TQT_SIGNAL(resized(int)), TQT_SLOT(slotDesktopResized())); + connect(desktop(), TQ_SIGNAL(resized(int)), TQ_SLOT(slotDesktopResized())); #endif // the panels, aka extensions - TQTimer::singleShot(0, ExtensionManager::the(), TQT_SLOT(initialize())); + TQTimer::singleShot(0, ExtensionManager::the(), TQ_SLOT(initialize())); - connect(ExtensionManager::the(), TQT_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), - this, TQT_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); + connect(ExtensionManager::the(), TQ_SIGNAL(desktopIconsAreaChanged(const TQRect &, int)), + this, TQ_SLOT(slotDesktopIconsAreaChanged(const TQRect &, int))); } Kicker::~Kicker() @@ -258,7 +258,7 @@ void Kicker::quit() void Kicker::restart() { // do this on a timer to give us time to return true - TQTimer::singleShot(0, this, TQT_SLOT(slotRestart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestart())); } void Kicker::slotRestart() @@ -352,7 +352,7 @@ void Kicker::showConfig(const TQString& configPath, const TQString& configFile, moduleNumber++; } - connect(m_configDialog, TQT_SIGNAL(finished()), TQT_SLOT(configDialogFinished())); + connect(m_configDialog, TQ_SIGNAL(finished()), TQ_SLOT(configDialogFinished())); } if (!configPath.isEmpty()) diff --git a/kicker/kicker/core/kickerbindings.cpp b/kicker/kicker/core/kickerbindings.cpp index 07ac99d7a..e8999a22d 100644 --- a/kicker/kicker/core/kickerbindings.cpp +++ b/kicker/kicker/core/kickerbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, target, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, target, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, target, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, target, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index a7326844e..94ee0acfb 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/kicker/kicker/core/menumanager.cpp @@ -71,8 +71,8 @@ MenuManager::MenuManager(TQObject *parent) m_kmenu = new KMenuStub(new KMenu); kapp->dcopClient()->setNotifications(true); - connect(kapp->dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - this, TQT_SLOT(applicationRemoved(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + this, TQ_SLOT(applicationRemoved(const TQCString&))); } MenuManager::~MenuManager() @@ -164,7 +164,7 @@ void MenuManager::kmenuAccelActivated() // the item under the cursor gets selected. The single shot // avoids this from happening by allowing the item to be selected // when the event loop is enterred, and then resetting it. - TQTimer::singleShot(0, this, TQT_SLOT(slotSetKMenuItemActive())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetKMenuItemActive())); } else { diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp index 9e8d7130a..e55f65697 100644 --- a/kicker/kicker/core/panelextension.cpp +++ b/kicker/kicker/core/panelextension.cpp @@ -71,7 +71,7 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con // container area _containerArea = new ContainerArea( config(), this, opMenu() ); - connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool))); + connect(_containerArea, TQ_SIGNAL(maintainFocus(bool)), this, TQ_SIGNAL(maintainFocus(bool))); _layout->addWidget(_containerArea); _containerArea->viewport()->installEventFilter(this); @@ -81,15 +81,15 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con // beginning. positionChange(position()); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - TQT_SLOT(configurationChanged())); - connect(Kicker::the(), TQT_SIGNAL(immutabilityChanged(bool)), - TQT_SLOT(immutabilityChanged(bool))); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + TQ_SLOT(configurationChanged())); + connect(Kicker::the(), TQ_SIGNAL(immutabilityChanged(bool)), + TQ_SLOT(immutabilityChanged(bool))); // we wait to get back to the event loop to start up the container area so that // the main panel in ExtensionManager will be assigned and we can tell in a // relatively non-hackish way that we are (or aren't) the "main panel" - TQTimer::singleShot(0, this, TQT_SLOT(populateContainerArea())); + TQTimer::singleShot(0, this, TQ_SLOT(populateContainerArea())); } PanelExtension::~PanelExtension() @@ -129,7 +129,7 @@ TQPopupMenu* PanelExtension::opMenu() } _opMnu = new TQPopupMenu(this); - connect(_opMnu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBuildOpMenu())); + connect(_opMnu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotBuildOpMenu())); return _opMnu; } @@ -339,7 +339,7 @@ void PanelExtension::slotBuildOpMenu() { _opMnu->insertItem(isMenuBar ? i18n("Add &Applet to Menubar...") : i18n("Add &Applet to Panel..."), - _containerArea, TQT_SLOT(showAddAppletDialog())); + _containerArea, TQ_SLOT(showAddAppletDialog())); m_panelAddMenu = new PanelAddButtonMenu(_containerArea, this); _opMnu->insertItem(isMenuBar ? i18n("Add Appli&cation to Menubar") : i18n("Add Appli&cation to Panel"), @@ -362,7 +362,7 @@ void PanelExtension::slotBuildOpMenu() } _opMnu->insertItem(SmallIconSet("system-lock-screen"), i18n("&Lock Panels"), - Kicker::the(), TQT_SLOT(toggleLock())); + Kicker::the(), TQ_SLOT(toggleLock())); } else if (!Kicker::the()->isKioskImmutable()) { @@ -370,20 +370,20 @@ void PanelExtension::slotBuildOpMenu() SmallIconSet("system-lock-screen"), kickerImmutable ? i18n("Un&lock Panels") : i18n("&Lock Panels"), - Kicker::the(), TQT_SLOT(toggleLock())); + Kicker::the(), TQ_SLOT(toggleLock())); } if (!isMenuBar && !Kicker::the()->isKioskImmutable()) { _opMnu->insertItem(SmallIconSet("configure"), i18n("&Configure Panel..."), - this, TQT_SLOT(showConfig())); + this, TQ_SLOT(showConfig())); _opMnu->insertSeparator(); } _opMnu->insertItem(SmallIconSet("fork"), i18n("&Launch Process Manager..."), - this, TQT_SLOT(showProcessManager())); + this, TQ_SLOT(showProcessManager())); _opMnu->insertSeparator(); if (kapp->authorize("action/help")) diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index a0c1c0c31..78db46495 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/kicker/kicker/core/pluginmanager.cpp @@ -123,8 +123,8 @@ PluginManager::~PluginManager() AppletInfo::Dict::const_iterator it = _dict.constBegin(); for (; it != _dict.constEnd(); ++it) { - disconnect(it.key(), TQT_SIGNAL(destroyed( TQObject*)), - this, TQT_SLOT(slotPluginDestroyed(TQObject*))); + disconnect(it.key(), TQ_SIGNAL(destroyed( TQObject*)), + this, TQ_SLOT(slotPluginDestroyed(TQObject*))); delete it.data(); } @@ -160,8 +160,8 @@ KPanelApplet* PluginManager::loadApplet(const AppletInfo& info, if (applet) { _dict.insert( applet, new AppletInfo( info ) ); - connect( applet, TQT_SIGNAL( destroyed( TQObject* ) ), - TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); + connect( applet, TQ_SIGNAL( destroyed( TQObject* ) ), + TQ_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return applet; @@ -198,8 +198,8 @@ KPanelExtension* PluginManager::loadExtension( if( extension ) { _dict.insert( extension, new AppletInfo( info ) ); - connect( extension, TQT_SIGNAL( destroyed( TQObject* ) ), - TQT_SLOT( slotPluginDestroyed( TQObject* ) ) ); + connect( extension, TQ_SIGNAL( destroyed( TQObject* ) ), + TQ_SLOT( slotPluginDestroyed( TQObject* ) ) ); } return extension; @@ -360,7 +360,7 @@ LibUnloader::LibUnloader( const TQString &libName, TQObject *parent ) { // NOTE: this doesn't work on kicker shutdown because the timer never gets // fired. - TQTimer::singleShot( 0, this, TQT_SLOT( unload() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( unload() ) ); } void LibUnloader::unload( const TQString &libName ) diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 4a6639574..0a1e2907c 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -49,8 +49,8 @@ ShowDesktop::ShowDesktop() m_wmSupport = i.isSupported( NET::WM2ShowingDesktop ); if( m_wmSupport ) { - connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), - TQT_SLOT( showingDesktopChanged( bool ))); + connect( Kicker::the()->twinModule(), TQ_SIGNAL( showingDesktopChanged( bool )), + TQ_SLOT( showingDesktopChanged( bool ))); showingDesktopChanged( m_showingDesktop = Kicker::the()->twinModule()->showingDesktop()); } } @@ -161,21 +161,21 @@ void ShowDesktop::showDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - TQT_SLOT(slotCurrentDesktopChanged(int))); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - TQT_SLOT(slotWindowChanged(WId,unsigned int))); - connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), - TQT_SLOT(slotWindowAdded(WId))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + TQ_SLOT(slotCurrentDesktopChanged(int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + TQ_SLOT(slotWindowChanged(WId,unsigned int))); + connect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)), + TQ_SLOT(slotWindowAdded(WId))); } else { - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(slotCurrentDesktopChanged(int))); - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), - this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(slotWindowAdded(WId))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(slotCurrentDesktopChanged(int))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowChanged(WId,unsigned int)), + this, TQ_SLOT(slotWindowChanged(WId,unsigned int))); + disconnect(Kicker::the()->twinModule(), TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(slotWindowAdded(WId))); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); it != m_iconifiedList.end(); diff --git a/kicker/kicker/core/unhidetrigger.cpp b/kicker/kicker/core/unhidetrigger.cpp index 0a5093a61..1acc182f6 100644 --- a/kicker/kicker/core/unhidetrigger.cpp +++ b/kicker/kicker/core/unhidetrigger.cpp @@ -40,7 +40,7 @@ UnhideTrigger::UnhideTrigger() , enabledCount( 0 ) { _timer = new TQTimer( this, "UnhideTrigger" ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(pollMouse()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(pollMouse()) ); } void UnhideTrigger::setEnabled( bool enable ) diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp index 27d709837..fb5e3f16d 100644 --- a/kicker/kicker/ui/addapplet.cpp +++ b/kicker/kicker/ui/addapplet.cpp @@ -254,16 +254,16 @@ AddAppletDialog::AddAppletDialog(ContainerArea* cArea, m_mainWidget->appletInstall->setGuiItem(addGuiItem); m_mainWidget->closeButton->setGuiItem(KStdGuiItem::close()); - connect(m_mainWidget->appletSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(delayedSearch())); - connect(m_searchDelay, TQT_SIGNAL(timeout()), this, TQT_SLOT(search())); - connect(m_mainWidget->appletFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(filter(int))); - connect(m_mainWidget->appletInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(addCurrentApplet())); - connect(m_mainWidget->closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + connect(m_mainWidget->appletSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(delayedSearch())); + connect(m_searchDelay, TQ_SIGNAL(timeout()), this, TQ_SLOT(search())); + connect(m_mainWidget->appletFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(filter(int))); + connect(m_mainWidget->appletInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(addCurrentApplet())); + connect(m_mainWidget->closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); m_selectedType = AppletInfo::Undefined; m_appletBox = 0; - TQTimer::singleShot(0, this, TQT_SLOT(populateApplets())); + TQTimer::singleShot(0, this, TQ_SLOT(populateApplets())); } void AddAppletDialog::updateInsertionPoint() @@ -303,7 +303,7 @@ void AddAppletDialog::resizeAppletView() bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e) { if (e->type() == TQEvent::Resize) - TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView())); return this->TQObject::eventFilter(o, e); } @@ -372,10 +372,10 @@ void AddAppletDialog::populateApplets() setTabOrder(prevTabWidget, itemWidget); prevTabWidget = itemWidget; - connect(itemWidget, TQT_SIGNAL(clicked(AppletWidget*)), - this, TQT_SLOT(selectApplet(AppletWidget*))); - connect(itemWidget, TQT_SIGNAL(doubleClicked(AppletWidget*)), - this, TQT_SLOT(addApplet(AppletWidget*))); + connect(itemWidget, TQ_SIGNAL(clicked(AppletWidget*)), + this, TQ_SLOT(selectApplet(AppletWidget*))); + connect(itemWidget, TQ_SIGNAL(doubleClicked(AppletWidget*)), + this, TQ_SLOT(addApplet(AppletWidget*))); if (m_closing) { @@ -518,7 +518,7 @@ void AddAppletDialog::search() } } - TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeAppletView())); } void AddAppletDialog::filter(int i) diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp index 6d5c4482f..f68159b98 100644 --- a/kicker/kicker/ui/addapplet_mnu.cpp +++ b/kicker/kicker/ui/addapplet_mnu.cpp @@ -33,8 +33,8 @@ PanelAddAppletMenu::PanelAddAppletMenu(ContainerArea* cArea, TQWidget *parent, c : TQPopupMenu(parent, name), containerArea(cArea) { setCheckable(true); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelAddAppletMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp index 1226c9b37..dd6f04135 100644 --- a/kicker/kicker/ui/addappletvisualfeedback.cpp +++ b/kicker/kicker/ui/addappletvisualfeedback.cpp @@ -56,7 +56,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget, { setFocusPolicy(TQWidget::NoFocus); setBackgroundMode(NoBackground); - connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser())); + connect(&m_moveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(swoopCloser())); TQString m = "<qt><h3>" + i18n("%1 Added").arg(widget->info().name()); @@ -218,7 +218,7 @@ void AddAppletVisualFeedback::swoopCloser() { m_moveTimer.stop(); displayInternal(); - TQTimer::singleShot(2000, this, TQT_SLOT(deleteLater())); + TQTimer::singleShot(2000, this, TQ_SLOT(deleteLater())); } } diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp index b22187443..c0eda09ab 100644 --- a/kicker/kicker/ui/addextension_mnu.cpp +++ b/kicker/kicker/ui/addextension_mnu.cpp @@ -31,8 +31,8 @@ PanelAddExtensionMenu::PanelAddExtensionMenu(TQWidget *parent, const char *name) : TQPopupMenu(parent, name) { setCheckable(true); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelAddExtensionMenu::slotAboutToShow() diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp index f1aa98023..740260d7f 100644 --- a/kicker/kicker/ui/appletop_mnu.cpp +++ b/kicker/kicker/ui/appletop_mnu.cpp @@ -169,10 +169,10 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP } if (KickerSettings::legacyKMenu()) -// insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy())); - insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQT_SLOT(toggleLegacy())); +// insertItem(SmallIcon("kickoff"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy())); + insertItem(SmallIcon("launch"), i18n("Switch to Kickoff Menu Style"), this, TQ_SLOT(toggleLegacy())); else - insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQT_SLOT(toggleLegacy())); + insertItem(SmallIcon("about_kde"), i18n("Switch to Trinity Classic Menu Style"), this, TQ_SLOT(toggleLegacy())); } if ((actions & PanelAppletOpMenu::KMenuEditor) && kapp->authorizeTDEAction("menuedit")) diff --git a/kicker/kicker/ui/browser_dlg.cpp b/kicker/kicker/ui/browser_dlg.cpp index 0e98054d8..27eb0def5 100644 --- a/kicker/kicker/ui/browser_dlg.cpp +++ b/kicker/kicker/ui/browser_dlg.cpp @@ -55,7 +55,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic hbox1->setSpacing( KDialog::spacingHint() ); TQLabel *label2 = new TQLabel( i18n ( "Path:" ), hbox1 ); pathInput = new KLineEdit( hbox1 ); - connect( pathInput, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotPathChanged( const TQString & ))); + connect( pathInput, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotPathChanged( const TQString & ))); pathInput->setText( path ); pathInput->setFocus(); @@ -69,7 +69,7 @@ PanelBrowserDialog::PanelBrowserDialog( const TQString& path, const TQString &ic else iconBtn->setIcon( icon ); - connect( browseBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( browse() ) ); + connect( browseBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( browse() ) ); } PanelBrowserDialog::~PanelBrowserDialog() diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 2082c4bb5..63ea58f1b 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/kicker/kicker/ui/browser_mnu.cpp @@ -64,12 +64,12 @@ PanelBrowserMenu::PanelBrowserMenu(TQString path, TQWidget *parent, const char * // we are not interested for dirty events on files inside the // directory (see slotClearIfNeeded) - connect( &_dirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotClearIfNeeded(const TQString&)) ); - connect( &_dirWatch, TQT_SIGNAL(created(const TQString&)), - this, TQT_SLOT(slotClear()) ); - connect( &_dirWatch, TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(slotClear()) ); + connect( &_dirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotClearIfNeeded(const TQString&)) ); + connect( &_dirWatch, TQ_SIGNAL(created(const TQString&)), + this, TQ_SLOT(slotClear()) ); + connect( &_dirWatch, TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(slotClear()) ); kdDebug() << "PanelBrowserMenu Constructor " << path << endl; } @@ -151,9 +151,9 @@ void PanelBrowserMenu::initialize() insertTitle(path()); TDEConfig *c = TDEGlobal::config(); c->setGroup("menus"); - insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQT_SLOT(slotOpenFileManager())); + insertItem(CICON("kfm"), i18n("Open in File Manager"), this, TQ_SLOT(slotOpenFileManager())); if (kapp->authorize("shell_access") && KickerSettings::showOpenInTerminal()) - insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQT_SLOT(slotOpenTerminal())); + insertItem(CICON("terminal"), i18n("Open in Terminal"), this, TQ_SLOT(slotOpenTerminal())); insertSeparator(); } @@ -334,7 +334,7 @@ void PanelBrowserMenu::initialize() if(!_mimecheckTimer) _mimecheckTimer = new TQTimer(this, "_mimecheckTimer"); - connect(_mimecheckTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMimeCheck())); + connect(_mimecheckTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMimeCheck())); _mimecheckTimer->start(0); } } @@ -398,7 +398,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e) url.setPath(path() + "/" + _filemap[id]); KURL::List files(url); KURLDrag *d = new KURLDrag(files, this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed())); d->setPixmap(iconSet(id)->pixmap()); d->drag(); } diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 0ad2107d1..8a69f0749 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/kicker/kicker/ui/client_mnu.cpp @@ -46,13 +46,13 @@ void KickerClientMenu::clear() void KickerClientMenu::insertItem( TQPixmap icon, TQString text, int id ) { - int globalid = TQPopupMenu::insertItem( icon, text, this, TQT_SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( icon, text, this, TQ_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } void KickerClientMenu::insertItem( TQString text, int id ) { - int globalid = TQPopupMenu::insertItem( text, this, TQT_SLOT( slotActivated(int) ) ); + int globalid = TQPopupMenu::insertItem( text, this, TQ_SLOT( slotActivated(int) ) ); setItemParameter( globalid, id ); } diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp index 07caa2b55..6861ba988 100644 --- a/kicker/kicker/ui/exe_dlg.cpp +++ b/kicker/kicker/ui/exe_dlg.cpp @@ -68,14 +68,14 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio updateIcon(); - connect(ui->m_exec, TQT_SIGNAL(urlSelected(const TQString &)), - this, TQT_SLOT(slotSelect(const TQString &))); - connect(ui->m_exec, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotTextChanged(const TQString &))); - connect(ui->m_exec, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(slotReturnPressed())); - connect(ui->m_icon, TQT_SIGNAL(iconChanged(TQString)), - this, TQT_SLOT(slotIconChanged(TQString))); + connect(ui->m_exec, TQ_SIGNAL(urlSelected(const TQString &)), + this, TQ_SLOT(slotSelect(const TQString &))); + connect(ui->m_exec, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotTextChanged(const TQString &))); + connect(ui->m_exec, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(slotReturnPressed())); + connect(ui->m_icon, TQ_SIGNAL(iconChanged(TQString)), + this, TQ_SLOT(slotIconChanged(TQString))); // leave decent space for the commandline resize(sizeHint().width() > 300 ? sizeHint().width() : 300, diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp index ae96ebcaa..e2e19d406 100644 --- a/kicker/kicker/ui/flipscrollview.cpp +++ b/kicker/kicker/ui/flipscrollview.cpp @@ -101,20 +101,20 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name ) addChild( mRightView ); mTimer = new TQTimer( this, "mTimer" ); - connect( mTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimer() ) ); - - connect( mLeftView, TQT_SIGNAL( startService(KService::Ptr) ), - TQT_SIGNAL( startService(KService::Ptr) ) ); - connect( mLeftView, TQT_SIGNAL( startURL(const TQString& ) ), - TQT_SIGNAL( startURL(const TQString& ) ) ); - connect( mLeftView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), - TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); - connect( mRightView, TQT_SIGNAL( startService(KService::Ptr) ), - TQT_SIGNAL( startService(KService::Ptr) ) ); - connect( mRightView, TQT_SIGNAL( startURL(const TQString& ) ), - TQT_SIGNAL( startURL(const TQString& ) ) ); - connect( mRightView, TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), - TQT_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); + connect( mTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimer() ) ); + + connect( mLeftView, TQ_SIGNAL( startService(KService::Ptr) ), + TQ_SIGNAL( startService(KService::Ptr) ) ); + connect( mLeftView, TQ_SIGNAL( startURL(const TQString& ) ), + TQ_SIGNAL( startURL(const TQString& ) ) ); + connect( mLeftView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), + TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); + connect( mRightView, TQ_SIGNAL( startService(KService::Ptr) ), + TQ_SIGNAL( startService(KService::Ptr) ) ); + connect( mRightView, TQ_SIGNAL( startURL(const TQString& ) ), + TQ_SIGNAL( startURL(const TQString& ) ) ); + connect( mRightView, TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ), + TQ_SIGNAL( rightButtonPressed(TQListViewItem*,const TQPoint&,int) ) ); // wild hack to make sure it has correct width mLeftView->setVScrollBarMode( TQScrollView::AlwaysOn ); @@ -124,7 +124,7 @@ FlipScrollView::FlipScrollView( TQWidget * parent, const char * name ) mBackrow = new BackFrame( this ); mBackrow->resize( 24, 100 ); - connect( mBackrow, TQT_SIGNAL( clicked() ), TQT_SIGNAL( backButtonClicked() ) ); + connect( mBackrow, TQ_SIGNAL( clicked() ), TQ_SIGNAL( backButtonClicked() ) ); } ItemView* FlipScrollView::prepareRightMove() diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 795535976..3107fe17a 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/kicker/kicker/ui/hidebutton.cpp @@ -38,8 +38,8 @@ HideButton::HideButton(TQWidget *parent, const char *name) { setBackgroundOrigin(AncestorOrigin); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int))); kapp->addKipcEventMask(KIPC::SettingsChanged); kapp->addKipcEventMask(KIPC::IconChanged); diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 4ab68eb55..155584ab9 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -640,11 +640,11 @@ ItemView::ItemView(TQWidget* parent, const char* name) m_lastOne = 0; m_old_contentY = -1; - connect(this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )), - TQT_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int))); + connect(this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem*, const TQPoint &, int )), + TQ_SLOT(slotItemClicked(int, TQListViewItem*, const TQPoint &, int))); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); - connect(this, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); + connect(this, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(slotItemClicked(TQListViewItem*))); new ItemViewTip( viewport(), this ); } diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 2fe75f2d5..768056473 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -87,8 +87,8 @@ PanelKMenu::PanelKMenu() disableAutoClear(); actionCollection = new TDEActionCollection(this); setCaption(i18n("TDE Menu")); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(configChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(configChanged())); DCOPClient *dcopClient = TDEApplication::dcopClient(); dcopClient->connectDCOPSignal(0, "appLauncher", "serviceStartedByStorageId(TQString,TQString)", @@ -96,7 +96,7 @@ PanelKMenu::PanelKMenu() "slotServiceStartedByStorageId(TQString,TQString)", false); displayRepairTimer = new TQTimer( this ); - connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) ); + connect( displayRepairTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(repairDisplay()) ); } PanelKMenu::~PanelKMenu() @@ -127,7 +127,7 @@ void PanelKMenu::hideMenu() while (isShown() == true) kapp->eventLoop()->processEvents(1000); TQTimer *windowtimer = new TQTimer( this ); - connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( windowtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; windowtimer->start( 0, TRUE ); // Wait for all window system events to be processed while (windowTimerTimedOut == false) @@ -140,7 +140,7 @@ void PanelKMenu::hideMenu() // thereby removing a bad shutdown screen artifact while still providing // a somewhat snappy user interface. TQTimer *delaytimer = new TQTimer( this ); - connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) ); + connect( delaytimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(windowClearTimeout()) ); windowTimerTimedOut = false; delaytimer->start( 100, TRUE ); // Wait for 100 milliseconds while (windowTimerTimedOut == false) @@ -247,10 +247,10 @@ void PanelKMenu::initialize() if (loadSidePixmap()) { // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); } else { @@ -286,13 +286,13 @@ void PanelKMenu::initialize() hbox->setFocusPolicy(TQWidget::StrongFocus); hbox->setFocusProxy(searchEdit); hbox->setSpacing( 3 ); - connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClearSearch())); - connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT( slotUpdateSearch( const TQString&))); + connect(clearButton, TQ_SIGNAL(clicked()), searchEdit, TQ_SLOT(clear())); + connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClearSearch())); + connect(searchEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT( slotUpdateSearch( const TQString&))); accel->insert("search", i18n("Search"), i18n("TDE Menu search"), TDEShortcut(KickerSettings::searchShortcut()), - this, TQT_SLOT(slotFocusSearch())); + this, TQ_SLOT(slotFocusSearch())); insertItem(hbox, searchLineID, 0); } else { @@ -390,7 +390,7 @@ void PanelKMenu::initialize() insertItem(KickerLib::menuIconSet("system-run"), i18n("Run Command..."), this, - TQT_SLOT( slotRunCommand())); + TQ_SLOT( slotRunCommand())); insertSeparator(); } @@ -398,8 +398,8 @@ void PanelKMenu::initialize() { sessionsMenu = new TQPopupMenu( this ); insertItem(KickerLib::menuIconSet("switchuser"), i18n("Switch User"), sessionsMenu); - connect( sessionsMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotPopulateSessions()) ); - connect( sessionsMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSessionActivated(int)) ); + connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) ); + connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) ); } /* @@ -409,17 +409,17 @@ void PanelKMenu::initialize() ksmserver.setGroup("General"); if (ksmserver.readEntry( "loginMode" ) == "restoreSavedSession") { - insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQT_SLOT(slotSaveSession())); + insertItem(KickerLib::menuIconSet("document-save"), i18n("Save Session"), this, TQ_SLOT(slotSaveSession())); } if (kapp->authorize("lock_screen")) { - insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQT_SLOT(slotLock())); + insertItem(KickerLib::menuIconSet("system-lock-screen"), i18n("Lock Session"), this, TQ_SLOT(slotLock())); } if (kapp->authorize("logout")) { - insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQT_SLOT(slotLogout())); + insertItem(KickerLib::menuIconSet("system-log-out"), i18n("Log Out..."), this, TQ_SLOT(slotLogout())); } #if 0 @@ -726,7 +726,7 @@ void PanelKMenu::slotUpdateSearch(const TQString& searchString) void PanelKMenu::slotClearSearch() { if (searchEdit && searchEdit->text().isEmpty() == false) { - TQTimer::singleShot(0, searchEdit, TQT_SLOT(clear())); + TQTimer::singleShot(0, searchEdit, TQ_SLOT(clear())); } } diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 569bd1d8c..834086f33 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -206,15 +206,15 @@ KMenu::KMenu() m_iconName(TQString()), m_orientation(UnDetermined), m_search_plugin( 0 ) { setMouseTracking(true); - connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout())); + connect(&m_sloppyTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotSloppyTimeout())); // set the first client id to some arbitrarily large value. client_id = 10000; // Don't automatically clear the main menu. actionCollection = new TDEActionCollection(this); - connect(Kicker::the(), TQT_SIGNAL(configurationChanged()), - this, TQT_SLOT(configChanged())); + connect(Kicker::the(), TQ_SIGNAL(configurationChanged()), + this, TQ_SLOT(configChanged())); KUser * user = new KUser(); @@ -236,7 +236,7 @@ KMenu::KMenu() m_userInfo->setPaletteForegroundColor( userInfoColor ); m_tabBar = new KickoffTabBar(this, "m_tabBar"); - connect(m_tabBar, TQT_SIGNAL(tabClicked(TQTab*)), TQT_SLOT(tabClicked(TQTab*))); + connect(m_tabBar, TQ_SIGNAL(tabClicked(TQTab*)), TQ_SLOT(tabClicked(TQTab*))); const int tab_icon_size = 32; @@ -284,8 +284,8 @@ KMenu::KMenu() m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size)); } - connect(m_tabBar, TQT_SIGNAL(selected(int)), m_stacker, TQT_SLOT(raiseWidget(int))); - connect(m_stacker, TQT_SIGNAL(aboutToShow(int)), m_tabBar, TQT_SLOT(setCurrentTab(int))); + connect(m_tabBar, TQ_SIGNAL(selected(int)), m_stacker, TQ_SLOT(raiseWidget(int))); + connect(m_stacker, TQ_SIGNAL(aboutToShow(int)), m_tabBar, TQ_SLOT(setCurrentTab(int))); m_favoriteView = new FavoritesItemView (m_stacker, "m_favoriteView"); m_favoriteView->setAcceptDrops(true); @@ -300,11 +300,11 @@ KMenu::KMenu() m_browserView = new FlipScrollView(m_stacker, "m_browserView"); m_stacker->addWidget(m_browserView, ApplicationsTab); - connect( m_browserView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoBack() ) ); + connect( m_browserView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoBack() ) ); m_exitView = new FlipScrollView(m_stacker, "m_exitView"); m_stacker->addWidget(m_exitView, LeaveTab); - connect( m_exitView, TQT_SIGNAL( backButtonClicked() ), TQT_SLOT( slotGoExitMainMenu() ) ); + connect( m_exitView, TQ_SIGNAL( backButtonClicked() ), TQ_SLOT( slotGoExitMainMenu() ) ); m_searchWidget = new TQVBox (m_stacker, "m_searchWidget"); m_searchWidget->setSpacing(0); @@ -341,40 +341,40 @@ KMenu::KMenu() m_searchActions->setMaximumHeight(5+m_searchInternet->height()); - connect(m_searchActions, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchActions, TQT_SIGNAL(returnPressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchActions, TQT_SIGNAL(spacePressed(TQListViewItem*)), TQT_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(returnPressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); + connect(m_searchActions, TQ_SIGNAL(spacePressed(TQListViewItem*)), TQ_SLOT(searchActionClicked(TQListViewItem*))); - connect(m_searchResultsWidget, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_searchResultsWidget, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_searchResultsWidget, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_searchResultsWidget, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_searchResultsWidget, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_searchResultsWidget, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_recentlyView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_recentlyView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_recentlyView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_recentlyView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_recentlyView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_recentlyView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_favoriteView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_favoriteView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_favoriteView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_favoriteView, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQT_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); + connect(m_favoriteView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_favoriteView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_favoriteView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_favoriteView, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), TQ_SLOT(slotFavoritesMoved( TQListViewItem*, TQListViewItem*, TQListViewItem* ))); - connect(m_systemView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_systemView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_systemView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_systemView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_systemView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_systemView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_browserView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotGoSubMenu(const TQString&))); - connect(m_browserView, TQT_SIGNAL(startService(KService::Ptr)), TQT_SLOT(slotStartService(KService::Ptr))); - connect(m_browserView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_browserView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotGoSubMenu(const TQString&))); + connect(m_browserView, TQ_SIGNAL(startService(KService::Ptr)), TQ_SLOT(slotStartService(KService::Ptr))); + connect(m_browserView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); - connect(m_exitView, TQT_SIGNAL(startURL(const TQString&)), TQT_SLOT(slotStartURL(const TQString&))); - connect(m_exitView, TQT_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQT_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); + connect(m_exitView, TQ_SIGNAL(startURL(const TQString&)), TQ_SLOT(slotStartURL(const TQString&))); + connect(m_exitView, TQ_SIGNAL(rightButtonPressed( TQListViewItem*, const TQPoint &, int )), TQ_SLOT(slotContextMenuRequested( TQListViewItem*, const TQPoint &, int ))); m_kcommand->setDuplicatesEnabled( false ); m_kcommand->setLineEdit(new KLineEdit(m_kcommand, "m_kcommand-lineedit")); m_kcommand->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - connect(m_kcommand, TQT_SIGNAL(cleared()), TQT_SLOT(clearedHistory())); - connect(m_kcommand->lineEdit(), TQT_SIGNAL(returnPressed()), TQT_SLOT(searchAccept())); - connect(m_kcommand->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(searchChanged(const TQString &))); + connect(m_kcommand, TQ_SIGNAL(cleared()), TQ_SLOT(clearedHistory())); + connect(m_kcommand->lineEdit(), TQ_SIGNAL(returnPressed()), TQ_SLOT(searchAccept())); + connect(m_kcommand->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(searchChanged(const TQString &))); // URI Filter meta object... m_filterData = new KURIFilterData(); @@ -383,14 +383,14 @@ KMenu::KMenu() categorised_hit_total = new int [num_categories]; input_timer = new TQTimer (this, "input_timer"); - connect( input_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doQuery()) ); + connect( input_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doQuery()) ); init_search_timer = new TQTimer (this, "init_search_timer"); - connect( init_search_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initSearch()) ); + connect( init_search_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(initSearch()) ); init_search_timer->start(2000, true); - connect( m_favoriteView, TQT_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ), - TQT_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) ); + connect( m_favoriteView, TQ_SIGNAL( dropped (TQDropEvent *, TQListViewItem * ) ), + TQ_SLOT( slotFavDropped( TQDropEvent *, TQListViewItem * ) ) ); this->installEventFilter(this); m_tabBar->installEventFilter(this); @@ -453,7 +453,7 @@ void KMenu::setupUi() // m_stacker->setFocusPolicy( TQWidget::StrongFocus ); m_stacker->setLineWidth( 0 ); m_stacker->setFocusPolicy(TQWidget::NoFocus); - connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*))); + connect(m_stacker, TQ_SIGNAL(aboutToShow(TQWidget*)), TQ_SLOT(stackWidgetRaised(TQWidget*))); m_kcommand->setName("m_kcommand"); } @@ -1225,17 +1225,17 @@ void KMenu::initialize() kdDebug(1210) << "KMenu::initialize()" << endl; // in case we've been through here before, let's disconnect - disconnect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + disconnect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); /* If the user configured ksmserver to */ TDEConfig ksmserver("ksmserverrc", false, false); ksmserver.setGroup("General"); - connect( m_branding, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenHomepage())); + connect( m_branding, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenHomepage())); m_tabBar->setTabEnabled(LeaveTab, kapp->authorize("logout")); // load search field history @@ -1446,10 +1446,10 @@ void KMenu::insertStaticItems() "remote:/", "remote:/", nId++, index++ ); m_mediaWatcher = new MediaWatcher( this ); - connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) ); + connect( m_mediaWatcher, TQ_SIGNAL( mediumChanged() ), TQ_SLOT( updateMedia() ) ); m_media_id = 0; - connect(&m_mediaFreeTimer, TQT_SIGNAL(timeout()), TQT_SLOT( updateMedia())); + connect(&m_mediaFreeTimer, TQ_SIGNAL(timeout()), TQ_SLOT( updateMedia())); } int KMenu::insertClientMenu(KickerClientMenu *) @@ -2795,7 +2795,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos } m_popupMenu = new TDEPopupMenu(this); - connect(m_popupMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); + connect(m_popupMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int))); bool hasEntries = false; m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title()); diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp index a7bc609a6..4ce3c4ea0 100644 --- a/kicker/kicker/ui/removeapplet_mnu.cpp +++ b/kicker/kicker/ui/removeapplet_mnu.cpp @@ -37,8 +37,8 @@ PanelRemoveAppletMenu::PanelRemoveAppletMenu(ContainerArea* cArea, const char *name) : TQPopupMenu(parent, name), m_containerArea(cArea) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelRemoveAppletMenu::slotAboutToShow() @@ -81,7 +81,7 @@ void PanelRemoveAppletMenu::slotAboutToShow() if (m_containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removebutton_mnu.cpp b/kicker/kicker/ui/removebutton_mnu.cpp index 819eff533..6617975f5 100644 --- a/kicker/kicker/ui/removebutton_mnu.cpp +++ b/kicker/kicker/ui/removebutton_mnu.cpp @@ -40,8 +40,8 @@ PanelRemoveButtonMenu::PanelRemoveButtonMenu( ContainerArea* cArea, TQWidget *parent, const char *name ) : TQPopupMenu( parent, name ), containerArea( cArea ) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } void PanelRemoveButtonMenu::addToContainers(const TQString& type) @@ -89,7 +89,7 @@ void PanelRemoveButtonMenu::slotAboutToShow() if (containers.count() > 1) { insertSeparator(); - insertItem(i18n("All"), this, TQT_SLOT(slotRemoveAll()), 0, id); + insertItem(i18n("All"), this, TQ_SLOT(slotRemoveAll()), 0, id); } } diff --git a/kicker/kicker/ui/removecontainer_mnu.cpp b/kicker/kicker/ui/removecontainer_mnu.cpp index 1b30506cc..a447b4d66 100644 --- a/kicker/kicker/ui/removecontainer_mnu.cpp +++ b/kicker/kicker/ui/removecontainer_mnu.cpp @@ -44,7 +44,7 @@ RemoveContainerMenu::RemoveContainerMenu( ContainerArea* cArea, buttonId = insertItem(i18n("Appli&cation"), new PanelRemoveButtonMenu( containerArea, this ) ); adjustSize(); - connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); + connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); } RemoveContainerMenu::~RemoveContainerMenu() diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp index 829dfab5c..ef345921d 100644 --- a/kicker/kicker/ui/removeextension_mnu.cpp +++ b/kicker/kicker/ui/removeextension_mnu.cpp @@ -37,8 +37,8 @@ static const int REMOVEALLID = 1000; PanelRemoveExtensionMenu::PanelRemoveExtensionMenu( TQWidget *parent, const char *name ) : TQPopupMenu( parent, name ) { - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); } PanelRemoveExtensionMenu::PanelRemoveExtensionMenu() diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index 0e8a8ce99..e661ee1ea 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/kicker/kicker/ui/service_mnu.cpp @@ -68,10 +68,10 @@ PanelServiceMenu::PanelServiceMenu(const TQString & label, const TQString & relP { excludeNoDisplay_=true; - connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), - TQT_SLOT(slotClearOnClose())); - connect(this, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(slotClose())); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSetTooltip(int))); + connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()), + TQ_SLOT(slotClearOnClose())); + connect(this, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(slotClose())); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSetTooltip(int))); } PanelServiceMenu::~PanelServiceMenu() @@ -378,7 +378,7 @@ void PanelServiceMenu::doInitialize() if (relPath_ == "") { insertItem(KickerLib::menuIconSet("application-x-executable"), i18n("Add Non-TDE Application"), - this, TQT_SLOT(addNonKDEApp())); + this, TQ_SLOT(addNonKDEApp())); } if (list.count() > 0) { @@ -590,7 +590,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev) delete popupMenu_; popupMenu_ = new TDEPopupMenu(this); - connect(popupMenu_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContextMenu(int))); + connect(popupMenu_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContextMenu(int))); bool hasEntries = false; switch (contextKSycocaEntry_->sycocaType()) @@ -814,7 +814,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev) // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); @@ -857,7 +857,7 @@ void PanelServiceMenu::slotDragObjectDestroyed() // the execution of any code after the original exec() statement // though the panels themselves continue on otherwise normally // (we just have some sort of nested event loop) - TQTimer::singleShot(0, this, TQT_SLOT(close())); + TQTimer::singleShot(0, this, TQ_SLOT(close())); } } @@ -898,7 +898,7 @@ void PanelServiceMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - TQTimer::singleShot(100, this, TQT_SLOT(slotClear())); + TQTimer::singleShot(100, this, TQ_SLOT(slotClear())); return; } diff --git a/kicker/libkicker/kickertip.cpp b/kicker/libkicker/kickertip.cpp index a491aae27..c896c830a 100644 --- a/kicker/libkicker/kickertip.cpp +++ b/kicker/libkicker/kickertip.cpp @@ -80,9 +80,9 @@ KickerTip::KickerTip(TQWidget * parent) setBackgroundMode(NoBackground); resize(0, 0); hide(); - connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate())); + connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate())); // // FIXME: The settingsChanged(SettingsCategory) signal is not available under Trinity; where was it originally supposed to come from? -// connect(kapp, TQT_SIGNAL(settingsChanged(SettingsCategory)), TQT_SLOT(slotSettingsChanged())); +// connect(kapp, TQ_SIGNAL(settingsChanged(SettingsCategory)), TQ_SLOT(slotSettingsChanged())); } KickerTip::~KickerTip() @@ -176,8 +176,8 @@ void KickerTip::display() // close the message window after given mS if (data.duration > 0) { - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide())); m_timer.start(data.duration, true); } else @@ -424,16 +424,16 @@ void KickerTip::tipFor(const TQWidget* w) { if (m_tippingFor) { - disconnect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(tipperDestroyed(TQObject*))); + disconnect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(tipperDestroyed(TQObject*))); } m_tippingFor = w; if (m_tippingFor) { - connect(m_tippingFor, TQT_SIGNAL(destroyed(TQObject*)), - this, TQT_SLOT(tipperDestroyed(TQObject*))); + connect(m_tippingFor, TQ_SIGNAL(destroyed(TQObject*)), + this, TQ_SLOT(tipperDestroyed(TQObject*))); } } @@ -526,8 +526,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) tipFor(widget); m_timer.stop(); - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(display())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(display())); // delay to avoid false starts // e.g. when the user quickly zooms their mouse over @@ -547,8 +547,8 @@ bool KickerTip::eventFilter(TQObject *object, TQEvent *event) if (isTippingFor(widget) && isVisible()) { - disconnect(&m_timer, TQT_SIGNAL(timeout()), 0, 0); - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(hide())); + disconnect(&m_timer, TQ_SIGNAL(timeout()), 0, 0); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(hide())); m_timer.start(KickerSettings::mouseOversHideDelay(), true); } diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index aef83bbb3..0708d0b5f 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/kicker/libkicker/panelbutton.cpp @@ -93,8 +93,8 @@ PanelButton::PanelButton( TQWidget* parent, const char* name, bool forceStandard installEventFilter(KickerTip::the()); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(updateSettings(int))); - connect(kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(updateIcon(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(updateSettings(int))); + connect(kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(updateIcon(int))); } void PanelButton::configure() @@ -245,7 +245,7 @@ void PanelButton::checkForDeletion(const TQString& path) if (path == m_backingFile) { setEnabled(false); - TQTimer::singleShot(1000, this, TQT_SLOT(scheduleForRemoval())); + TQTimer::singleShot(1000, this, TQ_SLOT(scheduleForRemoval())); } } @@ -278,7 +278,7 @@ void PanelButton::scheduleForRemoval() } timelapse *= 2; - TQTimer::singleShot(timelapse, this, TQT_SLOT(scheduleForRemoval())); + TQTimer::singleShot(timelapse, this, TQ_SLOT(scheduleForRemoval())); } } @@ -833,16 +833,16 @@ void PanelButton::backedByFile(const TQString& localFilePath) } // avoid multiple connections - disconnect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(checkForDeletion(const TQString&))); + disconnect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(checkForDeletion(const TQString&))); if (!KDirWatch::self()->contains(m_backingFile)) { KDirWatch::self()->addFile(m_backingFile); } - connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(checkForDeletion(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(checkForDeletion(const TQString&))); } @@ -966,7 +966,7 @@ PanelPopupButton::PanelPopupButton(TQWidget *parent, const char *name, bool forc m_pressedDuringPopup(false), m_initialized(false) { - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotExecMenu())); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotExecMenu())); } void PanelPopupButton::setPopup(TQWidget *popup) @@ -974,7 +974,7 @@ void PanelPopupButton::setPopup(TQWidget *popup) if (m_popup) { m_popup->removeEventFilter(this); - disconnect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); + disconnect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide())); } m_popup = popup; @@ -983,7 +983,7 @@ void PanelPopupButton::setPopup(TQWidget *popup) if (m_popup) { m_popup->installEventFilter(this); - connect(m_popup, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(menuAboutToHide())); + connect(m_popup, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(menuAboutToHide())); } } diff --git a/kicker/libkicker/panner.cpp b/kicker/libkicker/panner.cpp index a868747fb..0401cfcdc 100644 --- a/kicker/libkicker/panner.cpp +++ b/kicker/libkicker/panner.cpp @@ -46,7 +46,7 @@ Panner::Panner( TQWidget* parent, const char* name ) setBackgroundOrigin( AncestorOrigin ); _updateScrollButtonsTimer = new TQTimer(this); - connect(_updateScrollButtonsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reallyUpdateScrollButtons())); + connect(_updateScrollButtonsTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reallyUpdateScrollButtons())); _clipper = new TQWidget(this); _clipper->setBackgroundOrigin(AncestorOrigin); @@ -78,8 +78,8 @@ void Panner::createScrollButtons() _luSB->setMinimumSize(12, 12); _luSB->hide(); _layout->addWidget(_luSB); - connect(_luSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollLeftUp())); - connect(_luSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); + connect(_luSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollLeftUp())); + connect(_luSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll())); // right/down scroll button _rdSB = new SimpleArrowButton(this); @@ -88,8 +88,8 @@ void Panner::createScrollButtons() _rdSB->setMinimumSize(12, 12); _rdSB->hide(); _layout->addWidget(_rdSB); - connect(_rdSB, TQT_SIGNAL(pressed()), TQT_SLOT(startScrollRightDown())); - connect(_rdSB, TQT_SIGNAL(released()), TQT_SLOT(stopScroll())); + connect(_rdSB, TQ_SIGNAL(pressed()), TQ_SLOT(startScrollRightDown())); + connect(_rdSB, TQ_SIGNAL(released()), TQ_SLOT(stopScroll())); // set up the buttons setupButtons(); @@ -170,7 +170,7 @@ void Panner::scrollLeftUp() void Panner::startScrollRightDown() { _scrollTimer = new TQTimer(this); - connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollRightDown())); + connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollRightDown())); _scrollTimer->start(50); _step = 8; scrollRightDown(); @@ -179,7 +179,7 @@ void Panner::startScrollRightDown() void Panner::startScrollLeftUp() { _scrollTimer = new TQTimer(this); - connect(_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(scrollLeftUp())); + connect(_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(scrollLeftUp())); _scrollTimer->start(50); _step = 8; scrollLeftUp(); diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index c53d6ce5a..79fd19915 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/kicker/libkicker/simplebutton.cpp @@ -47,10 +47,10 @@ SimpleButton::SimpleButton(TQWidget *parent, const char *name, bool forceStandar { setBackgroundOrigin( AncestorOrigin ); - connect( kapp, TQT_SIGNAL( settingsChanged( int ) ), - TQT_SLOT( slotSettingsChanged( int ) ) ); - connect( kapp, TQT_SIGNAL( iconChanged( int ) ), - TQT_SLOT( slotIconChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged( int ) ), + TQ_SLOT( slotSettingsChanged( int ) ) ); + connect( kapp, TQ_SIGNAL( iconChanged( int ) ), + TQ_SLOT( slotIconChanged( int ) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); kapp->addKipcEventMask( KIPC::IconChanged ); diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index 4238fc562..089a8ac93 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/kicker/menuext/kate/katesessionmenu.cpp @@ -117,7 +117,7 @@ void KateSessionMenu::initialize() // means for updating, to let the user manually update if he/she added new sessions. insertSeparator(); - insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQT_SLOT(reloadSessionsList()) ); + insertItem( SmallIconSet("reload"), i18n("Reload Session List"), this, TQ_SLOT(reloadSessionsList()) ); } void KateSessionMenu::slotExec( int id ) diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index c9439c8db..2e196186f 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/kicker/menuext/konsole/konsole_mnu.cpp @@ -150,8 +150,8 @@ void KonsoleMenu::initialize() insertItem(SmallIconSet("keditbookmarks"), i18n("New Session at Bookmark"), m_bookmarksSession); connect(m_bookmarkHandlerSession, - TQT_SIGNAL(openURL(const TQString&, const TQString&)), - TQT_SLOT(newSession(const TQString&, const TQString&))); + TQ_SIGNAL(openURL(const TQString&, const TQString&)), + TQ_SLOT(newSession(const TQString&, const TQString&))); screenList.clear(); @@ -229,11 +229,11 @@ void KonsoleMenu::initialize() // we don't have any profiles, disable the menu setItemEnabled(profileID, false); } - connect(m_profileMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(launchProfile(int))); + connect(m_profileMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(launchProfile(int))); insertSeparator(); insertItem(SmallIconSet("reload"), - i18n("Reload Sessions"), this, TQT_SLOT(reinitialize())); + i18n("Reload Sessions"), this, TQ_SLOT(reinitialize())); } void KonsoleMenu::slotExec(int id) diff --git a/kicker/menuext/konsole/konsolebookmarkhandler.cpp b/kicker/menuext/konsole/konsolebookmarkhandler.cpp index 9ace6483e..b2249d858 100644 --- a/kicker/menuext/konsole/konsolebookmarkhandler.cpp +++ b/kicker/menuext/konsole/konsolebookmarkhandler.cpp @@ -38,8 +38,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( KonsoleMenu *konsole, bool ) manager->setUpdate( true ); manager->setShowNSBookmarks( false ); - connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); + connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu, NULL, false, /*Not toplevel*/ false /*No 'Add Bookmark'*/ ); @@ -62,13 +62,13 @@ void KonsoleBookmarkHandler::importOldBookmarks( const TQString& path, KNSBookmarkImporter importer( path ); connect( &importer, - TQT_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )), - TQT_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& ))); + TQ_SIGNAL( newBookmark( const TQString&, const TQCString&, const TQString& )), + TQ_SLOT( slotNewBookmark( const TQString&, const TQCString&, const TQString& ))); connect( &importer, - TQT_SIGNAL( newFolder( const TQString&, bool, const TQString& )), - TQT_SLOT( slotNewFolder( const TQString&, bool, const TQString& ))); - connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() )); - connect( &importer, TQT_SIGNAL( endMenu() ), TQT_SLOT( endMenu() )); + TQ_SIGNAL( newFolder( const TQString&, bool, const TQString& )), + TQ_SLOT( slotNewFolder( const TQString&, bool, const TQString& ))); + connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() )); + connect( &importer, TQ_SIGNAL( endMenu() ), TQ_SLOT( endMenu() )); importer.parseNSBookmarks( false ); diff --git a/kicker/menuext/konsole/konsolebookmarkmenu.cpp b/kicker/menuext/konsole/konsolebookmarkmenu.cpp index 52588ed72..840b3b8f6 100644 --- a/kicker/menuext/konsole/konsolebookmarkmenu.cpp +++ b/kicker/menuext/konsole/konsolebookmarkmenu.cpp @@ -31,14 +31,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, /* * First, we disconnect KBookmarkMenu::slotAboutToShow() * Then, we connect KonsoleBookmarkMenu::slotAboutToShow(). - * They are named differently because the TQT_SLOT() macro thinks we want + * They are named differently because the TQ_SLOT() macro thinks we want * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow() * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu? */ - disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( slotAboutToShow() ) ); - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow2() ) ); + disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow2() ) ); } /* @@ -100,8 +100,8 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() m_actionCollection, false, m_bAddBookmark, TQString::null ); m_lstSubMenus.append(subMenu); - connect( actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, - TQT_SLOT(slotNSLoad())); + connect( actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu, + TQ_SLOT(slotNSLoad())); } } @@ -128,7 +128,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name TDEAction * action = new TDEAction( text, bm.icon(), 0, - this, TQT_SLOT( slotBookmarkSelected() ), + this, TQ_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); action->setStatusText( bm.url().prettyURL() ); diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 2ab6afc2c..5440c1ed7 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/kicker/menuext/prefmenu/prefmenu.cpp @@ -60,11 +60,11 @@ PrefMenu::PrefMenu(const TQString& label, { m_subMenus.setAutoDelete(true); - connect(KSycoca::self(), TQT_SIGNAL(databaseChanged()), - this, TQT_SLOT(clearOnClose())); + connect(KSycoca::self(), TQ_SIGNAL(databaseChanged()), + this, TQ_SLOT(clearOnClose())); - connect(this, TQT_SIGNAL(aboutToHide()), - this, TQT_SLOT(aboutToClose())); + connect(this, TQ_SIGNAL(aboutToHide()), + this, TQ_SLOT(aboutToClose())); } PrefMenu::~PrefMenu() @@ -198,7 +198,7 @@ void PrefMenu::mouseMoveEvent(TQMouseEvent * ev) // If the path to the desktop file is relative, try to get the full // path from KStdDirs. KURLDrag *d = new KURLDrag(KURL::List(url), this); - connect(d, TQT_SIGNAL(destroyed()), this, TQT_SLOT(dragObjectDestroyed())); + connect(d, TQ_SIGNAL(destroyed()), this, TQ_SLOT(dragObjectDestroyed())); d->setPixmap(icon); d->dragCopy(); @@ -246,7 +246,7 @@ void PrefMenu::initialize() { insertItem(KickerLib::menuIconSet("kcontrol"), i18n("Trinity Control Center"), - this, TQT_SLOT(launchControlCenter())); + this, TQ_SLOT(launchControlCenter())); insertSeparator(); } @@ -358,7 +358,7 @@ void PrefMenu::slotClear() // QPopupMenu's aboutToHide() is emitted before the popup is really hidden, // and also before a click in the menu is handled, so do the clearing // only after that has been handled - TQTimer::singleShot( 100, this, TQT_SLOT( slotClear())); + TQTimer::singleShot( 100, this, TQ_SLOT( slotClear())); return; } diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index ae4137017..90c84ee32 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/kicker/menuext/recentdocs/recentdocsmenu.cpp @@ -52,7 +52,7 @@ RecentDocsMenu::~RecentDocsMenu() void RecentDocsMenu::initialize() { if (initialized()) clear(); - insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQT_SLOT(slotClearHistory())); + insertItem(SmallIconSet("history_clear"), i18n("Clear History"), this, TQ_SLOT(slotClearHistory())); insertSeparator(); _fileList = TDERecentDocument::recentDocuments(); diff --git a/kicker/menuext/remote/remotemenu.cpp b/kicker/menuext/remote/remotemenu.cpp index aeaff8e94..8c0a8407a 100644 --- a/kicker/menuext/remote/remotemenu.cpp +++ b/kicker/menuext/remote/remotemenu.cpp @@ -68,9 +68,9 @@ void RemoteMenu::initialize() } id = insertItem(SmallIcon("wizard"), i18n("Add Network Folder")); - connectItem(id, this, TQT_SLOT(startWizard())); + connectItem(id, this, TQ_SLOT(startWizard())); id = insertItem(SmallIcon("kfm"), i18n("Manage Network Folders")); - connectItem(id, this, TQT_SLOT(openRemoteDir())); + connectItem(id, this, TQ_SLOT(openRemoteDir())); insertSeparator(); diff --git a/kicker/menuext/system/systemmenu.cpp b/kicker/menuext/system/systemmenu.cpp index 12ec087d8..e738e7af9 100644 --- a/kicker/menuext/system/systemmenu.cpp +++ b/kicker/menuext/system/systemmenu.cpp @@ -32,8 +32,8 @@ SystemMenu::SystemMenu(TQWidget *parent, const char *name, const TQStringList &/*args*/) : KPanelMenu( parent, name) { - connect( &m_dirLister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); + connect( &m_dirLister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); m_dirLister.openURL(KURL("system:/")); } diff --git a/kicker/menuext/tom/tom.cpp b/kicker/menuext/tom/tom.cpp index ed07468de..973c52ee9 100644 --- a/kicker/menuext/tom/tom.cpp +++ b/kicker/menuext/tom/tom.cpp @@ -217,7 +217,7 @@ void TOM::initializeRecentDocs() { m_recentDocsMenu->clear(); m_recentDocsMenu->insertItem(SmallIconSet("history_clear"), i18n("Clear History"), - this, TQT_SLOT(clearRecentDocHistory())); + this, TQ_SLOT(clearRecentDocHistory())); m_recentDocsMenu->insertSeparator(); m_recentDocURLs = TDERecentDocument::recentDocuments(); @@ -365,13 +365,13 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) return 0; } - connect(taskGroup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(runTask(int))); + connect(taskGroup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(runTask(int))); // so we have an actual task group menu with tasks, let's add it if (inSubMenu) { - TQObject::connect(taskGroup, TQT_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), - this, TQT_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); + TQObject::connect(taskGroup, TQ_SIGNAL(aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*)), + this, TQ_SLOT(contextualizeRMBmenu(TDEPopupMenu*, int, TQPopupMenu*))); m_submenus.append(taskGroup); @@ -389,7 +389,7 @@ int TOM::appendTaskGroup(TDEConfig& config, bool inSubMenu) rmbMenu->insertItem(title, contextMenuTitleID); rmbMenu->insertItem(i18n("Add This Task to Panel")); rmbMenu->insertItem(i18n("Modify This Task...")); - rmbMenu->insertItem(i18n("Remove This Task..."), this, TQT_SLOT(removeTask())); + rmbMenu->insertItem(i18n("Remove This Task..."), this, TQ_SLOT(removeTask())); rmbMenu->insertItem(i18n("Insert New Task...")); } } @@ -432,7 +432,7 @@ void TOM::initialize() } else { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); }*/ // TASKS @@ -486,7 +486,7 @@ void TOM::initialize() } else if (kapp->authorize("run_command")) { - insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); + insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } // RECENTLY USED ITEMS @@ -494,8 +494,8 @@ void TOM::initialize() m_recentDocsMenu = new TDEPopupMenu(this, "recentDocs"); m_recentDocsMenu->setFont(m_largerFont); - connect(m_recentDocsMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(initializeRecentDocs())); - connect(m_recentDocsMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(openRecentDocument(int))); + connect(m_recentDocsMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(initializeRecentDocs())); + connect(m_recentDocsMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(openRecentDocument(int))); insertItem(DesktopIcon("text-x-generic", TDEIcon::SizeMedium), i18n("Recent Documents"), m_recentDocsMenu); m_submenus.append(m_recentDocsMenu); @@ -512,7 +512,7 @@ void TOM::initialize() // if we have no destinations, put the run command here if (numDests == 0 && kapp->authorize("run_command")) { - insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQT_SLOT(runCommand())); + insertItem(DesktopIcon("system-run", TDEIcon::SizeMedium), i18n("Run Command..."), this, TQ_SLOT(runCommand())); } @@ -564,7 +564,7 @@ void TOM::initialize() } insertItem(DesktopIcon("system-log-out", TDEIcon::SizeMedium), - i18n("Logout %1").arg(username), this, TQT_SLOT(logout())); + i18n("Logout %1").arg(username), this, TQ_SLOT(logout())); } void TOM::reload() diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index ac2f969d8..daf6312d9 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -197,9 +197,9 @@ void AppletProxy::loadApplet(const TQString& desktopFile, const TQString& config } // connect updateLayout signal - connect(_applet, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); + connect(_applet, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); // connect requestFocus signal - connect(_applet, TQT_SIGNAL(requestFocus()), TQT_SLOT(slotRequestFocus())); + connect(_applet, TQ_SIGNAL(requestFocus()), TQ_SLOT(slotRequestFocus())); } KPanelApplet* AppletProxy::loadApplet(const AppletInfo& info) @@ -258,8 +258,8 @@ void AppletProxy::dock(const TQCString& callbackID) DCOPClient* dcop = kapp->dcopClient(); dcop->setNotifications(true); - connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(slotApplicationRemoved(const TQCString&))); + connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(slotApplicationRemoved(const TQCString&))); WId win; diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index c210e7b9e..e91d7ac7f 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/kicker/proxy/extensiondebugger.cpp @@ -129,7 +129,7 @@ int main( int argc, char ** argv ) ExtensionContainer *container = new ExtensionContainer( extension ); container->show(); - TQObject::connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) ); + TQObject::connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); int result = a.exec(); @@ -143,8 +143,8 @@ ExtensionContainer::ExtensionContainer( KPanelExtension *extension, TQWidget *pa ( new TQVBoxLayout( this ) )->setAutoAdd( true ); TQPushButton *configButton = new TQPushButton( i18n( "Configure..." ), this ); - connect( configButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( showPreferences() ) ); + connect( configButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( showPreferences() ) ); m_extension->reparent( this, TQPoint( 0, 0 ) ); } diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index 13c40e67b..4168bc14a 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/kicker/proxy/extensionproxy.cpp @@ -161,7 +161,7 @@ void ExtensionProxy::loadExtension(const TQCString& desktopFile, const TQCString } // connect updateLayout signal - connect(_extension, TQT_SIGNAL(updateLayout()), TQT_SLOT(slotUpdateLayout())); + connect(_extension, TQ_SIGNAL(updateLayout()), TQ_SLOT(slotUpdateLayout())); } KPanelExtension* ExtensionProxy::loadExtension(const AppletInfo& info) @@ -198,8 +198,8 @@ void ExtensionProxy::dock(const TQCString& callbackID) DCOPClient* dcop = kapp->dcopClient(); dcop->setNotifications(true); - connect(dcop, TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT(slotApplicationRemoved(const TQCString&))); + connect(dcop, TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT(slotApplicationRemoved(const TQCString&))); WId win; diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 81f54f25b..ac0133668 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -92,24 +92,24 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin // configure configure(); - connect(&m_relayoutTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(reLayout())); + connect(&m_relayoutTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(reLayout())); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(setBackground())); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(setBackground())); // connect manager - connect(TaskManager::the(), TQT_SIGNAL(taskAdded(Task::Ptr)), - this, TQT_SLOT(add(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(taskRemoved(Task::Ptr)), - this, TQT_SLOT(remove(Task::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupAdded(Startup::Ptr)), - this, TQT_SLOT(add(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(startupRemoved(Startup::Ptr)), - this, TQT_SLOT(remove(Startup::Ptr))); - connect(TaskManager::the(), TQT_SIGNAL(desktopChanged(int)), - this, TQT_SLOT(desktopChanged(int))); - connect(TaskManager::the(), TQT_SIGNAL(windowChanged(Task::Ptr)), - this, TQT_SLOT(windowChanged(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskAdded(Task::Ptr)), + this, TQ_SLOT(add(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(taskRemoved(Task::Ptr)), + this, TQ_SLOT(remove(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupAdded(Startup::Ptr)), + this, TQ_SLOT(add(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(startupRemoved(Startup::Ptr)), + this, TQ_SLOT(remove(Startup::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(desktopChanged(int)), + this, TQ_SLOT(desktopChanged(int))); + connect(TaskManager::the(), TQ_SIGNAL(windowChanged(Task::Ptr)), + this, TQ_SLOT(windowChanged(Task::Ptr))); isGrouping = shouldGroup(); @@ -131,7 +131,7 @@ TaskBar::TaskBar( TaskBarSettings* settingsObject, TaskBarSettings* globalSettin blocklayout = false; - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); keys = new TDEGlobalAccel( this ); #include "taskbarbindings.cpp" keys->readSettings(); @@ -261,12 +261,12 @@ void TaskBar::configure() // are paying attention to the current Xinerama screen // disconnect first in case we've been here before // to avoid multiple connections - disconnect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), - this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); + disconnect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQ_SLOT(windowChangedGeometry(Task::Ptr))); if (m_showOnlyCurrentScreen) { - connect(TaskManager::the(), TQT_SIGNAL(windowChangedGeometry(Task::Ptr)), - this, TQT_SLOT(windowChangedGeometry(Task::Ptr))); + connect(TaskManager::the(), TQ_SIGNAL(windowChangedGeometry(Task::Ptr)), + this, TQ_SLOT(windowChangedGeometry(Task::Ptr))); } TaskManager::the()->trackGeometry(m_showOnlyCurrentScreen); @@ -386,7 +386,7 @@ void TaskBar::add(Startup::Ptr startup) // create new container TaskContainer *container = new TaskContainer(startup, frames, this, m_settingsObject, m_globalSettingsObject, viewport()); m_hiddenContainers.append(container); - connect(container, TQT_SIGNAL(showMe(TaskContainer*)), this, TQT_SLOT(showTaskContainer(TaskContainer*))); + connect(container, TQ_SIGNAL(showMe(TaskContainer*)), this, TQ_SLOT(showTaskContainer(TaskContainer*))); } void TaskBar::reSort() @@ -854,7 +854,7 @@ void TaskBar::reLayout() } } - TQTimer::singleShot(100, this, TQT_SLOT(publishIconGeometry())); + TQTimer::singleShot(100, this, TQ_SLOT(publishIconGeometry())); } void TaskBar::setViewportBackground() diff --git a/kicker/taskbar/taskbarbindings.cpp b/kicker/taskbar/taskbarbindings.cpp index c451d621f..f604e3bc6 100644 --- a/kicker/taskbar/taskbarbindings.cpp +++ b/kicker/taskbar/taskbarbindings.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index f9ba06c32..efde7dd2c 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -99,7 +99,7 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQString configFileOverrid taskBar = new TaskBar(settingsObject, globalSettingsObject, this); layout->addWidget( taskBar ); - connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) ); + connect( taskBar, TQ_SIGNAL( containerCountChanged() ), TQ_SIGNAL( containerCountChanged() ) ); setBackground(); @@ -134,10 +134,10 @@ void TaskBarContainer::configure() // window list button windowListButton = new SimpleButton(this); windowListMenu= new KWindowListMenu; - connect(windowListButton, TQT_SIGNAL(pressed()), - TQT_SLOT(showWindowListMenu())); - connect(windowListMenu, TQT_SIGNAL(aboutToHide()), - TQT_SLOT(windowListMenuAboutToHide())); + connect(windowListButton, TQ_SIGNAL(pressed()), + TQ_SLOT(showWindowListMenu())); + connect(windowListMenu, TQ_SIGNAL(aboutToHide()), + TQ_SLOT(windowListMenuAboutToHide())); // geometry TQString icon; @@ -299,9 +299,9 @@ void TaskBarContainer::showWindowListMenu() break; } - disconnect( windowListButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( showWindowListMenu() ) ); + disconnect( windowListButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( showWindowListMenu() ) ); windowListMenu->exec( pos ); - TQTimer::singleShot(100, this, TQT_SLOT(reconnectWindowListButton())); + TQTimer::singleShot(100, this, TQ_SLOT(reconnectWindowListButton())); } void TaskBarContainer::windowListMenuAboutToHide() @@ -313,7 +313,7 @@ void TaskBarContainer::windowListMenuAboutToHide() void TaskBarContainer::reconnectWindowListButton() { - connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) ); + connect( windowListButton, TQ_SIGNAL( pressed() ), TQ_SLOT( showWindowListMenu() ) ); } TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index d6b873e2b..3eba42cd1 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -186,7 +186,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames, Ta sid = m_startup->bin(); - connect(m_startup, TQT_SIGNAL(changed()), TQT_SLOT(update())); + connect(m_startup, TQ_SIGNAL(changed()), TQ_SLOT(update())); dragSwitchTimer.start(333, true); } @@ -212,10 +212,10 @@ void TaskContainer::init() installEventFilter(KickerTip::the()); - connect(&animationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(animationTimerFired())); - connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(showMe())); - connect(&attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimerFired())); - connect(&m_paintEventCompressionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateNow())); + connect(&animationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(animationTimerFired())); + connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(showMe())); + connect(&attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimerFired())); + connect(&m_paintEventCompressionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateNow())); } TaskContainer::~TaskContainer() @@ -235,8 +235,8 @@ void TaskContainer::showMe() animationTimer.start(100); emit showMe(this); - disconnect(&dragSwitchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showMe())); - connect(&dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); + disconnect(&dragSwitchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showMe())); + connect(&dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch())); } void TaskContainer::stopTimers() @@ -442,9 +442,9 @@ void TaskContainer::add(Task::Ptr task) KickerTip::Client::updateKickerTip(); update(); - connect(task, TQT_SIGNAL(changed(bool)), TQT_SLOT(taskChanged(bool))); - connect(task, TQT_SIGNAL(iconChanged()), TQT_SLOT(iconChanged())); - connect(task, TQT_SIGNAL(activated()), TQT_SLOT(setLastActivated())); + connect(task, TQ_SIGNAL(changed(bool)), TQ_SLOT(taskChanged(bool))); + connect(task, TQ_SIGNAL(iconChanged()), TQ_SLOT(iconChanged())); + connect(task, TQ_SIGNAL(activated()), TQ_SLOT(setLastActivated())); } void TaskContainer::remove(Task::Ptr task) @@ -1097,7 +1097,7 @@ void TaskContainer::mouseReleaseEvent(TQMouseEvent *e) } performAction( buttonAction ); - TQTimer::singleShot(0, this, TQT_SLOT(update())); + TQTimer::singleShot(0, this, TQ_SLOT(update())); } void TaskContainer::performAction(int action) @@ -1310,22 +1310,22 @@ TQPopupMenu* TaskContainer::makeTaskMoveMenu() id = menu->insertItem(SmallIconSet("go-first"), i18n("Move to Beginning"), - this, TQT_SLOT(slotTaskMoveBeginning())); + this, TQ_SLOT(slotTaskMoveBeginning())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left)); id = menu->insertItem(SmallIconSet("back"), i18n("Move Left"), - this, TQT_SLOT(slotTaskMoveLeft())); + this, TQ_SLOT(slotTaskMoveLeft())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Left)); id = menu->insertItem(SmallIconSet("forward"), i18n("Move Right"), - this, TQT_SLOT(slotTaskMoveRight())); + this, TQ_SLOT(slotTaskMoveRight())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right)); id = menu->insertItem(SmallIconSet("go-last"), i18n("Move to End"), - this, TQT_SLOT(slotTaskMoveEnd())); + this, TQ_SLOT(slotTaskMoveEnd())); menu->setItemEnabled(id, (capabilities & TaskMoveDestination::Right)); return menu; diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp index 3286c8576..79c809e39 100644 --- a/kicker/taskmanager/tasklmbmenu.cpp +++ b/kicker/taskmanager/tasklmbmenu.cpp @@ -99,7 +99,7 @@ TaskLMBMenu::TaskLMBMenu(const Task::List& tasks, TQWidget *parent, const char * setAcceptDrops(true); // Always enabled to activate task during drag&drop. m_dragSwitchTimer = new TQTimer(this, "DragSwitchTimer"); - connect(m_dragSwitchTimer, TQT_SIGNAL(timeout()), TQT_SLOT(dragSwitch())); + connect(m_dragSwitchTimer, TQ_SIGNAL(timeout()), TQ_SLOT(dragSwitch())); } void TaskLMBMenu::fillMenu() @@ -118,7 +118,7 @@ void TaskLMBMenu::fillMenu() t->isIconified(), t->demandsAttention()); int id = insertItem(TQIconSet(t->pixmap()), menuItem); - connectItem(id, t, TQT_SLOT(activateRaiseOrIconify())); + connectItem(id, t, TQ_SLOT(activateRaiseOrIconify())); setItemChecked(id, t->isActive()); if (t->demandsAttention()) @@ -131,7 +131,7 @@ void TaskLMBMenu::fillMenu() if (m_attentionState) { m_attentionTimer = new TQTimer(this, "AttentionTimer"); - connect(m_attentionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(attentionTimeout())); + connect(m_attentionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(attentionTimeout())); m_attentionTimer->start(500, true); } } diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index d4da190b6..54bf6d919 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -61,16 +61,16 @@ TaskManager::TaskManager() m_trackGeometry(false) { TDEGlobal::locale()->insertCatalogue("libtaskmanager"); - connect(m_winModule, TQT_SIGNAL(windowAdded(WId)), - this, TQT_SLOT(windowAdded(WId))); - connect(m_winModule, TQT_SIGNAL(windowRemoved(WId)), - this, TQT_SLOT(windowRemoved(WId))); - connect(m_winModule, TQT_SIGNAL(activeWindowChanged(WId)), - this, TQT_SLOT(activeWindowChanged(WId))); - connect(m_winModule, TQT_SIGNAL(currentDesktopChanged(int)), - this, TQT_SLOT(currentDesktopChanged(int))); - connect(m_winModule, TQT_SIGNAL(windowChanged(WId,unsigned int)), - this, TQT_SLOT(windowChanged(WId,unsigned int))); + connect(m_winModule, TQ_SIGNAL(windowAdded(WId)), + this, TQ_SLOT(windowAdded(WId))); + connect(m_winModule, TQ_SIGNAL(windowRemoved(WId)), + this, TQ_SLOT(windowRemoved(WId))); + connect(m_winModule, TQ_SIGNAL(activeWindowChanged(WId)), + this, TQ_SLOT(activeWindowChanged(WId))); + connect(m_winModule, TQ_SIGNAL(currentDesktopChanged(int)), + this, TQ_SLOT(currentDesktopChanged(int))); + connect(m_winModule, TQ_SIGNAL(windowChanged(WId,unsigned int)), + this, TQ_SLOT(windowChanged(WId,unsigned int))); // register existing windows const TQValueList<WId> windows = m_winModule->windows(); @@ -99,14 +99,14 @@ void TaskManager::configure_startup() return; _startup_info = new TDEStartupInfo( TDEStartupInfo::CleanOnCantDetect, this ); connect( _startup_info, - TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( _startup_info, - TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); + TQ_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( _startup_info, - TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), - TQT_SLOT( killStartup( const TDEStartupInfoId& ))); + TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( killStartup( const TDEStartupInfoId& ))); c.setGroup( "TaskbarButtonSettings" ); _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 )); } @@ -1313,7 +1313,7 @@ void Task::updateThumbnail() if (!_grab.isNull()) { - TQTimer::singleShot(200, this, TQT_SLOT(generateThumbnail())); + TQTimer::singleShot(200, this, TQ_SLOT(generateThumbnail())); } } diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp index cdc6e4532..943160d26 100644 --- a/kicker/taskmanager/taskrmbmenu.cpp +++ b/kicker/taskmanager/taskrmbmenu.cpp @@ -78,7 +78,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) if (showAll) { id = insertItem(i18n("&To Current Desktop"), - t, TQT_SLOT(toCurrentDesktop())); + t, TQ_SLOT(toCurrentDesktop())); setItemEnabled( id, !t->isOnCurrentDesktop() ); } @@ -88,21 +88,21 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) } } - id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQT_SLOT(move())); + id = insertItem(SmallIconSet("move"), i18n("&Move"), t, TQ_SLOT(move())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMove)); - id = insertItem(i18n("Re&size"), t, TQT_SLOT(resize())); + id = insertItem(i18n("Re&size"), t, TQ_SLOT(resize())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionResize)); - id = insertItem(i18n("Mi&nimize"), t, TQT_SLOT(toggleIconified())); + id = insertItem(i18n("Mi&nimize"), t, TQ_SLOT(toggleIconified())); setItemChecked(id, t->isIconified()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMinimize)); - id = insertItem(i18n("Ma&ximize"), t, TQT_SLOT(toggleMaximized())); + id = insertItem(i18n("Ma&ximize"), t, TQ_SLOT(toggleMaximized())); setItemChecked(id, t->isMaximized()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionMax)); - id = insertItem(i18n("&Shade"), t, TQT_SLOT(toggleShaded())); + id = insertItem(i18n("&Shade"), t, TQ_SLOT(toggleShaded())); setItemChecked(id, t->isShaded()); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionShade)); @@ -115,7 +115,7 @@ void TaskRMBMenu::fillMenu(Task::Ptr t) insertSeparator(); } - id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQT_SLOT(close())); + id = insertItem(SmallIcon("window-close"), i18n("&Close"), t, TQ_SLOT(close())); setItemEnabled(id, !checkActions || t->info().actionSupported(NET::ActionClose)); } @@ -133,7 +133,7 @@ void TaskRMBMenu::fillMenu() t->visibleNameWithState(), new TaskRMBMenu(t, this) ); setItemChecked( id, t->isActive() ); - connectItem( id, t, TQT_SLOT( activateRaiseOrIconify() ) ); + connectItem( id, t, TQ_SLOT( activateRaiseOrIconify() ) ); } insertSeparator(); @@ -144,7 +144,7 @@ void TaskRMBMenu::fillMenu() { id = insertItem(i18n("All to &Desktop"), makeDesktopsMenu()); - id = insertItem(i18n("All &to Current Desktop"), this, TQT_SLOT(slotAllToCurrentDesktop())); + id = insertItem(i18n("All &to Current Desktop"), this, TQ_SLOT(slotAllToCurrentDesktop())); Task::List::iterator itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -159,7 +159,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "Mi&nimize All" ), this, TQT_SLOT( slotMinimizeAll() ) ); + id = insertItem( i18n( "Mi&nimize All" ), this, TQ_SLOT( slotMinimizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -172,7 +172,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "Ma&ximize All" ), this, TQT_SLOT( slotMaximizeAll() ) ); + id = insertItem( i18n( "Ma&ximize All" ), this, TQ_SLOT( slotMaximizeAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -185,7 +185,7 @@ void TaskRMBMenu::fillMenu() enable = false; - id = insertItem( i18n( "&Restore All" ), this, TQT_SLOT( slotRestoreAll() ) ); + id = insertItem( i18n( "&Restore All" ), this, TQ_SLOT( slotRestoreAll() ) ); itEnd = tasks.end(); for (Task::List::iterator it = tasks.begin(); it != itEnd; ++it) { @@ -207,7 +207,7 @@ void TaskRMBMenu::fillMenu() insertSeparator(); } - insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQT_SLOT( slotCloseAll() ) ); + insertItem( SmallIcon( "window-close" ), i18n( "&Close All" ), this, TQ_SLOT( slotCloseAll() ) ); } TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) @@ -219,17 +219,17 @@ TQPopupMenu* TaskRMBMenu::makeAdvancedMenu(Task::Ptr t) id = menu->insertItem(SmallIconSet("go-up"), i18n("Keep &Above Others"), - t, TQT_SLOT(toggleAlwaysOnTop())); + t, TQ_SLOT(toggleAlwaysOnTop())); menu->setItemChecked(id, t->isAlwaysOnTop()); id = menu->insertItem(SmallIconSet("go-down"), i18n("Keep &Below Others"), - t, TQT_SLOT(toggleKeptBelowOthers())); + t, TQ_SLOT(toggleKeptBelowOthers())); menu->setItemChecked(id, t->isKeptBelowOthers()); id = menu->insertItem(SmallIconSet("view-fullscreen"), i18n("&Fullscreen"), - t, TQT_SLOT(toggleFullScreen())); + t, TQ_SLOT(toggleFullScreen())); menu->setItemChecked(id, t->isFullScreen()); if (KWin::allowedActionsSupported()) @@ -245,7 +245,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), t, TQT_SLOT( toDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), t, TQ_SLOT( toDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->setItemChecked( id, t->isOnAllDesktops() ); @@ -253,7 +253,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t) for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) ); + id = m->insertItem( name, t, TQ_SLOT( toDesktop(int) ) ); m->setItemParameter( id, i ); m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i ); } @@ -266,14 +266,14 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu() TQPopupMenu* m = new TQPopupMenu( this ); m->setCheckable( true ); - int id = m->insertItem( i18n("&All Desktops"), this, TQT_SLOT( slotAllToDesktop(int) ) ); + int id = m->insertItem( i18n("&All Desktops"), this, TQ_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, 0 ); // 0 means all desktops m->insertSeparator(); for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) { TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&")); - id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) ); + id = m->insertItem( name, this, TQ_SLOT( slotAllToDesktop(int) ) ); m->setItemParameter( id, i ); } diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp index ff6c50cef..a2f5368a8 100644 --- a/klipper/clipboardpoll.cpp +++ b/klipper/clipboardpoll.cpp @@ -108,9 +108,9 @@ ClipboardPoll::ClipboardPoll( TQWidget* parent ) void ClipboardPoll::initPolling() { - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged() ), TQT_SLOT(qtSelectionChanged())); - connect( kapp->clipboard(), TQT_SIGNAL( dataChanged() ), TQT_SLOT( qtClipboardChanged() )); - connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( timeout())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged() ), TQ_SLOT(qtSelectionChanged())); + connect( kapp->clipboard(), TQ_SIGNAL( dataChanged() ), TQ_SLOT( qtClipboardChanged() )); + connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( timeout())); timer.start( 1000, false ); selection.atom = XA_PRIMARY; clipboard.atom = xa_clipboard; diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index c44e11afe..0dfc7ede1 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -158,11 +158,11 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name ) maxItems = new KIntNumInput( this ); maxItems->setLabel( i18n( "C&lipboard history size:" ) ); maxItems->setRange( 2, 2048, 1, true ); - connect( maxItems, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( historySizeChanged( int ) )); + connect( maxItems, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( historySizeChanged( int ) )); - connect( group, TQT_SIGNAL( clicked( int )), - TQT_SLOT( slotClipConfigChanged() )); + connect( group, TQ_SIGNAL( clicked( int )), + TQ_SLOT( slotClipConfigChanged() )); slotClipConfigChanged(); // Add some spacing at the end @@ -243,13 +243,13 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, listView->setMultiSelection( false ); listView->setAllColumnsShowFocus( true ); listView->setSelectionMode( TQListView::Single ); - connect( listView, TQT_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )), - TQT_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) )); - connect( listView, TQT_SIGNAL( selectionChanged ( TQListViewItem * )), - TQT_SLOT(selectionChanged ( TQListViewItem * ))); + connect( listView, TQ_SIGNAL(executed( TQListViewItem*, const TQPoint&, int )), + TQ_SLOT( slotItemChanged( TQListViewItem*, const TQPoint& , int ) )); + connect( listView, TQ_SIGNAL( selectionChanged ( TQListViewItem * )), + TQ_SLOT(selectionChanged ( TQListViewItem * ))); connect(listView, - TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), - TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint&)), + TQ_SLOT( slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&))); ClipAction *action = 0L; ClipCommand *command = 0L; @@ -291,10 +291,10 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, TQHBox *box = new TQHBox( this ); box->setSpacing( KDialog::spacingHint() ); TQPushButton *button = new TQPushButton( i18n("&Add Action"), box ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddAction() )); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddAction() )); delActionButton = new TQPushButton( i18n("&Delete Action"), box ); - connect( delActionButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeleteAction() )); + connect( delActionButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDeleteAction() )); TQLabel *label = new TQLabel(i18n("Click on a highlighted item's column to change it. \"%s\" in a command will be replaced with the clipboard contents."), box); label->setAlignment( WordBreak | AlignLeft | AlignVCenter ); @@ -304,7 +304,7 @@ ActionWidget::ActionWidget( const ActionList *list, ConfigDialog* configWidget, box = new TQHBox( this ); TQPushButton *advanced = new TQPushButton( i18n("Advanced..."), box ); advanced->setFixedSize( advanced->sizeHint() ); - connect( advanced, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdvanced() )); + connect( advanced, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdvanced() )); (void) new TQWidget( box ); // spacer delActionButton->setEnabled(listView->currentItem () !=0); diff --git a/klipper/history.cpp b/klipper/history.cpp index 625fbef0f..99db4eaba 100644 --- a/klipper/history.cpp +++ b/klipper/history.cpp @@ -29,7 +29,7 @@ History::History( TQWidget* parent, const char* name ) m_popup( new KlipperPopup( this, parent, "main_widget" ) ), m_topIsUserSelected( false ) { - connect( this, TQT_SIGNAL( changed() ), m_popup, TQT_SLOT( slotHistoryChanged() ) ); + connect( this, TQ_SIGNAL( changed() ), m_popup, TQ_SLOT( slotHistoryChanged() ) ); itemList.setAutoDelete( true ); } diff --git a/klipper/klipperbindings.cpp b/klipper/klipperbindings.cpp index dd14ad3c4..8db1f5fe8 100644 --- a/klipper/klipperbindings.cpp +++ b/klipper/klipperbindings.cpp @@ -18,7 +18,7 @@ */ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4 ) diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 9d3ab728d..38cd51aa5 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -112,7 +112,7 @@ KlipperPopup::KlipperPopup( History* history, TQWidget* parent, const char* name m_popupProxy = new PopupProxy( this, "popup_proxy", menu_height, menu_width ); - connect( this, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); + connect( this, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); } KlipperPopup::~KlipperPopup() { diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp index f3a86379f..20f8139a1 100644 --- a/klipper/popupproxy.cpp +++ b/klipper/popupproxy.cpp @@ -39,7 +39,7 @@ PopupProxy::PopupProxy( KlipperPopup* parent, const char* name, int menu_height, m_menu_width( menu_width ), nextItemNumber( 0 ) { - connect( parent->history(), TQT_SIGNAL( changed() ), TQT_SLOT( slotHistoryChanged() ) ); + connect( parent->history(), TQ_SIGNAL( changed() ), TQ_SLOT( slotHistoryChanged() ) ); } void PopupProxy::slotHistoryChanged() { @@ -117,7 +117,7 @@ void PopupProxy::tryInsertItem( HistoryItem const * const item, History* history = parent()->history(); proxy_for_menu->connectItem( id, history, - TQT_SLOT( slotMoveToTop( int ) ) ); + TQ_SLOT( slotMoveToTop( int ) ) ); proxy_for_menu->setItemParameter( id, nextItemNumber ); } @@ -151,7 +151,7 @@ int PopupProxy::insertFromSpill( int index ) { if ( spillPointer.current() ) { TDEPopupMenu* moreMenu = new TDEPopupMenu( proxy_for_menu, "a more menu" ); proxy_for_menu->insertItem( i18n( "&More" ), moreMenu, -1, index ); - connect( moreMenu, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotAboutToShow() ) ); + connect( moreMenu, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotAboutToShow() ) ); proxy_for_menu = moreMenu; } diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index c764b0003..b76c7472b 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -140,10 +140,10 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) setBackgroundMode( X11ParentRelative ); clip = kapp->clipboard(); - connect( &m_overflowClearTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotClearOverflow())); + connect( &m_overflowClearTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotClearOverflow())); m_overflowClearTimer.start( 1000 ); - connect( &m_pendingCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotCheckPending())); - connect( &m_setClipboardTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotDelayedSetClipboard())); + connect( &m_pendingCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotCheckPending())); + connect( &m_setClipboardTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotDelayedSetClipboard())); m_history = new History( this, "main_history" ); @@ -157,16 +157,16 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) "history_clear", 0, history(), - TQT_SLOT( slotClear() ), + TQ_SLOT( slotClear() ), collection, "clearHistoryAction" ); - connect( clearHistoryAction, TQT_SIGNAL( activated() ), TQT_SLOT( slotClearClipboard() ) ); + connect( clearHistoryAction, TQ_SIGNAL( activated() ), TQ_SLOT( slotClearClipboard() ) ); clearHistoryAction->setGroup( defaultGroup ); configureAction = new TDEAction( i18n("&Configure Klipper..."), "configure", 0, this, - TQT_SLOT( slotConfigure() ), + TQ_SLOT( slotConfigure() ), collection, "configureAction" ); configureAction->setGroup( defaultGroup ); @@ -174,7 +174,7 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) "system-log-out", 0, this, - TQT_SLOT( slotQuit() ), + TQ_SLOT( slotQuit() ), collection, "quitAction" ); quitAction->setGroup( "exit" ); @@ -187,11 +187,11 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) showTimer = new TQTime(); readProperties(m_config); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int))); poll = new ClipboardPoll( this ); - connect( poll, TQT_SIGNAL( clipboardChanged( bool ) ), - this, TQT_SLOT( newClipData( bool ) ) ); + connect( poll, TQ_SIGNAL( clipboardChanged( bool ) ), + this, TQ_SLOT( newClipData( bool ) ) ); if ( isApplet() || !isShown() ) { m_pixmap = KSystemTray::loadIcon( "klipper" ); @@ -211,13 +211,13 @@ KlipperWidget::KlipperWidget( TQWidget *parent, TDEConfig* config ) globalKeys->updateConnections(); toggleURLGrabAction->setShortcut(globalKeys->shortcut("Enable/Disable Clipboard Actions")); - connect( toggleURLGrabAction, TQT_SIGNAL( toggled( bool )), - this, TQT_SLOT( setURLGrabberEnabled( bool ))); + connect( toggleURLGrabAction, TQ_SIGNAL( toggled( bool )), + this, TQ_SLOT( setURLGrabberEnabled( bool ))); KlipperPopup* popup = history()->popup(); - connect ( history(), TQT_SIGNAL( topChanged() ), TQT_SLOT( slotHistoryTopChanged() ) ); - connect( popup, TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotStartHideTimer() ) ); - connect( popup, TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotStartShowTimer() ) ); + connect ( history(), TQ_SIGNAL( topChanged() ), TQ_SLOT( slotHistoryTopChanged() ) ); + connect( popup, TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotStartHideTimer() ) ); + connect( popup, TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotStartShowTimer() ) ); popup->plugAction( toggleURLGrabAction ); popup->plugAction( clearHistoryAction ); @@ -631,10 +631,10 @@ void KlipperWidget::slotRepeatAction() { if ( !myURLGrabber ) { myURLGrabber = new URLGrabber( m_config ); - connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )), - TQT_SLOT( showPopupMenu( TQPopupMenu * )) ); - connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ), - this, TQT_SLOT( disableURLGrabber() ) ); + connect( myURLGrabber, TQ_SIGNAL( sigPopup( TQPopupMenu * )), + TQ_SLOT( showPopupMenu( TQPopupMenu * )) ); + connect( myURLGrabber, TQ_SIGNAL( sigDisablePopup() ), + this, TQ_SLOT( disableURLGrabber() ) ); } const HistoryStringItem* top = dynamic_cast<const HistoryStringItem*>( history()->first() ); @@ -666,10 +666,10 @@ void KlipperWidget::setURLGrabberEnabled( bool enable ) toggleURLGrabAction->setText(i18n("&Actions Enabled")); if ( !myURLGrabber ) { myURLGrabber = new URLGrabber( m_config ); - connect( myURLGrabber, TQT_SIGNAL( sigPopup( TQPopupMenu * )), - TQT_SLOT( showPopupMenu( TQPopupMenu * )) ); - connect( myURLGrabber, TQT_SIGNAL( sigDisablePopup() ), - this, TQT_SLOT( disableURLGrabber() ) ); + connect( myURLGrabber, TQ_SIGNAL( sigPopup( TQPopupMenu * )), + TQ_SLOT( showPopupMenu( TQPopupMenu * )) ); + connect( myURLGrabber, TQ_SIGNAL( sigDisablePopup() ), + this, TQ_SLOT( disableURLGrabber() ) ); } } } diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index b8b1cb032..078e38097 100644 --- a/klipper/urlgrabber.cpp +++ b/klipper/urlgrabber.cpp @@ -61,8 +61,8 @@ URLGrabber::URLGrabber( TDEConfig* config ) readConfiguration( m_config ); myPopupKillTimer = new TQTimer( this ); - connect( myPopupKillTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotKillPopupMenu() )); + connect( myPopupKillTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotKillPopupMenu() )); // testing /* @@ -163,8 +163,8 @@ void URLGrabber::actionMenu( bool wm_class_check ) myPopupKillTimer->stop(); delete myMenu; myMenu = new TDEPopupMenu; - connect( myMenu, TQT_SIGNAL( activated( int )), - TQT_SLOT( slotItemSelected( int ))); + connect( myMenu, TQ_SIGNAL( activated( int )), + TQ_SLOT( slotItemSelected( int ))); for ( action = it.current(); action; action = ++it ) { TQPtrListIterator<ClipCommand> it2( action->commands() ); @@ -279,7 +279,7 @@ void URLGrabber::editData() if ( dlg->exec() == TQDialog::Accepted ) { myClipData = edit->text(); delete dlg; - TQTimer::singleShot( 0, this, TQT_SLOT( slotActionMenu() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotActionMenu() ) ); } else { diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index 32dba3f3e..1cde09440 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -101,18 +101,18 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) grid->addWidget(_execLabel, 3, 0); // connect line inputs - connect(_nameEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotChanged())); - connect(_descriptionEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotChanged())); - connect(_commentEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotChanged())); - connect(_execEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotChanged())); - connect(_execEdit, TQT_SIGNAL(urlSelected(const TQString&)), - TQT_SLOT(slotExecSelected())); - connect(_launchCB, TQT_SIGNAL(clicked()), TQT_SLOT(launchcb_clicked())); - connect(_systrayCB, TQT_SIGNAL(clicked()), TQT_SLOT(systraycb_clicked())); + connect(_nameEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotChanged())); + connect(_descriptionEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotChanged())); + connect(_commentEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotChanged())); + connect(_execEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotChanged())); + connect(_execEdit, TQ_SIGNAL(urlSelected(const TQString&)), + TQ_SLOT(slotExecSelected())); + connect(_launchCB, TQ_SIGNAL(clicked()), TQ_SLOT(launchcb_clicked())); + connect(_systrayCB, TQ_SIGNAL(clicked()), TQ_SLOT(systraycb_clicked())); // add line inputs to the grid grid->addMultiCellWidget(_nameEdit, 0, 0, 1, 1); @@ -126,7 +126,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) _iconButton = new TDEIconButton(general_group); _iconButton->setFixedSize(56,56); _iconButton->setIconSize(48); - connect(_iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(slotChanged())); + connect(_iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(slotChanged())); grid->addMultiCellWidget(_iconButton, 0, 1, 2, 2); // add the general group to the main layout @@ -148,8 +148,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) _pathLabel->setBuddy(_pathEdit); - connect(_pathEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotChanged())); + connect(_pathEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotChanged())); vbox->addWidget(hbox); layout->addMultiCellWidget(_path_group, 1, 1, 0, 1); @@ -159,7 +159,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) KDialog::spacingHint()); _terminalCB = new TQCheckBox(i18n("Run in term&inal"), _term_group); - connect(_terminalCB, TQT_SIGNAL(clicked()), TQT_SLOT(termcb_clicked())); + connect(_terminalCB, TQ_SIGNAL(clicked()), TQ_SLOT(termcb_clicked())); vbox->addWidget(_terminalCB); hbox = new TQHBox(_term_group); @@ -169,8 +169,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) _termOptEdit->setAcceptDrops(false); _termOptLabel->setBuddy(_termOptEdit); - connect(_termOptEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotChanged())); + connect(_termOptEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotChanged())); vbox->addWidget(hbox); layout->addMultiCellWidget(_term_group, 2, 2, 0, 1); @@ -182,7 +182,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) KDialog::spacingHint()); _uidCB = new TQCheckBox(i18n("&Run as a different user"), _uid_group); - connect(_uidCB, TQT_SIGNAL(clicked()), TQT_SLOT(uidcb_clicked())); + connect(_uidCB, TQ_SIGNAL(clicked()), TQ_SLOT(uidcb_clicked())); vbox->addWidget(_uidCB); hbox = new TQHBox(_uid_group); @@ -192,8 +192,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) _uidEdit->setAcceptDrops(false); _uidLabel->setBuddy(_uidEdit); - connect(_uidEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotChanged())); + connect(_uidEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotChanged())); vbox->addWidget(hbox); layout->addMultiCellWidget(_uid_group, 3, 3, 0, 1); @@ -216,11 +216,11 @@ BasicTab::BasicTab( TQWidget *parent, const char *name ) //_keyEdit->setText( "" ); //TQPushButton* _keyButton = new TQPushButton( i18n( "Change" ), // general_group_keybind ); - //connect( _keyButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( keyButtonPressed())); + //connect( _keyButton, TQ_SIGNAL( clicked()), this, TQ_SLOT( keyButtonPressed())); _keyEdit = new KKeyButton(general_group_keybind); grid_keybind->addWidget(new TQLabel(_keyEdit, i18n("Current shortcut &key:"), general_group_keybind), 0, 0); - connect( _keyEdit, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), - this, TQT_SLOT(slotCapturedShortcut(const TDEShortcut&))); + connect( _keyEdit, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), + this, TQ_SLOT(slotCapturedShortcut(const TDEShortcut&))); grid_keybind->addWidget(_keyEdit, 0, 1); //grid_keybind->addWidget(_keyButton, 0, 2 ); diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 277748ae9..282c9843c 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -67,12 +67,12 @@ void KMenuEdit::setupActions() if (!m_controlCenter) (void)new TDEAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep"); - (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, this, TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit"); + (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, this, TQ_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit"); m_actionDelete = 0; - KStdAction::save(this, TQT_SLOT( slotSave() ), actionCollection()); - KStdAction::quit(this, TQT_SLOT( close() ), actionCollection()); + KStdAction::save(this, TQ_SLOT( slotSave() ), actionCollection()); + KStdAction::quit(this, TQ_SLOT( close() ), actionCollection()); KStdAction::cut(0, 0, actionCollection()); KStdAction::copy(0, 0, actionCollection()); KStdAction::paste(0, 0, actionCollection()); @@ -84,21 +84,21 @@ void KMenuEdit::setupView() m_tree = new TreeView(m_controlCenter, actionCollection(), m_splitter); m_basicTab = new BasicTab(m_splitter); - connect(m_tree, TQT_SIGNAL(entrySelected(MenuFolderInfo *)), - m_basicTab, TQT_SLOT(setFolderInfo(MenuFolderInfo *))); - connect(m_tree, TQT_SIGNAL(entrySelected(MenuEntryInfo *)), - m_basicTab, TQT_SLOT(setEntryInfo(MenuEntryInfo *))); - connect(m_tree, TQT_SIGNAL(disableAction()), - m_basicTab, TQT_SLOT(slotDisableAction() ) ); + connect(m_tree, TQ_SIGNAL(entrySelected(MenuFolderInfo *)), + m_basicTab, TQ_SLOT(setFolderInfo(MenuFolderInfo *))); + connect(m_tree, TQ_SIGNAL(entrySelected(MenuEntryInfo *)), + m_basicTab, TQ_SLOT(setEntryInfo(MenuEntryInfo *))); + connect(m_tree, TQ_SIGNAL(disableAction()), + m_basicTab, TQ_SLOT(slotDisableAction() ) ); - connect(m_basicTab, TQT_SIGNAL(changed(MenuFolderInfo *)), - m_tree, TQT_SLOT(currentChanged(MenuFolderInfo *))); + connect(m_basicTab, TQ_SIGNAL(changed(MenuFolderInfo *)), + m_tree, TQ_SLOT(currentChanged(MenuFolderInfo *))); - connect(m_basicTab, TQT_SIGNAL(changed(MenuEntryInfo *)), - m_tree, TQT_SLOT(currentChanged(MenuEntryInfo *))); + connect(m_basicTab, TQ_SIGNAL(changed(MenuEntryInfo *)), + m_tree, TQ_SLOT(currentChanged(MenuEntryInfo *))); - connect(m_basicTab, TQT_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)), - m_tree, TQT_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &))); + connect(m_basicTab, TQ_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)), + m_tree, TQ_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &))); // restore splitter sizes TDEConfig* config = TDEGlobal::config(); diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 0e15d8d38..8340b4090 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -163,23 +163,23 @@ TreeView::TreeView( bool controlCenter, TDEActionCollection *ac, TQWidget *paren addColumn(""); header()->hide(); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect(this, TQT_SIGNAL(clicked( TQListViewItem* )), - TQT_SLOT(itemSelected( TQListViewItem* ))); + connect(this, TQ_SIGNAL(clicked( TQListViewItem* )), + TQ_SLOT(itemSelected( TQListViewItem* ))); - connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )), - TQT_SLOT(itemSelected( TQListViewItem* ))); + connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )), + TQ_SLOT(itemSelected( TQListViewItem* ))); - connect(this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&))); // connect actions - connect(m_ac->action("newitem"), TQT_SIGNAL(activated()), TQT_SLOT(newitem())); - connect(m_ac->action("newsubmenu"), TQT_SIGNAL(activated()), TQT_SLOT(newsubmenu())); + connect(m_ac->action("newitem"), TQ_SIGNAL(activated()), TQ_SLOT(newitem())); + connect(m_ac->action("newsubmenu"), TQ_SIGNAL(activated()), TQ_SLOT(newsubmenu())); if (m_ac->action("newsep")) - connect(m_ac->action("newsep"), TQT_SIGNAL(activated()), TQT_SLOT(newsep())); + connect(m_ac->action("newsep"), TQ_SIGNAL(activated()), TQ_SLOT(newsep())); m_menuFile = new MenuFile( locateLocal("xdgconf-menu", "applications-tdemenuedit.menu")); m_rootFolder = new MenuFolderInfo; @@ -215,21 +215,21 @@ void TreeView::setViewMode(bool showHidden) if(action) { action->plug(m_rmb); action->setEnabled(false); - connect(action, TQT_SIGNAL(activated()), TQT_SLOT(cut())); + connect(action, TQ_SIGNAL(activated()), TQ_SLOT(cut())); } action = m_ac->action("edit_copy"); if(action) { action->plug(m_rmb); action->setEnabled(false); - connect(action, TQT_SIGNAL(activated()), TQT_SLOT(copy())); + connect(action, TQ_SIGNAL(activated()), TQ_SLOT(copy())); } action = m_ac->action("edit_paste"); if(action) { action->plug(m_rmb); action->setEnabled(false); - connect(action, TQT_SIGNAL(activated()), TQT_SLOT(paste())); + connect(action, TQ_SIGNAL(activated()), TQ_SLOT(paste())); } m_rmb->insertSeparator(); @@ -238,7 +238,7 @@ void TreeView::setViewMode(bool showHidden) if(action) { action->plug(m_rmb); action->setEnabled(false); - connect(action, TQT_SIGNAL(activated()), TQT_SLOT(del())); + connect(action, TQ_SIGNAL(activated()), TQ_SLOT(del())); } m_rmb->insertSeparator(); diff --git a/knetattach/knetattach.ui.h b/knetattach/knetattach.ui.h index f71240990..1df766960 100644 --- a/knetattach/knetattach.ui.h +++ b/knetattach/knetattach.ui.h @@ -13,8 +13,8 @@ void KNetAttach::init() { setIcon(SmallIcon("knetattach")); - disconnect(finishButton(), TQT_SIGNAL(clicked()), (TQDialog*)this, TQT_SLOT(accept())); - connect(finishButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(finished())); + disconnect(finishButton(), TQ_SIGNAL(clicked()), (TQDialog*)this, TQ_SLOT(accept())); + connect(finishButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(finished())); finishButton()->setText(i18n("Save && C&onnect")); //setResizeMode(Fixed); FIXME: make the wizard fixed-geometry setFinishEnabled(_folderParameters, false); diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp index efc858f61..001734cdb 100644 --- a/konqueror/client/kfmclient.cpp +++ b/konqueror/client/kfmclient.cpp @@ -323,8 +323,8 @@ bool clientApp::createNewWindow(const KURL & url, bool newTab, bool tempFile, co TDEStartupInfo::appStarted(); KRun * run = new KRun( url, 0, 0, false, false /* no progress window */ ); // TODO pass tempFile [needs support in the KRun ctor] - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -423,7 +423,7 @@ void clientApp::delayedQuit() { // Quit in 2 seconds. This leaves time for KRun to pop up // "app not found" in TDEProcessRunner, if that was the case. - TQTimer::singleShot( 2000, this, TQT_SLOT(deref()) ); + TQTimer::singleShot( 2000, this, TQ_SLOT(deref()) ); // don't access the KRun instance later, it will be deleted after calling slots if( static_cast< const KRun* >( sender())->hasError()) krun_has_error = true; @@ -504,8 +504,8 @@ bool clientApp::doIt() { checkArgumentCount(argc, 2, 2); KPropertiesDialog * p = new KPropertiesDialog( args->url(1) ); - TQObject::connect( p, TQT_SIGNAL( destroyed() ), &app, TQT_SLOT( quit() )); - TQObject::connect( p, TQT_SIGNAL( canceled() ), &app, TQT_SLOT( slotDialogCanceled() )); + TQObject::connect( p, TQ_SIGNAL( destroyed() ), &app, TQ_SLOT( quit() )); + TQObject::connect( p, TQ_SIGNAL( canceled() ), &app, TQ_SLOT( slotDialogCanceled() )); app.exec(); return m_ok; } @@ -520,8 +520,8 @@ bool clientApp::doIt() else if ( argc == 2 ) { KRun * run = new KRun( args->url(1), 0, 0, false, false /* no progress window */ ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -538,8 +538,8 @@ bool clientApp::doIt() else if ( command == "openBrowser" ) { KRun * run = new KRun( "http://default.browser", 0, 0, false, false /* no progress window */ ); - TQObject::connect( run, TQT_SIGNAL( finished() ), &app, TQT_SLOT( delayedQuit() )); - TQObject::connect( run, TQT_SIGNAL( error() ), &app, TQT_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( finished() ), &app, TQ_SLOT( delayedQuit() )); + TQObject::connect( run, TQ_SIGNAL( error() ), &app, TQ_SLOT( delayedQuit() )); app.exec(); return !krun_has_error; } @@ -553,7 +553,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::move( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -588,7 +588,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::copy( srcLst, dsturl ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } @@ -602,7 +602,7 @@ bool clientApp::doIt() TDEIO::Job * job = TDEIO::copy( srcLst, args->url(argc - 1) ); if ( !s_interactive ) job->setInteractive( false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), &app, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), &app, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); app.exec(); return m_ok; } diff --git a/konqueror/delayedinitializer.cpp b/konqueror/delayedinitializer.cpp index e30db3d21..a635fb1ac 100644 --- a/konqueror/delayedinitializer.cpp +++ b/konqueror/delayedinitializer.cpp @@ -38,7 +38,7 @@ bool DelayedInitializer::eventFilter( TQObject *receiver, TQEvent *event ) // Move the emitting of the event to the end of the eventQueue // so we are absolutely sure the event we get here is handled before // the initialize is fired. - TQTimer::singleShot( 0, this, TQT_SLOT( slotInitialize() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotInitialize() ) ); return false; } diff --git a/konqueror/iconview/konq_iconview.cpp b/konqueror/iconview/konq_iconview.cpp index 1a84fb28d..04b973f8f 100644 --- a/konqueror/iconview/konq_iconview.cpp +++ b/konqueror/iconview/konq_iconview.cpp @@ -184,22 +184,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_pIconView = new KonqIconViewWidget( parentWidget, "qiconview" ); m_pIconView->initConfig( true ); - connect( m_pIconView, TQT_SIGNAL(imagePreviewFinished()), - this, TQT_SLOT(slotRenderingFinished())); + connect( m_pIconView, TQ_SIGNAL(imagePreviewFinished()), + this, TQ_SLOT(slotRenderingFinished())); // connect up the icon inc/dec signals - connect( m_pIconView, TQT_SIGNAL(incIconSize()), - this, TQT_SLOT(slotIncIconSize())); - connect( m_pIconView, TQT_SIGNAL(decIconSize()), - this, TQT_SLOT(slotDecIconSize())); + connect( m_pIconView, TQ_SIGNAL(incIconSize()), + this, TQ_SLOT(slotIncIconSize())); + connect( m_pIconView, TQ_SIGNAL(decIconSize()), + this, TQ_SLOT(slotDecIconSize())); // pass signals to the extension - connect( m_pIconView, TQT_SIGNAL( enableAction( const char *, bool ) ), - m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( enableAction( const char *, bool ) ), + m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) ); // signals from konqdirpart (for BC reasons) - connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); - connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); + connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) ); + connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) ); setWidget( m_pIconView ); m_mimeTypeResolver = new KMimeTypeResolver<KFileIVI,KonqKfmIconView>(this); @@ -211,22 +211,22 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons // Don't repaint on configuration changes during construction m_bInit = true; - m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), + m_paDotFiles = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paDotFiles->setCheckedState(i18n("Hide &Hidden Files")); m_paDotFiles->setToolTip( i18n( "Toggle displaying of hidden dot files" ) ); - m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQT_SLOT( slotShowDirectoryOverlays() ), + m_paDirectoryOverlays = new TDEToggleAction( i18n( "&Folder Icons Reflect Contents" ), 0, this, TQ_SLOT( slotShowDirectoryOverlays() ), actionCollection(), "show_directory_overlays" ); - m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQT_SLOT( slotShowFreeSpaceOverlays() ), + m_paFreeSpaceOverlays = new TDEToggleAction( i18n( "&Media Icons Reflect Free Space" ), 0, this, TQ_SLOT( slotShowFreeSpaceOverlays() ), actionCollection(), "show_free_space_overlays" ); m_pamPreview = new TDEActionMenu( i18n( "&Preview" ), actionCollection(), "iconview_preview" ); m_paEnablePreviews = new TDEToggleAction( i18n("Enable Previews"), 0, actionCollection(), "iconview_preview_all" ); m_paEnablePreviews->setCheckedState( i18n("Disable Previews") ); - connect( m_paEnablePreviews, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( m_paEnablePreviews, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_paEnablePreviews->setIcon("thumbnail"); m_pamPreview->insert( m_paEnablePreviews ); m_pamPreview->insert( new TDEActionSeparator(this) ); @@ -240,13 +240,13 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons else { preview = new TDEToggleAction( (*it)->name(), 0, actionCollection(), (*it)->desktopEntryName().latin1() ); - connect( preview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( preview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( preview ); m_paPreviewPlugins.append( preview ); } } TDEToggleAction *soundPreview = new TDEToggleAction( i18n("Sound Files"), 0, actionCollection(), "audio/" ); - connect( soundPreview, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotPreview( bool ) ) ); + connect( soundPreview, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotPreview( bool ) ) ); m_pamPreview->insert( soundPreview ); m_paPreviewPlugins.append( soundPreview ); @@ -270,11 +270,11 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons aSortByType->setChecked( false ); aSortByDate->setChecked( false ); - connect( aSortByNameCS, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseSensitive( bool ) ) ); - connect( aSortByNameCI, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByNameCaseInsensitive( bool ) ) ); - connect( aSortBySize, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortBySize( bool ) ) ); - connect( aSortByType, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByType( bool ) ) ); - connect( aSortByDate, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortByDate( bool ) ) ); + connect( aSortByNameCS, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseSensitive( bool ) ) ); + connect( aSortByNameCI, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByNameCaseInsensitive( bool ) ) ); + connect( aSortBySize, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortBySize( bool ) ) ); + connect( aSortByType, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByType( bool ) ) ); + connect( aSortByDate, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortByDate( bool ) ) ); //enable menu item representing the saved sorting criterion TQString sortcrit = KonqIconViewFactory::defaultViewProps()->sortCriterion(); @@ -286,8 +286,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_paSortDirsFirst->setChecked( KonqIconViewFactory::defaultViewProps()->isDirsFirst() ); - connect( aSortDescending, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDescending() ) ); - connect( m_paSortDirsFirst, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotSortDirsFirst() ) ); + connect( aSortDescending, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDescending() ) ); + connect( m_paSortDirsFirst, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSortDirsFirst() ) ); //enable stored settings slotSortDirsFirst(); @@ -307,15 +307,15 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_pamSort->insert( aSortDescending ); */ - m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), + m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, - this, TQT_SLOT( slotInvertSelection() ), + this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); m_paSelect->setToolTip( i18n( "Allows selecting of file or folder items based on a given mask" ) ); @@ -328,65 +328,65 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons //m_paRightText = new TDEToggleAction( i18n( "Text at &Right" ), 0, actionCollection(), "textright" ); //m_paBottomText->setExclusiveGroup( "TextPos" ); //m_paRightText->setExclusiveGroup( "TextPos" ); - //connect( m_paBottomText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextBottom( bool ) ) ); - //connect( m_paRightText, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotTextRight( bool ) ) ); + //connect( m_paBottomText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextBottom( bool ) ) ); + //connect( m_paRightText, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotTextRight( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem * ) ), - this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( returnPressed( TQIconViewItem * ) ), - this, TQT_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem * ) ), + this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( returnPressed( TQIconViewItem * ) ), + this, TQ_SLOT( slotReturnPressed( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); + connect( m_pIconView, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); - connect( m_pIconView, TQT_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); - connect( m_pIconView, TQT_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) ); - connect( m_pIconView, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), - this, TQT_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQ_SIGNAL( mouseButtonPressed(int, TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotMouseButtonPressed(int, TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQ_SIGNAL( mouseButtonClicked(int, TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotMouseButtonClicked(int, TQIconViewItem*, const TQPoint&)) ); + connect( m_pIconView, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*, const TQPoint&)), + this, TQ_SLOT( slotContextMenuRequested(TQIconViewItem*, const TQPoint&)) ); // Signals needed to implement the spring loading folders behavior - connect( m_pIconView, TQT_SIGNAL( held( TQIconViewItem * ) ), - this, TQT_SLOT( slotDragHeld( TQIconViewItem * ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragEntered( bool ) ), - this, TQT_SLOT( slotDragEntered( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragLeft() ), - this, TQT_SLOT( slotDragLeft() ) ); - connect( m_pIconView, TQT_SIGNAL( dragMove( bool ) ), - this, TQT_SLOT( slotDragMove( bool ) ) ); - connect( m_pIconView, TQT_SIGNAL( dragFinished() ), - this, TQT_SLOT( slotDragFinished() ) ); + connect( m_pIconView, TQ_SIGNAL( held( TQIconViewItem * ) ), + this, TQ_SLOT( slotDragHeld( TQIconViewItem * ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragEntered( bool ) ), + this, TQ_SLOT( slotDragEntered( bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragLeft() ), + this, TQ_SLOT( slotDragLeft() ) ); + connect( m_pIconView, TQ_SIGNAL( dragMove( bool ) ), + this, TQ_SLOT( slotDragMove( bool ) ) ); + connect( m_pIconView, TQ_SIGNAL( dragFinished() ), + this, TQ_SLOT( slotDragFinished() ) ); // Create the directory lister m_dirLister = new KDirLister( true ); setDirLister( m_dirLister ); m_dirLister->setMainWindow(m_pIconView->topLevelWidget()); - connect( m_dirLister, TQT_SIGNAL( started( const KURL & ) ), - this, TQT_SLOT( slotStarted() ) ); - connect( m_dirLister, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); - connect( m_dirLister, TQT_SIGNAL( canceled( const KURL& ) ), this, TQT_SLOT( slotCanceled( const KURL& ) ) ); - connect( m_dirLister, TQT_SIGNAL( clear() ), this, TQT_SLOT( slotClear() ) ); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList& ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ), - TQT_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) ); - connect( m_dirLister, TQT_SIGNAL( infoMessage( const TQString& ) ), - extension(), TQT_SIGNAL( infoMessage( const TQString& ) ) ); - connect( m_dirLister, TQT_SIGNAL( percent( int ) ), - extension(), TQT_SIGNAL( loadingProgress( int ) ) ); - connect( m_dirLister, TQT_SIGNAL( speed( int ) ), - extension(), TQT_SIGNAL( speedProgress( int ) ) ); + connect( m_dirLister, TQ_SIGNAL( started( const KURL & ) ), + this, TQ_SLOT( slotStarted() ) ); + connect( m_dirLister, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) ); + connect( m_dirLister, TQ_SIGNAL( canceled( const KURL& ) ), this, TQ_SLOT( slotCanceled( const KURL& ) ) ); + connect( m_dirLister, TQ_SIGNAL( clear() ), this, TQ_SLOT( slotClear() ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList& ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ), + TQ_SIGNAL( itemsFilteredByMime(const KFileItemList& ) ) ); + connect( m_dirLister, TQ_SIGNAL( infoMessage( const TQString& ) ), + extension(), TQ_SIGNAL( infoMessage( const TQString& ) ) ); + connect( m_dirLister, TQ_SIGNAL( percent( int ) ), + extension(), TQ_SIGNAL( loadingProgress( int ) ) ); + connect( m_dirLister, TQ_SIGNAL( speed( int ) ), + extension(), TQ_SIGNAL( speedProgress( int ) ) ); // Now we may react to configuration changes m_bInit = false; @@ -399,8 +399,8 @@ KonqKfmIconView::KonqKfmIconView( TQWidget *parentWidget, TQObject *parent, cons m_bPreviewRunningBeforeCloseURL = false; m_pIconView->setResizeMode( TQIconView::Adjust ); - connect( m_pIconView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( m_pIconView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); // Respect kcmkonq's configuration for word-wrap icon text. // If we want something else, we have to adapt the configuration or remove it... @@ -1150,8 +1150,8 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item) if (!m_paOutstandingOverlaysTimer) { m_paOutstandingOverlaysTimer = new TQTimer(this); - connect(m_paOutstandingOverlaysTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotDirectoryOverlayStart())); + connect(m_paOutstandingOverlaysTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotDirectoryOverlayStart())); } m_paOutstandingOverlaysTimer->start(20, true); } @@ -1166,8 +1166,8 @@ void KonqKfmIconView::showFreeSpaceOverlay(KFileIVI* item) if (!m_paOutstandingFreeSpaceOverlaysTimer) { m_paOutstandingFreeSpaceOverlaysTimer = new TQTimer(this); - connect(m_paOutstandingFreeSpaceOverlaysTimer, TQT_SIGNAL(timeout()), - TQT_SLOT(slotFreeSpaceOverlayStart())); + connect(m_paOutstandingFreeSpaceOverlaysTimer, TQ_SIGNAL(timeout()), + TQ_SLOT(slotFreeSpaceOverlayStart())); } m_paOutstandingFreeSpaceOverlaysTimer->start(20, true); } @@ -1185,7 +1185,7 @@ void KonqKfmIconView::slotDirectoryOverlayStart() if (overlay) { - connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDirectoryOverlayFinished() ) ); + connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDirectoryOverlayFinished() ) ); overlay->start(); // Watch out, may emit finished() immediately!! return; // Let it run.... } @@ -1205,7 +1205,7 @@ void KonqKfmIconView::slotFreeSpaceOverlayStart() if (overlay) { - connect( overlay, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFreeSpaceOverlayFinished() ) ); + connect( overlay, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFreeSpaceOverlayFinished() ) ); overlay->start(); // Watch out, may emit finished() immediately!! return; // Let it run.... } @@ -1295,8 +1295,8 @@ void KonqKfmIconView::slotClear() if ( !m_pTimeoutRefreshTimer ) { m_pTimeoutRefreshTimer = new TQTimer( this ); - connect( m_pTimeoutRefreshTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRefreshViewport() ) ); + connect( m_pTimeoutRefreshTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRefreshViewport() ) ); } m_pTimeoutRefreshTimer->start( 700, true ); @@ -1575,8 +1575,8 @@ static KStaticDeleter<SpringLoadingManager> s_springManagerDeleter; SpringLoadingManager::SpringLoadingManager() : m_startPart(0L) { - connect( &m_endTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( finished() ) ); + connect( &m_endTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( finished() ) ); } diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 9e4480d0b..395da6a5d 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -78,136 +78,136 @@ void KEBApp::createActions() { // save and quit should probably not be in the toplevel??? (void) KStdAction::quit( - this, TQT_SLOT( close() ), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + this, TQ_SLOT( close() ), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); (void) KStdAction::configureToolbars( - this, TQT_SLOT( slotConfigureToolbars() ), actionCollection()); + this, TQ_SLOT( slotConfigureToolbars() ), actionCollection()); if (m_browser) { (void) KStdAction::open( - actn, TQT_SLOT( slotLoad() ), actionCollection()); + actn, TQ_SLOT( slotLoad() ), actionCollection()); (void) KStdAction::saveAs( - actn, TQT_SLOT( slotSaveAs() ), actionCollection()); + actn, TQ_SLOT( slotSaveAs() ), actionCollection()); } - (void) KStdAction::cut(actn, TQT_SLOT( slotCut() ), actionCollection()); - (void) KStdAction::copy(actn, TQT_SLOT( slotCopy() ), actionCollection()); - (void) KStdAction::paste(actn, TQT_SLOT( slotPaste() ), actionCollection()); - (void) KStdAction::print(actn, TQT_SLOT( slotPrint() ), actionCollection()); + (void) KStdAction::cut(actn, TQ_SLOT( slotCut() ), actionCollection()); + (void) KStdAction::copy(actn, TQ_SLOT( slotCopy() ), actionCollection()); + (void) KStdAction::paste(actn, TQ_SLOT( slotPaste() ), actionCollection()); + (void) KStdAction::print(actn, TQ_SLOT( slotPrint() ), actionCollection()); // settings menu (void) new TDEToggleAction( i18n("&Show Netscape Bookmarks in Konqueror"), 0, - actn, TQT_SLOT( slotShowNS() ), actionCollection(), + actn, TQ_SLOT( slotShowNS() ), actionCollection(), "settings_showNS"); // actions (void) new TDEAction( i18n("&Delete"), "edit-delete", Key_Delete, - actn, TQT_SLOT( slotDelete() ), actionCollection(), "delete"); + actn, TQ_SLOT( slotDelete() ), actionCollection(), "delete"); (void) new TDEAction( i18n("Rename"), "text", Key_F2, - actn, TQT_SLOT( slotRename() ), actionCollection(), "rename"); + actn, TQ_SLOT( slotRename() ), actionCollection(), "rename"); (void) new TDEAction( i18n("C&hange URL"), "text", Key_F3, - actn, TQT_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); + actn, TQ_SLOT( slotChangeURL() ), actionCollection(), "changeurl"); (void) new TDEAction( i18n("C&hange Comment"), "text", Key_F4, - actn, TQT_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); + actn, TQ_SLOT( slotChangeComment() ), actionCollection(), "changecomment"); (void) new TDEAction( i18n("Chan&ge Icon..."), "icons", 0, - actn, TQT_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); + actn, TQ_SLOT( slotChangeIcon() ), actionCollection(), "changeicon"); (void) new TDEAction( i18n("Update Favicon"), 0, - actn, TQT_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); + actn, TQ_SLOT( slotUpdateFavIcon() ), actionCollection(), "updatefavicon"); (void) new TDEAction( i18n("Recursive Sort"), 0, - actn, TQT_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); + actn, TQ_SLOT( slotRecursiveSort() ), actionCollection(), "recursivesort"); (void) new TDEAction( i18n("&New Folder..."), "folder-new", CTRL+Key_N, - actn, TQT_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); + actn, TQ_SLOT( slotNewFolder() ), actionCollection(), "newfolder"); (void) new TDEAction( i18n("&New Bookmark"), "www", 0, - actn, TQT_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); + actn, TQ_SLOT( slotNewBookmark() ), actionCollection(), "newbookmark"); (void) new TDEAction( i18n("&Insert Separator"), CTRL+Key_I, - actn, TQT_SLOT( slotInsertSeparator() ), actionCollection(), + actn, TQ_SLOT( slotInsertSeparator() ), actionCollection(), "insertseparator"); (void) new TDEAction( i18n("&Sort Alphabetically"), 0, - actn, TQT_SLOT( slotSort() ), actionCollection(), "sort"); + actn, TQ_SLOT( slotSort() ), actionCollection(), "sort"); (void) new TDEAction( i18n("Set as T&oolbar Folder"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); + actn, TQ_SLOT( slotSetAsToolbar() ), actionCollection(), "setastoolbar"); (void) new TDEAction( i18n("Show in T&oolbar"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); + actn, TQ_SLOT( slotShowInToolbar() ), actionCollection(), "showintoolbar"); (void) new TDEAction( i18n("Hide in T&oolbar"), "bookmark_toolbar", 0, - actn, TQT_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); + actn, TQ_SLOT( slotHideInToolbar() ), actionCollection(), "hideintoolbar"); (void) new TDEAction( i18n("&Expand All Folders"), 0, - actn, TQT_SLOT( slotExpandAll() ), actionCollection(), "expandall"); + actn, TQ_SLOT( slotExpandAll() ), actionCollection(), "expandall"); (void) new TDEAction( i18n("Collapse &All Folders"), 0, - actn, TQT_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); + actn, TQ_SLOT( slotCollapseAll() ), actionCollection(), "collapseall" ); (void) new TDEAction( i18n("&Open in Konqueror"), "document-open", 0, - actn, TQT_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); + actn, TQ_SLOT( slotOpenLink() ), actionCollection(), "openlink" ); (void) new TDEAction( i18n("Check &Status"), "bookmark", 0, - actn, TQT_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); + actn, TQ_SLOT( slotTestSelection() ), actionCollection(), "testlink" ); (void) new TDEAction( i18n("Check Status: &All"), 0, - actn, TQT_SLOT( slotTestAll() ), actionCollection(), "testall" ); + actn, TQ_SLOT( slotTestAll() ), actionCollection(), "testall" ); (void) new TDEAction( i18n("Update All &Favicons"), 0, - actn, TQT_SLOT( slotUpdateAllFavIcons() ), actionCollection(), + actn, TQ_SLOT( slotUpdateAllFavIcons() ), actionCollection(), "updateallfavicons" ); (void) new TDEAction( i18n("Cancel &Checks"), 0, - actn, TQT_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); + actn, TQ_SLOT( slotCancelAllTests() ), actionCollection(), "canceltests" ); (void) new TDEAction( i18n("Cancel &Favicon Updates"), 0, - actn, TQT_SLOT( slotCancelFavIconUpdates() ), actionCollection(), + actn, TQ_SLOT( slotCancelFavIconUpdates() ), actionCollection(), "cancelfaviconupdates" ); (void) new TDEAction( i18n("Import &Netscape Bookmarks..."), "netscape", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importNS"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importNS"); (void) new TDEAction( i18n("Import &Opera Bookmarks..."), "opera", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importOpera"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importOpera"); (void) new TDEAction( i18n("Import All &Crash Sessions as Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importCrashes"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importCrashes"); (void) new TDEAction( i18n("Import &Galeon Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importGaleon"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importGaleon"); (void) new TDEAction( i18n("Import &KDE2/KDE3/TDE Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importKDE2"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importKDE2"); (void) new TDEAction( i18n("Import &IE Bookmarks..."), 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importIE"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importIE"); (void) new TDEAction( i18n("Import &Mozilla Bookmarks..."), "mozilla", 0, - actn, TQT_SLOT( slotImport() ), actionCollection(), "importMoz"); + actn, TQ_SLOT( slotImport() ), actionCollection(), "importMoz"); (void) new TDEAction( i18n("Export to &Netscape Bookmarks"), "netscape", 0, - actn, TQT_SLOT( slotExportNS() ), actionCollection(), "exportNS"); + actn, TQ_SLOT( slotExportNS() ), actionCollection(), "exportNS"); (void) new TDEAction( i18n("Export to &Opera Bookmarks..."), "opera", 0, - actn, TQT_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); + actn, TQ_SLOT( slotExportOpera() ), actionCollection(), "exportOpera"); (void) new TDEAction( i18n("Export to &HTML Bookmarks..."), "text-html", 0, - actn, TQT_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); + actn, TQ_SLOT( slotExportHTML() ), actionCollection(), "exportHTML"); (void) new TDEAction( i18n("Export to &IE Bookmarks..."), 0, - actn, TQT_SLOT( slotExportIE() ), actionCollection(), "exportIE"); + actn, TQ_SLOT( slotExportIE() ), actionCollection(), "exportIE"); (void) new TDEAction( i18n("Export to &Mozilla Bookmarks..."), "mozilla", 0, - actn, TQT_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); + actn, TQ_SLOT( slotExportMoz() ), actionCollection(), "exportMoz"); } void ActionsImpl::slotLoad() { @@ -444,7 +444,7 @@ void ActionsImpl::slotPrint() { s_appId = kapp->dcopClient()->appId(); s_objId = s_part->property("dcopObjectId").toString().latin1(); - connect(s_part, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDelayedPrint())); + connect(s_part, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDelayedPrint())); s_part->openURL(KURL( tmpf.name() )); } diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index 8a7e05c3a..45da6db7a 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/konqueror/keditbookmarks/bookmarkinfo.cpp @@ -231,7 +231,7 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) : TQWidget(parent, name), m_connected(false) { timer = new TQTimer(this); - connect(timer, TQT_SIGNAL( timeout() ), TQT_SLOT( commitChanges())); + connect(timer, TQ_SIGNAL( timeout() ), TQ_SLOT( commitChanges())); titlecmd = 0; urlcmd = 0; @@ -246,9 +246,9 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) new TQLabel(m_title_le, i18n("Name:"), this), 0, 0); - connect(m_title_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedTitle(const TQString &) )); - connect(m_title_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitTitle() )); + connect(m_title_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedTitle(const TQString &) )); + connect(m_title_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitTitle() )); m_url_le = new BookmarkLineEdit(this); grid->addWidget(m_url_le, 1, 1); @@ -256,18 +256,18 @@ BookmarkInfoWidget::BookmarkInfoWidget(TQWidget *parent, const char *name) new TQLabel(m_url_le, i18n("Location:"), this), 1, 0); - connect(m_url_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedURL(const TQString &) )); - connect(m_url_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitURL() )); + connect(m_url_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedURL(const TQString &) )); + connect(m_url_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitURL() )); m_comment_le = new BookmarkLineEdit(this); grid->addWidget(m_comment_le, 2, 1); grid->addWidget( new TQLabel(m_comment_le, i18n("Comment:"), this), 2, 0); - connect(m_comment_le, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotTextChangedComment(const TQString &) )); - connect(m_comment_le, TQT_SIGNAL( lostFocus() ), TQT_SLOT( commitComment() )); + connect(m_comment_le, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotTextChangedComment(const TQString &) )); + connect(m_comment_le, TQ_SIGNAL( lostFocus() ), TQ_SLOT( commitComment() )); m_credate_le = new KLineEdit(this); grid->addWidget(m_credate_le, 0, 3); diff --git a/konqueror/keditbookmarks/bookmarkiterator.cpp b/konqueror/keditbookmarks/bookmarkiterator.cpp index 41aa6299d..35374136f 100644 --- a/konqueror/keditbookmarks/bookmarkiterator.cpp +++ b/konqueror/keditbookmarks/bookmarkiterator.cpp @@ -27,8 +27,8 @@ #include <tqtimer.h> BookmarkIterator::BookmarkIterator(TQValueList<KBookmark> bks) : m_bklist(bks) { - connect(this, TQT_SIGNAL( deleteSelf(BookmarkIterator *) ), - TQT_SLOT( slotCancelTest(BookmarkIterator *) )); + connect(this, TQ_SIGNAL( deleteSelf(BookmarkIterator *) ), + TQ_SLOT( slotCancelTest(BookmarkIterator *) )); delayedEmitNextOne(); } @@ -37,7 +37,7 @@ BookmarkIterator::~BookmarkIterator() { } void BookmarkIterator::delayedEmitNextOne() { - TQTimer::singleShot(1, this, TQT_SLOT( nextOne() )); + TQTimer::singleShot(1, this, TQ_SLOT( nextOne() )); } void BookmarkIterator::slotCancelTest(BookmarkIterator *test) { diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp index 0d262bc7a..b02f0af16 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/konqueror/keditbookmarks/dcop.cpp @@ -37,8 +37,8 @@ KBookmarkEditorIface::KBookmarkEditorIface() : TQObject(), DCOPObject("KBookmarkEditor") { - // connect(KBookmarkNotifier_stub, TQT_SIGNAL( updatedAccessMetadata(TQString,TQString) ), - // this, TQT_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); + // connect(KBookmarkNotifier_stub, TQ_SIGNAL( updatedAccessMetadata(TQString,TQString) ), + // this, TQ_SLOT( slotDcopUpdatedAccessMetadata(TQString,TQString) )); connectDCOPSignal(0, "KBookmarkNotifier", "updatedAccessMetadata(TQString,TQString)", "slotDcopUpdatedAccessMetadata(TQString,TQString)", false); } diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index 6013187bb..73cbd9ced 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/konqueror/keditbookmarks/favicons.cpp @@ -84,8 +84,8 @@ void FavIconsItr::doAction() { curItem()->setTmpStatus(i18n("Updating favicon...")); if (!m_updater) { m_updater = new FavIconUpdater(kapp, "FavIconUpdater"); - connect(m_updater, TQT_SIGNAL( done(bool) ), - this, TQT_SLOT( slotDone(bool) ) ); + connect(m_updater, TQ_SIGNAL( done(bool) ), + this, TQ_SLOT( slotDone(bool) ) ); } if (curBk().url().protocol().startsWith("http")) { m_updater->downloadIcon(curBk()); diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 1fd5cf222..f5a8474cc 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/konqueror/keditbookmarks/listview.cpp @@ -229,8 +229,8 @@ void ListView::selected(KEBListViewItem * item, bool s) } //FIXME do it once somewhere if (!KEBApp::self()->bkInfo()->connected()) { - connect(KEBApp::self()->bkInfo(), TQT_SIGNAL( updateListViewItem() ), - TQT_SLOT( slotBkInfoUpdateListViewItem() )); + connect(KEBApp::self()->bkInfo(), TQ_SIGNAL( updateListViewItem() ), + TQ_SLOT( slotBkInfoUpdateListViewItem() )); KEBApp::self()->bkInfo()->setConnected(true); } @@ -716,21 +716,21 @@ void KEBListView::init() { setDragEnabled(true); setSelectionModeExt((!m_folderList) ? TDEListView::Extended: TDEListView::Single); setAllColumnsShowFocus(true); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); } void KEBListView::makeConnections() { - connect(this, TQT_SIGNAL( moved() ), - TQT_SLOT( slotMoved() )); - connect(this, TQT_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), - TQT_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); - connect(this, TQT_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), - TQT_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); - connect(this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); - connect(this, TQT_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), - TQT_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); + connect(this, TQ_SIGNAL( moved() ), + TQ_SLOT( slotMoved() )); + connect(this, TQ_SIGNAL( contextMenu(TDEListView *, TQListViewItem*, const TQPoint &) ), + TQ_SLOT( slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &) )); + connect(this, TQ_SIGNAL( itemRenamed(TQListViewItem *, const TQString &, int) ), + TQ_SLOT( slotItemRenamed(TQListViewItem *, const TQString &, int) )); + connect(this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( slotDoubleClicked(TQListViewItem *, const TQPoint &, int) )); + connect(this, TQ_SIGNAL( dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) ), + TQ_SLOT( slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*) )); } void KEBListView::readonlyFlagInit(bool readonly) { diff --git a/konqueror/keditbookmarks/testlink.cpp b/konqueror/keditbookmarks/testlink.cpp index 767c15a50..707491741 100644 --- a/konqueror/keditbookmarks/testlink.cpp +++ b/konqueror/keditbookmarks/testlink.cpp @@ -88,10 +88,10 @@ void TestLinkItr::doAction() { m_job->addMetaData("errorPage", "true"); m_job->addMetaData( TQString("cookies"), TQString("none") ); - connect(m_job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotJobResult(TDEIO::Job *))); - connect(m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); + connect(m_job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotJobResult(TDEIO::Job *))); + connect(m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT( slotJobData(TDEIO::Job *, const TQByteArray &))); curItem()->setTmpStatus(i18n("Checking...")); TQString oldModDate = TestLinkItrHolder::self()->getMod(curBk().url().url()); diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index cc8161f4e..d685e8dee 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/konqueror/keditbookmarks/toplevel.cpp @@ -58,8 +58,8 @@ CmdHistory* CmdHistory::s_self = 0; CmdHistory::CmdHistory(TDEActionCollection *collection) : m_commandHistory(collection) { - connect(&m_commandHistory, TQT_SIGNAL( commandExecuted(KCommand *) ), - TQT_SLOT( slotCommandExecuted(KCommand *) )); + connect(&m_commandHistory, TQ_SIGNAL( commandExecuted(KCommand *) ), + TQ_SLOT( slotCommandExecuted(KCommand *) )); assert(!s_self); s_self = this; // this is hacky } @@ -138,8 +138,8 @@ void CurrentMgr::createManager(const TQString &filename) { m_mgr = KBookmarkManager::managerForFile(filename, false); - connect(m_mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) )); + connect(m_mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) )); } void CurrentMgr::slotBookmarksChanged(const TQString &, const TQString &) { @@ -219,8 +219,8 @@ KEBApp::KEBApp( TDEListViewSearchLine *searchLineEdit = new KEBSearchLine(quicksearch, 0, "TDEListViewSearchLine"); quicksearch->setStretchableWidget(searchLineEdit); lbl->setBuddy(searchLineEdit); - connect(resetQuickSearch, TQT_SIGNAL(activated()), searchLineEdit, TQT_SLOT(clear())); - connect(searchLineEdit, TQT_SIGNAL(searchUpdated()), TQT_SLOT(updateActions())); + connect(resetQuickSearch, TQ_SIGNAL(activated()), searchLineEdit, TQ_SLOT(clear())); + connect(searchLineEdit, TQ_SIGNAL(searchUpdated()), TQ_SLOT(updateActions())); ListView::createListViews(vsplitter); ListView::self()->initListViews(); @@ -245,8 +245,8 @@ KEBApp::KEBApp( m_dcopIface = new KBookmarkEditorIface(); - connect(kapp->clipboard(), TQT_SIGNAL( dataChanged() ), - TQT_SLOT( slotClipboardDataChanged() )); + connect(kapp->clipboard(), TQ_SIGNAL( dataChanged() ), + TQ_SLOT( slotClipboardDataChanged() )); ListView::self()->connectSignals(); @@ -337,8 +337,8 @@ void KEBApp::notifyCommandExecuted() { void KEBApp::slotConfigureToolbars() { saveMainWindowSettings(TDEGlobal::config(), "MainWindow"); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), - TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), + TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index 9a0280dfa..377026411 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -95,10 +95,10 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { part->setProperty("javaEnabled", TQVariant(false)); part->setProperty("autoloadImages", TQVariant(false)); - connect(part, TQT_SIGNAL( canceled(const TQString &) ), - this, TQT_SLOT( slotCompleted() )); - connect(part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() )); + connect(part, TQ_SIGNAL( canceled(const TQString &) ), + this, TQ_SLOT( slotCompleted() )); + connect(part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() )); KParts::BrowserExtension *ext = KParts::BrowserExtension::childObject(part); assert(ext); @@ -106,8 +106,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { m_browserIface = new FavIconBrowserInterface(this, "browseriface"); ext->setBrowserInterface(m_browserIface); - connect(ext, TQT_SIGNAL( setIconURL(const KURL &) ), - this, TQT_SLOT( setIconURL(const KURL &) )); + connect(ext, TQ_SIGNAL( setIconURL(const KURL &) ), + this, TQ_SLOT( setIconURL(const KURL &) )); m_part = part; } @@ -115,7 +115,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { if (!m_timer) { // Timeout to stop the updating hanging m_timer = new TQTimer(this); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); } m_timer->start(15000,false); m_webGrabber = new FavIconWebGrabber(m_part, bk.url()); @@ -149,10 +149,10 @@ FavIconWebGrabber::FavIconWebGrabber(KParts::ReadOnlyPart *part, const KURL &url TDEIO::Job *job = TDEIO::get(m_url, false, false); job->addMetaData( TQString("cookies"), TQString("none") ); - connect(job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotFinished(TDEIO::Job *) )); - connect(job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); + connect(job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotFinished(TDEIO::Job *) )); + connect(job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) )); } void FavIconWebGrabber::slotMimetype(TDEIO::Job *job, const TQString & /*type*/) { diff --git a/konqueror/konq_actions.cpp b/konqueror/konq_actions.cpp index d87a73971..fa93bca57 100644 --- a/konqueror/konq_actions.cpp +++ b/konqueror/konq_actions.cpp @@ -98,10 +98,10 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index ) { m_goMenu = (TQPopupMenu*)widget; // Forward signal (to main view) - connect( m_goMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SIGNAL( menuAboutToShow() ) ); - connect( m_goMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotActivated( int ) ) ); + connect( m_goMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SIGNAL( menuAboutToShow() ) ); + connect( m_goMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotActivated( int ) ) ); //kdDebug(1202) << "m_goMenu->count()=" << m_goMenu->count() << endl; // Store how many items the menu already contains. // This means, the KonqBidiHistoryAction has to be plugged LAST in a menu ! @@ -261,12 +261,12 @@ int KonqLogoAction::plug( TQWidget *widget, int index ) int id_ = getToolButtonID(); - bar->insertAnimatedWidget( id_, this, TQT_SIGNAL(activated()), TQString("trinity"), index ); + bar->insertAnimatedWidget( id_, this, TQ_SIGNAL(activated()), TQString("trinity"), index ); bar->alignItemRight( id_ ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -284,12 +284,12 @@ KonqViewModeAction::KonqViewModeAction( const TQString &text, const TQString &ic { m_menu = new TQPopupMenu; - connect( m_menu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotPopupAboutToShow() ) ); - connect( m_menu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotPopupActivated() ) ); - connect( m_menu, TQT_SIGNAL( aboutToHide() ), - this, TQT_SLOT( slotPopupAboutToHide() ) ); + connect( m_menu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotPopupAboutToShow() ) ); + connect( m_menu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotPopupActivated() ) ); + connect( m_menu, TQ_SIGNAL( aboutToHide() ), + this, TQ_SLOT( slotPopupAboutToHide() ) ); } KonqViewModeAction::~KonqViewModeAction() @@ -355,10 +355,10 @@ KonqMostOftenURLSAction::KonqMostOftenURLSAction( const TQString& text, { setDelayed( false ); - connect( popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( slotFillMenu() )); - //connect( popupMenu(), TQT_SIGNAL( aboutToHide() ), TQT_SLOT( slotClearMenu() )); - connect( popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated(int) )); + connect( popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( slotFillMenu() )); + //connect( popupMenu(), TQ_SIGNAL( aboutToHide() ), TQ_SLOT( slotClearMenu() )); + connect( popupMenu(), TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated(int) )); // Need to do all this upfront for a correct initial state init(); } @@ -380,11 +380,11 @@ void KonqMostOftenURLSAction::parseHistory() // only ever called once KonqHistoryManager *mgr = KonqHistoryManager::kself(); KonqHistoryIterator it( mgr->entries() ); - connect( mgr, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * )), - TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ))); - connect( mgr, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry * )), - TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry * ))); - connect( mgr, TQT_SIGNAL( cleared() ), TQT_SLOT( slotHistoryCleared() )); + connect( mgr, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * )), + TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ))); + connect( mgr, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry * )), + TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry * ))); + connect( mgr, TQ_SIGNAL( cleared() ), TQ_SLOT( slotHistoryCleared() )); s_mostEntries = new MostOftenList; // exit() will clean this up for now for ( uint i = 0; it.current() && i < s_maxEntries; i++ ) { diff --git a/konqueror/konq_combo.cpp b/konqueror/konq_combo.cpp index 8793441cd..ef65a5412 100644 --- a/konqueror/konq_combo.cpp +++ b/konqueror/konq_combo.cpp @@ -122,14 +122,14 @@ KonqCombo::KonqCombo( TQWidget *parent, const char *name ) // Make the lineedit consume the Key_Enter event... setTrapReturnKey( true ); - connect( KonqHistoryManager::kself(), TQT_SIGNAL(cleared()), TQT_SLOT(slotCleared()) ); - connect( this, TQT_SIGNAL(cleared() ), TQT_SLOT(slotCleared()) ); - connect( this, TQT_SIGNAL(highlighted( int )), TQT_SLOT(slotSetIcon( int )) ); - connect( this, TQT_SIGNAL(activated( const TQString& )), - TQT_SLOT(slotActivated( const TQString& )) ); + connect( KonqHistoryManager::kself(), TQ_SIGNAL(cleared()), TQ_SLOT(slotCleared()) ); + connect( this, TQ_SIGNAL(cleared() ), TQ_SLOT(slotCleared()) ); + connect( this, TQ_SIGNAL(highlighted( int )), TQ_SLOT(slotSetIcon( int )) ); + connect( this, TQ_SIGNAL(activated( const TQString& )), + TQ_SLOT(slotActivated( const TQString& )) ); setHistoryEditorEnabled( true ); - connect( this, TQT_SIGNAL(removed( const TQString&) ), TQT_SLOT(slotRemoved( const TQString& )) ); + connect( this, TQ_SIGNAL(removed( const TQString&) ), TQ_SLOT(slotRemoved( const TQString& )) ); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); diff --git a/konqueror/konq_extensionmanager.cpp b/konqueror/konq_extensionmanager.cpp index d60caeeb1..861fe0fff 100644 --- a/konqueror/konq_extensionmanager.cpp +++ b/konqueror/konq_extensionmanager.cpp @@ -52,9 +52,9 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai (new TQVBoxLayout(plainPage(), 0, 0))->setAutoAdd(true); d->pluginSelector = new KPluginSelector(plainPage()); setMainWidget(d->pluginSelector); - connect(d->pluginSelector, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(setChanged(bool))); - connect(d->pluginSelector, TQT_SIGNAL(configCommitted(const TQCString &)), - KSettings::Dispatcher::self(), TQT_SLOT(reparseConfiguration(const TQCString &))); + connect(d->pluginSelector, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(setChanged(bool))); + connect(d->pluginSelector, TQ_SIGNAL(configCommitted(const TQCString &)), + KSettings::Dispatcher::self(), TQ_SLOT(reparseConfiguration(const TQCString &))); d->mainWindow = mainWindow; d->activePart = activePart; diff --git a/konqueror/konq_frame.cpp b/konqueror/konq_frame.cpp index 93f465a13..32ca35650 100644 --- a/konqueror/konq_frame.cpp +++ b/konqueror/konq_frame.cpp @@ -90,8 +90,8 @@ KonqFrameStatusBar::KonqFrameStatusBar( KonqFrame *_parent, const char *_name ) "directory tree with an icon view or detailed view, and possibly a " "terminal emulator window." ) ); addWidget( m_pLinkedViewCheckBox, 0, true /*permanent->right align*/ ); - connect( m_pLinkedViewCheckBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(linkedViewClicked(bool)) ); + connect( m_pLinkedViewCheckBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(linkedViewClicked(bool)) ); m_progressBar = new KProgress( this ); m_progressBar->setMaximumHeight(fontMetrics().height()); @@ -151,7 +151,7 @@ void KonqFrameStatusBar::splitFrameMenu() // We have to ship the remove view action ourselves, // since this may not be the active view (passive view) - TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQT_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); + TDEAction actRemoveView(i18n("Close View"), "view_remove", 0, m_pParentKonqFrame, TQ_SLOT(slotRemoveView()), (TQObject*)0, "removethisview"); //KonqView * nextView = mw->viewManager()->chooseNextView( m_pParentKonqFrame->childView() ); actRemoveView.setEnabled( mw->mainViewsCount() > 1 || m_pParentKonqFrame->childView()->isToggleView() || m_pParentKonqFrame->childView()->isPassiveMode() ); @@ -242,7 +242,7 @@ void KonqFrameStatusBar::slotSpeedProgress( int bytesPerSecond ) void KonqFrameStatusBar::slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *newOne) { if (newOne!=0) - connect(newOne,TQT_SIGNAL(setStatusBarText(const TQString &)),this,TQT_SLOT(slotDisplayStatusText(const TQString&))); + connect(newOne,TQ_SIGNAL(setStatusBarText(const TQString &)),this,TQ_SLOT(slotDisplayStatusText(const TQString&))); slotDisplayStatusText( TQString::null ); } @@ -302,8 +302,8 @@ KonqFrame::KonqFrame( TQWidget* parent, KonqFrameContainerBase *parentContainer, // the frame statusbar m_pStatusBar = new KonqFrameStatusBar( this, "KonquerorFrameStatusBar"); m_pStatusBar->setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); - connect(m_pStatusBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStatusBarClicked())); - connect( m_pStatusBar, TQT_SIGNAL( linkedViewClicked( bool ) ), this, TQT_SLOT( slotLinkedViewClicked( bool ) ) ); + connect(m_pStatusBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStatusBarClicked())); + connect( m_pStatusBar, TQ_SIGNAL( linkedViewClicked( bool ) ), this, TQ_SLOT( slotLinkedViewClicked( bool ) ) ); m_separator = 0; m_pParentContainer = parentContainer; } @@ -420,8 +420,8 @@ void KonqFrame::setView( KonqView* child ) m_pView = child; if (m_pView) { - connect(m_pView,TQT_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)), - m_pStatusBar,TQT_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *))); + connect(m_pView,TQ_SIGNAL(sigPartChanged(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *)), + m_pStatusBar,TQ_SLOT(slotConnectToNewView(KonqView *, KParts::ReadOnlyPart *,KParts::ReadOnlyPart *))); } } diff --git a/konqueror/konq_guiclients.cpp b/konqueror/konq_guiclients.cpp index 0e014e70a..2e3703151 100644 --- a/konqueror/konq_guiclients.cpp +++ b/konqueror/konq_guiclients.cpp @@ -157,7 +157,7 @@ void PopupMenuGUIClient::addEmbeddingService( TQDomElement &menu, int idx, const action.setAttribute( "group", "preview" ); (void)new TDEAction( name, service->pixmap( TDEIcon::Small ), 0, - m_mainWindow, TQT_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); + m_mainWindow, TQ_SLOT( slotOpenEmbedded() ), actionCollection(), actName ); } ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) @@ -202,8 +202,8 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) if ( (*cIt)->icon() != "unknown" ) action->setIcon( (*cIt)->icon() ); - connect( action, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleView( bool ) ) ); + connect( action, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleView( bool ) ) ); m_actions.insert( name, action ); @@ -212,10 +212,10 @@ ToggleViewGUIClient::ToggleViewGUIClient( KonqMainWindow *mainWindow ) m_mapOrientation.insert( name, horizontal ); } - connect( m_mainWindow, TQT_SIGNAL( viewAdded( KonqView * ) ), - this, TQT_SLOT( slotViewAdded( KonqView * ) ) ); - connect( m_mainWindow, TQT_SIGNAL( viewRemoved( KonqView * ) ), - this, TQT_SLOT( slotViewRemoved( KonqView * ) ) ); + connect( m_mainWindow, TQ_SIGNAL( viewAdded( KonqView * ) ), + this, TQ_SLOT( slotViewAdded( KonqView * ) ) ); + connect( m_mainWindow, TQ_SIGNAL( viewRemoved( KonqView * ) ), + this, TQ_SLOT( slotViewRemoved( KonqView * ) ) ); } ToggleViewGUIClient::~ToggleViewGUIClient() diff --git a/konqueror/konq_mainwindow.cpp b/konqueror/konq_mainwindow.cpp index f5a34925a..01cbf5a52 100644 --- a/konqueror/konq_mainwindow.cpp +++ b/konqueror/konq_mainwindow.cpp @@ -186,9 +186,9 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqExtendedBookmarkOwner *extOwner = new KonqExtendedBookmarkOwner( this ); m_pBookmarksOwner = extOwner; connect( extOwner, - TQT_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ), + TQ_SIGNAL( signalFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ), extOwner, - TQT_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) ); + TQ_SLOT( slotFillBookmarksList(KExtendedBookmarkOwner::QStringPairList &) ) ); // init history-manager, load history, get completion object if ( !s_pCompletion ) { @@ -201,7 +201,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con int mode = KonqSettings::settingsCompletionMode(); s_pCompletion->setCompletionMode( (TDEGlobalSettings::Completion) mode ); } - connect(KParts::HistoryProvider::self(), TQT_SIGNAL(cleared()), TQT_SLOT(slotClearComboHistory())); + connect(KParts::HistoryProvider::self(), TQ_SIGNAL(cleared()), TQ_SLOT(slotClearComboHistory())); KonqPixmapProvider *prov = KonqPixmapProvider::self(); if ( !s_comboConfig ) { @@ -210,17 +210,17 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con s_comboConfig->setGroup( "Location Bar" ); prov->load( s_comboConfig, "ComboIconCache" ); } - connect( prov, TQT_SIGNAL( changed() ), TQT_SLOT( slotIconsChanged() ) ); + connect( prov, TQ_SIGNAL( changed() ), TQ_SLOT( slotIconsChanged() ) ); initCombo(); initActions(); setInstance( TDEGlobal::instance() ); - connect( KSycoca::self(), TQT_SIGNAL( databaseChanged() ), - this, TQT_SLOT( slotDatabaseChanged() ) ); + connect( KSycoca::self(), TQ_SIGNAL( databaseChanged() ), + this, TQ_SLOT( slotDatabaseChanged() ) ); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged()), TQT_SLOT(slotReconfigure())); + connect( kapp, TQ_SIGNAL( tdedisplayFontChanged()), TQ_SLOT(slotReconfigure())); //load the xmlui file specified in the profile or the default konqueror.rc setXMLFile( xmluiFile ); @@ -229,7 +229,7 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con createGUI( 0L ); - connect(toolBarMenuAction(),TQT_SIGNAL(activated()),this,TQT_SLOT(slotForceSaveMainWindowSettings()) ); + connect(toolBarMenuAction(),TQ_SIGNAL(activated()),this,TQ_SLOT(slotForceSaveMainWindowSettings()) ); if ( !m_toggleViewGUIClient->empty() ) plugActionList( TQString::fromLatin1( "toggleview" ), m_toggleViewGUIClient->actions() ); @@ -255,8 +255,8 @@ KonqMainWindow::KonqMainWindow( const KURL &initialURL, bool openInitialURL, con KonqUndoManager::incRef(); - connect( KonqUndoManager::self(), TQT_SIGNAL( undoAvailable( bool ) ), - this, TQT_SLOT( slotUndoAvailable( bool ) ) ); + connect( KonqUndoManager::self(), TQ_SIGNAL( undoAvailable( bool ) ), + this, TQ_SLOT( slotUndoAvailable( bool ) ) ); m_bNeedApplyKonqMainWindowSettings = true; if ( !initialURL.isEmpty() ) @@ -361,7 +361,7 @@ TQWidget * KonqMainWindow::createContainer( TQWidget *parent, int index, const T m_bookmarkBarActionCollection->setHighlightingEnabled( true ); connectActionCollection( m_bookmarkBarActionCollection ); DelayedInitializer *initializer = new DelayedInitializer( TQEvent::Show, res ); - connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT(initBookmarkBar()) ); + connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT(initBookmarkBar()) ); } } @@ -377,11 +377,11 @@ void KonqMainWindow::initBookmarkBar() delete m_paBookmarkBar; m_paBookmarkBar = new KBookmarkBar( KonqBookmarkManager::self(), m_pBookmarksOwner, bar, m_bookmarkBarActionCollection, this ); connect( m_paBookmarkBar, - TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), - this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); + TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), + this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_paBookmarkBar, - TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), - this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); + TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), + this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); // hide if empty if (bar->count() == 0 ) @@ -699,7 +699,7 @@ void KonqMainWindow::openURL( KonqView *_view, const KURL &_url, if ( view == m_currentView ) startAnimation(); - connect( run, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotRunFinished() ) ); + connect( run, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotRunFinished() ) ); } } @@ -1535,8 +1535,8 @@ void KonqMainWindow::slotToolFind() findPart->widget()->show(); findPart->widget()->setFocus(); - connect( dirPart, TQT_SIGNAL( findClosed(KonqDirPart *) ), - this, TQT_SLOT( slotFindClosed(KonqDirPart *) ) ); + connect( dirPart, TQ_SIGNAL( findClosed(KonqDirPart *) ), + this, TQ_SLOT( slotFindClosed(KonqDirPart *) ) ); } else if ( sender()->inherits( "TDEAction" ) ) // don't go there if called by the singleShot below { @@ -1550,7 +1550,7 @@ void KonqMainWindow::slotToolFind() "filemanagement", url, KParts::URLArgs(), true /* forbid "use html"*/ ); mw->m_paFindFiles->setChecked(true); // Delay it after the openURL call (hacky!) - TQTimer::singleShot( 1, mw, TQT_SLOT(slotToolFind())); + TQTimer::singleShot( 1, mw, TQ_SLOT(slotToolFind())); m_paFindFiles->setChecked(false); } } @@ -1864,14 +1864,14 @@ void KonqMainWindow::slotReloadStop() { } void KonqMainWindow::toggleReloadStopButton(bool isReload) { - //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + //m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" ); if (isReload) { m_paReloadStop->setIcon("process-stop"); m_paReloadStop->setWhatsThis( i18n( "Stop loading the document<p>" "All network transfers will be stopped and Konqueror will display the content " "that has been received so far." ) ); m_paReloadStop->setToolTip( i18n( "Stop loading the document" ) ); - //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload" ); + //m_paReloadStop = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload" ); } else { m_paReloadStop->setIcon("reload"); m_paReloadStop->setWhatsThis( i18n( "Reload the currently displayed document<p>" @@ -1978,7 +1978,7 @@ void KonqMainWindow::slotGoHistory() // Show the sidebar if (!static_cast<TDEToggleAction*>(a)->isChecked()) { a->activate(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistory())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistory())); return; } @@ -2042,8 +2042,8 @@ void KonqMainWindow::slotConfigureToolbars() if ( autoSaveSettings() ) saveMainWindowSettings( TDEGlobal::config(), "KonqMainWindow" ); KEditToolbar dlg(factory()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(initBookmarkBar())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(initBookmarkBar())); dlg.exec(); } @@ -2342,8 +2342,8 @@ void KonqMainWindow::insertChildView( KonqView *childView ) kdDebug(1202) << "KonqMainWindow::insertChildView " << childView << endl; m_mapViews.insert( childView->part(), childView ); - connect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ), - this, TQT_SLOT( slotViewCompleted( KonqView * ) ) ); + connect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ), + this, TQ_SLOT( slotViewCompleted( KonqView * ) ) ); if ( !m_pViewManager->isLoadingProfile() ) // see KonqViewManager::loadViewProfile viewCountChanged(); @@ -2355,8 +2355,8 @@ void KonqMainWindow::removeChildView( KonqView *childView ) { kdDebug(1202) << "KonqMainWindow::removeChildView childView " << childView << endl; - disconnect( childView, TQT_SIGNAL( viewCompleted( KonqView * ) ), - this, TQT_SLOT( slotViewCompleted( KonqView * ) ) ); + disconnect( childView, TQ_SIGNAL( viewCompleted( KonqView * ) ), + this, TQ_SLOT( slotViewCompleted( KonqView * ) ) ); #ifndef NDEBUG dumpViewList(); @@ -2714,7 +2714,7 @@ void KonqMainWindow::slotBreakOffTabPopup() //Can't do this safely here as the tabbar may disappear and we're //hanging off here. - TQTimer::singleShot(0, this, TQT_SLOT( slotBreakOffTabPopupDelayed() ) ); + TQTimer::singleShot(0, this, TQ_SLOT( slotBreakOffTabPopupDelayed() ) ); } void KonqMainWindow::slotBreakOffTabPopupDelayed() @@ -2858,7 +2858,7 @@ void KonqMainWindow::slotRemoveTabPopup() } //Can't do immediately - may kill the tabbar, and we're in an event path down from it - TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveTabPopupDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveTabPopupDelayed() ) ); } void KonqMainWindow::slotRemoveTabPopupDelayed() @@ -2896,7 +2896,7 @@ void KonqMainWindow::slotRemoveOtherTabsPopup() m_pViewManager->showTab( originalView ); //Can't do immediately - kills the tabbar, and we're in an event path down from it - TQTimer::singleShot( 0, this, TQT_SLOT( slotRemoveOtherTabsPopupDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRemoveOtherTabsPopupDelayed() ) ); } void KonqMainWindow::slotRemoveOtherTabsPopupDelayed() @@ -3128,13 +3128,13 @@ void KonqMainWindow::slotUpAboutToShow() void KonqMainWindow::slotUp(TDEAction::ActivationReason, TQt::ButtonState state) { m_goState = state; - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) ); } void KonqMainWindow::slotUp() { m_goState = TQt::LeftButton; - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpDelayed() ) ); } void KonqMainWindow::slotUpDelayed() @@ -3192,7 +3192,7 @@ void KonqMainWindow::slotGoHistoryActivated( int steps, TQt::ButtonState state ) // Only start 1 timer. m_goBuffer = steps; m_goState = state; - TQTimer::singleShot( 0, this, TQT_SLOT(slotGoHistoryDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotGoHistoryDelayed())); } } @@ -3284,10 +3284,10 @@ void KonqMainWindow::initCombo() m_combo->init( s_pCompletion ); - connect( m_combo, TQT_SIGNAL(activated(const TQString&,int)), - this, TQT_SLOT(slotURLEntered(const TQString&,int)) ); - connect( m_combo, TQT_SIGNAL(showPageSecurity()), - this, TQT_SLOT(showPageSecurity()) ); + connect( m_combo, TQ_SIGNAL(activated(const TQString&,int)), + this, TQ_SLOT(slotURLEntered(const TQString&,int)) ); + connect( m_combo, TQ_SIGNAL(showPageSecurity()), + this, TQ_SLOT(showPageSecurity()) ); m_pURLCompletion = new KURLCompletion(); m_pURLCompletion->setCompletionMode( s_pCompletion->completionMode() ); @@ -3296,18 +3296,18 @@ void KonqMainWindow::initCombo() // We do want completion of user names, right? //m_pURLCompletion->setReplaceHome( false ); // Leave ~ alone! Will be taken care of by filters!! - connect( m_combo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ))); - connect( m_combo, TQT_SIGNAL( completion( const TQString& )), - TQT_SLOT( slotMakeCompletion( const TQString& ))); - connect( m_combo, TQT_SIGNAL( substringCompletion( const TQString& )), - TQT_SLOT( slotSubstringcompletion( const TQString& ))); - connect( m_combo, TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ), - TQT_SLOT( slotRotation( TDECompletionBase::KeyBindingType ))); - connect( m_combo, TQT_SIGNAL( cleared() ), - TQT_SLOT ( slotClearHistory() ) ); - connect( m_pURLCompletion, TQT_SIGNAL( match(const TQString&) ), - TQT_SLOT( slotMatch(const TQString&) )); + connect( m_combo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ))); + connect( m_combo, TQ_SIGNAL( completion( const TQString& )), + TQ_SLOT( slotMakeCompletion( const TQString& ))); + connect( m_combo, TQ_SIGNAL( substringCompletion( const TQString& )), + TQ_SLOT( slotSubstringcompletion( const TQString& ))); + connect( m_combo, TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType) ), + TQ_SLOT( slotRotation( TDECompletionBase::KeyBindingType ))); + connect( m_combo, TQ_SIGNAL( cleared() ), + TQ_SLOT ( slotClearHistory() ) ); + connect( m_pURLCompletion, TQ_SIGNAL( match(const TQString&) ), + TQ_SLOT( slotMatch(const TQString&) )); m_combo->lineEdit()->installEventFilter(this); @@ -3316,7 +3316,7 @@ void KonqMainWindow::initCombo() { bookmarkCompletionInitialized = true; DelayedInitializer *initializer = new DelayedInitializer( TQEvent::KeyPress, m_combo->lineEdit() ); - connect( initializer, TQT_SIGNAL( initialize() ), this, TQT_SLOT( bookmarksIntoCompletion() ) ); + connect( initializer, TQ_SIGNAL( initialize() ), this, TQ_SLOT( bookmarksIntoCompletion() ) ); } } @@ -3504,22 +3504,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) duplicate->setEnabled( false ); if (slotNames.contains("cut()")) - disconnect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); + disconnect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) ); if (slotNames.contains("copy()")) - disconnect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); + disconnect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) ); if (slotNames.contains("paste()")) - disconnect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); + disconnect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) ); if (slotNames.contains("del()")) - disconnect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - disconnect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + disconnect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) ); + disconnect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - connect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); - connect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); - connect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); - connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); - connect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); + connect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) ); + connect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) ); + connect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) ); + connect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) ); + connect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) ); m_paTrash->setEnabled(false); m_paDelete->setEnabled(false); @@ -3545,22 +3545,22 @@ bool KonqMainWindow::eventFilter(TQObject*obj,TQEvent *ev) duplicate->setEnabled( actionCollection()->action("new_window")->isEnabled() ); if (slotNames.contains("cut()")) - connect( m_paCut, TQT_SIGNAL( activated() ), ext, TQT_SLOT( cut() ) ); + connect( m_paCut, TQ_SIGNAL( activated() ), ext, TQ_SLOT( cut() ) ); if (slotNames.contains("copy()")) - connect( m_paCopy, TQT_SIGNAL( activated() ), ext, TQT_SLOT( copy() ) ); + connect( m_paCopy, TQ_SIGNAL( activated() ), ext, TQ_SLOT( copy() ) ); if (slotNames.contains("paste()")) - connect( m_paPaste, TQT_SIGNAL( activated() ), ext, TQT_SLOT( paste() ) ); + connect( m_paPaste, TQ_SIGNAL( activated() ), ext, TQ_SLOT( paste() ) ); if (slotNames.contains("del()")) - connect( m_paDelete, TQT_SIGNAL( activated() ), ext, TQT_SLOT( del() ) ); - connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( m_paDelete, TQ_SIGNAL( activated() ), ext, TQ_SLOT( del() ) ); + connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); - disconnect( m_paCut, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( cut() ) ); - disconnect( m_paCopy, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( copy() ) ); - disconnect( m_paPaste, TQT_SIGNAL( activated() ), m_combo->lineEdit(), TQT_SLOT( paste() ) ); - disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); - disconnect( m_combo->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotCheckComboSelection()) ); - disconnect( m_combo->lineEdit(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCheckComboSelection()) ); + disconnect( m_paCut, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( cut() ) ); + disconnect( m_paCopy, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( copy() ) ); + disconnect( m_paPaste, TQ_SIGNAL( activated() ), m_combo->lineEdit(), TQ_SLOT( paste() ) ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) ); + disconnect( m_combo->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotCheckComboSelection()) ); + disconnect( m_combo->lineEdit(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCheckComboSelection()) ); if ( ext ) { @@ -3815,77 +3815,77 @@ void KonqMainWindow::initActions() // File menu m_pMenuNew = new KNewMenu ( actionCollection(), this, "new_menu" ); - TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); (void) new TDEAction( i18n( "&Edit File Type..." ), 0, actionCollection(), "editMimeType" ); (void) new TDEAction( i18n( "Properties" ), ALT+Key_Return, actionCollection(), "properties" ); - (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); - (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); - (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQT_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); - (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); + (void) new TDEAction( i18n( "New &Window" ), "window-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewWindow() ), actionCollection(), "new_window" ); + (void) new TDEAction( i18n( "&Duplicate Window" ), "window_duplicate", CTRL+Key_D, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "duplicate_window" ); + (void) new TDEAction( i18n( "Send &Link Address..." ), "mail_generic", 0, this, TQ_SLOT( slotSendURL() ), actionCollection(), "sendURL" ); + (void) new TDEAction( i18n( "S&end File..." ), "mail_generic", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "sendPage" ); if (kapp->authorize("shell_access")) { - (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQT_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); + (void) new TDEAction( i18n( "Open &Terminal" ), "openterm", Key_F4, this, TQ_SLOT( slotOpenTerminal() ), actionCollection(), "open_terminal" ); } - (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQT_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); + (void) new TDEAction( i18n( "&Open Location..." ), "document-open", TDEStdAccel::shortcut(TDEStdAccel::Open), this, TQ_SLOT( slotOpenLocation() ), actionCollection(), "open_location" ); - m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQT_SLOT( slotToolFind() ), actionCollection(), "findfile" ); + m_paFindFiles = new TDEToggleAction( i18n( "&Find File..." ), "filefind", TDEStdAccel::shortcut(TDEStdAccel::Find), this, TQ_SLOT( slotToolFind() ), actionCollection(), "findfile" ); m_paPrint = KStdAction::print( 0, 0, actionCollection(), "print" ); - (void) KStdAction::quit( this, TQT_SLOT( close() ), actionCollection(), "quit" ); + (void) KStdAction::quit( this, TQ_SLOT( close() ), actionCollection(), "quit" ); - m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQT_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); - m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQT_SLOT( slotLockView() ), actionCollection(), "lock" ); - m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQT_SLOT( slotLinkView() ), actionCollection(), "link" ); + m_ptaUseHTML = new TDEToggleAction( i18n( "&Use index.html" ), 0, this, TQ_SLOT( slotShowHTML() ), actionCollection(), "usehtml" ); + m_paLockView = new TDEToggleAction( i18n( "Lock to Current Location"), 0, this, TQ_SLOT( slotLockView() ), actionCollection(), "lock" ); + m_paLinkView = new TDEToggleAction( i18n( "Lin&k View"), 0, this, TQ_SLOT( slotLinkView() ), actionCollection(), "link" ); // Go menu m_paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", TDEStdAccel::shortcut(TDEStdAccel::Up), actionCollection(), "up" ); - connect( m_paUp, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, - TQT_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUpAboutToShow() ) ); - connect( m_paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUpActivated( int ) ) ); + connect( m_paUp, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotUp(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paUp->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUpAboutToShow() ) ); + connect( m_paUp->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUpActivated( int ) ) ); TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); m_paBack = new TDEToolBarPopupAction( backForward.first, TDEStdAccel::shortcut(TDEStdAccel::Back), 0, "", actionCollection(), "back" ); - connect( m_paBack, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, - TQT_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotBackAboutToShow() ) ); - connect( m_paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotBackActivated( int ) ) ); + connect( m_paBack, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotBack(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paBack->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotBackAboutToShow() ) ); + connect( m_paBack->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotBackActivated( int ) ) ); m_paForward = new TDEToolBarPopupAction( backForward.second, TDEStdAccel::shortcut(TDEStdAccel::Forward), 0, "", actionCollection(), "forward" ); - connect( m_paForward, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, - TQT_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotForwardAboutToShow() ) ); - connect( m_paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotForwardActivated( int ) ) ); + connect( m_paForward, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotForward(TDEAction::ActivationReason, TQt::ButtonState) ) ); + connect( m_paForward->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotForwardAboutToShow() ) ); + connect( m_paForward->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotForwardActivated( int ) ) ); m_paHistory = new KonqBidiHistoryAction( i18n("History"), actionCollection(), "history" ); - connect( m_paHistory, TQT_SIGNAL( menuAboutToShow() ), this, TQT_SLOT( slotGoMenuAboutToShow() ) ); - connect( m_paHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotGoHistoryActivated( int ) ) ); + connect( m_paHistory, TQ_SIGNAL( menuAboutToShow() ), this, TQ_SLOT( slotGoMenuAboutToShow() ) ); + connect( m_paHistory, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotGoHistoryActivated( int ) ) ); m_paHome = new TDEAction( i18n( "Home" ), "go-home", TDEStdAccel::shortcut(TDEStdAccel::Home), actionCollection(), "home" ); - connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, - TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); - - (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); - (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); - (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); - (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); - (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); - //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); - (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQT_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); - (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQT_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); + connect( m_paHome, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), this, + TQ_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) ); + + (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, this, TQ_SLOT( slotGoSystem() ), actionCollection(), "go_system" ); + (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, this, TQ_SLOT( slotGoApplications() ), actionCollection(), "go_applications" ); + (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, this, TQ_SLOT( slotGoMedia() ), actionCollection(), "go_media" ); + (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, this, TQ_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" ); + (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, this, TQ_SLOT( slotGoSettings() ), actionCollection(), "go_settings" ); + //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQ_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" ); + (void) new TDEAction( i18n( "Trash" ), "trashcan_full", 0, this, TQ_SLOT( slotGoTrash() ), actionCollection(), "go_trash" ); + (void) new TDEAction( i18n( "Autostart" ), "launch", 0, this, TQ_SLOT( slotGoAutostart() ), actionCollection(), "go_autostart" ); KonqMostOftenURLSAction *mostOften = new KonqMostOftenURLSAction( i18n("Most Often Visited"), actionCollection(), "go_most_often" ); - connect( mostOften, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( slotOpenURL( const KURL& ))); - (void) new TDEAction( i18n( "History" ), "history", 0, this, TQT_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); + connect( mostOften, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( slotOpenURL( const KURL& ))); + (void) new TDEAction( i18n( "History" ), "history", 0, this, TQ_SLOT( slotGoHistory() ), actionCollection(), "go_history" ); // Settings menu - m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQT_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); - m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQT_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); + m_paSaveViewProfile = new TDEAction( i18n( "&Save View Profile..." ), 0, this, TQ_SLOT( slotSaveViewProfile() ), actionCollection(), "saveviewprofile" ); + m_paSaveViewPropertiesLocally = new TDEToggleAction( i18n( "Save View Changes per &Folder" ), 0, this, TQ_SLOT( slotSaveViewPropertiesLocally() ), actionCollection(), "saveViewPropertiesLocally" ); // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like... - m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQT_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); + m_paRemoveLocalProperties = new TDEAction( i18n( "Remove Folder Properties" ), 0, this, TQ_SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" ); m_configureModules << "tde-filebehavior.desktop" << "tde-fileappearance.desktop" << @@ -3900,41 +3900,41 @@ void KonqMainWindow::initActions() if (!kapp->authorizeControlModules(configModules()).isEmpty()) - KStdAction::preferences (this, TQT_SLOT (slotConfigure()), actionCollection() ); + KStdAction::preferences (this, TQ_SLOT (slotConfigure()), actionCollection() ); - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); - m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQT_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); - m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQT_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); + m_paConfigureExtensions = new TDEAction( i18n("Configure Extensions..."), 0, this, TQ_SLOT( slotConfigureExtensions()), actionCollection(), "options_configure_extensions"); + m_paConfigureSpellChecking = new TDEAction( i18n("Configure Spell Checking..."), "tools-check-spelling", 0,this, TQ_SLOT( slotConfigureSpellChecking()), actionCollection(), "configurespellcheck"); // Window menu - m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQT_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); - m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQT_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); - m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQT_SLOT( slotAddTab() ), actionCollection(), "newtab" ); - m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQT_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); - m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQT_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); - m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQT_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); - m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQT_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); - m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQT_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); - - m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQT_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); - m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQT_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); + m_paSplitViewHor = new TDEAction( i18n( "Split View &Left/Right" ), "view_left_right", CTRL+SHIFT+Key_L, this, TQ_SLOT( slotSplitViewHorizontal() ), actionCollection(), "splitviewh" ); + m_paSplitViewVer = new TDEAction( i18n( "Split View &Top/Bottom" ), "view_top_bottom", CTRL+SHIFT+Key_T, this, TQ_SLOT( slotSplitViewVertical() ), actionCollection(), "splitviewv" ); + m_paAddTab = new TDEAction( i18n( "&New Tab" ), "tab_new", "CTRL+SHIFT+N;CTRL+T", this, TQ_SLOT( slotAddTab() ), actionCollection(), "newtab" ); + m_paDuplicateTab = new TDEAction( i18n( "&Duplicate Current Tab" ), "tab_duplicate", CTRL+SHIFT+Key_D, this, TQ_SLOT( slotDuplicateTab() ), actionCollection(), "duplicatecurrenttab" ); + m_paBreakOffTab = new TDEAction( i18n( "Detach Current Tab" ), "tab_breakoff", CTRL+SHIFT+Key_B, this, TQ_SLOT( slotBreakOffTab() ), actionCollection(), "breakoffcurrenttab" ); + m_paRemoveView = new TDEAction( i18n( "&Close Active View" ),"view_remove", CTRL+SHIFT+Key_R, this, TQ_SLOT( slotRemoveView() ), actionCollection(), "removeview" ); + m_paRemoveTab = new TDEAction( i18n( "Close Current Tab" ), "tab_remove", CTRL+Key_W, this, TQ_SLOT( slotRemoveTab() ), actionCollection(), "removecurrenttab" ); + m_paRemoveOtherTabs = new TDEAction( i18n( "Close &Other Tabs" ), "tab_remove_other", 0, this, TQ_SLOT( slotRemoveOtherTabsPopup() ), actionCollection(), "removeothertabs" ); + + m_paActivateNextTab = new TDEAction( i18n( "Activate Next Tab" ), "tab_next", TQApplication::reverseLayout() ? TDEStdAccel::tabPrev() : TDEStdAccel::tabNext(), this, TQ_SLOT( slotActivateNextTab() ), actionCollection(), "activatenexttab" ); + m_paActivatePrevTab = new TDEAction( i18n( "Activate Previous Tab" ), "tab_previous", TQApplication::reverseLayout() ? TDEStdAccel::tabNext() : TDEStdAccel::tabPrev(), this, TQ_SLOT( slotActivatePrevTab() ), actionCollection(), "activateprevtab" ); TQCString actionname; for (int i=1;i<13;i++) { actionname.sprintf("activate_tab_%02d", i); - new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQT_SLOT(slotActivateTab()), actionCollection(), actionname); + new TDEAction(i18n("Activate Tab %1").arg(i), 0, this, TQ_SLOT(slotActivateTab()), actionCollection(), actionname); } - m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQT_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); - m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQT_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); + m_paMoveTabLeft = new TDEAction( i18n("Move Tab Left"), "go-previous" , CTRL+SHIFT+Key_Left,this, TQ_SLOT( slotMoveTabLeft()),actionCollection(),"tab_move_left"); + m_paMoveTabRight = new TDEAction( i18n("Move Tab Right"), "go-next" , CTRL+SHIFT+Key_Right,this, TQ_SLOT( slotMoveTabRight()),actionCollection(),"tab_move_right"); #ifndef NDEBUG - (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQT_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); + (void) new TDEAction( i18n( "Dump Debug Info" ), "view_dump_debug_info", 0, this, TQ_SLOT( slotDumpDebugInfo() ), actionCollection(), "dumpdebuginfo" ); #endif - m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQT_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); + m_paSaveRemoveViewProfile = new TDEAction( i18n( "C&onfigure View Profiles..." ), 0, m_pViewManager, TQ_SLOT( slotProfileDlg() ), actionCollection(), "saveremoveviewprofile" ); m_pamLoadViewProfile = new TDEActionMenu( i18n( "Load &View Profile" ), actionCollection(), "loadviewprofile" ); m_pViewManager->setProfiles( m_pamLoadViewProfile ); @@ -3943,19 +3943,19 @@ void KonqMainWindow::initActions() TDEShortcut fullScreenShortcut = m_ptaFullScreen->shortcut(); fullScreenShortcut.append( KKey( Key_F11 ) ); m_ptaFullScreen->setShortcut( fullScreenShortcut ); - connect( m_ptaFullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_ptaFullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); TDEShortcut reloadShortcut = TDEStdAccel::shortcut(TDEStdAccel::Reload); reloadShortcut.append(KKey(CTRL + Key_R)); - m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQT_SLOT( slotReload() ), actionCollection(), "reload" ); - m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQT_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); + m_paReload = new TDEAction( i18n( "&Reload" ), "reload", reloadShortcut, this, TQ_SLOT( slotReload() ), actionCollection(), "reload" ); + m_paReloadAllTabs = new TDEAction( i18n( "&Reload All Tabs" ), "reload_all_tabs", SHIFT+Key_F5, this, TQ_SLOT( slotReloadAllTabs() ), actionCollection(), "reload_all_tabs" ); - m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQT_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); + m_paReloadStop = new TDEAction( i18n( "&Reload/Stop" ), "reload", 0, this, TQ_SLOT( slotReloadStop() ), actionCollection(), "reload_stop" ); - m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQT_SLOT( undo() ), actionCollection(), "undo" ); + m_paUndo = KStdAction::undo( KonqUndoManager::self(), TQ_SLOT( undo() ), actionCollection(), "undo" ); //m_paUndo->setEnabled( KonqUndoManager::self()->undoAvailable() ); - connect( KonqUndoManager::self(), TQT_SIGNAL( undoTextChanged( const TQString & ) ), - m_paUndo, TQT_SLOT( setText( const TQString & ) ) ); + connect( KonqUndoManager::self(), TQ_SIGNAL( undoTextChanged( const TQString & ) ), + m_paUndo, TQ_SLOT( setText( const TQString & ) ) ); // Those are connected to the browserextension directly m_paCut = KStdAction::cut( 0, 0, actionCollection(), "cut" ); @@ -3965,24 +3965,24 @@ void KonqMainWindow::initActions() m_paCopy = KStdAction::copy( 0, 0, actionCollection(), "copy" ); m_paPaste = KStdAction::paste( 0, 0, actionCollection(), "paste" ); - m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQT_SLOT( slotStop() ), actionCollection(), "stop" ); + m_paStop = new TDEAction( i18n( "&Stop" ), "process-stop", Key_Escape, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" ); m_paRename = new TDEAction( i18n( "&Rename" ), "edit_rename", Key_F2, actionCollection(), "rename" ); m_paTrash = new TDEAction( i18n( "&Move to Trash" ), "edittrash", Key_Delete, actionCollection(), "trash" ); - connect( m_paTrash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( m_paTrash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( slotTrashActivated( TDEAction::ActivationReason, TQt::ButtonState ) ) ); m_paDelete = new TDEAction( i18n( "&Delete" ), "edit-delete", SHIFT+Key_Delete, actionCollection(), "del" ); // F5 is the default key binding for Reload.... a la Windows. mc users want F5 for Copy and F6 for move, but I can't make that default. - m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQT_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); - m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQT_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); + m_paCopyFiles = new TDEAction( i18n("Copy &Files..."), "copyfiles", Key_F7, this, TQ_SLOT( slotCopyFiles() ), actionCollection(), "copyfiles" ); + m_paMoveFiles = new TDEAction( i18n("M&ove Files..."), "movefiles", Key_F8, this, TQ_SLOT( slotMoveFiles() ), actionCollection(), "movefiles" ); // This action doesn't appear in the GUI, it's for the shortcut only. KNewMenu takes care of the GUI stuff. - m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQT_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); - m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQT_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); + m_paNewDir = new TDEAction( i18n("Create Folder..." ), "konq_create_dir", Key_F10, this, TQ_SLOT( slotNewDir() ), actionCollection(), "konq_create_dir" ); + m_paAnimatedLogo = new KonqLogoAction( i18n("Animated Logo"), 0, this, TQ_SLOT( slotDuplicateWindow() ), actionCollection(), "animated_logo" ); // Location bar m_locationLabel = new KonqDraggableLabel( this, i18n("L&ocation: ") ); - (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQT_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); + (void) new KWidgetAction( m_locationLabel, i18n("L&ocation: "), Key_F6, this, TQ_SLOT( slotLocationLabelActivated() ), actionCollection(), "location_label" ); m_locationLabel->setBuddy( m_combo ); KWidgetAction* comboAction = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, @@ -3996,8 +3996,8 @@ void KonqMainWindow::initActions() TDEAction *clearLocation = new TDEAction( i18n( "Clear Location Bar" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", CTRL+Key_L, actionCollection(), "clear_location" ); - connect( clearLocation, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - TQT_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( clearLocation, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + TQ_SLOT( slotClearLocationBar( TDEAction::ActivationReason, TQt::ButtonState ) ) ); clearLocation->setWhatsThis( i18n( "Clear Location bar<p>" "Clears the content of the location bar." ) ); @@ -4013,21 +4013,21 @@ void KonqMainWindow::initActions() m_pBookmarkMenu = new KBookmarkMenu( KonqBookmarkManager::self(), m_pBookmarksOwner, m_pamBookmarks->popupMenu(), m_bookmarksActionCollection, true ); connect( m_pBookmarkMenu, - TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), - this, TQT_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); + TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu*) ), + this, TQ_SLOT( slotFillContextMenu(const KBookmark &, TQPopupMenu*) )); connect( m_pBookmarkMenu, - TQT_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), - this, TQT_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); + TQ_SIGNAL( openBookmark(const TQString &, TQt::ButtonState) ), + this, TQ_SLOT( slotOpenBookmarkURL(const TQString &, TQt::ButtonState) )); TDEAction *addBookmark = actionCollection()->action("add_bookmark"); if (addBookmark) addBookmark->setText(i18n("Bookmark This Location")); - m_paShowMenuBar = KStdAction::showMenubar( this, TQT_SLOT( slotShowMenuBar() ), actionCollection() ); + m_paShowMenuBar = KStdAction::showMenubar( this, TQ_SLOT( slotShowMenuBar() ), actionCollection() ); - (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQT_SLOT( slotIntro() ), actionCollection(), "konqintro" ); + (void) new TDEAction( i18n( "Kon&queror Introduction" ), "konqui_intro", 0, this, TQ_SLOT( slotIntro() ), actionCollection(), "konqintro" ); - TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQT_SLOT( goURL() ), actionCollection(), "go_url" ); + TDEAction *goUrl = new TDEAction( i18n( "Go" ), "key_enter", 0, this, TQ_SLOT( goURL() ), actionCollection(), "go_url" ); goUrl->setWhatsThis( i18n( "Go<p>" "Goes to the page that has been entered into the location bar." ) ); @@ -4120,13 +4120,13 @@ void KonqMainWindow::slotFillContextMenu( const KBookmark &bk, TQPopupMenu * pm TQValueList<KURL>::Iterator it = list.begin(); for (; it != list.end(); ++it ) popupItems.append( new KFileItem( (*it), TQString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); + pm->insertItem( SmallIcon(tab_new_x), i18n( "Open Folder in Tabs" ), this, TQ_SLOT( slotPopupNewTabRight() ) ); } else { popupItems.append( new KFileItem( bk.url(), TQString::null, KFileItem::Unknown) ); - pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQT_SLOT( slotPopupNewWindow() ) ); - pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQT_SLOT( slotPopupNewTabRight() ) ); + pm->insertItem( SmallIcon("window-new"), i18n( "Open in New Window" ), this, TQ_SLOT( slotPopupNewWindow() ) ); + pm->insertItem( SmallIcon(tab_new_x), i18n( "Open in New Tab" ), this, TQ_SLOT( slotPopupNewTabRight() ) ); } } @@ -4345,7 +4345,7 @@ void KonqMainWindow::connectExtension( KParts::BrowserExtension *ext ) if ( slotNames.contains( it.key()+"()" ) ) { if ( it.key() != "trash" ) - connect( act, TQT_SIGNAL( activated() ), ext, it.data() /* TQT_SLOT(slot name) */ ); + connect( act, TQ_SIGNAL( activated() ), ext, it.data() /* TQ_SLOT(slot name) */ ); act->setEnabled( ext->isActionEnabled( it.key() ) ); const TQString text = ext->actionText( it.key() ); if ( !text.isEmpty() ) @@ -4701,7 +4701,7 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa popupMenuCollection.insert( m_paDelete ); // The pasteto action is used when clicking on a dir, to paste into it. - TDEAction *actPaste = KStdAction::paste( this, TQT_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); + TDEAction *actPaste = KStdAction::paste( this, TQ_SLOT( slotPopupPasteTo() ), &popupMenuCollection, "pasteto" ); actPaste->setEnabled( m_paPaste->isEnabled() ); popupMenuCollection.insert( actPaste ); @@ -4774,10 +4774,10 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if (doTabHandling) { if (_args.forcesNewWindow()) { - actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQT_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); + actNewWindow = new TDEAction( i18n( "Open in T&his Window" ), 0, this, TQ_SLOT( slotPopupThisWindow() ), konqyMenuClient->actionCollection(), "sameview" ); actNewWindow->setToolTip( i18n( "Open the document in current window" ) ); } - actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); + actNewWindow = new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotPopupNewWindow() ), konqyMenuClient->actionCollection(), "newview" ); actNewWindow->setToolTip( i18n( "Open the document in a new window" ) ); //Set tab_new_x to point to the correct icon based on NewTabsInFront @@ -4788,12 +4788,12 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa else tab_new_x = "tab_new_bg" ; - TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQT_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); + TDEAction *actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), "tab_new_bg", 0, this, TQ_SLOT( slotPopupNewTab() ), actionCollection(), "openintab" ); actNewTab->setStatusText( i18n( "Open the document in a new background tab" ) ); - TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); + TDEAction *actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), actionCollection(), "openintabfront" ); actNewTabFront->setStatusText( i18n( "Open the document in a new foreground tab" ) ); - actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); - actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQT_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); + actNewTab = new TDEAction( i18n( "Open in &Background Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTab() ), konqyMenuClient->actionCollection(), "openintab" ); + actNewTabFront = new TDEAction( i18n( "Open in &New Tab" ), tab_new_x, 0, this, TQ_SLOT( slotPopupNewTabAtFront() ), konqyMenuClient->actionCollection(), "openintabfront" ); actNewTab->setToolTip( i18n( "Open the document in a new background tab" ) ); actNewTabFront->setToolTip( i18n( "Open the document in a new foreground tab" ) ); doTabHandling = true; @@ -4843,13 +4843,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa if ( be ) { - TQObject::connect( this, TQT_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQT_SLOT(close()) ); - TQObject::connect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)), - this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) ); + TQObject::connect( this, TQ_SIGNAL(popupItemsDisturbed()), pPopupMenu, TQ_SLOT(close()) ); + TQObject::connect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)), + this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) ); } - TQObject::disconnect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::disconnect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); TQGuardedPtr<TQObject> guard(this); // #149736 pPopupMenu->exec( _global ); @@ -4868,13 +4868,13 @@ void KonqMainWindow::slotPopupMenu( KXMLGUIClient *client, const TQPoint &_globa return; } - TQObject::connect( m_pMenuNew->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotFileNewAboutToShow()) ); + TQObject::connect( m_pMenuNew->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotFileNewAboutToShow()) ); if ( be ) { - TQObject::disconnect( be, TQT_SIGNAL(itemsRemoved(const KFileItemList &)), - this, TQT_SLOT(slotItemsRemoved(const KFileItemList &)) ); + TQObject::disconnect( be, TQ_SIGNAL(itemsRemoved(const KFileItemList &)), + this, TQ_SLOT(slotItemsRemoved(const KFileItemList &)) ); } delete konqyMenuClient; @@ -4932,7 +4932,7 @@ void KonqMainWindow::slotOpenEmbedded() m_popupEmbeddingServices.clear(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotOpenEmbeddedDoIt() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotOpenEmbeddedDoIt() ) ); } void KonqMainWindow::slotOpenEmbeddedDoIt() @@ -5045,8 +5045,8 @@ void KonqMainWindow::updateOpenWithActions() TDEAction *action = new TDEAction( i18n( "Open with %1" ).arg( (*it)->name() ), 0, 0, (*it)->desktopEntryName().latin1() ); action->setIcon( (*it)->icon() ); - connect( action, TQT_SIGNAL( activated() ), - this, TQT_SLOT( slotOpenWith() ) ); + connect( action, TQ_SIGNAL( activated() ), + this, TQ_SLOT( slotOpenWith() ) ); m_openWithActions.append( action ); } @@ -5138,8 +5138,8 @@ void KonqMainWindow::updateViewModeActions() action->setExclusiveGroup( "KonqMainWindow_ViewModes" ); - connect( action, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotViewModeToggle( bool ) ) ); + connect( action, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotViewModeToggle( bool ) ) ); m_viewModeActions.append( action ); action->plug( m_viewModeMenu->popupMenu() ); @@ -5193,8 +5193,8 @@ void KonqMainWindow::updateViewModeActions() tbAction->setChecked( action->isChecked() ); - connect( tbAction, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotViewModeToggle( bool ) ) ); + connect( tbAction, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotViewModeToggle( bool ) ) ); m_toolBarViewModeActions.append( tbAction ); @@ -5518,18 +5518,18 @@ void KonqMainWindow::bookmarksIntoCompletion( const KBookmarkGroup& group ) void KonqMainWindow::connectActionCollection( TDEActionCollection *coll ) { - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } void KonqMainWindow::disconnectActionCollection( TDEActionCollection *coll ) { - disconnect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - disconnect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); + disconnect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + disconnect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); } // diff --git a/konqueror/konq_misc.cpp b/konqueror/konq_misc.cpp index e24426c8d..1fbea747e 100644 --- a/konqueror/konq_misc.cpp +++ b/konqueror/konq_misc.cpp @@ -269,7 +269,7 @@ void KonqDraggableLabel::dropEvent( TQDropEvent* ev ) { _savedLst.clear(); if ( KURLDrag::decode( ev, _savedLst ) ) { - TQTimer::singleShot(0, this, TQT_SLOT(delayedOpenURL())); + TQTimer::singleShot(0, this, TQ_SLOT(delayedOpenURL())); } } diff --git a/konqueror/konq_profiledlg.cpp b/konqueror/konq_profiledlg.cpp index f7241713b..6819990a9 100644 --- a/konqueror/konq_profiledlg.cpp +++ b/konqueror/konq_profiledlg.cpp @@ -100,8 +100,8 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese box->setStretchFactor( m_pListView, 1 ); - connect( m_pListView, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ), - TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( itemRenamed( TQListViewItem * ) ), + TQ_SLOT( slotItemRenamed( TQListViewItem * ) ) ); loadAllProfiles( preselectProfile ); m_pListView->setMinimumSize( m_pListView->sizeHint() ); @@ -112,11 +112,11 @@ KonqProfileDlg::KonqProfileDlg( KonqViewManager *manager, const TQString & prese m_cbSaveSize = new TQCheckBox( i18n("Save &window size in profile"), box ); m_cbSaveSize->setChecked( KonqSettings::saveWindowSizeInProfile() ); - connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); - connect( m_pProfileNameLineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( m_pProfileNameLineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); enableButton( BTN_RENAME, m_pListView->selectedItem ()!=0 ); enableButton( BTN_DELETE, m_pListView->selectedItem ()!=0 ); diff --git a/konqueror/konq_run.cpp b/konqueror/konq_run.cpp index ecd03d3c4..01cff73c6 100644 --- a/konqueror/konq_run.cpp +++ b/konqueror/konq_run.cpp @@ -150,8 +150,8 @@ void KonqRun::init() // (in case it goes to scanFile, this will be done below) TDEIO::StatJob *job = dynamic_cast<TDEIO::StatJob*>( m_job ); if ( job && !job->error() && m_pView ) { - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); } } @@ -162,11 +162,11 @@ void KonqRun::scanFile() // BrowserRun changes TDEIO::TransferJob *job = dynamic_cast<TDEIO::TransferJob*>( m_job ); if ( job && !job->error() ) { - connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL& )), - TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) )); + connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL& )), + TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL& ) )); if ( m_pView && m_pView->service()->desktopEntryName() != "konq_sidebartng") { - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - m_pView, TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + m_pView, TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); } } } diff --git a/konqueror/konq_tabs.cpp b/konqueror/konq_tabs.cpp index b22610cc2..0506648ff 100644 --- a/konqueror/konq_tabs.cpp +++ b/konqueror/konq_tabs.cpp @@ -78,61 +78,61 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon m_pActiveChild = 0L; m_pViewManager = viewManager; - connect( this, TQT_SIGNAL( currentChanged ( TQWidget * ) ), - this, TQT_SLOT( slotCurrentChanged( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( currentChanged ( TQWidget * ) ), + this, TQ_SLOT( slotCurrentChanged( TQWidget* ) ) ); m_pPopupMenu = new TQPopupMenu( this ); m_pPopupMenu->insertItem( SmallIcon( "tab_new" ), i18n("&New Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotAddTab() ), + TQ_SLOT( slotAddTab() ), m_pViewManager->mainWindow()->action("newtab")->shortcut() ); m_pPopupMenu->insertItem( SmallIconSet( "reload" ), i18n( "&Reload Tab" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotReloadPopup() ), + TQ_SLOT( slotReloadPopup() ), m_pViewManager->mainWindow()->action("reload")->shortcut(), RELOAD_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_duplicate" ), i18n("&Duplicate Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotDuplicateTabPopup() ), + TQ_SLOT( slotDuplicateTabPopup() ), m_pViewManager->mainWindow()->action("duplicatecurrenttab")->shortcut(), DUPLICATE_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_breakoff" ), i18n("D&etach Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotBreakOffTabPopup() ), + TQ_SLOT( slotBreakOffTabPopup() ), m_pViewManager->mainWindow()->action("breakoffcurrenttab")->shortcut(), BREAKOFF_ID ); m_pPopupMenu->insertSeparator(); m_pPopupMenu->insertItem( SmallIconSet( "tab_move_left" ), i18n("Move Tab &Left"), m_pViewManager->mainWindow(), - TQT_SLOT( slotMoveTabLeft() ), + TQ_SLOT( slotMoveTabLeft() ), m_pViewManager->mainWindow()->action("tab_move_left")->shortcut(), MOVE_LEFT_ID ); m_pPopupMenu->insertItem( SmallIconSet( "tab_move_right" ), i18n("Move Tab &Right"), m_pViewManager->mainWindow(), - TQT_SLOT( slotMoveTabRight() ), + TQ_SLOT( slotMoveTabRight() ), m_pViewManager->mainWindow()->action("tab_move_right")->shortcut(), MOVE_RIGHT_ID ); m_pPopupMenu->insertSeparator(); m_pSubPopupMenuTab = new TQPopupMenu( this ); m_pPopupMenu->insertItem( i18n("Other Tabs" ), m_pSubPopupMenuTab, OTHERTABS_ID ); - connect( m_pSubPopupMenuTab, TQT_SIGNAL( activated ( int ) ), - this, TQT_SLOT( slotSubPopupMenuTabActivated( int ) ) ); + connect( m_pSubPopupMenuTab, TQ_SIGNAL( activated ( int ) ), + this, TQ_SLOT( slotSubPopupMenuTabActivated( int ) ) ); m_pPopupMenu->insertSeparator(); m_pPopupMenu->insertItem( SmallIconSet( "tab_remove" ), i18n("&Close Tab"), m_pViewManager->mainWindow(), - TQT_SLOT( slotRemoveTabPopup() ), + TQ_SLOT( slotRemoveTabPopup() ), m_pViewManager->mainWindow()->action("removecurrenttab")->shortcut(), CLOSETAB_ID ); - connect( this, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), - TQT_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( contextMenu( const TQPoint & ) ), - TQT_SLOT(slotContextMenu( const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), + TQ_SLOT(slotContextMenu( TQWidget *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenu( const TQPoint & ) ), + TQ_SLOT(slotContextMenu( const TQPoint & ) ) ); m_MouseMiddleClickClosesTab = KonqSettings::mouseMiddleClickClosesTab(); @@ -146,14 +146,14 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon setTabCloseActivatePrevious( KonqSettings::tabCloseActivatePrevious() ); if (KonqSettings::tabPosition()=="Bottom") setTabPosition(TQTabWidget::Bottom); - connect( this, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(slotCloseRequest( TQWidget * ))); - connect( this, TQT_SIGNAL( removeTabPopup() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTabPopup() ) ); + connect( this, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(slotCloseRequest( TQWidget * ))); + connect( this, TQ_SIGNAL( removeTabPopup() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTabPopup() ) ); if ( KonqSettings::addTabButton() ) { m_leftWidget = new TQToolButton( this ); - connect( m_leftWidget, TQT_SIGNAL( clicked() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) ); + connect( m_leftWidget, TQ_SIGNAL( clicked() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) ); m_leftWidget->setIconSet( SmallIcon( "tab_new" ) ); m_leftWidget->adjustSize(); TQToolTip::add(m_leftWidget, i18n("Open a new tab")); @@ -161,8 +161,8 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon } if ( KonqSettings::closeTabButton() ) { m_rightWidget = new TQToolButton( this ); - connect( m_rightWidget, TQT_SIGNAL( clicked() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotRemoveTab() ) ); + connect( m_rightWidget, TQ_SIGNAL( clicked() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotRemoveTab() ) ); m_rightWidget->setIconSet( SmallIconSet( "tab_remove" ) ); m_rightWidget->adjustSize(); TQToolTip::add(m_rightWidget, i18n("Close the current tab")); @@ -171,23 +171,23 @@ KonqFrameTabs::KonqFrameTabs(TQWidget* parent, KonqFrameContainerBase* parentCon setAutomaticResizeTabs( true ); setTabReorderingEnabled( true ); - connect( this, TQT_SIGNAL( movedTab( int, int ) ), - TQT_SLOT( slotMovedTab( int, int ) ) ); - connect( this, TQT_SIGNAL( mouseMiddleClick() ), - TQT_SLOT( slotMouseMiddleClick() ) ); - connect( this, TQT_SIGNAL( mouseMiddleClick( TQWidget * ) ), - TQT_SLOT( slotMouseMiddleClick( TQWidget * ) ) ); - connect( this, TQT_SIGNAL( mouseDoubleClick() ), - m_pViewManager->mainWindow(), TQT_SLOT( slotAddTab() ) ); - - connect( this, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), - TQT_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) ); - connect( this, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), - TQT_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) ); - connect( this, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), - TQT_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) ); - connect( this, TQT_SIGNAL( initiateDrag( TQWidget * )), - TQT_SLOT( slotInitiateDrag( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( movedTab( int, int ) ), + TQ_SLOT( slotMovedTab( int, int ) ) ); + connect( this, TQ_SIGNAL( mouseMiddleClick() ), + TQ_SLOT( slotMouseMiddleClick() ) ); + connect( this, TQ_SIGNAL( mouseMiddleClick( TQWidget * ) ), + TQ_SLOT( slotMouseMiddleClick( TQWidget * ) ) ); + connect( this, TQ_SIGNAL( mouseDoubleClick() ), + m_pViewManager->mainWindow(), TQ_SLOT( slotAddTab() ) ); + + connect( this, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), + TQ_SLOT( slotTestCanDecode(const TQDragMoveEvent *, bool & ) ) ); + connect( this, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )), + TQ_SLOT( slotReceivedDropEvent( TQDropEvent * ) ) ); + connect( this, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), + TQ_SLOT( slotReceivedDropEvent( TQWidget *, TQDropEvent * ) ) ); + connect( this, TQ_SIGNAL( initiateDrag( TQWidget * )), + TQ_SLOT( slotInitiateDrag( TQWidget * ) ) ); setMouseWheelScroll(KonqSettings::tabsCycleWheel()); } @@ -466,7 +466,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab() m_pSubPopupMenuTab->insertItem( SmallIcon( "reload_all_tabs" ), i18n( "&Reload All Tabs" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotReloadAllTabs() ), + TQ_SLOT( slotReloadAllTabs() ), m_pViewManager->mainWindow()->action("reload_all_tabs")->shortcut() ); m_pSubPopupMenuTab->insertSeparator(); for (KonqFrameBase* it = m_pChildFrameList->first(); it; it = m_pChildFrameList->next()) @@ -488,7 +488,7 @@ void KonqFrameTabs::refreshSubPopupMenuTab() m_pSubPopupMenuTab->insertItem( SmallIconSet( "tab_remove_other" ), i18n( "Close &Other Tabs" ), m_pViewManager->mainWindow(), - TQT_SLOT( slotRemoveOtherTabsPopup() ), + TQ_SLOT( slotRemoveOtherTabsPopup() ), m_pViewManager->mainWindow()->action("removeothertabs")->shortcut() ); } diff --git a/konqueror/konq_view.cpp b/konqueror/konq_view.cpp index 89f4a2e07..0f809ccd1 100644 --- a/konqueror/konq_view.cpp +++ b/konqueror/konq_view.cpp @@ -127,7 +127,7 @@ KonqView::~KonqView() { finishedWithCurrentURL(); if ( isPassiveMode() ) - disconnect( m_pPart, TQT_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQT_SLOT( slotObjectDestroyed() ) ); + disconnect( m_pPart, TQ_SIGNAL( destroyed() ), m_pMainWindow->viewManager(), TQ_SLOT( slotObjectDestroyed() ) ); delete m_pPart; } @@ -372,16 +372,16 @@ bool KonqView::changeViewMode( const TQString &serviceType, void KonqView::connectPart( ) { //kdDebug(1202) << "KonqView::connectPart" << endl; - connect( m_pPart, TQT_SIGNAL( started( TDEIO::Job * ) ), - this, TQT_SLOT( slotStarted( TDEIO::Job * ) ) ); - connect( m_pPart, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( m_pPart, TQT_SIGNAL( completed(bool) ), - this, TQT_SLOT( slotCompleted(bool) ) ); - connect( m_pPart, TQT_SIGNAL( canceled( const TQString & ) ), - this, TQT_SLOT( slotCanceled( const TQString & ) ) ); - connect( m_pPart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); + connect( m_pPart, TQ_SIGNAL( started( TDEIO::Job * ) ), + this, TQ_SLOT( slotStarted( TDEIO::Job * ) ) ); + connect( m_pPart, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( m_pPart, TQ_SIGNAL( completed(bool) ), + this, TQ_SLOT( slotCompleted(bool) ) ); + connect( m_pPart, TQ_SIGNAL( canceled( const TQString & ) ), + this, TQ_SLOT( slotCanceled( const TQString & ) ) ); + connect( m_pPart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); KParts::BrowserExtension *ext = browserExtension(); @@ -389,8 +389,8 @@ void KonqView::connectPart( ) { ext->setBrowserInterface( m_browserIface ); - connect( ext, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ), - m_pMainWindow, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( ext, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs &) ), + m_pMainWindow, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); if ( m_bPopupMenuEnabled ) { @@ -398,59 +398,59 @@ void KonqView::connectPart( ) enablePopupMenu( true ); } - connect( ext, TQT_SIGNAL( setLocationBarURL( const TQString & ) ), - this, TQT_SLOT( setLocationBarURL( const TQString & ) ) ); + connect( ext, TQ_SIGNAL( setLocationBarURL( const TQString & ) ), + this, TQ_SLOT( setLocationBarURL( const TQString & ) ) ); - connect( ext, TQT_SIGNAL( setIconURL( const KURL & ) ), - this, TQT_SLOT( setIconURL( const KURL & ) ) ); + connect( ext, TQ_SIGNAL( setIconURL( const KURL & ) ), + this, TQ_SLOT( setIconURL( const KURL & ) ) ); - connect( ext, TQT_SIGNAL( setPageSecurity( int ) ), - this, TQT_SLOT( setPageSecurity( int ) ) ); + connect( ext, TQ_SIGNAL( setPageSecurity( int ) ), + this, TQ_SLOT( setPageSecurity( int ) ) ); - connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( ext, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - m_pMainWindow, TQT_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) ); + connect( ext, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + m_pMainWindow, TQ_SLOT( slotCreateNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ) ); - connect( ext, TQT_SIGNAL( loadingProgress( int ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( slotLoadingProgress( int ) ) ); + connect( ext, TQ_SIGNAL( loadingProgress( int ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( slotLoadingProgress( int ) ) ); - connect( ext, TQT_SIGNAL( speedProgress( int ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( slotSpeedProgress( int ) ) ); + connect( ext, TQ_SIGNAL( speedProgress( int ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( slotSpeedProgress( int ) ) ); - connect( ext, TQT_SIGNAL( selectionInfo( const KFileItemList & ) ), - this, TQT_SLOT( slotSelectionInfo( const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( selectionInfo( const KFileItemList & ) ), + this, TQ_SLOT( slotSelectionInfo( const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( mouseOverInfo( const KFileItem * ) ), - this, TQT_SLOT( slotMouseOverInfo( const KFileItem * ) ) ); + connect( ext, TQ_SIGNAL( mouseOverInfo( const KFileItem * ) ), + this, TQ_SLOT( slotMouseOverInfo( const KFileItem * ) ) ); - connect( ext, TQT_SIGNAL( openURLNotify() ), - this, TQT_SLOT( slotOpenURLNotify() ) ); + connect( ext, TQ_SIGNAL( openURLNotify() ), + this, TQ_SLOT( slotOpenURLNotify() ) ); - connect( ext, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( slotEnableAction( const char *, bool ) ) ); + connect( ext, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( slotEnableAction( const char *, bool ) ) ); - connect( ext, TQT_SIGNAL( setActionText( const char *, const TQString& ) ), - this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) ); + connect( ext, TQ_SIGNAL( setActionText( const char *, const TQString& ) ), + this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) ); - connect( ext, TQT_SIGNAL( moveTopLevelWidget( int, int ) ), - this, TQT_SLOT( slotMoveTopLevelWidget( int, int ) ) ); + connect( ext, TQ_SIGNAL( moveTopLevelWidget( int, int ) ), + this, TQ_SLOT( slotMoveTopLevelWidget( int, int ) ) ); - connect( ext, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ), - this, TQT_SLOT( slotResizeTopLevelWidget( int, int ) ) ); + connect( ext, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ), + this, TQ_SLOT( slotResizeTopLevelWidget( int, int ) ) ); - connect( ext, TQT_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ), - this, TQT_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) ); + connect( ext, TQ_SIGNAL( requestFocus(KParts::ReadOnlyPart *) ), + this, TQ_SLOT( slotRequestFocus(KParts::ReadOnlyPart *) ) ); if (service()->desktopEntryName() != "konq_sidebartng") { - connect( ext, TQT_SIGNAL( infoMessage( const TQString & ) ), - m_pKonqFrame->statusbar(), TQT_SLOT( message( const TQString & ) ) ); + connect( ext, TQ_SIGNAL( infoMessage( const TQString & ) ), + m_pKonqFrame->statusbar(), TQ_SLOT( message( const TQString & ) ) ); connect( ext, - TQT_SIGNAL( addWebSideBar(const KURL&, const TQString&) ), + TQ_SIGNAL( addWebSideBar(const KURL&, const TQString&) ), m_pMainWindow, - TQT_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) ); + TQ_SLOT( slotAddWebSideBar(const KURL&, const TQString&) ) ); } callExtensionBoolMethod( "setSaveViewPropertiesLocally(bool)", m_pMainWindow->saveViewPropertiesLocally() ); @@ -480,8 +480,8 @@ void KonqView::connectPart( ) // KonqDirPart signal if ( m_pPart->inherits("KonqDirPart") ) { - connect( m_pPart, TQT_SIGNAL( findOpen( KonqDirPart * ) ), - m_pMainWindow, TQT_SLOT( slotFindOpen( KonqDirPart * ) ) ); + connect( m_pPart, TQ_SIGNAL( findOpen( KonqDirPart * ) ), + m_pMainWindow, TQ_SLOT( slotFindOpen( KonqDirPart * ) ) ); } } @@ -532,9 +532,9 @@ void KonqView::slotStarted( TDEIO::Job * job ) job->setWindow (m_pMainWindow->topLevelWidget ()); } - connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQT_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotPercent( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( speed( TDEIO::Job *, unsigned long ) ), this, TQ_SLOT( slotSpeed( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), this, TQ_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) ); } } @@ -1165,39 +1165,39 @@ void KonqView::enablePopupMenu( bool b ) if ( b ) { m_bPopupMenuEnabled = true; - connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + connect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); } else // disable context popup { m_bPopupMenuEnabled = false; - disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KFileItemList & ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - disconnect( ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_pMainWindow, TQT_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + disconnect( ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_pMainWindow, TQ_SLOT( slotPopupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); } enableBackRightClick( m_bBackRightClick ); } @@ -1207,11 +1207,11 @@ void KonqView::enableBackRightClick( bool b ) { m_bBackRightClick = b; if ( b ) - connect( this, TQT_SIGNAL( backRightClick() ), - m_pMainWindow, TQT_SLOT( slotBack() ) ); + connect( this, TQ_SIGNAL( backRightClick() ), + m_pMainWindow, TQ_SLOT( slotBack() ) ); else - disconnect( this, TQT_SIGNAL( backRightClick() ), - m_pMainWindow, TQT_SLOT( slotBack() ) ); + disconnect( this, TQ_SIGNAL( backRightClick() ), + m_pMainWindow, TQ_SLOT( slotBack() ) ); } void KonqView::reparseConfiguration() diff --git a/konqueror/konq_viewmgr.cpp b/konqueror/konq_viewmgr.cpp index 5c5bdc29b..c7ead1d0b 100644 --- a/konqueror/konq_viewmgr.cpp +++ b/konqueror/konq_viewmgr.cpp @@ -55,8 +55,8 @@ KonqViewManager::KonqViewManager( KonqMainWindow *mainWindow ) m_bLoadingProfile = false; m_activePartChangedTimer = new TQTimer(this); - connect(m_activePartChangedTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitActivePartChanged())); - connect( this, TQT_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQT_SLOT( slotActivePartChanged ( KParts::Part * ) ) ); + connect(m_activePartChangedTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitActivePartChanged())); + connect( this, TQ_SIGNAL( activePartChanged ( KParts::Part * ) ), this, TQ_SLOT( slotActivePartChanged ( KParts::Part * ) ) ); } KonqView* KonqViewManager::Initialize( const TQString &serviceType, const TQString &serviceName ) @@ -139,7 +139,7 @@ KonqView* KonqViewManager::splitView ( TQt::Orientation orientation, //kdDebug(1202) << "Create new Container" << endl; KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, parentContainer->widget(), parentContainer ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); parentContainer->insertChildFrame( newContainer, index ); if ( moveNewContainer ) { @@ -231,7 +231,7 @@ KonqView* KonqViewManager::splitWindow( TQt::Orientation orientation, m_pMainWindow->removeChildFrame( mainFrame ); KonqFrameContainer *newContainer = new KonqFrameContainer( orientation, m_pMainWindow, 0L); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); m_pMainWindow->insertChildFrame( newContainer ); @@ -286,7 +286,7 @@ void KonqViewManager::convertDocContainer() KonqFrameTabs* newContainer = new KonqFrameTabs( parentContainer->widget() , parentContainer, this); parentContainer->insertChildFrame( newContainer ); - connect( newContainer, TQT_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQT_SLOT(slotCtrlTabPressed()) ); + connect( newContainer, TQ_SIGNAL(ctrlTabPressed()), m_pMainWindow, TQ_SLOT(slotCtrlTabPressed()) ); m_pDocContainer->widget()->reparent( newContainer, pos ); newContainer->insertChildFrame( m_pDocContainer ); @@ -882,7 +882,7 @@ void KonqViewManager::slotPassiveModePartDeleted() // Passive mode parts aren't registered to the part manager, // so we have to handle suicidal ones ourselves KParts::ReadOnlyPart * part = const_cast<KParts::ReadOnlyPart *>( static_cast<const KParts::ReadOnlyPart *>( sender() ) ); - disconnect( part, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) ); + disconnect( part, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) ); kdDebug(1202) << "KonqViewManager::slotPassiveModePartDeleted part=" << part << endl; KonqView * view = m_pMainWindow->childView( part ); kdDebug(1202) << "view=" << view << endl; @@ -1038,8 +1038,8 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, m_pMainWindow, service, partServiceOffers, appServiceOffers, sType, passiveMode ); //kdDebug(1202) << "KonqView created - v=" << v << " v->part()=" << v->part() << endl; - TQObject::connect( v, TQT_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ), - m_pMainWindow, TQT_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) ); + TQObject::connect( v, TQ_SIGNAL( sigPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ), + m_pMainWindow, TQ_SLOT( slotPartChanged( KonqView *, KParts::ReadOnlyPart *, KParts::ReadOnlyPart * ) ) ); m_pMainWindow->insertChildView( v ); @@ -1063,7 +1063,7 @@ KonqView *KonqViewManager::setupView( KonqFrameContainerBase *parentContainer, else { // Passive views aren't registered, but we still want to detect the suicidal ones - connect( v->part(), TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotPassiveModePartDeleted() ) ); + connect( v->part(), TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotPassiveModePartDeleted() ) ); } //kdDebug(1202) << "KonqViewManager::setupView done" << endl; @@ -1599,7 +1599,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, else { KonqFrameContainer *newContainer = new KonqFrameContainer( o, parent->widget(), parent ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); int tabindex = -1; if(openAfterCurrentPage && parent->frameType() == "Tabs") // Need to honor it, if possible @@ -1628,7 +1628,7 @@ void KonqViewManager::loadItem( TDEConfig &cfg, KonqFrameContainerBase *parent, //kdDebug(1202) << "KonqViewManager::loadItem: Item is a Tabs" << endl; KonqFrameTabs *newContainer = new KonqFrameTabs( parent->widget(), parent, this ); - connect(newContainer,TQT_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQT_SLOT(slotCtrlTabPressed())); + connect(newContainer,TQ_SIGNAL(ctrlTabPressed()),m_pMainWindow,TQ_SLOT(slotCtrlTabPressed())); parent->insertChildFrame( newContainer ); m_pDocContainer = newContainer; @@ -1666,10 +1666,10 @@ void KonqViewManager::setProfiles( TDEActionMenu *profiles ) if ( m_pamProfiles ) { - connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotProfileActivated( int ) ) ); - connect( m_pamProfiles->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( slotProfileListAboutToShow() ) ); + connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotProfileActivated( int ) ) ); + connect( m_pamProfiles->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( slotProfileListAboutToShow() ) ); } //KonqMainWindow::enableAllActions will call it anyway //profileListDirty(); diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index 49d206664..94322e267 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -42,7 +42,7 @@ TDEHTMLPluginKTTSD::TDEHTMLPluginKTTSD( TQObject* parent, const char* name, cons { (void) new TDEAction( i18n("&Speak Text"), "kttsd", 0, - this, TQT_SLOT(slotReadOut()), + this, TQ_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" ); } else diff --git a/konqueror/listview/konq_infolistviewwidget.cpp b/konqueror/listview/konq_infolistviewwidget.cpp index 4698365e6..8ec62c79a 100644 --- a/konqueror/listview/konq_infolistviewwidget.cpp +++ b/konqueror/listview/konq_infolistviewwidget.cpp @@ -38,7 +38,7 @@ KonqInfoListViewWidget::KonqInfoListViewWidget( KonqListView* parent, m_metaInfoJob = 0; m_mtSelector = new TDESelectAction(i18n("View &As"), 0, this, - TQT_SLOT(slotSelectMimeType()), + TQ_SLOT(slotSelectMimeType()), parent->actionCollection(), "view_as" ); kdDebug(1203) << "created info list view\n"; @@ -237,10 +237,10 @@ void KonqInfoListViewWidget::slotNewItems( const KFileItemList& list) else { m_metaInfoJob = TDEIO::fileMetaInfo(list); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); } } @@ -257,10 +257,10 @@ void KonqInfoListViewWidget::slotRefreshItems( const KFileItemList& list) else { m_metaInfoJob = TDEIO::fileMetaInfo(list); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); } KonqBaseListViewWidget::slotRefreshItems(list); } @@ -313,10 +313,10 @@ void KonqInfoListViewWidget::slotMetaInfoResult() else { m_metaInfoJob = TDEIO::fileMetaInfo(m_metaInfoTodo); - connect( m_metaInfoJob, TQT_SIGNAL( gotMetaInfo( const KFileItem*)), - this, TQT_SLOT( slotMetaInfo( const KFileItem*))); - connect( m_metaInfoJob, TQT_SIGNAL( result( TDEIO::Job*)), - this, TQT_SLOT( slotMetaInfoResult())); + connect( m_metaInfoJob, TQ_SIGNAL( gotMetaInfo( const KFileItem*)), + this, TQ_SLOT( slotMetaInfo( const KFileItem*))); + connect( m_metaInfoJob, TQ_SIGNAL( result( TDEIO::Job*)), + this, TQ_SLOT( slotMetaInfoResult())); m_metaInfoTodo.clear(); } } diff --git a/konqueror/listview/konq_listview.cpp b/konqueror/listview/konq_listview.cpp index 5a06068ca..6a0d58973 100644 --- a/konqueror/listview/konq_listview.cpp +++ b/konqueror/listview/konq_listview.cpp @@ -289,20 +289,20 @@ KonqListView::KonqListView( TQWidget *parentWidget, TQObject *parent, const char // Note: File Type is in fact the mimetype comment. We use UDS_FILE_TYPE but that's not what we show in fact :/ m_pListView->confColumns[10].setData(I18N_NOOP("File Type"),"Type",TDEIO::UDS_FILE_TYPE,m_paShowType); - connect( m_pListView, TQT_SIGNAL( selectionChanged() ), - m_extension, TQT_SLOT( updateActions() ) ); - connect( m_pListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged() ), + m_extension, TQ_SLOT( updateActions() ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); - connect( m_pListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), - m_extension, TQT_SLOT( updateActions() ) ); - connect(m_pListView->header(),TQT_SIGNAL(indexChange(int,int,int)),this,TQT_SLOT(headerDragged(int,int,int))); - connect(m_pListView->header(),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(slotHeaderClicked(int))); - connect(m_pListView->header(),TQT_SIGNAL(sizeChange(int,int,int)),TQT_SLOT(slotHeaderSizeChanged())); + connect( m_pListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + m_extension, TQ_SLOT( updateActions() ) ); + connect(m_pListView->header(),TQ_SIGNAL(indexChange(int,int,int)),this,TQ_SLOT(headerDragged(int,int,int))); + connect(m_pListView->header(),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(slotHeaderClicked(int))); + connect(m_pListView->header(),TQ_SIGNAL(sizeChange(int,int,int)),TQ_SLOT(slotHeaderSizeChanged())); // signals from konqdirpart (for BC reasons) - connect( this, TQT_SIGNAL( findOpened( KonqDirPart * ) ), TQT_SLOT( slotKFindOpened() ) ); - connect( this, TQT_SIGNAL( findClosed( KonqDirPart * ) ), TQT_SLOT( slotKFindClosed() ) ); + connect( this, TQ_SIGNAL( findOpened( KonqDirPart * ) ), TQ_SLOT( slotKFindOpened() ) ); + connect( this, TQ_SIGNAL( findClosed( KonqDirPart * ) ), TQ_SLOT( slotKFindClosed() ) ); loadPlugins( this, this, instance() ); } @@ -789,7 +789,7 @@ void KonqListView::headerDragged(int sec, int from, int to) kdDebug(1202)<<"section: "<<sec<<" fromIndex: "<<from<<" toIndex "<<to<<endl; //at this point the columns aren't moved yet, so I let the listview //rearrange the stuff and use a single shot timer - TQTimer::singleShot(200,this,TQT_SLOT(slotSaveAfterHeaderDrag())); + TQTimer::singleShot(200,this,TQ_SLOT(slotSaveAfterHeaderDrag())); } const KFileItem * KonqListView::currentItem() @@ -863,7 +863,7 @@ void KonqListView::slotHeaderSizeChanged() if ( !m_headerTimer ) { m_headerTimer = new TQTimer( this ); - connect( m_headerTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSaveColumnWidths() ) ); + connect( m_headerTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSaveColumnWidths() ) ); } else m_headerTimer->stop(); @@ -885,33 +885,33 @@ void KonqListView::slotKFindClosed() void KonqListView::setupActions() { - m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQT_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); + m_paShowTime=new TDEToggleAction(i18n("Show &Modification Time"), 0,this, TQ_SLOT(slotColumnToggled()), actionCollection(), "show_time" ); m_paShowTime->setCheckedState(i18n("Hide &Modification Time")); - m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); + m_paShowType=new TDEToggleAction(i18n("Show &File Type"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_type" ); m_paShowType->setCheckedState(i18n("Hide &File Type")); - m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); + m_paShowMimeType=new TDEToggleAction(i18n("Show MimeType"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_mimetype" ); m_paShowMimeType->setCheckedState(i18n("Hide MimeType")); - m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); + m_paShowAccessTime=new TDEToggleAction(i18n("Show &Access Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_access_time" ); m_paShowAccessTime->setCheckedState(i18n("Hide &Access Time")); - m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); + m_paShowCreateTime=new TDEToggleAction(i18n("Show &Creation Time"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_creation_time" ); m_paShowCreateTime->setCheckedState(i18n("Hide &Creation Time")); - m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); + m_paShowLinkDest=new TDEToggleAction(i18n("Show &Link Destination"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_link_dest" ); m_paShowLinkDest->setCheckedState(i18n("Hide &Link Destination")); - m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); + m_paShowSize=new TDEToggleAction(i18n("Show Filesize"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_size" ); m_paShowSize->setCheckedState(i18n("Hide Filesize")); - m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); + m_paShowOwner=new TDEToggleAction(i18n("Show Owner"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_owner" ); m_paShowOwner->setCheckedState(i18n("Hide Owner")); - m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); + m_paShowGroup=new TDEToggleAction(i18n("Show Group"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_group" ); m_paShowGroup->setCheckedState(i18n("Hide Group")); - m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); + m_paShowPermissions=new TDEToggleAction(i18n("Show Permissions"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_permissions" ); m_paShowPermissions->setCheckedState(i18n("Hide Permissions")); - m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQT_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); + m_paShowURL=new TDEToggleAction(i18n("Show URL"), 0, this, TQ_SLOT(slotColumnToggled()),actionCollection(), "show_url" ); - m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQT_SLOT( slotSelect() ), actionCollection(), "select" ); - m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQT_SLOT( slotUnselect() ), actionCollection(), "unselect" ); - m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); - m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQT_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); - m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQT_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); + m_paSelect = new TDEAction( i18n( "Se&lect..." ), CTRL+Key_Plus, this, TQ_SLOT( slotSelect() ), actionCollection(), "select" ); + m_paUnselect = new TDEAction( i18n( "Unselect..." ), CTRL+Key_Minus, this, TQ_SLOT( slotUnselect() ), actionCollection(), "unselect" ); + m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectall" ); + m_paUnselectAll = new TDEAction( i18n( "Unselect All" ), CTRL+Key_U, this, TQ_SLOT( slotUnselectAll() ), actionCollection(), "unselectall" ); + m_paInvertSelection = new TDEAction( i18n( "&Invert Selection" ), CTRL+Key_Asterisk, this, TQ_SLOT( slotInvertSelection() ), actionCollection(), "invertselection" ); // These 2 actions are 'fake' actions. They are defined so that the keyboard shortcuts // can be set from the 'Configure Shortcuts..." dialog. @@ -929,16 +929,16 @@ void KonqListView::setupActions() m_paRenameMovePrev->setToolTip( i18n("Complete rename operation and move the previous item")); m_paRenameMovePrev->setEnabled(false); - m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQT_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); + m_paShowDot = new TDEToggleAction( i18n( "Show &Hidden Files" ), 0, this, TQ_SLOT( slotShowDot() ), actionCollection(), "show_dot" ); // m_paShowDot->setCheckedState(i18n("Hide &Hidden Files")); - m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQT_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); + m_paCaseInsensitive = new TDEToggleAction(i18n("Case Insensitive Sort"), 0, this, TQ_SLOT(slotCaseInsensitive()),actionCollection(), "sort_caseinsensitive" ); m_paSortAlternate = new TDEAction( i18n( "&Alternate Sort Order" ), CTRL+Key_S, this, - TQT_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order"); + TQ_SLOT( slotSortAlternate() ), actionCollection(), "alternate_sort_order"); m_paSortAlternate->setToolTip( i18n( "Sort by PREVIOUS sort column" ) ); m_paSortReverse = new TDEAction( i18n( "&Reverse Sort Order" ), CTRL+Key_R, this, - TQT_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order"); + TQ_SLOT( slotSortReverse() ), actionCollection(), "reverse_sort_order"); m_paSortReverse->setToolTip( i18n( "Reverse sort order of current sort column" ) ); /* @@ -948,17 +948,17 @@ void KonqListView::setupActions() TextSortOrder initialOrder = m_pProps->getSortOrder(); m_paOrderUnicodeUnmodified = new TDEToggleAction( i18n( "&Unicode based" ), ALT+Key_1, this, - TQT_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" ); + TQ_SLOT( slotOrderUnicodeUnmodified() ), actionCollection(), "order_unicode_based" ); m_paOrderUnicodeUnmodified->setToolTip( i18n( "Strict numeric Unicode based order" ) ); m_paOrderUnicodeUnmodified->setChecked( initialOrder == UNICODE_UNMODIFIED ); m_paOrderUnicodeCaseInsensitive = new TDEToggleAction( i18n( "Unicode based, &case insensitive" ), ALT+Key_2, this, - TQT_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" ); + TQ_SLOT( slotOrderUnicodeCaseInsensitive() ), actionCollection(), "order_unicode_based_case_insensitive" ); m_paOrderUnicodeCaseInsensitive->setToolTip( i18n( "Unicode based order but with lower/upper case ASCII letters adjacent" ) ); m_paOrderUnicodeCaseInsensitive->setChecked(initialOrder == UNICODE_CASEINSENSITIVE); m_paOrderLocale = new TDEToggleAction( i18n( "&Locale based" ), ALT+Key_3, this, - TQT_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" ); + TQ_SLOT( slotOrderLocale() ), actionCollection(), "order_locale_based" ); m_paOrderLocale->setToolTip( i18n( "Locale based order, usually \"friendly\"" ) ); m_paOrderLocale->setChecked(initialOrder == LOCALE_UNMODIFIED); @@ -968,12 +968,12 @@ void KonqListView::setupActions() m_paOrderLocale->setExclusiveGroup( "sortOrder" ); m_paDisplayDirectoriesFirst = new TDEToggleAction( i18n("Group &Directories First"), CTRL+SHIFT+Key_F, this, - TQT_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first"); + TQ_SLOT(slotToggleDisplayDirectoriesFirst()), actionCollection(), "group_directories_first"); m_paDisplayDirectoriesFirst->setToolTip( i18n( "Always display directories before non-directories" ) ); m_paDisplayDirectoriesFirst->setChecked(m_pProps->isDirsFirst()); m_paDisplayHiddenFirst = new TDEToggleAction( i18n("Group &Hidden First"), CTRL+SHIFT+Key_H, this, - TQT_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first"); + TQ_SLOT(slotToggleDisplayHiddenFirst()), actionCollection(), "group_hidden_first"); m_paDisplayHiddenFirst->setToolTip( i18n( "Always display hidden files before non-hidden files" ) ); m_paDisplayHiddenFirst->setChecked(m_pProps->isHiddenFirst()); diff --git a/konqueror/listview/konq_listviewwidget.cpp b/konqueror/listview/konq_listviewwidget.cpp index 5a2ff1261..a41cf6367 100644 --- a/konqueror/listview/konq_listviewwidget.cpp +++ b/konqueror/listview/konq_listviewwidget.cpp @@ -121,57 +121,57 @@ KonqBaseListViewWidget::KonqBaseListViewWidget( KonqListView *parent, TQWidget * initConfig(); #if 0 - connect( this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), - this, TQT_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); + connect( this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)), + this, TQ_SLOT(slotRightButtonPressed(TQListViewItem*,const TQPoint&,int))); #endif - connect( this, TQT_SIGNAL(returnPressed( TQListViewItem * )), - this, TQT_SLOT(slotReturnPressed( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), - this, TQT_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); - connect( this, TQT_SIGNAL(executed( TQListViewItem * )), - this, TQT_SLOT(slotExecuted( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(currentChanged( TQListViewItem * )), - this, TQT_SLOT(slotCurrentChanged( TQListViewItem * )) ); - connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), - this, TQT_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), - this, TQT_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); - connect( this, TQT_SIGNAL(renameNext( TQListViewItem *, int )), - this, TQT_SLOT(slotRenameNextItem( TQListViewItem*, int)) ); - connect( this, TQT_SIGNAL(renamePrev( TQListViewItem *, int )), - this, TQT_SLOT(slotRenamePrevItem( TQListViewItem*, int)) ); - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); - - connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged( int )), - this, TQT_SIGNAL(viewportAdjusted()) ); - connect( verticalScrollBar(), TQT_SIGNAL(valueChanged( int )), - this, TQT_SIGNAL(viewportAdjusted()) ); + connect( this, TQ_SIGNAL(returnPressed( TQListViewItem * )), + this, TQ_SLOT(slotReturnPressed( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(mouseButtonClicked( int, TQListViewItem *, const TQPoint&, int )), + this, TQ_SLOT(slotMouseButtonClicked2( int, TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(executed( TQListViewItem * )), + this, TQ_SLOT(slotExecuted( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(currentChanged( TQListViewItem * )), + this, TQ_SLOT(slotCurrentChanged( TQListViewItem * )) ); + connect( this, TQ_SIGNAL(itemRenamed( TQListViewItem *, const TQString &, int )), + this, TQ_SLOT(slotItemRenamed( TQListViewItem *, const TQString &, int )) ); + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint&, int )), + this, TQ_SLOT(slotPopupMenu( TQListViewItem *, const TQPoint&, int )) ); + connect( this, TQ_SIGNAL(renameNext( TQListViewItem *, int )), + this, TQ_SLOT(slotRenameNextItem( TQListViewItem*, int)) ); + connect( this, TQ_SIGNAL(renamePrev( TQListViewItem *, int )), + this, TQ_SLOT(slotRenamePrevItem( TQListViewItem*, int)) ); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); + + connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged( int )), + this, TQ_SIGNAL(viewportAdjusted()) ); + connect( verticalScrollBar(), TQ_SIGNAL(valueChanged( int )), + this, TQ_SIGNAL(viewportAdjusted()) ); // Connect the directory lister - connect( m_dirLister, TQT_SIGNAL(started( const KURL & )), - this, TQT_SLOT(slotStarted()) ); - connect( m_dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted()) ); - connect( m_dirLister, TQT_SIGNAL(canceled()), this, TQT_SLOT(slotCanceled()) ); - connect( m_dirLister, TQT_SIGNAL(clear()), this, TQT_SLOT(slotClear()) ); - connect( m_dirLister, TQT_SIGNAL(newItems( const KFileItemList & ) ), - this, TQT_SLOT(slotNewItems( const KFileItemList & )) ); - connect( m_dirLister, TQT_SIGNAL(deleteItem( KFileItem * )), - this, TQT_SLOT(slotDeleteItem( KFileItem * )) ); - connect( m_dirLister, TQT_SIGNAL(refreshItems( const KFileItemList & )), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & )) ); - connect( m_dirLister, TQT_SIGNAL(redirection( const KURL & )), - this, TQT_SLOT(slotRedirection( const KURL & )) ); - connect( m_dirLister, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )), - m_pBrowserView, TQT_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); - - connect( m_dirLister, TQT_SIGNAL(infoMessage( const TQString& )), - m_pBrowserView->extension(), TQT_SIGNAL(infoMessage( const TQString& )) ); - connect( m_dirLister, TQT_SIGNAL(percent( int )), - m_pBrowserView->extension(), TQT_SIGNAL(loadingProgress( int )) ); - connect( m_dirLister, TQT_SIGNAL(speed( int )), - m_pBrowserView->extension(), TQT_SIGNAL(speedProgress( int )) ); - - connect( header(), TQT_SIGNAL(sizeChange( int, int, int )), TQT_SLOT(slotUpdateBackground()) ); + connect( m_dirLister, TQ_SIGNAL(started( const KURL & )), + this, TQ_SLOT(slotStarted()) ); + connect( m_dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotCompleted()) ); + connect( m_dirLister, TQ_SIGNAL(canceled()), this, TQ_SLOT(slotCanceled()) ); + connect( m_dirLister, TQ_SIGNAL(clear()), this, TQ_SLOT(slotClear()) ); + connect( m_dirLister, TQ_SIGNAL(newItems( const KFileItemList & ) ), + this, TQ_SLOT(slotNewItems( const KFileItemList & )) ); + connect( m_dirLister, TQ_SIGNAL(deleteItem( KFileItem * )), + this, TQ_SLOT(slotDeleteItem( KFileItem * )) ); + connect( m_dirLister, TQ_SIGNAL(refreshItems( const KFileItemList & )), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & )) ); + connect( m_dirLister, TQ_SIGNAL(redirection( const KURL & )), + this, TQ_SLOT(slotRedirection( const KURL & )) ); + connect( m_dirLister, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )), + m_pBrowserView, TQ_SIGNAL(itemsFilteredByMime( const KFileItemList & )) ); + + connect( m_dirLister, TQ_SIGNAL(infoMessage( const TQString& )), + m_pBrowserView->extension(), TQ_SIGNAL(infoMessage( const TQString& )) ); + connect( m_dirLister, TQ_SIGNAL(percent( int )), + m_pBrowserView->extension(), TQ_SIGNAL(loadingProgress( int )) ); + connect( m_dirLister, TQ_SIGNAL(speed( int )), + m_pBrowserView->extension(), TQ_SIGNAL(speedProgress( int )) ); + + connect( header(), TQ_SIGNAL(sizeChange( int, int, int )), TQ_SLOT(slotUpdateBackground()) ); viewport()->setMouseTracking( true ); viewport()->setFocusPolicy( TQWidget::WheelFocus ); @@ -453,7 +453,7 @@ void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) { } if ( m_scrollTimer ) { - disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -762,15 +762,15 @@ void KonqBaseListViewWidget::slotAutoScroll() { m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoScroll() ) ); + connect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->start( 100, false ); } } else if ( m_scrollTimer ) { - disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoScroll() ) ); + disconnect( m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoScroll() ) ); m_scrollTimer->stop(); delete m_scrollTimer; m_scrollTimer = 0; @@ -1563,7 +1563,7 @@ void KonqBaseListViewWidget::slotUpdateBackground() if ( !m_backgroundTimer ) { m_backgroundTimer = new TQTimer( this ); - connect( m_backgroundTimer, TQT_SIGNAL( timeout() ), viewport(), TQT_SLOT( update() ) ); + connect( m_backgroundTimer, TQ_SIGNAL( timeout() ), viewport(), TQ_SLOT( update() ) ); } else m_backgroundTimer->stop(); diff --git a/konqueror/listview/konq_treeviewwidget.cpp b/konqueror/listview/konq_treeviewwidget.cpp index 77adc4b61..02c297c88 100644 --- a/konqueror/listview/konq_treeviewwidget.cpp +++ b/konqueror/listview/konq_treeviewwidget.cpp @@ -35,12 +35,12 @@ KonqTreeViewWidget::KonqTreeViewWidget( KonqListView *parent, TQWidget *parentWi setRootIsDecorated( true ); setTreeStepSize( 20 ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotCompleted( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( clear( const KURL & ) ), - this, TQT_SLOT( slotClear( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotCompleted( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( clear( const KURL & ) ), + this, TQ_SLOT( slotClear( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } KonqTreeViewWidget::~KonqTreeViewWidget() diff --git a/konqueror/preloader/preloader.cpp b/konqueror/preloader/preloader.cpp index 5d87a8b07..ecc6691da 100644 --- a/konqueror/preloader/preloader.cpp +++ b/konqueror/preloader/preloader.cpp @@ -30,10 +30,10 @@ KonqyPreloader::KonqyPreloader( const TQCString& obj ) : KDEDModule( obj ) { reconfigure(); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& )), - TQT_SLOT( appRemoved( const TQCString& ))); - connect( &check_always_preloaded_timer, TQT_SIGNAL( timeout()), - TQT_SLOT( checkAlwaysPreloaded())); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& )), + TQ_SLOT( appRemoved( const TQCString& ))); + connect( &check_always_preloaded_timer, TQ_SIGNAL( timeout()), + TQ_SLOT( checkAlwaysPreloaded())); } KonqyPreloader::~KonqyPreloader() diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 913444098..c44aaa342 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -50,16 +50,16 @@ KRemoteEncodingPlugin::KRemoteEncodingPlugin(TQObject * parent, { m_menu = new TDEActionMenu(i18n("Select Remote Charset"), "charset", actionCollection(), "changeremoteencoding"); - connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(slotAboutToShow())); + connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(slotAboutToShow())); m_menu->setEnabled(false); m_menu->setDelayed(false); m_part = dynamic_cast<KonqDirPart*>(parent); if (m_part) // if parent is not a KonqDirPart, our menu will never show - TQObject::connect(m_part, TQT_SIGNAL(aboutToOpenURL()), - this, TQT_SLOT(slotAboutToOpenURL())); + TQObject::connect(m_part, TQ_SIGNAL(aboutToOpenURL()), + this, TQ_SLOT(slotAboutToOpenURL())); } KRemoteEncodingPlugin::~KRemoteEncodingPlugin() @@ -117,11 +117,11 @@ KRemoteEncodingPlugin::fillMenu() TQStringList::ConstIterator it; int count = 0; for (it = m_encodingDescriptions.begin(); it != m_encodingDescriptions.end(); ++it) - menu->insertItem(*it, this, TQT_SLOT(slotItemSelected(int)), 0, ++count); + menu->insertItem(*it, this, TQ_SLOT(slotItemSelected(int)), 0, ++count); menu->insertSeparator(); - menu->insertItem(i18n("Reload"), this, TQT_SLOT(slotReload()), 0, ++count); - menu->insertItem(i18n("Default"), this, TQT_SLOT(slotDefault()), 0, ++count); + menu->insertItem(i18n("Reload"), this, TQ_SLOT(slotReload()), 0, ++count); + menu->insertItem(i18n("Default"), this, TQ_SLOT(slotDefault()), 0, ++count); m_idDefault = count; } diff --git a/konqueror/shellcmdplugin/kshellcmddialog.cpp b/konqueror/shellcmdplugin/kshellcmddialog.cpp index b4ea0cb5d..80c854fcf 100644 --- a/konqueror/shellcmdplugin/kshellcmddialog.cpp +++ b/konqueror/shellcmdplugin/kshellcmddialog.cpp @@ -54,9 +54,9 @@ KShellCommandDialog::KShellCommandDialog(const TQString& title, const TQString& m_shell->setFocus(); - connect(cancelButton, TQT_SIGNAL(clicked()), m_shell, TQT_SLOT(slotFinished())); - connect(m_shell, TQT_SIGNAL(finished()), this, TQT_SLOT(disableStopButton())); - connect(closeButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); + connect(cancelButton, TQ_SIGNAL(clicked()), m_shell, TQ_SLOT(slotFinished())); + connect(m_shell, TQ_SIGNAL(finished()), this, TQ_SLOT(disableStopButton())); + connect(closeButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose())); } KShellCommandDialog::~KShellCommandDialog() diff --git a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp index 228db9a36..d4d6f45f9 100644 --- a/konqueror/shellcmdplugin/kshellcmdexecutor.cpp +++ b/konqueror/shellcmdplugin/kshellcmdexecutor.cpp @@ -87,8 +87,8 @@ int KShellCommandExecutor::exec() m_readNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Read, this); m_writeNotifier=new TQSocketNotifier(m_shellProcess->fd(),TQSocketNotifier::Write, this); m_writeNotifier->setEnabled(false); - connect (m_readNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(readDataFromShell())); - connect (m_writeNotifier, TQT_SIGNAL(activated(int)), this,TQT_SLOT(writeDataToShell())); + connect (m_readNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(readDataFromShell())); + connect (m_writeNotifier, TQ_SIGNAL(activated(int)), this,TQ_SLOT(writeDataToShell())); return 1; } diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index 407d6f297..1b426da2a 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/konqueror/shellcmdplugin/kshellcmdplugin.cpp @@ -34,7 +34,7 @@ KShellCmdPlugin::KShellCmdPlugin( TQObject* parent, const char* name, return; new TDEAction( i18n( "&Execute Shell Command..." ), "system-run", CTRL+Key_E, this, - TQT_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); + TQ_SLOT( slotExecuteShellCommand() ), actionCollection(), "executeshellcommand" ); } void KShellCmdPlugin::slotExecuteShellCommand() diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index 774ad8509..437c7bda9 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/konqueror/sidebar/konqsidebar.cpp @@ -32,11 +32,11 @@ KonqSidebar::KonqSidebar( TQWidget *parentWidget, const char *widgetName, // this should be your custom internal widget m_widget = new Sidebar_Widget( parentWidget, this, widgetName ,universalMode, parentWidget->topLevelWidget()->property("currentProfile").toString() ); m_extension = new KonqSidebarBrowserExtension( this, m_widget,"KonqSidebar::BrowserExtension" ); - connect(m_widget,TQT_SIGNAL(started(TDEIO::Job *)), - this, TQT_SIGNAL(started(TDEIO::Job*))); - connect(m_widget,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); - connect(m_extension, TQT_SIGNAL(addWebSideBar(const KURL&, const TQString&)), - m_widget, TQT_SLOT(addWebSideBar(const KURL&, const TQString&))); + connect(m_widget,TQ_SIGNAL(started(TDEIO::Job *)), + this, TQ_SIGNAL(started(TDEIO::Job*))); + connect(m_widget,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed())); + connect(m_extension, TQ_SIGNAL(addWebSideBar(const KURL&, const TQString&)), + m_widget, TQ_SLOT(addWebSideBar(const KURL&, const TQString&))); TDEAcceleratorManager::setNoAccel(m_widget); setWidget(m_widget); } diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp index 8fe85f512..5fd3f6d7e 100644 --- a/konqueror/sidebar/sidebar_widget.cpp +++ b/konqueror/sidebar/sidebar_widget.cpp @@ -60,8 +60,8 @@ addBackEnd::addBackEnd(TQWidget *parent, class TQPopupMenu *addmenu, m_universal=universal; m_currentProfile = currentProfile; menu = addmenu; - connect(menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(aboutToShowAddMenu())); - connect(menu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activatedAddMenu(int))); + connect(menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(aboutToShowAddMenu())); + connect(menu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activatedAddMenu(int))); } void addBackEnd::aboutToShowAddMenu() @@ -268,7 +268,7 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (splitterWidget) { splitterWidget->setResizeMode(parent, TQSplitter::FollowSizeHint); splitterWidget->setOpaqueResize( false ); - connect(splitterWidget,TQT_SIGNAL(setRubberbandCalled()),TQT_SLOT(userMovedSplitter())); + connect(splitterWidget,TQ_SIGNAL(setRubberbandCalled()),TQ_SLOT(userMovedSplitter())); } m_area = new KDockArea(this); @@ -292,22 +292,22 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons if (!m_universalMode) { m_menu->insertItem(SmallIconSet("remove"), i18n("Close Navigation Panel"), - par, TQT_SLOT(deleteLater())); + par, TQ_SLOT(deleteLater())); } - connect(m_menu, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(aboutToShowConfigMenu())); - connect(m_menu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(activatedMenu(int))); + connect(m_menu, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(aboutToShowConfigMenu())); + connect(m_menu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(activatedMenu(int))); m_buttonPopup = 0; addBackEnd *ab = new addBackEnd(this, addMenu, universalMode, currentProfile, "Sidebar_Widget-addBackEnd"); - connect(ab, TQT_SIGNAL(updateNeeded()), - this, TQT_SLOT(updateButtons())); - connect(ab, TQT_SIGNAL(initialCopyNeeded()), - this, TQT_SLOT(finishRollBack())); + connect(ab, TQ_SIGNAL(updateNeeded()), + this, TQ_SLOT(updateButtons())); + connect(ab, TQ_SIGNAL(initialCopyNeeded()), + this, TQ_SLOT(finishRollBack())); initialCopy(); @@ -327,13 +327,13 @@ Sidebar_Widget::Sidebar_Widget(TQWidget *parent, KParts::ReadOnlyPart *par, cons m_menu->setItemVisible(2, !m_immutableShowTabsLeft); m_menu->setItemVisible(3, !m_immutableShowExtraButtons); - connect(&m_configTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(saveConfig())); + connect(&m_configTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(saveConfig())); m_somethingVisible = !m_openViews.isEmpty(); doLayout(); - TQTimer::singleShot(0,this,TQT_SLOT(createButtons())); - connect(m_area, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), - this, TQT_SLOT(dockWidgetHasUndocked(KDockWidget*))); + TQTimer::singleShot(0,this,TQ_SLOT(createButtons())); + connect(m_area, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget*)), + this, TQ_SLOT(dockWidgetHasUndocked(KDockWidget*))); } void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { @@ -373,7 +373,7 @@ void Sidebar_Widget::addWebSideBar(const KURL& url, const TQString& /*name*/) { scf.writeEntry("X-TDE-KonqSidebarModule", "konqsidebar_web"); scf.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } } @@ -382,7 +382,7 @@ void Sidebar_Widget::finishRollBack() { m_path = TDEGlobal::dirs()->saveLocation("data",m_relPath,true); initialCopy(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } @@ -508,7 +508,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) ksc.setGroup("Desktop Entry"); ksc.writeEntry("Icon",iconname); ksc.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -531,7 +531,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) //ksc.writeEntry("Name",newurl); ksc.writePathEntry("URL",newurl); ksc.sync(); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } } delete dlg; @@ -545,7 +545,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) TQFile f(m_path+m_currentButton->file); if (!f.remove()) tqDebug("Error, file not deleted"); - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -566,7 +566,7 @@ void Sidebar_Widget::buttonPopupActivate(int id) ksc.sync(); // Update the buttons with a TQTimer (why?) - TQTimer::singleShot(0,this,TQT_SLOT(updateButtons())); + TQTimer::singleShot(0,this,TQ_SLOT(updateButtons())); } break; } @@ -838,7 +838,7 @@ bool Sidebar_Widget::addButton(const TQString &desktoppath,int pos) /*int id=*/m_buttons.insert(lastbtn, bi); KMultiTabBarTab *tab = m_buttonBar->tab(lastbtn); tab->installEventFilter(this); - connect(tab,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(showHidePage(int))); + connect(tab,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(showHidePage(int))); // Set Whats This help // This uses the comments in the .desktop files @@ -882,8 +882,8 @@ bool Sidebar_Widget::eventFilter(TQObject *obj, TQEvent *ev) m_buttonPopup->insertItem(SmallIconSet("edit-delete"), i18n("Remove"),3); m_buttonPopup->insertSeparator(); m_buttonPopup->insertItem(SmallIconSet("configure"), i18n("Configure Navigation Panel"), m_menu, 4); - connect(m_buttonPopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(buttonPopupActivate(int))); + connect(m_buttonPopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(buttonPopupActivate(int))); } m_buttonPopup->setItemEnabled(2,!m_currentButton->URL.isEmpty()); m_buttonPopup->changeTitle(50,SmallIcon(m_currentButton->iconName), @@ -961,11 +961,11 @@ bool Sidebar_Widget::createView( ButtonInfo *data) KDockWidget::DockBottom/*|KDockWidget::DockDesktop*/); data->dock->setDockSite(KDockWidget::DockTop|KDockWidget::DockBottom); connectModule(data->module); - connect(this, TQT_SIGNAL(fileSelection(const KFileItemList&)), - data->module, TQT_SLOT(openPreview(const KFileItemList&))); + connect(this, TQ_SIGNAL(fileSelection(const KFileItemList&)), + data->module, TQ_SLOT(openPreview(const KFileItemList&))); - connect(this, TQT_SIGNAL(fileMouseOver(const KFileItem&)), - data->module, TQT_SLOT(openPreviewOnMouseOver(const KFileItem&))); + connect(this, TQ_SIGNAL(fileMouseOver(const KFileItem&)), + data->module, TQ_SLOT(openPreviewOnMouseOver(const KFileItem&))); } delete confFile; @@ -998,14 +998,14 @@ void Sidebar_Widget::showHidePage(int page) m_buttonBar->setTab(page,true); connect(info->module, - TQT_SIGNAL(setIcon(const TQString&)), + TQ_SIGNAL(setIcon(const TQString&)), m_buttonBar->tab(page), - TQT_SLOT(setIcon(const TQString&))); + TQ_SLOT(setIcon(const TQString&))); connect(info->module, - TQT_SIGNAL(setCaption(const TQString&)), + TQ_SIGNAL(setCaption(const TQString&)), m_buttonBar->tab(page), - TQT_SLOT(setText(const TQString&))); + TQ_SLOT(setText(const TQString&))); if (m_singleWidgetMode) { @@ -1217,51 +1217,51 @@ void Sidebar_Widget::popupMenu( KXMLGUIClient *client, void Sidebar_Widget::connectModule(TQObject *mod) { if (mod->metaObject()->findSignal("started(TDEIO::Job*)") != -1) { - connect(mod,TQT_SIGNAL(started(TDEIO::Job *)),this, TQT_SIGNAL(started(TDEIO::Job*))); + connect(mod,TQ_SIGNAL(started(TDEIO::Job *)),this, TQ_SIGNAL(started(TDEIO::Job*))); } if (mod->metaObject()->findSignal("completed()") != -1) { - connect(mod,TQT_SIGNAL(completed()),this,TQT_SIGNAL(completed())); + connect(mod,TQ_SIGNAL(completed()),this,TQ_SIGNAL(completed())); } if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KURL&,const TQString&,mode_t)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, - const TQString &, mode_t)),this,TQT_SLOT(popupMenu( const + connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, + const TQString &, mode_t)),this,TQ_SLOT(popupMenu( const TQPoint &, const KURL&, const TQString &, mode_t))); } if (mod->metaObject()->findSignal("popupMenu(KXMLGUIClient*,const TQPoint &,const KURL&,const TQString&,mode_t)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, + connect(mod,TQ_SIGNAL(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t)),this, - TQT_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, + TQ_SLOT(popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &,const TQString &, mode_t))); } if (mod->metaObject()->findSignal("popupMenu(const TQPoint&,const KFileItemList&)") != -1) { - connect(mod,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); + connect(mod,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SLOT(popupMenu( const TQPoint &, const KFileItemList & ))); } if (mod->metaObject()->findSignal("openURLRequest(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,TQT_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(mod,TQ_SIGNAL(openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs &))); } if (mod->metaObject()->findSignal("submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)") != -1) { connect(mod, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); + TQ_SLOT(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); } if (mod->metaObject()->findSignal("enableAction(const char*,bool)") != -1) { - connect(mod,TQT_SIGNAL(enableAction( const char *, bool)), - this,TQT_SLOT(enableAction(const char *, bool))); + connect(mod,TQ_SIGNAL(enableAction( const char *, bool)), + this,TQ_SLOT(enableAction(const char *, bool))); } if (mod->metaObject()->findSignal("createNewWindow(const KURL&,const KParts::URLArgs&)") != -1) { - connect(mod,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(mod,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SLOT(createNewWindow( const KURL &, const KParts::URLArgs &))); } } diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 208fe2ee6..f1dd0b953 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp @@ -45,39 +45,39 @@ KonqSidebarBookmarkModule::KonqSidebarBookmarkModule( KonqSidebarTree * parentTr formats << "text/uri-list" << "application/x-xbel" << "text/plain"; tree()->setDropFormats(formats); - connect(tree(), TQT_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(moved(TQListViewItem*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotMoved(TQListViewItem*,TQListViewItem*,TQListViewItem*))); + connect(tree(), TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*,TQListViewItem*))); - connect(tree(), TQT_SIGNAL(expanded(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); - connect(tree(), TQT_SIGNAL(collapsed(TQListViewItem*)), - this, TQT_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(expanded(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); + connect(tree(), TQ_SIGNAL(collapsed(TQListViewItem*)), + this, TQ_SLOT(slotOpenChange(TQListViewItem*))); m_collection = new TDEActionCollection( this, "bookmark actions" ); (void) new TDEAction( i18n("&Create New Folder"), "folder-new", 0, this, - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new TDEAction( i18n("Delete Bookmark"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_bookmark"); + TQ_SLOT( slotDelete() ), m_collection, "delete_bookmark"); (void) new TDEAction( i18n("Properties"), "edit", 0, this, - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new TDEAction( i18n("Open Folder in Tabs"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); + TQ_SLOT( slotOpenTab() ), m_collection, "folder_open_tabs"); (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); - KStdAction::editBookmarks( KonqBookmarkManager::self(), TQT_SLOT( slotEditBookmarks() ), + KStdAction::editBookmarks( KonqBookmarkManager::self(), TQ_SLOT( slotEditBookmarks() ), m_collection, "edit_bookmarks" ); - connect( KonqBookmarkManager::self(), TQT_SIGNAL(changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( KonqBookmarkManager::self(), TQ_SIGNAL(changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } KonqSidebarBookmarkModule::~KonqSidebarBookmarkModule() diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index b1b6d0563..e6e4a0af3 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -52,8 +52,8 @@ KonqSidebarDirTreeModule::~KonqSidebarDirTreeModule() // KDirLister may still emit canceled while being deleted. if (m_dirLister) { - disconnect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); + disconnect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); delete m_dirLister; } } @@ -303,18 +303,18 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) // mimetypes<<TQString("inode/directory"); // m_dirLister->setMimeFilter(mimetypes); - connect( m_dirLister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - this, TQT_SLOT( slotRefreshItems( const KFileItemList & ) ) ); - connect( m_dirLister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - this, TQT_SLOT( slotDeleteItem( KFileItem * ) ) ); - connect( m_dirLister, TQT_SIGNAL( completed( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( canceled( const KURL & ) ), - this, TQT_SLOT( slotListingStopped( const KURL & ) ) ); - connect( m_dirLister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - this, TQT_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + this, TQ_SLOT( slotRefreshItems( const KFileItemList & ) ) ); + connect( m_dirLister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + this, TQ_SLOT( slotDeleteItem( KFileItem * ) ) ); + connect( m_dirLister, TQ_SIGNAL( completed( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( canceled( const KURL & ) ), + this, TQ_SLOT( slotListingStopped( const KURL & ) ) ); + connect( m_dirLister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + this, TQ_SLOT( slotRedirection( const KURL &, const KURL & ) ) ); } diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index 6f051a553..416054cf1 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/konqueror/sidebar/trees/history_module/history_module.cpp @@ -51,7 +51,7 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree s_settings->readSettings( true ); } - connect( s_settings, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( slotSettingsChanged() )); + connect( s_settings, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( slotSettingsChanged() )); m_dict.setAutoDelete( true ); m_currentTime = TQDateTime::currentDateTime(); @@ -63,35 +63,35 @@ KonqSidebarHistoryModule::KonqSidebarHistoryModule( KonqSidebarTree * parentTree KonqHistoryManager *manager = KonqHistoryManager::kself(); - connect( manager, TQT_SIGNAL( loadingFinished() ), TQT_SLOT( slotCreateItems() )); - connect( manager, TQT_SIGNAL( cleared() ), TQT_SLOT( clear() )); + connect( manager, TQ_SIGNAL( loadingFinished() ), TQ_SLOT( slotCreateItems() )); + connect( manager, TQ_SIGNAL( cleared() ), TQ_SLOT( clear() )); - connect( manager, TQT_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), - TQT_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); - connect( manager, TQT_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), - TQT_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); + connect( manager, TQ_SIGNAL( entryAdded( const KonqHistoryEntry * ) ), + TQ_SLOT( slotEntryAdded( const KonqHistoryEntry * ) )); + connect( manager, TQ_SIGNAL( entryRemoved( const KonqHistoryEntry *) ), + TQ_SLOT( slotEntryRemoved( const KonqHistoryEntry *) )); - connect( parentTree, TQT_SIGNAL( expanded( TQListViewItem * )), - TQT_SLOT( slotItemExpanded( TQListViewItem * ))); + connect( parentTree, TQ_SIGNAL( expanded( TQListViewItem * )), + TQ_SLOT( slotItemExpanded( TQListViewItem * ))); m_collection = new TDEActionCollection( this, "history actions" ); (void) new TDEAction( i18n("New &Window"), "window-new", 0, this, - TQT_SLOT( slotNewWindow() ), m_collection, "open_new"); + TQ_SLOT( slotNewWindow() ), m_collection, "open_new"); (void) new TDEAction( i18n("&Remove Entry"), "edit-delete", 0, this, - TQT_SLOT( slotRemoveEntry() ), m_collection, "remove"); + TQ_SLOT( slotRemoveEntry() ), m_collection, "remove"); (void) new TDEAction( i18n("C&lear History"), "history_clear", 0, this, - TQT_SLOT( slotClearHistory() ), m_collection, "clear"); + TQ_SLOT( slotClearHistory() ), m_collection, "clear"); (void) new TDEAction( i18n("&Preferences..."), "configure", 0, this, - TQT_SLOT( slotPreferences()), m_collection, "preferences"); + TQ_SLOT( slotPreferences()), m_collection, "preferences"); TDERadioAction *sort; sort = new TDERadioAction( i18n("By &Name"), 0, this, - TQT_SLOT( slotSortByName() ), m_collection, "byName"); + TQ_SLOT( slotSortByName() ), m_collection, "byName"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( m_sortsByName ); sort = new TDERadioAction( i18n("By &Date"), 0, this, - TQT_SLOT( slotSortByDate() ), m_collection, "byDate"); + TQ_SLOT( slotSortByDate() ), m_collection, "byDate"); sort->setExclusiveGroup("SortGroup"); sort->setChecked( !m_sortsByName ); diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 70e42e113..188da9d93 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/konqueror/sidebar/trees/history_module/kcmhistory.cpp @@ -75,33 +75,33 @@ HistorySidebarConfig::HistorySidebarConfig( TQWidget *parent, const char* name, dialog->comboOlder->insertItem( i18n("Days"), KonqSidebarHistorySettings::DAYS ); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - dialog->spinExpire, TQT_SLOT( setEnabled( bool ))); - connect( dialog->spinExpire, TQT_SIGNAL( valueChanged( int )), - this, TQT_SLOT( slotExpireChanged( int ))); - - connect( dialog->spinNewer, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotNewerChanged( int ))); - connect( dialog->spinOlder, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( slotOlderChanged( int ))); - - connect( dialog->btnFontNewer, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontNewer() )); - connect( dialog->btnFontOlder, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotGetFontOlder() )); - connect( dialog->btnClearHistory, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotClearHistory() )); - - connect( dialog->cbDetailedTips, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->cbExpire, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( configChanged() )); - connect( dialog->spinEntries, TQT_SIGNAL( valueChanged( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboNewer, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); - connect( dialog->comboOlder, TQT_SIGNAL( activated( int )), - TQT_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + dialog->spinExpire, TQ_SLOT( setEnabled( bool ))); + connect( dialog->spinExpire, TQ_SIGNAL( valueChanged( int )), + this, TQ_SLOT( slotExpireChanged( int ))); + + connect( dialog->spinNewer, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotNewerChanged( int ))); + connect( dialog->spinOlder, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( slotOlderChanged( int ))); + + connect( dialog->btnFontNewer, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontNewer() )); + connect( dialog->btnFontOlder, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotGetFontOlder() )); + connect( dialog->btnClearHistory, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotClearHistory() )); + + connect( dialog->cbDetailedTips, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->cbExpire, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( configChanged() )); + connect( dialog->spinEntries, TQ_SIGNAL( valueChanged( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboNewer, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); + connect( dialog->comboOlder, TQ_SIGNAL( activated( int )), + TQ_SLOT( configChanged() )); dialog->show(); topLayout->add(dialog); diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 77e4f640b..6dee8c0dd 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/konqueror/sidebar/trees/konq_sidebartree.cpp @@ -136,8 +136,8 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg m_part = parent; m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAnimation() ) ); + connect( m_animationTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; @@ -148,22 +148,22 @@ KonqSidebarTree::KonqSidebarTree( KonqSidebar_Tree *parent, TQWidget *parentWidg setTreeStepSize(15); m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); - - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), - this, TQT_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); + + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT( slotMouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ), + this, TQ_SLOT( slotSidebarMouseButtonClicked( int, TQListViewItem*, const TQPoint&, int ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); /* assert( m_part->getInterfaces()->getInstance()->dirs ); TQString dirtreeDir = m_part->getInterfaces()->getInstance()->dirs()->saveLocation( "data", "konqueror/dirtree/" ); */ @@ -558,7 +558,7 @@ void KonqSidebarTree::FilesAdded( const KURL & dir ) kdDebug(1201) << "KonqSidebarTree::FilesAdded " << dir.url() << endl; if ( m_dirtreeDir.dir.isParentOf( dir ) ) // We use a timer in case of DCOP re-entrance.. - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); } void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) @@ -569,7 +569,7 @@ void KonqSidebarTree::FilesRemoved( const KURL::List & urls ) //kdDebug(1201) << "KonqSidebarTree::FilesRemoved " << (*it).prettyURL() << endl; if ( m_dirtreeDir.dir.isParentOf( *it ) ) { - TQTimer::singleShot( 0, this, TQT_SLOT( rescanConfiguration() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( rescanConfiguration() ) ); kdDebug(1201) << "KonqSidebarTree::FilesRemoved done" << endl; return; } @@ -909,21 +909,21 @@ void KonqSidebarTree::showToplevelContextMenu() { m_collection = new TDEActionCollection( this, "bookmark actions" ); (void) new TDEAction( i18n("&Create New Folder..."), "folder-new", 0, this, - TQT_SLOT( slotCreateFolder() ), m_collection, "create_folder"); + TQ_SLOT( slotCreateFolder() ), m_collection, "create_folder"); (void) new TDEAction( i18n("Delete Folder"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_folder"); + TQ_SLOT( slotDelete() ), m_collection, "delete_folder"); (void) new TDEAction( i18n("Rename"), 0, this, - TQT_SLOT( slotRename() ), m_collection, "rename"); + TQ_SLOT( slotRename() ), m_collection, "rename"); (void) new TDEAction( i18n("Delete Link"), "edit-delete", 0, this, - TQT_SLOT( slotDelete() ), m_collection, "delete_link"); + TQ_SLOT( slotDelete() ), m_collection, "delete_link"); (void) new TDEAction( i18n("Properties"), "edit", 0, this, - TQT_SLOT( slotProperties() ), m_collection, "item_properties"); + TQ_SLOT( slotProperties() ), m_collection, "item_properties"); (void) new TDEAction( i18n("Open in New Window"), "window-new", 0, this, - TQT_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); + TQ_SLOT( slotOpenNewWindow() ), m_collection, "open_window"); (void) new TDEAction( i18n("Open in New Tab"), "tab_new", 0, this, - TQT_SLOT( slotOpenTab() ), m_collection, "open_tab"); + TQ_SLOT( slotOpenTab() ), m_collection, "open_tab"); (void) new TDEAction( i18n("Copy Link Address"), "edit-copy", 0, this, - TQT_SLOT( slotCopyLocation() ), m_collection, "copy_location"); + TQ_SLOT( slotCopyLocation() ), m_collection, "copy_location"); } TQPopupMenu *menu = new TQPopupMenu; diff --git a/konqueror/sidebar/trees/konqsidebar_tree.cpp b/konqueror/sidebar/trees/konqsidebar_tree.cpp index 1903c2328..4bd91f9f3 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.cpp +++ b/konqueror/sidebar/trees/konqsidebar_tree.cpp @@ -34,25 +34,25 @@ KonqSidebar_Tree::KonqSidebar_Tree(TDEInstance *instance,TQObject *parent,TQWidg TQLabel* slbl = new TQLabel(i18n("Se&arch:"), searchline); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchline,tree); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); } else tree=new KonqSidebarTree(this,widget,virt,desktopName_); - connect(tree, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); + connect(tree, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), - this,TQT_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); + connect(tree,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &)), + this,TQ_SIGNAL(createNewWindow( const KURL &, const KParts::URLArgs &))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ))); - connect(tree,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), - this,TQT_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); + connect(tree,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & )), + this,TQ_SIGNAL(popupMenu( const TQPoint &, const KFileItemList & ))); - connect(tree,TQT_SIGNAL(enableAction( const char *, bool )), - this,TQT_SIGNAL(enableAction( const char *, bool))); + connect(tree,TQ_SIGNAL(enableAction( const char *, bool )), + this,TQ_SIGNAL(enableAction( const char *, bool))); } diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index 44a94f02c..feb1a6692 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -36,30 +36,30 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare : KonqSidebarPlugin(instance, parent, widgetParent, desktopName, name) { _htmlPart = new TDEHTMLSideBar(universalMode()); - connect(_htmlPart, TQT_SIGNAL(reload()), this, TQT_SLOT(reload())); - connect(_htmlPart, TQT_SIGNAL(completed()), this, TQT_SLOT(pageLoaded())); + connect(_htmlPart, TQ_SIGNAL(reload()), this, TQ_SLOT(reload())); + connect(_htmlPart, TQ_SIGNAL(completed()), this, TQ_SLOT(pageLoaded())); connect(_htmlPart, - TQT_SIGNAL(setWindowCaption(const TQString&)), + TQ_SIGNAL(setWindowCaption(const TQString&)), this, - TQT_SLOT(setTitle(const TQString&))); + TQ_SLOT(setTitle(const TQString&))); connect(_htmlPart, - TQT_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), + TQ_SIGNAL(openURLRequest(const TQString&, KParts::URLArgs)), this, - TQT_SLOT(urlClicked(const TQString&, KParts::URLArgs))); + TQ_SLOT(urlClicked(const TQString&, KParts::URLArgs))); connect(_htmlPart->browserExtension(), - TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), + TQ_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)), this, - TQT_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); + TQ_SLOT(formClicked(const KURL&, const KParts::URLArgs&))); connect(_htmlPart, - TQT_SIGNAL(setAutoReload()), this, TQT_SLOT( setAutoReload() )); + TQ_SIGNAL(setAutoReload()), this, TQ_SLOT( setAutoReload() )); connect(_htmlPart, - TQT_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), + TQ_SIGNAL(openURLNewWindow(const TQString&, KParts::URLArgs)), this, - TQT_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); + TQ_SLOT(urlNewWindow(const TQString&, KParts::URLArgs))); connect(_htmlPart, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); + TQ_SIGNAL(submitFormRequest(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&))); _desktopName = desktopName; @@ -69,7 +69,7 @@ KonqSideBarWebModule::KonqSideBarWebModule(TDEInstance *instance, TQObject *pare _url = ksc.readPathEntry("URL"); _htmlPart->openURL(_url ); // Must load this delayed - TQTimer::singleShot(0, this, TQT_SLOT(loadFavicon())); + TQTimer::singleShot(0, this, TQ_SLOT(loadFavicon())); } @@ -176,7 +176,7 @@ void KonqSideBarWebModule::setTitle(const TQString& title) { void KonqSideBarWebModule::pageLoaded() { if( reloadTimeout > 0 ) { - TQTimer::singleShot( reloadTimeout, this, TQT_SLOT( reload() ) ); + TQTimer::singleShot( reloadTimeout, this, TQ_SLOT( reload() ) ); } } diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index e4669da89..072c3d822 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -41,9 +41,9 @@ class TDEHTMLSideBar : public TDEHTMLPart setFormNotification(TDEHTMLPart::Only); connect(this, - TQT_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), + TQ_SIGNAL(formSubmitNotification(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)), this, - TQT_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) + TQ_SLOT(formProxy(const char*,const TQString&,const TQByteArray&,const TQString&,const TQString&,const TQString&)) ); @@ -51,22 +51,22 @@ class TDEHTMLSideBar : public TDEHTMLPart "link context menu"); if (!universal) { _linkMenu->insertItem(i18n("&Open Link"), - this, TQT_SLOT(loadPage())); + this, TQ_SLOT(loadPage())); _linkMenu->insertItem(i18n("Open in New &Window"), - this, TQT_SLOT(loadNewWindow())); + this, TQ_SLOT(loadNewWindow())); } else { _linkMenu->insertItem(i18n("Open in New &Window"), - this, TQT_SLOT(loadPage())); + this, TQ_SLOT(loadPage())); } _menu = new TDEPopupMenu(widget(), "context menu"); _menu->insertItem(SmallIcon("reload"), i18n("&Reload"), - this, TQT_SIGNAL(reload())); - _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQT_SIGNAL(setAutoReload())); + this, TQ_SIGNAL(reload())); + _menu->insertItem(SmallIcon("reload"), i18n("Set &Automatic Reload"), this, TQ_SIGNAL(setAutoReload())); connect(this, - TQT_SIGNAL(popupMenu(const TQString&,const TQPoint&)), + TQ_SIGNAL(popupMenu(const TQString&,const TQPoint&)), this, - TQT_SLOT(showMenu(const TQString&, const TQPoint&))); + TQ_SLOT(showMenu(const TQString&, const TQPoint&))); } virtual ~TDEHTMLSideBar() {} diff --git a/konsole/konsole/TEPty.cpp b/konsole/konsole/TEPty.cpp index 2148ec03c..fbb152289 100644 --- a/konsole/konsole/TEPty.cpp +++ b/konsole/konsole/TEPty.cpp @@ -171,12 +171,12 @@ void TEPty::setWriteable(bool writeable) TEPty::TEPty() { m_bufferFull = false; - connect(this, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this, TQT_SLOT(dataReceived(TDEProcess *,char *, int))); - connect(this, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(donePty())); - connect(this, TQT_SIGNAL(wroteStdin(TDEProcess *)), - this, TQT_SLOT(writeReady())); + connect(this, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this, TQ_SLOT(dataReceived(TDEProcess *,char *, int))); + connect(this, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(donePty())); + connect(this, TQ_SIGNAL(wroteStdin(TDEProcess *)), + this, TQ_SLOT(writeReady())); setUsePty(All, false); // utmp will be overridden later } diff --git a/konsole/konsole/TEWidget.cpp b/konsole/konsole/TEWidget.cpp index 2302cf81a..33dcf7f79 100644 --- a/konsole/konsole/TEWidget.cpp +++ b/konsole/konsole/TEWidget.cpp @@ -410,17 +410,17 @@ TEWidget::TEWidget(TQWidget *parent, const char *name) bY = bX = 1; cb = TQApplication::clipboard(); - TQObject::connect( (TQObject*)cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( (TQObject*)cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); scrollbar = new TQScrollBar(this); scrollbar->setCursor( TQt::arrowCursor ); - connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); blinkT = new TQTimer(this); - connect(blinkT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkEvent())); + connect(blinkT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkEvent())); blinkCursorT = new TQTimer(this); - connect(blinkCursorT, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursorEvent())); + connect(blinkCursorT, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursorEvent())); setMouseMarks(true); setColorTable(base_color_table); // init color table @@ -977,7 +977,7 @@ void TEWidget::setImage(const ca* const newimg, int lines, int columns) mResizeWidget->setMinimumWidth(mResizeLabel->fontMetrics().width(i18n("Size: XXX x XXX"))+20); mResizeWidget->setMinimumHeight(mResizeLabel->sizeHint().height()+20); mResizeTimer = new TQTimer(this); - connect(mResizeTimer, TQT_SIGNAL(timeout()), mResizeWidget, TQT_SLOT(hide())); + connect(mResizeTimer, TQ_SIGNAL(timeout()), mResizeWidget, TQ_SLOT(hide())); } TQString sizeStr = i18n("Size: %1 x %2").arg(columns).arg(lines); mResizeLabel->setText(sizeStr); @@ -1254,13 +1254,13 @@ void TEWidget::scrollChanged(int) void TEWidget::setScroll(int cursor, int slines) { //kdDebug(1211)<<"TEWidget::setScroll() disconnect()"<<endl; - disconnect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + disconnect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); //kdDebug(1211)<<"TEWidget::setScroll() setRange()"<<endl; scrollbar->setRange(0,slines); //kdDebug(1211)<<"TEWidget::setScroll() setSteps()"<<endl; scrollbar->setSteps(1,lines); scrollbar->setValue(cursor); - connect(scrollbar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(scrollChanged(int))); + connect(scrollbar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(scrollChanged(int))); //kdDebug(1211)<<"TEWidget::setScroll() done"<<endl; } @@ -1696,7 +1696,7 @@ void TEWidget::mouseDoubleClickEvent(TQMouseEvent* ev) } possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void TEWidget::wheelEvent( TQWheelEvent* ev ) @@ -1870,15 +1870,15 @@ void TEWidget::setSelection(const TQString& t) { // Disconnect signal while WE set the clipboard TQClipboard *cb = TQApplication::clipboard(); - TQObject::disconnect( cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::disconnect( cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); cb->setSelectionMode( true ); cb->setText(t); cb->setSelectionMode( false ); - TQObject::connect( cb, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( cb, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(onClearSelection()) ); } void TEWidget::copyClipboard() @@ -1972,13 +1972,13 @@ bool TEWidget::eventFilter( TQObject *obj, TQEvent *e ) } if ( e->type() == TQEvent::Enter ) { - TQObject::disconnect( (TQObject*)cb, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::disconnect( (TQObject*)cb, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(onClearSelection()) ); } if ( e->type() == TQEvent::Leave ) { - TQObject::connect( (TQObject*)cb, TQT_SIGNAL(dataChanged()), - this, TQT_SLOT(onClearSelection()) ); + TQObject::connect( (TQObject*)cb, TQ_SIGNAL(dataChanged()), + this, TQ_SLOT(onClearSelection()) ); } return TQFrame::eventFilter( obj, e ); } @@ -2124,7 +2124,7 @@ void TEWidget::Bell(bool visibleSession, TQString message) bellTimer.start(BELLVISUAL_DELAY,true); swapColorTable(); - TQTimer::singleShot(200,this,TQT_SLOT(swapColorTable())); + TQTimer::singleShot(200,this,TQ_SLOT(swapColorTable())); } } @@ -2270,7 +2270,7 @@ void TEWidget::dropEvent(TQDropEvent* event) m_drop->insertItem( "cp", cp ); m_drop->insertItem( "ln", ln ); m_drop->insertItem( "mv", mv ); - connect(m_drop, TQT_SIGNAL(activated(int)), TQT_SLOT(drop_menu_activated(int))); + connect(m_drop, TQ_SIGNAL(activated(int)), TQ_SLOT(drop_menu_activated(int))); }; // The current behaviour when url(s) are dropped is // * if there is only ONE url and if it's a LOCAL one, ask for paste or cd/cp/ln/mv diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index a9c026fea..1d303089d 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -81,10 +81,10 @@ TEmuVt102::TEmuVt102(TEWidget* gui) : TEmulation(gui) { //kdDebug(1211)<<"TEmuVt102 ctor() connecting"<<endl; - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); //kdDebug(1211)<<"TEmuVt102 ctor() initToken..."<<endl; initTokenizer(); //kdDebug(1211)<<"TEmuVt102 ctor() reset()"<<endl; @@ -100,16 +100,16 @@ void TEmuVt102::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } TEmulation::changeGUI(newgui); - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } /*! @@ -1204,8 +1204,8 @@ void TEmuVt102::setConnect(bool c) TEmulation::setConnect(c); if (gui) { - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } if (c) { // refresh mouse mode @@ -1219,8 +1219,8 @@ void TEmuVt102::setConnect(bool c) else scrolllock_set_off(); #endif - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } } diff --git a/konsole/konsole/TEmulation.cpp b/konsole/konsole/TEmulation.cpp index 943d2f205..4a4c709e4 100644 --- a/konsole/konsole/TEmulation.cpp +++ b/konsole/konsole/TEmulation.cpp @@ -110,8 +110,8 @@ TEmulation::TEmulation(TEWidget* w) screen[1] = new TEScreen(gui->Lines(),gui->Columns()); scr = screen[0]; - TQObject::connect(&bulk_timer1, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) ); - TQObject::connect(&bulk_timer2, TQT_SIGNAL(timeout()), this, TQT_SLOT(showBulk()) ); + TQObject::connect(&bulk_timer1, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) ); + TQObject::connect(&bulk_timer2, TQ_SIGNAL(timeout()), this, TQ_SLOT(showBulk()) ); connectGUI(); setKeymap(0); // Default keymap } @@ -121,28 +121,28 @@ TEmulation::TEmulation(TEWidget* w) void TEmulation::connectGUI() { - TQObject::connect(gui,TQT_SIGNAL(changedHistoryCursor(int)), - this,TQT_SLOT(onHistoryCursorChange(int))); - TQObject::connect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyPress(TQKeyEvent*))); - TQObject::connect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyReleased(TQKeyEvent*))); - TQObject::connect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - this,TQT_SLOT(onFocusIn(TQFocusEvent*))); - TQObject::connect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)), - this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) ); - TQObject::connect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)), - this,TQT_SLOT(onSelectionExtend(const int,const int)) ); - TQObject::connect(gui,TQT_SIGNAL(endSelectionSignal(const bool)), - this,TQT_SLOT(setSelection(const bool)) ); - TQObject::connect(gui,TQT_SIGNAL(copySelectionSignal()), - this,TQT_SLOT(copySelection()) ); - TQObject::connect(gui,TQT_SIGNAL(clearSelectionSignal()), - this,TQT_SLOT(clearSelection()) ); - TQObject::connect(gui,TQT_SIGNAL(isBusySelecting(bool)), - this,TQT_SLOT(isBusySelecting(bool)) ); - TQObject::connect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)), - this,TQT_SLOT(testIsSelected(const int, const int, bool &)) ); + TQObject::connect(gui,TQ_SIGNAL(changedHistoryCursor(int)), + this,TQ_SLOT(onHistoryCursorChange(int))); + TQObject::connect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyPress(TQKeyEvent*))); + TQObject::connect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyReleased(TQKeyEvent*))); + TQObject::connect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + this,TQ_SLOT(onFocusIn(TQFocusEvent*))); + TQObject::connect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)), + this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) ); + TQObject::connect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)), + this,TQ_SLOT(onSelectionExtend(const int,const int)) ); + TQObject::connect(gui,TQ_SIGNAL(endSelectionSignal(const bool)), + this,TQ_SLOT(setSelection(const bool)) ); + TQObject::connect(gui,TQ_SIGNAL(copySelectionSignal()), + this,TQ_SLOT(copySelection()) ); + TQObject::connect(gui,TQ_SIGNAL(clearSelectionSignal()), + this,TQ_SLOT(clearSelection()) ); + TQObject::connect(gui,TQ_SIGNAL(isBusySelecting(bool)), + this,TQ_SLOT(isBusySelecting(bool)) ); + TQObject::connect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)), + this,TQ_SLOT(testIsSelected(const int, const int, bool &)) ); } /*! @@ -153,28 +153,28 @@ void TEmulation::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(changedHistoryCursor(int)), - this,TQT_SLOT(onHistoryCursorChange(int))); - TQObject::disconnect(gui,TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyPress(TQKeyEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - this,TQT_SLOT(onKeyReleased(TQKeyEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - this,TQT_SLOT(onFocusIn(TQFocusEvent*))); - TQObject::disconnect(gui,TQT_SIGNAL(beginSelectionSignal(const int,const int,const bool)), - this,TQT_SLOT(onSelectionBegin(const int,const int,const bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(extendSelectionSignal(const int,const int)), - this,TQT_SLOT(onSelectionExtend(const int,const int)) ); - TQObject::disconnect(gui,TQT_SIGNAL(endSelectionSignal(const bool)), - this,TQT_SLOT(setSelection(const bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(copySelectionSignal()), - this,TQT_SLOT(copySelection()) ); - TQObject::disconnect(gui,TQT_SIGNAL(clearSelectionSignal()), - this,TQT_SLOT(clearSelection()) ); - TQObject::disconnect(gui,TQT_SIGNAL(isBusySelecting(bool)), - this,TQT_SLOT(isBusySelecting(bool)) ); - TQObject::disconnect(gui,TQT_SIGNAL(testIsSelected(const int, const int, bool &)), - this,TQT_SLOT(testIsSelected(const int, const int, bool &)) ); + TQObject::disconnect(gui,TQ_SIGNAL(changedHistoryCursor(int)), + this,TQ_SLOT(onHistoryCursorChange(int))); + TQObject::disconnect(gui,TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyPress(TQKeyEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + this,TQ_SLOT(onKeyReleased(TQKeyEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + this,TQ_SLOT(onFocusIn(TQFocusEvent*))); + TQObject::disconnect(gui,TQ_SIGNAL(beginSelectionSignal(const int,const int,const bool)), + this,TQ_SLOT(onSelectionBegin(const int,const int,const bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(extendSelectionSignal(const int,const int)), + this,TQ_SLOT(onSelectionExtend(const int,const int)) ); + TQObject::disconnect(gui,TQ_SIGNAL(endSelectionSignal(const bool)), + this,TQ_SLOT(setSelection(const bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(copySelectionSignal()), + this,TQ_SLOT(copySelection()) ); + TQObject::disconnect(gui,TQ_SIGNAL(clearSelectionSignal()), + this,TQ_SLOT(clearSelection()) ); + TQObject::disconnect(gui,TQ_SIGNAL(isBusySelecting(bool)), + this,TQ_SLOT(isBusySelecting(bool)) ); + TQObject::disconnect(gui,TQ_SIGNAL(testIsSelected(const int, const int, bool &)), + this,TQ_SLOT(testIsSelected(const int, const int, bool &)) ); } gui=newgui; connectGUI(); diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index ebfc76a24..dae5b834c 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -290,7 +290,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,m_filterData(0) { isRestored = b_inRestore; - connect( &m_closeTimeout, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCouldNotClose())); + connect( &m_closeTimeout, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCouldNotClose())); no2command.setAutoDelete(true); menubar = menuBar(); @@ -298,8 +298,8 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo TDEAcceleratorManager::setNoAccel( menubar ); sessionNumberMapper = new TQSignalMapper( this ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -359,7 +359,7 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo if (te) te->setScrollbarLocation(TEWidget::SCRNONE); } -// connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), this, TQT_SLOT(slotFontChanged())); +// connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), this, TQ_SLOT(slotFontChanged())); kapp->dcopClient()->setDefaultObject( "konsole" ); } @@ -476,23 +476,23 @@ void Konsole::makeGUI() if (m_menuCreated) return; if (m_tabbarSessionsCommands) - disconnect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - disconnect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - disconnect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - disconnect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - disconnect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + disconnect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - disconnect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - disconnect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + disconnect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(loadScreenSessions())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(loadScreenSessions())); m_menuCreated=true; // Remove the empty separator Qt inserts if the menu is empty on popup, @@ -517,7 +517,7 @@ void Konsole::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); TDEAcceleratorManager::manage( m_signals ); } @@ -571,28 +571,28 @@ void Konsole::makeGUI() //bookmarks menu if (bookmarkHandler) - connect( bookmarkHandler, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( enterURL( const TQString&, const TQString& ))); + connect( bookmarkHandler, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( enterURL( const TQString&, const TQString& ))); if (bookmarkHandlerSession) - connect( bookmarkHandlerSession, TQT_SIGNAL( openURL( const TQString&, const TQString& )), - TQT_SLOT( newSession( const TQString&, const TQString& ))); + connect( bookmarkHandlerSession, TQ_SIGNAL( openURL( const TQString&, const TQString& )), + TQ_SLOT( newSession( const TQString&, const TQString& ))); if (m_bookmarks) - connect(m_bookmarks, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarks, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); if (m_bookmarksSession) - connect(m_bookmarksSession, TQT_SIGNAL(aboutToShow()), TQT_SLOT(bookmarks_menu_check())); + connect(m_bookmarksSession, TQ_SIGNAL(aboutToShow()), TQ_SLOT(bookmarks_menu_check())); // Schema Options Menu ----------------------------------------------------- m_schema = new TDEPopupMenu(this); m_schema->setCheckable(true); TDEAcceleratorManager::manage( m_schema ); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); // Keyboard Options Menu --------------------------------------------------- m_keytab = new TDEPopupMenu(this); m_keytab->setCheckable(true); TDEAcceleratorManager::manage( m_keytab ); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); //options menu if (m_options) @@ -602,7 +602,7 @@ void Konsole::makeGUI() // Tabbar selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, - TQT_SLOT(slotSelectTabbar()), actions, "tabbar" ); + TQ_SLOT(slotSelectTabbar()), actions, "tabbar" ); TQStringList tabbaritems; tabbaritems << i18n("&Hide") << i18n("&Top") << i18n("&Bottom"); selectTabbar->setItems(tabbaritems); @@ -610,7 +610,7 @@ void Konsole::makeGUI() // Scrollbar selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, - TQT_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); + TQ_SLOT(slotSelectScrollbar()), actions, "scrollbar" ); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); selectScrollbar->setItems(scrollitems); @@ -626,7 +626,7 @@ void Konsole::makeGUI() // Select Bell selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, - TQT_SLOT(slotSelectBell()), actions, "bell"); + TQ_SLOT(slotSelectBell()), actions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") << i18n("System &Notification") @@ -641,27 +641,27 @@ void Konsole::makeGUI() actions, 0L ); m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "fontsizeup" ), 0, this, - TQT_SLOT( biggerFont() ), actions, + TQ_SLOT( biggerFont() ), actions, "enlarge_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "fontsizedown" ), 0, this, - TQT_SLOT( smallerFont() ), actions, + TQ_SLOT( smallerFont() ), actions, "shrink_font" ) ); m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, - TQT_SLOT( slotSelectFont() ), actions, + TQ_SLOT( slotSelectFont() ), actions, "select_font" ) ); if ( b_installBitmapFonts ) { m_fontsizes->insert( new TDEAction( i18n( "&Install Bitmap..." ), SmallIconSet( "font-x-generic" ), 0, this, - TQT_SLOT( slotInstallBitmapFonts() ), actions, + TQ_SLOT( slotInstallBitmapFonts() ), actions, "install_fonts" ) ); } m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQT_SLOT(slotSetEncoding()), actions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet( "charset" ), 0, this, TQ_SLOT(slotSetEncoding()), actions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -679,7 +679,7 @@ void Konsole::makeGUI() if (!b_fixedSize) { selectSize = new KonsoleFontSelectAction(i18n("S&ize"), 0, this, - TQT_SLOT(slotSelectSize()), actions, "size"); + TQ_SLOT(slotSelectSize()), actions, "size"); TQStringList sizeitems; sizeitems << i18n("40x15 (&Small)") << i18n("80x24 (&VT100)") @@ -693,13 +693,13 @@ void Konsole::makeGUI() } TDEAction *historyType = new TDEAction(i18n("Hist&ory..."), "history", 0, this, - TQT_SLOT(slotHistoryType()), actions, "history"); + TQ_SLOT(slotHistoryType()), actions, "history"); historyType->plug(m_options); m_options->insertSeparator(); TDEAction *save_settings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, - TQT_SLOT(slotSaveSettings()), actions, "save_default"); + TQ_SLOT(slotSaveSettings()), actions, "save_default"); save_settings->plug(m_options); m_options->insertSeparator(); @@ -708,9 +708,9 @@ void Konsole::makeGUI() m_options->insertSeparator(); - KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); - TDEAction *configure = KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actions); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection())->plug(m_options); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection())->plug(m_options); + TDEAction *configure = KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actions); configure->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) @@ -722,13 +722,13 @@ void Konsole::makeGUI() { m_help->insertSeparator(1); m_help->insertItem(SmallIcon( "idea" ), i18n("&Tip of the Day"), - this, TQT_SLOT(showTip()), 0, -1, 2); + this, TQ_SLOT(showTip()), 0, -1, 2); } //the different session menus buildSessionMenus(); - connect(m_session, TQT_SIGNAL(activated(int)), TQT_SLOT(newSession(int))); + connect(m_session, TQ_SIGNAL(activated(int)), TQ_SLOT(newSession(int))); // Right mouse button menu if (m_rightButton) @@ -736,7 +736,7 @@ void Konsole::makeGUI() updateRMBMenu(); // show menubar / exit fullscreen TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, this, - TQT_SLOT(slotSetSelectionEnd()), actions, "selection_end"); + TQ_SLOT(slotSetSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_rightButton); m_copyClipboard->plug(m_rightButton); @@ -744,7 +744,7 @@ void Konsole::makeGUI() m_openSelection = new TDEPopupMenu(this); m_rightButton->insertItem( i18n("&Open.."), m_openSelection ); - connect(m_openSelection, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotOpenSelection())); + connect(m_openSelection, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotOpenSelection())); if (m_signals) m_rightButton->insertItem(i18n("&Send Signal"), m_signals); @@ -822,26 +822,26 @@ void Konsole::makeGUI() if (!m_detachSession) { m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->plug(m_tabPopupMenu); m_tabPopupMenu->insertItem( i18n("&Rename Session..."), this, - TQT_SLOT(slotTabRenameSession()) ); + TQ_SLOT(slotTabRenameSession()) ); m_tabPopupMenu->insertSeparator(); m_tabMonitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), - SmallIconSet("activity"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this ); + SmallIconSet("activity"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); m_tabMonitorActivity->plug(m_tabPopupMenu); m_tabMonitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), - SmallIconSet("silence"), 0, this, TQT_SLOT( slotTabToggleMonitor() ), this ); + SmallIconSet("silence"), 0, this, TQ_SLOT( slotTabToggleMonitor() ), this ); m_tabMonitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); m_tabMonitorSilence->plug(m_tabPopupMenu); m_tabMasterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, - TQT_SLOT( slotTabToggleMasterMode() ), this); + TQ_SLOT( slotTabToggleMasterMode() ), this); m_tabMasterMode->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); @@ -849,30 +849,30 @@ void Konsole::makeGUI() { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } m_moveSessionLeft->plug(m_tabPopupMenu); if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } m_moveSessionRight->plug(m_tabPopupMenu); m_tabPopupMenu->insertSeparator(); - m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQT_SLOT(slotTabSelectColor()) ); - m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQT_SLOT(slotTabResetColor()) ); + m_tabPopupMenu->insertItem( SmallIconSet("colors"), i18n("Select &Tab Color..."), this, TQ_SLOT(slotTabSelectColor()) ); + m_tabPopupMenu->insertItem( i18n("Reset Tab Color"), this, TQ_SLOT(slotTabResetColor()) ); m_tabPopupMenu->insertSeparator(); m_tabPopupTabsMenu = new TDEPopupMenu( m_tabPopupMenu ); m_tabPopupMenu->insertItem( i18n("Switch to Tab" ), m_tabPopupTabsMenu ); - connect( m_tabPopupTabsMenu, TQT_SIGNAL( activated ( int ) ), - TQT_SLOT( activateSession( int ) ) ); + connect( m_tabPopupTabsMenu, TQ_SIGNAL( activated ( int ) ), + TQ_SLOT( activateSession( int ) ) ); m_tabPopupMenu->insertSeparator(); m_tabPopupMenu->insertItem( SmallIcon("window-close"), i18n("C&lose Session"), this, - TQT_SLOT(slotTabCloseSession()) ); + TQ_SLOT(slotTabCloseSession()) ); if (m_options) { // Fill tab bar context menu @@ -887,16 +887,16 @@ void Konsole::makeGUI() viewOptions->setItems(options); viewOptions->setCurrentItem(m_tabViewMode); viewOptions->plug(m_tabbarPopupMenu); - connect(viewOptions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotTabSetViewOptions(int))); + connect(viewOptions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotTabSetViewOptions(int))); slotTabSetViewOptions(m_tabViewMode); TDEToggleAction *dynamicTabHideOption = new TDEToggleAction ( i18n( "&Dynamic Hide" ), 0, this, - TQT_SLOT( slotTabbarToggleDynamicHide() ), this); + TQ_SLOT( slotTabbarToggleDynamicHide() ), this); dynamicTabHideOption->setChecked(b_dynamicTabHide); dynamicTabHideOption->plug(m_tabbarPopupMenu); TDEToggleAction *m_autoResizeTabs = new TDEToggleAction( i18n("&Auto Resize Tabs"), - 0, this, TQT_SLOT( slotToggleAutoResizeTabs() ), this); + 0, this, TQ_SLOT( slotToggleAutoResizeTabs() ), this); m_autoResizeTabs->setChecked(b_autoResizeTabs); m_autoResizeTabs->plug(m_tabbarPopupMenu); } @@ -952,23 +952,23 @@ void Konsole::makeTabWidget() TDEAcceleratorManager::setNoAccel( tabwidget ); - connect(tabwidget, TQT_SIGNAL(movedTab(int,int)), TQT_SLOT(slotMovedTab(int,int))); - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick(TQWidget*)), TQT_SLOT(slotRenameSession())); - connect(tabwidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(activateSession(TQWidget*))); - connect(tabwidget, TQT_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), - TQT_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); - connect(tabwidget, TQT_SIGNAL(contextMenu(const TQPoint &)), - TQT_SLOT(slotTabbarContextMenu(const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(movedTab(int,int)), TQ_SLOT(slotMovedTab(int,int))); + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick(TQWidget*)), TQ_SLOT(slotRenameSession())); + connect(tabwidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(activateSession(TQWidget*))); + connect(tabwidget, TQ_SIGNAL(contextMenu(TQWidget*, const TQPoint &)), + TQ_SLOT(slotTabContextMenu(TQWidget*, const TQPoint &))); + connect(tabwidget, TQ_SIGNAL(contextMenu(const TQPoint &)), + TQ_SLOT(slotTabbarContextMenu(const TQPoint &))); if (kapp->authorize("shell_access")) { - connect(tabwidget, TQT_SIGNAL(mouseDoubleClick()), TQT_SLOT(newSession())); + connect(tabwidget, TQ_SIGNAL(mouseDoubleClick()), TQ_SLOT(newSession())); m_newSessionButton = new TQToolButton( tabwidget ); TQToolTip::add(m_newSessionButton,i18n("Click for new standard session\nClick and hold for session menu")); m_newSessionButton->setIconSet( SmallIcon( "tab_new" ) ); m_newSessionButton->adjustSize(); m_newSessionButton->setPopup( m_tabbarSessionsCommands ); - connect(m_newSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(newSession())); + connect(m_newSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(newSession())); tabwidget->setCornerWidget( m_newSessionButton, BottomLeft ); m_newSessionButton->installEventFilter(this); @@ -977,7 +977,7 @@ void Konsole::makeTabWidget() m_removeSessionButton->setIconSet( SmallIconSet( "tab_remove" ) ); m_removeSessionButton->adjustSize(); m_removeSessionButton->setEnabled(false); - connect(m_removeSessionButton, TQT_SIGNAL(clicked()), TQT_SLOT(confirmCloseCurrentSession())); + connect(m_removeSessionButton, TQ_SIGNAL(clicked()), TQ_SLOT(confirmCloseCurrentSession())); tabwidget->setCornerWidget( m_removeSessionButton, BottomRight ); } @@ -1019,7 +1019,7 @@ void Konsole::makeBasicGUI() if (kapp->authorize("shell_access")) { m_tabbarSessionsCommands = new TDEPopupMenu( this ); TDEAcceleratorManager::manage( m_tabbarSessionsCommands ); - connect(m_tabbarSessionsCommands, TQT_SIGNAL(activated(int)), TQT_SLOT(newSessionTabbar(int))); + connect(m_tabbarSessionsCommands, TQ_SIGNAL(activated(int)), TQ_SLOT(newSessionTabbar(int))); } m_session = new TDEPopupMenu(this); @@ -1062,20 +1062,20 @@ void Konsole::makeBasicGUI() // programs. if (m_tabbarSessionsCommands) - connect(m_tabbarSessionsCommands,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_session,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_tabbarSessionsCommands,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_session,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_options) - connect(m_options,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_options,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_help) - connect(m_help,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_help,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_rightButton) - connect(m_rightButton,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_edit,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); - connect(m_view,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_rightButton,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_edit,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); + connect(m_view,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarks) - connect(m_bookmarks,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarks,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); if (m_bookmarksSession) - connect(m_bookmarksSession,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(makeGUI())); + connect(m_bookmarksSession,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(makeGUI())); m_session_id=menubar->insertItem(m_session_string , m_session); m_edit_id=menubar->insertItem(m_edit_string, m_edit); @@ -1090,78 +1090,78 @@ void Konsole::makeBasicGUI() m_shortcuts = new TDEActionCollection(this); m_copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, this, - TQT_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); + TQ_SLOT(slotCopyClipboard()), m_shortcuts, "edit_copy"); m_pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", TQt::SHIFT+TQt::Key_Insert, this, - TQT_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); + TQ_SLOT(slotPasteClipboard()), m_shortcuts, "edit_paste"); m_pasteSelection = new TDEAction(i18n("Paste Selection"), TQt::CTRL+TQt::SHIFT+TQt::Key_Insert, this, - TQT_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); + TQ_SLOT(slotPasteSelection()), m_shortcuts, "pasteselection"); m_clearTerminal = new TDEAction(i18n("C&lear Terminal"), 0, this, - TQT_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); + TQ_SLOT(slotClearTerminal()), m_shortcuts, "clear_terminal"); m_resetClearTerminal = new TDEAction(i18n("&Reset && Clear Terminal"), 0, this, - TQT_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); + TQ_SLOT(slotResetClearTerminal()), m_shortcuts, "reset_clear_terminal"); m_findHistory = new TDEAction(i18n("&Find in History..."), "edit-find", 0, this, - TQT_SLOT(slotFindHistory()), m_shortcuts, "find_history"); + TQ_SLOT(slotFindHistory()), m_shortcuts, "find_history"); m_findHistory->setEnabled(b_histEnabled); m_findNext = new TDEAction(i18n("Find &Next"), "go-next", 0, this, - TQT_SLOT(slotFindNext()), m_shortcuts, "find_next"); + TQ_SLOT(slotFindNext()), m_shortcuts, "find_next"); m_findNext->setEnabled(b_histEnabled); m_findPrevious = new TDEAction(i18n("Find Pre&vious"), "go-previous", 0, this, - TQT_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); + TQ_SLOT(slotFindPrevious()), m_shortcuts, "find_previous"); m_findPrevious->setEnabled( b_histEnabled ); m_saveHistory = new TDEAction(i18n("S&ave History As..."), "document-save-as", 0, this, - TQT_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); + TQ_SLOT(slotSaveHistory()), m_shortcuts, "save_history"); m_saveHistory->setEnabled(b_histEnabled ); m_clearHistory = new TDEAction(i18n("Clear &History"), "history_clear", 0, this, - TQT_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); + TQ_SLOT(slotClearHistory()), m_shortcuts, "clear_history"); m_clearHistory->setEnabled(b_histEnabled); m_clearAllSessionHistories = new TDEAction(i18n("Clear All H&istories"), "history_clear", 0, - this, TQT_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); + this, TQ_SLOT(slotClearAllSessionHistories()), m_shortcuts, "clear_all_histories"); if (!m_detachSession) { m_detachSession = new TDEAction(i18n("&Detach Session"), SmallIconSet("tab_breakoff"), 0, this, - TQT_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); + TQ_SLOT(slotDetachSession()), m_shortcuts, "detach_session"); } m_detachSession->setEnabled(false); m_renameSession = new TDEAction(i18n("&Rename Session..."), TQt::CTRL+TQt::SHIFT+TQt::Key_R, this, - TQT_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); + TQ_SLOT(slotRenameSession()), m_shortcuts, "rename_session"); if (kapp->authorizeTDEAction("zmodem_upload")) m_zmodemUpload = new TDEAction( i18n( "&ZModem Upload..." ), TQt::CTRL+TQt::ALT+TQt::Key_U, this, - TQT_SLOT( slotZModemUpload() ), + TQ_SLOT( slotZModemUpload() ), m_shortcuts, "zmodem_upload" ); monitorActivity = new TDEToggleAction ( i18n( "Monitor for &Activity" ), SmallIconSet("activity"), 0, this, - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_activity" ); monitorActivity->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Activity" ) ) ); monitorSilence = new TDEToggleAction ( i18n( "Monitor for &Silence" ), SmallIconSet("silence"), 0, this, - TQT_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); + TQ_SLOT( slotToggleMonitor() ), m_shortcuts, "monitor_silence" ); monitorSilence->setCheckedState( KGuiItem( i18n( "Stop Monitoring for &Silence" ) ) ); masterMode = new TDEToggleAction ( i18n( "Send &Input to All Sessions" ), "remote", 0, this, - TQT_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); + TQ_SLOT( slotToggleMasterMode() ), m_shortcuts, "send_input_to_all_sessions" ); showMenubar = new TDEToggleAction ( i18n( "Show &Menubar" ), "showmenu", TQt::CTRL+TQt::SHIFT+TQt::ALT+TQt::Key_M, this, - TQT_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); + TQ_SLOT( slotToggleMenubar() ), m_shortcuts, "show_menubar" ); showMenubar->setCheckedState( KGuiItem( i18n("Hide &Menubar"), "showmenu", TQString::null, TQString::null ) ); m_fullscreen = KStdAction::fullScreen(0, 0, m_shortcuts, this ); - connect( m_fullscreen,TQT_SIGNAL(toggled(bool)), this,TQT_SLOT(updateFullScreen(bool))); + connect( m_fullscreen,TQ_SIGNAL(toggled(bool)), this,TQ_SLOT(updateFullScreen(bool))); m_fullscreen->setChecked(b_fullscreen); m_saveProfile = new TDEAction( i18n( "Save Sessions &Profile..." ), SmallIconSet("document-save-as"), 0, this, - TQT_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); + TQ_SLOT( slotSaveSessionsProfile() ), m_shortcuts, "save_sessions_profile" ); //help menu if (m_help) @@ -1170,42 +1170,42 @@ void Konsole::makeBasicGUI() // "Configure Shortcuts"). m_closeSession = new TDEAction(i18n("C&lose Session"), "window-close", 0, this, - TQT_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); - m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQT_SLOT( slotPrint() ), m_shortcuts, "file_print"); - m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQT_SLOT( close() ), m_shortcuts, "file_quit"); + TQ_SLOT(confirmCloseCurrentSession()), m_shortcuts, "close_session"); + m_print = new TDEAction(i18n("&Print Screen..."), "document-print", 0, this, TQ_SLOT( slotPrint() ), m_shortcuts, "file_print"); + m_quit = new TDEAction(i18n("&Quit"), "system-log-out", 0, this, TQ_SLOT( close() ), m_shortcuts, "file_quit"); TDEShortcut shortcut(TQt::CTRL+TQt::ALT+TQt::Key_N); shortcut.append(TDEShortcut(TQt::CTRL+TQt::SHIFT+TQt::Key_N)); - new TDEAction(i18n("New Session"), shortcut, this, TQT_SLOT(newSession()), m_shortcuts, "new_session"); - new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQT_SLOT(activateMenu()), m_shortcuts, "activate_menu"); - new TDEAction(i18n("List Sessions"), 0, this, TQT_SLOT(listSessions()), m_shortcuts, "list_sessions"); + new TDEAction(i18n("New Session"), shortcut, this, TQ_SLOT(newSession()), m_shortcuts, "new_session"); + new TDEAction(i18n("Activate Menu"), TQt::CTRL+TQt::ALT+TQt::Key_M, this, TQ_SLOT(activateMenu()), m_shortcuts, "activate_menu"); + new TDEAction(i18n("List Sessions"), 0, this, TQ_SLOT(listSessions()), m_shortcuts, "list_sessions"); if (!m_moveSessionLeft) { m_moveSessionLeft = new TDEAction(i18n("&Move Session Left"), TQApplication::reverseLayout() ? "forward" : "back", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Right : TQt::CTRL+TQt::SHIFT+TQt::Key_Left, this, - TQT_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); + TQ_SLOT(moveSessionLeft()), m_shortcuts, "move_session_left"); } if (!m_moveSessionRight) { m_moveSessionRight = new TDEAction(i18n("M&ove Session Right"), TQApplication::reverseLayout() ? "back" : "forward", TQApplication::reverseLayout() ? TQt::CTRL+TQt::SHIFT+TQt::Key_Left : TQt::CTRL+TQt::SHIFT+TQt::Key_Right, this, - TQT_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); + TQ_SLOT(moveSessionRight()), m_shortcuts, "move_session_right"); } new TDEAction(i18n("Go to Previous Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Right : TQt::SHIFT+TQt::Key_Left, - this, TQT_SLOT(prevSession()), m_shortcuts, "previous_session"); + this, TQ_SLOT(prevSession()), m_shortcuts, "previous_session"); new TDEAction(i18n("Go to Next Session"), TQApplication::reverseLayout() ? TQt::SHIFT+TQt::Key_Left : TQt::SHIFT+TQt::Key_Right, - this, TQT_SLOT(nextSession()), m_shortcuts, "next_session"); + this, TQ_SLOT(nextSession()), m_shortcuts, "next_session"); for (int i=1;i<13;i++) { // Due to 12 function keys? - new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQT_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); + new TDEAction(i18n("Switch to Session %1").arg(i), 0, this, TQ_SLOT(switchToSession()), m_shortcuts, TQString(TQString().sprintf("switch_to_session_%02d", i)).latin1()); } - new TDEAction(i18n("Enlarge Font"), 0, this, TQT_SLOT(biggerFont()), m_shortcuts, "bigger_font"); - new TDEAction(i18n("Shrink Font"), 0, this, TQT_SLOT(smallerFont()), m_shortcuts, "smaller_font"); + new TDEAction(i18n("Enlarge Font"), 0, this, TQ_SLOT(biggerFont()), m_shortcuts, "bigger_font"); + new TDEAction(i18n("Shrink Font"), 0, this, TQ_SLOT(smallerFont()), m_shortcuts, "smaller_font"); - new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQT_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); + new TDEAction(i18n("Toggle Bidi"), TQt::CTRL+TQt::ALT+TQt::Key_B, this, TQ_SLOT(toggleBidi()), m_shortcuts, "toggle_bidi"); // Should we load all *.desktop files now? Required for Session shortcuts. if ( TDEConfigGroup(TDEGlobal::config(), "General").readBoolEntry("SessionShortcutsEnabled", false) ) { @@ -1217,7 +1217,7 @@ void Konsole::makeBasicGUI() m_sessionList = new TDEPopupMenu(this); TDEAcceleratorManager::manage( m_sessionList ); - connect(m_sessionList, TQT_SIGNAL(activated(int)), TQT_SLOT(activateSession(int))); + connect(m_sessionList, TQ_SIGNAL(activated(int)), TQ_SLOT(activateSession(int))); } /** @@ -1990,7 +1990,7 @@ void Konsole::slotToggleMenubar() { } if (!showMenubar->isChecked()) { setCaption(i18n("Use the right mouse button to bring back the menu")); - TQTimer::singleShot(5000,this,TQT_SLOT(updateTitle())); + TQTimer::singleShot(5000,this,TQ_SLOT(updateTitle())); } updateRMBMenu(); } @@ -2142,12 +2142,12 @@ void Konsole::reparseConfiguration() b_sessionShortcutsMapped = false; // Mappings may have to be changed...get a fresh mapper. - disconnect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + disconnect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); delete sessionNumberMapper; sessionNumberMapper = new TQSignalMapper( this ); - connect( sessionNumberMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( newSessionTabbar( int ) ) ); + connect( sessionNumberMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( newSessionTabbar( int ) ) ); sl_sessionShortCuts.clear(); buildSessionMenus(); @@ -2380,12 +2380,12 @@ void Konsole::disableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2403,12 +2403,12 @@ void Konsole::enableMasterModeConnections() TESession *to = to_it.current(); if (to!=from) { - connect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - to->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - connect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - to->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + connect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + to->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + connect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + to->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } @@ -2503,7 +2503,7 @@ void Konsole::runSession(TESession* s) // give some time to get through the // resize events before starting up. - TQTimer::singleShot(100,s,TQT_SLOT(run())); + TQTimer::singleShot(100,s,TQ_SLOT(run())); } void Konsole::addSession(TESession* s) @@ -2537,7 +2537,7 @@ void Konsole::addSession(TESession* s) s->IconName(), 0, this, - TQT_SLOT(activateSession()), + TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -2676,7 +2676,7 @@ void Konsole::activateSession(TESession *s) } ra->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(allowPrevNext())); // hack, hack, hack + TQTimer::singleShot(1,this,TQ_SLOT(allowPrevNext())); // hack, hack, hack tabwidget->showPage( se->widget() ); te = se->widget(); @@ -2953,8 +2953,8 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis TEWidget* te_old = te; te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); if (te_old) { initTEWidget(te, te_old); } @@ -2975,38 +2975,38 @@ TQString Konsole::newSession(KSimpleConfig *co, TQString program, const TQStrLis s->setMetaAsAltMode(b_metaAsAlt); // If you add any new signal-slot connection below, think about doing it in konsolePart too - connect( s,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*))); - connect( s, TQT_SIGNAL(updateTitle(TESession*)), - this, TQT_SLOT(updateTitle(TESession*))); - connect( s, TQT_SIGNAL(notifySessionState(TESession*, int)), - this, TQT_SLOT(notifySessionState(TESession*, int))); - connect( s, TQT_SIGNAL(disableMasterModeConnections()), - this, TQT_SLOT(disableMasterModeConnections())); - connect( s, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections())); - connect( s, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - this, TQT_SLOT(slotRenameSession(TESession*, const TQString&))); - connect( s->getEmulation(), TQT_SIGNAL(changeColumns(int)), - this, TQT_SLOT(changeColumns(int)) ); - connect( s->getEmulation(), TQT_SIGNAL(changeColLin(int,int)), - this, TQT_SLOT(changeColLin(int,int))); - connect( s->getEmulation(), TQT_SIGNAL(ImageSizeChanged(int,int)), - this, TQT_SLOT(notifySize(int,int))); - connect( s, TQT_SIGNAL(zmodemDetected(TESession*)), - this, TQT_SLOT(slotZModemDetected(TESession*))); - connect( s, TQT_SIGNAL(updateSessionConfig(TESession*)), - this, TQT_SLOT(slotUpdateSessionConfig(TESession*))); - connect( s, TQT_SIGNAL(resizeSession(TESession*, TQSize)), - this, TQT_SLOT(slotResizeSession(TESession*, TQSize))); - connect( s, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( s, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( s, TQT_SIGNAL(changeTabTextColor(TESession*, int)), - this,TQT_SLOT(changeTabTextColor(TESession*, int))); + connect( s,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*))); + connect( s, TQ_SIGNAL(updateTitle(TESession*)), + this, TQ_SLOT(updateTitle(TESession*))); + connect( s, TQ_SIGNAL(notifySessionState(TESession*, int)), + this, TQ_SLOT(notifySessionState(TESession*, int))); + connect( s, TQ_SIGNAL(disableMasterModeConnections()), + this, TQ_SLOT(disableMasterModeConnections())); + connect( s, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections())); + connect( s, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + this, TQ_SLOT(slotRenameSession(TESession*, const TQString&))); + connect( s->getEmulation(), TQ_SIGNAL(changeColumns(int)), + this, TQ_SLOT(changeColumns(int)) ); + connect( s->getEmulation(), TQ_SIGNAL(changeColLin(int,int)), + this, TQ_SLOT(changeColLin(int,int))); + connect( s->getEmulation(), TQ_SIGNAL(ImageSizeChanged(int,int)), + this, TQ_SLOT(notifySize(int,int))); + connect( s, TQ_SIGNAL(zmodemDetected(TESession*)), + this, TQ_SLOT(slotZModemDetected(TESession*))); + connect( s, TQ_SIGNAL(updateSessionConfig(TESession*)), + this, TQ_SLOT(slotUpdateSessionConfig(TESession*))); + connect( s, TQ_SIGNAL(resizeSession(TESession*, TQSize)), + this, TQ_SLOT(slotResizeSession(TESession*, TQSize))); + connect( s, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( s, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( s, TQ_SIGNAL(changeTabTextColor(TESession*, int)), + this,TQ_SLOT(changeTabTextColor(TESession*, int))); s->widget()->setVTFont(defaultFont);// Hack to set font again after newSession s->setSchemaNo(schmno); @@ -3149,7 +3149,7 @@ void Konsole::doneSession(TESession* s) // Since the timer approach only works at good weather, // the whole construction is not suited to what it // should do. Affected is the TEEmulation::setConnect. - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } else close(); @@ -3482,7 +3482,7 @@ void Konsole::addSessionCommand(const TQString &path) } else { sessionAction = new TDEAction( comment, 0, this, 0, m_shortcuts, name.latin1() ); } - connect( sessionAction, TQT_SIGNAL( activated() ), sessionNumberMapper, TQT_SLOT( map() ) ); + connect( sessionAction, TQ_SIGNAL( activated() ), sessionNumberMapper, TQ_SLOT( map() ) ); sessionNumberMapper->setMapping( sessionAction, cmd_serial ); } @@ -3752,31 +3752,31 @@ void Konsole::detachSession(TESession* _se) { TESession *from = from_it.current(); if(from->isMasterMode()) { - disconnect(from->widget(), TQT_SIGNAL(keyPressedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyPress(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(keyReleasedSignal(TQKeyEvent*)), - _se->getEmulation(), TQT_SLOT(onKeyReleased(TQKeyEvent*))); - disconnect(from->widget(), TQT_SIGNAL(focusInSignal(TQFocusEvent*)), - _se->getEmulation(), TQT_SLOT(onFocusIn(TQFocusEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyPressedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyPress(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(keyReleasedSignal(TQKeyEvent*)), + _se->getEmulation(), TQ_SLOT(onKeyReleased(TQKeyEvent*))); + disconnect(from->widget(), TQ_SIGNAL(focusInSignal(TQFocusEvent*)), + _se->getEmulation(), TQ_SLOT(onFocusIn(TQFocusEvent*))); } } } TQColor se_tabtextcolor = tabwidget->tabColor( _se->widget() ); - disconnect( _se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( _se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); - disconnect( _se->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - disconnect( _se, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); + disconnect( _se->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + disconnect( _se, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); - disconnect( _se,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - disconnect( _se,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); - disconnect( _se,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - disconnect( _se,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); + disconnect( _se,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + disconnect( _se,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); + disconnect( _se,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + disconnect( _se,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); // TODO: "type" isn't passed properly Konsole* konsole = new Konsole(name(), b_histEnabled, !menubar->isHidden(), n_tabbar != TabNone, b_framevis, @@ -3800,7 +3800,7 @@ void Konsole::detachSession(TESession* _se) { else se = sessions.at(sessionIndex ? sessionIndex - 1 : 0); session2action.find(se)->setChecked(true); - TQTimer::singleShot(1,this,TQT_SLOT(activateSession())); + TQTimer::singleShot(1,this,TQ_SLOT(activateSession())); } if (sessions.count()==1) @@ -3828,8 +3828,8 @@ void Konsole::attachSession(TESession* session) te=new TEWidget(tabwidget); - connect( te, TQT_SIGNAL(configureRequest(TEWidget*, int, int, int)), - this, TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te, TQ_SIGNAL(configureRequest(TEWidget*, int, int, int)), + this, TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); te->resize(se_widget->size()); te->setSize(se_widget->Columns(), se_widget->Lines()); @@ -3845,7 +3845,7 @@ void Konsole::attachSession(TESession* session) TQString title=session->Title(); TDERadioAction *ra = new TDERadioAction(title.replace('&',"&&"), session->IconName(), - 0, this, TQT_SLOT(activateSession()), m_shortcuts); + 0, this, TQ_SLOT(activateSession()), m_shortcuts); ra->setExclusiveGroup("sessions"); ra->setChecked(true); @@ -3859,20 +3859,20 @@ void Konsole::attachSession(TESession* session) if (m_menuCreated) ra->plug(m_view); - connect( session,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + connect( session,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); - connect( session,TQT_SIGNAL(updateTitle(TESession*)), this,TQT_SLOT(updateTitle(TESession*)) ); - connect( session,TQT_SIGNAL(notifySessionState(TESession*,int)), this,TQT_SLOT(notifySessionState(TESession*,int)) ); + connect( session,TQ_SIGNAL(updateTitle(TESession*)), this,TQ_SLOT(updateTitle(TESession*)) ); + connect( session,TQ_SIGNAL(notifySessionState(TESession*,int)), this,TQ_SLOT(notifySessionState(TESession*,int)) ); - connect( session,TQT_SIGNAL(disableMasterModeConnections()), this,TQT_SLOT(disableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(enableMasterModeConnections()), this,TQT_SLOT(enableMasterModeConnections()) ); - connect( session,TQT_SIGNAL(renameSession(TESession*,const TQString&)), this,TQT_SLOT(slotRenameSession(TESession*,const TQString&)) ); - connect( session->getEmulation(),TQT_SIGNAL(ImageSizeChanged(int,int)), this,TQT_SLOT(notifySize(int,int))); - connect( session->getEmulation(),TQT_SIGNAL(changeColumns(int)), this,TQT_SLOT(changeColumns(int)) ); - connect( session->getEmulation(),TQT_SIGNAL(changeColLin(int, int)), this,TQT_SLOT(changeColLin(int,int)) ); + connect( session,TQ_SIGNAL(disableMasterModeConnections()), this,TQ_SLOT(disableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(enableMasterModeConnections()), this,TQ_SLOT(enableMasterModeConnections()) ); + connect( session,TQ_SIGNAL(renameSession(TESession*,const TQString&)), this,TQ_SLOT(slotRenameSession(TESession*,const TQString&)) ); + connect( session->getEmulation(),TQ_SIGNAL(ImageSizeChanged(int,int)), this,TQ_SLOT(notifySize(int,int))); + connect( session->getEmulation(),TQ_SIGNAL(changeColumns(int)), this,TQ_SLOT(changeColumns(int)) ); + connect( session->getEmulation(),TQ_SIGNAL(changeColLin(int, int)), this,TQ_SLOT(changeColLin(int,int)) ); - connect( session, TQT_SIGNAL(changeTabTextColor(TESession*, int)), this, TQT_SLOT(changeTabTextColor(TESession*, int)) ); + connect( session, TQ_SIGNAL(changeTabTextColor(TESession*, int)), this, TQ_SLOT(changeTabTextColor(TESession*, int)) ); activateSession(session); } @@ -3934,7 +3934,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, TQHBoxLayout *hb = new TQHBoxLayout(mainFrame); m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHistEnable(bool))); + connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHistEnable(bool))); m_label = new TQLabel(i18n("&Number of lines: "), mainFrame); @@ -3945,7 +3945,7 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_label->setBuddy( m_size ); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -4039,8 +4039,8 @@ void Konsole::slotFindHistory() { if( !m_finddialog ) { m_finddialog = new KonsoleFind( this, "konsolefind", false); - connect(m_finddialog,TQT_SIGNAL(search()),this,TQT_SLOT(slotFind())); - connect(m_finddialog,TQT_SIGNAL(done()),this,TQT_SLOT(slotFindDone())); + connect(m_finddialog,TQ_SIGNAL(search()),this,TQ_SLOT(slotFind())); + connect(m_finddialog,TQ_SIGNAL(done()),this,TQ_SLOT(slotFindDone())); } TQString string; @@ -4059,7 +4059,7 @@ void Konsole::slotOpenSelection() delete m_filterData; m_openSelection->clear(); - disconnect(m_openSelection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotOpenURI(int))); + disconnect(m_openSelection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotOpenURI(int))); TQString selection = se->getEmulation()->getSelection(); TQString curdir = baseURL().path(); @@ -4074,7 +4074,7 @@ void Konsole::slotOpenSelection() KURIFilter::self()->filterURI( *(m_filterData) ); m_openSelection->insertItem( SmallIconSet( m_filterData->iconName() ),i18n( "%1" ).arg(m_filterData->uri().url()), 1 ); - connect(m_openSelection, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenURI(int))); + connect(m_openSelection, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenURI(int))); } void Konsole::slotOpenURI(int) @@ -4345,8 +4345,8 @@ KonsoleFind::KonsoleFind( TQWidget *parent, const char *name, bool /*modal*/ ) if (!TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty()) { m_editRegExp = new TQPushButton( i18n("&Edit..."), row, "editRegExp" ); - connect( m_asRegExp, TQT_SIGNAL( toggled(bool) ), m_editRegExp, TQT_SLOT( setEnabled(bool) ) ); - connect( m_editRegExp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditRegExp() ) ); + connect( m_asRegExp, TQ_SIGNAL( toggled(bool) ), m_editRegExp, TQ_SLOT( setEnabled(bool) ) ); + connect( m_editRegExp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditRegExp() ) ); m_editRegExp->setEnabled( false ); } } diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 405d83b28..b5879d45c 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/konsole/konsole/konsole_part.cpp @@ -153,8 +153,8 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje setWidget(te); te->setFocus(); - connect( te,TQT_SIGNAL(configureRequest(TEWidget*,int,int,int)), - this,TQT_SLOT(configureRequest(TEWidget*,int,int,int)) ); + connect( te,TQ_SIGNAL(configureRequest(TEWidget*,int,int,int)), + this,TQ_SLOT(configureRequest(TEWidget*,int,int,int)) ); colors = new ColorSchemaList(); colors->checkSchemas(); @@ -214,7 +214,7 @@ konsolePart::konsolePart(TQWidget *_parentWidget, const char *widgetName, TQObje applySettingsToGUI(); - TQTimer::singleShot( 0, this, TQT_SLOT( autoShowShell() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( autoShowShell() ) ); } void konsolePart::autoShowShell() @@ -240,10 +240,10 @@ void konsolePart::doneSession(TESession*) if (se && b_autoDestroy) { // kdDebug(1211) << "doneSession - disconnecting done" << endl; - disconnect( se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); + disconnect( se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); se->setConnect(false); - //TQTimer::singleShot(100,se,TQT_SLOT(terminate())); + //TQTimer::singleShot(100,se,TQ_SLOT(terminate())); // kdDebug(1211) << "se->terminate()" << endl; se->terminate(); } @@ -252,7 +252,7 @@ void konsolePart::doneSession(TESession*) void konsolePart::sessionDestroyed() { // kdDebug(1211) << "sessionDestroyed()" << endl; - disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); se = 0; if (b_autoDestroy) delete this; @@ -275,7 +275,7 @@ konsolePart::~konsolePart() while(se && TDEProcessController::theTDEProcessController->waitForProcessExit(1)) ; - disconnect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + disconnect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); // kdDebug(1211) << "Deleting se session" << endl; delete se; se=0; @@ -343,7 +343,7 @@ void konsolePart::makeGUI() m_signals->insertItem( i18n( "&Kill Task" ) + " (KILL)", SIGKILL); m_signals->insertItem( i18n( "User Signal &1") + " (USR1)", SIGUSR1); m_signals->insertItem( i18n( "User Signal &2") + " (USR2)", SIGUSR2); - connect(m_signals, TQT_SIGNAL(activated(int)), TQT_SLOT(sendSignal(int))); + connect(m_signals, TQ_SIGNAL(activated(int)), TQ_SLOT(sendSignal(int))); } // Settings Menu ---------------------------------------------------------------- @@ -353,7 +353,7 @@ void konsolePart::makeGUI() // Scrollbar selectScrollbar = new TDESelectAction(i18n("Sc&rollbar"), 0, this, - TQT_SLOT(slotSelectScrollbar()), settingsActions); + TQ_SLOT(slotSelectScrollbar()), settingsActions); TQStringList scrollitems; scrollitems << i18n("&Hide") << i18n("&Left") << i18n("&Right"); @@ -363,7 +363,7 @@ void konsolePart::makeGUI() // Select Bell m_options->insertSeparator(); selectBell = new TDESelectAction(i18n("&Bell"), SmallIconSet( "bell"), 0 , this, - TQT_SLOT(slotSelectBell()), settingsActions, "bell"); + TQ_SLOT(slotSelectBell()), settingsActions, "bell"); TQStringList bellitems; bellitems << i18n("System &Bell") @@ -374,13 +374,13 @@ void konsolePart::makeGUI() selectBell->plug(m_options); m_fontsizes = new TDEActionMenu( i18n( "Font" ), SmallIconSet( "text" ), settingsActions, 0L ); - m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQT_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQT_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); - m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQT_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Enlarge Font" ), SmallIconSet( "zoom-in" ), 0, this, TQ_SLOT( biggerFont() ), settingsActions, "enlarge_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "&Shrink Font" ), SmallIconSet( "zoom-out" ), 0, this, TQ_SLOT( smallerFont() ), settingsActions, "shrink_font" ) ); + m_fontsizes->insert( new TDEAction( i18n( "Se&lect..." ), SmallIconSet( "font-x-generic" ), 0, this, TQ_SLOT( slotSelectFont() ), settingsActions, "select_font" ) ); m_fontsizes->plug(m_options); // encoding menu, start with default checked ! - selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQT_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); + selectSetEncoding = new TDESelectAction( i18n( "&Encoding" ), SmallIconSet("charset" ), 0, this, TQ_SLOT(slotSetEncoding()), settingsActions, "set_encoding" ); TQStringList list = TDEGlobal::charsets()->descriptiveEncodingNames(); list.prepend( i18n( "Default" ) ); selectSetEncoding->setItems(list); @@ -392,7 +392,7 @@ void konsolePart::makeGUI() { m_keytab = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_keytab->setCheckable(true); - connect(m_keytab, TQT_SIGNAL(activated(int)), TQT_SLOT(keytab_menu_activated(int))); + connect(m_keytab, TQ_SIGNAL(activated(int)), TQ_SLOT(keytab_menu_activated(int))); m_options->insertItem( SmallIconSet( "key_bindings" ), i18n( "&Keyboard" ), m_keytab ); } @@ -401,21 +401,21 @@ void konsolePart::makeGUI() { m_schema = new TDEPopupMenu((TDEMainWindow*)parentWidget); m_schema->setCheckable(true); - connect(m_schema, TQT_SIGNAL(activated(int)), TQT_SLOT(schema_menu_activated(int))); - connect(m_schema, TQT_SIGNAL(aboutToShow()), TQT_SLOT(schema_menu_check())); + connect(m_schema, TQ_SIGNAL(activated(int)), TQ_SLOT(schema_menu_activated(int))); + connect(m_schema, TQ_SIGNAL(aboutToShow()), TQ_SLOT(schema_menu_check())); m_options->insertItem( SmallIconSet( "colorize" ), i18n( "Sch&ema" ), m_schema); } TDEAction *historyType = new TDEAction(i18n("&History..."), "history", 0, this, - TQT_SLOT(slotHistoryType()), settingsActions, "history"); + TQ_SLOT(slotHistoryType()), settingsActions, "history"); historyType->plug(m_options); m_options->insertSeparator(); // Select line spacing selectLineSpacing = new TDESelectAction(i18n("Li&ne Spacing"), SmallIconSet("format-justify-left"), 0, this, - TQT_SLOT(slotSelectLineSpacing()), settingsActions ); + TQ_SLOT(slotSelectLineSpacing()), settingsActions ); TQStringList lineSpacingList; lineSpacingList @@ -433,35 +433,35 @@ void konsolePart::makeGUI() // Blinking Cursor blinkingCursor = new TDEToggleAction (i18n("Blinking &Cursor"), - 0, this,TQT_SLOT(slotBlinkingCursor()), settingsActions); + 0, this,TQ_SLOT(slotBlinkingCursor()), settingsActions); blinkingCursor->plug(m_options); // Frame on/off showFrame = new TDEToggleAction(i18n("Show Fr&ame"), 0, - this, TQT_SLOT(slotToggleFrame()), settingsActions); + this, TQ_SLOT(slotToggleFrame()), settingsActions); showFrame->setCheckedState(i18n("Hide Fr&ame")); showFrame->plug(m_options); // Meta key as Alt key metaAsAlt = new TDEToggleAction(i18n("Me&ta key as Alt key"), 0, - this, TQT_SLOT(slotToggleMetaAsAltMode()), settingsActions); + this, TQ_SLOT(slotToggleMetaAsAltMode()), settingsActions); metaAsAlt->plug(m_options); // Word Connectors TDEAction *WordSeps = new TDEAction(i18n("Wor&d Connectors..."), 0, this, - TQT_SLOT(slotWordSeps()), settingsActions); + TQ_SLOT(slotWordSeps()), settingsActions); WordSeps->plug(m_options); // Use Konsole's Settings m_options->insertSeparator(); m_useKonsoleSettings = new TDEToggleAction( i18n("&Use Konsole's Settings"), - 0, this, TQT_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); + 0, this, TQ_SLOT(slotUseKonsoleSettings()), 0, "use_konsole_settings" ); m_useKonsoleSettings->plug(m_options); // Save Settings m_options->insertSeparator(); TDEAction *saveSettings = new TDEAction(i18n("&Save as Default"), "document-save", 0, this, - TQT_SLOT(saveProperties()), actions, "save_default"); + TQ_SLOT(saveProperties()), actions, "save_default"); saveSettings->plug(m_options); if (TDEGlobalSettings::insertTearOffHandle()) m_options->insertTearOffHandle(); @@ -470,15 +470,15 @@ void konsolePart::makeGUI() // Popup Menu ------------------------------------------------------------------- m_popupMenu = new TDEPopupMenu((TDEMainWindow*)parentWidget); TDEAction* selectionEnd = new TDEAction(i18n("Set Selection End"), 0, te, - TQT_SLOT(setSelectionEnd()), actions, "selection_end"); + TQ_SLOT(setSelectionEnd()), actions, "selection_end"); selectionEnd->plug(m_popupMenu); TDEAction *copyClipboard = new TDEAction(i18n("&Copy"), "edit-copy", 0, - te, TQT_SLOT(copyClipboard()), actions, "edit_copy"); + te, TQ_SLOT(copyClipboard()), actions, "edit_copy"); copyClipboard->plug(m_popupMenu); TDEAction *pasteClipboard = new TDEAction(i18n("&Paste"), "edit-paste", 0, - te, TQT_SLOT(pasteClipboard()), actions, "edit_paste"); + te, TQ_SLOT(pasteClipboard()), actions, "edit_paste"); pasteClipboard->plug(m_popupMenu); if (m_signals) @@ -494,7 +494,7 @@ void konsolePart::makeGUI() } TDEAction *closeSession = new TDEAction(i18n("&Close Terminal Emulator"), "window-close", 0, this, - TQT_SLOT(closeCurrentSession()), actions, "close_session"); + TQ_SLOT(closeCurrentSession()), actions, "close_session"); closeSession->plug(m_popupMenu); if (TDEGlobalSettings::insertTearOffHandle()) m_popupMenu->insertTearOffHandle(); @@ -1011,15 +1011,15 @@ HistoryTypeDialog::HistoryTypeDialog(const HistoryType& histType, m_btnEnable = new TQCheckBox(i18n("&Enable"), mainFrame); - TQObject::connect(m_btnEnable, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotHistEnable(bool))); + TQObject::connect(m_btnEnable, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotHistEnable(bool))); m_size = new TQSpinBox(0, 10 * 1000 * 1000, 100, mainFrame); m_size->setValue(histSize); m_size->setSpecialValueText(i18n("Unlimited (number of lines)", "Unlimited")); m_setUnlimited = new TQPushButton(i18n("&Set Unlimited"), mainFrame); - connect( m_setUnlimited,TQT_SIGNAL(clicked()), this,TQT_SLOT(slotSetUnlimited()) ); + connect( m_setUnlimited,TQ_SIGNAL(clicked()), this,TQ_SLOT(slotSetUnlimited()) ); hb->addWidget(m_btnEnable); hb->addSpacing(10); @@ -1121,42 +1121,42 @@ void konsolePart::newSession() { se = new TESession(te, "xterm", parentWidget->winId()); } - connect( se,TQT_SIGNAL(done(TESession*)), - this,TQT_SLOT(doneSession(TESession*)) ); - connect( se,TQT_SIGNAL(openURLRequest(const TQString &)), - this,TQT_SLOT(emitOpenURLRequest(const TQString &)) ); - connect( se, TQT_SIGNAL( updateTitle(TESession*) ), - this, TQT_SLOT( updateTitle(TESession*) ) ); - connect( se, TQT_SIGNAL(enableMasterModeConnections()), - this, TQT_SLOT(enableMasterModeConnections()) ); - connect( se, TQT_SIGNAL( processExited(TDEProcess *) ), - this, TQT_SIGNAL( processExited(TDEProcess *) ) ); - connect( se, TQT_SIGNAL( receivedData( const TQString& ) ), - this, TQT_SIGNAL( receivedData( const TQString& ) ) ); - connect( se, TQT_SIGNAL( forkedChild() ), - this, TQT_SIGNAL( forkedChild() )); - connect( se, TQT_SIGNAL(getSessionSchema(TESession*, TQString &)), - this, TQT_SLOT(slotGetSessionSchema(TESession*, TQString &))); - connect( se, TQT_SIGNAL(setSessionSchema(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionSchema(TESession*, const TQString &))); - connect( se, TQT_SIGNAL(setSessionEncoding(TESession*, const TQString &)), - this, TQT_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); - connect( se, TQT_SIGNAL(updateSessionKeytab(TESession *, const TQString &)), - this, TQT_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &))); + connect( se,TQ_SIGNAL(done(TESession*)), + this,TQ_SLOT(doneSession(TESession*)) ); + connect( se,TQ_SIGNAL(openURLRequest(const TQString &)), + this,TQ_SLOT(emitOpenURLRequest(const TQString &)) ); + connect( se, TQ_SIGNAL( updateTitle(TESession*) ), + this, TQ_SLOT( updateTitle(TESession*) ) ); + connect( se, TQ_SIGNAL(enableMasterModeConnections()), + this, TQ_SLOT(enableMasterModeConnections()) ); + connect( se, TQ_SIGNAL( processExited(TDEProcess *) ), + this, TQ_SIGNAL( processExited(TDEProcess *) ) ); + connect( se, TQ_SIGNAL( receivedData( const TQString& ) ), + this, TQ_SIGNAL( receivedData( const TQString& ) ) ); + connect( se, TQ_SIGNAL( forkedChild() ), + this, TQ_SIGNAL( forkedChild() )); + connect( se, TQ_SIGNAL(getSessionSchema(TESession*, TQString &)), + this, TQ_SLOT(slotGetSessionSchema(TESession*, TQString &))); + connect( se, TQ_SIGNAL(setSessionSchema(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionSchema(TESession*, const TQString &))); + connect( se, TQ_SIGNAL(setSessionEncoding(TESession*, const TQString &)), + this, TQ_SLOT(slotSetSessionEncoding(TESession*, const TQString &))); + connect( se, TQ_SIGNAL(updateSessionKeytab(TESession *, const TQString &)), + this, TQ_SLOT(slotUpdateSessionKeytab(TESession *, const TQString &))); // We ignore the following signals - //connect( se, TQT_SIGNAL(renameSession(TESession*,const TQString&)), - // this, TQT_SLOT(slotRenameSession(TESession*, const TQString&)) ); - //connect( se->getEmulation(), TQT_SIGNAL(changeColumns(int)), - // this, TQT_SLOT(changeColumns(int)) ); - //connect( se, TQT_SIGNAL(disableMasterModeConnections()), - // this, TQT_SLOT(disableMasterModeConnections()) ); + //connect( se, TQ_SIGNAL(renameSession(TESession*,const TQString&)), + // this, TQ_SLOT(slotRenameSession(TESession*, const TQString&)) ); + //connect( se->getEmulation(), TQ_SIGNAL(changeColumns(int)), + // this, TQ_SLOT(changeColumns(int)) ); + //connect( se, TQ_SIGNAL(disableMasterModeConnections()), + // this, TQ_SLOT(disableMasterModeConnections()) ); applyProperties(); se->setConnect(true); // se->run(); - connect( se, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( sessionDestroyed() ) ); + connect( se, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( sessionDestroyed() ) ); // setFont( n_font ); // we do this here, to make TEWidget recalculate // its geometry.. } diff --git a/konsole/konsole/konsolebookmarkhandler.cpp b/konsole/konsole/konsolebookmarkhandler.cpp index 13af12ca5..16f8afb63 100644 --- a/konsole/konsole/konsolebookmarkhandler.cpp +++ b/konsole/konsole/konsolebookmarkhandler.cpp @@ -59,8 +59,8 @@ KonsoleBookmarkHandler::KonsoleBookmarkHandler( Konsole *konsole, bool toplevel manager->setUpdate( true ); manager->setShowNSBookmarks( false ); - connect( manager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); + connect( manager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &, const TQString &) ) ); if (toplevel) { m_bookmarkMenu = new KonsoleBookmarkMenu( manager, this, m_menu, diff --git a/konsole/konsole/konsolebookmarkmenu.cpp b/konsole/konsole/konsolebookmarkmenu.cpp index 77b86882b..d199808df 100644 --- a/konsole/konsole/konsolebookmarkmenu.cpp +++ b/konsole/konsole/konsolebookmarkmenu.cpp @@ -36,14 +36,14 @@ KonsoleBookmarkMenu::KonsoleBookmarkMenu( KBookmarkManager* mgr, /* * First, we disconnect KBookmarkMenu::slotAboutToShow() * Then, we connect KonsoleBookmarkMenu::slotAboutToShow(). - * They are named differently because the TQT_SLOT() macro thinks we want + * They are named differently because the TQ_SLOT() macro thinks we want * KonsoleBookmarkMenu::KBookmarkMenu::slotAboutToShow() * Could this be solved if slotAboutToShow() is virtual in KBookmarMenu? */ - disconnect( _parentMenu, TQT_SIGNAL( aboutToShow() ), this, - TQT_SLOT( slotAboutToShow() ) ); - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow2() ) ); + disconnect( _parentMenu, TQ_SIGNAL( aboutToShow() ), this, + TQ_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow2() ) ); } /* @@ -113,7 +113,7 @@ void KonsoleBookmarkMenu::fillBookmarkMenu() // kdDebug(1203) << "Creating URL bookmark menu item for " << bm.text() << endl; // create a normal URL item, with ID as a name TDEAction * action = new TDEAction( text, bm.icon(), 0, - this, TQT_SLOT( slotBookmarkSelected() ), + this, TQ_SLOT( slotBookmarkSelected() ), m_actionCollection, bm.url().url().utf8() ); action->setStatusText( bm.url().prettyURL() ); diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index f3ca3ea19..9e70e4c1a 100644 --- a/konsole/konsole/kwrited.cpp +++ b/konsole/konsole/kwrited.cpp @@ -80,7 +80,7 @@ KWrited::KWrited() : TQTextEdit() pty->open(); pty->login(KUser().loginName().local8Bit().data(), getenv("DISPLAY")); TQSocketNotifier *sn = new TQSocketNotifier(pty->masterFd(), TQSocketNotifier::Read, this); - connect(sn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(block_in(int))); + connect(sn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(block_in(int))); TQString txt = i18n("KWrited - Listening on Device %1").arg(pty->ttyName()); setCaption(txt); @@ -116,7 +116,7 @@ TQPopupMenu *KWrited::createPopupMenu( const TQPoint &pos ) TQPopupMenu *menu = TQTextEdit::createPopupMenu( pos ); menu->insertItem( i18n( "Clear Messages" ), - this, TQT_SLOT( clearText() ), + this, TQ_SLOT( clearText() ), 0, -1, 0 ); return menu; diff --git a/konsole/konsole/session.cpp b/konsole/konsole/session.cpp index dcfe9fee4..d613a23e4 100644 --- a/konsole/konsole/session.cpp +++ b/konsole/konsole/session.cpp @@ -78,10 +78,10 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T em = new TEmuVt102(te); font_h = te-> fontHeight(); font_w = te-> fontWidth(); - TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); term = _term; winId = _winId; @@ -89,17 +89,17 @@ TESession::TESession(TEWidget* _te, const TQString &_term, ulong _winId, const T setPty( new TEPty() ); - connect( em, TQT_SIGNAL( changeTitle( int, const TQString & ) ), - this, TQT_SLOT( setUserTitle( int, const TQString & ) ) ); - connect( em, TQT_SIGNAL( notifySessionState(int) ), - this, TQT_SLOT( notifySessionState(int) ) ); + connect( em, TQ_SIGNAL( changeTitle( int, const TQString & ) ), + this, TQ_SLOT( setUserTitle( int, const TQString & ) ) ); + connect( em, TQ_SIGNAL( notifySessionState(int) ), + this, TQ_SLOT( notifySessionState(int) ) ); monitorTimer = new TQTimer(this); - connect(monitorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(monitorTimerDone())); + connect(monitorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(monitorTimerDone())); - connect( em, TQT_SIGNAL( zmodemDetected() ), this, TQT_SLOT(slotZModemDetected())); + connect( em, TQ_SIGNAL( zmodemDetected() ), this, TQ_SLOT(slotZModemDetected())); - connect( em, TQT_SIGNAL( changeTabTextColor( int ) ), - this, TQT_SLOT( changeTabTextColor( int ) ) ); + connect( em, TQ_SIGNAL( changeTabTextColor( int ) ), + this, TQ_SLOT( changeTabTextColor( int ) ) ); //kdDebug(1211)<<"TESession ctor() done"<<endl; } @@ -110,23 +110,23 @@ void TESession::setPty(TEPty *_sh) delete sh; } sh = _sh; - connect( sh, TQT_SIGNAL( forkedChild() ), - this, TQT_SIGNAL( forkedChild() )); + connect( sh, TQ_SIGNAL( forkedChild() ), + this, TQ_SIGNAL( forkedChild() )); //kdDebug(1211)<<"TESession ctor() sh->setSize()"<<endl; sh->setSize(te->Lines(),te->Columns()); // not absolutely nessesary sh->useUtf8(em->utf8()); //kdDebug(1211)<<"TESession ctor() connecting"<<endl; - connect( sh,TQT_SIGNAL(block_in(const char*,int)),this,TQT_SLOT(onRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(block_in(const char*,int)),this,TQ_SLOT(onRcvBlock(const char*,int)) ); - connect( em,TQT_SIGNAL(sndBlock(const char*,int)),sh,TQT_SLOT(send_bytes(const char*,int)) ); - connect( em,TQT_SIGNAL(lockPty(bool)),sh,TQT_SLOT(lockPty(bool)) ); - connect( em,TQT_SIGNAL(useUtf8(bool)),sh,TQT_SLOT(useUtf8(bool)) ); + connect( em,TQ_SIGNAL(sndBlock(const char*,int)),sh,TQ_SLOT(send_bytes(const char*,int)) ); + connect( em,TQ_SIGNAL(lockPty(bool)),sh,TQ_SLOT(lockPty(bool)) ); + connect( em,TQ_SIGNAL(useUtf8(bool)),sh,TQ_SLOT(useUtf8(bool)) ); - connect( sh,TQT_SIGNAL(done(int)), this,TQT_SLOT(done(int)) ); + connect( sh,TQ_SIGNAL(done(int)), this,TQ_SLOT(done(int)) ); if (!sh->error().isEmpty()) - TQTimer::singleShot(0, this, TQT_SLOT(ptyError())); + TQTimer::singleShot(0, this, TQ_SLOT(ptyError())); } void TESession::ptyError() @@ -143,10 +143,10 @@ void TESession::ptyError() void TESession::changeWidget(TEWidget* w) { - TQObject::disconnect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::disconnect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::disconnect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::disconnect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); te=w; em->changeGUI(w); font_h = te->fontHeight(); @@ -155,10 +155,10 @@ void TESession::changeWidget(TEWidget* w) te->setDefaultBackColor(modifiedBackground); - TQObject::connect(te,TQT_SIGNAL(changedContentSizeSignal(int,int)), - this,TQT_SLOT(onContentSizeChange(int,int))); - TQObject::connect(te,TQT_SIGNAL(changedFontMetricSignal(int,int)), - this,TQT_SLOT(onFontMetricChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedContentSizeSignal(int,int)), + this,TQ_SLOT(onContentSizeChange(int,int))); + TQObject::connect(te,TQ_SIGNAL(changedFontMetricSignal(int,int)), + this,TQ_SLOT(onFontMetricChange(int,int))); } void TESession::setProgram( const TQString &_pgm, const TQStrList &_args ) @@ -177,7 +177,7 @@ void TESession::run() TQString pexec = TDEGlobal::dirs()->findExe(exec); if ( pexec.isEmpty() ) { kdError()<<"can not execute "<<exec<<endl; - TQTimer::singleShot(1, this, TQT_SLOT(done())); + TQTimer::singleShot(1, this, TQ_SLOT(done())); return; } @@ -194,7 +194,7 @@ void TESession::run() ("DCOPRef("+appId+","+sessionId+")").latin1()); if (result < 0) { // Error in opening pseudo teletype kdWarning()<<"Unable to open a pseudo teletype!"<<endl; - TQTimer::singleShot(0, this, TQT_SLOT(ptyError())); + TQTimer::singleShot(0, this, TQ_SLOT(ptyError())); } sh->setErase(em->getErase()); @@ -311,7 +311,7 @@ bool TESession::closeSession() if (!sh->isRunning() || !sendSignal(SIGHUP)) { // Forced close. - TQTimer::singleShot(1, this, TQT_SLOT(done())); + TQTimer::singleShot(1, this, TQ_SLOT(done())); } return true; } @@ -341,8 +341,8 @@ void TESession::renameSession(const TQString &name) TESession::~TESession() { //kdDebug(1211) << "disconnnecting..." << endl; - TQObject::disconnect( sh, TQT_SIGNAL( done(int) ), - this, TQT_SLOT( done(int) ) ); + TQObject::disconnect( sh, TQ_SIGNAL( done(int) ), + this, TQ_SLOT( done(int) ) ); delete em; delete sh; @@ -605,7 +605,7 @@ void TESession::slotZModemDetected() { if (!zmodemBusy) { - TQTimer::singleShot(10, this, TQT_SLOT(emitZModemDetected())); + TQTimer::singleShot(10, this, TQ_SLOT(emitZModemDetected())); zmodemBusy = true; } } @@ -639,23 +639,23 @@ void TESession::startZModem(const TQString &zmodem, const TQString &dir, const T zmodemProc->start(KProcIO::NotifyOnExit, false); // Override the read-processing of KProcIO - disconnect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0); - connect(zmodemProc,TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT(zmodemSendBlock(TDEProcess *, char *, int))); - connect(zmodemProc,TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT(zmodemStatus(TDEProcess *, char *, int))); - connect(zmodemProc,TQT_SIGNAL (processExited(TDEProcess *)), - this, TQT_SLOT(zmodemDone())); - - disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) ); - connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(zmodemRcvBlock(const char*,int)) ); - connect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); + disconnect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), 0, 0); + connect(zmodemProc,TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT(zmodemSendBlock(TDEProcess *, char *, int))); + connect(zmodemProc,TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT(zmodemStatus(TDEProcess *, char *, int))); + connect(zmodemProc,TQ_SIGNAL (processExited(TDEProcess *)), + this, TQ_SLOT(zmodemDone())); + + disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(zmodemRcvBlock(const char*,int)) ); + connect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue())); zmodemProgress = new ZModemDialog(te->topLevelWidget(), false, i18n("ZModem Progress")); - connect(zmodemProgress, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(zmodemDone())); + connect(zmodemProgress, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(zmodemDone())); zmodemProgress->show(); } @@ -720,9 +720,9 @@ void TESession::zmodemDone() zmodemProc = 0; zmodemBusy = false; - disconnect( sh,TQT_SIGNAL(block_in(const char*,int)), this ,TQT_SLOT(zmodemRcvBlock(const char*,int)) ); - disconnect( sh,TQT_SIGNAL(buffer_empty()), this, TQT_SLOT(zmodemContinue())); - connect( sh,TQT_SIGNAL(block_in(const char*,int)), this, TQT_SLOT(onRcvBlock(const char*,int)) ); + disconnect( sh,TQ_SIGNAL(block_in(const char*,int)), this ,TQ_SLOT(zmodemRcvBlock(const char*,int)) ); + disconnect( sh,TQ_SIGNAL(buffer_empty()), this, TQ_SLOT(zmodemContinue())); + connect( sh,TQ_SIGNAL(block_in(const char*,int)), this, TQ_SLOT(onRcvBlock(const char*,int)) ); sh->send_bytes("\030\030\030\030", 4); // Abort sh->send_bytes("\001\013\n", 3); // Try to get prompt back diff --git a/konsole/konsole/zmodem_dialog.cpp b/konsole/konsole/zmodem_dialog.cpp index b4f16dd49..230fc7f9a 100644 --- a/konsole/konsole/zmodem_dialog.cpp +++ b/konsole/konsole/zmodem_dialog.cpp @@ -32,7 +32,7 @@ ZModemDialog::ZModemDialog(TQWidget *parent, bool modal, const TQString &caption textEdit = new TQTextEdit(this); textEdit->setMinimumSize(400, 100); setMainWidget(textEdit); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClose())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClose())); } void ZModemDialog::addProgressText(const TQString &txt) diff --git a/kpager/config.cpp b/kpager/config.cpp index 0c022d4bb..29d0470a0 100644 --- a/kpager/config.cpp +++ b/kpager/config.cpp @@ -48,20 +48,20 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent) TQVBox *box = new TQVBox( this ); m_chkWindowDragging=new TQCheckBox(i18n("Enable window dragging"),box,0); (void ) new KSeparator( box ); - connect(m_chkWindowDragging, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableWindowDragging(bool))); + connect(m_chkWindowDragging, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableWindowDragging(bool))); TQHBox *page = new TQHBox( box ); TQVBox *lpage = new TQVBox( page ); setMainWidget(box); m_chkShowName=new TQCheckBox(i18n("Show name"),lpage,0); - connect(m_chkShowName, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowName(bool))); + connect(m_chkShowName, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowName(bool))); m_chkShowNumber=new TQCheckBox(i18n("Show number"),lpage,0); - connect(m_chkShowNumber, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowNumber(bool))); + connect(m_chkShowNumber, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowNumber(bool))); m_chkShowBackground=new TQCheckBox(i18n("Show background"),lpage,0); - connect(m_chkShowBackground, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowBackground(bool))); + connect(m_chkShowBackground, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowBackground(bool))); m_chkShowWindows=new TQCheckBox(i18n("Show windows"),lpage,0); - connect(m_chkShowWindows, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setShowWindows(bool))); + connect(m_chkShowWindows, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setShowWindows(bool))); m_grpWindowDrawMode=new TQButtonGroup(i18n("Type of Window"),page); m_grpWindowDrawMode->setExclusive(true); @@ -75,7 +75,7 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent) // rbpix->setEnabled(false); vbox->addWidget(rbpix); - connect(m_grpWindowDrawMode, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setWindowDrawMode(int))); + connect(m_grpWindowDrawMode, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setWindowDrawMode(int))); m_grpLayoutType=new TQButtonGroup(i18n("Layout"),page); m_grpLayoutType->setExclusive(true); @@ -85,8 +85,8 @@ KPagerConfigDialog::KPagerConfigDialog (TQWidget *parent) vbox->addWidget(new TQRadioButton(i18n("Horizontal"),m_grpLayoutType)); vbox->addWidget(new TQRadioButton(i18n("Vertical"),m_grpLayoutType)); - connect(m_grpLayoutType, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(setLayout(int))); - connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk())); + connect(m_grpLayoutType, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(setLayout(int))); + connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotOk())); loadConfiguration(); setMinimumSize(360, 160); } diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index dc7b27f05..c731f5353 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -257,7 +257,7 @@ void Desktop::loadBgPixmap(void) if (!m_bgPixmap) { m_bgPixmap = new TDESharedPixmap; - connect(m_bgPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(backgroundLoaded(bool))); + connect(m_bgPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(backgroundLoaded(bool))); } retval = m_bgPixmap->loadFromShared(TQString("DESKTOP%1").arg(m_isCommon?1:m_desk)); diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index d18d814c0..68f73982a 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -111,7 +111,7 @@ KPagerMainWindow::KPagerMainWindow(TQWidget *parent, const char *name) XFree(reinterpret_cast<char *>(hints)); timeout=new TQTimer(this,"timeoutToQuit"); - connect(timeout,TQT_SIGNAL(timeout()),this, TQT_SLOT(reallyClose())); + connect(timeout,TQ_SIGNAL(timeout()),this, TQ_SLOT(reallyClose())); } KPagerMainWindow::~KPagerMainWindow() @@ -191,7 +191,7 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) m_currentDesktop=m_winmodule->currentDesktop(); m_grabWinTimer=new TQTimer(this,"grabWinTimer"); - connect(m_grabWinTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGrabWindows())); + connect(m_grabWinTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGrabWindows())); KPagerConfigDialog::initConfiguration(); @@ -208,31 +208,31 @@ KPager::KPager(KPagerMainWindow *parent, const char *name) m_layoutType=static_cast<enum KPager::LayoutTypes>( KPagerConfigDialog::m_layoutType ); - connect( m_winmodule, TQT_SIGNAL( activeWindowChanged(WId)), - TQT_SLOT(slotActiveWindowChanged(WId))); - connect( m_winmodule, TQT_SIGNAL( windowAdded(WId) ), - TQT_SLOT( slotWindowAdded(WId) ) ); - connect( m_winmodule, TQT_SIGNAL( windowRemoved(WId) ), - TQT_SLOT( slotWindowRemoved(WId) ) ); - connect( m_winmodule, TQT_SIGNAL( windowChanged(WId,unsigned int) ), - TQT_SLOT( slotWindowChanged(WId,unsigned int) ) ); - connect( m_winmodule, TQT_SIGNAL( stackingOrderChanged() ), - TQT_SLOT( slotStackingOrderChanged() ) ); - connect( m_winmodule, TQT_SIGNAL( desktopNamesChanged() ), - TQT_SLOT( slotDesktopNamesChanged() ) ); - connect( m_winmodule, TQT_SIGNAL( numberOfDesktopsChanged(int) ), - TQT_SLOT( slotNumberOfDesktopsChanged(int) ) ); - connect( m_winmodule, TQT_SIGNAL( currentDesktopChanged(int)), - TQT_SLOT( slotCurrentDesktopChanged(int) ) ); - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), - TQT_SLOT(slotBackgroundChanged(int))); + connect( m_winmodule, TQ_SIGNAL( activeWindowChanged(WId)), + TQ_SLOT(slotActiveWindowChanged(WId))); + connect( m_winmodule, TQ_SIGNAL( windowAdded(WId) ), + TQ_SLOT( slotWindowAdded(WId) ) ); + connect( m_winmodule, TQ_SIGNAL( windowRemoved(WId) ), + TQ_SLOT( slotWindowRemoved(WId) ) ); + connect( m_winmodule, TQ_SIGNAL( windowChanged(WId,unsigned int) ), + TQ_SLOT( slotWindowChanged(WId,unsigned int) ) ); + connect( m_winmodule, TQ_SIGNAL( stackingOrderChanged() ), + TQ_SLOT( slotStackingOrderChanged() ) ); + connect( m_winmodule, TQ_SIGNAL( desktopNamesChanged() ), + TQ_SLOT( slotDesktopNamesChanged() ) ); + connect( m_winmodule, TQ_SIGNAL( numberOfDesktopsChanged(int) ), + TQ_SLOT( slotNumberOfDesktopsChanged(int) ) ); + connect( m_winmodule, TQ_SIGNAL( currentDesktopChanged(int)), + TQ_SLOT( slotCurrentDesktopChanged(int) ) ); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), + TQ_SLOT(slotBackgroundChanged(int))); TQFont defFont(TDEGlobalSettings::generalFont().family(), 10, TQFont::Bold); defFont = cfg->readFontEntry("Font", &defFont); setFont(defFont); - m_prefs_action = KStdAction::preferences(this, TQT_SLOT(configureDialog()), parent->actionCollection()); - m_quit_action = KStdAction::quit(kapp, TQT_SLOT(quit()), parent->actionCollection()); + m_prefs_action = KStdAction::preferences(this, TQ_SLOT(configureDialog()), parent->actionCollection()); + m_quit_action = KStdAction::quit(kapp, TQ_SLOT(quit()), parent->actionCollection()); updateLayout(); } @@ -323,13 +323,13 @@ void KPager::showPopupMenu( WId wid, TQPoint pos) m_mnu->insertTitle( TQString::fromUtf8("KPager"), 1); m_mnu->setCheckable(true); - connect(m_mnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(clientPopupAboutToShow())); - connect(m_mnu, TQT_SIGNAL(activated(int)), TQT_SLOT(clientPopupActivated(int))); + connect(m_mnu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(clientPopupAboutToShow())); + connect(m_mnu, TQ_SIGNAL(activated(int)), TQ_SLOT(clientPopupActivated(int))); m_dmnu = new TQPopupMenu(m_mnu); m_dmnu->setCheckable(true); - connect(m_dmnu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(desktopPopupAboutToShow())); - connect(m_dmnu, TQT_SIGNAL(activated(int)), TQT_SLOT(sendToDesktop(int))); + connect(m_dmnu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(desktopPopupAboutToShow())); + connect(m_dmnu, TQ_SIGNAL(activated(int)), TQ_SLOT(sendToDesktop(int))); m_mnu->insertItem( i18n("Mi&nimize"), IconifyOp ); m_mnu->insertItem( i18n("Ma&ximize"), MaximizeOp ); diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index cec71bae8..0384ff2b8 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -37,8 +37,8 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl px_introSidebar->setPixmap(UserIcon("step1.png")); - connect(cb_country, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLangForCountry(const TQString &))); - connect(cb_language, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLanguageChanged())); + connect(cb_country, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLangForCountry(const TQString &))); + connect(cb_language, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLanguageChanged())); // naturally, the language is not changed on startup b_savedLanguageChanged = false; diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index 86b0a5b4a..cef8619ea 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -90,9 +90,9 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name) locale = new TDELocale("kpersonalizer"); locale->setLanguage(TDELocale::defaultLanguage()); - connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), stylepage, TQT_SLOT(presetStyle(const TQString&))); - connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), eyecandy, TQT_SLOT(slotPresetSlider(const TQString&))); - connect(refinepage->pb_kcontrol, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), stylepage, TQ_SLOT(presetStyle(const TQString&))); + connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), eyecandy, TQ_SLOT(slotPresetSlider(const TQString&))); + connect(refinepage->pb_kcontrol, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); setPosition(); @@ -125,7 +125,7 @@ void KPersonalizer::next() { else if(currentPage()==eyecandy){ eye_dirty=true; // set the dirty flag, changes done that need reverting eyecandy->save(); - TQTimer::singleShot(0, this, TQT_SLOT(slotNext())); + TQTimer::singleShot(0, this, TQ_SLOT(slotNext())); } else if(currentPage()==stylepage){ style_dirty=true; // set the dirty flag, changes done that need reverting @@ -215,7 +215,7 @@ void KPersonalizer::slotRestart() { } void KPersonalizer::delayedRestart() { - TQTimer::singleShot(0, this, TQT_SLOT(slotRestart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRestart())); } /** this session is restarted, so we want to start with ospage */ diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp index 568967690..32c7370ae 100644 --- a/kpersonalizer/krefinepage.cpp +++ b/kpersonalizer/krefinepage.cpp @@ -28,7 +28,7 @@ KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(parent,name) { px_finishSidebar->setPixmap(UserIcon("step5.png")); - connect( pb_kcontrol, TQT_SIGNAL(clicked()), TQT_SLOT(startKControl()) ); + connect( pb_kcontrol, TQ_SIGNAL(clicked()), TQ_SLOT(startKControl()) ); if( KPersonalizer::beforeSession()) { pb_kcontrol->hide(); lb_kcontrol->hide(); diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp index 5c85f402c..2fd4a8419 100644 --- a/kpersonalizer/tdestylepage.cpp +++ b/kpersonalizer/tdestylepage.cpp @@ -75,8 +75,8 @@ TDEStylePage::TDEStylePage(TQWidget *parent, const char *name ) : TDEStylePageDl platinum->setText( 0, i18n( "Platinum" ) ); platinum->setText( 1, i18n( "The platinum style" ) ); - connect(klv_styles, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotCurrentChanged())); + connect(klv_styles, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotCurrentChanged())); // Note: if the default is changed here it needs to be changed in tdebase/twin/plugins.cpp // and tdebase/twin/kcmtwin/twindecoration/twindecoration.cpp as well. diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index 9d1ef9e32..73efa6abb 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -68,10 +68,10 @@ void KRootBacking::init() m_bInit = false; m_bActive = false; - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint())); #ifdef Q_WS_X11 - connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); + connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); d->twin = new KWinModule( this ); #endif @@ -107,7 +107,7 @@ void KRootBacking::start() // We should get a KIPC message when the shared pixmap is available... enableExports(); if (m_timeout < 50) { - TQTimer::singleShot( 100, this, SLOT(show()) ); // ...but it doesn't always work! + TQTimer::singleShot( 100, this, TQ_SLOT(show()) ); // ...but it doesn't always work! m_timeout++; return; } @@ -218,7 +218,7 @@ void KRootBacking::slotDone(bool success) { kdWarning(270) << k_lineinfo << "loading of desktop background failed.\n"; if (m_timeout < 50) { - TQTimer::singleShot( 100, this, SLOT(show()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(show()) ); m_timeout++; return; } diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index 5691d736d..f29666d02 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char **argv) TQObject* mainWin = new KRootBacking(); TQTimer *timer = new TQTimer( mainWin ); - TQObject::connect( timer, SIGNAL(timeout()), mainWin, SLOT(start()) ); + TQObject::connect( timer, TQ_SIGNAL(timeout()), mainWin, TQ_SLOT(start()) ); timer->start( 100, TRUE ); // 100ms single shot timer app.exec(); diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index aee40fcaa..be5ed0bcc 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -603,9 +603,9 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag hwDevices = TDEGlobal::hardwareDevices(); #endif - connect( &knotifyTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( knotifyTimeout())); - connect( &startupSuspendTimeoutTimer, TQT_SIGNAL( timeout()), TQT_SLOT( startupSuspendTimeout())); - connect( &pendingShutdown, TQT_SIGNAL( timeout()), TQT_SLOT( pendingShutdownTimeout())); + connect( &knotifyTimeoutTimer, TQ_SIGNAL( timeout()), TQ_SLOT( knotifyTimeout())); + connect( &startupSuspendTimeoutTimer, TQ_SIGNAL( timeout()), TQ_SLOT( startupSuspendTimeout())); + connect( &pendingShutdown, TQ_SIGNAL( timeout()), TQ_SLOT( pendingShutdownTimeout())); only_local = _only_local; #ifdef HAVE__ICETRANSNOLISTEN @@ -676,7 +676,7 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag for ( int i = 0; i < numTransports; i++) { con = new KSMListener( listenObjs[i] ); listener.append( con ); - connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newConnection(int) ) ); + connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( newConnection(int) ) ); } signal(SIGHUP, sighandler); @@ -684,11 +684,11 @@ KSMServer::KSMServer( const TQString& windowManager, const TQString& windowManag signal(SIGINT, sighandler); signal(SIGPIPE, SIG_IGN); - connect( ¬ificationTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( notificationTimeout() ) ); - connect( &protectionTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( protectionTimerTick() ) ); - connect( &restoreTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( tryRestoreNext() ) ); - connect( &shutdownTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeoutQuit() ) ); - connect( kapp, TQT_SIGNAL( shutDown() ), this, TQT_SLOT( cleanUp() ) ); + connect( ¬ificationTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( notificationTimeout() ) ); + connect( &protectionTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( protectionTimerTick() ) ); + connect( &restoreTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( tryRestoreNext() ) ); + connect( &shutdownTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeoutQuit() ) ); + connect( kapp, TQ_SIGNAL( shutDown() ), this, TQ_SLOT( cleanUp() ) ); } KSMServer::~KSMServer() @@ -742,7 +742,7 @@ void KSMServer::cleanUp() void* KSMServer::watchConnection( IceConn iceConn ) { KSMConnection* conn = new KSMConnection( iceConn ); - connect( conn, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) ); + connect( conn, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( processData(int) ) ); return (void*) conn; } diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index ec27f7768..f62894d72 100644 --- a/ksmserver/shutdown.cpp +++ b/ksmserver/shutdown.cpp @@ -272,8 +272,8 @@ void KSMServer::shutdownInternal( TDEApplication::ShutdownConfirm confirm, if (showLogoutStatusDlg) { shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP(); if (shutdownNotifierIPDlg) { - connect(shutdownNotifierIPDlg, SIGNAL(abortLogoutClicked()), this, SLOT(cancelShutdown())); - connect(shutdownNotifierIPDlg, SIGNAL(skipNotificationClicked()), this, SLOT(forceSkipSaveYourself())); + connect(shutdownNotifierIPDlg, TQ_SIGNAL(abortLogoutClicked()), this, TQ_SLOT(cancelShutdown())); + connect(shutdownNotifierIPDlg, TQ_SIGNAL(skipNotificationClicked()), this, TQ_SLOT(forceSkipSaveYourself())); static_cast<KSMShutdownIPDlg*>(shutdownNotifierIPDlg)->setStatusMessage(i18n("Notifying applications of logout request...")); notificationTimer.start( KSMSERVER_NOTIFICATION_MANUAL_OPTIONS_TIMEOUT, true ); } @@ -764,8 +764,8 @@ void KSMServer::completeShutdownOrCheckpoint() if (!shutdownNotifierIPDlg) { shutdownNotifierIPDlg = KSMShutdownIPDlg::showShutdownIP(); if (shutdownNotifierIPDlg) { - connect(shutdownNotifierIPDlg, SIGNAL(abortLogoutClicked()), this, SLOT(cancelShutdown())); - connect(shutdownNotifierIPDlg, SIGNAL(skipNotificationClicked()), this, SLOT(forceSkipSaveYourself())); + connect(shutdownNotifierIPDlg, TQ_SIGNAL(abortLogoutClicked()), this, TQ_SLOT(cancelShutdown())); + connect(shutdownNotifierIPDlg, TQ_SIGNAL(skipNotificationClicked()), this, TQ_SLOT(forceSkipSaveYourself())); } } while (!KSMShutdownIPFeedback::ispainted()) { @@ -963,7 +963,7 @@ void KSMServer::killWM() } if( iswm ) { completeKillingWM(); - TQTimer::singleShot( 5000, this, TQT_SLOT( timeoutWMQuit() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( timeoutWMQuit() ) ); } else { killingCompleted(); diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index 0d1cbd4ef..62eea0d05 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -105,7 +105,7 @@ KSMShutdownFeedback::KSMShutdownFeedback() m_unfadedImage = m_grayImage; resize(0, 0); setShown(true); - TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( slotPaintEffect() ) ); } // called after stopping shutdown-feedback -> smooth fade-back to color-mode @@ -243,7 +243,7 @@ void KSMShutdownFeedback::slotPaintEffect() bitBlt( this, 0, start_y1, &img ); } - TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) ); + TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) ); } else { // if slotPaintEffect() is called first time, we have to initialize the gray image @@ -370,7 +370,7 @@ void KSMShutdownFeedback::slotPaintEffect() bitBlt( this, 0, start_y1, &img ); } - TQTimer::singleShot( 5, this, TQT_SLOT( slotPaintEffect() ) ); + TQTimer::singleShot( 5, this, TQ_SLOT( slotPaintEffect() ) ); } } else { @@ -486,7 +486,7 @@ void KSMShutdownFeedback::slotPaintEffect() bitBlt( this, 0, start_y1, &img ); } - TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( slotPaintEffect() ) ); } else { if ( m_currentY >= height() ) { @@ -517,7 +517,7 @@ void KSMShutdownFeedback::slotPaintEffect() bitBlt( this, 0, m_currentY, &pixmap ); bitBlt( &m_root, 0, m_currentY, &pixmap ); m_currentY += 10; - TQTimer::singleShot( 1, this, TQT_SLOT( slotPaintEffect() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( slotPaintEffect() ) ); } } } @@ -539,7 +539,7 @@ KSMShutdownIPFeedback::KSMShutdownIPFeedback() m_sharedRootPixmap = new KRootPixmap(this); m_sharedRootPixmap->setCustomPainting(true); - connect(m_sharedRootPixmap, TQT_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQT_SLOT(slotSetBackgroundPixmap(const TQPixmap &))); + connect(m_sharedRootPixmap, TQ_SIGNAL(backgroundUpdated(const TQPixmap &)), this, TQ_SLOT(slotSetBackgroundPixmap(const TQPixmap &))); if (TQPaintDevice::x11AppDepth() == 32) { // The shared pixmap is 24 bits, but we are 32 bits @@ -571,7 +571,7 @@ void KSMShutdownIPFeedback::showNow() if (!m_isPainted) { setGeometry( TQApplication::desktop()->geometry() ); - TQTimer::singleShot( 0, this, SLOT(slotPaintEffect()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotPaintEffect()) ); } } @@ -632,7 +632,7 @@ void KSMShutdownIPFeedback::slotPaintEffect() m_sharedRootPixmap->start(); } - TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) ); mPixmapTimeout++; return; } @@ -647,7 +647,7 @@ void KSMShutdownIPFeedback::slotPaintEffect() } if ((pm.isNull()) || (pm.width() != kapp->desktop()->width()) || (pm.height() != kapp->desktop()->height())) { if (mPixmapTimeout < 10) { - TQTimer::singleShot( 100, this, SLOT(slotPaintEffect()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(slotPaintEffect()) ); mPixmapTimeout++; return; } @@ -766,7 +766,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, int i = btnLogout->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnLogout->setAccel( "ALT+" + btnLogout->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnLogout ); - connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout())); + connect(btnLogout, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogout())); } else { @@ -794,7 +794,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, TQToolTip::add( btnLogout, i18n( "<qt><p>Log out of the current session to login as a different user.</p></qt>" ) ); btnFont = btnLogout->font(); buttonlay->addWidget( btnLogout ); - connect(btnLogout, TQT_SIGNAL(clicked()), TQT_SLOT(slotLogout())); + connect(btnLogout, TQ_SIGNAL(clicked()), TQ_SLOT(slotLogout())); } if ((maysd) || (mayrb)) { @@ -841,7 +841,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, int i = btnFreeze->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnFreeze->setAccel( "ALT+" + btnFreeze->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnFreeze ); - connect(btnFreeze, TQT_SIGNAL(clicked()), TQT_SLOT(slotFreeze())); + connect(btnFreeze, TQ_SIGNAL(clicked()), TQ_SLOT(slotFreeze())); } if (canSuspend && !disableSuspend) @@ -857,7 +857,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, int i = btnSuspend->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnSuspend->setAccel( "ALT+" + btnSuspend->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnSuspend ); - connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend())); + connect(btnSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotSuspend())); } if (canHibernate && !disableHibernate) @@ -872,7 +872,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, int i = btnHibernate->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnHibernate->setAccel( "ALT+" + btnHibernate->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnHibernate ); - connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate())); + connect(btnHibernate, TQ_SIGNAL(clicked()), TQ_SLOT(slotHibernate())); } if (canHybridSuspend && !disableSuspend && !disableHibernate) @@ -890,7 +890,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, int i = btnHybridSuspend->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnHybridSuspend->setAccel( "ALT+" + btnHybridSuspend->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnHybridSuspend ); - connect(btnHybridSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotHybridSuspend())); + connect(btnHybridSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotHybridSuspend())); } // Separator (within buttonlay) @@ -909,7 +909,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ; hbuttonbox2->addWidget ( btnReboot); - connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); + connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot())); if ( sdtype == TDEApplication::ShutdownTypeReboot ) { btnReboot->setFocus(); } @@ -936,7 +936,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, } btnReboot->setPopup(targets); - connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) ); + connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) ); } // BAD KARMA .. this code is copied line by line from standard konqy dialog [EOF] } @@ -950,7 +950,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, int i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; hbuttonbox2->addWidget ( btnHalt ); - connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); + connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt())); if ( sdtype == TDEApplication::ShutdownTypeHalt ) { btnHalt->setFocus(); } @@ -963,7 +963,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // Back to Desktop KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); hbuttonbox3->addWidget( btnBack ); - connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } else @@ -975,7 +975,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, TQToolTip::add( btnHalt, i18n( "<qt><p>Log out of the current session and turn off the computer.</p></qt>" ) ); btnHalt->setFont( btnFont ); buttonlay->addWidget( btnHalt ); - connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); + connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt())); if ( sdtype == TDEApplication::ShutdownTypeHalt || getenv("TDM_AUTOLOGIN") ) { btnHalt->setFocus(); } @@ -988,7 +988,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, btnReboot->setFont( btnFont ); buttonlay->addWidget( btnReboot ); - connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); + connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot())); if ( sdtype == TDEApplication::ShutdownTypeReboot ) { btnReboot->setFocus(); } @@ -1014,7 +1014,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, } btnReboot->setPopup(targets); - connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) ); + connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) ); } } @@ -1026,7 +1026,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, " almost instantly.</p><p>This correspond to ACPI S0 mode.</p></qt>")); btnFreeze->setFont( btnFont ); buttonlay->addWidget( btnFreeze ); - connect(btnFreeze, TQT_SIGNAL(clicked()), TQT_SLOT(slotFreeze())); + connect(btnFreeze, TQ_SIGNAL(clicked()), TQ_SLOT(slotFreeze())); } if (canSuspend && !disableSuspend) @@ -1038,7 +1038,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, "<p>Also known as Suspend-to-RAM mode.</p></qt>")); btnSuspend->setFont( btnFont ); buttonlay->addWidget( btnSuspend ); - connect(btnSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotSuspend())); + connect(btnSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotSuspend())); } if (canHibernate && !disableHibernate) @@ -1049,7 +1049,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, " considerable time is required to reactivate the system again.</p><p>This correspond to ACPI S4 mode.</p><p>Also known as Suspend-to-Disk mode.</p></qt>")); btnHibernate->setFont( btnFont ); buttonlay->addWidget( btnHibernate ); - connect(btnHibernate, TQT_SIGNAL(clicked()), TQT_SLOT(slotHibernate())); + connect(btnHibernate, TQ_SIGNAL(clicked()), TQ_SLOT(slotHibernate())); } if (canHybridSuspend && !disableSuspend && !disableHibernate) @@ -1063,7 +1063,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, "<p>Also known as Suspend-to-RAM + Suspend-to-Disk mode.</p></qt>")); btnHybridSuspend->setFont( btnFont ); buttonlay->addWidget( btnHybridSuspend ); - connect(btnHybridSuspend, TQT_SIGNAL(clicked()), TQT_SLOT(slotHybridSuspend())); + connect(btnHybridSuspend, TQ_SIGNAL(clicked()), TQ_SLOT(slotHybridSuspend())); } buttonlay->addStretch( 1 ); @@ -1074,7 +1074,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, // Back to Desktop KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame ); buttonlay->addWidget( btnBack ); - connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } } else { @@ -1089,7 +1089,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), frame ); hbuttonbox3->addWidget( btnBack ); - connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } else { @@ -1100,7 +1100,7 @@ KSMShutdownDlg::KSMShutdownDlg( TQWidget* parent, KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame ); buttonlay->addWidget( btnBack ); - connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } } } @@ -1246,8 +1246,8 @@ KSMShutdownIPDlg::KSMShutdownIPDlg(TQWidget* parent) setNotificationActionButtonsSkipText(i18n("Skip Notification")); m_button2->setText(i18n("Abort Logout")); - connect(m_button1, SIGNAL(clicked()), this, SIGNAL(skipNotificationClicked())); - connect(m_button2, SIGNAL(clicked()), this, SIGNAL(abortLogoutClicked())); + connect(m_button1, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(skipNotificationClicked())); + connect(m_button2, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(abortLogoutClicked())); show(); setActiveWindow(); @@ -1264,10 +1264,10 @@ KSMDelayedPushButton::KSMDelayedPushButton( const KGuiItem &item, const char *name) : KPushButton( item, parent, name), pop(0), popt(0) { - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed())); - connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased())); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed())); + connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased())); popt = new TQTimer(this); - connect(popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); } void KSMDelayedPushButton::setPopup(TQPopupMenu *p) @@ -1329,7 +1329,7 @@ KSMDelayedMessageBox::KSMDelayedMessageBox( TDEApplication::ShutdownType sdtype, } TQTimer *timer = new TQTimer( this ); timer->start( 1000 ); - connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateText() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateText() ) ); KDialog::centerOnScreen(this); } diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index fb9e696ec..f3b0012ab 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -145,7 +145,7 @@ void KSMServer::restoreSession( TQString sessionName ) if ((showFancyLogin) && (!startupNotifierIPDlg)) { startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); } - TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) ); + TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) ); } else { if ((showFancyLogin) && (!startupNotifierIPDlg)) { startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); @@ -192,7 +192,7 @@ void KSMServer::startDefaultSession() if ((showFancyLogin) && (!startupNotifierIPDlg)) { startupNotifierIPDlg = KSMStartupIPDlg::showStartupIP(); } - TQTimer::singleShot( 4000, this, TQT_SLOT( autoStart0() ) ); + TQTimer::singleShot( 4000, this, TQ_SLOT( autoStart0() ) ); } @@ -226,7 +226,7 @@ void KSMServer::autoStart0Done() connectDCOPSignal( "kcminit", "kcminit", "phase1Done()", "kcmPhase1Done()", true); state = KcmInitPhase1; - TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase1Timeout())); // protection + TQTimer::singleShot( 10000, this, TQ_SLOT( kcmPhase1Timeout())); // protection DCOPRef( "kcminit", "kcminit" ).send( "runPhase1" ); } @@ -333,7 +333,7 @@ void KSMServer::autoStart2() DCOPRef( "kdesktop", "KDesktopIface" ).send( "runAutoStart" ); connectDCOPSignal( "kcminit", "kcminit", "phase2Done()", "kcmPhase2Done()", true); - TQTimer::singleShot( 10000, this, TQT_SLOT( kcmPhase2Timeout())); // protection + TQTimer::singleShot( 10000, this, TQ_SLOT( kcmPhase2Timeout())); // protection DCOPRef( "kcminit", "kcminit" ).send( "runPhase2" ); if( !defaultSession()) restoreLegacySession( TDEGlobal::config()); diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 66b6eb83b..c790000b0 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -36,8 +36,8 @@ ThemeListBox::ThemeListBox(TQWidget *parent) : TDEListBox(parent) { setAcceptDrops(true); - connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &))); + connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &))); } void ThemeListBox::dragEnterEvent(TQDragEnterEvent* event) @@ -100,21 +100,21 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn mThemesList = new ThemeListBox(this); mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); - connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int))); - connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&))); + connect(mThemesList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSetTheme(int))); + connect(mThemesList, TQ_SIGNAL(filesDropped(const KURL::List&)), TQ_SLOT(slotFilesDropped(const KURL::List&))); leftbox->addWidget(mThemesList); mBtnAdd = new KPushButton( i18n("Add..."), this ); leftbox->addWidget( mBtnAdd ); - connect(mBtnAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); + connect(mBtnAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); mBtnRemove = new KPushButton( i18n("Remove"), this ); leftbox->addWidget( mBtnRemove ); - connect(mBtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); + connect(mBtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); mBtnTest = new KPushButton( i18n("Test"), this ); leftbox->addWidget( mBtnTest ); - connect(mBtnTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTest())); + connect(mBtnTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTest())); TQVBoxLayout* rightbox = new TQVBoxLayout( hbox, KDialog::spacingHint() ); hbox->setStretchFactor( rightbox, 3 ); diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp index f0b5d1f52..4a2f9cf5c 100644 --- a/ksplashml/kcmksplash/main.cpp +++ b/ksplashml/kcmksplash/main.cpp @@ -59,7 +59,7 @@ KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQSt TQHBoxLayout *box = new TQHBoxLayout(this, 0, 0); box->addWidget(mInstaller); #endif - connect( mInstaller, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) ); + connect( mInstaller, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) ); TDEAboutData *about = new TDEAboutData( "kcmksplash" ,I18N_NOOP("TDE splash screen theme manager") ,"0.1" diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index c3a0285a8..1c311ed8b 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -71,7 +71,7 @@ ThemeDefault::ThemeDefault( TQWidget *parent, const char *name, const TQStringLi if( mIconsFlashing ) { mFlashTimer = new TQTimer( this ); - connect( mFlashTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flash()) ); + connect( mFlashTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flash()) ); mFlashPixmap1 = new TQPixmap(); mFlashPixmap2 = new TQPixmap(); diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 856547895..c6c16170c 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -70,7 +70,7 @@ WndIcon::WndIcon( if( mIconJumping ) { TQTimer *t = new TQTimer( this ); - connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(slotJump())); + connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(slotJump())); t->start( 50, false ); } } diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index db12b8493..7458abefd 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -101,7 +101,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w ) XChangeWindowAttributes( tqt_xdisplay(), w->winId(), CWOverrideRedirect, &attrs ); } d->mSplashWindows.prepend( w->winId()); - connect( w, TQT_SIGNAL( destroyed( TQObject* )), TQT_SLOT( splashWindowDestroyed( TQObject* ))); + connect( w, TQ_SIGNAL( destroyed( TQObject* )), TQ_SLOT( splashWindowDestroyed( TQObject* ))); w->raise(); } diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index 0514b53bc..3c07e5191 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -58,23 +58,23 @@ KSplash::KSplash(const char *name) if ( config->readBoolEntry( "CloseOnClick", TRUE ) ) mThemeEngine->installEventFilter( this ); - connect( mThemeEngine, TQT_SIGNAL(destroyed()), this, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(stepsChanged(int)), TQT_SLOT(slotUpdateSteps(int)) ); - connect( this, TQT_SIGNAL(progressChanged(int)), TQT_SLOT(slotUpdateProgress(int)) ); + connect( mThemeEngine, TQ_SIGNAL(destroyed()), this, TQ_SLOT(close()) ); + connect( this, TQ_SIGNAL(stepsChanged(int)), TQ_SLOT(slotUpdateSteps(int)) ); + connect( this, TQ_SIGNAL(progressChanged(int)), TQ_SLOT(slotUpdateProgress(int)) ); if( mKsTheme->testing() ) { slotUpdateSteps(7); - TQTimer::singleShot( 1000, this, TQT_SLOT(slotExec())); + TQTimer::singleShot( 1000, this, TQ_SLOT(slotExec())); } else - TQTimer::singleShot( 100, this, TQT_SLOT(initDcop())); + TQTimer::singleShot( 100, this, TQ_SLOT(initDcop())); // Make sure we don't stay up forever. if (!mKsTheme->managedMode()) { close_timer = new TQTimer( this ); - connect( close_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( close() ) ); + connect( close_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( close() ) ); close_timer->start( 60000, TRUE ); } } @@ -133,14 +133,14 @@ void KSplash::slotInsertAction( const TQString& pix, const TQString& msg ) void KSplash::slotExec() { - TQTimer::singleShot( 200, this, TQT_SLOT(nextIcon())); + TQTimer::singleShot( 200, this, TQ_SLOT(nextIcon())); } void KSplash::nextIcon() { if( !mCurrentAction || mTimeToGo ) { - TQTimer::singleShot( 1000, this, TQT_SLOT(close())); + TQTimer::singleShot( 1000, this, TQ_SLOT(close())); return; } @@ -155,12 +155,12 @@ void KSplash::nextIcon() } if( mKsTheme->testing() ) - TQTimer::singleShot( 1000, this, TQT_SLOT(nextIcon())); + TQTimer::singleShot( 1000, this, TQ_SLOT(nextIcon())); } void KSplash::initDcop() { - disconnect( kapp->dcopClient(), TQT_SIGNAL( attachFailed(const TQString&) ), kapp, TQT_SLOT( dcopFailure(const TQString&) ) ); + disconnect( kapp->dcopClient(), TQ_SIGNAL( attachFailed(const TQString&) ), kapp, TQ_SLOT( dcopFailure(const TQString&) ) ); if ( kapp->dcopClient()->isAttached() ) return; @@ -174,7 +174,7 @@ void KSplash::initDcop() } else { - TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()) ); } } @@ -247,7 +247,7 @@ void KSplash::upAndRunning( TQString s ) //if(!mSessMgrCalled) emit nextIcon(); mTimeToGo = true; close_timer->stop(); - TQTimer::singleShot( 1000, this, TQT_SLOT(close())); + TQTimer::singleShot( 1000, this, TQ_SLOT(close())); } else { @@ -307,7 +307,7 @@ void KSplash::setStartupItemCount( int count ) void KSplash::startupComplete() { mTimeToGo = true; - TQTimer::singleShot( 1000, this, TQT_SLOT(close())); + TQTimer::singleShot( 1000, this, TQ_SLOT(close())); } void KSplash::close() @@ -426,7 +426,7 @@ bool KSplash::eventFilter( TQObject *o, TQEvent *e ) { if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) ) { - TQTimer::singleShot( 0, this, TQT_SLOT(close())); + TQTimer::singleShot( 0, this, TQ_SLOT(close())); return TRUE; } else diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index bcbc6d846..bcf915b07 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -55,7 +55,7 @@ KStart::KStart() sendRule(); else { // connect to window add to get the NEW windows - connect(twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId))); + connect(twinmodule, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId))); if (windowtitle != 0) twinmodule->doNotManage( windowtitle ); } @@ -76,7 +76,7 @@ KStart::KStart() else TDEStartupInfo::sendFinish( id ); // failed to start - TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQT_SLOT( quit())); + TQTimer::singleShot( useRule ? 0 : 120 * 1000, kapp, TQ_SLOT( quit())); } void KStart::sendRule() { diff --git a/ksysguard/gui/KSysGuardApplet.cpp b/ksysguard/gui/KSysGuardApplet.cpp index e1c8db73e..d5ae18b46 100644 --- a/ksysguard/gui/KSysGuardApplet.cpp +++ b/ksysguard/gui/KSysGuardApplet.cpp @@ -120,9 +120,9 @@ void KSysGuardApplet::preferences() } mSettingsDlg = new KSGAppletSettings( this ); - connect( mSettingsDlg, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDlg, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDlg, TQT_SIGNAL( finished() ), TQT_SLOT( preferencesFinished() ) ); + connect( mSettingsDlg, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDlg, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDlg, TQ_SIGNAL( finished() ), TQ_SLOT( preferencesFinished() ) ); mSettingsDlg->setNumDisplay( mDockCount ); mSettingsDlg->setSizeRatio( (int) ( mSizeRatio * 100.0 + 0.5 ) ); @@ -232,8 +232,8 @@ void KSysGuardApplet::dropEvent( TQDropEvent *e ) mDockList[ dock ] = wdg; layout(); - connect( wdg, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( sensorDisplayModified( bool ) ) ); + connect( wdg, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( sensorDisplayModified( bool ) ) ); mDockList[ dock ]->show(); } @@ -405,8 +405,8 @@ bool KSysGuardApplet::load() delete mDockList[ dock ]; mDockList[ dock ] = newDisplay; - connect( newDisplay, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( sensorDisplayModified( bool ) ) ); + connect( newDisplay, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( sensorDisplayModified( bool ) ) ); } return true; diff --git a/ksysguard/gui/SensorBrowser.cpp b/ksysguard/gui/SensorBrowser.cpp index 32f290460..575389bac 100644 --- a/ksysguard/gui/SensorBrowser.cpp +++ b/ksysguard/gui/SensorBrowser.cpp @@ -68,11 +68,11 @@ SensorBrowser::SensorBrowser( TQWidget* parent, KSGRD::SensorManager* sm, { mHostInfoList.setAutoDelete(true); - connect( mSensorManager, TQT_SIGNAL( update() ), TQT_SLOT( update() ) ); - connect( this, TQT_SIGNAL( clicked( TQListViewItem* ) ), - TQT_SLOT( newItemSelected( TQListViewItem* ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), - TQT_SLOT( newItemSelected( TQListViewItem* ) ) ); + connect( mSensorManager, TQ_SIGNAL( update() ), TQ_SLOT( update() ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem* ) ), + TQ_SLOT( newItemSelected( TQListViewItem* ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem* ) ), + TQ_SLOT( newItemSelected( TQListViewItem* ) ) ); addColumn( i18n( "Sensor Browser" ) ); addColumn( i18n( "Sensor Type" ) ); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cpp b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp index 5b09addc0..43fbe549f 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBars.cpp +++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp @@ -104,7 +104,7 @@ void DancingBars::configureSettings() } mSettingsDialog->setSensors( list ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); if ( mSettingsDialog->exec() ) applySettings(); diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp index 9b05d6806..b754791f8 100644 --- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp +++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp @@ -181,15 +181,15 @@ DancingBarsSettings::DancingBarsSettings( TQWidget* parent, const char* name ) TQWhatsThis::add( mRemoveButton, i18n( "Push this button to delete the sensor." ) ); pageLayout->addWidget( mRemoveButton, 1, 1 ); - connect( mUseLowerLimit, TQT_SIGNAL( toggled( bool ) ), - mLowerLimit, TQT_SLOT( setEnabled( bool ) ) ); - connect( mUseUpperLimit, TQT_SIGNAL( toggled( bool ) ), - mUpperLimit, TQT_SLOT( setEnabled( bool ) ) ); - - connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) ); + connect( mUseLowerLimit, TQ_SIGNAL( toggled( bool ) ), + mLowerLimit, TQ_SLOT( setEnabled( bool ) ) ); + connect( mUseUpperLimit, TQ_SIGNAL( toggled( bool ) ), + mUpperLimit, TQ_SLOT( setEnabled( bool ) ) ); + + connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) ); TDEAcceleratorManager::manage( this ); diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp index 4e32dc630..eccf470c2 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp @@ -111,9 +111,9 @@ void FancyPlotter::configureSettings() } mSettingsDialog->setSensors( list ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDialog, TQT_SIGNAL( okClicked() ), TQT_SLOT( applySettings() ) ); - connect( mSettingsDialog, TQT_SIGNAL( finished() ), TQT_SLOT( killDialog() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( okClicked() ), TQ_SLOT( applySettings() ) ); + connect( mSettingsDialog, TQ_SIGNAL( finished() ), TQ_SLOT( killDialog() ) ); mSettingsDialog->show(); } diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp index 447d9c718..7e7e15d7d 100644 --- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp +++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp @@ -257,30 +257,30 @@ FancyPlotterSettings::FancyPlotterSettings( TQWidget* parent, const char* name ) mMoveDownButton->setEnabled( false ); pageLayout->addWidget( mMoveDownButton, 4, 1 ); - connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMinValue, - TQT_SLOT( setDisabled( bool ) ) ); - connect( mUseAutoRange, TQT_SIGNAL( toggled( bool ) ), mMaxValue, - TQT_SLOT( setDisabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesDistance, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesScroll, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowVerticalLines, TQT_SIGNAL( toggled( bool ) ), mVerticalLinesColor, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesCount, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mHorizontalLinesColor, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mShowHorizontalLines, TQT_SIGNAL( toggled( bool ) ), mShowLabels, - TQT_SLOT( setEnabled( bool ) ) ); - connect( mSensorView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), - TQT_SLOT( selectionChanged( TQListViewItem* ) ) ); - - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editSensor() ) ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSensor() ) ); - connect( mMoveUpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveUpSensor() ) ); - connect( mMoveDownButton, TQT_SIGNAL( clicked() ), TQT_SLOT( moveDownSensor() ) ); - connect ( mSensorView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQT_SLOT(editSensor())); + connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMinValue, + TQ_SLOT( setDisabled( bool ) ) ); + connect( mUseAutoRange, TQ_SIGNAL( toggled( bool ) ), mMaxValue, + TQ_SLOT( setDisabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesDistance, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesScroll, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowVerticalLines, TQ_SIGNAL( toggled( bool ) ), mVerticalLinesColor, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesCount, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mHorizontalLinesColor, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mShowHorizontalLines, TQ_SIGNAL( toggled( bool ) ), mShowLabels, + TQ_SLOT( setEnabled( bool ) ) ); + connect( mSensorView, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ), + TQ_SLOT( selectionChanged( TQListViewItem* ) ) ); + + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editSensor() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSensor() ) ); + connect( mMoveUpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveUpSensor() ) ); + connect( mMoveDownButton, TQ_SIGNAL( clicked() ), TQ_SLOT( moveDownSensor() ) ); + connect ( mSensorView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), TQ_SLOT(editSensor())); TDEAcceleratorManager::manage( this ); } diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cpp b/ksysguard/gui/SensorDisplayLib/ListView.cpp index 5b748e9c0..828832668 100644 --- a/ksysguard/gui/SensorDisplayLib/ListView.cpp +++ b/ksysguard/gui/SensorDisplayLib/ListView.cpp @@ -329,7 +329,7 @@ ListView::configureSettings() { lvs = new ListViewSettings(this, "ListViewSettings"); TQ_CHECK_PTR(lvs); - connect(lvs, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); + connect(lvs, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings())); TQColorGroup colorGroup = monitor->colorGroup(); lvs->setGridColor(colorGroup.color(TQColorGroup::Link)); diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cpp b/ksysguard/gui/SensorDisplayLib/LogFile.cpp index 763953163..c92594fa6 100644 --- a/ksysguard/gui/SensorDisplayLib/LogFile.cpp +++ b/ksysguard/gui/SensorDisplayLib/LogFile.cpp @@ -92,16 +92,16 @@ void LogFile::configureSettings(void) lfs->ruleList->insertStringList(filterRules); lfs->title->setText(title()); - connect(lfs->okButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(accept())); - connect(lfs->applyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(applySettings())); - connect(lfs->cancelButton, TQT_SIGNAL(clicked()), lfs, TQT_SLOT(reject())); - - connect(lfs->fontButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsFontSelection())); - connect(lfs->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsAddRule())); - connect(lfs->deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsDeleteRule())); - connect(lfs->changeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(settingsChangeRule())); - connect(lfs->ruleList, TQT_SIGNAL(selected(int)), this, TQT_SLOT(settingsRuleListSelected(int))); - connect(lfs->ruleText, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(settingsAddRule())); + connect(lfs->okButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(accept())); + connect(lfs->applyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(applySettings())); + connect(lfs->cancelButton, TQ_SIGNAL(clicked()), lfs, TQ_SLOT(reject())); + + connect(lfs->fontButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsFontSelection())); + connect(lfs->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsAddRule())); + connect(lfs->deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsDeleteRule())); + connect(lfs->changeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(settingsChangeRule())); + connect(lfs->ruleList, TQ_SIGNAL(selected(int)), this, TQ_SLOT(settingsRuleListSelected(int))); + connect(lfs->ruleText, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(settingsAddRule())); if (lfs->exec()) { applySettings(); diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp index 111c4787b..382b6cb13 100644 --- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp +++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp @@ -202,7 +202,7 @@ MultiMeter::configureSettings() mms->setAlarmDigitColor(alarmDigitColor); mms->setMeterBackgroundColor(lcd->backgroundColor()); - connect(mms, TQT_SIGNAL(applyClicked()), TQT_SLOT(applySettings())); + connect(mms, TQ_SIGNAL(applyClicked()), TQ_SLOT(applySettings())); if (mms->exec()) applySettings(); diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp index 91851d113..cb4579031 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cpp +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp @@ -81,12 +81,12 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T pListSearchLine = new TDEListViewSearchLineWidget(pList, this, "process_list_search_line"); gmSearch->addWidget(pListSearchLine, 1); - connect(pList, TQT_SIGNAL(killProcess(int, int)), - this, TQT_SLOT(killProcess(int, int))); - connect(pList, TQT_SIGNAL(reniceProcess(const TQValueList<int> &, int)), - this, TQT_SLOT(reniceProcess(const TQValueList<int> &, int))); - connect(pList, TQT_SIGNAL(listModified(bool)), - this, TQT_SLOT(setModified(bool))); + connect(pList, TQ_SIGNAL(killProcess(int, int)), + this, TQ_SLOT(killProcess(int, int))); + connect(pList, TQ_SIGNAL(reniceProcess(const TQValueList<int> &, int)), + this, TQ_SLOT(reniceProcess(const TQValueList<int> &, int))); + connect(pList, TQ_SIGNAL(listModified(bool)), + this, TQ_SLOT(setModified(bool))); /* Create the combo box to configure the process filter. The * cbFilter must be created prior to constructing pList as the @@ -103,27 +103,27 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T xbTreeView = new TQCheckBox(i18n("&Tree View"), this, "xbTreeView"); TQ_CHECK_PTR(xbTreeView); xbTreeView->setMinimumSize(xbTreeView->sizeHint()); - connect(xbTreeView, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setTreeView(bool))); + connect(xbTreeView, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setTreeView(bool))); /* When the both cbFilter and pList are constructed we can connect the * missing link. */ - connect(cbFilter, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(filterModeChanged(int))); + connect(cbFilter, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(filterModeChanged(int))); // Create the 'Refresh' button. bRefresh = new KPushButton( KGuiItem( i18n( "&Refresh" ), "reload" ), this, "bRefresh" ); TQ_CHECK_PTR(bRefresh); bRefresh->setMinimumSize(bRefresh->sizeHint()); - connect(bRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateList())); + connect(bRefresh, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateList())); // Create the 'Kill' button. bKill = new KPushButton(i18n("&Kill"), this, "bKill"); TQ_CHECK_PTR(bKill); bKill->setMinimumSize(bKill->sizeHint()); - connect(bKill, TQT_SIGNAL(clicked()), this, TQT_SLOT(killProcess())); + connect(bKill, TQ_SIGNAL(clicked()), this, TQ_SLOT(killProcess())); /* Disable the kill button until we know that the daemon supports the * kill command. */ bKill->setEnabled(false); @@ -154,7 +154,7 @@ ProcessController::ProcessController(TQWidget* parent, const char* name, const T void ProcessController::setSearchFocus() { //stupid search line widget. See rant in fixTabOrder if(!pListSearchLine->searchLine()) - TQTimer::singleShot(100, this, TQT_SLOT(setSearchFocus())); + TQTimer::singleShot(100, this, TQ_SLOT(setSearchFocus())); else { pListSearchLine->searchLine()->setFocus(); } @@ -167,7 +167,7 @@ void ProcessController::fixTabOrder() { // //Did i mention I hate this? if(!pListSearchLine->searchLine()) - TQTimer::singleShot(100, this, TQT_SLOT(fixTabOrder())); + TQTimer::singleShot(100, this, TQ_SLOT(fixTabOrder())); else { setTabOrder(pListSearchLine->searchLine(), cbFilter); setTabOrder(cbFilter, pList); @@ -224,7 +224,7 @@ ProcessController::killProcess(int pid, int sig) if ( !timerOn() ) // give ksysguardd time to update its proccess list - TQTimer::singleShot(3000, this, TQT_SLOT(updateList())); + TQTimer::singleShot(3000, this, TQ_SLOT(updateList())); else updateList(); } @@ -274,7 +274,7 @@ ProcessController::killProcess() if ( !timerOn()) // give ksysguardd time to update its proccess list - TQTimer::singleShot(3000, this, TQT_SLOT(updateList())); + TQTimer::singleShot(3000, this, TQ_SLOT(updateList())); else updateList(); } diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cpp b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp index 9293ef6a0..b7e8b0c72 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessList.cpp +++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp @@ -221,19 +221,19 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) /* The filter mode is controlled by a combo box of the parent. If * the mode is changed we get a signal. */ - connect(parent, TQT_SIGNAL(setFilterMode(int)), - this, TQT_SLOT(setFilterMode(int))); + connect(parent, TQ_SIGNAL(setFilterMode(int)), + this, TQ_SLOT(setFilterMode(int))); /* We need to catch this signal to show various popup menues. */ connect(this, - TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), + TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)), this, - TQT_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int))); + TQ_SLOT(handleRMBPressed(TQListViewItem*, const TQPoint&, int))); /* Since Qt does not tell us the sorting details we have to do our * own bookkeping, so we can save and restore the sorting * settings. */ - connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(sortingChanged(int))); + connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(sortingChanged(int))); ctrlKeyDown = false; shiftKeyDown = false; @@ -260,10 +260,10 @@ ProcessList::ProcessList(TQWidget *parent, const char* name) headerPM->insertItem(i18n("Add Column"), HEADER_ADD); headerPM->insertItem(i18n("Help on Column"), HEADER_HELP); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(sizeChanged(int, int, int))); - connect(header(), TQT_SIGNAL(indexChange(int, int, int)), - this, TQT_SLOT(indexChanged(int, int, int))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(sizeChanged(int, int, int))); + connect(header(), TQ_SIGNAL(indexChange(int, int, int)), + this, TQ_SLOT(indexChanged(int, int, int))); killSupported = false; setModified(false); diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp index 9cdf1f507..63cee160b 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp @@ -146,7 +146,7 @@ SensorLogger::SensorLogger(TQWidget *parent, const char *name, const TQString& t monitor->setPalette(TQPalette(cgroup, cgroup, cgroup)); monitor->setSelectionMode(TQListView::NoSelection); - connect(monitor, TQT_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int))); + connect(monitor, TQ_SIGNAL(rightButtonClicked(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(RMBClicked(TQListViewItem*, const TQPoint&, int))); setTitle(i18n("Sensor Logger")); @@ -237,7 +237,7 @@ SensorLogger::configureSettings() sls = new SensorLoggerSettings(this, "SensorLoggerSettings"); TQ_CHECK_PTR(sls); - connect( sls, TQT_SIGNAL( applyClicked() ), TQT_SLOT( applySettings() ) ); + connect( sls, TQ_SIGNAL( applyClicked() ), TQ_SLOT( applySettings() ) ); sls->setTitle(title()); sls->setForegroundColor(cgroup.text()); diff --git a/ksysguard/gui/WorkSheet.cpp b/ksysguard/gui/WorkSheet.cpp index d465a998d..2b0bc76dd 100644 --- a/ksysguard/gui/WorkSheet.cpp +++ b/ksysguard/gui/WorkSheet.cpp @@ -518,10 +518,10 @@ void WorkSheet::replaceDisplay( uint row, uint column, KSGRD::SensorDisplay* new mDisplayList[ row ][ column ] = newDisplay; if ( mDisplayList[ row ][ column ]->useGlobalUpdateInterval() ) mDisplayList[ row ][ column ]->setUpdateInterval( updateInterval() ); - connect( newDisplay, TQT_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ), - TQT_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) ); - connect( newDisplay, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( setModified( bool ) ) ); + connect( newDisplay, TQ_SIGNAL( showPopupMenu( KSGRD::SensorDisplay* ) ), + TQ_SLOT( showPopupMenu( KSGRD::SensorDisplay* ) ) ); + connect( newDisplay, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( setModified( bool ) ) ); } diff --git a/ksysguard/gui/Workspace.cpp b/ksysguard/gui/Workspace.cpp index c5e622248..9aa511884 100644 --- a/ksysguard/gui/Workspace.cpp +++ b/ksysguard/gui/Workspace.cpp @@ -47,8 +47,8 @@ Workspace::Workspace( TQWidget* parent, const char* name ) mSheetList.setAutoDelete( true ); mAutoSave = true; - connect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); TQWhatsThis::add( this, i18n( "This is your work space. It holds your worksheets. You need " "to create a new worksheet (Menu File->New) before " @@ -62,8 +62,8 @@ Workspace::~Workspace() * administration data is already deleted but slots are still * being triggered. TODO: I need to ask the Trolls about this. */ - disconnect( this, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, - TQT_SLOT( updateCaption( TQWidget* ) ) ); + disconnect( this, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, + TQ_SLOT( updateCaption( TQWidget* ) ) ); } void Workspace::saveProperties( TDEConfig *cfg ) @@ -148,10 +148,10 @@ void Workspace::newWorkSheet() insertTab( sheet, dlg.sheetTitle() ); mSheetList.append( sheet ); showPage( sheet ); - connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); - connect( sheet, TQT_SIGNAL( titleChanged( TQWidget* ) ), - TQT_SLOT( updateSheetTitle( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( titleChanged( TQWidget* ) ), + TQ_SLOT( updateSheetTitle( TQWidget* ) ) ); } } @@ -370,8 +370,8 @@ WorkSheet *Workspace::restoreWorkSheet( const TQString &fileName, const TQString } mSheetList.append( sheet ); - connect( sheet, TQT_SIGNAL( sheetModified( TQWidget* ) ), - TQT_SLOT( updateCaption( TQWidget* ) ) ); + connect( sheet, TQ_SIGNAL( sheetModified( TQWidget* ) ), + TQ_SLOT( updateCaption( TQWidget* ) ) ); /* Force the file name to be the new name. This also sets the modified * flag, so that the file will get saved on exit. */ diff --git a/ksysguard/gui/ksgrd/HostConnector.cpp b/ksysguard/gui/ksgrd/HostConnector.cpp index da3974ce9..9ff979965 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cpp +++ b/ksysguard/gui/ksgrd/HostConnector.cpp @@ -111,12 +111,12 @@ HostConnector::HostConnector( TQWidget *parent, const char *name ) layout->addMultiCellWidget( group, 1, 1, 0, 1 ); - connect( mUseCustom, TQT_SIGNAL( toggled( bool ) ), - mCommands, TQT_SLOT( setEnabled( bool ) ) ); - connect( mUseDaemon, TQT_SIGNAL( toggled( bool ) ), - mPort, TQT_SLOT( setEnabled( bool ) ) ); - connect( mHostNames->lineEdit(), TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotHostNameChanged( const TQString & ) ) ); + connect( mUseCustom, TQ_SIGNAL( toggled( bool ) ), + mCommands, TQ_SLOT( setEnabled( bool ) ) ); + connect( mUseDaemon, TQ_SIGNAL( toggled( bool ) ), + mPort, TQ_SLOT( setEnabled( bool ) ) ); + connect( mHostNames->lineEdit(), TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotHostNameChanged( const TQString & ) ) ); enableButtonOK( !mHostNames->lineEdit()->text().isEmpty() ); TDEAcceleratorManager::manage( this ); } diff --git a/ksysguard/gui/ksgrd/SensorManager.cpp b/ksysguard/gui/ksgrd/SensorManager.cpp index 237e73b23..1412df7d7 100644 --- a/ksysguard/gui/ksgrd/SensorManager.cpp +++ b/ksysguard/gui/ksgrd/SensorManager.cpp @@ -219,8 +219,8 @@ bool SensorManager::engage( const TQString &hostName, const TQString &shell, } mAgents.insert( hostName, agent ); - connect( agent, TQT_SIGNAL( reconfigure( const SensorAgent* ) ), - TQT_SLOT( reconfigure( const SensorAgent* ) ) ); + connect( agent, TQ_SIGNAL( reconfigure( const SensorAgent* ) ), + TQ_SLOT( reconfigure( const SensorAgent* ) ) ); emit update(); return true; diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.cpp b/ksysguard/gui/ksgrd/SensorShellAgent.cpp index 7e137ad56..c398be32f 100644 --- a/ksysguard/gui/ksgrd/SensorShellAgent.cpp +++ b/ksysguard/gui/ksgrd/SensorShellAgent.cpp @@ -55,14 +55,14 @@ bool SensorShellAgent::start( const TQString &host, const TQString &shell, mShell = shell; mCommand = command; - connect( mDaemon, TQT_SIGNAL( processExited( TDEProcess* ) ), - TQT_SLOT( daemonExited( TDEProcess* ) ) ); - connect( mDaemon, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - TQT_SLOT( msgRcvd( TDEProcess*, char*, int ) ) ); - connect( mDaemon, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - TQT_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) ); - connect( mDaemon, TQT_SIGNAL( wroteStdin( TDEProcess* ) ), - TQT_SLOT( msgSent( TDEProcess* ) ) ); + connect( mDaemon, TQ_SIGNAL( processExited( TDEProcess* ) ), + TQ_SLOT( daemonExited( TDEProcess* ) ) ); + connect( mDaemon, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + TQ_SLOT( msgRcvd( TDEProcess*, char*, int ) ) ); + connect( mDaemon, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + TQ_SLOT( errMsgRcvd( TDEProcess*, char*, int ) ) ); + connect( mDaemon, TQ_SIGNAL( wroteStdin( TDEProcess* ) ), + TQ_SLOT( msgSent( TDEProcess* ) ) ); TQString cmd; if ( !command.isEmpty() ) diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cpp b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp index 30c0cc7e9..ed52a5bd4 100644 --- a/ksysguard/gui/ksgrd/SensorSocketAgent.cpp +++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp @@ -34,10 +34,10 @@ using namespace KSGRD; SensorSocketAgent::SensorSocketAgent( SensorManager *sm ) : SensorAgent( sm ) { - connect( &mSocket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( error( int ) ) ); - connect( &mSocket, TQT_SIGNAL( bytesWritten( int ) ), TQT_SLOT( msgSent( int ) ) ); - connect( &mSocket, TQT_SIGNAL( readyRead() ), TQT_SLOT( msgRcvd() ) ); - connect( &mSocket, TQT_SIGNAL( closed() ), TQT_SLOT( connectionClosed() ) ); + connect( &mSocket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( error( int ) ) ); + connect( &mSocket, TQ_SIGNAL( bytesWritten( int ) ), TQ_SLOT( msgSent( int ) ) ); + connect( &mSocket, TQ_SIGNAL( readyRead() ), TQ_SLOT( msgRcvd() ) ); + connect( &mSocket, TQ_SIGNAL( closed() ), TQ_SLOT( connectionClosed() ) ); } SensorSocketAgent::~SensorSocketAgent() diff --git a/ksysguard/gui/ksgrd/StyleEngine.cpp b/ksysguard/gui/ksgrd/StyleEngine.cpp index ce3e3bd6b..0e7330741 100644 --- a/ksysguard/gui/ksgrd/StyleEngine.cpp +++ b/ksysguard/gui/ksgrd/StyleEngine.cpp @@ -143,8 +143,8 @@ void StyleEngine::configure() mSettingsDialog->setFontSize( mFontSize ); mSettingsDialog->setSensorColors( mSensorColors ); - connect( mSettingsDialog, TQT_SIGNAL( applyClicked() ), - this, TQT_SLOT( applyToWorksheet() ) ); + connect( mSettingsDialog, TQ_SIGNAL( applyClicked() ), + this, TQ_SLOT( applyToWorksheet() ) ); if ( mSettingsDialog->exec() ) apply(); diff --git a/ksysguard/gui/ksgrd/StyleSettings.cpp b/ksysguard/gui/ksgrd/StyleSettings.cpp index 71a18b713..f70a387b4 100644 --- a/ksysguard/gui/ksgrd/StyleSettings.cpp +++ b/ksysguard/gui/ksgrd/StyleSettings.cpp @@ -92,12 +92,12 @@ StyleSettings::StyleSettings( TQWidget *parent, const char *name ) mEditColorButton->setEnabled( false ); layout->addWidget( mEditColorButton, 0, 1, TQt::AlignTop ); - connect( mColorListBox, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ), - TQT_SLOT( selectionChanged( TQListBoxItem* ) ) ); - connect( mColorListBox, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - TQT_SLOT( editSensorColor() ) ); - connect( mEditColorButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( editSensorColor() ) ); + connect( mColorListBox, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ), + TQ_SLOT( selectionChanged( TQListBoxItem* ) ) ); + connect( mColorListBox, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + TQ_SLOT( editSensorColor() ) ); + connect( mEditColorButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( editSensorColor() ) ); TDEAcceleratorManager::manage( this ); } diff --git a/ksysguard/gui/ksgrd/TimerSettings.cpp b/ksysguard/gui/ksgrd/TimerSettings.cpp index 43e73ab90..4fa165f99 100644 --- a/ksysguard/gui/ksgrd/TimerSettings.cpp +++ b/ksysguard/gui/ksgrd/TimerSettings.cpp @@ -53,8 +53,8 @@ TimerSettings::TimerSettings( TQWidget *parent, const char *name ) mLabel->setBuddy( mInterval ); TQWhatsThis::add( mInterval, i18n( "All displays of the sheet are updated at the rate specified here." ) ); - connect( mUseGlobalUpdate, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( globalUpdateChanged( bool ) ) ); + connect( mUseGlobalUpdate, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( globalUpdateChanged( bool ) ) ); mUseGlobalUpdate->setChecked( true ); diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp index 2375cf8ee..65326d826 100644 --- a/ksysguard/gui/ksysguard.cpp +++ b/ksysguard/gui/ksysguard.cpp @@ -83,16 +83,16 @@ TopLevel::TopLevel( const char *name ) mSensorBrowser = new SensorBrowser( mSplitter, KSGRD::SensorMgr ); mServiceBrowser = new DNSSD::ServiceBrowser("_ksysguard._tcp", 0, true); - connect(mServiceBrowser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, - TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); + connect(mServiceBrowser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, + TQ_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); mWorkSpace = new Workspace( mSplitter ); - connect( mWorkSpace, TQT_SIGNAL( announceRecentURL( const KURL& ) ), - TQT_SLOT( registerRecentURL( const KURL& ) ) ); - connect( mWorkSpace, TQT_SIGNAL( setCaption( const TQString&, bool ) ), - TQT_SLOT( setCaption( const TQString&, bool ) ) ); - connect( KSGRD::Style, TQT_SIGNAL( applyStyleToWorksheet() ), mWorkSpace, - TQT_SLOT( applyStyle() ) ); + connect( mWorkSpace, TQ_SIGNAL( announceRecentURL( const KURL& ) ), + TQ_SLOT( registerRecentURL( const KURL& ) ) ); + connect( mWorkSpace, TQ_SIGNAL( setCaption( const TQString&, bool ) ), + TQ_SLOT( setCaption( const TQString&, bool ) ) ); + connect( KSGRD::Style, TQ_SIGNAL( applyStyleToWorksheet() ), mWorkSpace, + TQ_SLOT( applyStyle() ) ); /* Create the status bar. It displays some information about the * number of processes and the memory consumption of the local @@ -106,39 +106,39 @@ TopLevel::TopLevel( const char *name ) // create actions for menue entries new TDEAction( i18n( "&New Worksheet..." ), "tab_new", 0, mWorkSpace, - TQT_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); + TQ_SLOT( newWorkSheet() ), actionCollection(), "new_worksheet" ); new TDEAction( i18n( "Import Worksheet..." ), "document-open", 0, mWorkSpace, - TQT_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); + TQ_SLOT( loadWorkSheet() ), actionCollection(), "import_worksheet" ); mActionOpenRecent = new TDERecentFilesAction( i18n( "&Import Recent Worksheet" ),"document-open", 0, - mWorkSpace, TQT_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); + mWorkSpace, TQ_SLOT( loadWorkSheet( const KURL& ) ), actionCollection(), "recent_import_worksheet" ); new TDEAction( i18n( "&Remove Worksheet" ), "tab_remove", 0, mWorkSpace, - TQT_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); + TQ_SLOT( deleteWorkSheet() ), actionCollection(), "remove_worksheet" ); new TDEAction( i18n( "&Export Worksheet..." ), "document-save-as", 0, mWorkSpace, - TQT_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); + TQ_SLOT( saveWorkSheetAs() ), actionCollection(), "export_worksheet" ); - KStdAction::quit( this, TQT_SLOT( close() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( close() ), actionCollection() ); new TDEAction( i18n( "C&onnect Host..." ), "connect_established", 0, this, - TQT_SLOT( connectHost() ), actionCollection(), "connect_host" ); + TQ_SLOT( connectHost() ), actionCollection(), "connect_host" ); new TDEAction( i18n( "D&isconnect Host" ), "connect_no", 0, this, - TQT_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); + TQ_SLOT( disconnectHost() ), actionCollection(), "disconnect_host" ); -// KStdAction::cut( mWorkSpace, TQT_SLOT( cut() ), actionCollection() ); -// KStdAction::copy( mWorkSpace, TQT_SLOT( copy() ), actionCollection() ); -// KStdAction::paste( mWorkSpace, TQT_SLOT( paste() ), actionCollection() ); +// KStdAction::cut( mWorkSpace, TQ_SLOT( cut() ), actionCollection() ); +// KStdAction::copy( mWorkSpace, TQ_SLOT( copy() ), actionCollection() ); +// KStdAction::paste( mWorkSpace, TQ_SLOT( paste() ), actionCollection() ); new TDEAction( i18n( "&Worksheet Properties" ), "configure", 0, mWorkSpace, - TQT_SLOT( configure() ), actionCollection(), "configure_sheet" ); + TQ_SLOT( configure() ), actionCollection(), "configure_sheet" ); new TDEAction( i18n( "Load Standard Sheets" ), "document-revert", - 0, this, TQT_SLOT( resetWorkSheets() ), + 0, this, TQ_SLOT( resetWorkSheets() ), actionCollection(), "revert_all_worksheets" ); new TDEAction( i18n( "Configure &Style..." ), "colorize", 0, this, - TQT_SLOT( editStyle() ), actionCollection(), "configure_style" ); + TQ_SLOT( editStyle() ), actionCollection(), "configure_style" ); // TODO remove resize and fix so sizeHints() determines default size. if (!initialGeometrySet()) @@ -293,7 +293,7 @@ void TopLevel::initStatusBar() TDEToggleAction *sb = dynamic_cast<TDEToggleAction*>(action("options_show_statusbar")); if (sb) - connect(sb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateStatusBar())); + connect(sb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateStatusBar())); } void TopLevel::updateStatusBar() @@ -319,8 +319,8 @@ void TopLevel::editToolbars() { saveMainWindowSettings( kapp->config() ); KEditToolbar dlg( actionCollection() ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this, - TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQ_SIGNAL( newToolbarConfig() ), this, + TQ_SLOT( slotNewToolbarConfig() ) ); dlg.exec(); } diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index 298bc2eae..404e2a472 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -114,8 +114,8 @@ void KSysTrayCmd::setTargetWindow( WId w ) void KSysTrayCmd::setTargetWindow( const KWin::WindowInfo &info ) { - disconnect( twinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) ); - connect( twinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) ); + disconnect( twinmodule, TQ_SIGNAL(windowAdded(WId)), this, TQ_SLOT(windowAdded(WId)) ); + connect( twinmodule, TQ_SIGNAL(windowChanged(WId)), TQ_SLOT(windowChanged(WId)) ); win = info.win(); KWin::setSystemTrayWindowFor( winId(), win ); refresh(); @@ -179,9 +179,9 @@ bool KSysTrayCmd::startClient() { client = new KShellProcess(); *client << command; - connect( twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)) ); - connect( client, TQT_SIGNAL( processExited(TDEProcess *) ), - this, TQT_SLOT( clientExited() ) ); + connect( twinmodule, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId)) ); + connect( client, TQ_SIGNAL( processExited(TDEProcess *) ), + this, TQ_SLOT( clientExited() ) ); return client->start(); } diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index 0240b3d1b..f15b20309 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) app.dcopClient()->send("ksplash", "ksplash", "close()", TQByteArray()); // Close splash screen tipDialog->show(); - TQObject::connect(tqApp, TQT_SIGNAL(lastWindowClosed()), tqApp, TQT_SLOT(quit())); + TQObject::connect(tqApp, TQ_SIGNAL(lastWindowClosed()), tqApp, TQ_SLOT(quit())); app.setMainWidget(tipDialog); diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index 303c88541..d780400d6 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -110,48 +110,48 @@ LayoutConfig::LayoutConfig(TQWidget *parent, const char *name) widget = new LayoutConfigWidget(this, "widget"); main->addWidget(widget); - connect( widget->chkEnable, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed())); - connect( widget->chkShowSingle, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT(changed())); + connect( widget->chkEnable, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT(changed())); + connect( widget->chkShowSingle, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT(changed())); - connect( widget->comboHotkey, TQT_SIGNAL(activated(int)), this, TQT_SLOT(hotkeyComboChanged())); - connect( widget->comboHotkey, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateOptionsCommand())); - connect( widget->comboHotkey, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect( widget->comboModel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); + connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(hotkeyComboChanged())); + connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateOptionsCommand())); + connect( widget->comboHotkey, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect( widget->comboModel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); - connect( widget->listLayoutsSrc, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)), - this, TQT_SLOT(add())); - connect( widget->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - connect( widget->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect( widget->listLayoutsSrc, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&, int)), + this, TQ_SLOT(add())); + connect( widget->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(add())); + connect( widget->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove())); - connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect( widget->comboVariant, TQT_SIGNAL(activated(int)), this, TQT_SLOT(variantChanged())); - connect( widget->listLayoutsDst, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(layoutSelChanged(TQListViewItem *))); + connect( widget->comboVariant, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect( widget->comboVariant, TQ_SIGNAL(activated(int)), this, TQ_SLOT(variantChanged())); + connect( widget->listLayoutsDst, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(layoutSelChanged(TQListViewItem *))); - connect( widget->editDisplayName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(displayNameChanged(const TQString&))); + connect( widget->editDisplayName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(displayNameChanged(const TQString&))); widget->btnUp->setIconSet(SmallIconSet("1uparrow")); - connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect( widget->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp())); + connect( widget->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect( widget->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp())); widget->btnDown->setIconSet(SmallIconSet("1downarrow")); - connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect( widget->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown())); + connect( widget->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect( widget->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown())); - connect( widget->grpStyle, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed())); - connect( widget->grpSwitching, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed())); - connect( widget->grpLabel, TQT_SIGNAL( clicked( int ) ), TQT_SLOT(changed())); + connect( widget->grpStyle, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed())); + connect( widget->grpSwitching, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed())); + connect( widget->grpLabel, TQ_SIGNAL( clicked( int ) ), TQ_SLOT(changed())); - connect( widget->bgColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT(changed())); - connect( widget->fgColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT(changed())); - connect( widget->labelFont, TQT_SIGNAL( fontSelected(const TQFont&) ), this, TQT_SLOT(changed())); - connect( widget->chkLabelShadow, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT(changed())); - connect( widget->shColor, TQT_SIGNAL( changed(const TQColor&) ), this, TQT_SLOT(changed())); + connect( widget->bgColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed())); + connect( widget->fgColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed())); + connect( widget->labelFont, TQ_SIGNAL( fontSelected(const TQFont&) ), this, TQ_SLOT(changed())); + connect( widget->chkLabelShadow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT(changed())); + connect( widget->shColor, TQ_SIGNAL( changed(const TQColor&) ), this, TQ_SLOT(changed())); - connect( widget->chkEnableSticky, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed())); - connect( widget->spinStickyDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( widget->chkEnableSticky, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(changed())); + connect( widget->spinStickyDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); - connect(widget->chkEnableNotify, SIGNAL(toggled(bool)), SLOT(changed())); - connect(widget->chkNotifyUseKMilo, SIGNAL(toggled(bool)), SLOT(changed())); + connect(widget->chkEnableNotify, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(widget->chkNotifyUseKMilo, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); widget->listLayoutsSrc->setColumnText(LAYOUT_COLUMN_FLAG, ""); widget->listLayoutsDst->setColumnText(LAYOUT_COLUMN_FLAG, ""); @@ -668,13 +668,13 @@ TQWidget* LayoutConfig::makeOptionsTab() listView->setColumnText( 0, i18n( "Options" ) ); listView->clear(); - connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(changed())); - connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(resolveConflicts(TQListViewItem *))); - connect(listView, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(updateHotkeyCombo())); + connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(changed())); + connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(resolveConflicts(TQListViewItem *))); + connect(listView, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(updateHotkeyCombo())); - connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(changed())); - connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateOptionsCommand())); - connect(widget->xkbOptsMode, TQT_SIGNAL(released(int)), TQT_SLOT(updateHotkeyCombo())); + connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(changed())); + connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(updateOptionsCommand())); + connect(widget->xkbOptsMode, TQ_SIGNAL(released(int)), TQ_SLOT(updateHotkeyCombo())); //Create controllers for all options TQDictIterator<char> it(m_rules->options()); @@ -739,7 +739,7 @@ TQWidget* LayoutConfig::makeOptionsTab() TQWidget* LayoutConfig::makeShortcutsTab() { m_keyChooser = new KKeyChooser(keys, widget->tabShortcuts, false, false); - connect(m_keyChooser, SIGNAL(keyChange()), this, SLOT(changed())); + connect(m_keyChooser, TQ_SIGNAL(keyChange()), this, TQ_SLOT(changed())); widget->tabShortcuts->layout()->add(m_keyChooser); return m_keyChooser; } diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp index 358d10450..6c7caa36e 100644 --- a/kxkb/kcmmisc.cpp +++ b/kxkb/kcmmisc.cpp @@ -71,14 +71,14 @@ KeyboardConfig::KeyboardConfig (TQWidget * parent, const char *) ui->rateSlider->setSteps(50, 500); ui->rateSlider->setTickInterval(500); - connect(ui->repeatBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(ui->delay, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySpinboxChanged(int))); - connect(ui->delaySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(delaySliderChanged(int))); - connect(ui->rate, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(rateSpinboxChanged(double))); - connect(ui->rateSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rateSliderChanged(int))); - - connect(ui->click, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(ui->numlockGroup, TQT_SIGNAL(released(int)), this, TQT_SLOT(changed())); + connect(ui->repeatBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(ui->delay, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySpinboxChanged(int))); + connect(ui->delaySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(delaySliderChanged(int))); + connect(ui->rate, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(rateSpinboxChanged(double))); + connect(ui->rateSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rateSliderChanged(int))); + + connect(ui->click, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(ui->numlockGroup, TQ_SIGNAL(released(int)), this, TQ_SLOT(changed())); #if !defined(HAVE_XTEST) && !defined(HAVE_XKB) ui->numlockGroup->setDisabled( true ); diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 7a76a19e5..6a90aa0dd 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -73,7 +73,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) kdDebug() << "xkb initialization failed, exiting..." << endl; ::exit(1); } - connect(m_extension, TQT_SIGNAL(groupChanged(uint)), this, TQT_SLOT(slotGroupChanged(uint))); + connect(m_extension, TQ_SIGNAL(groupChanged(uint)), this, TQ_SLOT(slotGroupChanged(uint))); m_layoutOwnerMap = new LayoutMap(kxkbConfig); @@ -81,7 +81,7 @@ KXKBApp::KXKBApp(bool allowStyles, bool GUIenabled) keys = new TDEGlobalAccel(this); #include "kxkbbindings.cpp" - connect( this, TQT_SIGNAL(settingsChanged(int)), TQT_SLOT(slotSettingsChanged(int)) ); + connect( this, TQ_SIGNAL(settingsChanged(int)), TQ_SLOT(slotSettingsChanged(int)) ); addKipcEventMask( KIPC::SettingsChanged ); } @@ -132,7 +132,7 @@ bool KXKBApp::settingsRead() if( kWinModule == NULL ) { kWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP); - connect(kWinModule, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(windowChanged(WId))); + connect(kWinModule, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(windowChanged(WId))); } m_prevWinId = kWinModule->activeWindow(); kdDebug() << "Active window " << m_prevWinId << endl; @@ -174,8 +174,8 @@ void KXKBApp::initTray() // popupMenu->insertTitle( kapp->miniIcon(), kapp->caption() ); m_tray = new KxkbLabelController(sysTray, popupMenu); - connect(popupMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuActivated(int))); - connect(sysTray, TQT_SIGNAL(toggled()), this, TQT_SLOT(nextLayout())); + connect(popupMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuActivated(int))); + connect(sysTray, TQ_SIGNAL(toggled()), this, TQ_SLOT(nextLayout())); } m_tray->setShowFlag(kxkbConfig.m_showFlag); diff --git a/kxkb/kxkbbindings.cpp b/kxkb/kxkbbindings.cpp index 4662918f2..02da8a4ea 100644 --- a/kxkb/kxkbbindings.cpp +++ b/kxkb/kxkbbindings.cpp @@ -1,6 +1,6 @@ #ifndef NOSLOTS # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString(), key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString(), key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF( name, key3, key4, fnSlot ) \ keys->insert( name, i18n(name), TQString(), key3, key4, 0, 0 ) diff --git a/kxkb/kxkbtraywindow.cpp b/kxkb/kxkbtraywindow.cpp index d84c529c6..573b0b4ef 100644 --- a/kxkb/kxkbtraywindow.cpp +++ b/kxkb/kxkbtraywindow.cpp @@ -116,7 +116,7 @@ void KxkbLabelController::initLayoutList(const TQValueList<LayoutUnit>& layouts, /* if( index != -1 ) { //not first start menu->insertSeparator(); - TDEAction* quitAction = KStdAction::quit(this, TQT_SIGNAL(quitSelected()), actionCollection()); + TDEAction* quitAction = KStdAction::quit(this, TQ_SIGNAL(quitSelected()), actionCollection()); if (quitAction) quitAction->plug(menu); }*/ diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index eab4a4479..c0d5a4f38 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -186,9 +186,9 @@ void FaviconsModule::startDownload(const TQString &hostOrURL, bool isHost, const TDEIO::Job *job = TDEIO::get(iconURL, false, false); job->addMetaData(d->metaData); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); FaviconsModulePrivate::DownloadInfo download; download.hostOrURL = hostOrURL; download.isHost = isHost; @@ -202,7 +202,7 @@ void FaviconsModule::slotData(TDEIO::Job *job, const TQByteArray &data) if (oldSize > 0x10000) { d->killJobs.append(job); - TQTimer::singleShot(0, this, TQT_SLOT(slotKill())); + TQTimer::singleShot(0, this, TQ_SLOT(slotKill())); } download.iconData.resize(oldSize + data.size()); memcpy(download.iconData.data() + oldSize, data.data(), data.size()); diff --git a/libkonq/kivdirectoryoverlay.cpp b/libkonq/kivdirectoryoverlay.cpp index bb1b0d6c2..590747b9c 100644 --- a/libkonq/kivdirectoryoverlay.cpp +++ b/libkonq/kivdirectoryoverlay.cpp @@ -43,8 +43,8 @@ KIVDirectoryOverlay::KIVDirectoryOverlay(KFileIVI* directory) { m_lister = new KDirLister; m_lister->setAutoErrorHandlingEnabled(false, 0); - connect(m_lister, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted())); - connect(m_lister, TQT_SIGNAL(newItems( const KFileItemList& )), TQT_SLOT(slotNewItems( const KFileItemList& ))); + connect(m_lister, TQ_SIGNAL(completed()), TQ_SLOT(slotCompleted())); + connect(m_lister, TQ_SIGNAL(newItems( const KFileItemList& )), TQ_SLOT(slotNewItems( const KFileItemList& ))); m_lister->setShowingDotFiles(false); } m_directory = directory; diff --git a/libkonq/kivfreespaceoverlay.cpp b/libkonq/kivfreespaceoverlay.cpp index 0343a4ab6..d0cd82e7d 100644 --- a/libkonq/kivfreespaceoverlay.cpp +++ b/libkonq/kivfreespaceoverlay.cpp @@ -63,7 +63,7 @@ void KIVFreeSpaceOverlay::start() if ( !m_freespace->item()->isReadable() ) { emit finished(); } - TQTimer::singleShot(0, this, TQT_SLOT(slotDisplay())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDisplay())); } void KIVFreeSpaceOverlay::timerEvent(TQTimerEvent *) diff --git a/libkonq/knewmenu.cpp b/libkonq/knewmenu.cpp index 042bb4e92..4dc1070cb 100644 --- a/libkonq/knewmenu.cpp +++ b/libkonq/knewmenu.cpp @@ -238,7 +238,7 @@ void KNewMenu::fillMenu() // The best way to identify the "Create Directory", "Link to Location", "Link to Application" was the template if ( (*templ).templatePath.endsWith( "emptydir" ) ) { - TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewDir() ), + TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewDir() ), d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) ); act->setGroup( "KNewMenu" ); act->plug( popupMenu() ); @@ -248,7 +248,7 @@ void KNewMenu::fillMenu() } else { - TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQT_SLOT( slotNewFile() ), + TDEAction * act = new TDEAction( (*templ).text, (*templ).icon, 0, this, TQ_SLOT( slotNewFile() ), d->m_actionCollection, TQCString().sprintf("newmenu%d", i ) ); act->setGroup( "KNewMenu" ); @@ -302,12 +302,12 @@ void KNewMenu::slotFillTemplates() //kdDebug(1203) << "Templates resource dir: " << *it << endl; s_pDirWatch->addDir( *it ); } - connect ( s_pDirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - this, TQT_SLOT ( slotFillTemplates() ) ); - connect ( s_pDirWatch, TQT_SIGNAL( created( const TQString & ) ), - this, TQT_SLOT ( slotFillTemplates() ) ); - connect ( s_pDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), - this, TQT_SLOT ( slotFillTemplates() ) ); + connect ( s_pDirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + this, TQ_SLOT ( slotFillTemplates() ) ); + connect ( s_pDirWatch, TQ_SIGNAL( created( const TQString & ) ), + this, TQ_SLOT ( slotFillTemplates() ) ); + connect ( s_pDirWatch, TQ_SIGNAL( deleted( const TQString & ) ), + this, TQ_SLOT ( slotFillTemplates() ) ); // Ok, this doesn't cope with new dirs in TDEDIRS, but that's another story } s_templatesVersion++; @@ -468,11 +468,11 @@ void KNewMenu::slotNewFile() //kdDebug(1203) << "KNewMenu : TDEIO::copyAs( " << uSrc.url() << ", " << dest.url() << ")" << endl; TDEIO::CopyJob * job = TDEIO::copyAs( uSrc, dest ); job->setDefaultPermissions( true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if ( m_isURLDesktopFile ) - connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ), - TQT_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL&, const KURL& ) ), + TQ_SLOT( slotRenamed( TDEIO::Job *, const KURL&, const KURL& ) ) ); KURL::List lst; lst.append( uSrc ); (void)new KonqCommandRecorder( KonqCommand::COPY, lst, dest, job ); @@ -549,8 +549,8 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin label->setBuddy(m_leFileName); // please "scheck" style m_leFileName->setText( defaultName ); m_leFileName->setSelection(0, m_leFileName->text().length()); // autoselect - connect( m_leFileName, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotNameTextChanged(const TQString&)) ); + connect( m_leFileName, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotNameTextChanged(const TQString&)) ); // Second line: url TQHBox * urlBox = new TQHBox( plainPage() ); @@ -560,13 +560,13 @@ void KURLDesktopFileDlg::initDialog( const TQString& textFileName, const TQStrin m_urlRequester->setMode( KFile::File | KFile::Directory ); m_urlRequester->setMinimumWidth( m_urlRequester->sizeHint().width() * 3 ); - connect( m_urlRequester->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotURLTextChanged(const TQString&)) ); + connect( m_urlRequester->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotURLTextChanged(const TQString&)) ); label->setBuddy(m_urlRequester); // please "scheck" style m_urlRequester->setFocus(); enableButtonOK( !defaultName.isEmpty() && !defaultUrl.isEmpty() ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) ); m_fileNameEdited = false; } diff --git a/libkonq/konq_bgnddlg.cpp b/libkonq/konq_bgnddlg.cpp index f4c0c41a6..04a95f3b0 100644 --- a/libkonq/konq_bgnddlg.cpp +++ b/libkonq/konq_bgnddlg.cpp @@ -54,8 +54,8 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, groupLayout->setAlignment( TQt::AlignTop ); mainLayout->addWidget( m_buttonGroup ); - connect( m_buttonGroup, TQT_SIGNAL( clicked(int) ), - this, TQT_SLOT( slotBackgroundModeChanged() ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked(int) ), + this, TQ_SLOT( slotBackgroundModeChanged() ) ); // color m_radioColor = new TQRadioButton( i18n("Co&lor:"), m_buttonGroup ); @@ -65,8 +65,8 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, TQSizePolicy::Minimum ); groupLayout->addWidget( m_buttonColor, 0, 1 ); - connect( m_buttonColor, TQT_SIGNAL( changed( const TQColor& ) ), - this, TQT_SLOT( slotColorChanged() ) ); + connect( m_buttonColor, TQ_SIGNAL( changed( const TQColor& ) ), + this, TQ_SLOT( slotColorChanged() ) ); // picture m_radioPicture = new TQRadioButton( i18n("&Picture:"), m_buttonGroup ); @@ -75,10 +75,10 @@ KonqBgndDialog::KonqBgndDialog( TQWidget* parent, groupLayout->addMultiCellWidget( m_comboPicture, 1, 1, 1, 2 ); initPictures(); - connect( m_comboPicture->comboBox(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotPictureChanged() ) ); - connect( m_comboPicture, TQT_SIGNAL( urlSelected(const TQString &) ), - this, TQT_SLOT( slotPictureChanged() ) ); + connect( m_comboPicture->comboBox(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotPictureChanged() ) ); + connect( m_comboPicture, TQ_SIGNAL( urlSelected(const TQString &) ), + this, TQ_SLOT( slotPictureChanged() ) ); TQSpacerItem* spacer1 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); diff --git a/libkonq/konq_dirpart.cpp b/libkonq/konq_dirpart.cpp index 32e6acb7c..c4d90d5b7 100644 --- a/libkonq/konq_dirpart.cpp +++ b/libkonq/konq_dirpart.cpp @@ -133,12 +133,12 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) resetCount(); //m_bMultipleItemsSelected = false; - connect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardDataChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipboardDataChanged()) ); actionCollection()->setHighlightingEnabled( true ); - m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQT_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" ); - m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQT_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" ); + m_paIncIconSize = new TDEAction( i18n( "Enlarge Icons" ), "zoom-in", 0, this, TQ_SLOT( slotIncIconSize() ), actionCollection(), "incIconSize" ); + m_paDecIconSize = new TDEAction( i18n( "Shrink Icons" ), "zoom-out", 0, this, TQ_SLOT( slotDecIconSize() ), actionCollection(), "decIconSize" ); m_paDefaultIcons = new TDERadioAction( i18n( "&Default Size" ), 0, actionCollection(), "modedefault" ); d->aEnormousIcons = new TDERadioAction( i18n( "&Huge" ), 0, @@ -158,17 +158,17 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) d->aSmallMediumIcons->setExclusiveGroup( "ViewMode" ); m_paSmallIcons->setExclusiveGroup( "ViewMode" ); - connect( m_paDefaultIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) ); - connect( d->aEnormousIcons, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotIconSizeToggled( bool ) ) ); - connect( m_paHugeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) ); - connect( m_paLargeIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) ); - connect( m_paMediumIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) ); - connect( d->aSmallMediumIcons, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotIconSizeToggled( bool ) ) ); - connect( m_paSmallIcons, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotIconSizeToggled( bool ) ) ); - - connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) ); + connect( m_paDefaultIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) ); + connect( d->aEnormousIcons, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotIconSizeToggled( bool ) ) ); + connect( m_paHugeIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) ); + connect( m_paLargeIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) ); + connect( m_paMediumIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) ); + connect( d->aSmallMediumIcons, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotIconSizeToggled( bool ) ) ); + connect( m_paSmallIcons, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotIconSizeToggled( bool ) ) ); + + connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) ); #if 0 // Extract 6 icon sizes from the icon theme. // Use 16,22,32,48,64,128 as default. @@ -219,7 +219,7 @@ KonqDirPart::KonqDirPart( TQObject *parent, const char *name ) m_iIconSize[4] = TDEIcon::SizeHuge; // ... up to here - TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQT_SLOT( slotBackgroundSettings() ), + TDEAction *a = new TDEAction( i18n( "Configure Background..." ), "background", 0, this, TQ_SLOT( slotBackgroundSettings() ), actionCollection(), "bgsettings" ); a->setToolTip( i18n( "Allows choosing of background settings for this view" ) ); @@ -665,25 +665,25 @@ void KonqDirPart::setFindPart( KParts::ReadOnlyPart * part ) { assert(part); m_findPart = part; - connect( m_findPart, TQT_SIGNAL( started() ), - this, TQT_SLOT( slotStarted() ) ); - connect( m_findPart, TQT_SIGNAL( started() ), - this, TQT_SLOT( slotStartAnimationSearching() ) ); - connect( m_findPart, TQT_SIGNAL( clear() ), - this, TQT_SLOT( slotClear() ) ); - connect( m_findPart, TQT_SIGNAL( newItems( const KFileItemList & ) ), - this, TQT_SLOT( slotNewItems( const KFileItemList & ) ) ); - connect( m_findPart, TQT_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal - this, TQT_SLOT( slotCompleted() ) ); - connect( m_findPart, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotStopAnimationSearching() ) ); - connect( m_findPart, TQT_SIGNAL( canceled() ), - this, TQT_SLOT( slotCanceled() ) ); - connect( m_findPart, TQT_SIGNAL( canceled() ), - this, TQT_SLOT( slotStopAnimationSearching() ) ); - - connect( m_findPart, TQT_SIGNAL( findClosed() ), - this, TQT_SLOT( slotFindClosed() ) ); + connect( m_findPart, TQ_SIGNAL( started() ), + this, TQ_SLOT( slotStarted() ) ); + connect( m_findPart, TQ_SIGNAL( started() ), + this, TQ_SLOT( slotStartAnimationSearching() ) ); + connect( m_findPart, TQ_SIGNAL( clear() ), + this, TQ_SLOT( slotClear() ) ); + connect( m_findPart, TQ_SIGNAL( newItems( const KFileItemList & ) ), + this, TQ_SLOT( slotNewItems( const KFileItemList & ) ) ); + connect( m_findPart, TQ_SIGNAL( finished() ), // can't name it completed, it conflicts with a KROP signal + this, TQ_SLOT( slotCompleted() ) ); + connect( m_findPart, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotStopAnimationSearching() ) ); + connect( m_findPart, TQ_SIGNAL( canceled() ), + this, TQ_SLOT( slotCanceled() ) ); + connect( m_findPart, TQ_SIGNAL( canceled() ), + this, TQ_SLOT( slotStopAnimationSearching() ) ); + + connect( m_findPart, TQ_SIGNAL( findClosed() ), + this, TQ_SLOT( slotFindClosed() ) ); emit findOpened( this ); diff --git a/libkonq/konq_filetip.cpp b/libkonq/konq_filetip.cpp index 8ad1e0d6f..5bc3de86b 100644 --- a/libkonq/konq_filetip.cpp +++ b/libkonq/konq_filetip.cpp @@ -114,7 +114,7 @@ void KonqFileTip::setItem( KFileItem *item, const TQRect &rect, const TQPixmap * // Don't start immediately, because the user could move the mouse over another item // This avoids a quick sequence of started preview-jobs m_timer->disconnect( this ); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDelayed())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDelayed())); m_timer->start( 300, true ); } } @@ -234,7 +234,7 @@ void KonqFileTip::showTip() if ( text.isEmpty() ) return; m_timer->disconnect( this ); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideTip())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideTip())); m_timer->start( 15000, true ); m_textLabel->setText( text ); @@ -261,14 +261,14 @@ void KonqFileTip::startDelayed() oneItem.append( m_item ); m_previewJob = TDEIO::filePreview( oneItem, 256, 256, 64, 70, true, true, 0); - connect( m_previewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), - this, TQT_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); - connect( m_previewJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( gotPreviewResult() ) ); + connect( m_previewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), + this, TQ_SLOT( gotPreview( const KFileItem *, const TQPixmap & ) ) ); + connect( m_previewJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( gotPreviewResult() ) ); } m_timer->disconnect( this ); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(showTip())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(showTip())); m_timer->start( 400, true ); } diff --git a/libkonq/konq_historymgr.cpp b/libkonq/konq_historymgr.cpp index 25cfef345..ac6916c81 100644 --- a/libkonq/konq_historymgr.cpp +++ b/libkonq/konq_historymgr.cpp @@ -61,7 +61,7 @@ KonqHistoryManager::KonqHistoryManager( TQObject *parent, const char *name ) // and load the history loadHistory(); - connect( m_updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotEmitUpdated() )); + connect( m_updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotEmitUpdated() )); } diff --git a/libkonq/konq_iconviewwidget.cpp b/libkonq/konq_iconviewwidget.cpp index 3f785604e..09ed599fd 100644 --- a/libkonq/konq_iconviewwidget.cpp +++ b/libkonq/konq_iconviewwidget.cpp @@ -121,17 +121,17 @@ KonqIconViewWidget::KonqIconViewWidget( TQWidget * parent, const char * name, WF m_bSetGridX( !kdesktop ) /* No line breaking on the desktop */ { d = new KonqIconViewWidgetPrivate; - connect( this, TQT_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), - this, TQT_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) ); + connect( this, TQ_SIGNAL( dropped( TQDropEvent *, const TQValueList<TQIconDragItem> & ) ), + this, TQ_SLOT( slotDropped( TQDropEvent*, const TQValueList<TQIconDragItem> & ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); kapp->addKipcEventMask( KIPC::IconChanged ); - connect( kapp, TQT_SIGNAL(iconChanged(int)), TQT_SLOT(slotIconChanged(int)) ); - connect( this, TQT_SIGNAL(onItem(TQIconViewItem *)), TQT_SLOT(slotOnItem(TQIconViewItem *)) ); - connect( this, TQT_SIGNAL(onViewport()), TQT_SLOT(slotOnViewport()) ); - connect( this, TQT_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQT_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) ); + connect( kapp, TQ_SIGNAL(iconChanged(int)), TQ_SLOT(slotIconChanged(int)) ); + connect( this, TQ_SIGNAL(onItem(TQIconViewItem *)), TQ_SLOT(slotOnItem(TQIconViewItem *)) ); + connect( this, TQ_SIGNAL(onViewport()), TQ_SLOT(slotOnViewport()) ); + connect( this, TQ_SIGNAL(itemRenamed(TQIconViewItem *, const TQString &)), TQ_SLOT(slotItemRenamed(TQIconViewItem *, const TQString &)) ); m_pSettings = KonqFMSettings::settings(); // already needed in setItemTextPos(), calculateGridX() d->bBoostPreview = boostPreview(); @@ -284,7 +284,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) else { kdDebug(1203) << "we go ahead.." << endl; d->m_movieBlocked++; - TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation())); + TQTimer::singleShot(300, this, TQ_SLOT(slotReenableAnimation())); d->m_movie->restart(); d->m_movie->unpause(); } @@ -307,8 +307,8 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) } if (!hasPixmap && backgroundMode() != NoBackground) d->m_movie->setBackgroundColor( viewport()->backgroundColor() ); - d->m_movie->connectUpdate( this, TQT_SLOT( slotMovieUpdate(const TQRect &) ) ); - d->m_movie->connectStatus( this, TQT_SLOT( slotMovieStatus(int) ) ); + d->m_movie->connectUpdate( this, TQ_SLOT( slotMovieUpdate(const TQRect &) ) ); + d->m_movie->connectStatus( this, TQ_SLOT( slotMovieStatus(int) ) ); d->movieFileName = d->pActiveItem->mouseOverAnimation(); d->pActiveItem->setAnimated( true ); } @@ -356,7 +356,7 @@ void KonqIconViewWidget::slotOnItem( TQIconViewItem *_item ) if (!d->pSoundTimer) { d->pSoundTimer = new TQTimer(this); - connect(d->pSoundTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartSoundPreview())); + connect(d->pSoundTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotStartSoundPreview())); } if (d->pSoundTimer->isActive()) d->pSoundTimer->stop(); @@ -394,7 +394,7 @@ void KonqIconViewWidget::slotOnViewport() d->m_movie->pause(); d->m_movieBlocked++; kdDebug(1203) << "on viewport, blocking" << endl; - TQTimer::singleShot(300, this, TQT_SLOT(slotReenableAnimation())); + TQTimer::singleShot(300, this, TQ_SLOT(slotReenableAnimation())); } #endif d->pActiveItem->refreshIcon( true ); @@ -874,10 +874,10 @@ void KonqIconViewWidget::startImagePreview( const TQStringList &, bool force ) d->pPreviewJob = TDEIO::filePreview( items, size, size, iconSize, m_pSettings->textPreviewIconTransparency(), true /* scale */, true /* save */, &(d->previewSettings) ); - connect( d->pPreviewJob, TQT_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), - this, TQT_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) ); - connect( d->pPreviewJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotPreviewResult() ) ); + connect( d->pPreviewJob, TQ_SIGNAL( gotPreview( const KFileItem *, const TQPixmap & ) ), + this, TQ_SLOT( slotPreview( const KFileItem *, const TQPixmap & ) ) ); + connect( d->pPreviewJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotPreviewResult() ) ); } void KonqIconViewWidget::stopImagePreview() @@ -1386,7 +1386,7 @@ void KonqIconViewWidget::contentsMousePressEvent( TQMouseEvent *e ) if (!d->pActivateDoubleClick) { d->pActivateDoubleClick = new TQTimer(this); - connect(d->pActivateDoubleClick, TQT_SIGNAL(timeout()), this, TQT_SLOT(doubleClickTimeout())); + connect(d->pActivateDoubleClick, TQ_SIGNAL(timeout()), this, TQ_SLOT(doubleClickTimeout())); } if( d->pActivateDoubleClick->isActive () ) d->pActivateDoubleClick->stop(); diff --git a/libkonq/konq_operations.cpp b/libkonq/konq_operations.cpp index 0761fe246..0897cc2c1 100644 --- a/libkonq/konq_operations.cpp +++ b/libkonq/konq_operations.cpp @@ -221,8 +221,8 @@ void KonqOperations::_del( int method, const KURL::List & _selectedURLs, Confirm delete this; return; } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } else delete this; } @@ -231,8 +231,8 @@ void KonqOperations::_restoreTrashedItems( const KURL::List& urls ) { m_method = RESTORE; KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } bool KonqOperations::askDeleteConfirmation( const KURL::List & selectedURLs, int method, ConfirmationType confirmation, TQWidget* widget ) @@ -376,7 +376,7 @@ void KonqOperations::doDrop( const KFileItem * destItem, const KURL & dest, TQDr else { // we need to stat to get it. - op->_statURL( dest, op, TQT_SLOT( asyncDrop( const KFileItem * ) ) ); + op->_statURL( dest, op, TQ_SLOT( asyncDrop( const KFileItem * ) ) ); } // In both cases asyncDrop will delete op when done @@ -458,7 +458,7 @@ void KonqOperations::asyncDrop( const KFileItem * destItem ) bool ro = desktopFile.readBoolEntry( "ReadOnly", false ); TQString fstype = desktopFile.readEntry( "FSType" ); KAutoMount* am = new KAutoMount( ro, fstype, dev, point, m_destURL.path(), false ); - connect( am, TQT_SIGNAL( finished() ), this, TQT_SLOT( doFileCopy() ) ); + connect( am, TQ_SIGNAL( finished() ), this, TQ_SLOT( doFileCopy() ) ); } return; } @@ -658,16 +658,16 @@ void KonqOperations::setOperation( TDEIO::Job * job, int method, const KURL::Lis m_destURL = dest; if ( job ) { - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::CopyJob *copyJob = dynamic_cast<TDEIO::CopyJob*>(job); KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent()); if (copyJob && iconView) { - connect(copyJob, TQT_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)), - this, TQT_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &))); - connect(this, TQT_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)), - iconView, TQT_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &))); + connect(copyJob, TQ_SIGNAL(aboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &)), + this, TQ_SLOT(slotAboutToCreate(TDEIO::Job *,const TQValueList<TDEIO::CopyInfo> &))); + connect(this, TQ_SIGNAL(aboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &)), + iconView, TQ_SLOT(slotAboutToCreate(const TQPoint &, const TQValueList<TDEIO::CopyInfo> &))); } } else // for link @@ -688,10 +688,10 @@ void KonqOperations::statURL( const KURL & url, const TQObject *receiver, const void KonqOperations::_statURL( const KURL & url, const TQObject *receiver, const char *member ) { - connect( this, TQT_SIGNAL( statFinished( const KFileItem * ) ), receiver, member ); + connect( this, TQ_SIGNAL( statFinished( const KFileItem * ) ), receiver, member ); TDEIO::StatJob * job = TDEIO::stat( url /*, false?*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); } void KonqOperations::slotStatResult( TDEIO::Job * job ) @@ -763,7 +763,7 @@ KonqMultiRestoreJob::KonqMultiRestoreJob( const KURL::List& urls, bool showProgr m_urls( urls ), m_urlsIterator( m_urls.begin() ), m_progress( 0 ) { - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void KonqMultiRestoreJob::slotStart() diff --git a/libkonq/konq_popupmenu.cpp b/libkonq/konq_popupmenu.cpp index 4c90b651a..1728e83f4 100644 --- a/libkonq/konq_popupmenu.cpp +++ b/libkonq/konq_popupmenu.cpp @@ -287,7 +287,7 @@ int KonqPopupMenu::insertServices(const ServiceList& list, name.setNum( id ); name.prepend( isBuiltin ? "builtinservice_" : "userservice_" ); TDEAction * act = new TDEAction( TQString((*it).m_strName).replace('&',"&&"), 0, - this, TQT_SLOT( slotRunService() ), + this, TQ_SLOT( slotRunService() ), &m_ownActions, name ); if ( !(*it).m_strIcon.isEmpty() ) @@ -430,8 +430,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) d->localURLSlotFired = false; TDEIO::LocalURLJob* localURLJob = TDEIO::localURL(m_sViewURL); if (localURLJob) { - connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); - connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); + connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); + connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed())); while (!d->localURLSlotFired) { kapp->eventLoop()->enterLoop(); } @@ -501,7 +501,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( ((kpf & ShowNewWindow) != 0) && sReading && !isEncryptedMediaFile) { TQString openStr = isKDesktop ? i18n( "&Open" ) : i18n( "Open in New &Window" ); - TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQT_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); + TDEAction *actNewWindow = new TDEAction( openStr, "window-new", 0, this, TQ_SLOT( slotPopupNewView() ), &m_ownActions, "newview" ); actNewWindow->setToolTip( i18n( "Open item in a new window" ) ); addAction( actNewWindow ); addSeparator(); @@ -523,14 +523,14 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { if (d->m_itemFlags & KParts::BrowserExtension::ShowCreateDirectory) { - TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQT_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); + TDEAction *actNewDir = new TDEAction( i18n( "Create &Folder..." ), "folder-new", 0, this, TQ_SLOT( slotPopupNewDir() ), &m_ownActions, "newdir" ); addAction( actNewDir ); addSeparator(); } } } else if ( isIntoTrash ) { // Trashed item, offer restoring - act = new TDEAction( i18n( "&Restore" ), 0, this, TQT_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); + act = new TDEAction( i18n( "&Restore" ), 0, this, TQ_SLOT( slotPopupRestoreTrashedItems() ), &m_ownActions, "restore" ); addAction( act ); } @@ -598,7 +598,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) } if ( isCurrentTrash ) { - act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQT_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); + act = new TDEAction( i18n( "&Empty Trash Bin" ), "emptytrash", 0, this, TQ_SLOT( slotPopupEmptyTrashBin() ), &m_ownActions, "empytrash" ); KSimpleConfig trashConfig( "trashrc", true ); trashConfig.setGroup( "Status" ); act->setEnabled( !trashConfig.readBoolEntry( "Empty", true ) ); @@ -631,7 +631,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) else caption = i18n("&Bookmark This File"); - act = new TDEAction( caption, "bookmark_add", 0, this, TQT_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" ); + act = new TDEAction( caption, "bookmark_add", 0, this, TQ_SLOT( slotPopupAddToBookmark() ), &m_ownActions, "bookmark_add" ); if (m_lstItems.count() > 1) act->setEnabled(false); if (kapp->authorizeTDEAction("bookmarks")) @@ -915,7 +915,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) actionName = i18n( "Open with %1" ).arg( actionName ); act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0, - this, TQT_SLOT( slotRunService() ), + this, TQ_SLOT( slotRunService() ), &m_ownActions, nam.prepend( "appservice_" ) ); addAction( act, menu ); @@ -932,12 +932,12 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { openWithActionName = i18n( "&Open With..." ); } - TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); + TDEAction *openWithAct = new TDEAction( openWithActionName, 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); addAction( openWithAct, menu ); } else // no app offers -> Open With... { - act = new TDEAction( i18n( "&Open With..." ), 0, this, TQT_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); + act = new TDEAction( i18n( "&Open With..." ), 0, this, TQ_SLOT( slotPopupOpenWith() ), &m_ownActions, "openwith" ); addAction( act ); } @@ -991,7 +991,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( KPropertiesDialog::canDisplay( m_lstItems ) && (kpf & ShowProperties) ) { - act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQT_SLOT( slotPopupProperties() ), + act = new TDEAction( i18n( "&Properties" ), "edit", 0, this, TQ_SLOT( slotPopupProperties() ), &m_ownActions, "properties" ); addAction( act ); } @@ -1005,7 +1005,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) if ( KFileShare::authorization() == KFileShare::Authorized ) { addSeparator(); - act = new TDEAction( i18n("Share"), 0, this, TQT_SLOT( slotOpenShareFileDialog() ), + act = new TDEAction( i18n("Share"), 0, this, TQ_SLOT( slotOpenShareFileDialog() ), &m_ownActions, "sharefile" ); addAction( act ); } diff --git a/libkonq/konq_undo.cpp b/libkonq/konq_undo.cpp index 51d85587d..9272bbf5c 100644 --- a/libkonq/konq_undo.cpp +++ b/libkonq/konq_undo.cpp @@ -93,14 +93,14 @@ KonqCommandRecorder::KonqCommandRecorder( KonqCommand::Type op, const KURL::List d->m_cmd.m_valid = true; d->m_cmd.m_src = src; d->m_cmd.m_dst = dst; - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if ( op != KonqCommand::MKDIR ) { - connect( job, TQT_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ), - this, TQT_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) ); - connect( job, TQT_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ), - this, TQT_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) ); + connect( job, TQ_SIGNAL( copyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ), + this, TQ_SLOT( slotCopyingDone( TDEIO::Job *, const KURL &, const KURL &, bool, bool ) ) ); + connect( job, TQ_SIGNAL( copyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ), + this, TQ_SLOT( slotCopyingLinkDone( TDEIO::Job *, const KURL &, const TQString &, const KURL & ) ) ); } KonqUndoManager::incRef(); @@ -411,8 +411,8 @@ void KonqUndoManager::undoStep() undoRemovingDirectories(); if ( d->m_currentJob ) - connect( d->m_currentJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( d->m_currentJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void KonqUndoManager::undoMakingDirectories() diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 4a19140b5..2df8ed163 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -69,7 +69,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj) if (cfg.readBoolEntry("demandLoad", false)) { _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this)); _layout->addWidget(_button, 0, 0); - connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin())); + connect(_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadPlugin())); show(); } else { _button = 0L; @@ -80,7 +80,7 @@ void NSPluginInstance::init(const TQCString& app, const TQCString& obj) // and use 'resize_count' to wait for that one more resize to come (plus a timer // for a possible timeout). Only then flash is actually initialized ('inited' is true). resize_count = 1; - TQTimer::singleShot( 1000, this, TQT_SLOT( doLoadPlugin())); + TQTimer::singleShot( 1000, this, TQ_SLOT( doLoadPlugin())); } } @@ -203,8 +203,8 @@ NSPluginLoader::NSPluginLoader() // trap dcop register events kapp->dcopClient()->setNotifications(true); TQObject::connect(kapp->dcopClient(), - TQT_SIGNAL(applicationRegistered(const TQCString&)), - this, TQT_SLOT(applicationRegistered(const TQCString&))); + TQ_SIGNAL(applicationRegistered(const TQCString&)), + this, TQ_SLOT(applicationRegistered(const TQCString&))); // load configuration TDEConfig cfg("kcmnspluginrc", false); @@ -337,8 +337,8 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType) int pid = (int)getpid(); _dcopid.sprintf("nspluginviewer-%d", pid); - connect( _process, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(processTerminated(TDEProcess*)) ); + connect( _process, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(processTerminated(TDEProcess*)) ); // find the external viewer process TQString viewer = TDEGlobal::dirs()->findExe("nspluginviewer"); diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 93f4cac7d..3e5530f3a 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -217,7 +217,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject // Only create this if we have no parent since the parent part is // responsible for "Save As" then if (!parent || !parent->inherits("Part")) { - new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQT_SLOT(saveAs()), actionCollection(), "saveDocument"); + new TDEAction(i18n("&Save As..."), CTRL+Key_S, this, TQ_SLOT(saveAs()), actionCollection(), "saveDocument"); setXMLFile("nspluginpart.rc"); } @@ -232,8 +232,8 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject _canvas->setBackgroundMode( TQWidget::NoBackground ); setWidget(_canvas); _canvas->show(); - TQObject::connect( _canvas, TQT_SIGNAL(resized(int,int)), - this, TQT_SLOT(pluginResized(int,int)) ); + TQObject::connect( _canvas, TQ_SIGNAL(resized(int,int)), + this, TQ_SLOT(pluginResized(int,int)) ); } diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp index daccd1bcf..7ac24ee2c 100644 --- a/nsplugins/test/testnsplugin.cpp +++ b/nsplugins/test/testnsplugin.cpp @@ -44,9 +44,9 @@ TestNSPlugin::TestNSPlugin() m_layout = new TQHBoxLayout( m_client ); // file menu - KStdAction::openNew( this, TQT_SLOT(newView()), actionCollection()); - KStdAction::close( this, TQT_SLOT(closeView()), actionCollection()); - KStdAction::quit( kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew( this, TQ_SLOT(newView()), actionCollection()); + KStdAction::close( this, TQ_SLOT(closeView()), actionCollection()); + KStdAction::quit( kapp, TQ_SLOT(quit()), actionCollection()); createGUI( "testnspluginui.rc" ); } @@ -88,8 +88,8 @@ void TestNSPlugin::newView() if ( win ) { m_plugins.append( win ); - connect( win, TQT_SIGNAL(destroyed(NSPluginInstance *)), - this, TQT_SLOT(viewDestroyed(NSPluginInstance *)) ); + connect( win, TQ_SIGNAL(destroyed(NSPluginInstance *)), + this, TQ_SLOT(viewDestroyed(NSPluginInstance *)) ); m_layout->addWidget( win ); win->show(); } else diff --git a/nsplugins/viewer/glibevents.cpp b/nsplugins/viewer/glibevents.cpp index fe059d1ee..e8bc766a1 100644 --- a/nsplugins/viewer/glibevents.cpp +++ b/nsplugins/viewer/glibevents.cpp @@ -24,7 +24,7 @@ GlibEvents::GlibEvents() { g_main_context_ref( g_main_context_default()); - connect( &timer, TQT_SIGNAL( timeout()), TQT_SLOT( process())); + connect( &timer, TQ_SIGNAL( timeout()), TQ_SLOT( process())); // TODO Poll for now timer.start( 10 ); } diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp index 5b6b9267f..2495556e4 100644 --- a/nsplugins/viewer/nsplugin.cpp +++ b/nsplugins/viewer/nsplugin.cpp @@ -616,7 +616,7 @@ NSPluginInstance::NSPluginInstance(NPP privateData, NPPluginFuncs *pluginFuncs, memcpy(&_pluginFuncs, pluginFuncs, sizeof(_pluginFuncs)); _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) ); kdDebug(1431) << "NSPluginInstance::NSPluginInstance" << endl; kdDebug(1431) << "pdata = " << _npp->pdata << endl; @@ -809,8 +809,8 @@ void NSPluginInstance::timer() if (req.post) { // create stream NSPluginStream *s = new NSPluginStream( this ); - connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)), - TQT_SLOT(streamFinished(NSPluginStreamBase*)) ); + connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)), + TQ_SLOT(streamFinished(NSPluginStreamBase*)) ); _streams.append( s ); kdDebug() << "posting to " << url << endl; @@ -828,8 +828,8 @@ void NSPluginInstance::timer() } else { // create stream NSPluginStream *s = new NSPluginStream( this ); - connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)), - TQT_SLOT(streamFinished(NSPluginStreamBase*)) ); + connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)), + TQ_SLOT(streamFinished(NSPluginStreamBase*)) ); _streams.append( s ); kdDebug() << "getting " << url << endl; @@ -1026,8 +1026,8 @@ void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) { Request *req = i.data(); _jsrequests.remove( i ); NSPluginStream *s = new NSPluginStream( this ); - connect( s, TQT_SIGNAL(finished(NSPluginStreamBase*)), - TQT_SLOT(streamFinished(NSPluginStreamBase*)) ); + connect( s, TQ_SIGNAL(finished(NSPluginStreamBase*)), + TQ_SLOT(streamFinished(NSPluginStreamBase*)) ); _streams.append( s ); int len = result.length(); @@ -1254,9 +1254,9 @@ NSPluginViewer::NSPluginViewer( TQCString dcopId, { _classes.setAutoDelete( true ); connect(TDEApplication::dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(appUnregistered(const TQCString&))); + TQ_SLOT(appUnregistered(const TQCString&))); } @@ -1348,7 +1348,7 @@ NSPluginClass::NSPluginClass( const TQString &library, _NP_Shutdown = 0; _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL(timeout()), TQT_SLOT(timer()) ); + connect( _timer, TQ_SIGNAL(timeout()), TQ_SLOT(timer()) ); // check lib handle if (!_handle) { @@ -1832,7 +1832,7 @@ NSPluginBufStream::NSPluginBufStream( class NSPluginInstance *instance ) : NSPluginStreamBase( instance ) { _timer = new TQTimer( this ); - connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timer()) ); + connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timer()) ); } @@ -1878,7 +1878,7 @@ NSPluginStream::NSPluginStream( NSPluginInstance *instance ) : NSPluginStreamBase( instance ), _job(0) { _resumeTimer = new TQTimer( this ); - connect(_resumeTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(resume())); + connect(_resumeTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(resume())); } @@ -1902,15 +1902,15 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType, if (reload) { _job->addMetaData("cache", "reload"); } - connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(data(TDEIO::Job *, const TQByteArray &))); - connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *))); - connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), - TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); - connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - TQT_SLOT(mimetype(TDEIO::Job *, const TQString &))); - connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), - TQT_SLOT(redirection(TDEIO::Job *, const KURL&))); + connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(data(TDEIO::Job *, const TQByteArray &))); + connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *))); + connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), + TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + TQ_SLOT(mimetype(TDEIO::Job *, const TQString &))); + connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQ_SLOT(redirection(TDEIO::Job *, const KURL&))); } return false; @@ -1928,15 +1928,15 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data, _job->addMetaData("errorPage", "false"); _job->addMetaData("PropagateHttpHeader", "true"); _job->addMetaData("AllowCompressedPage", "false"); - connect(_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(data(TDEIO::Job *, const TQByteArray &))); - connect(_job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(result(TDEIO::Job *))); - connect(_job, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), - TQT_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); - connect(_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - TQT_SLOT(mimetype(TDEIO::Job *, const TQString &))); - connect(_job, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL&)), - TQT_SLOT(redirection(TDEIO::Job *, const KURL&))); + connect(_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(data(TDEIO::Job *, const TQByteArray &))); + connect(_job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(result(TDEIO::Job *))); + connect(_job, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t )), + TQ_SLOT(totalSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + TQ_SLOT(mimetype(TDEIO::Job *, const TQString &))); + connect(_job, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL&)), + TQ_SLOT(redirection(TDEIO::Job *, const KURL&))); } return false; diff --git a/tdedebugdialog/kabstractdebugdialog.cpp b/tdedebugdialog/kabstractdebugdialog.cpp index 10c0c2a00..d7c84a499 100644 --- a/tdedebugdialog/kabstractdebugdialog.cpp +++ b/tdedebugdialog/kabstractdebugdialog.cpp @@ -64,10 +64,10 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout ) pApplyButton->setFixedWidth( w4 ); pCancelButton->setFixedWidth( w4 ); - connect( pHelpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowHelp() ) ); - connect( pOKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) ); - connect( pApplyButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotApply() ) ); - connect( pCancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( pHelpButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotShowHelp() ) ); + connect( pOKButton, TQ_SIGNAL( clicked() ), TQ_SLOT( accept() ) ); + connect( pApplyButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotApply() ) ); + connect( pCancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) ); } void KAbstractDebugDialog::slotShowHelp() diff --git a/tdedebugdialog/tdedebugdialog.cpp b/tdedebugdialog/tdedebugdialog.cpp index b5ced18a0..6a1043345 100644 --- a/tdedebugdialog/tdedebugdialog.cpp +++ b/tdedebugdialog/tdedebugdialog.cpp @@ -79,8 +79,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c pInfoLabel1 = new TQLabel( i18n("Output to:"), pInfoGroup ); vbox->addWidget( pInfoLabel1 ); pInfoCombo = new TQComboBox( false, pInfoGroup ); - connect(pInfoCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDestinationChanged(int))); + connect(pInfoCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDestinationChanged(int))); vbox->addWidget( pInfoCombo ); pInfoCombo->insertStringList( destList ); pInfoLabel2 = new TQLabel( i18n("Filename:"), pInfoGroup ); @@ -104,8 +104,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c pWarnLabel1 = new TQLabel( i18n("Output to:"), pWarnGroup ); vbox->addWidget( pWarnLabel1 ); pWarnCombo = new TQComboBox( false, pWarnGroup ); - connect(pWarnCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDestinationChanged(int))); + connect(pWarnCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDestinationChanged(int))); vbox->addWidget( pWarnCombo ); pWarnCombo->insertStringList( destList ); pWarnLabel2 = new TQLabel( i18n("Filename:"), pWarnGroup ); @@ -129,8 +129,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c pErrorLabel1 = new TQLabel( i18n("Output to:"), pErrorGroup ); vbox->addWidget( pErrorLabel1 ); pErrorCombo = new TQComboBox( false, pErrorGroup ); - connect(pErrorCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDestinationChanged(int))); + connect(pErrorCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDestinationChanged(int))); vbox->addWidget( pErrorCombo ); pErrorCombo->insertStringList( destList ); pErrorLabel2 = new TQLabel( i18n("Filename:"), pErrorGroup ); @@ -154,8 +154,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c pFatalLabel1 = new TQLabel( i18n("Output to:"), pFatalGroup ); vbox->addWidget( pFatalLabel1 ); pFatalCombo = new TQComboBox( false, pFatalGroup ); - connect(pFatalCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotDestinationChanged(int))); + connect(pFatalCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotDestinationChanged(int))); vbox->addWidget( pFatalCombo ); pFatalCombo->insertStringList( destList ); pFatalLabel2 = new TQLabel( i18n("Filename:"), pFatalGroup ); @@ -179,8 +179,8 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c buildButtons( topLayout ); - connect( pDebugAreas, TQT_SIGNAL( activated( const TQString &) ), - TQT_SLOT( slotDebugAreaChanged( const TQString & ) ) ); + connect( pDebugAreas, TQ_SIGNAL( activated( const TQString &) ), + TQ_SLOT( slotDebugAreaChanged( const TQString & ) ) ); // Get initial values ("initial" is understood by the slot) slotDebugAreaChanged( "0 initial" ); diff --git a/tdedebugdialog/tdelistdebugdialog.cpp b/tdedebugdialog/tdelistdebugdialog.cpp index d447b3747..4c3bb9f0e 100644 --- a/tdedebugdialog/tdelistdebugdialog.cpp +++ b/tdedebugdialog/tdelistdebugdialog.cpp @@ -40,8 +40,8 @@ TDEListDebugDialog::TDEListDebugDialog( TQStringList areaList, TQWidget *parent, m_incrSearch = new KLineEdit( this ); lay->addWidget( m_incrSearch ); - connect( m_incrSearch, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( generateCheckBoxes( const TQString& ) ) ); + connect( m_incrSearch, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( generateCheckBoxes( const TQString& ) ) ); TQScrollView * scrollView = new TQScrollView( this ); scrollView->setResizePolicy( TQScrollView::AutoOneFit ); @@ -58,8 +58,8 @@ TDEListDebugDialog::TDEListDebugDialog( TQStringList areaList, TQWidget *parent, selectButs->addWidget( all ); selectButs->addWidget( none ); - connect( all, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectAll() ) ); - connect( none, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deSelectAll() ) ); + connect( all, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectAll() ) ); + connect( none, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deSelectAll() ) ); buildButtons( lay ); resize( 350, 400 ); diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp index 1b36daaae..456c9d45f 100644 --- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp @@ -57,11 +57,11 @@ KCMCgi::KCMCgi(TQWidget *parent, const char *name) buttonBox->setSpacing( KDialog::spacingHint() ); mAddButton = new TQPushButton( i18n("Add..."), buttonBox ); - connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addPath() ) ); + connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addPath() ) ); mRemoveButton = new TQPushButton( i18n("Remove"), buttonBox ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removePath() ) ); - connect( mListBox, TQT_SIGNAL( clicked ( TQListBoxItem * )),this, TQT_SLOT( slotItemSelected( TQListBoxItem *))); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removePath() ) ); + connect( mListBox, TQ_SIGNAL( clicked ( TQListBoxItem * )),this, TQ_SLOT( slotItemSelected( TQListBoxItem *))); mConfig = new TDEConfig("kcmcgirc"); diff --git a/tdeioslave/finger/tdeio_finger.cpp b/tdeioslave/finger/tdeio_finger.cpp index 643a699f0..621d33301 100644 --- a/tdeioslave/finger/tdeio_finger.cpp +++ b/tdeioslave/finger/tdeio_finger.cpp @@ -126,10 +126,10 @@ void FingerProtocol::get(const KURL& url ) << *myFingerPath << *myFingerCSSFile << refreshRate << myURL->host() << myURL->user() ; - connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); - //connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - // this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + //connect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + // this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); diff --git a/tdeioslave/home/homeimpl.cpp b/tdeioslave/home/homeimpl.cpp index ea3dad520..8967e5ea4 100644 --- a/tdeioslave/home/homeimpl.cpp +++ b/tdeioslave/home/homeimpl.cpp @@ -193,8 +193,8 @@ TDEIO::UDSEntry HomeImpl::extractUrlInfos(const KURL &url) m_entryBuffer.clear(); TDEIO::StatJob *job = TDEIO::stat(url, false); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotStatResult(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); TDEIO::UDSEntry::iterator it = m_entryBuffer.begin(); diff --git a/tdeioslave/mac/tdeio_mac.cpp b/tdeioslave/mac/tdeio_mac.cpp index caef50784..d116ef909 100644 --- a/tdeioslave/mac/tdeio_mac.cpp +++ b/tdeioslave/mac/tdeio_mac.cpp @@ -105,8 +105,8 @@ void MacProtocol::get(const KURL& url) { *myTDEProcess << "hpcopy" << mode << path << "-"; //data is now sent directly from the slot - connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotSetDataStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); @@ -134,8 +134,8 @@ void MacProtocol::listDir(const KURL& url) { *myTDEProcess << "hpls" << "-la" << filename; standardOutputStream = TQString::null; - connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); @@ -146,8 +146,8 @@ void MacProtocol::listDir(const KURL& url) { //clean up delete myTDEProcess; myTDEProcess = 0; - disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + disconnect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); UDSEntry entry; if (!standardOutputStream.isEmpty()) { @@ -191,8 +191,8 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) { *myTDEProcess << "hpls" << "-ld" << filename; standardOutputStream = TQString::null; - connect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); @@ -203,8 +203,8 @@ TQValueList<TDEIO::UDSAtom> MacProtocol::doStat(const KURL& url) { //clean up delete myTDEProcess; myTDEProcess = 0; - disconnect(myTDEProcess, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + disconnect(myTDEProcess, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); if (standardOutputStream.isEmpty()) { filename.replace("\\ ", " "); //get rid of escapes @@ -257,8 +257,8 @@ TQString MacProtocol::prepareHP(const KURL& url) { myTDEProcess = new TDEProcess(); *myTDEProcess << "hpmount"; standardOutputStream = TQString::null; - connect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + connect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); myTDEProcess->start(TDEProcess::Block, TDEProcess::All); @@ -269,8 +269,8 @@ TQString MacProtocol::prepareHP(const KURL& url) { } delete myTDEProcess; myTDEProcess = 0; - disconnect(myTDEProcess, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + disconnect(myTDEProcess, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); //now mount the drive myTDEProcess = new TDEProcess(); diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp index 556b287e4..703ec2202 100644 --- a/tdeioslave/man/kmanpart.cpp +++ b/tdeioslave/man/kmanpart.cpp @@ -95,8 +95,8 @@ bool KManPart::openFile() url.setPath( m_file ); m_job = TDEIO::get( url, true, false ); - connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQT_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( jobDone( TDEIO::Job * ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray &) ), TQ_SLOT( readData( TDEIO::Job *, const TQByteArray &) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( jobDone( TDEIO::Job * ) ) ); return true; } diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp index 13fc3b4d5..cd04f702e 100644 --- a/tdeioslave/man/tdeio_man.cpp +++ b/tdeioslave/man/tdeio_man.cpp @@ -204,8 +204,8 @@ TQMap<TQString, TQString> MANProtocol::buildIndexMap(const TQString §ion) TDEProcess proc; proc << "whatis" << "-M" << (*it_dir) << "-w" << "*"; myStdStream = TQString::null; - connect( &proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ), - TQT_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) ); + connect( &proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int ) ), + TQ_SLOT( slotGetStdOutput( TDEProcess *, char *, int ) ) ); proc.start( TDEProcess::Block, TDEProcess::Stdout ); TQTextStream t( &myStdStream, IO_ReadOnly ); parseWhatIs( i, t, mark ); @@ -555,8 +555,8 @@ char *MANProtocol::readManPage(const char *_filename) getProgramPath(); proc << mySgml2RoffPath << filename; - TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); + TQApplication::connect(&proc, TQ_SIGNAL(receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutput(TDEProcess *, char *, int))); proc.start(TDEProcess::Block, TDEProcess::All); const TQCString cstr=myStdStream.latin1(); @@ -589,8 +589,8 @@ char *MANProtocol::readManPage(const char *_filename) proc << "man" << "--recode" << "UTF-8" << filename; - TQApplication::connect(&proc, TQT_SIGNAL(receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int))); + TQApplication::connect(&proc, TQ_SIGNAL(receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT(slotGetStdOutputUtf8(TDEProcess *, char *, int))); proc.start(TDEProcess::Block, TDEProcess::All); const TQCString cstr=myStdStream.utf8(); diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp index aacbcc5e2..510437072 100644 --- a/tdeioslave/media/mediaimpl.cpp +++ b/tdeioslave/media/mediaimpl.cpp @@ -242,10 +242,10 @@ bool MediaImpl::ensureMediumMounted(Medium &medium) medium.deviceNode(), medium.mountPoint()); job->setAutoWarningHandlingEnabled(false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotMountResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ), - this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotMountResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ), + this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) ); */ kapp->dcopClient() ->connectDCOPSignal("kded", "mediamanager", @@ -365,10 +365,10 @@ TDEIO::UDSEntry MediaImpl::extractUrlInfos(const KURL &url) TDEIO::StatJob *job = TDEIO::stat(url, false); job->setAutoWarningHandlingEnabled( false ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotStatResult(TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( warning( TDEIO::Job *, const TQString & ) ), - this, TQT_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotStatResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( warning( TDEIO::Job *, const TQString & ) ), + this, TQ_SLOT( slotWarning( TDEIO::Job *, const TQString & ) ) ); tqApp->eventLoop()->enterLoop(); TDEIO::UDSEntry::iterator it = m_entryBuffer.begin(); diff --git a/tdeioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp index b2e9ff5f5..ddfd041a0 100644 --- a/tdeioslave/media/mediamanager/dialog.cpp +++ b/tdeioslave/media/mediamanager/dialog.cpp @@ -37,7 +37,7 @@ Dialog::Dialog(TQString url, TQString iconName) : TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge); unlockDialog->encryptedIcon->setPixmap( pixmap ); - connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &))); + connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &))); setMainWidget(unlockDialog); } diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp index 6549723fe..2bd528c19 100644 --- a/tdeioslave/media/mediamanager/fstabbackend.cpp +++ b/tdeioslave/media/mediamanager/fstabbackend.cpp @@ -61,8 +61,8 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly) KDirWatch::self()->addFile(MTAB); KDirWatch::self()->addFile(FSTAB); - connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ), - this, TQT_SLOT( slotDirty(const TQString&) ) ); + connect( KDirWatch::self(), TQ_SIGNAL( dirty(const TQString&) ), + this, TQ_SLOT( slotDirty(const TQString&) ) ); handleFstabChange(false); handleMtabChange(false); @@ -70,8 +70,8 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly) KDirWatch::self()->startScan(); #if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) - connect( &m_mtabTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( handleMtabChange() ) ); + connect( &m_mtabTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( handleMtabChange() ) ); m_mtabTimer.start(250); #endif } diff --git a/tdeioslave/media/mediamanager/linuxcdpolling.cpp b/tdeioslave/media/mediamanager/linuxcdpolling.cpp index 9a5a0a223..66074f40e 100644 --- a/tdeioslave/media/mediamanager/linuxcdpolling.cpp +++ b/tdeioslave/media/mediamanager/linuxcdpolling.cpp @@ -176,19 +176,19 @@ private: LinuxCDPolling::LinuxCDPolling(MediaList &list) : TQObject(), BackendBase(list) { - connect(&m_mediaList, TQT_SIGNAL(mediumAdded(const TQString &, + connect(&m_mediaList, TQ_SIGNAL(mediumAdded(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotMediumAdded(const TQString &)) ); + this, TQ_SLOT(slotMediumAdded(const TQString &)) ); - connect(&m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString &, + connect(&m_mediaList, TQ_SIGNAL(mediumRemoved(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotMediumRemoved(const TQString &)) ); + this, TQ_SLOT(slotMediumRemoved(const TQString &)) ); - connect(&m_mediaList, TQT_SIGNAL(mediumStateChanged(const TQString &, + connect(&m_mediaList, TQ_SIGNAL(mediumStateChanged(const TQString &, const TQString &, bool, bool)), - this, TQT_SLOT(slotMediumStateChanged(const TQString &)) ); + this, TQ_SLOT(slotMediumStateChanged(const TQString &)) ); - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } LinuxCDPolling::~LinuxCDPolling() diff --git a/tdeioslave/media/mediamanager/mediamanager.cpp b/tdeioslave/media/mediamanager/mediamanager.cpp index f8c2a574b..66c456a24 100644 --- a/tdeioslave/media/mediamanager/mediamanager.cpp +++ b/tdeioslave/media/mediamanager/mediamanager.cpp @@ -43,15 +43,15 @@ MediaManager::MediaManager(const TQCString &obj) : KDEDModule(obj), m_dirNotify(m_mediaList) { - connect( &m_mediaList, TQT_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)), - TQT_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) ); - connect( &m_mediaList, TQT_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)), - TQT_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) ); + connect( &m_mediaList, TQ_SIGNAL(mediumAdded(const TQString&, const TQString&, bool)), + TQ_SLOT(slotMediumAdded(const TQString&, const TQString&, bool)) ); + connect( &m_mediaList, TQ_SIGNAL(mediumRemoved(const TQString&, const TQString&, bool)), + TQ_SLOT(slotMediumRemoved(const TQString&, const TQString&, bool)) ); connect( &m_mediaList, - TQT_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)), - TQT_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) ); + TQ_SIGNAL(mediumStateChanged(const TQString&, const TQString&, bool, bool)), + TQ_SLOT(slotMediumChanged(const TQString&, const TQString&, bool, bool)) ); - TQTimer::singleShot( 10, this, TQT_SLOT( loadBackends() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT( loadBackends() ) ); } MediaManager::~MediaManager() diff --git a/tdeioslave/media/mediamanager/removablebackend.cpp b/tdeioslave/media/mediamanager/removablebackend.cpp index dacb9b704..a9207cd92 100644 --- a/tdeioslave/media/mediamanager/removablebackend.cpp +++ b/tdeioslave/media/mediamanager/removablebackend.cpp @@ -37,8 +37,8 @@ RemovableBackend::RemovableBackend(MediaList &list) { KDirWatch::self()->addFile(MTAB); - connect( KDirWatch::self(), TQT_SIGNAL( dirty(const TQString&) ), - this, TQT_SLOT( slotDirty(const TQString&) ) ); + connect( KDirWatch::self(), TQ_SIGNAL( dirty(const TQString&) ), + this, TQ_SLOT( slotDirty(const TQString&) ) ); KDirWatch::self()->startScan(); } diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index 77cd8e7b3..a5900c883 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -55,9 +55,9 @@ TDEBackend::TDEBackend(MediaList &list, TQObject* parent) TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); // Connect device monitoring signals/slots - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(AddDeviceHandler(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(RemoveDeviceHandler(TDEGenericDevice*))); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(ModifyDeviceHandler(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(AddDeviceHandler(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(RemoveDeviceHandler(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(ModifyDeviceHandler(TDEGenericDevice*))); // List devices at startup ListDevices(); @@ -1234,7 +1234,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium) data.medium = medium; TDEIO::Job *job = TDEIO::mount(false, 0, medium->deviceNode(), mountPoint); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); mount_jobs[job] = &data; // The caller expects the device to be mounted when the function // completes. Thus block until the job completes. @@ -1345,7 +1345,7 @@ TQStringVariantMap TDEBackend::unmount(const TQString &id) data.medium = medium; TDEIO::Job *job = TDEIO::unmount( medium->mountPoint(), false ); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); mount_jobs[job] = &data; // The caller expects the device to be unmounted when the function // completes. Thus block until the job completes. diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index 1e75b2501..2510019f2 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -69,7 +69,7 @@ MediaNotifier::MediaNotifier(const TQCString &name) : KDEDModule(name) m_notificationDialogList.setAutoDelete(FALSE); m_freeTimer = new TQTimer( this ); - connect( m_freeTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( checkFreeDiskSpace() ) ); + connect( m_freeTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( checkFreeDiskSpace() ) ); m_freeTimer->start( 1000*6*2 /* 20 minutes */ ); m_freeDialog = 0; } @@ -123,8 +123,8 @@ void MediaNotifier::onMediumChange( const TQString &name, bool allowNotification m_allowNotificationMap[job] = allowNotification; - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); } void MediaNotifier::slotStatResult( TDEIO::Job *job ) @@ -347,7 +347,7 @@ void MediaNotifier::notify( KFileItem &medium ) if ( actions.size()>1 ) { NotificationDialog* notifier = new NotificationDialog( medium, settings ); - connect(notifier, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(notificationDialogDestroyed(TQObject*))); + connect(notifier, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(notificationDialogDestroyed(TQObject*))); m_notificationDialogList.append(notifier); notifier->show(); } @@ -407,8 +407,8 @@ void MediaNotifier::checkFreeDiskSpace() i18n("Do not ask again"), &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec); m_freeDialog->show(); - connect( m_freeDialog, TQT_SIGNAL( yesClicked() ), TQT_SLOT( slotFreeContinue() ) ); - connect( m_freeDialog, TQT_SIGNAL( noClicked() ), TQT_SLOT( slotFreeCancel() ) ); + connect( m_freeDialog, TQ_SIGNAL( yesClicked() ), TQ_SLOT( slotFreeContinue() ) ); + connect( m_freeDialog, TQ_SIGNAL( noClicked() ), TQ_SLOT( slotFreeCancel() ) ); } } } diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp index fc6d87647..a8bb81ea5 100644 --- a/tdeioslave/media/medianotifier/notificationdialog.cpp +++ b/tdeioslave/media/medianotifier/notificationdialog.cpp @@ -71,17 +71,17 @@ NotificationDialog::NotificationDialog( KFileItem medium, NotifierSettings *sett setButtonText( User1, i18n("Configure...") ); - connect( m_actionWatcher, TQT_SIGNAL( dirty( const TQString & ) ), - this, TQT_SLOT( slotActionsChanged( const TQString & ) ) ); - connect( this , TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), - this, TQT_SLOT( slotConfigure() ) ); - connect( m_view->actionsList, TQT_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ), - this, TQT_SLOT( slotOk() ) ); - - connect( this, TQT_SIGNAL( finished() ), - this, TQT_SLOT( delayedDestruct() ) ); + connect( m_actionWatcher, TQ_SIGNAL( dirty( const TQString & ) ), + this, TQ_SLOT( slotActionsChanged( const TQString & ) ) ); + connect( this , TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), + this, TQ_SLOT( slotConfigure() ) ); + connect( m_view->actionsList, TQ_SIGNAL( doubleClicked ( TQListBoxItem*, const TQPoint & ) ), + this, TQ_SLOT( slotOk() ) ); + + connect( this, TQ_SIGNAL( finished() ), + this, TQ_SLOT( delayedDestruct() ) ); m_actionWatcher->startScan(); TQPushButton * btn = actionButton( Ok ); diff --git a/tdeioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp index d16c6d974..a257ca6d8 100644 --- a/tdeioslave/media/mounthelper/dialog.cpp +++ b/tdeioslave/media/mounthelper/dialog.cpp @@ -36,7 +36,7 @@ Dialog::Dialog(TQString url, TQString iconName) : TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge); unlockDialog->encryptedIcon->setPixmap( pixmap ); - connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &))); + connect(unlockDialog->passwordEdit, TQ_SIGNAL (textChanged(const TQString &)), this, TQ_SLOT (slotPasswordChanged(const TQString &))); setMainWidget(unlockDialog); } diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index 457c2cc55..90f3caa3f 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -102,8 +102,8 @@ void MountHelper::unlock(const Medium &medium) } m_mediumId = medium.id(); m_dialog = new Dialog(device, iconName); - connect(m_dialog, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSendPassword())); - connect(m_dialog, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancel())); + connect(m_dialog, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotSendPassword())); + connect(m_dialog, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancel())); m_dialog->show(); } @@ -146,7 +146,7 @@ void MountHelper::eject(const Medium &medium) TDEProcess *proc = new TDEProcess(this); *proc << "tdeeject"; *proc << medium.deviceNode(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(ejectFinished(TDEProcess*))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(ejectFinished(TDEProcess*))); proc->start(); } diff --git a/tdeioslave/media/propsdlgplugin/propertiespage.cpp b/tdeioslave/media/propsdlgplugin/propertiespage.cpp index 5b54c8c5a..57fff8573 100644 --- a/tdeioslave/media/propsdlgplugin/propertiespage.cpp +++ b/tdeioslave/media/propsdlgplugin/propertiespage.cpp @@ -64,43 +64,43 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) option_ro->hide(); else option_ro->setChecked(options["ro"] == "true"); - connect( option_ro, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_ro, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); if (!options.contains("quiet")) option_quiet->hide(); else option_quiet->setChecked(options["quiet"] == "true"); - connect( option_quiet, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_quiet, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); if (!options.contains("sync")) option_sync->hide(); else option_sync->setChecked(options["sync"] == "true"); - connect( option_sync, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_sync, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); if (!options.contains("atime")) option_atime->hide(); else option_atime->setChecked(options["atime"] == "true"); - connect( option_atime, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_atime, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); if (!options.contains("flush")) option_flush->hide(); else option_flush->setChecked(options["flush"] == "true"); - connect( option_flush, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_flush, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); if (!options.contains("utf8")) option_utf8->hide(); else option_utf8->setChecked(options["utf8"] == "true"); - connect( option_utf8, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_utf8, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); if (!options.contains("uid")) option_uid->hide(); else option_uid->setChecked(options["uid"] == "true"); - connect( option_uid, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_uid, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); if (!options.contains("shortname")) { @@ -115,7 +115,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) option_shortname->setCurrentItem(index); break; } - connect( option_shortname, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) ); + connect( option_shortname, TQ_SIGNAL( activated(int) ), TQ_SIGNAL( changed() ) ); } if (!options.contains("journaling")) @@ -131,14 +131,14 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) option_journaling->setCurrentItem(index); break; } - connect( option_journaling, TQT_SIGNAL( activated(int) ), TQT_SIGNAL( changed() ) ); + connect( option_journaling, TQ_SIGNAL( activated(int) ), TQ_SIGNAL( changed() ) ); } label_filesystem->setText(i18n("Filesystem: %1").arg(options["filesystem"])); option_mountpoint->setText(options["mountpoint"]); - connect( option_mountpoint, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SIGNAL( changed() ) ); + connect( option_mountpoint, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SIGNAL( changed() ) ); option_automount->setChecked(options["automount"] == "true"); - connect( option_automount, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_automount, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); bool has_groupbox_specific = true; if (!options.contains("journaling") && @@ -152,11 +152,11 @@ PropertiesPage::PropertiesPage(TQWidget* parent, const TQString &_id) // The order is important - we want groupboxes to hide automatically depending on use_defaults // but don't want to emit changed() until user actually changes something. - connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_generic, SLOT( setHidden(bool) ) ); + connect( option_defaults, TQ_SIGNAL( toggled(bool) ), groupbox_generic, TQ_SLOT( setHidden(bool) ) ); if (has_groupbox_specific) - connect( option_defaults, TQT_SIGNAL( toggled(bool) ), groupbox_specific, SLOT( setHidden(bool) ) ); + connect( option_defaults, TQ_SIGNAL( toggled(bool) ), groupbox_specific, TQ_SLOT( setHidden(bool) ) ); option_defaults->setChecked(options["use_defaults"] == "true"); - connect( option_defaults, TQT_SIGNAL( stateChanged(int) ), TQT_SIGNAL( changed() ) ); + connect( option_defaults, TQ_SIGNAL( stateChanged(int) ), TQ_SIGNAL( changed() ) ); } else { diff --git a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp index ea830d2e1..dce33d786 100644 --- a/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp +++ b/tdeioslave/media/propsdlgplugin/propsdlgshareplugin.cpp @@ -70,10 +70,10 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, d = new Private(); d->page = new PropertiesPage(vbox, Medium::create(reply).id()); - connect(d->page, TQT_SIGNAL(changed()), - TQT_SLOT(slotChanged())); + connect(d->page, TQ_SIGNAL(changed()), + TQ_SLOT(slotChanged())); - // TQTimer::singleShot(100, this, TQT_SLOT(slotChanged())); + // TQTimer::singleShot(100, this, TQ_SLOT(slotChanged())); } diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp index e2d367e7d..dabac39aa 100644 --- a/tdeioslave/media/tdecmodule/main.cpp +++ b/tdeioslave/media/tdecmodule/main.cpp @@ -49,13 +49,13 @@ MediaModule::MediaModule( TQWidget *parent, const char *name, const TQStringList m_notifierModule = new NotifierModule( this, "notifier" ); tab->addTab( m_notifierModule, i18n( "&Notifications" ) ); - connect( m_notifierModule, TQT_SIGNAL( changed( bool ) ), - this, TQT_SLOT( moduleChanged( bool ) ) ); + connect( m_notifierModule, TQ_SIGNAL( changed( bool ) ), + this, TQ_SLOT( moduleChanged( bool ) ) ); m_managerModule = new ManagerModule( this, "manager" ); tab->addTab( m_managerModule, i18n( "&Advanced" ) ); - connect( m_managerModule, TQT_SIGNAL( changed( bool ) ), - this, TQT_SLOT( moduleChanged( bool ) ) ); + connect( m_managerModule, TQ_SIGNAL( changed( bool ) ), + this, TQ_SLOT( moduleChanged( bool ) ) ); diff --git a/tdeioslave/media/tdecmodule/managermodule.cpp b/tdeioslave/media/tdecmodule/managermodule.cpp index 9a443e551..03a5ea500 100644 --- a/tdeioslave/media/tdecmodule/managermodule.cpp +++ b/tdeioslave/media/tdecmodule/managermodule.cpp @@ -51,16 +51,16 @@ ManagerModule::ManagerModule( TQWidget* parent, const char* name ) #endif view->kcfg_CdPollingEnabled->setEnabled( false ); - connect( view->option_automount, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_ro, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_quiet, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_flush, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_uid, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_utf8, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_sync, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_atime, SIGNAL( stateChanged(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_shortname, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) ); - connect( view->option_journaling, SIGNAL( activated(int) ), this, SLOT( emitChanged() ) ); + connect( view->option_automount, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_ro, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_quiet, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_flush, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_uid, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_utf8, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_sync, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_atime, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_shortname, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( emitChanged() ) ); + connect( view->option_journaling, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( emitChanged() ) ); load(); } diff --git a/tdeioslave/media/tdecmodule/notifiermodule.cpp b/tdeioslave/media/tdecmodule/notifiermodule.cpp index 4364d93ad..2d2d53481 100644 --- a/tdeioslave/media/tdecmodule/notifiermodule.cpp +++ b/tdeioslave/media/tdecmodule/notifiermodule.cpp @@ -57,18 +57,18 @@ NotifierModule::NotifierModule(TQWidget *parent, const char *name) updateListBox(); - connect( m_view->mimetypesCombo, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( slotMimeTypeChanged(int) ) ); - connect( m_view->actionsList, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ), - this, TQT_SLOT( slotActionSelected(TQListBoxItem*) ) ); - connect( m_view->addButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAdd() ) ); - connect( m_view->editButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotEdit() ) ); - connect( m_view->deleteButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDelete() ) ); - connect( m_view->toggleAutoButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotToggleAuto() ) ); + connect( m_view->mimetypesCombo, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( slotMimeTypeChanged(int) ) ); + connect( m_view->actionsList, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ), + this, TQ_SLOT( slotActionSelected(TQListBoxItem*) ) ); + connect( m_view->addButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAdd() ) ); + connect( m_view->editButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotEdit() ) ); + connect( m_view->deleteButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDelete() ) ); + connect( m_view->toggleAutoButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotToggleAuto() ) ); } NotifierModule::~NotifierModule() diff --git a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp index 4147e437c..bcf533b9d 100644 --- a/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp +++ b/tdeioslave/media/tdecmodule/serviceconfigdialog.cpp @@ -78,10 +78,10 @@ ServiceConfigDialog::ServiceConfigDialog(NotifierServiceAction *action, setMainWidget(m_view); setCaption( m_action->label() ); - connect( m_view->iconButton, TQT_SIGNAL( iconChanged(TQString) ), - this, TQT_SLOT( slotIconChanged() ) ); - connect( m_view->commandButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotCommand() ) ); + connect( m_view->iconButton, TQ_SIGNAL( iconChanged(TQString) ), + this, TQ_SLOT( slotIconChanged() ) ); + connect( m_view->commandButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotCommand() ) ); } bool operator==( KDEDesktopMimeType::Service s1, KDEDesktopMimeType::Service s2 ) diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp index 9124568c1..c68bc25d5 100644 --- a/tdeioslave/media/tdeio_media.cpp +++ b/tdeioslave/media/tdeio_media.cpp @@ -62,8 +62,8 @@ MediaProtocol::MediaProtocol(const TQCString &protocol, const TQCString &pool, const TQCString &app) : ForwardingSlaveBase(protocol, pool, app) { - connect( &m_impl, TQT_SIGNAL( warning( const TQString & ) ), - this, TQT_SLOT( slotWarning( const TQString & ) ) ); + connect( &m_impl, TQ_SIGNAL( warning( const TQString & ) ), + this, TQ_SLOT( slotWarning( const TQString & ) ) ); } MediaProtocol::~MediaProtocol() diff --git a/tdeioslave/smb/tdeio_smb_mount.cpp b/tdeioslave/smb/tdeio_smb_mount.cpp index 0aef92698..120372672 100644 --- a/tdeioslave/smb/tdeio_smb_mount.cpp +++ b/tdeioslave/smb/tdeio_smb_mount.cpp @@ -113,11 +113,11 @@ void SMBSlave::special( const TQByteArray & data) proc << TDEProcess::quote(mountPoint.local8Bit()); proc << options; - connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )), - TQT_SLOT(readOutput(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int )), + TQ_SLOT(readOutput(TDEProcess *, char *, int))); - connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )), - TQT_SLOT(readStdErr(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int )), + TQ_SLOT(readStdErr(TDEProcess *, char *, int))); if (!proc.start( TDEProcess::Block, TDEProcess::AllOutput )) { @@ -154,11 +154,11 @@ void SMBSlave::special( const TQByteArray & data) mybuf.truncate(0); mystderr.truncate(0); - connect(&proc, TQT_SIGNAL( receivedStdout(TDEProcess *, char *, int )), - TQT_SLOT(readOutput(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL( receivedStdout(TDEProcess *, char *, int )), + TQ_SLOT(readOutput(TDEProcess *, char *, int))); - connect(&proc, TQT_SIGNAL( receivedStderr(TDEProcess *, char *, int )), - TQT_SLOT(readStdErr(TDEProcess *, char *, int))); + connect(&proc, TQ_SIGNAL( receivedStderr(TDEProcess *, char *, int )), + TQ_SLOT(readStdErr(TDEProcess *, char *, int))); if ( !proc.start( TDEProcess::Block, TDEProcess::AllOutput ) ) { diff --git a/tdeioslave/smtp/interactivesmtpserver.cpp b/tdeioslave/smtp/interactivesmtpserver.cpp index 4055a47a4..ed13d7253 100644 --- a/tdeioslave/smtp/interactivesmtpserver.cpp +++ b/tdeioslave/smtp/interactivesmtpserver.cpp @@ -55,8 +55,8 @@ InteractiveSMTPServerWindow::~InteractiveSMTPServerWindow() { if ( mSocket ) { mSocket->close(); if ( mSocket->state() == TQSocket::Closing ) - connect( mSocket, TQT_SIGNAL(delayedCloseFinished()), - mSocket, TQT_SLOT(deleteLater()) ); + connect( mSocket, TQ_SIGNAL(delayedCloseFinished()), + mSocket, TQ_SLOT(deleteLater()) ); else mSocket->deleteLater(); mSocket = 0; @@ -108,17 +108,17 @@ InteractiveSMTPServerWindow::InteractiveSMTPServerWindow( TQSocket * socket, TQW hlay->addWidget( mLineEdit, 1 ); hlay->addWidget( but ); - connect( mLineEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotSendResponse()) ); - connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotSendResponse()) ); + connect( mLineEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotSendResponse()) ); + connect( but, TQ_SIGNAL(clicked()), TQ_SLOT(slotSendResponse()) ); but = new TQPushButton( "&Close Connection", this ); vlay->addWidget( but ); - connect( but, TQT_SIGNAL(clicked()), TQT_SLOT(slotConnectionClosed()) ); + connect( but, TQ_SIGNAL(clicked()), TQ_SLOT(slotConnectionClosed()) ); - connect( socket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotConnectionClosed()) ); - connect( socket, TQT_SIGNAL(error(int)), TQT_SLOT(slotError(int)) ); - connect( socket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotReadyRead()) ); + connect( socket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotConnectionClosed()) ); + connect( socket, TQ_SIGNAL(error(int)), TQ_SLOT(slotError(int)) ); + connect( socket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotReadyRead()) ); mLineEdit->setText( "220 hi there" ); mLineEdit->setFocus(); diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp index 21a9da7da..164b9a467 100644 --- a/tdeioslave/system/systemimpl.cpp +++ b/tdeioslave/system/systemimpl.cpp @@ -279,12 +279,12 @@ void SystemImpl::createEntry(TDEIO::UDSEntry &entry, m_lastListingEmpty = true; TDEIO::ListJob *job = TDEIO::listDir(url, false, false); - connect( job, TQT_SIGNAL( entries(TDEIO::Job *, + connect( job, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), - this, TQT_SLOT( slotEntries(TDEIO::Job *, + this, TQ_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotResult(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); if (m_lastListingEmpty) icon = empty_icon; diff --git a/tdeioslave/thumbnail/htmlcreator.cpp b/tdeioslave/thumbnail/htmlcreator.cpp index 34742a0e9..5a6935010 100644 --- a/tdeioslave/thumbnail/htmlcreator.cpp +++ b/tdeioslave/thumbnail/htmlcreator.cpp @@ -50,7 +50,7 @@ bool HTMLCreator::create(const TQString &path, int width, int height, TQImage &i 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); diff --git a/tdeioslave/trash/discspaceutil.cpp b/tdeioslave/trash/discspaceutil.cpp index 186cb0e7f..e231b901c 100644 --- a/tdeioslave/trash/discspaceutil.cpp +++ b/tdeioslave/trash/discspaceutil.cpp @@ -102,9 +102,9 @@ void DiscSpaceUtil::done() void DiscSpaceUtil::calculateFullSize() { KDiskFreeSp *sp = KDiskFreeSp::findUsageInfo( mDirectory ); - connect( sp, TQT_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ), - this, TQT_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) ); - connect( sp, TQT_SIGNAL( done() ), this, TQT_SLOT( done() ) ); + connect( sp, TQ_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ), + this, TQ_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) ); + connect( sp, TQ_SIGNAL( done() ), this, TQ_SLOT( done() ) ); tqApp->eventLoop()->enterLoop(); } diff --git a/tdeioslave/trash/kcmtrash.cpp b/tdeioslave/trash/kcmtrash.cpp index 4747e092a..8793be5d9 100644 --- a/tdeioslave/trash/kcmtrash.cpp +++ b/tdeioslave/trash/kcmtrash.cpp @@ -51,7 +51,7 @@ TrashModule::TrashModule(TQWidget *parent, const char *name) policyWidget = new KTrashPropsWidget(this); tab->addTab(policyWidget, i18n("&Trash Policy")); - connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(policyWidget, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); TQVBoxLayout *top = new TQVBoxLayout(this); top->addWidget(tab); diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp index 067c10b6e..7b36aaaf4 100644 --- a/tdeioslave/trash/ktrashpropsdlgplugin.cpp +++ b/tdeioslave/trash/ktrashpropsdlgplugin.cpp @@ -74,7 +74,7 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha policyWidget = new KTrashPropsWidget(frame); TQVBoxLayout *vLayout = new TQVBoxLayout(frame, 0, 0); vLayout->addWidget(policyWidget); - connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SLOT(setDirty())); + connect(policyWidget, TQ_SIGNAL(changed(bool)), TQ_SLOT(setDirty())); } KTrashPropsDlgPlugin::~KTrashPropsDlgPlugin() diff --git a/tdeioslave/trash/ktrashpropswidget.cpp b/tdeioslave/trash/ktrashpropswidget.cpp index 40e12cb4f..2040e9a76 100644 --- a/tdeioslave/trash/ktrashpropswidget.cpp +++ b/tdeioslave/trash/ktrashpropswidget.cpp @@ -50,15 +50,15 @@ KTrashPropsWidget::KTrashPropsWidget(TQWidget *parent, const char *name) mTrashImpl->init(); setupGui(); - connect(mUseTimeLimit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useTypeChanged())); - connect(mDays, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setDirty())); - connect(mUseSizeLimit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useTypeChanged())); - connect(mPercentSize, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(percentSizeChanged(double))); - connect(mFixedSize, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(fixedSizeChanged(double))); - connect(mFixedSizeUnit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fixedSizeUnitActivated(int))); - connect(mRbPercentSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rbPercentSizeToggled(bool))); - connect(mRbFixedSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rbFixedSizeToggled(bool))); - connect(mLimitReachedAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDirty())); + connect(mUseTimeLimit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useTypeChanged())); + connect(mDays, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setDirty())); + connect(mUseSizeLimit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useTypeChanged())); + connect(mPercentSize, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(percentSizeChanged(double))); + connect(mFixedSize, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(fixedSizeChanged(double))); + connect(mFixedSizeUnit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(fixedSizeUnitActivated(int))); + connect(mRbPercentSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rbPercentSizeToggled(bool))); + connect(mRbFixedSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rbFixedSizeToggled(bool))); + connect(mLimitReachedAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDirty())); inhibitChangedSignal = true; load(); @@ -87,7 +87,7 @@ void KTrashPropsWidget::setupGui() mountPoints->insertItem(folderPixmap, util.mountPoint(), it.key()); } mountPoints->setCurrentItem(0); - connect(mountPoints, TQT_SIGNAL(highlighted(int)), TQT_SLOT(trashChanged(int))); + connect(mountPoints, TQ_SIGNAL(highlighted(int)), TQ_SLOT(trashChanged(int))); } mCurrentTrash = map[0]; diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp index eeb0f600b..aa1f63aa1 100644 --- a/tdeioslave/trash/tdeio_trash.cpp +++ b/tdeioslave/trash/tdeio_trash.cpp @@ -533,12 +533,12 @@ void TrashProtocol::get( const KURL& url ) KURL fileURL; fileURL.setPath( physicalPath ); TDEIO::Job* job = TDEIO::get( fileURL ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); } diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp index 60fe2d1a6..4a1ca12f8 100644 --- a/tdeioslave/trash/testtrash.cpp +++ b/tdeioslave/trash/testtrash.cpp @@ -1094,8 +1094,8 @@ void TestTrash::listRootDir() m_entryCount = 0; m_listResult.clear(); TDEIO::ListJob* job = TDEIO::listDir( "trash:/" ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; @@ -1111,8 +1111,8 @@ void TestTrash::listRecursiveRootDir() m_entryCount = 0; m_listResult.clear(); TDEIO::ListJob* job = TDEIO::listRecursive( "trash:/" ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; @@ -1128,8 +1128,8 @@ void TestTrash::listSubDir() m_entryCount = 0; m_listResult.clear(); TDEIO::ListJob* job = TDEIO::listDir( "trash:/0-trashDirFromHome" ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp index 8bfbbca8d..8c062256c 100644 --- a/tdeioslave/trash/trashimpl.cpp +++ b/tdeioslave/trash/trashimpl.cpp @@ -374,8 +374,8 @@ bool TrashImpl::move( const TQString& src, const TQString& dest ) #ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE job->setInteractive( false ); #endif - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; @@ -424,8 +424,8 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest ) #ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE job->setInteractive( false ); #endif - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( jobFinished( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; @@ -513,15 +513,15 @@ bool TrashImpl::synchronousDel( const TQString& path, bool setLastErrorCode, boo KFileItemList fileItemList; fileItemList.append( &fileItem ); TDEIO::ChmodJob* chmodJob = TDEIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ ); - connect( chmodJob, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); + connect( chmodJob, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); } kdDebug() << k_funcinfo << "deleting " << url << endl; TDEIO::DeleteJob *job = TDEIO::del( url, false, false ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); bool ok = m_lastErrorCode == 0; if ( !setLastErrorCode ) { diff --git a/tdepasswd/kcm/chfacedlg.cpp b/tdepasswd/kcm/chfacedlg.cpp index dd37bba9d..bea316c8c 100644 --- a/tdepasswd/kcm/chfacedlg.cpp +++ b/tdepasswd/kcm/chfacedlg.cpp @@ -68,16 +68,16 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name m_FacesWidget->setItemsMovable( false ); m_FacesWidget->setMinimumSize( 400, 200 ); - connect( m_FacesWidget, TQT_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQT_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) ); + connect( m_FacesWidget, TQ_SIGNAL( selectionChanged( TQIconViewItem * ) ), TQ_SLOT( slotFaceWidgetSelectionChanged( TQIconViewItem * ) ) ); - connect( m_FacesWidget, TQT_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQT_SLOT( slotOk() ) ); + connect( m_FacesWidget, TQ_SIGNAL( doubleClicked( TQIconViewItem *, const TQPoint & ) ), TQ_SLOT( slotOk() ) ); top->addWidget( m_FacesWidget ); // Buttons to get more pics TQHBoxLayout * morePics = new TQHBoxLayout( 0, 0, spacingHint() ); TQPushButton *browseBtn = new TQPushButton( i18n("Custom &Image..."), page ); - connect( browseBtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGetCustomImage() ) ); + connect( browseBtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotGetCustomImage() ) ); morePics->addWidget( browseBtn ); #if 0 TQPushButton *acquireBtn = new TQPushButton( i18n("&Acquire Image..."), page ); @@ -110,7 +110,7 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name m_FacesWidget->arrangeItemsInGrid(); enableButtonOK( false ); - //connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotSaveCustomImage() ) ); + //connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotSaveCustomImage() ) ); resize( 420, 400 ); } diff --git a/tdepasswd/kcm/main.cpp b/tdepasswd/kcm/main.cpp index 0751c997e..b7e2aa8fa 100644 --- a/tdepasswd/kcm/main.cpp +++ b/tdepasswd/kcm/main.cpp @@ -63,14 +63,14 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name, _mw = new MainWidget(this); topLayout->addWidget( _mw ); - connect( _mw->btnChangeFace, TQT_SIGNAL(clicked()), TQT_SLOT(slotFaceButtonClicked())); - connect( _mw->btnChangePassword, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangePassword())); + connect( _mw->btnChangeFace, TQ_SIGNAL(clicked()), TQ_SLOT(slotFaceButtonClicked())); + connect( _mw->btnChangePassword, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangePassword())); _mw->btnChangePassword->setGuiItem( KGuiItem( i18n("Change &Password..."), "password" )); - connect( _mw->leRealname, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); - connect( _mw->leOrganization, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); - connect( _mw->leEmail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); - connect( _mw->leSMTP, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect( _mw->leRealname, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); + connect( _mw->leOrganization, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); + connect( _mw->leEmail, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); + connect( _mw->leSMTP, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); _ku = new KUser(); _kes = new KEMailSettings(); diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index f1fe23d47..814cda92a 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -39,7 +39,7 @@ class JobTray : public KSystemTray { public: JobTray(KJobViewerApp *parent, const char *name = 0) - : KSystemTray(0, name), m_app(parent) { connect( this, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) ); } + : KSystemTray(0, name), m_app(parent) { connect( this, TQ_SIGNAL( quitSelected() ), kapp, TQ_SLOT( quit() ) ); } protected: void mousePressEvent(TQMouseEvent*); private: @@ -120,7 +120,7 @@ void KJobViewerApp::initialize() if (!m_timer) { m_timer = KMTimer::self(); - connect(m_timer,TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer())); + connect(m_timer,TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer())); } if (prname.isEmpty() && all) @@ -149,10 +149,10 @@ void KJobViewerApp::initialize() { kdDebug() << "creating new view: " << TQString(prname) << endl; view = new KMJobViewer(); - connect(view, TQT_SIGNAL(jobsShown(KMJobViewer*,bool)), TQT_SLOT(slotJobsShown(KMJobViewer*,bool))); - connect(view, TQT_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQT_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&))); - connect(view, TQT_SIGNAL(refreshClicked()), TQT_SLOT(slotTimer())); - connect(view, TQT_SIGNAL(viewerDestroyed(KMJobViewer*)), TQT_SLOT(slotViewerDestroyed(KMJobViewer*))); + connect(view, TQ_SIGNAL(jobsShown(KMJobViewer*,bool)), TQ_SLOT(slotJobsShown(KMJobViewer*,bool))); + connect(view, TQ_SIGNAL(printerChanged(KMJobViewer*,const TQString&)), TQ_SLOT(slotPrinterChanged(KMJobViewer*,const TQString&))); + connect(view, TQ_SIGNAL(refreshClicked()), TQ_SLOT(slotTimer())); + connect(view, TQ_SIGNAL(viewerDestroyed(KMJobViewer*)), TQ_SLOT(slotViewerDestroyed(KMJobViewer*))); m_views.insert(prname, view); } diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp index fd528b705..b9e04be1f 100644 --- a/tdeprint/kprinter/main.cpp +++ b/tdeprint/kprinter/main.cpp @@ -49,7 +49,7 @@ extern "C" int KDE_EXPORT kdemain(int argc, char *argv[]) TDEApplication app; PrintWrapper *wrap = new PrintWrapper; app.setMainWidget(wrap); - TQTimer::singleShot(10,wrap,TQT_SLOT(slotPrint())); + TQTimer::singleShot(10,wrap,TQ_SLOT(slotPrint())); int result = app.exec(); delete wrap; diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp index 0ee7c2352..aed2065a1 100644 --- a/tdeprint/kprinter/printwrapper.cpp +++ b/tdeprint/kprinter/printwrapper.cpp @@ -262,11 +262,11 @@ void PrintWrapper::slotPrint() dlg = KPrintDialog::printerDialog(&kprinter, 0); if (dlg) { - connect(dlg, TQT_SIGNAL(printRequested(KPrinter*)), TQT_SLOT(slotPrintRequested(KPrinter*))); + connect(dlg, TQ_SIGNAL(printRequested(KPrinter*)), TQ_SLOT(slotPrintRequested(KPrinter*))); if( check_stdin ) { notif = new TQSocketNotifier( 0, TQSocketNotifier::Read, this ); - connect( notif, TQT_SIGNAL( activated( int )), this, TQT_SLOT( slotGotStdin())); + connect( notif, TQ_SIGNAL( activated( int )), this, TQ_SLOT( slotGotStdin())); kdDebug( 500 ) << "waiting for input on stdin" << endl; } dlg->exec(); @@ -276,7 +276,7 @@ void PrintWrapper::slotPrint() errormsg(i18n("Unable to construct the print dialog.")); } - TQTimer::singleShot(10,kapp,TQT_SLOT(quit())); + TQTimer::singleShot(10,kapp,TQ_SLOT(quit())); } void hack( KPrintDialog* dlg ); diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp index 2e714087a..5ca66f09b 100644 --- a/tdeprint/slave/tdeio_print.cpp +++ b/tdeprint/slave/tdeio_print.cpp @@ -455,10 +455,10 @@ bool TDEIO_Print::getDBFile( const KURL& src ) /* start the transfer job */ TDEIO::TransferJob *job = TDEIO::get( src, false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( slotResult( TDEIO::Job* ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); kapp->enter_loop(); m_httpBuffer.close(); diff --git a/tdeprint/tdeprintfax/conffilters.cpp b/tdeprint/tdeprintfax/conffilters.cpp index 7fdb4fec1..8a2456e73 100644 --- a/tdeprint/tdeprintfax/conffilters.cpp +++ b/tdeprint/tdeprintfax/conffilters.cpp @@ -45,7 +45,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) m_filters->setLineWidth(1); m_filters->setSorting(-1); m_filters->header()->setStretchEnabled(true, 1); - connect(m_filters, TQT_SIGNAL(doubleClicked(TQListViewItem*)), TQT_SLOT(slotChange())); + connect(m_filters, TQ_SIGNAL(doubleClicked(TQListViewItem*)), TQ_SLOT(slotChange())); m_add = new TQPushButton(this); m_add->setPixmap(BarIcon("document-new")); @@ -57,11 +57,11 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) m_up->setIconSet(BarIconSet("go-up")); m_down = new TQPushButton(this); m_down->setIconSet(BarIconSet("go-down")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - connect(m_change, TQT_SIGNAL(clicked()), TQT_SLOT(slotChange())); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); + connect(m_change, TQ_SIGNAL(clicked()), TQ_SLOT(slotChange())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown())); TQToolTip::add(m_add, i18n("Add filter")); TQToolTip::add(m_change, i18n("Modify filter")); TQToolTip::add(m_remove, i18n("Remove filter")); @@ -80,7 +80,7 @@ ConfFilters::ConfFilters(TQWidget *parent, const char *name) l1->addWidget(m_down); l1->addStretch(1); updateButton(); - connect(m_filters, TQT_SIGNAL(selectionChanged ()),TQT_SLOT(updateButton())); + connect(m_filters, TQ_SIGNAL(selectionChanged ()),TQ_SLOT(updateButton())); } void ConfFilters::load() diff --git a/tdeprint/tdeprintfax/confgeneral.cpp b/tdeprint/tdeprintfax/confgeneral.cpp index ad7512d8d..b79e2f52b 100644 --- a/tdeprint/tdeprintfax/confgeneral.cpp +++ b/tdeprint/tdeprintfax/confgeneral.cpp @@ -49,7 +49,7 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name) m_replace_int_char_val = new TQLineEdit( this ); m_replace_int_char_val->setEnabled( false ); - connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_replace_int_char, TQ_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQ_SLOT( setEnabled( bool ) ) ); TQGridLayout *l0 = new TQGridLayout(this, 6, 2, 10, 10); l0->setColStretch(1, 1); diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp index e6ef4e299..bfb201691 100644 --- a/tdeprint/tdeprintfax/confsystem.cpp +++ b/tdeprint/tdeprintfax/confsystem.cpp @@ -51,7 +51,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name) TQLabel *cmdlabel = new TQLabel(i18n("Co&mmand:"), this); syslabel->setBuddy(m_system); cmdlabel->setBuddy(m_command); - connect(m_system, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSystemChanged(int))); + connect(m_system, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSystemChanged(int))); m_current = 0; m_system->setCurrentItem(m_current); @@ -66,7 +66,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name) for (int i=0; i<10; i++) m_device->insertItem(TQString(i18n("Serial Port #%1").arg(i))); m_device->insertItem( i18n( "Other" ) ); - connect( m_device, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotDeviceChanged( int ) ) ); + connect( m_device, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotDeviceChanged( int ) ) ); m_device_edit = new TQLineEdit( m_dummy2 ); slotDeviceChanged( 0 ); diff --git a/tdeprint/tdeprintfax/faxab.cpp b/tdeprint/tdeprintfax/faxab.cpp index 1b3eb6131..f9f16c4aa 100644 --- a/tdeprint/tdeprintfax/faxab.cpp +++ b/tdeprint/tdeprintfax/faxab.cpp @@ -45,9 +45,9 @@ FaxAB::FaxAB(TQWidget *parent, const char *name) m_ok = new KPushButton(KStdGuiItem::ok(), this); TQPushButton *m_cancel = new KPushButton(KStdGuiItem::cancel(), this); TQPushButton *m_ab = new KPushButton(KGuiItem(i18n("&Edit Addressbook"), "contents"), this); - connect(m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); - connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); - connect(m_ab, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditAb())); + connect(m_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); + connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); + connect(m_ab, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditAb())); m_ok->setDefault(true); TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10); @@ -66,7 +66,7 @@ FaxAB::FaxAB(TQWidget *parent, const char *name) resize( conf->readSizeEntry( "ABSize", &defsize ) ); initialize(); - connect(TDEABC::StdAddressBook::self(), TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(slotAbChanged(AddressBook*))); + connect(TDEABC::StdAddressBook::self(), TQ_SIGNAL(addressBookChanged(AddressBook*)), TQ_SLOT(slotAbChanged(AddressBook*))); } FaxAB::~FaxAB() diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index f87ee4377..78074c55f 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -356,10 +356,10 @@ FaxCtrl::FaxCtrl(TQWidget *parent, const char *name) { m_process = new TDEProcess(); m_process->setUseShell(true); - connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(this, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(cleanTempFiles())); + connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(this, TQ_SIGNAL(faxSent(bool)), TQ_SLOT(cleanTempFiles())); m_logview = 0; } @@ -530,11 +530,11 @@ void FaxCtrl::viewLog(TQWidget *) TQPushButton *m_print = new KPushButton( KStdGuiItem::print(), topView ); TQPushButton *m_save = new KPushButton( KStdGuiItem::saveAs(), topView ); m_close->setDefault(true); - connect(m_clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearLog())); - connect(m_close, TQT_SIGNAL(clicked()), TQT_SLOT(slotCloseLog())); - connect(m_logview, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCloseLog())); - connect( m_print, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPrintLog() ) ); - connect( m_save, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSaveLog() ) ); + connect(m_clear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearLog())); + connect(m_close, TQ_SIGNAL(clicked()), TQ_SLOT(slotCloseLog())); + connect(m_logview, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCloseLog())); + connect( m_print, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPrintLog() ) ); + connect( m_save, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSaveLog() ) ); TQVBoxLayout *l0 = new TQVBoxLayout(topView, 10, 10); l0->addWidget(m_logview); diff --git a/tdeprint/tdeprintfax/filterdlg.cpp b/tdeprint/tdeprintfax/filterdlg.cpp index 141e7138a..fa3eed829 100644 --- a/tdeprint/tdeprintfax/filterdlg.cpp +++ b/tdeprint/tdeprintfax/filterdlg.cpp @@ -47,8 +47,8 @@ FilterDlg::FilterDlg(TQWidget *parent, const char *name) setMainWidget(w); m_mime->setFocus(); resize(300, 100); - connect(m_mime, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged())); - connect(m_cmd, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(slotTextFilterChanged())); + connect(m_mime, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(slotTextFilterChanged())); + connect(m_cmd, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(slotTextFilterChanged())); slotTextFilterChanged(); } diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 7a95e5485..4538bc7ae 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/tdeprint/tdeprintfax/tdeprintfax.cpp @@ -62,22 +62,22 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) { m_faxctrl = new FaxCtrl(this); m_quitAfterSend = false; - connect(m_faxctrl, TQT_SIGNAL(message(const TQString&)), TQT_SLOT(slotMessage(const TQString&))); - connect(m_faxctrl, TQT_SIGNAL(faxSent(bool)), TQT_SLOT(slotFaxSent(bool))); + connect(m_faxctrl, TQ_SIGNAL(message(const TQString&)), TQ_SLOT(slotMessage(const TQString&))); + connect(m_faxctrl, TQ_SIGNAL(faxSent(bool)), TQ_SLOT(slotFaxSent(bool))); TQWidget *mainw = new TQWidget(this); setCentralWidget(mainw); m_files = new TDEListBox(mainw); - connect( m_files, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotCurrentChanged() ) ); + connect( m_files, TQ_SIGNAL( currentChanged( TQListBoxItem* ) ), TQ_SLOT( slotCurrentChanged() ) ); m_upbtn = new KPushButton( mainw ); m_upbtn->setIconSet( SmallIconSet( "go-up" ) ); TQToolTip::add( m_upbtn, i18n( "Move up" ) ); - connect( m_upbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveUp() ) ); + connect( m_upbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveUp() ) ); m_upbtn->setEnabled( false ); m_downbtn = new KPushButton( mainw ); m_downbtn->setIconSet( SmallIconSet( "go-down" ) ); TQToolTip::add( m_downbtn, i18n( "Move down" ) ); - connect( m_downbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotMoveDown() ) ); + connect( m_downbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotMoveDown() ) ); m_downbtn->setEnabled( false ); TQLabel *m_filelabel = new TQLabel(i18n("F&iles:"), mainw); m_filelabel->setBuddy(m_files); @@ -89,21 +89,21 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) m_numbers->addColumn( i18n("Enterprise") ); m_numbers->header()->setStretchEnabled( true ); m_numbers->setSelectionMode( TQListView::Extended ); - connect( m_numbers, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotFaxSelectionChanged() ) ); - connect( m_numbers, TQT_SIGNAL( executed( TQListViewItem* ) ), TQT_SLOT( slotFaxExecuted( TQListViewItem* ) ) ); + connect( m_numbers, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotFaxSelectionChanged() ) ); + connect( m_numbers, TQ_SIGNAL( executed( TQListViewItem* ) ), TQ_SLOT( slotFaxExecuted( TQListViewItem* ) ) ); m_newbtn = new KPushButton( mainw ); m_newbtn->setPixmap( SmallIcon( "edit" ) ); TQToolTip::add( m_newbtn, i18n( "Add fax number" ) ); - connect( m_newbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxAdd() ) ); + connect( m_newbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotFaxAdd() ) ); m_abbtn = new KPushButton( mainw ); m_abbtn->setPixmap( SmallIcon( "kaddressbook" ) ); TQToolTip::add( m_abbtn, i18n( "Add fax number from addressbook" ) ); - connect( m_abbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotKab() ) ); + connect( m_abbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotKab() ) ); m_delbtn = new KPushButton( mainw ); m_delbtn->setIconSet( SmallIconSet( "edittrash" ) ); TQToolTip::add( m_delbtn, i18n( "Remove fax number" ) ); m_delbtn->setEnabled( false ); - connect( m_delbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotFaxRemove() ) ); + connect( m_delbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotFaxRemove() ) ); TQLabel *m_commentlabel = new TQLabel(i18n("&Comment:"), mainw); KSystemTray *m_tray = new KSystemTray(this); m_tray->setPixmap(SmallIcon("tdeprintfax")); @@ -124,9 +124,9 @@ KdeprintFax::KdeprintFax(TQWidget *parent, const char *name) m_time = new TQTimeEdit(mainw); m_time->setTime(TQTime::currentTime()); m_time->setEnabled(false); - connect(m_timecombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeComboActivated(int))); + connect(m_timecombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeComboActivated(int))); m_cover = new TQCheckBox(i18n("Send Co&ver Sheet"), mainw); - connect(m_cover, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCoverToggled(bool))); + connect(m_cover, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCoverToggled(bool))); m_subject = new TQLineEdit( mainw ); TQLabel *m_subjectlabel = new TQLabel( i18n( "Su&bject:" ), mainw ); m_subjectlabel->setBuddy( m_subject ); @@ -188,23 +188,23 @@ KdeprintFax::~KdeprintFax() void KdeprintFax::initActions() { - new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, this, TQT_SLOT(slotAdd()), actionCollection(), "file_add"); - new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, this, TQT_SLOT(slotRemove()), actionCollection(), "file_remove"); - new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, this, TQT_SLOT(slotFax()), actionCollection(), "fax_send"); - new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, this, TQT_SLOT(slotAbort()), actionCollection(), "fax_stop"); - new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, this, TQT_SLOT(slotKab()), actionCollection(), "fax_ab"); - new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, this, TQT_SLOT(slotViewLog()), actionCollection(), "fax_log"); - new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, this, TQT_SLOT(slotView()), actionCollection(), "file_view"); - new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, this, TQT_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" ); + new TDEAction(i18n("&Add File..."), "document-new", TQt::Key_Insert, this, TQ_SLOT(slotAdd()), actionCollection(), "file_add"); + new TDEAction(i18n("&Remove File"), "remove", TQt::Key_Delete, this, TQ_SLOT(slotRemove()), actionCollection(), "file_remove"); + new TDEAction(i18n("&Send Fax"), "connect_established", TQt::Key_Return, this, TQ_SLOT(slotFax()), actionCollection(), "fax_send"); + new TDEAction(i18n("A&bort"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(slotAbort()), actionCollection(), "fax_stop"); + new TDEAction(i18n("A&ddress Book"), "kaddressbook", TQt::CTRL+TQt::Key_A, this, TQ_SLOT(slotKab()), actionCollection(), "fax_ab"); + new TDEAction(i18n("V&iew Log"), "contents", TQt::CTRL+TQt::Key_L, this, TQ_SLOT(slotViewLog()), actionCollection(), "fax_log"); + new TDEAction(i18n("Vi&ew File"), "filefind", TQt::CTRL+TQt::Key_O, this, TQ_SLOT(slotView()), actionCollection(), "file_view"); + new TDEAction( i18n( "&New Fax Recipient..." ), "edit", TQt::CTRL+TQt::Key_N, this, TQ_SLOT( slotFaxAdd() ), actionCollection(), "fax_add" ); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); - KStdAction::showMenubar(this, TQT_SLOT(slotToggleMenuBar()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::showMenubar(this, TQ_SLOT(slotToggleMenuBar()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); actionCollection()->action("fax_stop")->setEnabled(false); - connect(actionCollection()->action("file_remove"), TQT_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQT_SLOT(setEnabled(bool))); + connect(actionCollection()->action("file_remove"), TQ_SIGNAL(enabled(bool)), actionCollection()->action("file_view"), TQ_SLOT(setEnabled(bool))); actionCollection()->action("file_remove")->setEnabled(false); createGUI(); diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp index fce4491e7..f1f39ca57 100644 --- a/tdescreensaver/blankscrn.cpp +++ b/tdescreensaver/blankscrn.cpp @@ -55,8 +55,8 @@ KBlankSetup::KBlankSetup( TQWidget *parent, const char *name ) KColorButton *colorPush = new KColorButton( color, main ); colorPush->setMinimumWidth(80); - connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ), - TQT_SLOT( slotColor(const TQColor &) ) ); + connect( colorPush, TQ_SIGNAL( changed(const TQColor &) ), + TQ_SLOT( slotColor(const TQColor &) ) ); grid->addWidget(colorPush, 1, 0); preview = new TQWidget( main ); diff --git a/tdm/cryptocardwatcher/main.cpp b/tdm/cryptocardwatcher/main.cpp index 5d27ff19b..34cc96b59 100644 --- a/tdm/cryptocardwatcher/main.cpp +++ b/tdm/cryptocardwatcher/main.cpp @@ -123,8 +123,8 @@ int main(int argc, char *argv[]) { TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - TQObject::connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - TQObject::connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + TQObject::connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + TQObject::connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } diff --git a/tdm/kfrontend/kchooser.cpp b/tdm/kfrontend/kchooser.cpp index 3076d4a3c..876f42c88 100644 --- a/tdm/kfrontend/kchooser.cpp +++ b/tdm/kfrontend/kchooser.cpp @@ -75,7 +75,7 @@ ChooserDlg::ChooserDlg() iline->setEnabled( TRUE ); TQLabel *itxt = new TQLabel( iline, i18n("Hos&t:"), this ); TQPushButton *addButton = new TQPushButton( i18n("A&dd"), this ); - connect( addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addHostname()) ); + connect( addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addHostname()) ); TQBoxLayout *hibox = new TQHBoxLayout( vbox, 10 ); hibox->addWidget( itxt ); hibox->addWidget( iline ); @@ -107,12 +107,12 @@ ChooserDlg::ChooserDlg() #endif sn = new TQSocketNotifier( rfd, TQSocketNotifier::Read, this ); - connect( sn, TQT_SIGNAL(activated( int )), TQT_SLOT(slotReadPipe()) ); + connect( sn, TQ_SIGNAL(activated( int )), TQ_SLOT(slotReadPipe()) ); - connect( pingButton, TQT_SIGNAL(clicked()), TQT_SLOT(pingHosts()) ); - connect( acceptButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); -// connect( helpButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) ); - connect( host_view, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(accept()) ); + connect( pingButton, TQ_SIGNAL(clicked()), TQ_SLOT(pingHosts()) ); + connect( acceptButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); +// connect( helpButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) ); + connect( host_view, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(accept()) ); adjustGeometry(); } diff --git a/tdm/kfrontend/kconsole.cpp b/tdm/kfrontend/kconsole.cpp index bf1560aed..d47576c12 100644 --- a/tdm/kfrontend/kconsole.cpp +++ b/tdm/kfrontend/kconsole.cpp @@ -129,7 +129,7 @@ KConsole::OpenConsole() gotcon: notifier = new TQSocketNotifier( fd, TQSocketNotifier::Read, this ); - connect( notifier, TQT_SIGNAL(activated( int )), TQT_SLOT(slotData()) ); + connect( notifier, TQ_SIGNAL(activated( int )), TQ_SLOT(slotData()) ); return 1; } diff --git a/tdm/kfrontend/kfdialog.cpp b/tdm/kfrontend/kfdialog.cpp index 428b2ce09..30ee85a00 100644 --- a/tdm/kfrontend/kfdialog.cpp +++ b/tdm/kfrontend/kfdialog.cpp @@ -178,7 +178,7 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t KPushButton *button = new KPushButton( KStdGuiItem::ok(), this ); button->setDefault( true ); button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); - connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( button, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 ); grid->addWidget( label1, 0, 0, TQt::AlignCenter ); diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index c7d694608..6e144600f 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/tdm/kfrontend/kgapp.cpp @@ -126,7 +126,7 @@ void GreeterApp::init() #ifdef WITH_TDEHWLIB TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); - connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); + connect(hwdevices, TQ_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQ_SLOT(deviceChanged(TDEGenericDevice*))); #endif } diff --git a/tdm/kfrontend/kgdialog.cpp b/tdm/kfrontend/kgdialog.cpp index 91058a0b8..684c57e6d 100644 --- a/tdm/kfrontend/kgdialog.cpp +++ b/tdm/kfrontend/kgdialog.cpp @@ -60,42 +60,42 @@ KGDialog::completeMenu() if (_isLocal) { dpyMenu = new TQPopupMenu( this ); int id = inserten( i18n("Sw&itch User"), ALT+Key_I, dpyMenu ); - connect( dpyMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotDisplaySelected( int )) ); - connect( dpyMenu, TQT_SIGNAL(aboutToShow()), - TQT_SLOT(slotPopulateDisplays()) ); + connect( dpyMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotDisplaySelected( int )) ); + connect( dpyMenu, TQ_SIGNAL(aboutToShow()), + TQ_SLOT(slotPopulateDisplays()) ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+CTRL+Key_Insert, id ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivateMenu( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivateMenu( int )) ); } #endif if (_allowClose) inserten( _isLocal ? i18n("R&estart X Server") : i18n("Clos&e Connection"), - ALT+Key_E, TQT_SLOT(slotExit()) ); + ALT+Key_E, TQ_SLOT(slotExit()) ); #ifdef XDMCP if (_isLocal && _loginMode != _switchIf) { switchCode = _switchCode; - inserten( _switchMsg, _switchAccel, TQT_SLOT(slotSwitch()) ); + inserten( _switchMsg, _switchAccel, TQ_SLOT(slotSwitch()) ); } #endif if (_hasConsole) - inserten( i18n("Co&nsole Login"), ALT+Key_N, TQT_SLOT(slotConsole()) ); + inserten( i18n("Co&nsole Login"), ALT+Key_N, TQ_SLOT(slotConsole()) ); if (_allowShutdown != SHUT_NONE) { ensureMenu(); - optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQT_SLOT(slotShutdown(int)), ALT+Key_S ); + optMenu->insertItem(SmallIconSet( "system-log-out" ), i18n("&Shutdown..."), this, TQ_SLOT(slotShutdown(int)), ALT+Key_S ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+CTRL+Key_Delete ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); accel = new TQAccel( this ); accel->insertItem( SHIFT+ALT+CTRL+Key_PageUp, SHUT_REBOOT ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); accel = new TQAccel( this ); accel->insertItem( SHIFT+ALT+CTRL+Key_PageDown, SHUT_HALT ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotShutdown( int )) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotShutdown( int )) ); } } @@ -125,7 +125,7 @@ KGDialog::inserten( const TQString& txt, int accel, TQPopupMenu *cmnu ) ensureMenu(); int id = optMenu->insertItem( txt, cmnu ); optMenu->setAccel( accel, id ); - optMenu->connectItem( id, this, TQT_SLOT(slotActivateMenu( int )) ); + optMenu->connectItem( id, this, TQ_SLOT(slotActivateMenu( int )) ); optMenu->setItemParameter( id, id ); return id; } @@ -151,7 +151,7 @@ KGDialog::slotSwitch() { #ifdef XDMCP // workaround for Qt bug - TQTimer::singleShot( 0, this, TQT_SLOT(slotReallySwitch()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotReallySwitch()) ); #endif } diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 19d27fe2f..d0815efbe 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -207,18 +207,18 @@ KGreeter::KGreeter( bool framed ) if (_userList) { readFacesList(); userView = new UserListView( framed, this ); - connect( userView, TQT_SIGNAL(clicked( TQListViewItem * )), - TQT_SLOT(slotUserClicked( TQListViewItem * )) ); - connect( userView, TQT_SIGNAL(doubleClicked( TQListViewItem * )), - TQT_SLOT(accept()) ); + connect( userView, TQ_SIGNAL(clicked( TQListViewItem * )), + TQ_SLOT(slotUserClicked( TQListViewItem * )) ); + connect( userView, TQ_SIGNAL(doubleClicked( TQListViewItem * )), + TQ_SLOT(accept()) ); } if (_userCompletion) { userList = new TQStringList; } sessMenu = new TQPopupMenu( this ); - connect( sessMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotSessionSelected( int )) ); + connect( sessMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotSessionSelected( int )) ); insertSessions(); if (curPlugin < 0) { @@ -230,8 +230,8 @@ KGreeter::KGreeter( bool framed ) mControlPipeHandler = new ControlPipeHandlerObject(); mControlPipeHandler->mKGreeterParent = this; mControlPipeHandler->moveToThread(mControlPipeHandlerThread); - TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString))); - TQTimer::singleShot(0, mControlPipeHandler, SLOT(run())); + TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString))); + TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run())); mControlPipeHandlerThread->start(); } @@ -258,8 +258,8 @@ void KGreeter::cryptographicCardWatcherSetup() { TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } #endif @@ -656,7 +656,7 @@ KGreeter::slotUserEntered() if (isVisible()) slotLoadPrevWM(); else - TQTimer::singleShot( 0, this, TQT_SLOT(slotLoadPrevWM()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotLoadPrevWM()) ); } void @@ -1053,7 +1053,7 @@ KStdGreeter::KStdGreeter() goButton = new TQPushButton( i18n("L&ogin"), this ); goButton->setDefault( true ); - connect( goButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( goButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); menuButton = new TQPushButton( i18n("&Menu"), this ); //helpButton @@ -1112,7 +1112,7 @@ KStdGreeter::KStdGreeter() verify->setInfoMessageDisplay(showInfoMessages); verify->start(); - TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup())); } void @@ -1168,8 +1168,8 @@ KThemedGreeter::KThemedGreeter() return; } - connect( themer, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotThemeActivated( const TQString & )) ); + connect( themer, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotThemeActivated( const TQString & )) ); console_rect = themer->findNode( "xconsole" ); // tdm ext userlist_rect = themer->findNode( "userlist" ); @@ -1256,14 +1256,14 @@ KThemedGreeter::KThemedGreeter() system_button = themer->findNode( "system_button" ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_M, 0 ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActionMenu()) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActionMenu()) ); pluginSetup(); verify->setInfoMessageDisplay(showInfoMessages); verify->start(); - TQTimer::singleShot(0, this, SLOT(cryptographicCardWatcherSetup())); + TQTimer::singleShot(0, this, TQ_SLOT(cryptographicCardWatcherSetup())); } bool diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index 66b13e974..105ee3aeb 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/tdm/kfrontend/kgverify.cpp @@ -105,8 +105,8 @@ KGVerify::KGVerify(KGVerifyHandler *_handler, KdmThemer *_themer, , cardLoginDevice(NULL) #endif { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); - connect( kapp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); + connect( kapp, TQ_SIGNAL(activity()), TQ_SLOT(slotActivity()) ); _parent->installEventFilter( this ); } @@ -125,8 +125,8 @@ KGVerify::getPlugMenu() uint np = pluginList.count(); if (np > 1) { plugMenu = new TQPopupMenu( parent ); - connect( plugMenu, TQT_SIGNAL(activated( int )), - TQT_SLOT(slotPluginSelected( int )) ); + connect( plugMenu, TQ_SIGNAL(activated( int )), + TQ_SLOT(slotPluginSelected( int )) ); for (uint i = 0; i < np; i++) plugMenu->insertItem( i18n(greetPlugins[pluginList[i]].info->name), pluginList[i] ); } @@ -1264,10 +1264,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user, hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); - TQTimer::singleShot( 0, verify, TQT_SLOT(start()) ); + TQTimer::singleShot( 0, verify, TQ_SLOT(start()) ); } KGChTok::~KGChTok() @@ -1321,7 +1321,7 @@ QXTimer::QXTimer() : inherited( 0 ) , left( -1 ) { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); } void diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 889f41e58..a52adabb2 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/tdm/kfrontend/krootimage.cpp @@ -51,8 +51,8 @@ MyApplication::MyApplication( const char *conf ) : TDEApplication(), renderer( 0, new KSimpleConfig( TQFile::decodeName( conf ) ) ) { - connect( &timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); - connect( &renderer, TQT_SIGNAL(imageDone( int )), this, TQT_SLOT(renderDone()) ); + connect( &timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); + connect( &renderer, TQ_SIGNAL(imageDone( int )), this, TQ_SLOT(renderDone()) ); renderer.enableTiling( true ); // optimize renderer.changeWallpaper(); // cannot do it when we're killed, so do it now timer.start( 60000 ); diff --git a/tdm/kfrontend/sakdlg.cpp b/tdm/kfrontend/sakdlg.cpp index 138045a52..879e30e02 100644 --- a/tdm/kfrontend/sakdlg.cpp +++ b/tdm/kfrontend/sakdlg.cpp @@ -133,7 +133,7 @@ SAKDlg::SAKDlg(TQWidget *parent) mSAKProcess = new TDEProcess; *mSAKProcess << "tdmtsak" << "dm"; - connect(mSAKProcess, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotSAKProcessExited())); + connect(mSAKProcess, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotSAKProcessExited())); mSAKProcess->start(); #ifdef WITH_TDEHWLIB @@ -143,8 +143,8 @@ SAKDlg::SAKDlg(TQWidget *parent) TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, TQT_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(certificateListAvailable(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } #endif @@ -153,8 +153,8 @@ SAKDlg::SAKDlg(TQWidget *parent) mControlPipeHandler = new ControlPipeHandlerObject(); mControlPipeHandler->mSAKDlgParent = this; mControlPipeHandler->moveToThread(mControlPipeHandlerThread); - TQObject::connect(mControlPipeHandler, SIGNAL(processCommand(TQString)), this, SLOT(processInputPipeCommand(TQString))); - TQTimer::singleShot(0, mControlPipeHandler, SLOT(run())); + TQObject::connect(mControlPipeHandler, TQ_SIGNAL(processCommand(TQString)), this, TQ_SLOT(processInputPipeCommand(TQString))); + TQTimer::singleShot(0, mControlPipeHandler, TQ_SLOT(run())); mControlPipeHandlerThread->start(); } diff --git a/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp index 7c792c083..9f511d221 100644 --- a/tdm/kfrontend/tdmadmindialog.cpp +++ b/tdm/kfrontend/tdmadmindialog.cpp @@ -70,7 +70,7 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent ) box->addLayout( verify->getLayout() ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_A, 0 ); - connect( accel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivatePlugMenu()) ); + connect( accel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivatePlugMenu()) ); box->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -87,8 +87,8 @@ TDMAdmin::TDMAdmin( const TQString &user, TQWidget *_parent ) hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); slotWhenChanged(); } diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp index f9a7122b8..88beae860 100644 --- a/tdm/kfrontend/tdmclock.cpp +++ b/tdm/kfrontend/tdmclock.cpp @@ -37,7 +37,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name ) { // start timer TQTimer *timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); timer->start( 1000 ); // reading rc file diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index 1a9ea254c..da0863be5 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/tdm/kfrontend/tdmshutdown.cpp @@ -108,7 +108,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) box->addLayout( verify->getLayout() ); TQAccel *accel = new TQAccel( this ); accel->insertItem( ALT+Key_A, 0 ); - connect( accel, TQT_SIGNAL(activated( int )), TQT_SLOT(slotActivatePlugMenu()) ); + connect( accel, TQ_SIGNAL(activated( int )), TQ_SLOT(slotActivatePlugMenu()) ); } box->addWidget( new KSeparator( KSeparator::HLine, this ) ); @@ -121,7 +121,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) okButton->setDefault( true ); hlay->addWidget( okButton ); hlay->addStretch( 1 ); - connect( okButton, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( okButton, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); } if (maySched) { KPushButton *schedButton = @@ -129,7 +129,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) schedButton->setSizePolicy( fp ); hlay->addWidget( schedButton ); hlay->addStretch( 1 ); - connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); + connect( schedButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) ); } cancelButton = new KPushButton( KStdGuiItem::cancel(), this ); cancelButton->setSizePolicy( fp ); @@ -137,7 +137,7 @@ TDMShutdownBase::complete( TQWidget *prevWidget ) cancelButton->setDefault( true ); hlay->addWidget( cancelButton ); hlay->addStretch( 1 ); - connect( cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); updateNeedRoot(); } @@ -260,8 +260,8 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) restart_rb = new TDMRadioButton( i18n("&Restart computer"), howGroup ); - connect( rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); - connect( restart_rb, TQT_SIGNAL(doubleClicked()), TQT_SLOT(accept()) ); + connect( rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) ); + connect( restart_rb, TQ_SIGNAL(doubleClicked()), TQ_SLOT(accept()) ); GSet( 1 ); GSendInt( G_ListBootOpts ); @@ -280,7 +280,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) + howGroup->insideSpacing(); hb->addSpacing( spc ); hb->addWidget( targets ); - connect( targets, TQT_SIGNAL(activated( int )), TQT_SLOT(slotTargetChanged()) ); + connect( targets, TQ_SIGNAL(activated( int )), TQ_SLOT(slotTargetChanged()) ); } GSet( 0 ); @@ -297,7 +297,7 @@ TDMShutdown::TDMShutdown( int _uid, TQWidget *_parent ) cb_force = new TQCheckBox( i18n("&Force after timeout"), schedGroup ); if (_allowNuke != SHUT_NONE) { - connect( cb_force, TQT_SIGNAL(clicked()), TQT_SLOT(slotWhenChanged()) ); + connect( cb_force, TQ_SIGNAL(clicked()), TQ_SLOT(slotWhenChanged()) ); mayNuke = true; } else cb_force->setEnabled( false ); @@ -437,9 +437,9 @@ TDMDelayedPushButton::TDMDelayedPushButton( const KGuiItem &item, : inherited( item, parent, name ) , pop( 0 ) { - connect( this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); - connect( this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) ); - connect( &popt, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) ); + connect( this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) ); + connect( &popt, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); } void TDMDelayedPushButton::setPopup( TQPopupMenu *p ) @@ -503,7 +503,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) int i = btnReboot->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnReboot->setAccel( "ALT+" + btnReboot->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnReboot); - connect(btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot())); + connect(btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot())); // Copied completely from the standard restart/shutdown dialog GSet( 1 ); @@ -522,7 +522,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) t, i ); } btnReboot->setPopup( targets ); - connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) ); + connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) ); } GSet( 0 ); // Copied completely from the standard restart/shutdown dialog @@ -534,7 +534,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) i = btnHalt->textLabel().find( TQRegExp("\\&"), 0 ); // i == 1 btnHalt->setAccel( "ALT+" + btnHalt->textLabel().lower()[i+1] ) ; hbuttonbox->addWidget ( btnHalt ); - connect(btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt())); + connect(btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt())); // cancel buttonbox TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() ); @@ -543,7 +543,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) // Back to tdm KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm ); hbuttonbox2->addWidget( btnBack ); - connect(btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); } else { @@ -567,14 +567,14 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off Computer"), "system-log-out" ), this ); buttonlay->addWidget( btnHalt ); - connect( btnHalt, TQT_SIGNAL(clicked()), TQT_SLOT(slotHalt()) ); + connect( btnHalt, TQ_SIGNAL(clicked()), TQ_SLOT(slotHalt()) ); buttonlay->addSpacing( KDialog::spacingHint() ); TDMDelayedPushButton *btnReboot = new TDMDelayedPushButton( KGuiItem( i18n("&Restart Computer"), "reload" ), this ); buttonlay->addWidget( btnReboot ); - connect( btnReboot, TQT_SIGNAL(clicked()), TQT_SLOT(slotReboot()) ); + connect( btnReboot, TQ_SIGNAL(clicked()), TQ_SLOT(slotReboot()) ); GSet( 1 ); GSendInt( G_ListBootOpts ); @@ -591,7 +591,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) t, i ); } btnReboot->setPopup( targets ); - connect( targets, TQT_SIGNAL(activated(int)), TQT_SLOT(slotReboot(int)) ); + connect( targets, TQ_SIGNAL(activated(int)), TQ_SLOT(slotReboot(int)) ); } GSet( 0 ); @@ -601,7 +601,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnSched = new KPushButton( KGuiItem( i18n("&Schedule...") ), this ); buttonlay->addWidget( btnSched ); - connect( btnSched, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) ); + connect( btnSched, TQ_SIGNAL(clicked()), TQ_SLOT(slotSched()) ); buttonlay->addStretch( 1 ); } @@ -612,7 +612,7 @@ TDMSlimShutdown::TDMSlimShutdown( TQWidget *_parent ) KPushButton *btnBack = new KPushButton( KStdGuiItem::cancel(), this ); buttonlay->addWidget( btnBack ); - connect( btnBack, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( btnBack, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); buttonlay->addSpacing( KDialog::spacingHint() ); } diff --git a/tdm/kfrontend/themer/tdmitem.cpp b/tdm/kfrontend/themer/tdmitem.cpp index e89890129..befcb7c35 100644 --- a/tdm/kfrontend/themer/tdmitem.cpp +++ b/tdm/kfrontend/themer/tdmitem.cpp @@ -238,7 +238,7 @@ KdmItem::setWidget( TQWidget *widget ) setGeometry(area, true); - connect( myWidget, TQT_SIGNAL(destroyed()), TQT_SLOT(widgetGone()) ); + connect( myWidget, TQ_SIGNAL(destroyed()), TQ_SLOT(widgetGone()) ); } void @@ -253,11 +253,11 @@ KdmItem::setLayoutItem( TQLayoutItem *item ) myLayoutItem = item; // XXX hiding not supported - it think it's pointless here if (myLayoutItem->widget()) - connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()), - TQT_SLOT(layoutItemGone()) ); + connect( myLayoutItem->widget(), TQ_SIGNAL(destroyed()), + TQ_SLOT(layoutItemGone()) ); else if (myLayoutItem->layout()) - connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()), - TQT_SLOT(layoutItemGone()) ); + connect( myLayoutItem->layout(), TQ_SIGNAL(destroyed()), + TQ_SLOT(layoutItemGone()) ); } void @@ -583,8 +583,8 @@ KdmItem::addChildItem( KdmItem *item ) } // signal bounce from child to parent - connect( item, TQT_SIGNAL(needUpdate( int, int, int, int )), TQT_SIGNAL(needUpdate( int, int, int, int )) ); - connect( item, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) ); + connect( item, TQ_SIGNAL(needUpdate( int, int, int, int )), TQ_SIGNAL(needUpdate( int, int, int, int )) ); + connect( item, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) ); } void diff --git a/tdm/kfrontend/themer/tdmlabel.cpp b/tdm/kfrontend/themer/tdmlabel.cpp index f2fae90a6..1af382819 100644 --- a/tdm/kfrontend/themer/tdmlabel.cpp +++ b/tdm/kfrontend/themer/tdmlabel.cpp @@ -100,7 +100,7 @@ KdmLabel::KdmLabel( KdmItem *parent, const TQDomNode &node, const char *name ) if (label.isTimer) { timer = new TQTimer( this ); timer->start( 1000 ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(update()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(update()) ); } setTextInt( lookupText( label.text ) ); } @@ -117,7 +117,7 @@ KdmLabel::setTextInt( const TQString &txt) cText.remove('&'); myAccel = new TQAccel(parentWidget()); myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode()); - connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel())); + connect(myAccel, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAccel())); } } diff --git a/tdm/kfrontend/themer/tdmthemer.cpp b/tdm/kfrontend/themer/tdmthemer.cpp index 16fdf7c89..f064e384a 100644 --- a/tdm/kfrontend/themer/tdmthemer.cpp +++ b/tdm/kfrontend/themer/tdmthemer.cpp @@ -78,24 +78,24 @@ KdmThemer::KdmThemer( const TQString &_filename, const TQString &mode, TQWidget // Set the root (screen) item rootItem = new KdmRect( parent, TQDomNode(), "tdm root" ); - connect( rootItem, TQT_SIGNAL(needUpdate( int, int, int, int )), - widget(), TQT_SLOT(update( int, int, int, int )) ); + connect( rootItem, TQ_SIGNAL(needUpdate( int, int, int, int )), + widget(), TQ_SLOT(update( int, int, int, int )) ); rootItem->setBaseDir( TQFileInfo( filename ).dirPath( true ) ); // generate all the items defined in the theme generateItems( rootItem ); - connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SIGNAL(activated( const TQString & )) ); - connect( rootItem, TQT_SIGNAL(activated( const TQString & )), TQT_SLOT(slotActivated( const TQString & )) ); + connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SIGNAL(activated( const TQString & )) ); + connect( rootItem, TQ_SIGNAL(activated( const TQString & )), TQ_SLOT(slotActivated( const TQString & )) ); - TQTimer::singleShot(800, this, TQT_SLOT(slotPaintRoot())); + TQTimer::singleShot(800, this, TQ_SLOT(slotPaintRoot())); /* *TODO* // Animation timer TQTimer *time = new TQTimer( this ); time->start( 500 ); - connect( time, TQT_SIGNAL(timeout()), TQT_SLOT(update()) ) + connect( time, TQ_SIGNAL(timeout()), TQ_SLOT(update()) ) */ } diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp index 44db90158..7a04b7fea 100644 --- a/tdmlib/kgreet_classic.cpp +++ b/tdmlib/kgreet_classic.cpp @@ -94,10 +94,10 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, if (fixedUser.isEmpty()) { loginEdit = new KLineEdit( parent ); loginEdit->setContextMenuEnabled( false ); - connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) ); - connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); - connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) ); - connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) ); + connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) ); + connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) ); + connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) ); + connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) ); if (pred) { parent->setTabOrder( pred, loginEdit ); pred = loginEdit; @@ -120,9 +120,9 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, else passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); - connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotActivity()) ); - connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); + connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotActivity()) ); + connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) ); if (pred) { parent->setTabOrder( pred, passwdEdit ); pred = passwdEdit; diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp index b0ef73a28..1f6da138c 100644 --- a/tdmlib/kgreet_pam.cpp +++ b/tdmlib/kgreet_pam.cpp @@ -127,10 +127,10 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, if (fixedUser.isEmpty()) { loginEdit = new KLineEdit( parent ); loginEdit->setContextMenuEnabled( false ); - connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) ); - connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); - connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) ); - connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) ); + connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) ); + connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) ); + connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) ); + connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) ); if (pred) { parent->setTabOrder( pred, loginEdit ); pred = loginEdit; @@ -154,9 +154,9 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, else passwdEdit = new TDMPasswordEdit( echoMode, parent ); - connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotActivity()) ); - connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); + connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotActivity()) ); + connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) ); if (pred) { parent->setTabOrder( pred, passwdEdit ); pred = passwdEdit; @@ -377,7 +377,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) if (tdmlabel) { //userLabel->setText(TQString::fromUtf8(prompt)); tdmlabel->label.text = TQString::fromUtf8(prompt); - TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update())); + TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update())); } } } @@ -395,7 +395,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) //userLabel->setText(TQString::fromUtf8(prompt)); TQString str = TQString::fromUtf8(prompt); tdmlabel->label.text = str; - TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update())); + TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update())); } } @@ -405,9 +405,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) passwdEdit = new TDMPasswordEdit( m_parentWidget ); else passwdEdit = new TDMPasswordEdit( echoMode, m_parentWidget); - connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotActivity()) ); - connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); + connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotActivity()) ); + connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) ); authEdit << passwdEdit; #if 1 @@ -435,7 +435,7 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking ) if (0) { //userLabel->setText(TQString::fromUtf8(prompt)); //tdmlabel->label.text = TQString::fromUtf8(prompt); - //TQTimer::singleShot(0, tdmlabel, TQT_SLOT(update())); + //TQTimer::singleShot(0, tdmlabel, TQ_SLOT(update())); } } else diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp index 6065a9123..b7a9211b8 100644 --- a/tdmlib/kgreet_winbind.cpp +++ b/tdmlib/kgreet_winbind.cpp @@ -108,12 +108,12 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, if (func != ChAuthTok) { if (fixedUser.isEmpty()) { domainCombo = new KComboBox( parent ); - connect( domainCombo, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotChangedDomain( const TQString & )) ); - connect( domainCombo, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotLoginLostFocus()) ); - connect( domainCombo, TQT_SIGNAL(activated( const TQString & )), - TQT_SLOT(slotActivity()) ); + connect( domainCombo, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotChangedDomain( const TQString & )) ); + connect( domainCombo, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotLoginLostFocus()) ); + connect( domainCombo, TQ_SIGNAL(activated( const TQString & )), + TQ_SLOT(slotActivity()) ); // should handle loss of focus loginEdit = new KLineEdit( parent ); loginEdit->setContextMenuEnabled( false ); @@ -136,13 +136,13 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, grid->addWidget( loginLabel, line, 0 ); grid->addWidget( loginEdit, line++, 1 ); } - connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotLoginLostFocus()) ); - connect( loginEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); - connect( loginEdit, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotActivity()) ); - connect( loginEdit, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotActivity()) ); - connect(&mDomainListTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotStartDomainList())); + connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotLoginLostFocus()) ); + connect( loginEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) ); + connect( loginEdit, TQ_SIGNAL(textChanged( const TQString & )), TQ_SLOT(slotActivity()) ); + connect( loginEdit, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotActivity()) ); + connect(&mDomainListTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotStartDomainList())); domainCombo->insertStringList( staticDomains ); - TQTimer::singleShot(0, this, TQT_SLOT(slotStartDomainList())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStartDomainList())); } else if (ctx != Login && ctx != Shutdown && grid) { domainLabel = new TQLabel( i18n("Domain:"), parent ); grid->addWidget( domainLabel, line, 0 ); @@ -156,9 +156,9 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, else passwdEdit = new TDMPasswordEdit( (KPasswordEdit::EchoModes)echoMode, parent ); - connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )), - TQT_SLOT(slotActivity()) ); - connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) ); + connect( passwdEdit, TQ_SIGNAL(textChanged( const TQString & )), + TQ_SLOT(slotActivity()) ); + connect( passwdEdit, TQ_SIGNAL(lostFocus()), TQ_SLOT(slotActivity()) ); if (!grid) { passwdEdit->adjustSize(); @@ -613,8 +613,8 @@ KWinbindGreeter::slotStartDomainList() mDomainListing.clear(); m_domainLister = new KProcIO; - connect(m_domainLister, TQT_SIGNAL(readReady(KProcIO*)), TQT_SLOT(slotReadDomainList())); - connect(m_domainLister, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotEndDomainList())); + connect(m_domainLister, TQ_SIGNAL(readReady(KProcIO*)), TQ_SLOT(slotReadDomainList())); + connect(m_domainLister, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotEndDomainList())); (*m_domainLister) << "wbinfo" << "--own-domain" << "--trusted-domains"; m_domainLister->setComm (TDEProcess::Stdout); diff --git a/tqt3integration/libtqttde/tqttde.cpp b/tqt3integration/libtqttde/tqttde.cpp index 3647db8a2..45b0a8b96 100644 --- a/tqt3integration/libtqttde/tqttde.cpp +++ b/tqt3integration/libtqttde/tqttde.cpp @@ -90,7 +90,7 @@ static DCOPClient* dcopClient() if( !tqApp->inherits( "TDEApplication" )) // KApp takes care of input blocking { static tqttde_EventLoop* loop = new tqttde_EventLoop; - TQObject::connect( dcop, TQT_SIGNAL( blockUserInput( bool )), loop, TQT_SLOT( block( bool ))); + TQObject::connect( dcop, TQ_SIGNAL( blockUserInput( bool )), loop, TQ_SLOT( block( bool ))); } } return dcop; diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index e397105b1..9a7d8f6e3 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -93,7 +93,7 @@ void* Module::getOpenFileNames( const TQString& filter, TQString workingDirector dlg->setMode(( multiple ? KFile::Files : KFile::File ) | KFile::LocalOnly ); dlg->setPlainCaption( caption.isNull() ? i18n("Open") : caption ); // TODO dlg->ops->clearHistory(); - connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int ))); + connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int ))); dlg->show(); return dlg; } @@ -117,7 +117,7 @@ void* Module::getSaveFileName( const TQString& initialSelection, const TQString& prepareDialog( dlg, parent, wmclass1, wmclass2 ); dlg->setOperationMode( KFileDialog::Saving ); dlg->setPlainCaption( caption.isNull() ? i18n("Save As") : caption ); - connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int ))); + connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int ))); dlg->show(); return dlg; } @@ -130,7 +130,7 @@ void* Module::getExistingDirectory( const TQString& initialDirectory, long paren name.isEmpty() ? name : "kdirselect dialog", false ); prepareDialog( dlg, parent, wmclass1, wmclass2 ); dlg->setPlainCaption( caption.isNull() ? i18n( "Select Folder" ) : caption ); - connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int ))); + connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int ))); dlg->show(); return dlg; } @@ -144,7 +144,7 @@ void* Module::getColor( const TQColor& color, long parent, const TQCString& name dlg->setColor( color ); prepareDialog( dlg, parent, wmclass1, wmclass2 ); dlg->setPlainCaption( i18n( "Select Color" )); - connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int ))); + connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int ))); dlg->show(); return dlg; } @@ -156,7 +156,7 @@ void* Module::getFont( bool /*ok*/, const TQFont& def, long parent, const TQCStr dlg->setFont( def, false ); prepareDialog( dlg, parent, wmclass1, wmclass2 ); dlg->setPlainCaption( i18n( "Select Font" )); - connect( dlg, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int ))); + connect( dlg, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int ))); dlg->show(); return dlg; } @@ -245,7 +245,7 @@ void* Module::messageBox1( int type, long parent, const TQString& caption, const &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec); prepareDialog( dialog, parent, wmclass1, wmclass2 ); dialog->setPlainCaption( caption ); - connect( dialog, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int ))); + connect( dialog, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int ))); btns b; b.buttons[ 0 ] = buttons[ 0 ]; b.buttons[ 1 ] = buttons[ 1 ]; @@ -277,7 +277,7 @@ void* Module::messageBox2( int type, long parent, const TQString& caption, const &checkboxResult, KMessageBox::Notify | KMessageBox::NoExec); prepareDialog( dialog, parent, wmclass1, wmclass2 ); dialog->setPlainCaption( caption ); - connect( dialog, TQT_SIGNAL( dialogDone( int )), TQT_SLOT( dialogDone( int ))); + connect( dialog, TQ_SIGNAL( dialogDone( int )), TQ_SLOT( dialogDone( int ))); dialog->show(); return dialog; } diff --git a/twin/activation.cpp b/twin/activation.cpp index 0deb81798..47e0f9a34 100644 --- a/twin/activation.cpp +++ b/twin/activation.cpp @@ -727,7 +727,7 @@ void Client::demandAttention( bool set ) if( demandAttentionKNotifyTimer == NULL ) { demandAttentionKNotifyTimer = new TQTimer( this ); - connect( demandAttentionKNotifyTimer, TQT_SIGNAL( timeout()), TQT_SLOT( demandAttentionKNotify())); + connect( demandAttentionKNotifyTimer, TQ_SIGNAL( timeout()), TQ_SLOT( demandAttentionKNotify())); } demandAttentionKNotifyTimer->start( 1000, true ); } diff --git a/twin/client.cpp b/twin/client.cpp index 75aa896d4..b8f00746e 100644 --- a/twin/client.cpp +++ b/twin/client.cpp @@ -130,14 +130,14 @@ Client::Client( Workspace *ws ) shadeHoverTimer = 0; configureRequestTimer = new TQTimer(this); - connect(configureRequestTimer, TQT_SIGNAL(timeout()), TQT_SLOT(configureRequestTimeout())); + connect(configureRequestTimer, TQ_SIGNAL(timeout()), TQ_SLOT(configureRequestTimeout())); shadowDelayTimer = new TQTimer(this); opacityCache = &activeOpacityCache; shadowAfterClient = NULL; shadowWidget = NULL; shadowMe = true; - connect(shadowDelayTimer, TQT_SIGNAL(timeout()), TQT_SLOT(drawShadow())); + connect(shadowDelayTimer, TQ_SIGNAL(timeout()), TQ_SLOT(drawShadow())); // set the initial mapping state mapping_state = WithdrawnState; @@ -1210,7 +1210,7 @@ void Client::drawDelayedShadow() void Client::drawShadowAfter(Client *after) { shadowAfterClient = after; - connect(after, TQT_SIGNAL(shadowDrawn()), TQT_SLOT(drawShadow())); + connect(after, TQ_SIGNAL(shadowDrawn()), TQ_SLOT(drawShadow())); } /*! @@ -1224,7 +1224,7 @@ void Client::drawShadow() // If we are waiting for another Client's shadow to be drawn, stop waiting now if (shadowAfterClient != NULL) { - disconnect(shadowAfterClient, TQT_SIGNAL(shadowDrawn()), this, TQT_SLOT(drawShadow())); + disconnect(shadowAfterClient, TQ_SIGNAL(shadowDrawn()), this, TQ_SLOT(drawShadow())); shadowAfterClient = NULL; } @@ -1791,7 +1791,7 @@ void Client::pingWindow() if( ping_timer != NULL ) return; // pinging already ping_timer = new TQTimer( this ); - connect( ping_timer, TQT_SIGNAL( timeout()), TQT_SLOT( pingTimeout())); + connect( ping_timer, TQ_SIGNAL( timeout()), TQ_SLOT( pingTimeout())); ping_timer->start( options->killPingTimeout, true ); ping_timestamp = get_tqt_x_time(); workspace()->sendPingToWindow( window(), ping_timestamp ); @@ -1850,8 +1850,8 @@ void Client::killProcess( bool ask, Time timestamp ) << "--applicationname" << resourceClass() << "--wid" << TQCString().setNum( window()) << "--timestamp" << TQCString().setNum( timestamp ); - connect( process_killer, TQT_SIGNAL( processExited( TDEProcess* )), - TQT_SLOT( processKillerExited())); + connect( process_killer, TQ_SIGNAL( processExited( TDEProcess* )), + TQ_SLOT( processKillerExited())); if( !process_killer->start( TDEProcess::NotifyOnExit )) { delete process_killer; @@ -2002,8 +2002,8 @@ bool Client::queryUserSuspendedResume() << "--windowname" << caption().utf8() << "--applicationname" << resourceClass() << "--wid" << TQCString().setNum( window()); - connect( process_resumer, TQT_SIGNAL( processExited( TDEProcess* )), - TQT_SLOT( processResumerExited())); + connect( process_resumer, TQ_SIGNAL( processExited( TDEProcess* )), + TQ_SLOT( processResumerExited())); if( !process_resumer->start( TDEProcess::NotifyOnExit )) { delete process_resumer; diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 6339402b7..16a451932 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -464,8 +464,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], TQt::LeftButton | TQt::RightButton); button[BtnMenu]->setPixmaps(P_MENU); button[BtnMenu]->setUseMiniIcon(); - connect(button[BtnMenu], TQT_SIGNAL(pressed()), - this, TQT_SLOT(menuButtonPressed())); + connect(button[BtnMenu], TQ_SIGNAL(pressed()), + this, TQ_SLOT(menuButtonPressed())); titleLayout->addWidget(button[BtnMenu]); } } @@ -477,8 +477,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], button[BtnSticky]->setPixmaps(P_PINUP); button[BtnSticky]->setToggle(); button[BtnSticky]->setDown(isOnAllDesktops()); - connect(button[BtnSticky], TQT_SIGNAL(clicked()), - this, TQT_SLOT(toggleOnAllDesktops())); + connect(button[BtnSticky], TQ_SIGNAL(clicked()), + this, TQ_SLOT(toggleOnAllDesktops())); titleLayout->addWidget(button[BtnSticky]); } } @@ -487,8 +487,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (providesContextHelp() && (!button[BtnHelp])) { button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]); button[BtnHelp]->setPixmaps(P_HELP); - connect(button[BtnHelp], TQT_SIGNAL(clicked()), - this, TQT_SLOT(showContextHelp())); + connect(button[BtnHelp], TQ_SIGNAL(clicked()), + this, TQ_SLOT(showContextHelp())); titleLayout->addWidget(button[BtnHelp]); } break; @@ -496,8 +496,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isMinimizable() && (!button[BtnIconify])) { button[BtnIconify] = new B2Button(this, tb,tips[BtnIconify]); button[BtnIconify]->setPixmaps(P_ICONIFY); - connect(button[BtnIconify], TQT_SIGNAL(clicked()), - this, TQT_SLOT(minimize())); + connect(button[BtnIconify], TQ_SIGNAL(clicked()), + this, TQ_SLOT(minimize())); titleLayout->addWidget(button[BtnIconify]); } break; @@ -507,8 +507,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], TQt::LeftButton | TQt::MidButton | TQt::RightButton); button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ? P_NORMALIZE : P_MAX); - connect(button[BtnMax], TQT_SIGNAL(clicked()), - this, TQT_SLOT(maxButtonClicked())); + connect(button[BtnMax], TQ_SIGNAL(clicked()), + this, TQ_SLOT(maxButtonClicked())); titleLayout->addWidget(button[BtnMax]); } break; @@ -516,8 +516,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isCloseable() && !button[BtnClose]) { button[BtnClose] = new B2Button(this, tb, tips[BtnClose]); button[BtnClose]->setPixmaps(P_CLOSE); - connect(button[BtnClose], TQT_SIGNAL(clicked()), - this, TQT_SLOT(closeWindow())); + connect(button[BtnClose], TQ_SIGNAL(clicked()), + this, TQ_SLOT(closeWindow())); titleLayout->addWidget(button[BtnClose]); } break; @@ -525,8 +525,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (isShadeable() && !button[BtnShade]) { button[BtnShade] = new B2Button(this, tb, tips[BtnShade]); button[BtnShade]->setPixmaps(P_SHADE); - connect(button[BtnShade], TQT_SIGNAL(clicked()), - this, TQT_SLOT(shadeButtonClicked())); + connect(button[BtnShade], TQ_SIGNAL(clicked()), + this, TQ_SLOT(shadeButtonClicked())); titleLayout->addWidget(button[BtnShade]); } break; @@ -534,8 +534,8 @@ void B2Client::addButtons(const TQString& s, const TQString tips[], if (resizable && !button[BtnResize]) { button[BtnResize] = new B2Button(this, tb, tips[BtnResize]); button[BtnResize]->setPixmaps(P_RESIZE); - connect(button[BtnResize], TQT_SIGNAL(pressed()), - this, TQT_SLOT(resizeButtonPressed())); + connect(button[BtnResize], TQ_SIGNAL(pressed()), + this, TQ_SLOT(resizeButtonPressed())); titleLayout->addWidget(button[BtnResize]); } break; diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp index 5b7a29e0f..b955254ec 100644 --- a/twin/clients/b2/config/config.cpp +++ b/twin/clients/b2/config/config.cpp @@ -70,12 +70,12 @@ B2Config::B2Config( TDEConfig* conf, TQWidget* parent ) load(conf); // Ensure we track user changes properly - connect(cbColorBorder, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged())); - connect(showGrabHandleCb, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged())); - connect(menuDblClickOp, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSelectionChanged())); + connect(cbColorBorder, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged())); + connect(showGrabHandleCb, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged())); + connect(menuDblClickOp, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSelectionChanged())); // Make the widgets visible in twindecoration gb->show(); } diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp index 886077925..36ddb1402 100644 --- a/twin/clients/default/config/config.cpp +++ b/twin/clients/default/config/config.cpp @@ -61,13 +61,13 @@ KDEDefaultConfig::KDEDefaultConfig( TDEConfig* conf, TQWidget* parent ) load( conf ); // Ensure we track user changes properly - connect( cbShowStipple, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); - connect( cbShowGrabBar, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbShowStipple, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); + connect( cbShowGrabBar, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); if (highcolor) - connect( cbUseGradients, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbUseGradients, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectionChanged()) ); // Make the widgets visible in twindecoration gb->show(); diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp index dfd5e20aa..98a46e308 100644 --- a/twin/clients/keramik/config/config.cpp +++ b/twin/clients/keramik/config/config.cpp @@ -55,10 +55,10 @@ KeramikConfig::KeramikConfig( TDEConfig* conf, TQWidget* parent ) c = new TDEConfig( "twinkeramikrc" ); ui = new KeramikConfigUI( parent ); - connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->smallCaptions, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->largeGrabBars, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); - connect( ui->useShadowedText, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); + connect( ui->showAppIcons, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->smallCaptions, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->largeGrabBars, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); + connect( ui->useShadowedText, TQ_SIGNAL(clicked()), TQ_SIGNAL(changed()) ); load( conf ); ui->show(); diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index fe7cc37d7..942962693 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -907,8 +907,8 @@ KeramikClient::KeramikClient( KDecorationBridge* bridge, KDecorationFactory* fac void KeramikClient::init() { - connect( this, TQT_SIGNAL( keepAboveChanged( bool )), TQT_SLOT( keepAboveChange( bool ))); - connect( this, TQT_SIGNAL( keepBelowChanged( bool )), TQT_SLOT( keepBelowChange( bool ))); + connect( this, TQ_SIGNAL( keepAboveChanged( bool )), TQ_SLOT( keepAboveChange( bool ))); + connect( this, TQ_SIGNAL( keepBelowChanged( bool )), TQ_SLOT( keepBelowChange( bool ))); createMainWidget( (WFlags)(WStaticContents | WResizeNoErase | WRepaintNoErase) ); widget()->installEventFilter( this ); @@ -1051,7 +1051,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) if (!isModalSystemNotification()) { if ( !button[MenuButton] ) { button[MenuButton] = new KeramikButton( this, "menu", MenuButton, i18n("Menu"), TQt::LeftButton|TQt::RightButton ); - connect( button[MenuButton], TQT_SIGNAL( pressed() ), TQT_SLOT( menuButtonPressed() ) ); + connect( button[MenuButton], TQ_SIGNAL( pressed() ), TQ_SLOT( menuButtonPressed() ) ); layout->addWidget( button[MenuButton] ); } } @@ -1065,7 +1065,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) OnAllDesktopsButton, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops") ); if(isOnAllDesktops()) button[OnAllDesktopsButton]->toggle(); - connect( button[OnAllDesktopsButton], TQT_SIGNAL( clicked() ), TQT_SLOT( toggleOnAllDesktops() ) ); + connect( button[OnAllDesktopsButton], TQ_SIGNAL( clicked() ), TQ_SLOT( toggleOnAllDesktops() ) ); layout->addWidget( button[OnAllDesktopsButton] ); } } @@ -1075,7 +1075,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'H' : if ( !button[HelpButton] && providesContextHelp() ) { button[HelpButton] = new KeramikButton( this, "help", HelpButton, i18n("Help") ); - connect( button[HelpButton], TQT_SIGNAL( clicked() ), TQT_SLOT( showContextHelp() ) ); + connect( button[HelpButton], TQ_SIGNAL( clicked() ), TQ_SLOT( showContextHelp() ) ); layout->addWidget( button[HelpButton] ); } break; @@ -1084,7 +1084,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'I' : if ( !button[MinButton] && isMinimizable() ) { button[MinButton] = new KeramikButton( this, "minimize", MinButton, i18n("Minimize") ); - connect( button[MinButton], TQT_SIGNAL( clicked() ), TQT_SLOT( minimize() ) ); + connect( button[MinButton], TQ_SIGNAL( clicked() ), TQ_SLOT( minimize() ) ); layout->addWidget( button[MinButton] ); } break; @@ -1093,7 +1093,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'A' : if ( !button[MaxButton] && isMaximizable() ) { button[MaxButton] = new KeramikButton( this, "maximize", MaxButton, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton ); - connect( button[MaxButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotMaximize() ) ); + connect( button[MaxButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotMaximize() ) ); layout->addWidget( button[MaxButton] ); } break; @@ -1102,7 +1102,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'X' : if ( !button[CloseButton] && isCloseable() ) { button[CloseButton] = new KeramikButton( this, "close", CloseButton, i18n("Close") ); - connect( button[CloseButton], TQT_SIGNAL( clicked() ), TQT_SLOT( closeWindow() ) ); + connect( button[CloseButton], TQ_SIGNAL( clicked() ), TQ_SLOT( closeWindow() ) ); layout->addWidget( button[CloseButton] ); } break; @@ -1111,7 +1111,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'F' : if ( !button[AboveButton]) { button[AboveButton] = new KeramikButton( this, "above", AboveButton, i18n("Keep Above Others") ); - connect( button[AboveButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotAbove() ) ); + connect( button[AboveButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotAbove() ) ); layout->addWidget( button[AboveButton] ); } break; @@ -1120,7 +1120,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) case 'B' : if ( !button[BelowButton]) { button[BelowButton] = new KeramikButton( this, "below", BelowButton, i18n("Keep Below Others") ); - connect( button[BelowButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotBelow() ) ); + connect( button[BelowButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotBelow() ) ); layout->addWidget( button[BelowButton] ); } break; @@ -1130,7 +1130,7 @@ void KeramikClient::addButtons( TQBoxLayout *layout, const TQString &s ) if ( !button[ShadeButton] && isShadeable() ) { button[ShadeButton] = new KeramikButton( this, "shade", ShadeButton, isSetShade() ? i18n("Unshade") : i18n( "Shade" )); - connect( button[ShadeButton], TQT_SIGNAL( clicked() ), TQT_SLOT( slotShade() ) ); + connect( button[ShadeButton], TQ_SIGNAL( clicked() ), TQ_SLOT( slotShade() ) ); layout->addWidget( button[ShadeButton] ); } break; diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp index 4daffae7c..defc8a3df 100644 --- a/twin/clients/kwmtheme/kwmthemeclient.cpp +++ b/twin/clients/kwmtheme/kwmthemeclient.cpp @@ -293,8 +293,8 @@ void KWMThemeClient::init() iconChange(); hb->addWidget(mnuBtn); mnuBtn->setFixedSize(20, 20); - connect(mnuBtn, TQT_SIGNAL(pressed()), this, - TQT_SLOT(menuButtonPressed())); + connect(mnuBtn, TQ_SIGNAL(pressed()), this, + TQ_SLOT(menuButtonPressed())); } else if(val == "Sticky"){ stickyBtn = new MyButton(widget(), "sticky"); @@ -303,7 +303,7 @@ void KWMThemeClient::init() stickyBtn->setPixmap(*pindownPix); else stickyBtn->setPixmap(*pinupPix); - connect(stickyBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT(toggleOnAllDesktops())); + connect(stickyBtn, TQ_SIGNAL( clicked() ), this, TQ_SLOT(toggleOnAllDesktops())); hb->addWidget(stickyBtn); stickyBtn->setFixedSize(20, 20); } @@ -311,7 +311,7 @@ void KWMThemeClient::init() btn = new MyButton(widget(), "iconify"); TQToolTip::add( btn, i18n("Minimize")); btn->setPixmap(*iconifyPix); - connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize())); + connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimize())); hb->addWidget(btn); btn->setFixedSize(20, 20); } @@ -319,7 +319,7 @@ void KWMThemeClient::init() maxBtn = new MyButton(widget(), "max"); TQToolTip::add( maxBtn, i18n("Maximize")); maxBtn->setPixmap(*maxPix); - connect(maxBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(maximize())); + connect(maxBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(maximize())); hb->addWidget(maxBtn); maxBtn->setFixedSize(20, 20); } @@ -327,7 +327,7 @@ void KWMThemeClient::init() btn = new MyButton(widget(), "close"); TQToolTip::add( btn, i18n("Close")); btn->setPixmap(*closePix); - connect(btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow())); + connect(btn, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeWindow())); hb->addWidget(btn); btn->setFixedSize(20, 20); } diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 4512203c4..187278d43 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/twin/clients/modernsystem/config/config.cpp @@ -44,7 +44,7 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p "easier, especially for trackballs and other mouse replacements " "on laptops.")); layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1); - connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged())); + connect(cbShowHandle, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged())); sliderBox = new TQVBox(handleBox); handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox); @@ -52,7 +52,7 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p i18n("Here you can change the size of the resize handle.")); handleSizeSlider->setTickInterval(1); handleSizeSlider->setTickmarks(TQSlider::Below); - connect(handleSizeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSelectionChanged())); + connect(handleSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSelectionChanged())); hbox = new TQHBox(sliderBox); hbox->setSpacing(6); diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp index 04658796c..81192f699 100644 --- a/twin/clients/plastik/config/config.cpp +++ b/twin/clients/plastik/config/config.cpp @@ -49,16 +49,16 @@ PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent) load(config); // setup the connections - connect(m_dialog->titleAlign, TQT_SIGNAL(clicked(int)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->animateButtons, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->menuClose, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->titleShadow, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); - connect(m_dialog->coloredBorder, TQT_SIGNAL(toggled(bool)), - this, TQT_SIGNAL(changed())); + connect(m_dialog->titleAlign, TQ_SIGNAL(clicked(int)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->animateButtons, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->menuClose, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->titleShadow, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); + connect(m_dialog->coloredBorder, TQ_SIGNAL(toggled(bool)), + this, TQ_SIGNAL(changed())); } PlastikConfig::~PlastikConfig() diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp index 5fdadc8e1..3f3f81f62 100644 --- a/twin/clients/plastik/plastikbutton.cpp +++ b/twin/clients/plastik/plastikbutton.cpp @@ -51,7 +51,7 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent, const char // no need to reset here as the button will be resetted on first resize. animTmr = new TQTimer(this); - connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) ); + connect(animTmr, TQ_SIGNAL(timeout() ), this, TQ_SLOT(animate() ) ); animProgress = 0; } diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp index 70dc87965..106ea28dc 100644 --- a/twin/clients/quartz/config/config.cpp +++ b/twin/clients/quartz/config/config.cpp @@ -49,8 +49,8 @@ QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent ) load( conf ); // Ensure we track user changes properly - connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); - connect( cbExtraSmall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( cbColorBorder, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) ); + connect( cbExtraSmall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) ); // Make the widgets visible in twindecoration gb->show(); diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp index e306520d5..0cf45a90b 100644 --- a/twin/clients/test/test.cpp +++ b/twin/clients/test/test.cpp @@ -24,7 +24,7 @@ void Decoration::init() button->show(); button->setCursor( TQt::arrowCursor ); button->move( 0, 0 ); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( closeWindow())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( closeWindow())); TQToolTip::add( button, "Zelva Mana" ); } } diff --git a/twin/events.cpp b/twin/events.cpp index 166767239..3d3ba999c 100644 --- a/twin/events.cpp +++ b/twin/events.cpp @@ -886,7 +886,7 @@ void Client::enterNotifyEvent( XCrossingEvent* e ) { delete shadeHoverTimer; shadeHoverTimer = new TQTimer( this ); - connect( shadeHoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( shadeHover() )); + connect( shadeHoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( shadeHover() )); shadeHoverTimer->start( options->shadeHoverInterval, TRUE ); } @@ -899,7 +899,7 @@ void Client::enterNotifyEvent( XCrossingEvent* e ) { delete autoRaiseTimer; autoRaiseTimer = new TQTimer( this ); - connect( autoRaiseTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoRaise() ) ); + connect( autoRaiseTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoRaise() ) ); autoRaiseTimer->start( options->autoRaiseInterval, TRUE ); } diff --git a/twin/kcmtwin/twindecoration/buttons.cpp b/twin/kcmtwin/twindecoration/buttons.cpp index 40f63d981..0a3c6331e 100644 --- a/twin/kcmtwin/twindecoration/buttons.cpp +++ b/twin/kcmtwin/twindecoration/buttons.cpp @@ -689,11 +689,11 @@ ButtonPositionWidget::ButtonPositionWidget(TQWidget *parent, const char* name) layout->addWidget(m_dropSite); layout->addWidget(m_buttonSource); - connect( m_dropSite, TQT_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQT_SLOT(hideButton(TQChar)) ); - connect( m_dropSite, TQT_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQT_SLOT(showButton(TQChar)) ); - connect( m_buttonSource, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQT_SLOT(removeSelectedButton()) ); + connect( m_dropSite, TQ_SIGNAL(buttonAdded(TQChar)), m_buttonSource, TQ_SLOT(hideButton(TQChar)) ); + connect( m_dropSite, TQ_SIGNAL(buttonRemoved(TQChar)), m_buttonSource, TQ_SLOT(showButton(TQChar)) ); + connect( m_buttonSource, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*)), m_dropSite, TQ_SLOT(removeSelectedButton()) ); - connect( m_dropSite, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()) ); + connect( m_dropSite, TQ_SIGNAL(changed()), TQ_SIGNAL(changed()) ); // insert all possible buttons into the source (backwards to keep the preferred order...) bool dummy; diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index 062ff6ac7..265fe2a1c 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/twin/kcmtwin/twindecoration/twindecoration.cpp @@ -193,32 +193,32 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c cbShadowDocks = new TQCheckBox(i18n("Docks and &panels"), whichShadowSettings); - connect(cbShadowDocks, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSelectionChanged())); + connect(cbShadowDocks, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSelectionChanged())); cbShadowOverrides = new TQCheckBox(i18n("O&verride windows"), whichShadowSettings); - connect(cbShadowOverrides, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSelectionChanged())); + connect(cbShadowOverrides, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSelectionChanged())); cbShadowTopMenus = new TQCheckBox(i18n("&Top menu"), whichShadowSettings); - connect(cbShadowTopMenus, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSelectionChanged())); + connect(cbShadowTopMenus, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSelectionChanged())); cbInactiveShadow = new TQCheckBox( i18n("Draw shadow under &inactive windows"), inactiveShadowSettings); - connect(cbInactiveShadow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotSelectionChanged())); + connect(cbInactiveShadow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotSelectionChanged())); shadowColourHBox = new TQHBox(activeShadowSettings); shadowColourHBox->setSpacing(KDialog::spacingHint()); shadowColourLabel = new TQLabel(i18n("Colour:"), shadowColourHBox); shadowColourButton = new KColorButton(shadowColourHBox); - connect(shadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged())); + connect(shadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged())); inactiveShadowColourHBox = new TQHBox(inactiveShadowSettings); inactiveShadowColourHBox->setSpacing(KDialog::spacingHint()); inactiveShadowColourLabel = new TQLabel(i18n("Colour:"), inactiveShadowColourHBox); inactiveShadowColourButton = new KColorButton(inactiveShadowColourHBox); - connect(inactiveShadowColourButton, TQT_SIGNAL(changed(const TQColor &)), TQT_SLOT(slotSelectionChanged())); + connect(inactiveShadowColourButton, TQ_SIGNAL(changed(const TQColor &)), TQ_SLOT(slotSelectionChanged())); shadowOpacityHBox = new TQHBox(activeShadowSettings); shadowOpacityHBox->setSpacing(KDialog::spacingHint()); @@ -229,12 +229,12 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowOpacitySlider->setTickInterval(10); shadowOpacitySpinBox = new TQSpinBox(1, 100, 1, shadowOpacityHBox); shadowOpacitySpinBox->setSuffix(" %"); - connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), shadowOpacitySpinBox, - TQT_SLOT(setValue(int))); - connect(shadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)), shadowOpacitySlider, - TQT_SLOT(setValue(int))); - connect(shadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), shadowOpacitySpinBox, + TQ_SLOT(setValue(int))); + connect(shadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)), shadowOpacitySlider, + TQ_SLOT(setValue(int))); + connect(shadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); inactiveShadowOpacityHBox = new TQHBox(inactiveShadowSettings); inactiveShadowOpacityHBox->setSpacing(KDialog::spacingHint()); @@ -247,14 +247,14 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowOpacitySpinBox = new TQSpinBox(1, 100, 1, inactiveShadowOpacityHBox); inactiveShadowOpacitySpinBox->setSuffix(" %"); - connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), + connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), inactiveShadowOpacitySpinBox, - TQT_SLOT(setValue(int))); - connect(inactiveShadowOpacitySpinBox, TQT_SIGNAL(valueChanged(int)), + TQ_SLOT(setValue(int))); + connect(inactiveShadowOpacitySpinBox, TQ_SIGNAL(valueChanged(int)), inactiveShadowOpacitySlider, - TQT_SLOT(setValue(int))); - connect(inactiveShadowOpacitySlider, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + TQ_SLOT(setValue(int))); + connect(inactiveShadowOpacitySlider, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); shadowXOffsetHBox = new TQHBox(activeShadowSettings); shadowXOffsetHBox->setSpacing(KDialog::spacingHint()); @@ -263,8 +263,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowXOffsetHBox); shadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowXOffsetHBox); shadowXOffsetSpinBox->setSuffix(i18n(" pixels")); - connect(shadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(shadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); inactiveShadowXOffsetHBox = new TQHBox(inactiveShadowSettings); inactiveShadowXOffsetHBox->setSpacing(KDialog::spacingHint()); @@ -274,8 +274,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowXOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, inactiveShadowXOffsetHBox); inactiveShadowXOffsetSpinBox->setSuffix(i18n(" pixels")); - connect(inactiveShadowXOffsetSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(inactiveShadowXOffsetSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); shadowYOffsetHBox = new TQHBox(activeShadowSettings); shadowYOffsetHBox->setSpacing(KDialog::spacingHint()); @@ -284,8 +284,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowYOffsetHBox); shadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, shadowYOffsetHBox); shadowYOffsetSpinBox->setSuffix(i18n(" pixels")); - connect(shadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(shadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); inactiveShadowYOffsetHBox = new TQHBox(inactiveShadowSettings); inactiveShadowYOffsetHBox->setSpacing(KDialog::spacingHint()); @@ -295,8 +295,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowYOffsetSpinBox = new TQSpinBox(-1024, 1024, 1, inactiveShadowYOffsetHBox); inactiveShadowYOffsetSpinBox->setSuffix(i18n(" pixels")); - connect(inactiveShadowYOffsetSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(inactiveShadowYOffsetSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); shadowThicknessHBox = new TQHBox(activeShadowSettings); shadowThicknessHBox->setSpacing(KDialog::spacingHint()); @@ -306,8 +306,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c shadowThicknessSpinBox = new TQSpinBox(1, 100, 1, shadowThicknessHBox); shadowThicknessSpinBox->setSuffix(i18n(" pixels")); - connect(shadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(shadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); inactiveShadowThicknessHBox = new TQHBox(inactiveShadowSettings); inactiveShadowThicknessHBox->setSpacing(KDialog::spacingHint()); @@ -317,8 +317,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c inactiveShadowThicknessSpinBox = new TQSpinBox(1, 100, 1, inactiveShadowThicknessHBox); inactiveShadowThicknessSpinBox->setSuffix(i18n(" pixels")); - connect(inactiveShadowThicknessSpinBox, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotSelectionChanged())); + connect(inactiveShadowThicknessSpinBox, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotSelectionChanged())); // Page 4 (WM selector) windowmanagerPage = new TQWidget( tabWidget ); @@ -355,25 +355,25 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c tabWidget->insertTab( shadowPage, i18n("&Shadows") ); tabWidget->insertTab( windowmanagerPage, i18n("&Window Manager") ); - connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotButtonsChanged()) ); // update preview etc. - connect( buttonPositionWidget, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); // emit changed()... - connect( decorationList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) ); - connect( decorationList, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotChangeDecoration(const TQString&)) ); - connect( cbUseCustomButtonPositions, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), buttonPositionWidget, TQT_SLOT(setEnabled(bool))); - connect(cbUseCustomButtonPositions, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotButtonsChanged()) ); - connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), activeShadowSettings, TQT_SLOT(setEnabled(bool))); - connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), inactiveShadowSettings, TQT_SLOT(setEnabled(bool))); - connect(cbWindowShadow, TQT_SIGNAL(toggled(bool)), whichShadowSettings, TQT_SLOT(setEnabled(bool))); - - connect( cbShowToolTips, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - connect( cbWindowShadow, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int ))); -// connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - - connect( thirdpartyWMList, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotSelectionChanged()) ); - connect( thirdpartyWMArguments, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotSelectionChanged()) ); + connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotButtonsChanged()) ); // update preview etc. + connect( buttonPositionWidget, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) ); // emit changed()... + connect( decorationList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) ); + connect( decorationList, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotChangeDecoration(const TQString&)) ); + connect( cbUseCustomButtonPositions, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) ); + connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), buttonPositionWidget, TQ_SLOT(setEnabled(bool))); + connect(cbUseCustomButtonPositions, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotButtonsChanged()) ); + connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), activeShadowSettings, TQ_SLOT(setEnabled(bool))); + connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), inactiveShadowSettings, TQ_SLOT(setEnabled(bool))); + connect(cbWindowShadow, TQ_SIGNAL(toggled(bool)), whichShadowSettings, TQ_SLOT(setEnabled(bool))); + + connect( cbShowToolTips, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) ); + connect( cbWindowShadow, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) ); + connect( cBorder, TQ_SIGNAL( activated( int )), TQ_SLOT( slotBorderChanged( int ))); +// connect( cbUseMiniWindows, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) ); + + connect( thirdpartyWMList, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotSelectionChanged()) ); + connect( thirdpartyWMArguments, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotSelectionChanged()) ); // Allow twin dcop signal to update our selection list connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); @@ -660,10 +660,10 @@ void KWinDecorationModule::resetPlugin( TDEConfig* conf, const TQString& current pluginObject = (TQObject*)(allocatePlugin( conf, pluginConfigWidget )); // connect required signals and slots together... - connect( pluginObject, TQT_SIGNAL(changed()), this, TQT_SLOT(slotSelectionChanged()) ); - connect( this, TQT_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQT_SLOT(load(TDEConfig*)) ); - connect( this, TQT_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQT_SLOT(save(TDEConfig*)) ); - connect( this, TQT_SIGNAL(pluginDefaults()), pluginObject, TQT_SLOT(defaults()) ); + connect( pluginObject, TQ_SIGNAL(changed()), this, TQ_SLOT(slotSelectionChanged()) ); + connect( this, TQ_SIGNAL(pluginLoad(TDEConfig*)), pluginObject, TQ_SLOT(load(TDEConfig*)) ); + connect( this, TQ_SIGNAL(pluginSave(TDEConfig*)), pluginObject, TQ_SLOT(save(TDEConfig*)) ); + connect( this, TQ_SIGNAL(pluginDefaults()), pluginObject, TQ_SLOT(defaults()) ); pluginConfigWidget->show(); return; } diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index e55d5a15f..2ce258c3c 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/twin/kcmtwin/twinoptions/main.cpp @@ -102,37 +102,37 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name) mFocus = new KFocusConfig(false, mConfig, this, "TWin Focus Config"); mFocus->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mFocus, i18n("&Focus")); - connect(mFocus, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mFocus, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "TWin TitleBar Actions"); mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); - connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mTitleBarActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "TWin Window Actions"); mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); - connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mWindowActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mMoving = new KMovingConfig(false, mConfig, this, "TWin Moving"); mMoving->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mMoving, i18n("&Moving")); - connect(mMoving, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mMoving, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mABorders = new KActiveBorderConfig(false, mConfig, this, "TWin Active Borders"); mABorders->layout()->setMargin(KDialog::marginHint()); tab->addTab(mABorders, i18n("Active &Borders")); - connect(mABorders, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mABorders, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mAdvanced = new KAdvancedConfig(false, mConfig, this, "TWin Advanced"); mAdvanced->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mAdvanced, i18n("Ad&vanced")); - connect(mAdvanced, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mAdvanced, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mTranslucency = new KTranslucencyConfig(false, mConfig, this, "TWin Translucency"); mTranslucency->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTranslucency, i18n("&Translucency")); - connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mTranslucency, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), @@ -266,12 +266,12 @@ TDEActionsOptions::TDEActionsOptions(TQWidget *parent, const char *name) mTitleBarActions = new KTitleBarActionsConfig(false, mConfig, this, "TWin TitleBar Actions"); mTitleBarActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mTitleBarActions, i18n("&Titlebar Actions")); - connect(mTitleBarActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mTitleBarActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); mWindowActions = new KWindowActionsConfig(false, mConfig, this, "TWin Window Actions"); mWindowActions->layout()->setMargin( KDialog::marginHint() ); tab->addTab(mWindowActions, i18n("Window Actio&ns")); - connect(mWindowActions, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(mWindowActions, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } TDEActionsOptions::~TDEActionsOptions() diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index 3314604e7..0e197071c 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/twin/kcmtwin/twinoptions/mouse.cpp @@ -164,7 +164,7 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co combo->insertItem(i18n("On All Desktops")); combo->insertItem(i18n("Nothing")); combo->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hlayout->addWidget(combo); coTiDbl = combo; TQWhatsThis::add(combo, i18n("Behavior on <em>double</em> click into the titlebar.")); @@ -189,14 +189,14 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co comboW->insertItem(i18n("Change Opacity")); comboW->insertItem(i18n("Nothing")); comboW->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed)); - connect(comboW, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(comboW, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); hlayoutW->addWidget(comboW); coTiW = comboW; TQWhatsThis::add(comboW, txtButton4); label->setBuddy(comboW); cbTiRevW = new TQCheckBox(i18n("Reverse wheel direction"), this); - connect(cbTiRevW, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(cbTiRevW, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); TQWhatsThis::add( cbTiRevW, i18n("Use this to reverse the action of the mouse wheel.") ); hlayoutW->addWidget(cbTiRevW); @@ -266,21 +266,21 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co // Titlebar and frame, active, mouse button 1 combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiAct1 = combo; TQWhatsThis::add(combo, txtButton1); // Titlebar and frame, active, mouse button 2 combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiAct2 = combo; TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>active</em> window.")); // Titlebar and frame, active, mouse button 3 combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiAct3 = combo; TQWhatsThis::add(combo, txtButton3 ); @@ -310,19 +310,19 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiInAct1 = combo; TQWhatsThis::add(combo, txtButton1); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiInAct2 = combo; TQWhatsThis::add(combo, i18n("Behavior on <em>middle</em> click into the titlebar or frame of an <em>inactive</em> window.")); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coTiInAct3 = combo; TQWhatsThis::add(combo, txtButton3); @@ -362,13 +362,13 @@ KTitleBarActionsConfig::KTitleBarActionsConfig (bool _standAlone, TDEConfig *_co coMax[b] = new ToolTipComboBox(box, tbl_Max); for (int t = 0; t < 3; ++t) coMax[b]->insertItem(maxButtonPixmaps[t]); - connect(coMax[b], TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect(coMax[b], TQT_SIGNAL(activated(int)), coMax[b], TQT_SLOT(changed())); + connect(coMax[b], TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect(coMax[b], TQ_SIGNAL(activated(int)), coMax[b], TQ_SLOT(changed())); TQWhatsThis::add( coMax[b], txtButton[b] ); coMax[b]->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum )); } - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); layout->addStretch(); @@ -655,19 +655,19 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config TQComboBox* combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coWin1 = combo; TQWhatsThis::add( combo, strWin1 ); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coWin2 = combo; TQWhatsThis::add( combo, strWin2 ); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coWin3 = combo; TQWhatsThis::add( combo, strWin3 ); @@ -727,7 +727,7 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config combo = new TQComboBox(grid); combo->insertItem(i18n("Meta")); combo->insertItem(i18n("Alt")); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAllKey = combo; TQWhatsThis::add( combo, strAllKey ); @@ -743,19 +743,19 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAll1 = combo; TQWhatsThis::add( combo, strAll1 ); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAll2 = combo; TQWhatsThis::add( combo, strAll2 ); combo = new TQComboBox(grid); combo->insertStringList(items); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAll3 = combo; TQWhatsThis::add( combo, strAll3 ); @@ -767,12 +767,12 @@ KWindowActionsConfig::KWindowActionsConfig (bool _standAlone, TDEConfig *_config combo->insertItem(i18n("Move to Previous/Next Desktop")); combo->insertItem(i18n("Change Opacity")); combo->insertItem(i18n("Nothing")); - connect(combo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(combo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); coAllW = combo; TQWhatsThis::add( combo, strAllW ); cbAllRevW = new TQCheckBox(i18n("Reverse wheel direction"), grid); - connect(cbAllRevW, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(cbAllRevW, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); TQWhatsThis::add( cbAllRevW, i18n("Use this to reverse the action of the mouse wheel.") ); layout->addStretch(); diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 30d565716..9d8e8d617 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -169,12 +169,12 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par TQWhatsThis::add( focusCombo, wtstr); TQWhatsThis::add(fLabel, wtstr); - connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setAutoRaiseEnabled()) ); + connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setAutoRaiseEnabled()) ); // autoraise delay autoRaiseOn = new TQCheckBox(i18n("Auto &raise"), fcsBox); fLay->addWidget(autoRaiseOn); - connect(autoRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(autoRaiseOnTog(bool))); + connect(autoRaiseOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(autoRaiseOnTog(bool))); autoRaise = new KIntNumInput(500, fcsBox); autoRaise->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); @@ -183,11 +183,11 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par autoRaise->setSuffix(i18n(" msec")); fLay->addWidget(autoRaise); - connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDelayFocusEnabled()) ); + connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDelayFocusEnabled()) ); delayFocusOn = new TQCheckBox(i18n("Delay focus"), fcsBox); fLay->addWidget(delayFocusOn); - connect(delayFocusOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(delayFocusOnTog(bool))); + connect(delayFocusOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(delayFocusOnTog(bool))); delayFocus = new KIntNumInput(500, fcsBox); delayFocus->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); @@ -197,7 +197,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par fLay->addWidget(delayFocus); clickRaiseOn = new TQCheckBox(i18n("Click &raises active window"), fcsBox); - connect(clickRaiseOn,TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(clickRaiseOnTog(bool))); + connect(clickRaiseOn,TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(clickRaiseOnTog(bool))); fLay->addWidget(clickRaiseOn); // fLay->addColSpacing(0,TQMAX(autoRaiseOn->sizeHint().width(), @@ -263,7 +263,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par " with the focused window. This option is by default disabled for Click to focus and" " enabled for other focus policies." ); TQWhatsThis::add( activeMouseScreen, wtstr ); - connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateActiveMouseScreen())); + connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateActiveMouseScreen())); if (!TQApplication::desktop()->isVirtualDesktop() || TQApplication::desktop()->numScreens() == 1) // No Ximerama @@ -291,7 +291,7 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par " is pressed, with no popup widget. In addition, the previously" " activated window will be sent to the back in this mode."); TQWhatsThis::add( altTabPopup, wtstr ); - connect(focusCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateAltTabMode())); + connect(focusCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateAltTabMode())); traverseAll = new TQCheckBox( i18n( "&Traverse windows on all desktops" ), kbdBox ); kLay->addWidget( traverseAll ); @@ -319,17 +319,17 @@ KFocusConfig::KFocusConfig (bool _standAlone, TDEConfig *_config, TQWidget * par lay->addStretch(); // Any changes goes to slotChanged() - connect(focusCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect(fcsBox, TQT_SIGNAL(clicked(int)), TQT_SLOT(changed())); - connect(autoRaise, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(delayFocus, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(separateScreenFocus, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(activeMouseScreen, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(altTabPopup, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(traverseAll, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(rollOverDesktops, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(showPopupinfo, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(focusStealing, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(focusCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect(fcsBox, TQ_SIGNAL(clicked(int)), TQ_SLOT(changed())); + connect(autoRaise, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(delayFocus, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(separateScreenFocus, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(activeMouseScreen, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(altTabPopup, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(traverseAll, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(rollOverDesktops, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(showPopupinfo, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(focusStealing, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); load(); } @@ -686,15 +686,15 @@ KActiveBorderConfig::KActiveBorderConfig(bool _standAlone, TDEConfig *_config, T active_vbox->addSpacing(15); active_vbox->addWidget(tilingOpaque); - connect(active_box, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateActiveBorders())); + connect(active_box, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateActiveBorders())); // Any changes go to slotChanged() - connect(active_box, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); - connect(active_move, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(active_maximize, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); - connect(delays, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(distance, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(tilingOpaque, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(active_box, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); + connect(active_move, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(active_maximize, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); + connect(delays, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(distance, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(tilingOpaque, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); lay->addWidget(active_box); lay->addStretch(); @@ -860,7 +860,7 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget shadeHoverOn = new TQCheckBox(i18n("&Enable hover"), shBox); - connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(shadeHoverChanged(bool))); + connect(shadeHoverOn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(shadeHoverChanged(bool))); shadeHover = new KIntNumInput(500, shBox); shadeHover->setLabel(i18n("Dela&y:"), TQt::AlignVCenter|TQt::AlignLeft); @@ -878,16 +878,16 @@ KAdvancedConfig::KAdvancedConfig (bool _standAlone, TDEConfig *_config, TQWidget lay->addWidget(shBox); // Any changes goes to slotChanged() - connect(animateShade, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(shadeHoverOn, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(shadeHover, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(animateShade, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(shadeHoverOn, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(shadeHover, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); hideUtilityWindowsForInactive = new TQCheckBox( i18n( "Hide utility windows for inactive applications" ), this ); TQWhatsThis::add( hideUtilityWindowsForInactive, i18n( "When turned on, utility windows (tool windows, torn-off menus,…) of inactive applications will be" " hidden and will be shown only when the application becomes active. Note that applications" " have to mark the windows with the proper window type for this feature to work." )); - connect(hideUtilityWindowsForInactive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(hideUtilityWindowsForInactive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); lay->addWidget( hideUtilityWindowsForInactive ); lay->addStretch(); @@ -1027,8 +1027,8 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa minimizeAnimSlider->setTickmarks(TQSlider::Below); rLay->addMultiCellWidget(minimizeAnimSlider,0,0,1,2); - connect(minimizeAnimOn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setMinimizeAnim(bool))); - connect(minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMinimizeAnimSpeed(int))); + connect(minimizeAnimOn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setMinimizeAnim(bool))); + connect(minimizeAnimSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMinimizeAnimSpeed(int))); minimizeAnimSlowLabel= new TQLabel(i18n("Slow"),windowsBox); minimizeAnimSlowLabel->setAlignment(TQt::AlignTop|TQt::AlignLeft); @@ -1143,19 +1143,19 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa load(); // Any changes goes to slotChanged() - connect( moveOpaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect( resizeOpaque, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect( geometryTipOn, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect( minimizeAnimOn, TQT_SIGNAL(clicked() ), TQT_SLOT(changed())); - connect( minimizeAnimSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect( moveResizeMaximized, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect( resetMaximizedWindowGeometry, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect( placementCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); - connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect( BrdrSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotBrdrSnapChanged(int))); - connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect( WndwSnap, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotWndwSnapChanged(int))); - connect( OverlapSnap, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect( moveOpaque, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect( resizeOpaque, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect( geometryTipOn, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect( minimizeAnimOn, TQ_SIGNAL(clicked() ), TQ_SLOT(changed())); + connect( minimizeAnimSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect( moveResizeMaximized, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect( resetMaximizedWindowGeometry, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect( placementCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); + connect( BrdrSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect( BrdrSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotBrdrSnapChanged(int))); + connect( WndwSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect( WndwSnap, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotWndwSnapChanged(int))); + connect( OverlapSnap, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); // To get suffix to BrdrSnap and WndwSnap inputs with default values. slotBrdrSnapChanged(BrdrSnap->value()); @@ -1640,84 +1640,84 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, TDEConfig *_config, lay->addWidget(useTranslucency); lay->addWidget(tabW); - connect(useTranslucency, TQT_SIGNAL(toggled(bool)), tabW, TQT_SLOT(setEnabled(bool))); - - connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), activeWindowOpacity, TQT_SLOT(setEnabled(bool))); - connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQT_SLOT(setEnabled(bool))); - connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), movingWindowOpacity, TQT_SLOT(setEnabled(bool))); - connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), dockWindowOpacity, TQT_SLOT(setEnabled(bool))); - - connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(onlyDecoTranslucent, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(activeWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(inactiveWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(movingWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(dockWindowTransparency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(keepAboveAsActive, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useOpenGL, TQT_SIGNAL(toggled(bool)), blurBackground, TQT_SLOT(setEnabled(bool))); - connect(blurBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useOpenGL, TQT_SIGNAL(toggled(bool)), greyscaleBackground, TQT_SLOT(setEnabled(bool))); - connect(greyscaleBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(removeShadowsOnResize, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(removeShadowsOnMove, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - - connect(activeWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(inactiveWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(movingWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(dockWindowOpacity, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(dockWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(menuWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(activeWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(baseShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(changed())); - connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(fadeInMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(fadeInToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - - connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts())); - connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts())); - connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts())); - connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(processShadowLockouts())); + connect(useTranslucency, TQ_SIGNAL(toggled(bool)), tabW, TQ_SLOT(setEnabled(bool))); + + connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), activeWindowOpacity, TQ_SLOT(setEnabled(bool))); + connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), inactiveWindowOpacity, TQ_SLOT(setEnabled(bool))); + connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), movingWindowOpacity, TQ_SLOT(setEnabled(bool))); + connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), dockWindowOpacity, TQ_SLOT(setEnabled(bool))); + + connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(onlyDecoTranslucent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(activeWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(inactiveWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(movingWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(dockWindowTransparency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(keepAboveAsActive, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(disableARGB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useOpenGL, TQ_SIGNAL(toggled(bool)), blurBackground, TQ_SLOT(setEnabled(bool))); + connect(blurBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useOpenGL, TQ_SIGNAL(toggled(bool)), greyscaleBackground, TQ_SLOT(setEnabled(bool))); + connect(greyscaleBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(removeShadowsOnResize, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(removeShadowsOnMove, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + + connect(activeWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(inactiveWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(movingWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(dockWindowOpacity, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(dockWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(menuWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(activeWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(inactiveWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(baseShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(shadowTopOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(shadowLeftOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(shadowColor, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(changed())); + connect(fadeInWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(fadeInMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(fadeInToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(fadeOnOpacityChange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(fadeInSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(fadeOutSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + + connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts())); + connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts())); + connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts())); + connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(processShadowLockouts())); load(); tabW->setEnabled(useTranslucency->isChecked()); - connect(useTranslucency, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showWarning(bool))); + connect(useTranslucency, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showWarning(bool))); // handle kompmgr restarts if necessary - connect(useTranslucency, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(disableARGB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useOpenGL, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(blurBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(greyscaleBackground, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useShadows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useShadowsOnMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useShadowsOnToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(useShadowsOnDockWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(inactiveWindowShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(baseShadowSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(shadowTopOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(shadowLeftOffset, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(shadowColor, TQT_SIGNAL(changed(const TQColor&)), TQT_SLOT(resetKompmgr())); - connect(fadeInWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(fadeInMenuWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(fadeInToolTipWindows, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(fadeOnOpacityChange, TQT_SIGNAL(toggled(bool)), TQT_SLOT(resetKompmgr())); - connect(fadeInSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); - connect(fadeOutSpeed, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(resetKompmgr())); + connect(useTranslucency, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(disableARGB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useOpenGL, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(blurBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(greyscaleBackground, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useShadows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useShadowsOnMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useShadowsOnToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(useShadowsOnDockWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(inactiveWindowShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(baseShadowSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(shadowTopOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(shadowLeftOffset, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(shadowColor, TQ_SIGNAL(changed(const TQColor&)), TQ_SLOT(resetKompmgr())); + connect(fadeInWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(fadeInMenuWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(fadeInToolTipWindows, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(fadeOnOpacityChange, TQ_SIGNAL(toggled(bool)), TQ_SLOT(resetKompmgr())); + connect(fadeInSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); + connect(fadeOutSpeed, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(resetKompmgr())); } } diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index 6e7b54890..fb7451626 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/twin/kcmtwin/twinrules/kcm.cpp @@ -45,7 +45,7 @@ KCMRules::KCMRules( TQWidget *parent, const char *name ) TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); layout->addWidget( widget ); - connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); + connect( widget, TQ_SIGNAL( changed( bool )), TQ_SLOT( moduleChanged( bool ))); TDEAboutData *about = new TDEAboutData(I18N_NOOP( "kcmtwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); diff --git a/twin/kcmtwin/twinrules/ruleslist.cpp b/twin/kcmtwin/twinrules/ruleslist.cpp index 8961874ae..a9238c178 100644 --- a/twin/kcmtwin/twinrules/ruleslist.cpp +++ b/twin/kcmtwin/twinrules/ruleslist.cpp @@ -33,22 +33,22 @@ KCMRulesList::KCMRulesList( TQWidget* parent, const char* name ) : KCMRulesListBase( parent, name ) { // connect both current/selected, so that current==selected (stupid TQListBox :( ) - connect( rules_listbox, TQT_SIGNAL( currentChanged( TQListBoxItem* )), - TQT_SLOT( activeChanged( TQListBoxItem*))); - connect( rules_listbox, TQT_SIGNAL( selectionChanged( TQListBoxItem* )), - TQT_SLOT( activeChanged( TQListBoxItem*))); - connect( new_button, TQT_SIGNAL( clicked()), - TQT_SLOT( newClicked())); - connect( modify_button, TQT_SIGNAL( clicked()), - TQT_SLOT( modifyClicked())); - connect( delete_button, TQT_SIGNAL( clicked()), - TQT_SLOT( deleteClicked())); - connect( moveup_button, TQT_SIGNAL( clicked()), - TQT_SLOT( moveupClicked())); - connect( movedown_button, TQT_SIGNAL( clicked()), - TQT_SLOT( movedownClicked())); - connect( rules_listbox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), - TQT_SLOT( modifyClicked())); + connect( rules_listbox, TQ_SIGNAL( currentChanged( TQListBoxItem* )), + TQ_SLOT( activeChanged( TQListBoxItem*))); + connect( rules_listbox, TQ_SIGNAL( selectionChanged( TQListBoxItem* )), + TQ_SLOT( activeChanged( TQListBoxItem*))); + connect( new_button, TQ_SIGNAL( clicked()), + TQ_SLOT( newClicked())); + connect( modify_button, TQ_SIGNAL( clicked()), + TQ_SLOT( modifyClicked())); + connect( delete_button, TQ_SIGNAL( clicked()), + TQ_SLOT( deleteClicked())); + connect( moveup_button, TQ_SIGNAL( clicked()), + TQ_SLOT( moveupClicked())); + connect( movedown_button, TQ_SIGNAL( clicked()), + TQ_SLOT( movedownClicked())); + connect( rules_listbox, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), + TQ_SLOT( modifyClicked())); load(); } diff --git a/twin/kcmtwin/twinrules/ruleswidget.cpp b/twin/kcmtwin/twinrules/ruleswidget.cpp index 334001bf7..116ac8b41 100644 --- a/twin/kcmtwin/twinrules/ruleswidget.cpp +++ b/twin/kcmtwin/twinrules/ruleswidget.cpp @@ -41,9 +41,9 @@ namespace KWinInternal { #define SETUP( var, type ) \ - connect( enable_##var, TQT_SIGNAL( toggled( bool )), rule_##var, TQT_SLOT( setEnabled( bool ))); \ - connect( enable_##var, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( updateEnable##var())); \ - connect( rule_##var, TQT_SIGNAL( activated( int )), this, TQT_SLOT( updateEnable##var())); \ + connect( enable_##var, TQ_SIGNAL( toggled( bool )), rule_##var, TQ_SLOT( setEnabled( bool ))); \ + connect( enable_##var, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( updateEnable##var())); \ + connect( rule_##var, TQ_SIGNAL( activated( int )), this, TQ_SLOT( updateEnable##var())); \ TQWhatsThis::add( enable_##var, enableDesc ); \ TQWhatsThis::add( rule_##var, type##RuleDesc ); @@ -550,7 +550,7 @@ void RulesWidget::detectClicked() { assert( detect_dlg == NULL ); detect_dlg = new DetectDialog; - connect( detect_dlg, TQT_SIGNAL( detectionDone( bool )), this, TQT_SLOT( detected( bool ))); + connect( detect_dlg, TQ_SIGNAL( detectionDone( bool )), this, TQ_SLOT( detected( bool ))); detect_dlg->detect( 0 ); } @@ -702,7 +702,7 @@ Rules* RulesDialog::edit( Rules* r, WId window, bool show_hints ) if( window != 0 ) widget->prepareWindowSpecific( window ); if( show_hints ) - TQTimer::singleShot( 0, this, TQT_SLOT( displayHints())); + TQTimer::singleShot( 0, this, TQ_SLOT( displayHints())); exec(); return rules; } diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index 7d219ae7f..d8a22458b 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -122,8 +122,8 @@ void KCommonDecoration::init() resetLayout(); - connect(this, TQT_SIGNAL(keepAboveChanged(bool) ), TQT_SLOT(keepAboveChange(bool) ) ); - connect(this, TQT_SIGNAL(keepBelowChanged(bool) ), TQT_SLOT(keepBelowChange(bool) ) ); + connect(this, TQ_SIGNAL(keepAboveChanged(bool) ), TQ_SLOT(keepAboveChange(bool) ) ); + connect(this, TQ_SIGNAL(keepBelowChanged(bool) ), TQ_SLOT(keepBelowChange(bool) ) ); updateCaption(); } @@ -350,8 +350,8 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString if (!btn) break; btn->setTipText(i18n("Menu") ); btn->setRealizeButtons(TQt::LeftButton|TQt::RightButton); - connect(btn, TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed())); - connect(btn, TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased())); + connect(btn, TQ_SIGNAL(pressed()), TQ_SLOT(menuButtonPressed())); + connect(btn, TQ_SIGNAL(released()), this, TQ_SLOT(menuButtonReleased())); m_button[MenuButton] = btn; } @@ -366,7 +366,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(oad?i18n("Not on all desktops"):i18n("On all desktops") ); btn->setToggleButton(true); btn->setOn( oad ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(toggleOnAllDesktops())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(toggleOnAllDesktops())); m_button[OnAllDesktopsButton] = btn; } @@ -377,7 +377,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(HelpButton); if (!btn) break; btn->setTipText(i18n("Help") ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(showContextHelp())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(showContextHelp())); m_button[HelpButton] = btn; } @@ -387,7 +387,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(MinButton); if (!btn) break; btn->setTipText(i18n("Minimize") ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(minimize())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(minimize())); m_button[MinButton] = btn; } @@ -401,7 +401,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(max?i18n("Restore"):i18n("Maximize") ); btn->setToggleButton(true); btn->setOn( max ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaximize())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaximize())); m_button[MaxButton] = btn; } @@ -411,7 +411,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn = createButton(CloseButton); if (!btn) break; btn->setTipText(i18n("Close") ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(closeWindow())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(closeWindow())); m_button[CloseButton] = btn; } @@ -424,7 +424,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(above?i18n("Do not keep above others"):i18n("Keep above others") ); btn->setToggleButton(true); btn->setOn( above ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepAbove())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepAbove())); m_button[AboveButton] = btn; } @@ -437,7 +437,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(below?i18n("Do not keep below others"):i18n("Keep below others") ); btn->setToggleButton(true); btn->setOn( below ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotKeepBelow())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotKeepBelow())); m_button[BelowButton] = btn; } @@ -450,7 +450,7 @@ void KCommonDecoration::addButtons(ButtonContainer &btnContainer, const TQString btn->setTipText(shaded?i18n("Unshade"):i18n("Shade") ); btn->setToggleButton(true); btn->setOn( shaded ); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotShade())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotShade())); m_button[ShadeButton] = btn; } diff --git a/twin/main.cpp b/twin/main.cpp index 4af065a8a..61fb82847 100644 --- a/twin/main.cpp +++ b/twin/main.cpp @@ -146,7 +146,7 @@ Application::Application( ) ::exit(1); } } - connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); + connect( &owner, TQ_SIGNAL( lostOwnership()), TQ_SLOT( lostSelection())); // if there was already twin running, it saved its configuration after loosing the selection -> reread config()->reparseConfiguration(); diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index c347991fe..d86037a84 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -39,7 +39,7 @@ PopupInfo::PopupInfo( Workspace* ws, const char *name ) m_shown = false; reset(); reconfigure(); - connect(&m_delayedHideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hide())); + connect(&m_delayedHideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hide())); TQFont f = font(); f.setBold( TRUE ); diff --git a/twin/rules.cpp b/twin/rules.cpp index 63fc0e37b..7bd2cd469 100644 --- a/twin/rules.cpp +++ b/twin/rules.cpp @@ -1008,7 +1008,7 @@ void Workspace::gotTemporaryRulesMessage( const TQString& message ) Rules* rule = new Rules( message, true ); rules.prepend( rule ); // highest priority first if( !was_temporary ) - TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules())); + TQTimer::singleShot( 60000, this, TQ_SLOT( cleanupTemporaryRules())); } void Workspace::cleanupTemporaryRules() @@ -1028,7 +1028,7 @@ void Workspace::cleanupTemporaryRules() } } if( has_temporary ) - TQTimer::singleShot( 60000, this, TQT_SLOT( cleanupTemporaryRules())); + TQTimer::singleShot( 60000, this, TQ_SLOT( cleanupTemporaryRules())); } void Workspace::discardUsedWindowRules( Client* c, bool withdrawn ) diff --git a/twin/sm.cpp b/twin/sm.cpp index 316322edd..00cdb6a22 100644 --- a/twin/sm.cpp +++ b/twin/sm.cpp @@ -417,7 +417,7 @@ SessionSaveDoneHelper::SessionSaveDoneHelper() SmcSetProperties( conn, 5, p ); notifier = new TQSocketNotifier( IceConnectionNumber( SmcGetIceConnection( conn )), TQSocketNotifier::Read, this ); - connect( notifier, TQT_SIGNAL( activated( int )), TQT_SLOT( processData())); + connect( notifier, TQ_SIGNAL( activated( int )), TQ_SLOT( processData())); } SessionSaveDoneHelper::~SessionSaveDoneHelper() diff --git a/twin/tabbox.cpp b/twin/tabbox.cpp index bec7cce97..feca2d77d 100644 --- a/twin/tabbox.cpp +++ b/twin/tabbox.cpp @@ -53,7 +53,7 @@ TabBox::TabBox( Workspace *ws, const char *name ) m = DesktopMode; // init variables reconfigure(); reset(); - connect(&delayedShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(show())); + connect(&delayedShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(show())); XSetWindowAttributes attr; attr.override_redirect = 1; diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index c4efddace..d4930ee84 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -130,7 +130,7 @@ int main(int argc, char** argv) DecoBenchApplication app(library, test, count); - TQTimer::singleShot(0, &app, TQT_SLOT(executeTest())); + TQTimer::singleShot(0, &app, TQ_SLOT(executeTest())); app.exec(); } #include "main.moc" diff --git a/twin/twinbindings.cpp b/twin/twinbindings.cpp index 08d6bf0d1..7e918f49f 100644 --- a/twin/twinbindings.cpp +++ b/twin/twinbindings.cpp @@ -1,8 +1,8 @@ #ifndef NOSLOTS # define DEF2( name, descr, key3, key4, fnSlot ) \ - keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(descr), TQString::null, key3, key4, this, TQ_SLOT(fnSlot) ) # define DEF( name, key3, key4, fnSlot ) \ - keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQT_SLOT(fnSlot) ) + keys->insert( name, i18n(name), TQString::null, key3, key4, this, TQ_SLOT(fnSlot) ) #else # define DEF2( name, descr, key3, key4, fnSlot ) \ keys->insert( name, i18n(descr), TQString::null, key3, key4 ) diff --git a/twin/useractions.cpp b/twin/useractions.cpp index dd29025db..ac017aacf 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -51,13 +51,13 @@ TQPopupMenu* Workspace::clientPopup() popup = new TQPopupMenu; popup->setCheckable( TRUE ); popup->setFont(TDEGlobalSettings::menuFont()); - connect( popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( clientPopupAboutToShow() ) ); - connect( popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) ); + connect( popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( clientPopupAboutToShow() ) ); + connect( popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) ); advanced_popup = new TQPopupMenu( popup ); advanced_popup->setCheckable( TRUE ); advanced_popup->setFont(TDEGlobalSettings::menuFont()); - connect( advanced_popup, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( clientPopupActivated(int) ) ); + connect( advanced_popup, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( clientPopupActivated(int) ) ); advanced_popup->insertItem( SmallIconSet( "go-up" ), i18n("Keep &Above Others")+'\t'+keys->shortcut("Window Above Other Windows").seq(0).toString(), Options::KeepAboveOp ); advanced_popup->insertItem( SmallIconSet( "go-down" ), @@ -85,11 +85,11 @@ TQPopupMenu* Workspace::clientPopup() TQToolTip::add(transButton, i18n("Reset opacity to default value")); transSlider = new TQSlider(0, 100, 1, 100, TQt::Horizontal, transBox, "transSlider"); TQToolTip::add(transSlider, i18n("Slide this to set the window's opacity")); - connect(transButton, TQT_SIGNAL(clicked()), TQT_SLOT(resetClientOpacity())); - connect(transButton, TQT_SIGNAL(clicked()), trans_popup, TQT_SLOT(hide())); - connect(transSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setTransButtonText(int))); - connect(transSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setPopupClientOpacity(int))); -// connect(transSlider, TQT_SIGNAL(sliderReleased()), trans_popup, TQT_SLOT(hide())); + connect(transButton, TQ_SIGNAL(clicked()), TQ_SLOT(resetClientOpacity())); + connect(transButton, TQ_SIGNAL(clicked()), trans_popup, TQ_SLOT(hide())); + connect(transSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setTransButtonText(int))); + connect(transSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setPopupClientOpacity(int))); +// connect(transSlider, TQ_SIGNAL(sliderReleased()), trans_popup, TQ_SLOT(hide())); trans_popup->insertItem(transBox); popup->insertItem(i18n("&Opacity"), trans_popup ); } @@ -105,7 +105,7 @@ TQPopupMenu* Workspace::clientPopup() if (!TDEGlobal::config()->isImmutable() && !kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty()) { - popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior…"), this, TQT_SLOT( configureWM() )); + popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior…"), this, TQ_SLOT( configureWM() )); popup->insertSeparator(); } @@ -201,10 +201,10 @@ void Workspace::initDesktopPopup() desk_popup = new TQPopupMenu( popup ); desk_popup->setCheckable( TRUE ); desk_popup->setFont(TDEGlobalSettings::menuFont()); - connect( desk_popup, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( slotSendToDesktop(int) ) ); - connect( desk_popup, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( desktopPopupAboutToShow() ) ); + connect( desk_popup, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( slotSendToDesktop(int) ) ); + connect( desk_popup, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( desktopPopupAboutToShow() ) ); popup->insertItem(i18n("To &Desktop"), desk_popup, -1, desk_popup_index ); } @@ -299,7 +299,7 @@ void Workspace::setupWindowShortcut( Client* c ) client_keys->suspend( true ); client_keys_dialog = new ShortcutDialog( c->shortcut()); client_keys_client = c; - connect( client_keys_dialog, TQT_SIGNAL( dialogDone( bool )), TQT_SLOT( setupWindowShortcutDone( bool ))); + connect( client_keys_dialog, TQ_SIGNAL( dialogDone( bool )), TQ_SLOT( setupWindowShortcutDone( bool ))); TQRect r = clientArea( ScreenArea, c ); TQSize size = client_keys_dialog->sizeHint(); TQPoint pos = c->pos() + c->clientPos(); @@ -336,7 +336,7 @@ void Workspace::clientShortcutUpdated( Client* c ) { client_keys->insert( key, key ); client_keys->setShortcut( key, c->shortcut()); - client_keys->setSlot( key, c, TQT_SLOT( shortcutActivated())); + client_keys->setSlot( key, c, TQ_SLOT( shortcutActivated())); client_keys->setActionEnabled( key, true ); } client_keys->updateConnections(); diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 5f75edd90..3a3273a05 100644 --- a/twin/workspace.cpp +++ b/twin/workspace.cpp @@ -195,9 +195,9 @@ Workspace::Workspace( bool restore ) active_windows[i] = None; } - connect( &temporaryRulesMessages, TQT_SIGNAL( gotMessage( const TQString& )), - this, TQT_SLOT( gotTemporaryRulesMessage( const TQString& ))); - connect( &rulesUpdatedTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( writeWindowRules())); + connect( &temporaryRulesMessages, TQ_SIGNAL( gotMessage( const TQString& )), + this, TQ_SLOT( gotTemporaryRulesMessage( const TQString& ))); + connect( &rulesUpdatedTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( writeWindowRules())); updateXTime(); // needed for proper initialization of user_time in Client ctor @@ -259,7 +259,7 @@ Workspace::Workspace( bool restore ) init(); #if (TQT_VERSION-0 >= 0x030200) // XRANDR support - connect( kapp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); + connect( kapp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( desktopResized())); #endif if (!supportsCompMgr()) { @@ -274,7 +274,7 @@ Workspace::Workspace( bool restore ) if (options->useTranslucency) { kompmgr = new TDEProcess; - connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); + connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); *kompmgr << TDE_COMPOSITOR_BINARY; if (kompmgrpid) { @@ -427,15 +427,15 @@ void Workspace::init() // now we know how many desktops we'll, thus, we initialise the positioning object initPositioning = new Placement(this); - connect(&reconfigureTimer, TQT_SIGNAL(timeout()), this, - TQT_SLOT(slotReconfigure())); - connect( &updateToolWindowsTimer, TQT_SIGNAL( timeout()), this, TQT_SLOT( slotUpdateToolWindows())); + connect(&reconfigureTimer, TQ_SIGNAL(timeout()), this, + TQ_SLOT(slotReconfigure())); + connect( &updateToolWindowsTimer, TQ_SIGNAL( timeout()), this, TQ_SLOT( slotUpdateToolWindows())); - connect(kapp, TQT_SIGNAL(appearanceChanged()), this, - TQT_SLOT(slotReconfigure())); - connect(kapp, TQT_SIGNAL(settingsChanged(int)), this, - TQT_SLOT(slotSettingsChanged(int))); - connect(kapp, TQT_SIGNAL( kipcMessage( int, int )), this, TQT_SLOT( kipcMessage( int, int ))); + connect(kapp, TQ_SIGNAL(appearanceChanged()), this, + TQ_SLOT(slotReconfigure())); + connect(kapp, TQ_SIGNAL(settingsChanged(int)), this, + TQ_SLOT(slotSettingsChanged(int))); + connect(kapp, TQ_SIGNAL( kipcMessage( int, int )), this, TQ_SLOT( kipcMessage( int, int ))); active_client = NULL; rootInfo->setActiveWindow( None ); @@ -1188,10 +1188,10 @@ void Workspace::slotReconfigure() if (!kompmgr) { kompmgr = new TDEProcess; - connect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); + connect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); *kompmgr << TDE_COMPOSITOR_BINARY; } - TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart + TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) ); // wait some time to ensure system's ready for restart } } else @@ -2396,7 +2396,7 @@ void Workspace::requestDelayFocus( Client* c ) delayfocus_client = c; delete delayFocusTimer; delayFocusTimer = new TQTimer( this ); - connect( delayFocusTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( delayFocus() ) ); + connect( delayFocusTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( delayFocus() ) ); delayFocusTimer->start( options->delayFocusInterval, TRUE ); } @@ -2506,7 +2506,7 @@ void Workspace::reserveActiveBorder( ActiveBorder border ) return; if (active_reserved[border]++ == 0) - TQTimer::singleShot(0, this, TQT_SLOT(updateActiveBorders())); + TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders())); } void Workspace::unreserveActiveBorder( ActiveBorder border ) @@ -2516,7 +2516,7 @@ void Workspace::unreserveActiveBorder( ActiveBorder border ) assert(active_reserved[ border ] > 0); if (--active_reserved[ border ] == 0) - TQTimer::singleShot(0, this, TQT_SLOT(updateActiveBorders())); + TQTimer::singleShot(0, this, TQ_SLOT(updateActiveBorders())); } void Workspace::checkActiveBorder(const TQPoint &pos, Time now) @@ -2788,12 +2788,12 @@ void Workspace::lostTopMenuSelection() { // kdDebug() << "lost TopMenu selection" << endl; // make sure this signal is always set when not owning the selection - disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); - connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); + disconnect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner())); + connect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner())); if( !managing_topmenus ) return; - connect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); - disconnect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection())); + connect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner())); + disconnect( topmenu_selection, TQ_SIGNAL( lostOwnership()), this, TQ_SLOT( lostTopMenuSelection())); managing_topmenus = false; delete topmenu_space; topmenu_space = NULL; @@ -2822,8 +2822,8 @@ void Workspace::setupTopMenuHandling() { if( managing_topmenus ) return; - connect( topmenu_selection, TQT_SIGNAL( lostOwnership()), this, TQT_SLOT( lostTopMenuSelection())); - disconnect( topmenu_watcher, TQT_SIGNAL( lostOwner()), this, TQT_SLOT( lostTopMenuOwner())); + connect( topmenu_selection, TQ_SIGNAL( lostOwnership()), this, TQ_SLOT( lostTopMenuSelection())); + disconnect( topmenu_watcher, TQ_SIGNAL( lostOwner()), this, TQ_SLOT( lostTopMenuOwner())); managing_topmenus = true; topmenu_space = new TQWidget; Window stack[ 2 ]; @@ -2934,7 +2934,7 @@ void Workspace::startKompmgr() } else { // Try again a bit later! - TQTimer::singleShot( 200, this, TQT_SLOT(startKompmgr()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(startKompmgr()) ); return; } pid_t kompmgrpid = getCompositorPID(); @@ -2962,12 +2962,12 @@ void Workspace::startKompmgr() char selection_name[ 100 ]; sprintf( selection_name, "_NET_WM_CM_S%d", DefaultScreen( tqt_xdisplay())); kompmgr_selection = new TDESelectionOwner( selection_name ); - connect( kompmgr_selection, TQT_SIGNAL( lostOwnership()), TQT_SLOT( stopKompmgr())); + connect( kompmgr_selection, TQ_SIGNAL( lostOwnership()), TQ_SLOT( stopKompmgr())); kompmgr_selection->claim( true ); - connect(kompmgr, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(restartKompmgr(TDEProcess*))); + connect(kompmgr, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(restartKompmgr(TDEProcess*))); options->useTranslucency = TRUE; //allowKompmgrRestart = FALSE; - //TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) ); + //TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) ); TQByteArray ba; TQDataStream arg(ba, IO_WriteOnly); arg << ""; @@ -2983,7 +2983,7 @@ void Workspace::stopKompmgr() } delete kompmgr_selection; kompmgr_selection = NULL; - kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(TDEProcess*))); + kompmgr->disconnect(this, TQ_SLOT(restartKompmgr(TDEProcess*))); options->useTranslucency = FALSE; if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider kompmgr->kill(SIGKILL); @@ -3012,7 +3012,7 @@ void Workspace::unblockKompmgrRestart() } void Workspace::restartKompmgr( TDEProcess *proc ) -// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQT_SLOT(startKompmgr())); +// this is for inernal purpose (crashhandling) only, usually you want to use workspace->stopKompmgr(); TQTimer::singleShot(200, workspace, TQ_SLOT(startKompmgr())); { bool crashed; if (proc->signalled()) { // looks like kompmgr may have crashed @@ -3061,7 +3061,7 @@ void Workspace::restartKompmgr( TDEProcess *proc ) else { allowKompmgrRestart = FALSE; - TQTimer::singleShot( 60000, this, TQT_SLOT(unblockKompmgrRestart()) ); + TQTimer::singleShot( 60000, this, TQ_SLOT(unblockKompmgrRestart()) ); } } } @@ -3088,7 +3088,7 @@ void Workspace::handleKompmgrOutput( TDEProcess* , char *buffer, int buflen) else return; //skip others // kompmgr startup failed or succeeded, release connection kompmgr->closeStderr(); - disconnect(kompmgr, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); + disconnect(kompmgr, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(handleKompmgrOutput(TDEProcess*, char*, int))); if( !message.isEmpty()) { TDEProcess proc; |