diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 14:09:37 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-14 14:09:37 +0900 |
| commit | af0b8f5d1e5e00b1f3b48658d89876c2df28e71c (patch) | |
| tree | 11e4cc0bc31cd049daeb734b4d9e0ee00fac9eab | |
| parent | 09fd0dead9b5dcb29dde24957ae8c07269c49aa1 (diff) | |
| download | tdeutils-af0b8f5d1e5e00b1f3b48658d89876c2df28e71c.tar.gz tdeutils-af0b8f5d1e5e00b1f3b48658d89876c2df28e71c.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
167 files changed, 2532 insertions, 2532 deletions
diff --git a/ark/ace.cpp b/ark/ace.cpp index 4f1d2e4..b2ffe8d 100644 --- a/ark/ace.cpp +++ b/ark/ace.cpp @@ -89,15 +89,15 @@ void AceArch::open() kdDebug() << "AceArch::open(): kp->args(): " << kp->args() << endl; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - this, TQT_SLOT( catchMeIfYouCan(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + this, TQ_SLOT( catchMeIfYouCan(TDEProcess*, char*, int) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -158,12 +158,12 @@ void AceArch::unarchFileInternal( ) } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -89,13 +89,13 @@ void ArArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "vt" << m_filename; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedTOC(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedTOC(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotOpenExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotOpenExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -111,10 +111,10 @@ void ArArch::create() kp->clearArguments(); *kp << m_archiver_program << "c" << m_filename; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::Block) == false) { @@ -152,13 +152,13 @@ void ArArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -209,13 +209,13 @@ void ArArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotExtractExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotExtractExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -242,13 +242,13 @@ void ArArch::remove(TQStringList *list) *kp << str; } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotDeleteExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotDeleteExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { diff --git a/ark/arj.cpp b/ark/arj.cpp index 7022b24..6da0041 100644 --- a/ark/arj.cpp +++ b/ark/arj.cpp @@ -122,12 +122,12 @@ void ArjArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -190,12 +190,12 @@ void ArjArch::open() *kp << m_unarchiver_program << "v" << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -246,12 +246,12 @@ void ArjArch::unarchFileInternal() } } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -282,12 +282,12 @@ void ArjArch::remove( TQStringList *list ) *kp << str; } - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -310,12 +310,12 @@ void ArjArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 2eaf97a..e1b1bc7 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -72,12 +72,12 @@ ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject awidget = new ArkWidget( parentWidget, "ArkWidget" ); setWidget(awidget); - connect( awidget, TQT_SIGNAL( fixActions() ), this, TQT_SLOT( fixEnables() ) ); - connect( awidget, TQT_SIGNAL( disableAllActions() ), this, TQT_SLOT( disableActions() ) ); - connect( awidget, TQT_SIGNAL( signalFilePopup( const TQPoint& ) ), this, TQT_SLOT( slotFilePopup( const TQPoint& ) ) ); - connect( awidget, TQT_SIGNAL( setWindowCaption( const TQString & ) ), this, TQT_SIGNAL( setWindowCaption( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( removeRecentURL( const KURL & ) ), this, TQT_SIGNAL( removeRecentURL( const KURL & ) ) ); - connect( awidget, TQT_SIGNAL( addRecentURL( const KURL & ) ), this, TQT_SIGNAL( addRecentURL( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( fixActions() ), this, TQ_SLOT( fixEnables() ) ); + connect( awidget, TQ_SIGNAL( disableAllActions() ), this, TQ_SLOT( disableActions() ) ); + connect( awidget, TQ_SIGNAL( signalFilePopup( const TQPoint& ) ), this, TQ_SLOT( slotFilePopup( const TQPoint& ) ) ); + connect( awidget, TQ_SIGNAL( setWindowCaption( const TQString & ) ), this, TQ_SIGNAL( setWindowCaption( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( removeRecentURL( const KURL & ) ), this, TQ_SIGNAL( removeRecentURL( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( addRecentURL( const KURL & ) ), this, TQ_SIGNAL( addRecentURL( const KURL & ) ) ); if( readWrite ) setXMLFile( "ark_part.rc" ); @@ -90,22 +90,22 @@ ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject setupActions(); m_ext = new ArkBrowserExtension( this, "ArkBrowserExtension" ); - connect( awidget, TQT_SIGNAL( openURLRequest( const KURL & ) ), - m_ext, TQT_SLOT( slotOpenURLRequested( const KURL & ) ) ); + connect( awidget, TQ_SIGNAL( openURLRequest( const KURL & ) ), + m_ext, TQ_SLOT( slotOpenURLRequested( const KURL & ) ) ); m_bar = new ArkStatusBarExtension( this ); - connect( awidget, TQT_SIGNAL( setStatusBarText( const TQString & ) ), m_bar, - TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setStatusBarSelectedFiles( const TQString & ) ), m_bar, - TQT_SLOT( slotSetStatusBarSelectedFiles( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setBusy( const TQString & ) ), m_bar, - TQT_SLOT( slotSetBusy( const TQString & ) ) ); - connect( awidget, TQT_SIGNAL( setReady() ), m_bar, - TQT_SLOT( slotSetReady() ) ); - connect( this, TQT_SIGNAL( started(TDEIO::Job*) ), TQT_SLOT( transferStarted(TDEIO::Job*) ) ); - connect( this, TQT_SIGNAL( completed() ), TQT_SLOT( transferCompleted() ) ); - connect( this, TQT_SIGNAL( canceled(const TQString&) ), - TQT_SLOT( transferCanceled(const TQString&) ) ); + connect( awidget, TQ_SIGNAL( setStatusBarText( const TQString & ) ), m_bar, + TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setStatusBarSelectedFiles( const TQString & ) ), m_bar, + TQ_SLOT( slotSetStatusBarSelectedFiles( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setBusy( const TQString & ) ), m_bar, + TQ_SLOT( slotSetBusy( const TQString & ) ) ); + connect( awidget, TQ_SIGNAL( setReady() ), m_bar, + TQ_SLOT( slotSetReady() ) ); + connect( this, TQ_SIGNAL( started(TDEIO::Job*) ), TQ_SLOT( transferStarted(TDEIO::Job*) ) ); + connect( this, TQ_SIGNAL( completed() ), TQ_SLOT( transferCompleted() ) ); + connect( this, TQ_SIGNAL( canceled(const TQString&) ), + TQ_SLOT( transferCanceled(const TQString&) ) ); setProgressInfoEnabled( false ); } @@ -117,43 +117,43 @@ void ArkPart::setupActions() { addFileAction = new TDEAction(i18n("Add &File..."), "ark_addfile", 0, awidget, - TQT_SLOT(action_add()), actionCollection(), "addfile"); + TQ_SLOT(action_add()), actionCollection(), "addfile"); addDirAction = new TDEAction(i18n("Add Folde&r..."), "ark_adddir", 0, awidget, - TQT_SLOT(action_add_dir()), actionCollection(), "adddir"); + TQ_SLOT(action_add_dir()), actionCollection(), "adddir"); extractAction = new TDEAction(i18n("E&xtract..."), "ark_extract", 0, awidget, - TQT_SLOT(action_extract()), actionCollection(), "extract"); + TQ_SLOT(action_extract()), actionCollection(), "extract"); deleteAction = new TDEAction(i18n("De&lete"), "ark_delete", TDEShortcut(TQt::Key_Delete), awidget, - TQT_SLOT(action_delete()), actionCollection(), "delete"); + TQ_SLOT(action_delete()), actionCollection(), "delete"); viewAction = new TDEAction(i18n("to view something","&View"), "ark_view", 0, awidget, - TQT_SLOT(action_view()), actionCollection(), "view"); + TQ_SLOT(action_view()), actionCollection(), "view"); openWithAction = new TDEAction(i18n("&Open With..."), 0, awidget, - TQT_SLOT(slotOpenWith()), actionCollection(), "open_with"); + TQ_SLOT(slotOpenWith()), actionCollection(), "open_with"); editAction = new TDEAction(i18n("Edit &With..."), 0, awidget, - TQT_SLOT(action_edit()), actionCollection(), "edit"); + TQ_SLOT(action_edit()), actionCollection(), "edit"); testAction = new TDEAction(i18n("&Test integrity"), 0, awidget, - TQT_SLOT(action_test()), actionCollection(), "test"); + TQ_SLOT(action_test()), actionCollection(), "test"); - selectAllAction = KStdAction::selectAll(awidget->fileList(), TQT_SLOT(selectAll()), actionCollection(), "select_all"); + selectAllAction = KStdAction::selectAll(awidget->fileList(), TQ_SLOT(selectAll()), actionCollection(), "select_all"); - deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, awidget->fileList(),TQT_SLOT(unselectAll()), actionCollection(), "deselect_all"); + deselectAllAction = new TDEAction(i18n("&Unselect All"), 0, awidget->fileList(),TQ_SLOT(unselectAll()), actionCollection(), "deselect_all"); - invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, awidget->fileList(),TQT_SLOT(invertSelection()), actionCollection(), "invert_selection"); + invertSelectionAction = new TDEAction(i18n("&Invert Selection"), 0, awidget->fileList(),TQ_SLOT(invertSelection()), actionCollection(), "invert_selection"); - saveAsAction = KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection()); + saveAsAction = KStdAction::saveAs(this, TQ_SLOT(file_save_as()), actionCollection()); - //KStdAction::preferences(awidget, TQT_SLOT(showSettings()), actionCollection()); + //KStdAction::preferences(awidget, TQ_SLOT(showSettings()), actionCollection()); ( void ) new TDEAction( i18n( "Configure &Ark..." ), "configure" , 0, awidget, - TQT_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); + TQ_SLOT( showSettings() ), actionCollection(), "options_configure_ark" ); showSearchBar = new TDEToggleAction( i18n( "Show Search Bar" ), TDEShortcut(), actionCollection(), "options_show_search_bar" ); @@ -161,7 +161,7 @@ ArkPart::setupActions() showSearchBar->setChecked( ArkSettings::showSearchBar() ); - connect( showSearchBar, TQT_SIGNAL( toggled( bool ) ), awidget, TQT_SLOT( slotShowSearchBarToggled( bool ) ) ); + connect( showSearchBar, TQ_SIGNAL( toggled( bool ) ), awidget, TQ_SLOT( slotShowSearchBarToggled( bool ) ) ); initialEnables(); } @@ -332,10 +332,10 @@ void ArkPart::transferStarted( TDEIO::Job *job ) if ( job ) { disableActions(); - connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); - connect( m_bar->cancelButton(), TQT_SIGNAL( clicked() ), - TQT_SLOT( cancelTransfer() ) ); + connect( job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + TQ_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); + connect( m_bar->cancelButton(), TQ_SIGNAL( clicked() ), + TQ_SLOT( cancelTransfer() ) ); } } @@ -343,8 +343,8 @@ void ArkPart::transferCompleted() { if ( m_job ) { - disconnect( m_job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - this, TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); + disconnect( m_job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + this, TQ_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); m_job = 0; } @@ -369,8 +369,8 @@ void ArkPart::progressInformation( TDEIO::Job *, unsigned long progress ) void ArkPart::cancelTransfer() { - disconnect( m_bar->cancelButton(), TQT_SIGNAL( clicked() ), - this, TQT_SLOT( cancelTransfer() ) ); + disconnect( m_bar->cancelButton(), TQ_SIGNAL( clicked() ), + this, TQ_SLOT( cancelTransfer() ) ); if ( m_job ) { m_job->kill( false ); @@ -413,7 +413,7 @@ void ArkStatusBarExtension::setupStatusBar() } m_pTimer = new TQTimer( this ); - connect( m_pTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgress() ) ); + connect( m_pTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgress() ) ); m_pStatusLabelTotal = new KSqueezedTextLabel( statusBar(), "StatusLabelTotal" ); m_pStatusLabelTotal->setFrameStyle( TQFrame::NoFrame ); diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp index 6ae8792..1c12630 100644 --- a/ark/arkviewer.cpp +++ b/ark/arkviewer.cpp @@ -42,7 +42,7 @@ ArkViewer::ArkViewer( TQWidget * parent, const char * name ) m_widget = new TQVBox( this ); m_widget->layout()->setSpacing( 10 ); - connect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotFinished() ) ); + connect( this, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotFinished() ) ); setMainWidget( m_widget ); } diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 6a6c091..e3b4549 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -299,7 +299,7 @@ ArkWidget::convertTo( const KURL & u ) busy( i18n( "Saving..." ) ); m_convert_tmpDir = new KTempDir( tmpDir() + "convtmp" ); m_convert_tmpDir->setAutoDelete( true ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( convertSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( convertSlotExtractDone( bool ) ) ); m_convert_saveAsURL = u; arch->unarchFile( 0, m_convert_tmpDir->name() ); } @@ -308,15 +308,15 @@ void ArkWidget::convertSlotExtractDone( bool ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( convertSlotExtractDone( bool ) ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( convertSlotCreate() ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( convertSlotExtractDone( bool ) ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( convertSlotCreate() ) ); } void ArkWidget::convertSlotCreate() { file_close(); - connect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( convertSlotCreateDone( bool ) ) ); + connect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( convertSlotCreateDone( bool ) ) ); TQString archToCreate; if ( m_convert_saveAsURL.isLocalFile() ) archToCreate = m_convert_saveAsURL.path(); @@ -330,7 +330,7 @@ ArkWidget::convertSlotCreate() void ArkWidget::convertSlotCreateDone( bool success ) { - disconnect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( convertSlotCreateDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( convertSlotCreateDone( bool ) ) ); kdDebug( 1601 ) << k_funcinfo << endl; if ( !success ) { @@ -357,7 +357,7 @@ ArkWidget::convertSlotCreateDone( bool success ) *it = TQString::fromLatin1( "file:" )+ m_convert_tmpDir->name() + *it; } bool bOldRecVal = ArkSettings::rarRecurseSubdirs(); - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( convertSlotAddDone( bool ) ) ); arch->addFile( entries ); ArkSettings::setRarRecurseSubdirs( bOldRecVal ); } @@ -365,11 +365,11 @@ ArkWidget::convertSlotCreateDone( bool success ) void ArkWidget::convertSlotAddDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( convertSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( convertSlotAddDone( bool ) ) ); kdDebug( 1601 ) << k_funcinfo << endl; m_convertSuccess = success; // needed ? (TarArch, lzo) - TQTimer::singleShot( 0, this, TQT_SLOT( convertFinish() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( convertFinish() ) ); } void @@ -438,7 +438,7 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b } } - connect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) ); + connect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( extractToSlotOpenDone( bool ) ) ); } const TQString @@ -464,7 +464,7 @@ ArkWidget::guessName( const KURL &archive ) void ArkWidget::extractToSlotOpenDone( bool success ) { - disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( extractToSlotOpenDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( extractToSlotOpenDone( bool ) ) ); if ( !success ) { KMessageBox::error( this, i18n( "An error occurred while opening the archive %1." ).arg( m_url.prettyURL() ) ); @@ -508,7 +508,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) if ( ArkUtils::diskHasSpace( extractDir, m_nSizeOfFiles ) ) { disableAll(); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( extractToSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( extractToSlotExtractDone( bool ) ) ); arch->unarchFile( 0, extractDir ); } else @@ -525,7 +525,7 @@ ArkWidget::extractToSlotOpenDone( bool success ) void ArkWidget::extractToSlotExtractDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( extractToSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( extractToSlotExtractDone( bool ) ) ); if ( !success ) { kdDebug( 1601 ) << "Last Shell Output" << arch->getLastShellOutput() << endl; @@ -536,7 +536,7 @@ ArkWidget::extractToSlotExtractDone( bool success ) if ( m_extractRemote ) { - connect( this, TQT_SIGNAL( extractRemoteMovingDone() ), this, TQT_SIGNAL( request_file_quit() ) ); + connect( this, TQ_SIGNAL( extractRemoteMovingDone() ), this, TQ_SIGNAL( request_file_quit() ) ); extractRemoteInitiateMoving( m_extractTo_targetDirectory ); } else @@ -565,7 +565,7 @@ ArkWidget::addToArchive( const KURL::List & filesToAdd, const KURL & archive) } } - connect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( addToArchiveSlotCreateDone( bool ) ) ); + connect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( addToArchiveSlotCreateDone( bool ) ) ); // TODO: remote Archives should be handled by createArchive if ( archive.isLocalFile() ) @@ -581,14 +581,14 @@ ArkWidget::addToArchive( const KURL::List & filesToAdd, const KURL & archive) return true; } - connect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( addToArchiveSlotOpenDone( bool ) ) ); + connect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( addToArchiveSlotOpenDone( bool ) ) ); return true; } void ArkWidget::addToArchiveSlotCreateDone( bool success ) { - disconnect( this, TQT_SIGNAL( createDone( bool ) ), this, TQT_SLOT( addToArchiveSlotCreateDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( createDone( bool ) ), this, TQ_SLOT( addToArchiveSlotCreateDone( bool ) ) ); if ( !success ) { kdDebug( 1601 ) << "Could not create the archive" << endl; @@ -602,7 +602,7 @@ void ArkWidget::addToArchiveSlotOpenDone( bool success ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( this, TQT_SIGNAL( openDone( bool ) ), this, TQT_SLOT( addToArchiveSlotOpenDone( bool ) ) ); + disconnect( this, TQ_SIGNAL( openDone( bool ) ), this, TQ_SLOT( addToArchiveSlotOpenDone( bool ) ) ); // TODO: handle dirs with addDir ( or better+easier: get rid of the need to do that entirely ) if ( !success ) { @@ -617,7 +617,7 @@ ArkWidget::addToArchiveSlotOpenDone( bool success ) strFilename = url.path(); if (!strFilename.isEmpty()) { - connect( this, TQT_SIGNAL( createRealArchiveDone( bool ) ), this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + connect( this, TQ_SIGNAL( createRealArchiveDone( bool ) ), this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); createRealArchive( strFilename, m_addToArchive_filesToAdd.toStringList() ); return; } @@ -662,7 +662,7 @@ ArkWidget::addToArchiveSlotOpenDone( bool success ) kdDebug( 1601 ) << "Adding: " << list << endl; - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); arch->addFile( list.toStringList() ); } @@ -670,7 +670,7 @@ void ArkWidget::addToArchiveSlotAddDone( bool success ) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( this, TQT_SLOT( addToArchiveSlotAddDone( bool ) ) ); + disconnect( this, TQ_SLOT( addToArchiveSlotAddDone( bool ) ) ); if ( !success ) { KMessageBox::error( this, i18n( "An error occurred while adding the files to the archive." ) ); @@ -861,8 +861,8 @@ ArkWidget::extractOnlyOpenDone() void ArkWidget::slotExtractDone(bool success) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( slotExtractDone(bool) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( slotExtractDone(bool) ) ); ready(); if(m_extractList != 0) @@ -919,8 +919,8 @@ ArkWidget::extractRemoteInitiateMoving( const KURL & target ) m_extractURL.adjustPath( 1 ); TDEIO::CopyJob *job = TDEIO::copy( srcList, target, this ); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotExtractRemoteDone(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotExtractRemoteDone(TDEIO::Job*)) ); m_extractRemote = false; } @@ -1010,8 +1010,8 @@ ArkWidget::createRealArchive( const TQString & strFilename, const TQStringList & u2.setPath( m_createRealArchTmpDir->name() + u1.fileName() ); TDEIO::NetAccess::copy( u1, u2, this ); m_compressedFile = "file:" + u2.path(); // AGAIN THE 5 SPACES Hack :-( - connect( newArch, TQT_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), - this, TQT_SLOT( createRealArchiveSlotCreate( Arch *, bool, + connect( newArch, TQ_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), + this, TQ_SLOT( createRealArchiveSlotCreate( Arch *, bool, const TQString &, int ) ) ); file_close(); newArch->create(); @@ -1030,8 +1030,8 @@ ArkWidget::createRealArchiveSlotCreate( Arch * newArch, bool success, listForCompressedFile.append(m_compressedFile); disableAll(); - connect( newArch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddDone( bool ) ) ); + connect( newArch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddDone( bool ) ) ); newArch->addFile(listForCompressedFile); } @@ -1040,8 +1040,8 @@ void ArkWidget::createRealArchiveSlotAddDone( bool success ) { kdDebug( 1601 ) << "createRealArchiveSlotAddDone+, success:" << success << endl; - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddDone( bool ) ) ); m_createRealArchTmpDir->unlink(); delete m_createRealArchTmpDir; @@ -1061,8 +1061,8 @@ ArkWidget::createRealArchiveSlotAddDone( bool success ) } else { - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); // files were dropped in addFile( m_pTempAddList ); } @@ -1072,8 +1072,8 @@ void ArkWidget::createRealArchiveSlotAddFilesDone( bool success ) { //kdDebug( 1601 ) << "createRealArchiveSlotAddFilesDone+, success:" << success << endl; - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, - TQT_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, + TQ_SLOT( createRealArchiveSlotAddFilesDone( bool ) ) ); delete m_pTempAddList; m_pTempAddList = NULL; emit createRealArchiveDone( success ); @@ -1150,7 +1150,7 @@ ArkWidget::addFile(TQStringList *list) } - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); arch->addFile( ( *list ) ); } @@ -1167,7 +1167,7 @@ ArkWidget::action_add_dir() busy( i18n( "Adding folder..." ) ); disableAll(); u = toLocalFile(u); - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); arch->addDir( u.prettyURL() ); } @@ -1176,7 +1176,7 @@ ArkWidget::action_add_dir() void ArkWidget::slotAddDone(bool _bSuccess) { - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( slotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( slotAddDone( bool ) ) ); m_fileListView->setUpdatesEnabled(true); m_fileListView->triggerUpdate(); ready(); @@ -1280,7 +1280,7 @@ ArkWidget::action_delete() disableAll(); busy( i18n( "Removing..." ) ); - connect( arch, TQT_SIGNAL( sigDelete( bool ) ), this, TQT_SLOT( slotDeleteDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigDelete( bool ) ), this, TQ_SLOT( slotDeleteDone( bool ) ) ); arch->remove(&list); kdDebug(1601) << "-ArkWidget::action_delete" << endl; } @@ -1288,7 +1288,7 @@ ArkWidget::action_delete() void ArkWidget::slotDeleteDone(bool _bSuccess) { - disconnect( arch, TQT_SIGNAL( sigDelete( bool ) ), this, TQT_SLOT( slotDeleteDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigDelete( bool ) ), this, TQ_SLOT( slotDeleteDone( bool ) ) ); kdDebug(1601) << "+ArkWidget::slotDeleteDone" << endl; m_fileListView->setUpdatesEnabled(true); m_fileListView->triggerUpdate(); @@ -1310,8 +1310,8 @@ ArkWidget::slotDeleteDone(bool _bSuccess) void ArkWidget::slotOpenWith() { - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( openWithSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( openWithSlotExtractDone( bool ) ) ); showCurrentFile(); } @@ -1319,8 +1319,8 @@ ArkWidget::slotOpenWith() void ArkWidget::openWithSlotExtractDone( bool success ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( openWithSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( openWithSlotExtractDone( bool ) ) ); if ( success ) { @@ -1524,7 +1524,7 @@ ArkWidget::action_extract() { disableAll(); busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( slotExtractDone(bool) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( slotExtractDone(bool) ) ); arch->unarchFile(0, extractDir); } } @@ -1551,8 +1551,8 @@ ArkWidget::action_extract() { disableAll(); busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( slotExtractDone(bool) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( slotExtractDone(bool) ) ); arch->unarchFile(m_extractList, extractDir); // extract selected files } } @@ -1585,16 +1585,16 @@ ArkWidget::action_edit() // [hmm, does that really make sense? I'll leave it for now.] busy( i18n( "Extracting..." ) ); - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( editSlotExtractDone() ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( editSlotExtractDone() ) ); showCurrentFile(); } void ArkWidget::editSlotExtractDone() { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( editSlotExtractDone() ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( editSlotExtractDone() ) ); ready(); editStart(); @@ -1619,8 +1619,8 @@ ArkWidget::editStart() TDEProcess *kp = new TDEProcess; *kp << l.text() << m_strFileToView; - connect( kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotEditFinished(TDEProcess *)) ); + connect( kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotEditFinished(TDEProcess *)) ); if ( kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false ) { KMessageBox::error(0, i18n("Trouble editing the file...")); @@ -1632,7 +1632,7 @@ void ArkWidget::slotEditFinished(TDEProcess *kp) { kdDebug(1601) << "+ArkWidget::slotEditFinished" << endl; - connect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( editSlotAddDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( editSlotAddDone( bool ) ) ); delete kp; TQStringList list; // now put the file back into the archive. @@ -1673,15 +1673,15 @@ void ArkWidget::editSlotAddDone( bool success ) { ready(); - disconnect( arch, TQT_SIGNAL( sigAdd( bool ) ), this, TQT_SLOT( editSlotAddDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigAdd( bool ) ), this, TQ_SLOT( editSlotAddDone( bool ) ) ); slotAddDone( success ); } void ArkWidget::action_view() { - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( viewSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( viewSlotExtractDone( bool ) ) ); busy( i18n( "Extracting file to view" ) ); showCurrentFile(); } @@ -1689,8 +1689,8 @@ ArkWidget::action_view() void ArkWidget::action_test() { - connect( arch, TQT_SIGNAL( sigTest( bool ) ), this, - TQT_SLOT( slotTestDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigTest( bool ) ), this, + TQ_SLOT( slotTestDone( bool ) ) ); busy( i18n( "Testing..." ) ); arch->test(); } @@ -1698,8 +1698,8 @@ ArkWidget::action_test() void ArkWidget::slotTestDone(bool ok) { - disconnect( arch, TQT_SIGNAL( sigTest( bool ) ), this, - TQT_SLOT( slotTestDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigTest( bool ) ), this, + TQ_SLOT( slotTestDone( bool ) ) ); ready(); if( ok ) KMessageBox::information(0, i18n("Test successful.")); @@ -1732,8 +1732,8 @@ ArkWidget::viewSlotExtractDone( bool success ) } } - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, - TQT_SLOT( viewSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, + TQ_SLOT( viewSlotExtractDone( bool ) ) ); delete m_viewList; @@ -1996,15 +1996,15 @@ void ArkWidget::startDrag( const TQStringList & fileList ) { mDragFiles = fileList; - connect( arch, TQT_SIGNAL( sigExtract( bool ) ), this, TQT_SLOT( startDragSlotExtractDone( bool ) ) ); + connect( arch, TQ_SIGNAL( sigExtract( bool ) ), this, TQ_SLOT( startDragSlotExtractDone( bool ) ) ); prepareViewFiles( fileList ); } void ArkWidget::startDragSlotExtractDone( bool ) { - disconnect( arch, TQT_SIGNAL( sigExtract( bool ) ), - this, TQT_SLOT( startDragSlotExtractDone( bool ) ) ); + disconnect( arch, TQ_SIGNAL( sigExtract( bool ) ), + this, TQ_SLOT( startDragSlotExtractDone( bool ) ) ); KURL::List list; @@ -2036,16 +2036,16 @@ ArkWidget::createFileListView() { m_fileListView = new FileListView(this); - connect( m_fileListView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( m_fileListView, TQT_SIGNAL( rightButtonPressed(TQListViewItem *, const TQPoint &, int) ), - this, TQT_SLOT(doPopup(TQListViewItem *, const TQPoint &, int))); - connect( m_fileListView, TQT_SIGNAL( startDragRequest( const TQStringList & ) ), - this, TQT_SLOT( startDrag( const TQStringList & ) ) ); - connect( m_fileListView, TQT_SIGNAL( executed(TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( viewFile(TQListViewItem*) ) ); - connect( m_fileListView, TQT_SIGNAL( returnPressed(TQListViewItem * ) ), - this, TQT_SLOT( viewFile(TQListViewItem*) ) ); + connect( m_fileListView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( m_fileListView, TQ_SIGNAL( rightButtonPressed(TQListViewItem *, const TQPoint &, int) ), + this, TQ_SLOT(doPopup(TQListViewItem *, const TQPoint &, int))); + connect( m_fileListView, TQ_SIGNAL( startDragRequest( const TQStringList & ) ), + this, TQ_SLOT( startDrag( const TQStringList & ) ) ); + connect( m_fileListView, TQ_SIGNAL( executed(TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( viewFile(TQListViewItem*) ) ); + connect( m_fileListView, TQ_SIGNAL( returnPressed(TQListViewItem * ) ), + this, TQ_SLOT( viewFile(TQListViewItem*) ) ); } m_fileListView->clear(); } @@ -2072,8 +2072,8 @@ Arch * ArkWidget::getNewArchive( const TQString & _fileName, const TQString& _mi return NULL; } - connect( newArch, TQT_SIGNAL(headers(const ColumnList&)), - m_fileListView, TQT_SLOT(setHeaders(const ColumnList&))); + connect( newArch, TQ_SIGNAL(headers(const ColumnList&)), + m_fileListView, TQ_SLOT(setHeaders(const ColumnList&))); m_archType = archtype; m_fileListView->setUpdatesEnabled(true); @@ -2093,8 +2093,8 @@ ArkWidget::createArchive( const TQString & _filename ) return false; busy( i18n( "Creating archive..." ) ); - connect( newArch, TQT_SIGNAL(sigCreate(Arch *, bool, const TQString &, int) ), - this, TQT_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); + connect( newArch, TQ_SIGNAL(sigCreate(Arch *, bool, const TQString &, int) ), + this, TQ_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); newArch->create(); return true; @@ -2104,8 +2104,8 @@ void ArkWidget::slotCreate(Arch * _newarch, bool _success, const TQString & _filename, int) { kdDebug( 1601 ) << k_funcinfo << endl; - disconnect( _newarch, TQT_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), - this, TQT_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); + disconnect( _newarch, TQ_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), + this, TQ_SLOT(slotCreate(Arch *, bool, const TQString &, int) ) ); ready(); if ( _success ) { @@ -2187,10 +2187,10 @@ ArkWidget::openArchive( const TQString & _filename, const TQString & _password ) m_archType = archtype; - connect( newArch, TQT_SIGNAL(sigOpen(Arch *, bool, const TQString &, int)), - this, TQT_SLOT(slotOpen(Arch *, bool, const TQString &,int)) ); - connect( newArch, TQT_SIGNAL(headers(const ColumnList&)), - m_fileListView, TQT_SLOT(setHeaders(const ColumnList&))); + connect( newArch, TQ_SIGNAL(sigOpen(Arch *, bool, const TQString &, int)), + this, TQ_SLOT(slotOpen(Arch *, bool, const TQString &,int)) ); + connect( newArch, TQ_SIGNAL(headers(const ColumnList&)), + m_fileListView, TQ_SLOT(setHeaders(const ColumnList&))); disableAll(); diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index a00bc16..d90a700 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -209,12 +209,12 @@ void CompressedFile::open() kdDebug(1601) << "Command is " << m_unarchiver_program << " " << m_tmpfile<< endl; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotUncompressDone(TDEProcess*))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotUncompressDone(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -314,12 +314,12 @@ void CompressedFile::addFile( const TQStringList &urls ) *kp << compressor << "-c" << file; - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotAddInProgress(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddDone(TDEProcess*))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotAddInProgress(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddDone(TDEProcess*))); int f_desc = KDE_open(TQFile::encodeName(m_filename), O_CREAT | O_TRUNC | O_WRONLY, 0666); if (f_desc != -1) diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp index d456744..7d1ba1e 100644 --- a/ark/extractiondialog.cpp +++ b/ark/extractiondialog.cpp @@ -122,9 +122,9 @@ ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name, m_viewFolderAfterExtraction = new TQCheckBox( i18n( "Open destination folder after extraction" ), vbox ); m_viewFolderAfterExtraction->setChecked( ArkSettings::openDestinationFolder() ); - connect( combobox, TQT_SIGNAL( returnPressed( const TQString& ) ), combobox, TQT_SLOT( addToHistory( const TQString& ) ) ); - connect( combobox->lineEdit(), TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( extractDirChanged( const TQString & ) ) ); + connect( combobox, TQ_SIGNAL( returnPressed( const TQString& ) ), combobox, TQ_SLOT( addToHistory( const TQString& ) ) ); + connect( combobox->lineEdit(), TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( extractDirChanged( const TQString & ) ) ); } ExtractionDialog::~ExtractionDialog() diff --git a/ark/lha.cpp b/ark/lha.cpp index 101277d..08385a6 100644 --- a/ark/lha.cpp +++ b/ark/lha.cpp @@ -146,12 +146,12 @@ void LhaArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "v" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -216,12 +216,12 @@ void LhaArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -257,12 +257,12 @@ void LhaArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -287,12 +287,12 @@ void LhaArch::remove( TQStringList *list ) *kp << ( *it ); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 255be83..cada938 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -58,29 +58,29 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) setStandardToolBarMenuEnabled( true ); setupActions(); - connect( m_part->widget(), TQT_SIGNAL( request_file_quit() ), this, TQT_SLOT( file_quit() ) ); - connect( KParts::BrowserExtension::childObject( m_part ), TQT_SIGNAL( openURLRequestDelayed + connect( m_part->widget(), TQ_SIGNAL( request_file_quit() ), this, TQ_SLOT( file_quit() ) ); + connect( KParts::BrowserExtension::childObject( m_part ), TQ_SIGNAL( openURLRequestDelayed ( const KURL &, const KParts::URLArgs & ) ), - m_part, TQT_SLOT( openURL( const KURL & ) ) ); + m_part, TQ_SLOT( openURL( const KURL & ) ) ); m_widget->setArchivePopupEnabled( true ); - connect( m_part->widget(), TQT_SIGNAL( signalArchivePopup( const TQPoint & ) ), this, - TQT_SLOT( slotArchivePopup( const TQPoint & ) ) ); - - connect( m_part, TQT_SIGNAL( removeRecentURL( const KURL & ) ), this, - TQT_SLOT( slotRemoveRecentURL( const KURL & ) ) ); - connect( m_part, TQT_SIGNAL( addRecentURL( const KURL & ) ), this, - TQT_SLOT( slotAddRecentURL( const KURL & ) ) ); - connect( m_part, TQT_SIGNAL( fixActionState( const bool & ) ), this, - TQT_SLOT( slotFixActionState( const bool & ) ) ); - connect( m_widget, TQT_SIGNAL( disableAllActions() ), this, - TQT_SLOT( slotDisableActions() ) ); + connect( m_part->widget(), TQ_SIGNAL( signalArchivePopup( const TQPoint & ) ), this, + TQ_SLOT( slotArchivePopup( const TQPoint & ) ) ); + + connect( m_part, TQ_SIGNAL( removeRecentURL( const KURL & ) ), this, + TQ_SLOT( slotRemoveRecentURL( const KURL & ) ) ); + connect( m_part, TQ_SIGNAL( addRecentURL( const KURL & ) ), this, + TQ_SLOT( slotAddRecentURL( const KURL & ) ) ); + connect( m_part, TQ_SIGNAL( fixActionState( const bool & ) ), this, + TQ_SLOT( slotFixActionState( const bool & ) ) ); + connect( m_widget, TQ_SIGNAL( disableAllActions() ), this, + TQ_SLOT( slotDisableActions() ) ); ArkApplication::getInstance()->addWindow(); - connect( m_widget, TQT_SIGNAL( removeOpenArk( const KURL &) ), this, - TQT_SLOT( slotRemoveOpenArk( const KURL & ) ) ); - connect( m_widget, TQT_SIGNAL( addOpenArk( const KURL & ) ), this, - TQT_SLOT( slotAddOpenArk( const KURL & ) ) ); + connect( m_widget, TQ_SIGNAL( removeOpenArk( const KURL &) ), this, + TQ_SLOT( slotRemoveOpenArk( const KURL & ) ) ); + connect( m_widget, TQ_SIGNAL( addOpenArk( const KURL & ) ), this, + TQ_SLOT( slotAddOpenArk( const KURL & ) ) ); setCentralWidget( m_part->widget() ); createGUI( m_part ); @@ -110,23 +110,23 @@ void MainWindow::setupActions() { newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), this, - TQT_SLOT(file_newWindow()), actionCollection(), "new_window"); + TQ_SLOT(file_newWindow()), actionCollection(), "new_window"); - newArchAction = KStdAction::openNew(this, TQT_SLOT(file_new()), actionCollection()); - openAction = KStdAction::open(this, TQT_SLOT(file_open()), actionCollection()); + newArchAction = KStdAction::openNew(this, TQ_SLOT(file_new()), actionCollection()); + openAction = KStdAction::open(this, TQ_SLOT(file_open()), actionCollection()); reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), this, - TQT_SLOT(file_reload()), actionCollection(), "reload_arch"); - closeAction = KStdAction::close(this, TQT_SLOT(file_close()), actionCollection(), "file_close"); + TQ_SLOT(file_reload()), actionCollection(), "reload_arch"); + closeAction = KStdAction::close(this, TQ_SLOT(file_close()), actionCollection(), "file_close"); - recent = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), actionCollection()); + recent = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection()); recent->loadEntries(kapp->config()); createStandardStatusBarAction(); - KStdAction::quit(this, TQT_SLOT(window_close()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(editToolbars()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeyBindings()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(window_close()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(editToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT( slotConfigureKeyBindings()), actionCollection()); openAction->setEnabled( true ); recent->setEnabled( true ); @@ -179,7 +179,7 @@ MainWindow::editToolbars() { saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg( factory(), this ); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } @@ -462,10 +462,10 @@ MainWindow::startProgressDialog( const TQString & text ) progressDialog->setMinimumDuration( 500 ); progressDialog->show(); KDialog::centerOnScreen( progressDialog ); - connect( progressDialog, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( window_close() ) ); + connect( progressDialog, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( window_close() ) ); timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgress() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgress() ) ); timer->start( 200, false ); } diff --git a/ark/rar.cpp b/ark/rar.cpp index fd049bd..940cf1e 100644 --- a/ark/rar.cpp +++ b/ark/rar.cpp @@ -211,12 +211,12 @@ void RarArch::open() *kp << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -297,12 +297,12 @@ void RarArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -354,12 +354,12 @@ void RarArch::unarchFileInternal() *kp << m_destDir ; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -390,12 +390,12 @@ void RarArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -418,12 +418,12 @@ void RarArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp index 2df9da9..1ea1d0c 100644 --- a/ark/searchbar.cpp +++ b/ark/searchbar.cpp @@ -35,7 +35,7 @@ SearchBar::SearchBar( TQWidget* parent, TDEActionCollection* aC, const char * name ) : TDEListViewSearchLine( parent, 0, name ) { - TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this, TQT_SLOT( clear() ), aC, "reset_search" ); + TDEAction *resetSearch = new TDEAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, this, TQ_SLOT( clear() ), aC, "reset_search" ); resetSearch->plug( parent ); resetSearch->setWhatsThis( i18n( "Reset Search\n" diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp index e6823c0..901d76c 100644 --- a/ark/sevenzip.cpp +++ b/ark/sevenzip.cpp @@ -102,12 +102,12 @@ void SevenZipArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "l" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -150,12 +150,12 @@ void SevenZipArch::addFile( const TQStringList & urls ) *kp << url.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -195,12 +195,12 @@ void SevenZipArch::remove( TQStringList *list ) *kp << *it; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -249,12 +249,12 @@ void SevenZipArch::unarchFileInternal( ) *kp << "-o" + m_destDir ; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -405,12 +405,12 @@ void SevenZipArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/ark/tar.cpp b/ark/tar.cpp index 52e8adb..0cef2dc 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -156,13 +156,13 @@ void TarArch::updateArch() *kp << "cat" << tmpfile; - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(updateProgress( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - (Arch *)this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(updateProgress( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + (Arch *)this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(updateFinished(TDEProcess *)) ); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(updateFinished(TDEProcess *)) ); if ( !fd || kp->start(TDEProcess::NotifyOnExit, flag) == false) { @@ -269,12 +269,12 @@ void TarArch::open() m_header_removed = false; m_finished = false; - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotListingDone(TDEProcess *))); - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotListingDone(TDEProcess *))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -291,7 +291,7 @@ void TarArch::open() } else { - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( openFirstCreateTempDone() ) ); createTmp(); } } @@ -301,7 +301,7 @@ void TarArch::openFirstCreateTempDone() if ( compressed && ( m_fileMimeType != "application/x-tgz" ) && ( m_fileMimeType != "application/x-tbz" ) ) { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( openFirstCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( openFirstCreateTempDone() ) ); Q_ASSERT( !m_listingThread ); m_listingThread = new TarListingThread( this, tmpfile ); } @@ -409,12 +409,12 @@ void TarArch::createTmp() } *kp << "-c" << m_filename; - connect(kp, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(createTmpFinished(TDEProcess *))); - connect(kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(createTmpProgress( TDEProcess *, char *, int ))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect(kp, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(createTmpFinished(TDEProcess *))); + connect(kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(createTmpProgress( TDEProcess *, char *, int ))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); if (kp->start(TDEProcess::NotifyOnExit, flag ) == false) { KMessageBox::error(0, i18n("Unable to fork a decompressor")); @@ -514,22 +514,22 @@ void TarArch::addFile( const TQStringList& urls ) // first. So we'll first delete all the old files matching the names of // those in urls. m_bNotifyWhenDeleteFails = false; - connect( this, TQT_SIGNAL( removeDone() ), this, TQT_SLOT( deleteOldFilesDone() ) ); + connect( this, TQ_SIGNAL( removeDone() ), this, TQ_SLOT( deleteOldFilesDone() ) ); deleteOldFiles(urls, ArkSettings::replaceOnlyWithNewer()); } void TarArch::deleteOldFilesDone() { - disconnect( this, TQT_SIGNAL( removeDone() ), this, TQT_SLOT( deleteOldFilesDone() ) ); + disconnect( this, TQ_SIGNAL( removeDone() ), this, TQ_SLOT( deleteOldFilesDone() ) ); m_bNotifyWhenDeleteFails = true; - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( addFileCreateTempDone() ) ); createTmp(); } void TarArch::addFileCreateTempDone() { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( addFileCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( addFileCreateTempDone() ) ); TQStringList * urls = &m_filesToAdd; TDEProcess *kp = m_currentProcess = new TDEProcess; @@ -562,13 +562,13 @@ void TarArch::addFileCreateTempDone() kdDebug(1601) << *strTemp << " " << endl; } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddFinished(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddFinished(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -579,13 +579,13 @@ void TarArch::addFileCreateTempDone() void TarArch::slotAddFinished(TDEProcess *_kp) { - disconnect( _kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotAddFinished(TDEProcess*))); + disconnect( _kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotAddFinished(TDEProcess*))); m_pTmpProc = _kp; m_filesToAdd = TQStringList(); if ( compressed ) { - connect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( addFinishedUpdateDone() ) ); + connect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) ); updateArch(); } else @@ -595,7 +595,7 @@ void TarArch::slotAddFinished(TDEProcess *_kp) void TarArch::addFinishedUpdateDone() { if ( compressed ) - disconnect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( addFinishedUpdateDone() ) ); + disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( addFinishedUpdateDone() ) ); Arch::slotAddExited( m_pTmpProc ); // this will delete _kp m_pTmpProc = NULL; } @@ -641,13 +641,13 @@ void TarArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotExtractExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotExtractExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -661,13 +661,13 @@ void TarArch::remove(TQStringList *list) { deleteInProgress = true; m_filesToRemove = *list; - connect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) ); + connect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( removeCreateTempDone() ) ); createTmp(); } void TarArch::removeCreateTempDone() { - disconnect( this, TQT_SIGNAL( createTempDone() ), this, TQT_SLOT( removeCreateTempDone() ) ); + disconnect( this, TQ_SIGNAL( createTempDone() ), this, TQ_SLOT( removeCreateTempDone() ) ); TQString name, tmp; TDEProcess *kp = m_currentProcess = new TDEProcess; @@ -685,13 +685,13 @@ void TarArch::removeCreateTempDone() } m_filesToRemove = TQStringList(); - connect( kp, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + connect( kp, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - connect( kp, TQT_SIGNAL(processExited(TDEProcess*)), this, - TQT_SLOT(slotDeleteExited(TDEProcess*))); + connect( kp, TQ_SIGNAL(processExited(TDEProcess*)), this, + TQ_SLOT(slotDeleteExited(TDEProcess*))); if (kp->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput) == false) { @@ -705,7 +705,7 @@ void TarArch::slotDeleteExited(TDEProcess *_kp) m_pTmpProc2 = _kp; if ( compressed ) { - connect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( removeUpdateDone() ) ); + connect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( removeUpdateDone() ) ); updateArch(); } else @@ -715,7 +715,7 @@ void TarArch::slotDeleteExited(TDEProcess *_kp) void TarArch::removeUpdateDone() { if ( compressed ) - disconnect( this, TQT_SIGNAL( updateDone() ), this, TQT_SLOT( removeUpdateDone() ) ); + disconnect( this, TQ_SIGNAL( updateDone() ), this, TQ_SLOT( removeUpdateDone() ) ); deleteInProgress = false; emit removeDone(); @@ -806,12 +806,12 @@ void TarArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/ark/zip.cpp b/ark/zip.cpp index 392cc5c..f8b5281 100644 --- a/ark/zip.cpp +++ b/ark/zip.cpp @@ -94,12 +94,12 @@ void ZipArch::open() *kp << m_unarchiver_program << "-v" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -172,12 +172,12 @@ void ZipArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -231,12 +231,12 @@ void ZipArch::unarchFileInternal() *kp << "-d" << m_destDir; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -268,12 +268,12 @@ void ZipArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -296,12 +296,12 @@ void ZipArch::test() *kp << m_filename; - connect( kp, SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, SIGNAL( processExited(TDEProcess*) ), - SLOT( slotTestExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotTestExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/ark/zoo.cpp b/ark/zoo.cpp index aa96d47..79ba8a9 100644 --- a/ark/zoo.cpp +++ b/ark/zoo.cpp @@ -110,12 +110,12 @@ void ZooArch::open() TDEProcess *kp = m_currentProcess = new TDEProcess; *kp << m_archiver_program << "l" << m_filename; - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotOpenExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedTOC(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotOpenExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -177,12 +177,12 @@ void ZooArch::addFile( const TQStringList &urls ) *kp << fileURL.fileName(); } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotAddExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotAddExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -236,12 +236,12 @@ void ZooArch::unarchFileInternal() } } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotExtractExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotExtractExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { @@ -267,12 +267,12 @@ void ZooArch::remove( TQStringList *list ) *kp << str; } - connect( kp, TQT_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), - TQT_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); - connect( kp, TQT_SIGNAL( processExited(TDEProcess*) ), - TQT_SLOT( slotDeleteExited(TDEProcess*) ) ); + connect( kp, TQ_SIGNAL( receivedStdout(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( receivedStderr(TDEProcess*, char*, int) ), + TQ_SLOT( slotReceivedOutput(TDEProcess*, char*, int) ) ); + connect( kp, TQ_SIGNAL( processExited(TDEProcess*) ), + TQ_SLOT( slotDeleteExited(TDEProcess*) ) ); if ( !kp->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index 548e7f7..baa8329 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -311,7 +311,7 @@ void CharTable::selectCell(int row, int col) repaintCell(_activeRow, _activeCol); TQClipboard *cb = TQApplication::clipboard(); - TQObject::disconnect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); + TQObject::disconnect( cb, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clearCell()) ); TQString text = TQString(_map[col + row * _cols]); bool oldMode = cb->selectionModeEnabled(); cb->setSelectionMode( true ); @@ -319,7 +319,7 @@ void CharTable::selectCell(int row, int col) cb->setSelectionMode( false ); cb->setText( text ); cb->setSelectionMode( oldMode ); - TQObject::connect( cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); + TQObject::connect( cb, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clearCell()) ); } void CharTable::clearCell() @@ -332,7 +332,7 @@ void CharTable::clearCell() repaintCell(oldRow, oldCol); - TQObject::disconnect( TQApplication::clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clearCell()) ); + TQObject::disconnect( TQApplication::clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clearCell()) ); } diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp index ceedeef..e5a3bc1 100644 --- a/kcalc/dlabel.cpp +++ b/kcalc/dlabel.cpp @@ -40,8 +40,8 @@ DispLogic::DispLogic(TQWidget *parent, const char *name, { KNumber::setDefaultFloatOutput(true); KNumber::setDefaultFractionalInput(true); - _back = KStdAction::undo(this, TQT_SLOT(history_back()), coll); - _forward = KStdAction::redo(this, TQT_SLOT(history_forward()), coll); + _back = KStdAction::undo(this, TQ_SLOT(history_back()), coll); + _forward = KStdAction::redo(this, TQ_SLOT(history_forward()), coll); _forward->setEnabled(false); _back->setEnabled(false); diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 886128e..130bf43 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -89,7 +89,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) TDEAcceleratorManager::setNoAccel( central ); // Detect color change - connect(kapp,TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(set_colors())); + connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(set_colors())); calc_display = new DispLogic(central, "display", actionCollection()); @@ -105,7 +105,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) // Create Button to select BaseMode BaseChooseGroup = new TQHButtonGroup(i18n("Base"), central); - connect(BaseChooseGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotBaseSelected(int))); + connect(BaseChooseGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotBaseSelected(int))); BaseChooseGroup->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); @@ -138,7 +138,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) angle_menu->insertItem(i18n("Gradians"), 2); angle_menu->setCheckable(true); - connect(angle_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAngleSelected(int))); + connect(angle_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotAngleSelected(int))); pbAngleChoose->setPopup(angle_menu); @@ -146,9 +146,9 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbInv = new KCalcButton("Inv", central, "Inverse-Button", i18n("Inverse mode")); pbInv->setAccel(Key_I); - connect(pbInv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotInvtoggled(bool))); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbInv, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbInv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotInvtoggled(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbInv, TQ_SLOT(slotSetAccelDisplayMode(bool))); pbInv->setToggleButton(true); // @@ -170,25 +170,25 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbMod->addMode(ModeNormal, "Mod", i18n("Modulo")); pbMod->addMode(ModeInverse, "IntDiv", i18n("Integer division")); pbMod->setAccel(Key_Colon); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbMod, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbMod, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMod, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotModclicked(void))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbMod, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMod, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMod, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotModclicked(void))); pbReci = new KCalcButton(mSmallPage, "Reciprocal-Button"); pbReci->addMode(ModeNormal, "1/x", i18n("Reciprocal")); pbReci->setAccel(Key_R); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbReci, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbReci, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotReciclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbReci, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbReci, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotReciclicked(void))); pbFactorial = new KCalcButton(mSmallPage, "Factorial-Button"); pbFactorial->addMode(ModeNormal, "x!", i18n("Factorial")); pbFactorial->setAccel(Key_Exclam); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbFactorial, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbFactorial, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotFactorialclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbFactorial, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbFactorial, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotFactorialclicked(void))); // Representation of x^2 is moved to the function // changeRepresentation() that paints the letters When @@ -197,20 +197,20 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbSquare = new KCalcButton(mSmallPage, "Square-Button"); pbSquare->addMode(ModeNormal, "x<sup>2</sup>", i18n("Square"), true); pbSquare->addMode(ModeInverse, "x<sup>3</sup>", i18n("Third power"), true); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbSquare, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbSquare, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(pbSquare, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSquareclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbSquare, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbSquare, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(pbSquare, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotSquareclicked(void))); pbRoot = new KSquareButton(mSmallPage, "Square-Button"); pbRoot->addMode(ModeNormal, "sqrt(x)", i18n("Square root")); pbRoot->addMode(ModeInverse, "sqrt[3](x)", i18n("Cube root")); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbRoot, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbRoot, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(pbRoot, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotRootclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbRoot, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbRoot, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(pbRoot, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotRootclicked(void))); // Representation of x^y is moved to the function @@ -219,12 +219,12 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) pbPower = new KCalcButton(mSmallPage, "Power-Button"); pbPower->addMode(ModeNormal, "x<sup>y</sup>", i18n("x to the power of y"), true); pbPower->addMode(ModeInverse, "x<sup>1/y</sup>", i18n("x to the power of 1/y"), true); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbPower, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbPower, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPower, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbPower, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); pbPower->setAccel(Key_AsciiCircum); - connect(pbPower, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPowerclicked(void))); + connect(pbPower, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPowerclicked(void))); // @@ -369,8 +369,8 @@ KCalculator::KCalculator(TQWidget *parent, const char *name) // Show the result in the app's caption in taskbar (wishlist - bug #52858) if (KCalcSettings::captionResult() == true) connect(calc_display, - TQT_SIGNAL(changedText(const TQString &)), - TQT_SLOT(setCaption(const TQString &))); + TQ_SIGNAL(changedText(const TQString &)), + TQ_SLOT(setCaption(const TQString &))); calc_display->changeSettings(); set_precision(); @@ -409,48 +409,48 @@ KCalculator::~KCalculator() void KCalculator::setupMainActions(void) { // file menu - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); // edit menu - KStdAction::cut(calc_display, TQT_SLOT(slotCut()), actionCollection()); - KStdAction::copy(calc_display, TQT_SLOT(slotCopy()), actionCollection()); - KStdAction::paste(calc_display, TQT_SLOT(slotPaste()), actionCollection()); + KStdAction::cut(calc_display, TQ_SLOT(slotCut()), actionCollection()); + KStdAction::copy(calc_display, TQ_SLOT(slotCopy()), actionCollection()); + KStdAction::paste(calc_display, TQ_SLOT(slotPaste()), actionCollection()); // settings menu actionStatshow = new TDEToggleAction(i18n("&Statistic Buttons"), 0, actionCollection(), "show_stat"); actionStatshow->setChecked(true); - connect(actionStatshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotStatshow(bool))); + connect(actionStatshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotStatshow(bool))); actionScientificshow = new TDEToggleAction(i18n("Science/&Engineering Buttons"), 0, actionCollection(), "show_science"); actionScientificshow->setChecked(true); - connect(actionScientificshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotScientificshow(bool))); + connect(actionScientificshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotScientificshow(bool))); actionLogicshow = new TDEToggleAction(i18n("&Logic Buttons"), 0, actionCollection(), "show_logic"); actionLogicshow->setChecked(true); - connect(actionLogicshow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotLogicshow(bool))); + connect(actionLogicshow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotLogicshow(bool))); actionConstantsShow = new TDEToggleAction(i18n("&Constants Buttons"), 0, actionCollection(), "show_constants"); actionConstantsShow->setChecked(true); - connect(actionConstantsShow, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotConstantsShow(bool))); + connect(actionConstantsShow, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotConstantsShow(bool))); - (void) new TDEAction(i18n("&Show All"), 0, this, TQT_SLOT(slotShowAll()), + (void) new TDEAction(i18n("&Show All"), 0, this, TQ_SLOT(slotShowAll()), actionCollection(), "show_all"); - (void) new TDEAction(i18n("&Hide All"), 0, this, TQT_SLOT(slotHideAll()), + (void) new TDEAction(i18n("&Hide All"), 0, this, TQ_SLOT(slotHideAll()), actionCollection(), "hide_all"); - KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); } @@ -481,128 +481,128 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) KCalcButton *tmp_pb; NumButtonGroup = new TQButtonGroup(0, "Num-Button-Group"); - connect(NumButtonGroup, TQT_SIGNAL(clicked(int)), - TQT_SLOT(slotNumberclicked(int))); + connect(NumButtonGroup, TQ_SIGNAL(clicked(int)), + TQ_SLOT(slotNumberclicked(int))); tmp_pb = new KCalcButton("0", thisPage, "0-Button"); tmp_pb->setAccel(Key_0); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0); tmp_pb = new KCalcButton("1", thisPage, "1-Button"); tmp_pb->setAccel(Key_1); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 1); tmp_pb = new KCalcButton("2", thisPage, "2-Button"); tmp_pb->setAccel(Key_2); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 2); tmp_pb = new KCalcButton("3", thisPage, "3-Button"); tmp_pb->setAccel(Key_3); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 3); tmp_pb = new KCalcButton("4", thisPage, "4-Button"); tmp_pb->setAccel(Key_4); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 4); tmp_pb = new KCalcButton("5", thisPage, "5-Button"); tmp_pb->setAccel(Key_5); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 5); tmp_pb = new KCalcButton("6", thisPage, "6-Button"); tmp_pb->setAccel(Key_6); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 6); tmp_pb = new KCalcButton("7", thisPage, "7-Button"); tmp_pb->setAccel(Key_7); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 7); tmp_pb = new KCalcButton("8", thisPage, "8-Button"); tmp_pb->setAccel(Key_8); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 8); tmp_pb = new KCalcButton("9", thisPage, "9-Button"); tmp_pb->setAccel(Key_9); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 9); pbEE = new KCalcButton(thisPage, "EE-Button"); pbEE->addMode(ModeNormal, "x<small>" "\xb7" "10</small><sup>y</sup>", i18n("Exponent"), true); pbEE->setAccel(Key_E); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbEE, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbEE, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEEclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbEE, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbEE, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotEEclicked(void))); pbParenClose = new KCalcButton(")", mLargePage, "ParenClose-Button"); pbParenClose->setAccel(Key_ParenRight); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbParenClose, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbParenClose,TQT_SIGNAL(clicked(void)),TQT_SLOT(slotParenCloseclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbParenClose, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbParenClose,TQ_SIGNAL(clicked(void)),TQ_SLOT(slotParenCloseclicked(void))); pbX = new KCalcButton("X", thisPage, "Multiply-Button", i18n("Multiplication")); pbX->setAccel(Key_multiply); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbX, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbX, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Pressed '*'", i18n("Pressed Multiplication-Button"), - 0, Key_Asterisk, pbX, TQT_SLOT(animateClick())); - connect(pbX, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXclicked(void))); + 0, Key_Asterisk, pbX, TQ_SLOT(animateClick())); + connect(pbX, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotXclicked(void))); pbDivision = new KCalcButton("/", thisPage, "Division-Button", i18n("Division")); pbDivision->setAccel(Key_Slash); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbDivision, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbDivision, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotDivisionclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbDivision, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbDivision, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotDivisionclicked(void))); pbPlus = new KCalcButton("+", thisPage, "Plus-Button", i18n("Addition")); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbPlus, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPlus, TQ_SLOT(slotSetAccelDisplayMode(bool))); pbPlus->setAccel(Key_Plus); - connect(pbPlus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPlusclicked(void))); + connect(pbPlus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPlusclicked(void))); pbMinus = new KCalcButton("-", thisPage, "Minus-Button", i18n("Subtraction")); pbMinus->setAccel(Key_Minus); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMinusclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMinus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMinusclicked(void))); pbPeriod = new KCalcButton(TDEGlobal::locale()->decimalSymbol(), thisPage, "Period-Button", i18n("Decimal point")); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbPeriod, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPeriod, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Decimal Point (Period)", i18n("Pressed Decimal Point"), - 0, Key_Period, pbPeriod, TQT_SLOT(animateClick())); + 0, Key_Period, pbPeriod, TQ_SLOT(animateClick())); accel()->insert("Decimal Point (Comma)", i18n("Pressed Decimal Point"), - 0, Key_Comma, pbPeriod, TQT_SLOT(animateClick())); - connect(pbPeriod, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPeriodclicked(void))); + 0, Key_Comma, pbPeriod, TQ_SLOT(animateClick())); + connect(pbPeriod, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPeriodclicked(void))); pbEqual = new KCalcButton("=", thisPage, "Equal-Button", i18n("Result")); pbEqual->setAccel(Key_Enter); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbEqual, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbEqual, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Entered Equal", i18n("Pressed Equal-Button"), - 0, Key_Equal, pbEqual, TQT_SLOT(animateClick())); + 0, Key_Equal, pbEqual, TQ_SLOT(animateClick())); accel()->insert("Entered Return", i18n("Pressed Equal-Button"), - 0, Key_Return, pbEqual, TQT_SLOT(animateClick())); - connect(pbEqual, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotEqualclicked(void))); + 0, Key_Return, pbEqual, TQ_SLOT(animateClick())); + connect(pbEqual, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotEqualclicked(void))); TQGridLayout *thisLayout = new TQGridLayout(thisPage, 5, 4, 0, @@ -641,101 +641,101 @@ TQWidget* KCalculator::setupNumericKeys(TQWidget *parent) pbMemRecall = new KCalcButton("MR", mLargePage, "MemRecall-Button", i18n("Memory recall")); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbMemRecall, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemRecall, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotMemRecallclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemRecall, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemRecall, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotMemRecallclicked(void))); pbMemRecall->setDisabled(true); // At start, there is nothing in memory pbMemPlusMinus = new KCalcButton(mLargePage, "MPlusMinus-Button"); pbMemPlusMinus->addMode(ModeNormal, "M+", i18n("Add display to memory")); pbMemPlusMinus->addMode(ModeInverse, "M-", i18n("Subtract from memory")); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - pbMemPlusMinus, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbMemPlusMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemPlusMinus,TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotMemPlusMinusclicked(void))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + pbMemPlusMinus, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemPlusMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemPlusMinus,TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotMemPlusMinusclicked(void))); pbMemStore = new KCalcButton("MS", mLargePage, "MemStore-Button", i18n("Memory store")); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbMemStore, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMemStore, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMemStoreclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMemStore, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMemStore, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMemStoreclicked(void))); pbMC = new KCalcButton("MC", mLargePage, "MemClear-Button", i18n("Clear memory")); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbMC, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbMC, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotMCclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbMC, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbMC, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotMCclicked(void))); pbClear = new KCalcButton("C", mLargePage, "Clear-Button", i18n("Clear")); pbClear->setAccel(Key_Prior); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbClear, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbClear, TQ_SLOT(slotSetAccelDisplayMode(bool))); accel()->insert("Entered 'ESC'", i18n("Pressed ESC-Button"), 0, - Key_Escape, pbClear, TQT_SLOT(animateClick())); - connect(pbClear, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotClearclicked(void))); + Key_Escape, pbClear, TQ_SLOT(animateClick())); + connect(pbClear, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotClearclicked(void))); pbAC = new KCalcButton("AC", mLargePage, "AC-Button", i18n("Clear all")); pbAC->setAccel(Key_Delete); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbAC, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbAC, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotACclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbAC, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbAC, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotACclicked(void))); pbParenOpen = new KCalcButton("(", mLargePage, "ParenOpen-Button"); pbParenOpen->setAccel(Key_ParenLeft); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbParenOpen, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbParenOpen, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotParenOpenclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbParenOpen, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbParenOpen, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotParenOpenclicked(void))); pbPercent = new KCalcButton("%", mLargePage, "Percent-Button", i18n("Percent")); pbPercent->setAccel(Key_Percent); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbPercent, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbPercent, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPercentclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPercent, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbPercent, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPercentclicked(void))); pbPlusMinus = new KCalcButton("\xb1", mLargePage, "Sign-Button", i18n("Change sign")); pbPlusMinus->setAccel(Key_Backslash); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - pbPlusMinus, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(pbPlusMinus, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotPlusMinusclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + pbPlusMinus, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(pbPlusMinus, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotPlusMinusclicked(void))); tmp_pb = new KCalcButton("A", mSmallPage, "A-Button"); tmp_pb->setAccel(Key_A); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xA); tmp_pb = new KCalcButton("B", mSmallPage, "B-Button"); tmp_pb->setAccel(Key_B); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xB); tmp_pb = new KCalcButton("C", mSmallPage, "C-Button"); tmp_pb->setAccel(Key_C); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xC); tmp_pb = new KCalcButton("D", mSmallPage, "D-Button"); tmp_pb->setAccel(Key_D); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xD); tmp_pb = new KCalcButton("E", mSmallPage, "E-Button"); tmp_pb->setAccel(Key_E); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xE); tmp_pb = new KCalcButton("F", mSmallPage, "F-Button"); tmp_pb->setAccel(Key_F); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); NumButtonGroup->insert(tmp_pb, 0xF); return thisPage; @@ -750,48 +750,48 @@ void KCalculator::setupLogicKeys(TQWidget *parent) tmp_pb = new KCalcButton("AND", parent, "AND-Button", i18n("Bitwise AND")); pbLogic.insert("AND", tmp_pb); tmp_pb->setAccel(Key_Ampersand); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotANDclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotANDclicked(void))); tmp_pb = new KCalcButton("OR", parent, "OR-Button", i18n("Bitwise OR")); pbLogic.insert("OR", tmp_pb); tmp_pb->setAccel(Key_Bar); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotORclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotORclicked(void))); tmp_pb = new KCalcButton("XOR", parent, "XOR-Button", i18n("Bitwise XOR")); pbLogic.insert("XOR", tmp_pb); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotXORclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotXORclicked(void))); tmp_pb = new KCalcButton("Cmp", parent, "One-Complement-Button", i18n("One's complement")); pbLogic.insert("One-Complement", tmp_pb); tmp_pb->setAccel(Key_AsciiTilde); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotNegateclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotNegateclicked(void))); tmp_pb = new KCalcButton("Lsh", parent, "LeftBitShift-Button", i18n("Left bit shift")); tmp_pb->setAccel(Key_Less); pbLogic.insert("LeftShift", tmp_pb); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotLeftShiftclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotLeftShiftclicked(void))); tmp_pb = new KCalcButton("Rsh", parent, "RightBitShift-Button", i18n("Right bit shift")); tmp_pb->setAccel(Key_Greater); pbLogic.insert("RightShift", tmp_pb); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), - TQT_SLOT(slotRightShiftclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), + TQ_SLOT(slotRightShiftclicked(void))); } void KCalculator::setupScientificKeys(TQWidget *parent) @@ -803,9 +803,9 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb = new KCalcButton("Hyp", parent, "Hyp-Button", i18n("Hyperbolic mode")); pbScientific.insert("HypMode", tmp_pb); tmp_pb->setAccel(Key_H); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotHyptoggled(bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotHyptoggled(bool))); tmp_pb->setToggleButton(true); tmp_pb = new KCalcButton(parent, "Sin-Button"); @@ -816,11 +816,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Asinh", i18n("Inverse hyperbolic sine")); tmp_pb->setAccel(Key_S); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotSinclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotSinclicked(void))); tmp_pb = new KCalcButton(parent, "Cos-Button"); pbScientific.insert("Cosine", tmp_pb); @@ -830,11 +830,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Acosh", i18n("Inverse hyperbolic cosine")); tmp_pb->setAccel(Key_C); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotCosclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotCosclicked(void))); tmp_pb = new KCalcButton(parent, "Tan-Button"); pbScientific.insert("Tangent", tmp_pb); @@ -844,11 +844,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) tmp_pb->addMode(ButtonModeFlags(ModeInverse | ModeHyperbolic), "Atanh", i18n("Inverse hyperbolic tangent")); tmp_pb->setAccel(Key_T); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)),TQT_SLOT(slotTanclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)),TQ_SLOT(slotTanclicked(void))); tmp_pb = new KCalcButton(parent, "Ln-Button"); tmp_pb->addMode(ModeNormal, "Ln", i18n("Natural log")); @@ -856,11 +856,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) true); pbScientific.insert("LogNatural", tmp_pb); tmp_pb->setAccel(Key_N); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLnclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotLnclicked(void))); tmp_pb = new KCalcButton(parent, "Log-Button"); tmp_pb->addMode(ModeNormal, "Log", i18n("Logarithm to base 10")); @@ -868,11 +868,11 @@ void KCalculator::setupScientificKeys(TQWidget *parent) true); pbScientific.insert("Log10", tmp_pb); tmp_pb->setAccel(Key_L); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotLogclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotLogclicked(void))); } @@ -888,20 +888,20 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) + "x", i18n("Sum of all data items")); pbStat.insert("NumData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatNumclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatNumclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.Median-Button"); tmp_pb->addMode(ModeNormal, "Med", i18n("Median")); pbStat.insert("Median", tmp_pb); mStatButtonList.append(tmp_pb); TQToolTip::add(tmp_pb, i18n("Median")); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMedianclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatMedianclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.Mean-Button"); tmp_pb->addMode(ModeNormal, "Mea", i18n("Mean")); @@ -910,11 +910,11 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) i18n("Sum of all data items squared"), true); pbStat.insert("Mean", tmp_pb); mStatButtonList.append(tmp_pb); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatMeanclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatMeanclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.StandardDeviation-Button"); tmp_pb->addMode(ModeNormal, TQString::fromUtf8("σ",-1) + "<sub>N-1</sub>", @@ -923,30 +923,30 @@ void KCalculator::setupStatisticKeys(TQWidget *parent) i18n("Standard deviation"), true); pbStat.insert("StandardDeviation", tmp_pb); mStatButtonList.append(tmp_pb); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatStdDevclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatStdDevclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.DataInput-Button"); tmp_pb->addMode(ModeNormal, "Dat", i18n("Enter data")); tmp_pb->addMode(ModeInverse, "CDat", i18n("Delete last data item")); pbStat.insert("InputData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatDataInputclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatDataInputclicked(void))); tmp_pb = new KCalcButton(parent, "Stat.ClearData-Button"); tmp_pb->addMode(ModeNormal, "CSt", i18n("Clear data store")); pbStat.insert("ClearData", tmp_pb); mStatButtonList.append(tmp_pb); - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(tmp_pb, TQT_SIGNAL(clicked(void)), TQT_SLOT(slotStatClearDataclicked(void))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(tmp_pb, TQ_SIGNAL(clicked(void)), TQ_SLOT(slotStatClearDataclicked(void))); } void KCalculator::setupConstantsKeys(TQWidget *parent) @@ -954,62 +954,62 @@ void KCalculator::setupConstantsKeys(TQWidget *parent) TQ_CHECK_PTR(parent); ConstButtonGroup = new TQButtonGroup(0, "Const-Button-Group"); - connect(ConstButtonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotConstclicked(int))); + connect(ConstButtonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotConstclicked(int))); KCalcConstButton *tmp_pb; tmp_pb = new KCalcConstButton(parent, 0, "C1"); tmp_pb->setAccel(ALT + Key_1); pbConstant[0] = tmp_pb; - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 0); tmp_pb = new KCalcConstButton(parent, 1, "C2"); tmp_pb->setAccel(ALT + Key_2); pbConstant[1] = tmp_pb; - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 1); tmp_pb = new KCalcConstButton(parent, 2, "C3"); tmp_pb->setAccel(ALT + Key_3); pbConstant[2] = tmp_pb; - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 2); tmp_pb = new KCalcConstButton(parent, 3, "C4"); tmp_pb->setAccel(ALT + Key_4); pbConstant[3] = tmp_pb; - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 3); tmp_pb = new KCalcConstButton(parent, 4, "C5"); tmp_pb->setAccel(ALT + Key_5); pbConstant[4] = tmp_pb; - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 4); tmp_pb = new KCalcConstButton(parent, 5, "C6"); tmp_pb->setAccel(ALT + Key_6); pbConstant[5] = tmp_pb; - connect(this, TQT_SIGNAL(switchShowAccels(bool)), - tmp_pb, TQT_SLOT(slotSetAccelDisplayMode(bool))); - connect(this, TQT_SIGNAL(switchMode(ButtonModeFlags,bool)), - tmp_pb, TQT_SLOT(slotSetMode(ButtonModeFlags,bool))); + connect(this, TQ_SIGNAL(switchShowAccels(bool)), + tmp_pb, TQ_SLOT(slotSetAccelDisplayMode(bool))); + connect(this, TQ_SIGNAL(switchMode(ButtonModeFlags,bool)), + tmp_pb, TQ_SLOT(slotSetMode(ButtonModeFlags,bool))); ConstButtonGroup->insert(tmp_pb, 5); changeButtonNames(); @@ -1017,8 +1017,8 @@ void KCalculator::setupConstantsKeys(TQWidget *parent) // add menu with scientific constants KCalcConstMenu *tmp_menu = new KCalcConstMenu(this); menuBar()->insertItem(i18n("&Constants"), tmp_menu, -1, 2); - connect(tmp_menu, TQT_SIGNAL(activated(int)), this, - TQT_SLOT(slotConstantToDisplay(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), this, + TQ_SLOT(slotConstantToDisplay(int))); } void KCalculator::slotConstantToDisplay(int constant) @@ -1843,40 +1843,40 @@ void KCalculator::showSettings() tmp_const = constant; KCalcConstMenu *tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst0(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst0(int))); (constant->kPushButton0)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst1(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst1(int))); (constant->kPushButton1)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst2(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst2(int))); (constant->kPushButton2)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst3(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst3(int))); (constant->kPushButton3)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst4(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst4(int))); (constant->kPushButton4)->setPopup(tmp_menu); tmp_menu = new KCalcConstMenu(this); - connect(tmp_menu, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChooseScientificConst5(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChooseScientificConst5(int))); (constant->kPushButton5)->setPopup(tmp_menu); dialog->addPage(constant, i18n("Constants"), "constants"); // When the user clicks OK or Apply we want to update our settings. - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateSettings())); // Display the dialog. dialog->show(); @@ -2093,13 +2093,13 @@ void KCalculator::updateSettings() set_colors(); set_precision(); // Show the result in the app's caption in taskbar (wishlist - bug #52858) - disconnect(calc_display, TQT_SIGNAL(changedText(const TQString &)), + disconnect(calc_display, TQ_SIGNAL(changedText(const TQString &)), this, 0); if (KCalcSettings::captionResult()) { connect(calc_display, - TQT_SIGNAL(changedText(const TQString &)), - TQT_SLOT(setCaption(const TQString &))); + TQ_SIGNAL(changedText(const TQString &)), + TQ_SLOT(setCaption(const TQString &))); } else { diff --git a/kcalc/kcalc_const_button.cpp b/kcalc/kcalc_const_button.cpp index fa137f5..1db27b9 100644 --- a/kcalc/kcalc_const_button.cpp +++ b/kcalc/kcalc_const_button.cpp @@ -74,8 +74,8 @@ void KCalcConstButton::initPopupMenu(void) _popup->insertItem(i18n("Set Name"), 0); _popup->insertItem(i18n("Choose From List"), tmp_menu, 1); - connect(_popup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotConfigureButton(int))); - connect(tmp_menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChooseScientificConst(int))); + connect(_popup, TQ_SIGNAL(activated(int)), TQ_SLOT(slotConfigureButton(int))); + connect(tmp_menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChooseScientificConst(int))); KContextMenuManager::insert(this, _popup); } diff --git a/kcalc/kcalc_const_menu.cpp b/kcalc/kcalc_const_menu.cpp index 23790cb..6d74928 100644 --- a/kcalc/kcalc_const_menu.cpp +++ b/kcalc/kcalc_const_menu.cpp @@ -64,11 +64,11 @@ KCalcConstMenu::KCalcConstMenu(TQWidget * parent, const char * name) insertItem(i18n("Thermodynamics"), thermo_menu); insertItem(i18n("Gravitation"), gravitation_menu); - connect(math_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(em_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(nuclear_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(thermo_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); - connect(gravitation_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPassActivate(int))); + connect(math_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(em_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(nuclear_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(thermo_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); + connect(gravitation_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPassActivate(int))); for (int i = 0; i<NUM_CONST; i++) { diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp index 1c620b0..ecb0827 100644 --- a/kcalc/kcalcdisplay.cpp +++ b/kcalc/kcalcdisplay.cpp @@ -51,10 +51,10 @@ KCalcDisplay::KCalcDisplay(TQWidget *parent, const char *name) setFocusPolicy(TQWidget::StrongFocus); setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, false); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDisplaySelected())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDisplaySelected())); - connect(selection_timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(slotSelectionTimedOut())); + connect(selection_timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(slotSelectionTimedOut())); sendEvent(EventReset); } diff --git a/kcharselect/kcharselectdia.cpp b/kcharselect/kcharselectdia.cpp index 8f8b2a9..f3caed8 100644 --- a/kcharselect/kcharselectdia.cpp +++ b/kcharselect/kcharselectdia.cpp @@ -36,12 +36,12 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, // Add character selection widget from library tdeui charSelect = new KCharSelect(mainWidget,"",vFont,vChr,_tableNum); charSelect->resize(charSelect->sizeHint()); - connect(charSelect,TQT_SIGNAL(highlighted(const TQChar &)), - TQT_SLOT(charChanged(const TQChar &))); - connect(charSelect,TQT_SIGNAL(activated(const TQChar &)), - TQT_SLOT(add(const TQChar &))); - connect(charSelect,TQT_SIGNAL(fontChanged(const TQString &)), - TQT_SLOT(fontSelected(const TQString &))); + connect(charSelect,TQ_SIGNAL(highlighted(const TQChar &)), + TQ_SLOT(charChanged(const TQChar &))); + connect(charSelect,TQ_SIGNAL(activated(const TQChar &)), + TQ_SLOT(add(const TQChar &))); + connect(charSelect,TQ_SIGNAL(fontChanged(const TQString &)), + TQ_SLOT(fontSelected(const TQString &))); grid->addMultiCellWidget(charSelect, 0, 0, 0, 3); // Build line editor @@ -52,13 +52,13 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, font.setFamily( vFont ); lined->setFont( font ); - connect(lined,TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(lineEditChanged())); + connect(lined,TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(lineEditChanged())); grid->addMultiCellWidget(lined, 1, 1, 0, 3); // Build some buttons bHelp = new KPushButton( KStdGuiItem::help(), mainWidget ); - connect(bHelp,TQT_SIGNAL(clicked()),this,TQT_SLOT(help())); + connect(bHelp,TQ_SIGNAL(clicked()),this,TQ_SLOT(help())); bHelp->setFixedSize( bHelp->sizeHint() ); grid->addWidget( bHelp, 2, 0 ); @@ -66,39 +66,39 @@ KCharSelectDia::KCharSelectDia(TQWidget *parent,const char *name, grid->addItem( space, 2, 1 ); bClear = new KPushButton( KStdGuiItem::clear(), mainWidget ); - connect(bClear,TQT_SIGNAL(clicked()),this,TQT_SLOT(clear())); + connect(bClear,TQ_SIGNAL(clicked()),this,TQ_SLOT(clear())); bClear->setFixedSize( bClear->sizeHint() ); grid->addWidget( bClear, 2, 2 ); bClip = new KPushButton( KGuiItem( i18n( "&To Clipboard" ), "edit-copy" ), mainWidget ); bClip->setFixedSize( bClip->sizeHint() ); - connect(bClip,TQT_SIGNAL(clicked()),this,TQT_SLOT(toClip())); + connect(bClip,TQ_SIGNAL(clicked()),this,TQ_SLOT(toClip())); grid->addWidget( bClip, 2, 3 ); // Build menu - KStdAction::quit( this, TQT_SLOT(_exit()), actionCollection() ); + KStdAction::quit( this, TQ_SLOT(_exit()), actionCollection() ); new TDEAction(i18n("&To Clipboard"), "edit-copy", - TDEStdAccel::shortcut(TDEStdAccel::Copy), this, TQT_SLOT(toClip()), actionCollection(), "copy_clip" ); + TDEStdAccel::shortcut(TDEStdAccel::Copy), this, TQ_SLOT(toClip()), actionCollection(), "copy_clip" ); (void)new TDEAction(i18n("To Clipboard &UTF-8"), 0, this, - TQT_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" ); + TQ_SLOT(toClipUTF8()), actionCollection(), "copy_utf_8" ); (void)new TDEAction(i18n("To Clipboard &HTML"), 0, this, - TQT_SLOT(toClipHTML()), actionCollection(), "copy_html" ); + TQ_SLOT(toClipHTML()), actionCollection(), "copy_html" ); new TDEAction(i18n("&From Clipboard"), "edit-paste", - TDEStdAccel::shortcut(TDEStdAccel::Paste), this, TQT_SLOT(fromClip()), actionCollection(), "from_clip" ); + TDEStdAccel::shortcut(TDEStdAccel::Paste), this, TQ_SLOT(fromClip()), actionCollection(), "from_clip" ); (void)new TDEAction(i18n("From Clipboard UTF-8"), 0, this, - TQT_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" ); + TQ_SLOT(fromClipUTF8()), actionCollection(), "from_clip_utf8" ); i18n("From Clipboard HTML"); // Intended for future use - KStdAction::clear(this, TQT_SLOT(clear()), actionCollection(), "clear"); + KStdAction::clear(this, TQ_SLOT(clear()), actionCollection(), "clear"); (void)new TDEAction(i18n("&Flip"), 0, this, - TQT_SLOT(flipText()), actionCollection(), "flip" ); + TQ_SLOT(flipText()), actionCollection(), "flip" ); (void)new TDEAction(i18n("&Alignment"), 0, this, - TQT_SLOT(toggleEntryDirection()), actionCollection(), "alignment" ); + TQ_SLOT(toggleEntryDirection()), actionCollection(), "alignment" ); charSelect->setFocus(); diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index 3526999..8927f0a 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -53,10 +53,10 @@ DiskList::DiskList(TQObject *parent, const char *name) // BackgroundProcesses **************************************** dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); - connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), - this, TQT_SLOT(dfDone() ) ); + connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ), + this, TQ_SLOT(dfDone() ) ); readingDFStdErrOut=FALSE; config = kapp->config(); diff --git a/kdf/disks.cpp b/kdf/disks.cpp index 1084380..391b5d9 100644 --- a/kdf/disks.cpp +++ b/kdf/disks.cpp @@ -56,10 +56,10 @@ void DiskEntry::init() // BackgroundProcesses **************************************** sysProc = new KShellProcess(); TQ_CHECK_PTR(sysProc); - connect( sysProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); - connect( sysProc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); + connect( sysProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); + connect( sysProc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) ); readingSysStdErrOut=FALSE; diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp index 60b590d..ea3263a 100644 --- a/kdf/kdf.cpp +++ b/kdf/kdf.cpp @@ -41,11 +41,11 @@ KDFTopLevel::KDFTopLevel(TQWidget *, const char *name) { kdf = new KDFWidget(this,"kdf",FALSE); TQ_CHECK_PTR(kdf); - (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQT_SLOT( updateDF() ), actionCollection(), "updatedf" ); + (void) new TDEAction( i18n( "&Update" ), 0, kdf, TQ_SLOT( updateDF() ), actionCollection(), "updatedf" ); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - KStdAction::preferences(kdf, TQT_SLOT(settingsBtnClicked()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::preferences(kdf, TQ_SLOT(settingsBtnClicked()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); setCentralWidget(kdf); // kdf->setMinimumSize(kdf->sizeHint()); diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index d1f5c15..b3fef55 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -79,10 +79,10 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) { mList->addColumn( mTabName[i]->mName ); } - connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int))); - connect( mList, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotChanged())); + connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(toggleListText(TQListViewItem *,const TQPoint &,int))); + connect( mList, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotChanged())); topLayout->addWidget( mList ); TQListViewItem *mListItem = new TQListViewItem( mList ); @@ -103,13 +103,13 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) mScroll->setSteps(1,20); mScroll->setRange(0, 180 ); gl->addWidget( mScroll, 1, 1 ); - connect(mScroll,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChanged())); + connect(mScroll,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChanged())); mLCD = new TQLCDNumber( this ); TQ_CHECK_PTR(mLCD); mLCD->setNumDigits( 3 ); mLCD->setSegmentStyle(TQLCDNumber::Filled); - connect(mScroll,TQT_SIGNAL(valueChanged(int)),mLCD,TQT_SLOT(display(int))); + connect(mScroll,TQ_SIGNAL(valueChanged(int)),mLCD,TQ_SLOT(display(int))); gl->addMultiCellWidget( mLCD, 0, 1, 0, 0 ); text = i18n("Update frequency [seconds]. The value 0 disables update" ); @@ -125,19 +125,19 @@ KDFConfigWidget::KDFConfigWidget(TQWidget *parent, const char *name, bool init) mFileManagerEdit = new TQLineEdit( this ); TQ_CHECK_PTR(mFileManagerEdit); topLayout->addWidget( mFileManagerEdit ); - connect(mFileManagerEdit,TQT_SIGNAL(textChanged (const TQString &)),this,TQT_SLOT(slotChanged())); + connect(mFileManagerEdit,TQ_SIGNAL(textChanged (const TQString &)),this,TQ_SLOT(slotChanged())); text = i18n("Open file manager automatically on mount"); mOpenMountCheck = new TQCheckBox(text, this ); TQ_CHECK_PTR(mOpenMountCheck); topLayout->addWidget( mOpenMountCheck ); - connect(mOpenMountCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged())); + connect(mOpenMountCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged())); text = i18n("Pop up a window when a disk gets critically full"); mPopupFullCheck = new TQCheckBox( text, this ); TQ_CHECK_PTR(mPopupFullCheck); topLayout->addWidget( mPopupFullCheck ); - connect(mPopupFullCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotChanged())); + connect(mPopupFullCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotChanged())); } loadSettings(); diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index 5a759ed..0c8a08e 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -95,10 +95,10 @@ void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full) KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init ) : TQWidget(parent, name), mOptionDialog(0), mPopup(0), mTimer(0) { - connect(&mDiskList , TQT_SIGNAL(readDFDone() ), - this, TQT_SLOT (updateDFDone()) ); - connect(&mDiskList , TQT_SIGNAL(criticallyFull(DiskEntry*)), - this, TQT_SLOT (criticallyFull(DiskEntry*)) ); + connect(&mDiskList , TQ_SIGNAL(readDFDone() ), + this, TQ_SLOT (updateDFDone()) ); + connect(&mDiskList , TQ_SIGNAL(criticallyFull(DiskEntry*)), + this, TQ_SLOT (criticallyFull(DiskEntry*)) ); mTabProp.resize(8); mTabProp[0] = new CTabEntry( "Icon", i18n("Icon"), true, 32); @@ -122,13 +122,13 @@ KDFWidget::KDFWidget( TQWidget *parent, const char *name, bool init ) mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); mList->setShowSortIndicator(true); connect( mList, - TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ))); + TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( rightButtonPressed( TQListViewItem *, const TQPoint &, int ))); connect( mList, - TQT_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int ))); - connect( mList->header(), TQT_SIGNAL(sizeChange(int, int, int)), - this, TQT_SLOT(columnSizeChanged(int, int, int)) ); + TQ_SIGNAL( rightButtonClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( rightButtonClicked( TQListViewItem *, const TQPoint &, int ))); + connect( mList->header(), TQ_SIGNAL(sizeChange(int, int, int)), + this, TQ_SLOT(columnSizeChanged(int, int, int)) ); makeColumns(); mIsTopLevel = TQString(parent->className()) == "KDFTopLevel" ? true : false; @@ -266,8 +266,8 @@ void KDFWidget::settingsBtnClicked( void ) { mOptionDialog = new COptionDialog( this, "options", false ); if( mOptionDialog == 0 ) { return; } - connect( mOptionDialog, TQT_SIGNAL(valueChanged()), - this, TQT_SLOT(settingsChanged()) ); + connect( mOptionDialog, TQ_SIGNAL(valueChanged()), + this, TQ_SLOT(settingsChanged()) ); } mOptionDialog->show(); } @@ -632,7 +632,7 @@ void KDFWidget::columnSizeChanged( int, int, int ) if( mTimer == 0 ) { mTimer = new TQTimer( this ); - connect( mTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateDiskBarPixmaps()) ); + connect( mTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateDiskBarPixmaps()) ); } else if( mTimer->isActive() == true ) { diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp index 6b9dafb..aba455b 100644 --- a/kdf/kwikdisk.cpp +++ b/kdf/kwikdisk.cpp @@ -69,11 +69,11 @@ KwikDisk::KwikDisk() setPixmap(KSystemTray::loadIcon("kdf")); show(); - connect( &m_diskList, TQT_SIGNAL(readDFDone()), this, TQT_SLOT(updateDFDone()) ); - connect( &m_diskList, TQT_SIGNAL(criticallyFull(DiskEntry*)), - this, TQT_SLOT(criticallyFull(DiskEntry*)) ); + connect( &m_diskList, TQ_SIGNAL(readDFDone()), this, TQ_SLOT(updateDFDone()) ); + connect( &m_diskList, TQ_SIGNAL(criticallyFull(DiskEntry*)), + this, TQ_SLOT(criticallyFull(DiskEntry*)) ); - connect( contextMenu(), TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(aboutToHide()) ); + connect( contextMenu(), TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(aboutToHide()) ); loadSettings(); updateDF(); @@ -184,7 +184,7 @@ void KwikDisk::updateDFDone() { entryName += TQString("\t\t\t[%1]").arg(disk->prettyKBAvail()); } - int id = contextMenu()->insertItem("", this, TQT_SLOT(toggleMount(int)) ); + int id = contextMenu()->insertItem("", this, TQ_SLOT(toggleMount(int)) ); contextMenu()->setItemParameter(id, itemNo); itemNo++; @@ -215,7 +215,7 @@ void KwikDisk::updateDFDone() qp.drawRect(0,0,pix->width(),pix->height()); qp.end(); } - contextMenu()->disconnectItem(id,disk,TQT_SLOT(toggleMount())); + contextMenu()->disconnectItem(id,disk,TQ_SLOT(toggleMount())); toolTipText = i18n("You must login as root to mount this disk"); } @@ -226,21 +226,21 @@ void KwikDisk::updateDFDone() contextMenu()->insertItem( KSystemTray::loadIcon("kdf"), - i18n("&Start KDiskFree"), this, TQT_SLOT(startKDF()),0); + i18n("&Start KDiskFree"), this, TQ_SLOT(startKDF()),0); contextMenu()->insertItem( KSystemTray::loadIcon("configure"), - i18n("&Configure KwikDisk..."), this, TQT_SLOT(changeSettings()),0); + i18n("&Configure KwikDisk..."), this, TQ_SLOT(changeSettings()),0); contextMenu()->insertItem( KSystemTray::loadIcon("help"), - KStdGuiItem::help().text(), this, TQT_SLOT(invokeHelp()),0); + KStdGuiItem::help().text(), this, TQ_SLOT(invokeHelp()),0); contextMenu()->insertSeparator(); contextMenu()->insertItem( KSystemTray::loadIcon("system-log-out"), - KStdGuiItem::quit().text(), this, TQT_SIGNAL(quitSelected()) ); + KStdGuiItem::quit().text(), this, TQ_SIGNAL(quitSelected()) ); } void KwikDisk::toggleMount(int item) @@ -297,8 +297,8 @@ void KwikDisk::changeSettings() { m_optionDialog = new COptionDialog(this, "options", FALSE); if( !m_optionDialog ) return; - connect(m_optionDialog, TQT_SIGNAL(valueChanged()), - this, TQT_SLOT(loadSettings())); + connect(m_optionDialog, TQ_SIGNAL(valueChanged()), + this, TQ_SLOT(loadSettings())); } m_optionDialog->show(); } @@ -335,7 +335,7 @@ int main(int argc, char **argv) KwikDisk *mainWin = 0; mainWin = new KwikDisk; - TQObject::connect(mainWin, TQT_SIGNAL(quitSelected()), &app, TQT_SLOT(quit())); + TQObject::connect(mainWin, TQ_SIGNAL(quitSelected()), &app, TQ_SLOT(quit())); // mainWin has WDestructiveClose flag by default, so it will delete itself. return app.exec(); diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp index 37b9ff8..dc9a771 100644 --- a/kdf/mntconfig.cpp +++ b/kdf/mntconfig.cpp @@ -59,7 +59,7 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mDiskList.readFSTAB(); mDiskList.readDF(); mInitializing = true; - connect( &mDiskList,TQT_SIGNAL(readDFDone()),this,TQT_SLOT(readDFDone())); + connect( &mDiskList,TQ_SIGNAL(readDFDone()),this,TQ_SLOT(readDFDone())); TQString text; TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint()); @@ -72,8 +72,8 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mList->addColumn( i18n("Mount Command") ); mList->addColumn( i18n("Unmount Command") ); mList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); - connect( mList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(clicked(TQListViewItem *))); + connect( mList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(clicked(TQListViewItem *))); topLayout->addWidget( mList ); @@ -93,47 +93,47 @@ MntConfigWidget::MntConfigWidget(TQWidget *parent, const char *name, bool init) mIconLineEdit = new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mIconLineEdit); mIconLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(iconChanged(const TQString&))); - connect( mIconLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(iconChanged(const TQString&))); + connect( mIconLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mIconLineEdit, 2, 0 ); mIconButton = new TDEIconButton(mGroupBox); mIconButton->setIconType(TDEIcon::Small, TDEIcon::Device); TQ_CHECK_PTR(mIconButton); mIconButton->setFixedWidth( mIconButton->sizeHint().height() ); - connect(mIconButton,TQT_SIGNAL(iconChanged(TQString)),this,TQT_SLOT(iconChangedButton(TQString))); + connect(mIconButton,TQ_SIGNAL(iconChanged(TQString)),this,TQ_SLOT(iconChangedButton(TQString))); gl->addWidget( mIconButton, 2, 1 ); //Mount mMountButton = new TQPushButton( i18n("Get Mount Command"), mGroupBox ); TQ_CHECK_PTR(mMountButton); - connect(mMountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectMntFile())); + connect(mMountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectMntFile())); gl->addWidget( mMountButton, 1, 2 ); mMountLineEdit = new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mMountLineEdit); mMountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect(mMountLineEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(mntCmdChanged(const TQString&))); - connect( mMountLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect(mMountLineEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(mntCmdChanged(const TQString&))); + connect( mMountLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mMountLineEdit, 1, 3 ); //Umount mUmountButton = new TQPushButton(i18n("Get Unmount Command"), mGroupBox ); TQ_CHECK_PTR( mUmountButton ); - connect(mUmountButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectUmntFile())); + connect(mUmountButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectUmntFile())); gl->addWidget( mUmountButton, 2, 2 ); mUmountLineEdit=new TQLineEdit(mGroupBox); TQ_CHECK_PTR(mUmountLineEdit); mUmountLineEdit->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect(mUmountLineEdit,TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(umntCmdChanged(const TQString&))); - connect( mUmountLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - this,TQT_SLOT(slotChanged())); + connect(mUmountLineEdit,TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(umntCmdChanged(const TQString&))); + connect( mUmountLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + this,TQ_SLOT(slotChanged())); gl->addWidget( mUmountLineEdit, 2, 3 ); } diff --git a/kdf/optiondialog.cpp b/kdf/optiondialog.cpp index 6734294..6d96fe3 100644 --- a/kdf/optiondialog.cpp +++ b/kdf/optiondialog.cpp @@ -33,13 +33,13 @@ COptionDialog::COptionDialog( TQWidget *parent, const char *name, bool modal ) TQVBoxLayout *l1 = new TQVBoxLayout( f1 ); mConf = new KDFConfigWidget( f1, "kdfconf" ); l1->addWidget(mConf); - connect( mConf, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mConf, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); TQFrame *f2 = addPage( i18n("Mount Commands") ); TQVBoxLayout *l2 = new TQVBoxLayout( f2 ); mMnt = new MntConfigWidget( f2, "mntconf"); l2->addWidget(mMnt); - connect( mMnt, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mMnt, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); enableButton( Apply, false ); dataChanged = false; } diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index 95227a9..bb01672 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -72,9 +72,9 @@ TopLevel::TopLevel (TQWidget *, const char *name) windowList->append( this ); statusbar_timer = new TQTimer(this); - connect(statusbar_timer, TQT_SIGNAL(timeout()),this,TQT_SLOT(timer_slot())); + connect(statusbar_timer, TQ_SIGNAL(timeout()),this,TQ_SLOT(timer_slot())); - connect(kapp,TQT_SIGNAL(tdedisplayPaletteChanged()),this,TQT_SLOT(set_colors())); + connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors())); setupStatusBar(); setupActions(); @@ -107,24 +107,24 @@ void TopLevel::setupEditWidget() eframe = new KEdit (this, "eframe"); eframe->setOverwriteEnabled(true); - connect(eframe, TQT_SIGNAL(CursorPositionChanged()),this, - TQT_SLOT(statusbar_slot())); - connect(eframe, TQT_SIGNAL(toggle_overwrite_signal()),this, - TQT_SLOT(toggle_overwrite())); - connect(eframe, TQT_SIGNAL(gotUrlDrop(TQDropEvent*)), this, - TQT_SLOT(urlDrop_slot(TQDropEvent*))); - connect(eframe, TQT_SIGNAL(undoAvailable(bool)),undoAction, - TQT_SLOT(setEnabled(bool))); - connect(eframe, TQT_SIGNAL(redoAvailable(bool)),redoAction, - TQT_SLOT(setEnabled(bool))); - connect(eframe, TQT_SIGNAL(copyAvailable(bool)),cutAction, - TQT_SLOT(setEnabled(bool))); - connect(eframe, TQT_SIGNAL(copyAvailable(bool)),copyAction, - TQT_SLOT(setEnabled(bool))); - connect( eframe, TQT_SIGNAL(selectionChanged()),this, - TQT_SLOT(slotSelectionChanged())); - connect( eframe, TQT_SIGNAL(modificationChanged( bool)), - TQT_SLOT(setFileCaption())); + connect(eframe, TQ_SIGNAL(CursorPositionChanged()),this, + TQ_SLOT(statusbar_slot())); + connect(eframe, TQ_SIGNAL(toggle_overwrite_signal()),this, + TQ_SLOT(toggle_overwrite())); + connect(eframe, TQ_SIGNAL(gotUrlDrop(TQDropEvent*)), this, + TQ_SLOT(urlDrop_slot(TQDropEvent*))); + connect(eframe, TQ_SIGNAL(undoAvailable(bool)),undoAction, + TQ_SLOT(setEnabled(bool))); + connect(eframe, TQ_SIGNAL(redoAvailable(bool)),redoAction, + TQ_SLOT(setEnabled(bool))); + connect(eframe, TQ_SIGNAL(copyAvailable(bool)),cutAction, + TQ_SLOT(setEnabled(bool))); + connect(eframe, TQ_SIGNAL(copyAvailable(bool)),copyAction, + TQ_SLOT(setEnabled(bool))); + connect( eframe, TQ_SIGNAL(selectionChanged()),this, + TQ_SLOT(slotSelectionChanged())); + connect( eframe, TQ_SIGNAL(modificationChanged( bool)), + TQ_SLOT(setFileCaption())); undoAction->setEnabled(false); redoAction->setEnabled(false); @@ -163,20 +163,20 @@ void TopLevel::setupEditWidget() right_mouse_button = new TQPopupMenu; right_mouse_button->insertItem (i18n("Open..."), - this, TQT_SLOT(file_open())); + this, TQ_SLOT(file_open())); right_mouse_button->insertItem (SmallIcon("document-save"),i18n("Save"), - this, TQT_SLOT(file_save())); + this, TQ_SLOT(file_save())); right_mouse_button->insertItem (SmallIcon("document-save-as"),i18n("Save As..."), - this, TQT_SLOT(file_save_as())); + this, TQ_SLOT(file_save_as())); right_mouse_button->insertSeparator(-1); right_mouse_button->insertItem(i18n("Copy"), - this, TQT_SLOT(copy())); + this, TQ_SLOT(copy())); right_mouse_button->insertItem(i18n("Paste"), - this, TQT_SLOT(paste())); + this, TQ_SLOT(paste())); right_mouse_button->insertItem(i18n("Cut"), - this, TQT_SLOT(cut())); + this, TQ_SLOT(cut())); right_mouse_button->insertItem(i18n("Select All"), - this, TQT_SLOT(select_all())); + this, TQ_SLOT(select_all())); eframe->installRBPopup(right_mouse_button); */ } @@ -193,42 +193,42 @@ void TopLevel::slotSelectionChanged() void TopLevel::setupActions() { // setup File menu - KStdAction::openNew(this, TQT_SLOT(file_new()), actionCollection()); - KStdAction::open(this, TQT_SLOT(file_open()), actionCollection()); - recent = KStdAction::openRecent(this, TQT_SLOT(openRecent(const KURL&)), + KStdAction::openNew(this, TQ_SLOT(file_new()), actionCollection()); + KStdAction::open(this, TQ_SLOT(file_open()), actionCollection()); + recent = KStdAction::openRecent(this, TQ_SLOT(openRecent(const KURL&)), actionCollection()); - KStdAction::save(this, TQT_SLOT(file_save()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(file_save_as()), actionCollection()); - KStdAction::close(this, TQT_SLOT(file_close()), actionCollection()); - KStdAction::print(this, TQT_SLOT(print()), actionCollection()); - KStdAction::mail(this, TQT_SLOT(mail()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); + KStdAction::save(this, TQ_SLOT(file_save()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(file_save_as()), actionCollection()); + KStdAction::close(this, TQ_SLOT(file_close()), actionCollection()); + KStdAction::print(this, TQ_SLOT(print()), actionCollection()); + KStdAction::mail(this, TQ_SLOT(mail()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); // setup edit menu - undoAction = KStdAction::undo(this, TQT_SLOT(undo()), actionCollection()); - redoAction = KStdAction::redo(this, TQT_SLOT(redo()), actionCollection()); - cutAction = KStdAction::cut(this, TQT_SLOT(cut()), actionCollection()); - copyAction = KStdAction::copy(this, TQT_SLOT(copy()), actionCollection()); - KStdAction::pasteText(this, TQT_SLOT(paste()), actionCollection()); - KStdAction::selectAll(this, TQT_SLOT(select_all()), actionCollection()); - KStdAction::find(this, TQT_SLOT(search()), actionCollection()); - KStdAction::findNext(this, TQT_SLOT(search_again()), actionCollection()); - KStdAction::replace(this, TQT_SLOT(replace()), actionCollection()); - - (void)new TDEAction(i18n("&Insert File..."), 0, this, TQT_SLOT(file_insert()), + undoAction = KStdAction::undo(this, TQ_SLOT(undo()), actionCollection()); + redoAction = KStdAction::redo(this, TQ_SLOT(redo()), actionCollection()); + cutAction = KStdAction::cut(this, TQ_SLOT(cut()), actionCollection()); + copyAction = KStdAction::copy(this, TQ_SLOT(copy()), actionCollection()); + KStdAction::pasteText(this, TQ_SLOT(paste()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(select_all()), actionCollection()); + KStdAction::find(this, TQ_SLOT(search()), actionCollection()); + KStdAction::findNext(this, TQ_SLOT(search_again()), actionCollection()); + KStdAction::replace(this, TQ_SLOT(replace()), actionCollection()); + + (void)new TDEAction(i18n("&Insert File..."), 0, this, TQ_SLOT(file_insert()), actionCollection(), "insert_file"); - (void)new TDEAction(i18n("In&sert Date"), 0, this, TQT_SLOT(insertDate()), + (void)new TDEAction(i18n("In&sert Date"), 0, this, TQ_SLOT(insertDate()), actionCollection(), "insert_date"); - (void)new TDEAction(i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(clean_space()), + (void)new TDEAction(i18n("Cl&ean Spaces"), 0, this, TQ_SLOT(clean_space()), actionCollection(), "clean_spaces"); // setup Tools menu - KStdAction::spelling(this, TQT_SLOT(spellcheck()), actionCollection()); + KStdAction::spelling(this, TQ_SLOT(spellcheck()), actionCollection()); // setup Go menu - KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), actionCollection()); + KStdAction::gotoLine(this, TQ_SLOT(gotoLine()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(showSettings()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showSettings()), actionCollection()); } void TopLevel::setupStatusBar() @@ -389,19 +389,19 @@ void TopLevel::spellcheck() initSpellConfig(); tdespell = new KSpell(this, i18n("Spellcheck"), this, - TQT_SLOT( spell_started(KSpell *)), tdespellconfigOptions); + TQ_SLOT( spell_started(KSpell *)), tdespellconfigOptions); - connect (tdespell, TQT_SIGNAL ( death()), - this, TQT_SLOT ( spell_finished( ))); + connect (tdespell, TQ_SIGNAL ( death()), + this, TQ_SLOT ( spell_finished( ))); - connect (tdespell, TQT_SIGNAL (progress (unsigned int)), - this, TQT_SLOT (spell_progress (unsigned int))); - connect (tdespell, TQT_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), - eframe, TQT_SLOT (misspelling (const TQString &, const TQStringList &, unsigned int))); - connect (tdespell, TQT_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), - eframe, TQT_SLOT (corrected (const TQString &, const TQString &, unsigned int))); - connect (tdespell, TQT_SIGNAL (done(const TQString&)), - this, TQT_SLOT (spell_done(const TQString&))); + connect (tdespell, TQ_SIGNAL (progress (unsigned int)), + this, TQ_SLOT (spell_progress (unsigned int))); + connect (tdespell, TQ_SIGNAL (misspelling (const TQString &, const TQStringList &, unsigned int)), + eframe, TQ_SLOT (misspelling (const TQString &, const TQStringList &, unsigned int))); + connect (tdespell, TQ_SIGNAL (corrected (const TQString &, const TQString &, unsigned int)), + eframe, TQ_SLOT (corrected (const TQString &, const TQString &, unsigned int))); + connect (tdespell, TQ_SIGNAL (done(const TQString&)), + this, TQ_SLOT (spell_done(const TQString&))); } @@ -831,7 +831,7 @@ void TopLevel::showSettings() initSpellConfig(); TDEConfigDialog* dialog = new SettingsDialog(this, "settings", Prefs::self(), tdespellconfigOptions); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateSettings())); dialog->show(); } @@ -1333,7 +1333,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele // Spelling addPage(spellConfig, i18n("Spelling"), "tools-check-spelling", i18n("Spelling Checker")); - connect(spellConfig, TQT_SIGNAL(configChanged()), this, TQT_SLOT(slotSpellConfigChanged())); + connect(spellConfig, TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotSpellConfigChanged())); // Miscellaneous Misc *miscOptions = new Misc(0, "MiscSettings"); diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp index 7c8b22b..859172e 100644 --- a/kedit/ktextfiledlg.cpp +++ b/kedit/ktextfiledlg.cpp @@ -39,7 +39,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, // insert encoding action into toolbar TDESelectAction *mEncoding = new TDESelectAction( i18n( "Set &Encoding" ), 0, this, - TQT_SLOT( slotSetEncoding() ), this, + TQ_SLOT( slotSetEncoding() ), this, "encoding" ); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); @@ -62,7 +62,7 @@ KTextFileDialog::KTextFileDialog(const TQString& startDir, TDEAction* mEncoding = new TDEAction( i18n("Select Encoding..."), 0, - this, TQT_SLOT( slotShowEncCombo() ), this, "encoding"); + this, TQ_SLOT( slotShowEncCombo() ), this, "encoding"); mEncoding->setIcon( TQString::fromLatin1("charset") ); @@ -118,10 +118,10 @@ void KTextFileDialog::slotShowEncCombo() i++; } - connect( encDlg->actionButton( KDialogBase::Ok ), TQT_SIGNAL(clicked()), - encDlg, TQT_SLOT(accept()) ); - connect( encDlg->actionButton( KDialogBase::Cancel ), TQT_SIGNAL(clicked()), - encDlg, TQT_SLOT(reject()) ); + connect( encDlg->actionButton( KDialogBase::Ok ), TQ_SIGNAL(clicked()), + encDlg, TQ_SLOT(accept()) ); + connect( encDlg->actionButton( KDialogBase::Cancel ), TQ_SIGNAL(clicked()), + encDlg, TQ_SLOT(reject()) ); encDlg->setMinimumSize( 300, 120); diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp index cf9601d..e7d005a 100644 --- a/kfloppy/floppy.cpp +++ b/kfloppy/floppy.cpp @@ -255,7 +255,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) " Due to a limitation of MS-DOS the label can only be 11 characters long." " Please note that Minix does not support labels, whatever you enter here.</qt>") ); - connect(labellabel,TQT_SIGNAL(toggled(bool)),lineedit,TQT_SLOT(setEnabled(bool))); + connect(labellabel,TQ_SIGNAL(toggled(bool)),lineedit,TQ_SLOT(setEnabled(bool))); TQVBoxLayout* v3 = new TQVBoxLayout( h1 ); @@ -264,7 +264,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) formatbutton->setAutoRepeat( false ); if (!numFileSystems) formatbutton->setDisabled(false); // We have not any helper program for creating any file system - connect(formatbutton,TQT_SIGNAL(clicked()),this,TQT_SLOT(format())); + connect(formatbutton,TQ_SIGNAL(clicked()),this,TQ_SLOT(format())); v3->addWidget( formatbutton ); TQWhatsThis::add( formatbutton, i18n("<qt>Click here to start formatting.</qt>") ); @@ -281,7 +281,7 @@ FloppyData::FloppyData(TQWidget * parent, const char * name) quitbutton = new KPushButton( KStdGuiItem::quit(), this ); quitbutton->setAutoRepeat( false ); - connect(quitbutton,TQT_SIGNAL(clicked()),this,TQT_SLOT(quit())); + connect(quitbutton,TQ_SIGNAL(clicked()),this,TQ_SLOT(quit())); v3->addWidget( quitbutton ); ml->addSpacing( 10 ); @@ -538,10 +538,10 @@ void FloppyData::format(){ if (formatActions) delete formatActions; formatActions = new KFActionQueue(this); - connect(formatActions,TQT_SIGNAL(status(const TQString &,int)), - this,TQT_SLOT(formatStatus(const TQString &,int))); - connect(formatActions,TQT_SIGNAL(done(KFAction *,bool)), - this,TQT_SLOT(reset())); + connect(formatActions,TQ_SIGNAL(status(const TQString &,int)), + this,TQ_SLOT(formatStatus(const TQString &,int))); + connect(formatActions,TQ_SIGNAL(done(KFAction *,bool)), + this,TQ_SLOT(reset())); if ( quick->isChecked()) { diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp index 5c3729c..daa74ed 100644 --- a/kfloppy/format.cpp +++ b/kfloppy/format.cpp @@ -146,12 +146,12 @@ void KFActionQueue::queue(KFAction *p) else { kdDebug(KFAREA) << "Running action " << next->name() << endl; - TQObject::connect(next,TQT_SIGNAL(done(KFAction *,bool)), - this,TQT_SLOT(actionDone(KFAction *,bool))); + TQObject::connect(next,TQ_SIGNAL(done(KFAction *,bool)), + this,TQ_SLOT(actionDone(KFAction *,bool))); // Propagate signals - TQObject::connect(next,TQT_SIGNAL(status(const TQString &,int)), - this,TQT_SIGNAL(status(const TQString &,int))); - TQTimer::singleShot(0,next,TQT_SLOT(exec())); + TQObject::connect(next,TQ_SIGNAL(status(const TQString &,int)), + this,TQ_SIGNAL(status(const TQString &,int))); + TQTimer::singleShot(0,next,TQ_SLOT(exec())); } } @@ -370,12 +370,12 @@ bool FloppyAction::startProcess() { DEBUGSETUP; - connect(theProcess,TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processDone(TDEProcess *))); - connect(theProcess,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), - this,TQT_SLOT(processStdOut(TDEProcess *,char *,int))); - connect(theProcess,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)), - this,TQT_SLOT(processStdErr(TDEProcess *,char *,int))); + connect(theProcess,TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processDone(TDEProcess *))); + connect(theProcess,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this,TQ_SLOT(processStdOut(TDEProcess *,char *,int))); + connect(theProcess,TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)), + this,TQ_SLOT(processStdErr(TDEProcess *,char *,int))); theProcess->setEnvironment( "LC_ALL", "C" ); // We need the untranslated output of the tool return theProcess->start(TDEProcess::NotifyOnExit, diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp index a35a715..695d8cd 100644 --- a/kfloppy/zip.cpp +++ b/kfloppy/zip.cpp @@ -143,14 +143,14 @@ void ZipFormat::quit() if (statusTimer) delete statusTimer; statusTimer = new TQTimer(this); - connect(p,TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(transition())); - connect(p,TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), - this,TQT_SLOT(processResult(TDEProcess *,char *,int))); - connect(p,TQT_SIGNAL(receivedStderr(TDEProcess *,char *,int)), - this,TQT_SLOT(processResult(TDEProcess *,char *,int))); - connect(statusTimer,TQT_SIGNAL(timeout()), - this,TQT_SLOT(statusRequest())); + connect(p,TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(transition())); + connect(p,TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)), + this,TQ_SLOT(processResult(TDEProcess *,char *,int))); + connect(p,TQ_SIGNAL(receivedStderr(TDEProcess *,char *,int)), + this,TQ_SLOT(processResult(TDEProcess *,char *,int))); + connect(statusTimer,TQ_SIGNAL(timeout()), + this,TQ_SLOT(statusRequest())); transition(); } @@ -174,7 +174,7 @@ void ZipFormat::transition() // No point in making a dizzy display of it. statusTimer->start(10000); TQTimer::singleShot(1000,this, - TQT_SLOT(statusRequest())); + TQ_SLOT(statusRequest())); totalBlocks=12288; // 196608 * 512b = 12288 * 8192b ; } else diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp index 30fd99c..bf354ed 100644 --- a/kgpg/keygener.cpp +++ b/kgpg/keygener.cpp @@ -65,7 +65,7 @@ keyGenerate::keyGenerate(TQWidget *parent, const char *name):KDialogBase( parent keyexp->insertItem(i18n("Months"),3); keyexp->insertItem(i18n("Years"),4); keyexp->setMinimumSize(keyexp->sizeHint()); - connect(keyexp,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activateexp(int))); + connect(keyexp,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activateexp(int))); (void) new TQLabel(i18n("Key size:"),bgroup1); keysize = new KComboBox(bgroup1); diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp index cad6910..35c1520 100644 --- a/kgpg/keyinfowidget.cpp +++ b/kgpg/keyinfowidget.cpp @@ -76,18 +76,18 @@ KgpgKeyInfo::KgpgKeyInfo(TQWidget *parent, const char *name,TQString sigkey):KDi if (hasPhoto) { KgpgInterface *photoProcess=new KgpgInterface(); photoProcess->KgpgGetPhotoList(displayedKeyID); - connect(photoProcess,TQT_SIGNAL(signalPhotoList(TQStringList)),this,TQT_SLOT(slotSetMainPhoto(TQStringList))); + connect(photoProcess,TQ_SIGNAL(signalPhotoList(TQStringList)),this,TQ_SLOT(slotSetMainPhoto(TQStringList))); } else prop->comboId->setEnabled(false); - connect(prop->changeExp,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeExp())); - connect(this,TQT_SIGNAL(closeClicked()),this,TQT_SLOT(slotPreOk())); - connect(prop->changePass,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangePass())); - connect(prop->comboId,TQT_SIGNAL(activated (const TQString &)),this,TQT_SLOT(reloadMainPhoto(const TQString &))); - connect(prop->cbDisabled,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisableKey(bool))); - connect(prop->kCOwnerTrust,TQT_SIGNAL(activated (int)),this,TQT_SLOT(slotChangeTrust(int))); - connect(this,TQT_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQT_SLOT(slotSetPhoto(const TQPixmap&))); + connect(prop->changeExp,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangeExp())); + connect(this,TQ_SIGNAL(closeClicked()),this,TQ_SLOT(slotPreOk())); + connect(prop->changePass,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangePass())); + connect(prop->comboId,TQ_SIGNAL(activated (const TQString &)),this,TQ_SLOT(reloadMainPhoto(const TQString &))); + connect(prop->cbDisabled,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotDisableKey(bool))); + connect(prop->kCOwnerTrust,TQ_SIGNAL(activated (int)),this,TQ_SLOT(slotChangeTrust(int))); + connect(this,TQ_SIGNAL(changeMainPhoto(const TQPixmap&)),this,TQ_SLOT(slotSetPhoto(const TQPixmap&))); //prop->setMinimumSize(prop->sizeHint()); } @@ -347,8 +347,8 @@ void KgpgKeyInfo::reloadMainPhoto(const TQString &uid) KProcIO *p=new KProcIO(); *p<<"gpg"<<"--no-tty"<<"--show-photos"<<"--photo-viewer"<<TQString(TQFile::encodeName(pgpgOutput)); *p<<"--edit-key"<<displayedKeyID<<"uid"<<uid<<"showphoto"; - TQObject::connect(p, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(finishphotoreadprocess(KProcIO *))); - TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotMainImageRead(TDEProcess *))); + TQObject::connect(p, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(finishphotoreadprocess(KProcIO *))); + TQObject::connect(p, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotMainImageRead(TDEProcess *))); p->start(TDEProcess::NotifyOnExit,true); } @@ -423,10 +423,10 @@ void KgpgKeyInfo::slotChangeExp() TQVBoxLayout *vbox=new TQVBoxLayout(page,3); vbox->addWidget(kdt); vbox->addWidget(kb); - connect(kb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableDate(bool))); - connect(chdate,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotChangeDate())); - connect(kdt,TQT_SIGNAL(dateChanged(TQDate)),this,TQT_SLOT(slotCheckDate(TQDate))); - connect(kdt,TQT_SIGNAL(dateEntered(TQDate)),this,TQT_SLOT(slotCheckDate(TQDate))); + connect(kb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableDate(bool))); + connect(chdate,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotChangeDate())); + connect(kdt,TQ_SIGNAL(dateChanged(TQDate)),this,TQ_SLOT(slotCheckDate(TQDate))); + connect(kdt,TQ_SIGNAL(dateEntered(TQDate)),this,TQ_SLOT(slotCheckDate(TQDate))); chdate->setMainWidget(page); chdate->show(); @@ -450,7 +450,7 @@ void KgpgKeyInfo::slotChangeDate() else { KeyExpirationProcess->KgpgKeyExpire(displayedKeyID,kdt->date(),false); } - connect(KeyExpirationProcess,TQT_SIGNAL(expirationFinished(int)),this,TQT_SLOT(slotInfoExpirationChanged(int))); + connect(KeyExpirationProcess,TQ_SIGNAL(expirationFinished(int)),this,TQ_SLOT(slotInfoExpirationChanged(int))); } void KgpgKeyInfo::slotEnableDate(bool isOn) @@ -481,7 +481,7 @@ void KgpgKeyInfo::slotChangePass() // kdDebug(2100) << k_funcinfo << endl; KgpgInterface *ChangeKeyPassProcess=new KgpgInterface(); ChangeKeyPassProcess->KgpgChangePass(displayedKeyID); - connect(ChangeKeyPassProcess,TQT_SIGNAL(passwordChanged()),this,TQT_SLOT(slotInfoPasswordChanged())); + connect(ChangeKeyPassProcess,TQ_SIGNAL(passwordChanged()),this,TQ_SLOT(slotInfoPasswordChanged())); } void KgpgKeyInfo::slotChangeTrust(int newTrust) @@ -489,7 +489,7 @@ void KgpgKeyInfo::slotChangeTrust(int newTrust) // kdDebug(2100) << k_funcinfo << endl; KgpgInterface *KeyTrustProcess=new KgpgInterface(); KeyTrustProcess->KgpgTrustExpire(displayedKeyID,newTrust); - connect(KeyTrustProcess,TQT_SIGNAL(trustfinished()),this,TQT_SLOT(slotInfoTrustChanged())); + connect(KeyTrustProcess,TQ_SIGNAL(trustfinished()),this,TQ_SLOT(slotInfoTrustChanged())); } diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp index 63880c9..7fe35c1 100644 --- a/kgpg/keyservers.cpp +++ b/kgpg/keyservers.cpp @@ -68,17 +68,17 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos currentKey = TQString(); hashMap.clear(); - connect(page->Buttonimport,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotImport())); - connect(page->Buttonsearch,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSearch())); - connect(page->Buttonexport,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPreExport())); - connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotOk())); + connect(page->Buttonimport,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotImport())); + connect(page->Buttonsearch,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSearch())); + connect(page->Buttonexport,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPreExport())); + connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotOk())); if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 - connect(page->cBproxyI,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableProxyI(bool))); - connect(page->cBproxyE,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableProxyE(bool))); + connect(page->cBproxyI,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableProxyI(bool))); + connect(page->cBproxyE,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotEnableProxyE(bool))); } - connect(page->kLEimportid, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString &))); + connect(page->kLEimportid, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotTextChanged( const TQString &))); if (KgpgInterface::getGpgVersion() < 210 ) { // was removed in 2.1 page->cBproxyI->setChecked(KGpgSettings::useProxy()); page->cBproxyE->setChecked(KGpgSettings::useProxy()); @@ -93,8 +93,8 @@ keyServer::keyServer(TQWidget *parent, const char *name,bool modal,bool autoClos KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale()); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; - TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotprocresult(TDEProcess *))); - TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotprocresult(TDEProcess *))); + TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); page->Buttonimport->setEnabled( !page->kLEimportid->text().isEmpty()); page->Buttonsearch->setEnabled( !page->kLEimportid->text().isEmpty()); @@ -237,12 +237,12 @@ void keyServer::slotSearch() listpop->kLVsearch->setColumnWidth(0,150); listpop->kLVsearch->setColumnWidth(1,130); listpop->statusText->setText(i18n("Connecting to the server...")); - connect(listpop->kLVsearch,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(transferKeyID())); - connect(dialogServer,TQT_SIGNAL(okClicked()),this,TQT_SLOT(preimport())); - connect(listpop->kLVsearch,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),dialogServer,TQT_SIGNAL(okClicked())); + connect(listpop->kLVsearch,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(transferKeyID())); + connect(dialogServer,TQ_SIGNAL(okClicked()),this,TQ_SLOT(preimport())); + connect(listpop->kLVsearch,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),dialogServer,TQ_SIGNAL(okClicked())); - connect(dialogServer,TQT_SIGNAL(closeClicked()),this,TQT_SLOT(handleQuit())); - connect( listpop , TQT_SIGNAL( destroyed() ) , this, TQT_SLOT( abortSearch())); + connect(dialogServer,TQ_SIGNAL(closeClicked()),this,TQ_SLOT(handleQuit())); + connect( listpop , TQ_SIGNAL( destroyed() ) , this, TQ_SLOT( abortSearch())); searchproc=new KProcIO(TQTextCodec::codecForLocale()); TQString keyserv=page->kCBimportks->currentText(); @@ -262,8 +262,8 @@ void keyServer::slotSearch() keyNumbers=0; TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); - TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotsearchresult(TDEProcess *))); - TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *))); + TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotsearchresult(TDEProcess *))); + TQObject::connect(searchproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotsearchread(KProcIO *))); searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it searchproc->start(TDEProcess::NotifyOnExit,true); @@ -532,8 +532,8 @@ void keyServer::slotExport(TQStringList keyIds) } *exportproc << "--status-fd=2" << "--keyserver" << keyserv << "--send-keys" << keyIds; - TQObject::connect(exportproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotexportresult(TDEProcess *))); - TQObject::connect(exportproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *))); + TQObject::connect(exportproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotexportresult(TDEProcess *))); + TQObject::connect(exportproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotimportread(KProcIO *))); exportproc->start(TDEProcess::NotifyOnExit,true); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); importpop = new TQDialog( this,0,true,TQt::WDestructiveClose); @@ -546,8 +546,8 @@ void keyServer::slotExport(TQStringList keyIds) importpop->setMinimumWidth(250); importpop->adjustSize(); importpop->show(); - connect(importpop,TQT_SIGNAL(destroyed ()),this,TQT_SLOT(abortExport())); - connect(Buttonabort,TQT_SIGNAL(clicked ()),importpop,TQT_SLOT(close())); + connect(importpop,TQ_SIGNAL(destroyed ()),this,TQ_SLOT(abortExport())); + connect(Buttonabort,TQ_SIGNAL(clicked ()),importpop,TQ_SLOT(close())); } void keyServer::abortExport() @@ -631,8 +631,8 @@ void keyServer::slotImport() keyNames=keyNames.stripWhiteSpace(); *searchproc<< TQString(TQFile::encodeName(fkeyNames)); } - TQObject::connect(searchproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotksearchprocresult(TDEProcess *))); - TQObject::connect(searchproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotsearchread(KProcIO *))); + TQObject::connect(searchproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotksearchprocresult(TDEProcess *))); + TQObject::connect(searchproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotsearchread(KProcIO *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); searchproc->setUsePty(TDEProcess::Stdout,false); // EKO: very important line - it took me a day to find out why I should use it searchproc->start(TDEProcess::Block,true); @@ -663,8 +663,8 @@ void keyServer::slotImport() *importproc<< (*it) ; } - TQObject::connect(importproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotimportresult(TDEProcess *))); - TQObject::connect(importproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotimportread(KProcIO *))); + TQObject::connect(importproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotimportresult(TDEProcess *))); + TQObject::connect(importproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotimportread(KProcIO *))); importproc->start(TDEProcess::NotifyOnExit,true); importproc->closeWhenDone(); @@ -679,8 +679,8 @@ void keyServer::slotImport() importpop->setMinimumWidth(250); importpop->adjustSize(); importpop->show(); - connect(Buttonabort,TQT_SIGNAL(clicked()),importpop,TQT_SLOT(close())); - connect(importpop,TQT_SIGNAL(destroyed ()),this,TQT_SLOT(abortImport())); + connect(Buttonabort,TQ_SIGNAL(clicked()),importpop,TQ_SLOT(close())); + connect(importpop,TQ_SIGNAL(destroyed ()),this,TQ_SLOT(abortImport())); } void keyServer::abortImport() diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index d405c33..359644e 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -84,10 +84,10 @@ MyView::MyView( TQWidget *parent, const char *name ) setBackgroundMode( X11ParentRelative ); openTasks=0; - TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,this, TQT_SLOT(decryptDroppedFile()),this,"decrypt_file"); - TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,this, TQT_SLOT(showDroppedFile()),this,"show_file"); - TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,this, TQT_SLOT(encryptDroppedFile()),this,"encrypt_file"); - TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,this, TQT_SLOT(signDroppedFile()),this,"sign_file"); + TDEAction *saveDecrypt=new TDEAction(i18n("&Decrypt && Save File"),"decrypted",0,this, TQ_SLOT(decryptDroppedFile()),this,"decrypt_file"); + TDEAction *showDecrypt=new TDEAction(i18n("&Show Decrypted File"),"edit",0,this, TQ_SLOT(showDroppedFile()),this,"show_file"); + TDEAction *encrypt=new TDEAction(i18n("&Encrypt File"),"encrypted",0,this, TQ_SLOT(encryptDroppedFile()),this,"encrypt_file"); + TDEAction *sign=new TDEAction(i18n("&Sign File"), "signature",0,this, TQ_SLOT(signDroppedFile()),this,"sign_file"); //TQToolTip::add(this,i18n("KGpg drag & drop encryption applet")); readOptions(); @@ -118,7 +118,7 @@ MyView::~MyView() void MyView::clipEncrypt() { popupPublic *dialoguec=new popupPublic(0, "public_keys", 0,false,goDefaultKey); - connect(dialoguec,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool))); + connect(dialoguec,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(encryptClipboard(TQStringList,TQStringList,bool,bool))); dialoguec->exec(); delete dialoguec; } @@ -134,10 +134,10 @@ void MyView::clipSign(bool openEditor) TQString clippie=kapp->clipboard()->text(clipboardMode).stripWhiteSpace(); if (!clippie.isEmpty()) { KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),this,TQT_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); if (!openEditor) - connect(kgpgtxtedit->view,TQT_SIGNAL(verifyFinished()),kgpgtxtedit,TQT_SLOT(closeWindow())); + connect(kgpgtxtedit->view,TQ_SIGNAL(verifyFinished()),kgpgtxtedit,TQ_SLOT(closeWindow())); kgpgtxtedit->view->editor->setText(clippie); kgpgtxtedit->view->clearSign(); kgpgtxtedit->show(); @@ -163,9 +163,9 @@ void MyView::encryptDroppedFolder() optionbx->insertItem(i18n("Gzip")); optionbx->insertItem(i18n("Bzip2")); bGroup->show(); - connect(dialogue,TQT_SIGNAL(keyListFilled ()),dialogue,TQT_SLOT(slotSetVisible())); - connect(optionbx,TQT_SIGNAL(activated (int)),this,TQT_SLOT(slotSetCompression(int))); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(keyListFilled ()),dialogue,TQ_SLOT(slotSetVisible())); + connect(optionbx,TQ_SIGNAL(activated (int)),this,TQ_SLOT(slotSetCompression(int))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(startFolderEncode(TQStringList,TQStringList,bool,bool))); dialogue->CBshred->setEnabled(false); dialogue->exec(); dialogue=0L; @@ -236,8 +236,8 @@ pop = new KPassivePopup(); KgpgInterface *folderprocess=new KgpgInterface(); folderprocess->KgpgEncryptFile(selec,KURL(kgpgfoldertmp->name()),encryptedFile,encryptOptions,symetric); - connect(folderprocess,TQT_SIGNAL(encryptionfinished(KURL)),this,TQT_SLOT(slotFolderFinished(KURL))); - connect(folderprocess,TQT_SIGNAL(errormessage(TQString)),this,TQT_SLOT(slotFolderFinishedError(TQString))); + connect(folderprocess,TQ_SIGNAL(encryptionfinished(KURL)),this,TQ_SLOT(slotFolderFinished(KURL))); + connect(folderprocess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(slotFolderFinishedError(TQString))); } void MyView::slotFolderFinished(KURL) @@ -280,7 +280,7 @@ void MyView::encryptDroppedFile() { TQStringList opts; KgpgLibrary *lib=new KgpgLibrary(this,KGpgSettings::pgpExtension()); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),this,TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); if (KGpgSettings::fileKey()!=TQString()) { if (KGpgSettings::allowUntrustedKeys()) opts<<"--always-trust"; @@ -315,7 +315,7 @@ lb->insertStringList(droppedUrls.toStringList()); if (shredConfirm->exec()==TQDialog::Accepted) { KgpgLibrary *lib=new KgpgLibrary(this); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),this,TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); lib->shredprocessenc(droppedUrls); } delete shredConfirm; @@ -348,7 +348,7 @@ void MyView::slotVerifyFile() ///////////////////////// pipe gpg command KgpgInterface *verifyFileProcess=new KgpgInterface(); verifyFileProcess->KgpgVerifyFile(droppedUrl,KURL(sigfile)); - connect (verifyFileProcess,TQT_SIGNAL(verifyquerykey(TQString)),this,TQT_SLOT(importSignature(TQString))); + connect (verifyFileProcess,TQ_SIGNAL(verifyquerykey(TQString)),this,TQ_SLOT(importSignature(TQString))); } void MyView::importSignature(TQString ID) @@ -423,10 +423,10 @@ void MyView::decryptDroppedFile() } KgpgLibrary *lib=new KgpgLibrary(this); lib->slotFileDec(droppedUrls.first(),swapname,KGpgSettings::customDecrypt()); - connect(lib,TQT_SIGNAL(importOver(TQStringList)),this,TQT_SIGNAL(importedKeys(TQStringList))); - connect(lib,TQT_SIGNAL(systemMessage(TQString,bool)),this,TQT_SLOT(busyMessage(TQString,bool))); + connect(lib,TQ_SIGNAL(importOver(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); + connect(lib,TQ_SIGNAL(systemMessage(TQString,bool)),this,TQ_SLOT(busyMessage(TQString,bool))); // if (isFolder) - connect(lib,TQT_SIGNAL(decryptionOver()),this,TQT_SLOT(decryptNextFile())); + connect(lib,TQ_SIGNAL(decryptionOver()),this,TQ_SLOT(decryptNextFile())); } @@ -466,10 +466,10 @@ void MyView::showDroppedFile() kdDebug(2100)<<"------Show dropped file"<<endl; KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); kgpgtxtedit->view->editor->slotDroppedFile(droppedUrls.first()); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),this,TQT_SLOT(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),this,TQT_SIGNAL(importedKeys(TQStringList))); - connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),this,TQT_SIGNAL(importedKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(refreshImported(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); + connect(kgpgtxtedit->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); kgpgtxtedit->show(); } @@ -523,8 +523,8 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt) if (inputText.startsWith("-----BEGIN PGP MESSAGE")) { KgpgApp *kgpgtxtedit = new KgpgApp(0, "editor",WDestructiveClose,goDefaultKey); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),this,TQT_SLOT(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SLOT(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(setFont(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); kgpgtxtedit->view->editor->setText(inputText); kgpgtxtedit->view->slotdecode(); kgpgtxtedit->show(); @@ -537,7 +537,7 @@ void MyView::droppedtext (TQString inputText,bool allowEncrypt) else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(inputText); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SIGNAL(importedKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SIGNAL(importedKeys(TQStringList))); return; } } @@ -710,17 +710,17 @@ void MyView::startWizard() } wiz->CBdefault->setCurrentItem(firstKey); - //connect(wiz->pushButton4,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotGenKey())); + //connect(wiz->pushButton4,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotGenKey())); if (!counter) - connect(wiz->finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotGenKey())); + connect(wiz->finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotGenKey())); else { wiz->textGenerate->hide(); wiz->setTitle(wiz->page_4,i18n("Step Three: Select your Default Private Key")); - connect(wiz->finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotSaveOptionsPath())); + connect(wiz->finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotSaveOptionsPath())); } - connect(wiz->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotWizardChange())); - connect( wiz , TQT_SIGNAL( destroyed() ) , this, TQT_SLOT( slotWizardClose())); - connect(wiz,TQT_SIGNAL(helpClicked()),this,TQT_SLOT(help())); + connect(wiz->nextButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotWizardChange())); + connect( wiz , TQ_SIGNAL( destroyed() ) , this, TQ_SLOT( slotWizardClose())); + connect(wiz,TQ_SIGNAL(helpClicked()),this,TQ_SLOT(help())); wiz->setFinishEnabled(wiz->page_4,true); wiz->show(); @@ -838,19 +838,19 @@ kgpgapplet::kgpgapplet(TQWidget *parent, const char *name) w=new MyView(this); w->show(); TDEPopupMenu *conf_menu=contextMenu(); - KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,w, TQT_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt"); - KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,w, TQT_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); - KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,w, TQT_SLOT(clipSign()),actionCollection(),"clip_sign"); + KgpgEncryptClipboard = new TDEAction(i18n("&Encrypt Clipboard"), "kgpg", 0,w, TQ_SLOT(clipEncrypt()),actionCollection(),"clip_encrypt"); + KgpgDecryptClipboard = new TDEAction(i18n("&Decrypt Clipboard"), 0, 0,w, TQ_SLOT(clipDecrypt()),actionCollection(),"clip_decrypt"); + KgpgSignClipboard = new TDEAction(i18n("&Sign/Verify Clipboard"), "signature", 0,w, TQ_SLOT(clipSign()),actionCollection(),"clip_sign"); TDEAction *KgpgOpenEditor; if (KGpgSettings::leftClick()==KGpgSettings::EnumLeftClick::KeyManager) - KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,parent, TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); + KgpgOpenEditor = new TDEAction(i18n("&Open Editor"), "edit", 0,parent, TQ_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); else - KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQT_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor"); + KgpgOpenEditor = new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQ_SLOT(slotOpenKeyManager()),actionCollection(),"kgpg_editor"); - TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQT_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server"); - TDEAction *KgpgPreferences=KStdAction::preferences(this, TQT_SLOT(showOptions()), actionCollection()); + TDEAction *KgpgOpenServer = new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQ_SLOT(slotOpenServerDialog()),actionCollection(),"kgpg_server"); + TDEAction *KgpgPreferences=KStdAction::preferences(this, TQ_SLOT(showOptions()), actionCollection()); - connect (conf_menu,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(checkMenu())); + connect (conf_menu,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(checkMenu())); KgpgEncryptClipboard->plug(conf_menu); KgpgDecryptClipboard->plug(conf_menu); @@ -970,16 +970,16 @@ int KgpgAppletApp::newInstance() { kgpg_applet=new kgpgapplet(s_keyManager->s_kgpgEditor,"kgpg_systrayapplet"); } - connect(s_keyManager,TQT_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQT_SLOT(encryptFiles(KURL::List))); - connect(s_keyManager,TQT_SIGNAL(installShredder()),kgpg_applet->w,TQT_SLOT(installShred())); - connect(s_keyManager->s_kgpgEditor,TQT_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQT_SLOT(encryptFiles(KURL::List))); - - connect( kgpg_applet, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(slotHandleQuit())); - connect(s_keyManager,TQT_SIGNAL(readAgainOptions()),kgpg_applet->w,TQT_SLOT(readOptions())); - connect(kgpg_applet->w,TQT_SIGNAL(updateDefault(TQString)),this,TQT_SLOT(wizardOver(TQString))); - connect(kgpg_applet->w,TQT_SIGNAL(createNewKey()),s_keyManager,TQT_SLOT(slotgenkey())); - connect(s_keyManager,TQT_SIGNAL(fontChanged(TQFont)),kgpg_applet->w,TQT_SIGNAL(setFont(TQFont))); - connect(kgpg_applet->w,TQT_SIGNAL(importedKeys(TQStringList)),s_keyManager->keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(s_keyManager,TQ_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQ_SLOT(encryptFiles(KURL::List))); + connect(s_keyManager,TQ_SIGNAL(installShredder()),kgpg_applet->w,TQ_SLOT(installShred())); + connect(s_keyManager->s_kgpgEditor,TQ_SIGNAL(encryptFiles(KURL::List)),kgpg_applet->w,TQ_SLOT(encryptFiles(KURL::List))); + + connect( kgpg_applet, TQ_SIGNAL(quitSelected()), this, TQ_SLOT(slotHandleQuit())); + connect(s_keyManager,TQ_SIGNAL(readAgainOptions()),kgpg_applet->w,TQ_SLOT(readOptions())); + connect(kgpg_applet->w,TQ_SIGNAL(updateDefault(TQString)),this,TQ_SLOT(wizardOver(TQString))); + connect(kgpg_applet->w,TQ_SIGNAL(createNewKey()),s_keyManager,TQ_SLOT(slotgenkey())); + connect(s_keyManager,TQ_SIGNAL(fontChanged(TQFont)),kgpg_applet->w,TQ_SIGNAL(setFont(TQFont))); + connect(kgpg_applet->w,TQ_SIGNAL(importedKeys(TQStringList)),s_keyManager->keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); kgpg_applet->show(); @@ -1079,8 +1079,8 @@ void MyView::encryptClipboard(TQStringList selec,TQStringList encryptOptions,boo if (symmetric) selec.clear(); KgpgInterface *txtEncrypt=new KgpgInterface(); - connect (txtEncrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),this,TQT_SLOT(slotSetClip(TQString))); - connect (txtEncrypt,TQT_SIGNAL(txtencryptionstarted()),this,TQT_SLOT(slotPassiveClip())); + connect (txtEncrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(slotSetClip(TQString))); + connect (txtEncrypt,TQ_SIGNAL(txtencryptionstarted()),this,TQ_SLOT(slotPassiveClip())); txtEncrypt->KgpgEncryptText(kapp->clipboard()->text(clipboardMode),selec,encryptOptions); } diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index 922d2be..405005e 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -126,33 +126,33 @@ void KgpgApp::readOptions(bool doresize) void KgpgApp::initActions() { - KStdAction::openNew(this, TQT_SLOT(slotFileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - KStdAction::cut(this, TQT_SLOT(slotEditCut()), actionCollection()); - KStdAction::copy(this, TQT_SLOT(slotEditCopy()), actionCollection()); - KStdAction::paste(this, TQT_SLOT(slotEditPaste()), actionCollection()); - KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(slotOptions()), actionCollection(),"kgpg_config"); - - //KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - //KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection()); - - fileSave = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); - (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,this, TQT_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt"); - (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,this, TQT_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt"); - (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQT_SLOT(slotKeyManager()), actionCollection(),"key_manage"); - editUndo = KStdAction::undo(this, TQT_SLOT(slotundo()), actionCollection()); - editRedo = KStdAction::redo(this, TQT_SLOT(slotredo()), actionCollection()); - //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,this, TQT_SLOT(slotManageKey()), actionCollection(),"keys_manage"); - (void) new TDEAction(i18n("&Generate Signature..."),0, this, TQT_SLOT(slotPreSignFile()), actionCollection(), "sign_generate"); - (void) new TDEAction(i18n("&Verify Signature..."),0, this, TQT_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify"); - (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,this, TQT_SLOT(slotCheckMd5()), actionCollection(), "sign_check"); - KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotOptions()), actionCollection(),"kgpg_config"); + + //KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); + //KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); + + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + (void) new TDEAction(i18n("&Encrypt File..."), "encrypted", 0,this, TQ_SLOT(slotFilePreEnc()), actionCollection(),"file_encrypt"); + (void) new TDEAction(i18n("&Decrypt File..."), "decrypted", 0,this, TQ_SLOT(slotFilePreDec()), actionCollection(),"file_decrypt"); + (void) new TDEAction(i18n("&Open Key Manager"), "kgpg", 0,this, TQ_SLOT(slotKeyManager()), actionCollection(),"key_manage"); + editUndo = KStdAction::undo(this, TQ_SLOT(slotundo()), actionCollection()); + editRedo = KStdAction::redo(this, TQ_SLOT(slotredo()), actionCollection()); + //(void) new TDEAction(i18n("&Manage Keys"), "kgpg_manage", CTRL+Key_K,this, TQ_SLOT(slotManageKey()), actionCollection(),"keys_manage"); + (void) new TDEAction(i18n("&Generate Signature..."),0, this, TQ_SLOT(slotPreSignFile()), actionCollection(), "sign_generate"); + (void) new TDEAction(i18n("&Verify Signature..."),0, this, TQ_SLOT(slotPreVerifyFile()), actionCollection(), "sign_verify"); + (void) new TDEAction(i18n("&Check MD5 Sum..."), 0,this, TQ_SLOT(slotCheckMd5()), actionCollection(), "sign_check"); + KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); // comment out for now, only confusing - //encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQT_SLOT(slotSetCharset()),actionCollection(),"charsets"); + //encodingAction=new TDEToggleAction(i18n("&Unicode (utf-8) Encoding"), 0, 0,this, TQ_SLOT(slotSetCharset()),actionCollection(),"charsets"); } void KgpgApp::slotSetFont(TQFont myFont) @@ -181,7 +181,7 @@ void KgpgApp::initView() view = new KgpgView(this,0); // doc->addView(view); - connect(view,TQT_SIGNAL(resetEncoding(bool)),this,TQT_SLOT(slotResetEncoding(bool))); + connect(view,TQ_SIGNAL(resetEncoding(bool)),this,TQ_SLOT(slotResetEncoding(bool))); setCentralWidget(view); setCaption(i18n("Untitled"),false); /// doc->URL().fileName(),false); @@ -276,7 +276,7 @@ void KgpgApp::slotFilePreDec() } KgpgLibrary *lib=new KgpgLibrary(this); lib->slotFileDec(url,KURL(newname), customDecrypt); - connect(lib,TQT_SIGNAL(importOver(TQStringList)),this,TQT_SIGNAL(refreshImported(TQStringList))); + connect(lib,TQ_SIGNAL(importOver(TQStringList)),this,TQ_SIGNAL(refreshImported(TQStringList))); } else openEncryptedDocumentFile(url); } @@ -534,7 +534,7 @@ void KgpgApp::slotVerifyFile(KURL url) ///////////////////////// pipe gpg command KgpgInterface *verifyFileProcess=new KgpgInterface(); verifyFileProcess->KgpgVerifyFile(url,KURL(sigfile)); - connect (verifyFileProcess,TQT_SIGNAL(verifyquerykey(TQString)),this,TQT_SLOT(importSignatureKey(TQString))); + connect (verifyFileProcess,TQ_SIGNAL(verifyquerykey(TQString)),this,TQ_SLOT(importSignatureKey(TQString))); } } diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 5d852e6..e113bad 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -118,8 +118,8 @@ void KgpgInterface::KgpgEncryptFile(TQStringList encryptKeys,KURL srcUrl,KURL de *proc<<TQString(TQFile::encodeName(srcUrl.path())); ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(encryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readencprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(encryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readencprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -190,8 +190,8 @@ void KgpgInterface::KgpgDecryptFile(KURL srcUrl,KURL destUrl,TQStringList Option *proc<<"-d"<<TQString(TQFile::encodeName(srcUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(decryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readdecprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(decryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readdecprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -283,8 +283,8 @@ void KgpgInterface::KgpgEncryptText(TQString text,TQStringList userIDs, TQString ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtencryptfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtreadencprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtencryptfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(txtreadencprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,false); emit txtencryptionstarted(); } @@ -352,9 +352,9 @@ void KgpgInterface::KgpgDecryptText(TQString text,TQStringList Options) ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *))); - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtdecryptfin(TDEProcess *))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getOutput(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getCmdOutput(TDEProcess *, char *, int))); proc->start(TDEProcess::NotifyOnExit,TDEProcess::All); proc->writeStdin(text.utf8(), text.length()); } @@ -471,8 +471,8 @@ void KgpgInterface::KgpgSignText(TQString text,TQString userIDs, TQStringList Op ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtsignfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(txtsignprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtsignfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(txtsignprocess(KProcIO *))); //emit txtsigningstarted(); @@ -571,9 +571,9 @@ void KgpgInterface::KgpgDecryptFileToText(KURL srcUrl,TQStringList Options) ///////// when process ends, update dialog infos - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(txtdecryptfin(TDEProcess *))); - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQT_SLOT(getOutput(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQT_SLOT(getCmdOutput(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(txtdecryptfin(TDEProcess *))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),this, TQ_SLOT(getOutput(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),this, TQ_SLOT(getCmdOutput(TDEProcess *, char *, int))); proc->start(TDEProcess::NotifyOnExit,TDEProcess::All); } @@ -592,8 +592,8 @@ void KgpgInterface::KgpgVerifyText(TQString text) message=TQString(); KProcIO *verifyproc=new KProcIO(TQTextCodec::codecForLocale()); *verifyproc<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"<<"--verify"; - connect(verifyproc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotverifyresult(TDEProcess *))); - connect(verifyproc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotverifyread(KProcIO *))); + connect(verifyproc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotverifyresult(TDEProcess *))); + connect(verifyproc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotverifyread(KProcIO *))); verifyproc->start(TDEProcess::NotifyOnExit,true); verifyproc->writeStdin (text); verifyproc->closeWhenDone(); @@ -743,8 +743,8 @@ void KgpgInterface::KgpgSignFile(TQString keyID,KURL srcUrl,TQStringList Options *proc<<"--output"<<TQString(TQFile::encodeName(srcUrl.path()+".sig")); *proc<<"--detach-sig"<<TQString(TQFile::encodeName(srcUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(signfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readsignprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(signfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readsignprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -819,8 +819,8 @@ void KgpgInterface::KgpgVerifyFile(KURL sigUrl,KURL srcUrl) *proc<<TQString(TQFile::encodeName(srcUrl.path())); *proc<<TQString(TQFile::encodeName(sigUrl.path())); - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this,TQT_SLOT(verifyfin(TDEProcess *))); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readprocess(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this,TQ_SLOT(verifyfin(TDEProcess *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readprocess(KProcIO *))); proc->start(TDEProcess::NotifyOnExit,true); } @@ -903,8 +903,8 @@ void KgpgInterface::KgpgSignKey(TQString keyID,TQString signKeyID,TQString signK *conprocess<<"--edit-key"<<keyID; if (local) *conprocess<<"lsign"; else *conprocess<<"sign"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(sigprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(signover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(sigprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(signover(TDEProcess *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1151,8 +1151,8 @@ void KgpgInterface::KgpgDelSignature(TQString keyID,TQString signKeyID) KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--utf8-strings"<<"--command-fd=0"<<"--status-fd=2"; *conprocess<<"--edit-key"<<keyID<<"uid 1"<<"delsig"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(delsigprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delsignover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(delsigprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delsignover(TDEProcess *))); TQApplication::setOverrideCursor(TQCursor(TQt::BusyCursor)); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1242,8 +1242,8 @@ void KgpgInterface::KgpgKeyExpire(TQString keyID,TQDate date,bool unlimited) KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"expire"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(expprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(expover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(expprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(expover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -1339,8 +1339,8 @@ void KgpgInterface::KgpgTrustExpire(TQString keyID,int keyTrust) KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"trust"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(trustprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(trustover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(trustprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(trustover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1398,8 +1398,8 @@ void KgpgInterface::KgpgChangePass(TQString keyID) KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<<"gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--no-use-agent"<<"--command-fd=0"<<"--status-fd=2"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"passwd"; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(passprocess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(passover(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(passprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(passover(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -1505,7 +1505,7 @@ TQString KgpgInterface::getKey(TQStringList IDs, bool attributes) for ( TQStringList::Iterator it = IDs.begin(); it != IDs.end(); ++it ) *proc << *it; - TQObject::connect(proc, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotReadKey(KProcIO *))); + TQObject::connect(proc, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotReadKey(KProcIO *))); proc->start(TDEProcess::Block,false); return keyString; } @@ -1533,8 +1533,8 @@ void KgpgInterface::importKeyURL(KURL url) *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import"; *conprocess<<"--allow-secret-key-import"; *conprocess<<tempKeyFile; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importURLover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importURLover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(importprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } } @@ -1546,8 +1546,8 @@ void KgpgInterface::importKey(TQString keystr) KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--import"; *conprocess<<"--allow-secret-key-import"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(importover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(importprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(importover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(importprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); conprocess->writeStdin(keystr, true); conprocess->closeWhenDone(); @@ -1653,8 +1653,8 @@ addSuccess=true; KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"adduid"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(adduidover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(adduidprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(adduidover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(adduidprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1740,8 +1740,8 @@ userIDs=keyID; KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"; *conprocess<<"--with-colon"<<"--list-keys"<<keyID; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(photoreadover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(photoreadprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(photoreadover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(photoreadprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1793,8 +1793,8 @@ void KgpgInterface::KgpgDeletePhoto(TQString keyID,TQString uid) KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"uid"<<uid<<"deluid"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(delphotoover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(delphotoprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(delphotoover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(delphotoprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1859,8 +1859,8 @@ addSuccess=true; KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--status-fd=2"<<"--command-fd=0"<<"--utf8-strings"; *conprocess<<"--edit-key"<<keyID<<"addphoto"; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(addphotoover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(addphotoprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(addphotoover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(addphotoprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -1943,8 +1943,8 @@ void KgpgInterface::KgpgRevokeKey(TQString keyID,TQString revokeUrl,int reason,T if (!revokeUrl.isEmpty()) *conprocess<<"-o"<<revokeUrl; *conprocess<<"--gen-revoke"<<keyID; - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(revokeover(TDEProcess *))); - TQObject::connect(conprocess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(revokeprocess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(revokeover(TDEProcess *))); + TQObject::connect(conprocess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(revokeprocess(KProcIO *))); conprocess->start(TDEProcess::NotifyOnExit,true); } diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp index 66fbc45..05af489 100644 --- a/kgpg/kgpglibrary.cpp +++ b/kgpg/kgpglibrary.cpp @@ -54,7 +54,7 @@ void KgpgLibrary::slotFileEnc(KURL::List urls,TQStringList opts,TQStringList def TQString fileNames=urls.first().fileName(); if (urls.count()>1) fileNames+=",..."; popupPublic *dialogue=new popupPublic(0,"Public keys",fileNames,true,goDefaultKey); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(startencode(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(startencode(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; } else @@ -111,11 +111,11 @@ void KgpgLibrary::fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList e cryptFileProcess->KgpgEncryptFile(selec,urlselected,dest,encryptOptions,symetric); if (!popIsActive) { - //connect(cryptFileProcess,TQT_SIGNAL(processstarted(TQString)),this,TQT_SLOT(processpopup2(TQString))); + //connect(cryptFileProcess,TQ_SIGNAL(processstarted(TQString)),this,TQ_SLOT(processpopup2(TQString))); popIsActive=true; } - connect(cryptFileProcess,TQT_SIGNAL(encryptionfinished(KURL)),this,TQT_SLOT(processenc(KURL))); - connect(cryptFileProcess,TQT_SIGNAL(errormessage(TQString)),this,TQT_SLOT(processencerror(TQString))); + connect(cryptFileProcess,TQ_SIGNAL(encryptionfinished(KURL)),this,TQ_SLOT(processenc(KURL))); + connect(cryptFileProcess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(processencerror(TQString))); } void KgpgLibrary::processpopup2(TQString fileName) @@ -144,7 +144,7 @@ emit systemMessage(i18n("Shredding %n file","Shredding %n files",filesToShred.co TDEIO::Job *job; job = TDEIO::del( filesToShred, true ); -connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotShredResult( TDEIO::Job * ) ) ); +connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),TQ_SLOT( slotShredResult( TDEIO::Job * ) ) ); } void KgpgLibrary::slotShredResult( TDEIO::Job * job ) @@ -184,10 +184,10 @@ void KgpgLibrary::slotFileDec(KURL srcUrl,KURL destUrl,TQStringList customDecryp pop = new KPassivePopup(); urlselected=srcUrl; decryptFileProcess->KgpgDecryptFile(srcUrl,destUrl,customDecryptOption); - connect(decryptFileProcess,TQT_SIGNAL(processaborted(bool)),this,TQT_SLOT(processdecover())); - connect(decryptFileProcess,TQT_SIGNAL(processstarted(TQString)),this,TQT_SLOT(processpopup(TQString))); - connect(decryptFileProcess,TQT_SIGNAL(decryptionfinished()),this,TQT_SLOT(processdecover())); - connect(decryptFileProcess,TQT_SIGNAL(errormessage(TQString)),this,TQT_SLOT(processdecerror(TQString))); + connect(decryptFileProcess,TQ_SIGNAL(processaborted(bool)),this,TQ_SLOT(processdecover())); + connect(decryptFileProcess,TQ_SIGNAL(processstarted(TQString)),this,TQ_SLOT(processpopup(TQString))); + connect(decryptFileProcess,TQ_SIGNAL(decryptionfinished()),this,TQ_SLOT(processdecover())); + connect(decryptFileProcess,TQ_SIGNAL(errormessage(TQString)),this,TQ_SLOT(processdecerror(TQString))); } void KgpgLibrary::processpopup(TQString fileName) @@ -228,7 +228,7 @@ void KgpgLibrary::processdecerror(TQString mssge) else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(urlselected); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SIGNAL(importOver(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SIGNAL(importOver(TQStringList))); return; } } else if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) {////// dropped file is a public key, ask for import diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index f412172..3c18751 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -117,26 +117,26 @@ kgpgOptions::kgpgOptions(TQWidget *parent, const char *name) page1->clear_fkey->setIconSet(TQIconSet(TQPixmap(SmallIcon("clear_left")))); // The following widgets are managed manually. - connect(page1->change_fkey, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertFileKey())); - connect(page1->clear_fkey, TQT_SIGNAL(clicked()), page1->kcfg_FileKey, TQT_SLOT(clear())); - connect(page1->change_akey, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertAlwaysKey())); - connect(page1->clear_akey, TQT_SIGNAL(clicked()), page1->alwaysKey, TQT_SLOT(clear())); - connect(page1->alwaysKey, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->gpg_conf_path, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->gpg_home_path, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(updateButtons())); - connect(page4->use_agent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(updateButtons())); - connect(page4->changeHome, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChangeHome())); - connect(page4->kcfg_PubKeyring, TQT_SIGNAL(toggled (bool)), page4->kcfg_PubKeyringUrl, TQT_SLOT(setEnabled(bool))); - connect(page4->kcfg_PubKeyring, TQT_SIGNAL(toggled (bool)), this, TQT_SLOT(checkAdditionalState(bool))); - connect(page4->kcfg_PrivKeyring, TQT_SIGNAL(toggled (bool)), page4->kcfg_PrivKeyringUrl, TQT_SLOT(setEnabled(bool))); - connect(page4->kcfg_PrivKeyring, TQT_SIGNAL(toggled (bool)), this, TQT_SLOT(checkAdditionalState(bool))); - connect(page6->server_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddKeyServer())); - connect(page6->server_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelKeyServer())); - connect(page6->server_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultKeyServer())); - connect(page6->ServerBox, TQT_SIGNAL(currentChanged ( TQListBoxItem *)), this, TQT_SLOT(updateButtons())); - connect(page7->pushShredder, TQT_SIGNAL(clicked ()), this, TQT_SIGNAL(installShredder())); - - //connect(this, TQT_SIGNAL(settingsChanged()), TQT_SLOT(updateSettings())); + connect(page1->change_fkey, TQ_SIGNAL(clicked()), this, TQ_SLOT(insertFileKey())); + connect(page1->clear_fkey, TQ_SIGNAL(clicked()), page1->kcfg_FileKey, TQ_SLOT(clear())); + connect(page1->change_akey, TQ_SIGNAL(clicked()), this, TQ_SLOT(insertAlwaysKey())); + connect(page1->clear_akey, TQ_SIGNAL(clicked()), page1->alwaysKey, TQ_SLOT(clear())); + connect(page1->alwaysKey, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->gpg_conf_path, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->gpg_home_path, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(updateButtons())); + connect(page4->use_agent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(updateButtons())); + connect(page4->changeHome, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeHome())); + connect(page4->kcfg_PubKeyring, TQ_SIGNAL(toggled (bool)), page4->kcfg_PubKeyringUrl, TQ_SLOT(setEnabled(bool))); + connect(page4->kcfg_PubKeyring, TQ_SIGNAL(toggled (bool)), this, TQ_SLOT(checkAdditionalState(bool))); + connect(page4->kcfg_PrivKeyring, TQ_SIGNAL(toggled (bool)), page4->kcfg_PrivKeyringUrl, TQ_SLOT(setEnabled(bool))); + connect(page4->kcfg_PrivKeyring, TQ_SIGNAL(toggled (bool)), this, TQ_SLOT(checkAdditionalState(bool))); + connect(page6->server_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddKeyServer())); + connect(page6->server_del, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelKeyServer())); + connect(page6->server_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultKeyServer())); + connect(page6->ServerBox, TQ_SIGNAL(currentChanged ( TQListBoxItem *)), this, TQ_SLOT(updateButtons())); + connect(page7->pushShredder, TQ_SIGNAL(clicked ()), this, TQ_SIGNAL(installShredder())); + + //connect(this, TQ_SIGNAL(settingsChanged()), TQ_SLOT(updateSettings())); keyGood=KGpgSettings::colorGood(); keyUnknown=KGpgSettings::colorUnknown(); diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index 4e85f6b..525dacd 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -134,7 +134,7 @@ TQFile qfile(fileToCheck); } else { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL(fileToCheck)); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SLOT(slotProcessResult(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SLOT(slotProcessResult(TQStringList))); return true; } } else { @@ -172,8 +172,8 @@ void MyEditor::slotDecodeFile(TQString fname) TQFile qfile(TQFile::encodeName(fname)); if (qfile.open(IO_ReadOnly)) { KgpgInterface *txtDecrypt=new KgpgInterface(); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),this,TQT_SLOT(editorUpdateDecryptedtxt(TQString))); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),this,TQT_SLOT(editorFailedDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfinished(TQString)),this,TQ_SLOT(editorUpdateDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfailed(TQString)),this,TQ_SLOT(editorFailedDecryptedtxt(TQString))); txtDecrypt->KgpgDecryptFileToText(KURL(fname),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace())); } else KMessageBox::sorry(this,i18n("Unable to read file.")); @@ -208,11 +208,11 @@ KgpgView::KgpgView(TQWidget *parent, const char *name) : TQWidget(parent, name) KButtonBox *boutonbox=new KButtonBox(this,TQt::Horizontal,15,12); boutonbox->addStretch(1); - bouton0=boutonbox->addButton(i18n("S&ign/Verify"),this,TQT_SLOT(clearSign()),TRUE); - bouton1=boutonbox->addButton(i18n("En&crypt"),this,TQT_SLOT(popuppublic()),TRUE); - bouton2=boutonbox->addButton(i18n("&Decrypt"),this,TQT_SLOT(slotdecode()),TRUE); + bouton0=boutonbox->addButton(i18n("S&ign/Verify"),this,TQ_SLOT(clearSign()),TRUE); + bouton1=boutonbox->addButton(i18n("En&crypt"),this,TQ_SLOT(popuppublic()),TRUE); + bouton2=boutonbox->addButton(i18n("&Decrypt"),this,TQ_SLOT(slotdecode()),TRUE); - TQObject::connect(editor,TQT_SIGNAL(textChanged()),this,TQT_SLOT(modified())); + TQObject::connect(editor,TQ_SIGNAL(textChanged()),this,TQ_SLOT(modified())); boutonbox->layout(); editor->resize(editor->maximumSize()); @@ -261,8 +261,8 @@ void KgpgView::clearSign() if (mess.startsWith("-----BEGIN PGP SIGNED")) { ////////////////////// this is a signed message, verify it KgpgInterface *verifyProcess=new KgpgInterface(); - connect(verifyProcess,TQT_SIGNAL(missingSignature(TQString)),this,TQT_SLOT(slotAskForImport(TQString))); - connect(verifyProcess,TQT_SIGNAL(verifyOver(TQString,TQString)),this,TQT_SLOT(slotVerifyResult(TQString,TQString))); + connect(verifyProcess,TQ_SIGNAL(missingSignature(TQString)),this,TQ_SLOT(slotAskForImport(TQString))); + connect(verifyProcess,TQ_SIGNAL(verifyOver(TQString,TQString)),this,TQ_SLOT(slotVerifyResult(TQString,TQString))); verifyProcess->KgpgVerifyText(mess); } else { @@ -280,7 +280,7 @@ void KgpgView::clearSign() delete opts; KgpgInterface *signProcess=new KgpgInterface(); - connect(signProcess,TQT_SIGNAL(txtSignOver(TQString)),this,TQT_SLOT(slotSignResult(TQString))); + connect(signProcess,TQ_SIGNAL(txtSignOver(TQString)),this,TQ_SLOT(slotSignResult(TQString))); TQStringList options=NULL; if (KGpgSettings::pgpCompatibility()) options<<"--pgp6"; @@ -312,7 +312,7 @@ void KgpgView::popuppublic() //////// open dialog --> popuppublic.cpp popupPublic *dialogue=new popupPublic(this, "public_keys", 0,false,((KgpgApp *) parent())->goDefaultKey); - connect(dialogue,TQT_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQT_SLOT(encodetxt(TQStringList,TQStringList,bool,bool))); + connect(dialogue,TQ_SIGNAL(selectedKey(TQStringList,TQStringList,bool,bool)),this,TQ_SLOT(encodetxt(TQStringList,TQStringList,bool,bool))); dialogue->exec(); delete dialogue; } @@ -329,8 +329,8 @@ void KgpgView::slotdecode() //TQString resultat=KgpgInterface::KgpgDecryptText(editor->text(),encUsers); KgpgInterface *txtDecrypt=new KgpgInterface(); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfinished(TQString)),this,TQT_SLOT(updateDecryptedtxt(TQString))); - connect (txtDecrypt,TQT_SIGNAL(txtdecryptionfailed(TQString)),this,TQT_SLOT(failedDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfinished(TQString)),this,TQ_SLOT(updateDecryptedtxt(TQString))); + connect (txtDecrypt,TQ_SIGNAL(txtdecryptionfailed(TQString)),this,TQ_SLOT(failedDecryptedtxt(TQString))); txtDecrypt->KgpgDecryptText(editor->text(),TQStringList::split(TQString(" "),KGpgSettings::customDecrypt().simplifyWhiteSpace())); /* @@ -371,7 +371,7 @@ void KgpgView::encodetxt(TQStringList selec,TQStringList encryptOptions,bool, bo if (symmetric) selec.clear(); KgpgInterface *txtCrypt=new KgpgInterface(); - connect (txtCrypt,TQT_SIGNAL(txtencryptionfinished(TQString)),this,TQT_SLOT(updatetxt(TQString))); + connect (txtCrypt,TQ_SIGNAL(txtencryptionfinished(TQString)),this,TQ_SLOT(updatetxt(TQString))); txtCrypt->KgpgEncryptText(editor->text(),selec,encryptOptions); //KMessageBox::sorry(0,"OVER"); diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index 864bc4b..a7a8904 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -350,8 +350,8 @@ KDialogBase( parent, name, true,i18n("Private Key List"),Ok | Cancel) { KMessageBox::information(this,i18n("<qt><b>Some of your secret keys are untrusted.</b><br>Change their trust if you want to use them for signing.</qt>"),TQString(),"warnUntrusted"); } - TQObject::connect(keysListpr,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotpreOk())); - TQObject::connect(keysListpr,TQT_SIGNAL(clicked(TQListViewItem *)),this,TQT_SLOT(slotSelect(TQListViewItem *))); + TQObject::connect(keysListpr,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotpreOk())); + TQObject::connect(keysListpr,TQ_SIGNAL(clicked(TQListViewItem *)),this,TQ_SLOT(slotSelect(TQListViewItem *))); if (!selectedok) @@ -460,7 +460,7 @@ KeyView::KeyView( TQWidget *parent, const char *name ) trustgood.fill(KGpgSettings::colorGood());//TQColor(144,255,0)); bitBlt(&trustgood,0,0,&blankFrame,0,0,50,15); - connect(this,TQT_SIGNAL(expanded (TQListViewItem *)),this,TQT_SLOT(expandKey(TQListViewItem *))); + connect(this,TQ_SIGNAL(expanded (TQListViewItem *)),this,TQ_SLOT(expandKey(TQListViewItem *))); header()->setMovingEnabled(false); setAcceptDrops(true); setDragEnabled(true); @@ -476,7 +476,7 @@ void KeyView::droppedfile (KURL url) KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(url); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),this,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),this,TQ_SLOT(slotReloadKeys(TQStringList))); } void KeyView::contentsDragMoveEvent(TQDragMoveEvent *e) @@ -573,64 +573,64 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa installEventFilter(this); setCaption(i18n("Key Management")); - (void) new TDEAction(i18n("&Open Editor"), "edit",0,this, TQT_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); - TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),this, TQT_SLOT(slotexport()),actionCollection(),"key_export"); - TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,this, TQT_SLOT(confirmdeletekey()),actionCollection(),"key_delete"); - signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,this, TQT_SLOT(signkey()),actionCollection(),"key_sign"); - TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,this, TQT_SLOT(delsignkey()),actionCollection(),"key_delsign"); - TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,this, TQT_SLOT(listsigns()),actionCollection(),"key_info"); - TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),this, TQT_SLOT(slotPreImportKey()),actionCollection(),"key_import"); - TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,this, TQT_SLOT(slotSetDefKey()),actionCollection(),"key_default"); - importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,this, TQT_SLOT(preimportsignkey()),actionCollection(),"key_importsign"); - importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,this, TQT_SLOT(importallsignkey()),actionCollection(),"key_importallsign"); - refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,this, TQT_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh"); - - TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,this, TQT_SLOT(createNewGroup()),actionCollection(),"create_group"); - TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,this, TQT_SLOT(deleteGroup()),actionCollection(),"delete_group"); - TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,this, TQT_SLOT(editGroup()),actionCollection(),"edit_group"); - - TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,this, TQT_SLOT(addToKAB()),actionCollection(),"add_kab"); - (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,this, TQT_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key"); - - KStdAction::quit(this, TQT_SLOT(quitApp()), actionCollection()); - KStdAction::find(this, TQT_SLOT(findKey()), actionCollection()); - KStdAction::findNext(this, TQT_SLOT(findNextKey()), actionCollection()); - (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),this, TQT_SLOT(refreshkey()),actionCollection(),"key_refresh"); - TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,this, TQT_SLOT(slotShowPhoto()),actionCollection(),"key_photo"); - TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,this, TQT_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo"); - TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,this, TQT_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); - - TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,this, TQT_SLOT(slotAddUid()),actionCollection(),"add_uid"); - TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,this, TQT_SLOT(slotDelUid()),actionCollection(),"del_uid"); - - TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),this, TQT_SLOT(slotedit()),actionCollection(),"key_edit"); - TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,this, TQT_SLOT(slotexportsec()),actionCollection(),"key_sexport"); - TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,this, TQT_SLOT(revokeWidget()),actionCollection(),"key_revoke"); - - TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,this, TQT_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); - TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),this, TQT_SLOT(slotgenkey()),actionCollection(),"key_gener"); - - TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,this, TQT_SLOT(slotregenerate()),actionCollection(),"key_regener"); - - (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQT_SLOT(showKeyServer()),actionCollection(),"key_server"); - KStdAction::preferences(this, TQT_SLOT(showOptions()), actionCollection(),"options_configure"); - (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,this, TQT_SLOT(slotTip()), actionCollection(),"help_tipofday"); - (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,this, TQT_SLOT(slotManpage()),actionCollection(),"gpg_man"); - - (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,this, TQT_SLOT(slotToggleSecret()),actionCollection(),"show_secret"); + (void) new TDEAction(i18n("&Open Editor"), "edit",0,this, TQ_SLOT(slotOpenEditor()),actionCollection(),"kgpg_editor"); + TDEAction *exportPublicKey = new TDEAction(i18n("E&xport Public Keys..."), "kgpg_export", TDEStdAccel::shortcut(TDEStdAccel::Copy),this, TQ_SLOT(slotexport()),actionCollection(),"key_export"); + TDEAction *deleteKey = new TDEAction(i18n("&Delete Keys"),"edit-delete", TQt::Key_Delete,this, TQ_SLOT(confirmdeletekey()),actionCollection(),"key_delete"); + signKey = new TDEAction(i18n("&Sign Keys..."), "kgpg_sign", 0,this, TQ_SLOT(signkey()),actionCollection(),"key_sign"); + TDEAction *delSignKey = new TDEAction(i18n("Delete Sign&ature"),"edit-delete", 0,this, TQ_SLOT(delsignkey()),actionCollection(),"key_delsign"); + TDEAction *infoKey = new TDEAction(i18n("&Edit Key"), "kgpg_info", TQt::Key_Return,this, TQ_SLOT(listsigns()),actionCollection(),"key_info"); + TDEAction *importKey = new TDEAction(i18n("&Import Key..."), "kgpg_import", TDEStdAccel::shortcut(TDEStdAccel::Paste),this, TQ_SLOT(slotPreImportKey()),actionCollection(),"key_import"); + TDEAction *setDefaultKey = new TDEAction(i18n("Set as De&fault Key"),0, 0,this, TQ_SLOT(slotSetDefKey()),actionCollection(),"key_default"); + importSignatureKey = new TDEAction(i18n("Import Key From Keyserver"),"network", 0,this, TQ_SLOT(preimportsignkey()),actionCollection(),"key_importsign"); + importAllSignKeys = new TDEAction(i18n("Import &Missing Signatures From Keyserver"),"network", 0,this, TQ_SLOT(importallsignkey()),actionCollection(),"key_importallsign"); + refreshKey = new TDEAction(i18n("&Refresh Keys From Keyserver"),"reload", 0,this, TQ_SLOT(refreshKeyFromServer()),actionCollection(),"key_server_refresh"); + + TDEAction *createGroup=new TDEAction(i18n("&Create Group with Selected Keys..."), 0, 0,this, TQ_SLOT(createNewGroup()),actionCollection(),"create_group"); + TDEAction *delGroup= new TDEAction(i18n("&Delete Group"), 0, 0,this, TQ_SLOT(deleteGroup()),actionCollection(),"delete_group"); + TDEAction *editCurrentGroup= new TDEAction(i18n("&Edit Group"), 0, 0,this, TQ_SLOT(editGroup()),actionCollection(),"edit_group"); + + TDEAction *newContact=new TDEAction(i18n("&Create New Contact in Address Book"), "kaddressbook", 0,this, TQ_SLOT(addToKAB()),actionCollection(),"add_kab"); + (void) new TDEAction(i18n("&Go to Default Key"), "go-home",TQKeySequence(CTRL+TQt::Key_Home) ,this, TQ_SLOT(slotGotoDefaultKey()),actionCollection(),"go_default_key"); + + KStdAction::quit(this, TQ_SLOT(quitApp()), actionCollection()); + KStdAction::find(this, TQ_SLOT(findKey()), actionCollection()); + KStdAction::findNext(this, TQ_SLOT(findNextKey()), actionCollection()); + (void) new TDEAction(i18n("&Refresh List"), "reload", TDEStdAccel::reload(),this, TQ_SLOT(refreshkey()),actionCollection(),"key_refresh"); + TDEAction *openPhoto= new TDEAction(i18n("&Open Photo"), "image-x-generic", 0,this, TQ_SLOT(slotShowPhoto()),actionCollection(),"key_photo"); + TDEAction *deletePhoto= new TDEAction(i18n("&Delete Photo"), "delete", 0,this, TQ_SLOT(slotDeletePhoto()),actionCollection(),"delete_photo"); + TDEAction *addPhoto= new TDEAction(i18n("&Add Photo"), 0, 0,this, TQ_SLOT(slotAddPhoto()),actionCollection(),"add_photo"); + + TDEAction *addUid= new TDEAction(i18n("&Add User Id"), 0, 0,this, TQ_SLOT(slotAddUid()),actionCollection(),"add_uid"); + TDEAction *delUid= new TDEAction(i18n("&Delete User Id"), 0, 0,this, TQ_SLOT(slotDelUid()),actionCollection(),"del_uid"); + + TDEAction *editKey = new TDEAction(i18n("Edit Key in &Terminal"), "kgpg_term", TQKeySequence(ALT+TQt::Key_Return),this, TQ_SLOT(slotedit()),actionCollection(),"key_edit"); + TDEAction *exportSecretKey = new TDEAction(i18n("Export Secret Key..."), 0, 0,this, TQ_SLOT(slotexportsec()),actionCollection(),"key_sexport"); + TDEAction *revokeKey = new TDEAction(i18n("Revoke Key..."), 0, 0,this, TQ_SLOT(revokeWidget()),actionCollection(),"key_revoke"); + + TDEAction *deleteKeyPair = new TDEAction(i18n("Delete Key Pair"), 0, 0,this, TQ_SLOT(deleteseckey()),actionCollection(),"key_pdelete"); + TDEAction *generateKey = new TDEAction(i18n("&Generate Key Pair..."), "kgpg_gen", TDEStdAccel::shortcut(TDEStdAccel::New),this, TQ_SLOT(slotgenkey()),actionCollection(),"key_gener"); + + TDEAction *regeneratePublic = new TDEAction(i18n("&Regenerate Public Key"), 0, 0,this, TQ_SLOT(slotregenerate()),actionCollection(),"key_regener"); + + (void) new TDEAction(i18n("&Key Server Dialog"), "network", 0,this, TQ_SLOT(showKeyServer()),actionCollection(),"key_server"); + KStdAction::preferences(this, TQ_SLOT(showOptions()), actionCollection(),"options_configure"); + (void) new TDEAction(i18n("Tip of the &Day"), "idea", 0,this, TQ_SLOT(slotTip()), actionCollection(),"help_tipofday"); + (void) new TDEAction(i18n("View GnuPG Manual"), "contents", 0,this, TQ_SLOT(slotManpage()),actionCollection(),"gpg_man"); + + (void) new TDEToggleAction(i18n("&Show only Secret Keys"), "kgpg_show", 0,this, TQ_SLOT(slotToggleSecret()),actionCollection(),"show_secret"); keysList2->displayOnlySecret=false; - (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,this, TQT_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); + (void) new TDEToggleAction(i18n("&Hide Expired/Disabled Keys"),0, 0,this, TQ_SLOT(slotToggleDisabled()),actionCollection(),"hide_disabled"); keysList2->displayDisabled=true; - sTrust=new TDEToggleAction(i18n("Trust"),0, 0,this, TQT_SLOT(slotShowTrust()),actionCollection(),"show_trust"); - sSize=new TDEToggleAction(i18n("Size"),0, 0,this, TQT_SLOT(slotShowSize()),actionCollection(),"show_size"); - sCreat=new TDEToggleAction(i18n("Creation"),0, 0,this, TQT_SLOT(slotShowCreat()),actionCollection(),"show_creat"); - sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,this, TQT_SLOT(slotShowExpi()),actionCollection(),"show_expi"); + sTrust=new TDEToggleAction(i18n("Trust"),0, 0,this, TQ_SLOT(slotShowTrust()),actionCollection(),"show_trust"); + sSize=new TDEToggleAction(i18n("Size"),0, 0,this, TQ_SLOT(slotShowSize()),actionCollection(),"show_size"); + sCreat=new TDEToggleAction(i18n("Creation"),0, 0,this, TQ_SLOT(slotShowCreat()),actionCollection(),"show_creat"); + sExpi=new TDEToggleAction(i18n("Expiration"),0, 0,this, TQ_SLOT(slotShowExpi()),actionCollection(),"show_expi"); photoProps = new TDESelectAction(i18n("&Photo ID's"),"kgpg_photo", actionCollection(), "photo_settings"); - connect(photoProps, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetPhotoSize(int))); + connect(photoProps, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetPhotoSize(int))); // Keep the list in kgpg.kcfg in sync with this one! TQStringList list; @@ -722,12 +722,12 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa setCentralWidget(keysList2); keysList2->restoreLayout(TDEGlobal::config(), "KeyView"); - TQObject::connect(keysList2,TQT_SIGNAL(returnPressed(TQListViewItem *)),this,TQT_SLOT(listsigns())); - TQObject::connect(keysList2,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(listsigns())); - TQObject::connect(keysList2,TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(checkList())); - TQObject::connect(keysList2,TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), - this,TQT_SLOT(slotmenu(TQListViewItem *,const TQPoint &,int))); - TQObject::connect(keysList2,TQT_SIGNAL(destroyed()),this,TQT_SLOT(annule())); + TQObject::connect(keysList2,TQ_SIGNAL(returnPressed(TQListViewItem *)),this,TQ_SLOT(listsigns())); + TQObject::connect(keysList2,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(listsigns())); + TQObject::connect(keysList2,TQ_SIGNAL(selectionChanged ()),this,TQ_SLOT(checkList())); + TQObject::connect(keysList2,TQ_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)), + this,TQ_SLOT(slotmenu(TQListViewItem *,const TQPoint &,int))); + TQObject::connect(keysList2,TQ_SIGNAL(destroyed()),this,TQ_SLOT(annule())); /////////////// get all keys data @@ -742,10 +742,10 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa : "locationbar_erase")); (void) new TQLabel(i18n("Search: "),toolBar()); listViewSearch = new mySearchLine(toolBar(),keysList2); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); - (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, listViewSearch, TQT_SLOT(setFocus()),actionCollection(), "search_focus"); + (void)new TDEAction(i18n("Filter Search"), TQt::Key_F6, listViewSearch, TQ_SLOT(setFocus()),actionCollection(), "search_focus"); sTrust->setChecked(KGpgSettings::showTrust()); sSize->setChecked(KGpgSettings::showSize()); @@ -758,13 +758,13 @@ listKeys::listKeys(TQWidget *parent, const char *name) : DCOPObject( "KeyInterfa keyStatusBar->insertFixedItem(i18n("00000 Keys, 000 Groups"),1,true); keyStatusBar->setItemAlignment(0, AlignLeft); keyStatusBar->changeItem("",1); - TQObject::connect(keysList2,TQT_SIGNAL(statusMessage(TQString,int,bool)),this,TQT_SLOT(changeMessage(TQString,int,bool))); - TQObject::connect(statusbarTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(statusBarTimeout())); + TQObject::connect(keysList2,TQ_SIGNAL(statusMessage(TQString,int,bool)),this,TQ_SLOT(changeMessage(TQString,int,bool))); + TQObject::connect(statusbarTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(statusBarTimeout())); s_kgpgEditor= new KgpgApp(parent, "editor",WType_Dialog,actionCollection()->action("go_default_key")->shortcut(),true); - connect(s_kgpgEditor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(this,TQT_SIGNAL(fontChanged(TQFont)),s_kgpgEditor,TQT_SLOT(slotSetFont(TQFont))); - connect(s_kgpgEditor->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(s_kgpgEditor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(this,TQ_SIGNAL(fontChanged(TQFont)),s_kgpgEditor,TQ_SLOT(slotSetFont(TQFont))); + connect(s_kgpgEditor->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); // kdDebug(2100) << k_funcinfo << "getGpgversion" << KgpgInterface::getGpgVersion() <<endl; } @@ -781,10 +781,10 @@ show(); void listKeys::slotOpenEditor() { KgpgApp *kgpgtxtedit = new KgpgApp(this, "editor",WType_TopLevel | WDestructiveClose,actionCollection()->action("go_default_key")->shortcut()); - connect(kgpgtxtedit,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(kgpgtxtedit,TQT_SIGNAL(encryptFiles(KURL::List)),this,TQT_SIGNAL(encryptFiles(KURL::List))); - connect(this,TQT_SIGNAL(fontChanged(TQFont)),kgpgtxtedit,TQT_SLOT(slotSetFont(TQFont))); - connect(kgpgtxtedit->view->editor,TQT_SIGNAL(refreshImported(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(kgpgtxtedit,TQ_SIGNAL(encryptFiles(KURL::List)),this,TQ_SIGNAL(encryptFiles(KURL::List))); + connect(this,TQ_SIGNAL(fontChanged(TQFont)),kgpgtxtedit,TQ_SLOT(slotSetFont(TQFont))); + connect(kgpgtxtedit->view->editor,TQ_SIGNAL(refreshImported(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); kgpgtxtedit->show(); } @@ -911,7 +911,7 @@ void listKeys::refreshKeyFromServer() kServer=new keyServer(0,"server_dialog",false); kServer->page->kLEimportid->setText(keyIDS); kServer->slotImport(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT(refreshFinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT(refreshFinished())); } @@ -970,13 +970,13 @@ void listKeys::slotAddUid() addUidWidget->setMainWidget(keyUid); //keyUid->setMinimumSize(keyUid->sizeHint()); keyUid->setMinimumWidth(300); - connect(keyUid->kLineEdit1,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotAddUidEnable(const TQString & ))); + connect(keyUid->kLineEdit1,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotAddUidEnable(const TQString & ))); if (addUidWidget->exec()!=TQDialog::Accepted) return; KgpgInterface *addUidProcess=new KgpgInterface(); addUidProcess->KgpgAddUid(keysList2->currentItem()->text(6),keyUid->kLineEdit1->text(),keyUid->kLineEdit2->text(),keyUid->kLineEdit3->text()); - connect(addUidProcess,TQT_SIGNAL(addUidFinished()),keysList2,TQT_SLOT(refreshselfkey())); - connect(addUidProcess,TQT_SIGNAL(addUidError(TQString)),this,TQT_SLOT(slotGpgError(TQString))); + connect(addUidProcess,TQ_SIGNAL(addUidFinished()),keysList2,TQ_SLOT(refreshselfkey())); + connect(addUidProcess,TQ_SIGNAL(addUidError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotAddUidEnable(const TQString & name) @@ -999,8 +999,8 @@ void listKeys::slotAddPhoto() return; KgpgInterface *addPhotoProcess=new KgpgInterface(); addPhotoProcess->KgpgAddPhoto(keysList2->currentItem()->text(6),imagePath); - connect(addPhotoProcess,TQT_SIGNAL(addPhotoFinished()),this,TQT_SLOT(slotUpdatePhoto())); - connect(addPhotoProcess,TQT_SIGNAL(addPhotoError(TQString)),this,TQT_SLOT(slotGpgError(TQString))); + connect(addPhotoProcess,TQ_SIGNAL(addPhotoFinished()),this,TQ_SLOT(slotUpdatePhoto())); + connect(addPhotoProcess,TQ_SIGNAL(addPhotoError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotGpgError(TQString errortxt) @@ -1016,8 +1016,8 @@ void listKeys::slotDeletePhoto() KgpgInterface *delPhotoProcess=new KgpgInterface(); delPhotoProcess->KgpgDeletePhoto(keysList2->currentItem()->parent()->text(6),keysList2->currentItem()->text(6)); - connect(delPhotoProcess,TQT_SIGNAL(delPhotoFinished()),this,TQT_SLOT(slotUpdatePhoto())); - connect(delPhotoProcess,TQT_SIGNAL(delPhotoError(TQString)),this,TQT_SLOT(slotGpgError(TQString))); + connect(delPhotoProcess,TQ_SIGNAL(delPhotoFinished()),this,TQ_SLOT(slotUpdatePhoto())); + connect(delPhotoProcess,TQ_SIGNAL(delPhotoError(TQString)),this,TQ_SLOT(slotGpgError(TQString))); } void listKeys::slotUpdatePhoto() @@ -1251,7 +1251,7 @@ void listKeys::showKeyServer() { // kdDebug(2100) << k_funcinfo << endl; keyServer *ks=new keyServer(this); - connect(ks,TQT_SIGNAL( importFinished(TQString) ) , keysList2, TQT_SLOT(refreshcurrentkey(TQString))); + connect(ks,TQ_SIGNAL( importFinished(TQString) ) , keysList2, TQ_SLOT(refreshcurrentkey(TQString))); ks->exec(); if (ks) delete ks; @@ -1338,12 +1338,12 @@ void listKeys::showOptions() if (TDEConfigDialog::showDialog("settings")) return; kgpgOptions *optionsDialog=new kgpgOptions(this,"settings"); - connect(optionsDialog,TQT_SIGNAL(settingsUpdated()),this,TQT_SLOT(readAllOptions())); - connect(optionsDialog,TQT_SIGNAL(homeChanged()),this,TQT_SLOT(refreshkey())); - connect(optionsDialog,TQT_SIGNAL(reloadKeyList()),this,TQT_SLOT(refreshkey())); - connect(optionsDialog,TQT_SIGNAL(refreshTrust(int,TQColor)),keysList2,TQT_SLOT(refreshTrust(int,TQColor))); - connect(optionsDialog,TQT_SIGNAL(changeFont(TQFont)),this,TQT_SIGNAL(fontChanged(TQFont))); - connect(optionsDialog,TQT_SIGNAL(installShredder()),this,TQT_SIGNAL(installShredder())); + connect(optionsDialog,TQ_SIGNAL(settingsUpdated()),this,TQ_SLOT(readAllOptions())); + connect(optionsDialog,TQ_SIGNAL(homeChanged()),this,TQ_SLOT(refreshkey())); + connect(optionsDialog,TQ_SIGNAL(reloadKeyList()),this,TQ_SLOT(refreshkey())); + connect(optionsDialog,TQ_SIGNAL(refreshTrust(int,TQColor)),keysList2,TQ_SLOT(refreshTrust(int,TQColor))); + connect(optionsDialog,TQ_SIGNAL(changeFont(TQFont)),this,TQ_SIGNAL(fontChanged(TQFont))); + connect(optionsDialog,TQ_SIGNAL(installShredder()),this,TQ_SIGNAL(installShredder())); optionsDialog->exec(); delete optionsDialog; } @@ -1476,15 +1476,15 @@ void listKeys::revokeWidget() if (keyRevoke->cbSave->isChecked()) { slotrevoke(keysList2->currentItem()->text(6),keyRevoke->kURLRequester1->url(),keyRevoke->comboBox1->currentItem(),keyRevoke->textDescription->text()); if (keyRevoke->cbPrint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),this,TQT_SLOT(doFilePrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(doFilePrint(TQString))); if (keyRevoke->cbImport->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),this,TQT_SLOT(slotImportRevoke(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(slotImportRevoke(TQString))); } else { slotrevoke(keysList2->currentItem()->text(6),TQString(),keyRevoke->comboBox1->currentItem(),keyRevoke->textDescription->text()); if (keyRevoke->cbPrint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),this,TQT_SLOT(doPrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(doPrint(TQString))); if (keyRevoke->cbImport->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),this,TQT_SLOT(slotImportRevokeTxt(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(slotImportRevokeTxt(TQString))); } } @@ -1493,14 +1493,14 @@ void listKeys::slotImportRevoke(TQString url) { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL::fromPathOrURL( url )); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(refreshselfkey())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(refreshselfkey())); } void listKeys::slotImportRevokeTxt(TQString revokeText) { KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(revokeText); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(refreshselfkey())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(refreshselfkey())); } void listKeys::slotexportsec() @@ -1623,10 +1623,10 @@ void listKeys::slotexport() TQString result=kexp->getKey(tdelist,exportAttr); if (page->checkClipboard->isChecked()) slotProcessExportClip(result); - //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),this,TQT_SLOT(slotProcessExportClip(TQString))); + //connect(kexp,TQ_SIGNAL(publicKeyString(TQString)),this,TQ_SLOT(slotProcessExportClip(TQString))); else slotProcessExportMail(result); - //connect(kexp,TQT_SIGNAL(publicKeyString(TQString)),this,TQT_SLOT(slotProcessExportMail(TQString))); + //connect(kexp,TQ_SIGNAL(publicKeyString(TQString)),this,TQ_SLOT(slotProcessExportMail(TQString))); } } @@ -1698,7 +1698,7 @@ void listKeys::listsigns() TQString key=keysList2->currentItem()->text(6); if (!key.isEmpty()) { KgpgKeyInfo *opts=new KgpgKeyInfo(this,"key_props",key); - connect(opts,TQT_SIGNAL(keyNeedsRefresh()),keysList2,TQT_SLOT(refreshselfkey())); + connect(opts,TQ_SIGNAL(keyNeedsRefresh()),keysList2,TQ_SLOT(refreshselfkey())); opts->exec(); } else editGroup(); @@ -1848,11 +1848,11 @@ void listKeys::editGroup() gEdit->buttonAdd->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-down",TDEIcon::Small,20)); gEdit->buttonRemove->setPixmap(TDEGlobal::iconLoader()->loadIcon("go-up",TDEIcon::Small,20)); - connect(gEdit->buttonAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(groupAdd())); - connect(gEdit->buttonRemove,TQT_SIGNAL(clicked()),this,TQT_SLOT(groupRemove())); - // connect(dialogGroupEdit->okClicked(),TQT_SIGNAL(clicked()),this,TQT_SLOT(groupChange())); - connect(gEdit->availableKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQT_SLOT(groupAdd())); - connect(gEdit->groupKeys,TQT_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQT_SLOT(groupRemove())); + connect(gEdit->buttonAdd,TQ_SIGNAL(clicked()),this,TQ_SLOT(groupAdd())); + connect(gEdit->buttonRemove,TQ_SIGNAL(clicked()),this,TQ_SLOT(groupRemove())); + // connect(dialogGroupEdit->okClicked(),TQ_SIGNAL(clicked()),this,TQ_SLOT(groupChange())); + connect(gEdit->availableKeys,TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQ_SLOT(groupAdd())); + connect(gEdit->groupKeys,TQ_SIGNAL(doubleClicked (TQListViewItem *, const TQPoint &, int)),this,TQ_SLOT(groupRemove())); TQListViewItem *item=keysList2->firstChild(); if (item==NULL) return; @@ -2024,7 +2024,7 @@ void listKeys::signLoop() // kdDebug(2100)<<"Sign process for key: "<<keyCount<<" on a total of "<<signList.count()<<endl; if ( signList.at(keyCount) ) { KgpgInterface *signKeyProcess=new KgpgInterface(); - TQObject::connect(signKeyProcess,TQT_SIGNAL(signatureFinished(int)),this,TQT_SLOT(signatureResult(int))); + TQObject::connect(signKeyProcess,TQ_SIGNAL(signatureFinished(int)),this,TQ_SLOT(signatureResult(int))); signKeyProcess->KgpgSignKey(signList.at(keyCount)->text(6),globalkeyID,globalkeyMail,globalisLocal,globalChecked); } } @@ -2088,7 +2088,7 @@ bool listKeys::importRemoteKey(TQString keyID) kServer->page->tabWidget2->setTabEnabled(kServer->page->tabWidget2->page(1),false); kServer->show(); kServer->raise(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT( dcopImportFinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT( dcopImportFinished())); return true; } @@ -2117,7 +2117,7 @@ void listKeys::importsignkey(TQString importKeyId) kServer->slotImport(); // kServer->slotSearch(); //kServer->show(); - connect( kServer, TQT_SIGNAL( importFinished(TQString) ) , this, TQT_SLOT( importfinished())); + connect( kServer, TQ_SIGNAL( importFinished(TQString) ) , this, TQ_SLOT( importfinished())); } @@ -2164,7 +2164,7 @@ void listKeys::delsignkey() return; KgpgInterface *delSignKeyProcess=new KgpgInterface(); delSignKeyProcess->KgpgDelSignature(parentKey,signID); - connect(delSignKeyProcess,TQT_SIGNAL(delsigfinished(bool)),this,TQT_SLOT(delsignatureResult(bool))); + connect(delSignKeyProcess,TQ_SIGNAL(delsigfinished(bool)),this,TQ_SLOT(delsignatureResult(bool))); } void listKeys::delsignatureResult(bool success) @@ -2272,7 +2272,7 @@ void listKeys::slotgenkey() //*proc<<"gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--batch"<<"--passphrase-fd"<<res<<"--gen-key"<<"-a"<<"kgpg.tmp"; *proc<<"gpg"<<"--no-tty"<<"--status-fd=2"<<"--no-secmem-warning"<<"--batch"<<"--gen-key"<<"--utf8-strings"; ///////// when process ends, update dialog infos - TQObject::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(genover(TDEProcess *))); + TQObject::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(genover(TDEProcess *))); proc->start(TDEProcess::NotifyOnExit,true); if (ktype=="RSA") @@ -2303,7 +2303,7 @@ void listKeys::slotgenkey() if (kexp==4) proc->writeStdin(TQString("Expire-Date:%1y").arg(knumb)); proc->writeStdin(TQString("%commit")); - TQObject::connect(proc,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(readgenprocess(KProcIO *))); + TQObject::connect(proc,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(readgenprocess(KProcIO *))); proc->closeWhenDone(); } else ////// start expert (=konsole) mode { @@ -2346,8 +2346,8 @@ void listKeys::genover(TDEProcess *) <<"--with-colons" << fpropt <<"--list-keys"<<newKeyName; - TQObject::connect(conprocess,TQT_SIGNAL(readReady(KProcIO *)),this,TQT_SLOT(slotReadFingerProcess(KProcIO *))); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(newKeyDone(TDEProcess *))); + TQObject::connect(conprocess,TQ_SIGNAL(readReady(KProcIO *)),this,TQ_SLOT(slotReadFingerProcess(KProcIO *))); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(newKeyDone(TDEProcess *))); conprocess->start(TDEProcess::NotifyOnExit,true); } @@ -2413,10 +2413,10 @@ void listKeys::newKeyDone(TDEProcess *) if (page->CBsave->isChecked()) { slotrevoke(newkeyID,page->kURLRequester1->url(),0,i18n("backup copy")); if (page->CBprint->isChecked()) - connect(revKeyProcess,TQT_SIGNAL(revokeurl(TQString)),this,TQT_SLOT(doFilePrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokeurl(TQString)),this,TQ_SLOT(doFilePrint(TQString))); } else if (page->CBprint->isChecked()) { slotrevoke(newkeyID,TQString(),0,i18n("backup copy")); - connect(revKeyProcess,TQT_SIGNAL(revokecertificate(TQString)),this,TQT_SLOT(doPrint(TQString))); + connect(revKeyProcess,TQ_SIGNAL(revokecertificate(TQString)),this,TQ_SLOT(doPrint(TQString))); } } @@ -2460,7 +2460,7 @@ void listKeys::deleteseckey() *conprocess<< config->readPathEntry("TerminalApplication","konsole"); *conprocess<<"-e"<<"gpg" <<"--no-secmem-warning" <<"--delete-secret-key"<<keysList2->currentItem()->text(6); - TQObject::connect(conprocess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(reloadSecretKeys())); + TQObject::connect(conprocess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(reloadSecretKeys())); conprocess->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); } @@ -2594,8 +2594,8 @@ void listKeys::slotPreImportKey() ////////////////////////// import from file KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKeyURL(KURL::fromPathOrURL( impname )); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(refreshOrphaned()),keysList2,TQ_SLOT(slotReloadOrphaned())); } } else { TQString keystr = kapp->clipboard()->text(clipboardMode); @@ -2603,8 +2603,8 @@ void listKeys::slotPreImportKey() changeMessage(i18n("Importing..."),0,true); KgpgInterface *importKeyProcess=new KgpgInterface(); importKeyProcess->importKey(keystr); - connect(importKeyProcess,TQT_SIGNAL(importfinished(TQStringList)),keysList2,TQT_SLOT(slotReloadKeys(TQStringList))); - connect(importKeyProcess,TQT_SIGNAL(refreshOrphaned()),keysList2,TQT_SLOT(slotReloadOrphaned())); + connect(importKeyProcess,TQ_SIGNAL(importfinished(TQStringList)),keysList2,TQ_SLOT(slotReloadKeys(TQStringList))); + connect(importKeyProcess,TQ_SIGNAL(refreshOrphaned()),keysList2,TQ_SLOT(slotReloadOrphaned())); } } } diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp index 1c4ac98..f46b722 100644 --- a/kgpg/popuppublic.cpp +++ b/kgpg/popuppublic.cpp @@ -124,7 +124,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent : "locationbar_erase")); (void) new TQLabel(i18n("Search: "),hBar); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); #endif keysList = new TDEListView( page ); @@ -150,7 +150,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0); TDEActionCollection *actcol=new TDEActionCollection(this); - (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); + (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQ_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions); @@ -189,7 +189,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent TQWhatsThis::add (CBsymmetric,i18n("<b>Symmetrical encryption</b>: encryption does not use keys. You just need to give a password " "to encrypt/decrypt the file")); - TQObject::connect(CBsymmetric,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(isSymetric(bool))); + TQObject::connect(CBsymmetric,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(isSymetric(bool))); CBarmor->setChecked( KGpgSettings::asciiArmor() ); CBuntrusted->setChecked( KGpgSettings::allowUntrustedKeys() ); @@ -204,11 +204,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent optiontxt->setText(customOptions); TQWhatsThis::add (optiontxt,i18n("<b>Custom option</b>: for experienced users only, allows you to enter a gpg command line option, like: '--armor'")); - TQObject::connect(optiontxt,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(customOpts(const TQString & ))); + TQObject::connect(optiontxt,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(customOpts(const TQString & ))); } - TQObject::connect(keysList,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotOk())); -// TQObject::connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(crypte())); - TQObject::connect(CBuntrusted,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(refresh(bool))); + TQObject::connect(keysList,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotOk())); +// TQObject::connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(crypte())); + TQObject::connect(CBuntrusted,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(refresh(bool))); char line[200]="\0"; FILE *fp2; @@ -343,8 +343,8 @@ void popupPublic::refreshkeys() KProcIO *encid=new KProcIO(TQTextCodec::codecForLocale()); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; ///////// when process ends, update dialog infos - TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect())); - TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotpreselect())); + TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); } diff --git a/khexedit/bitswapwidget.cpp b/khexedit/bitswapwidget.cpp index dc17ea1..098fc9d 100644 --- a/khexedit/bitswapwidget.cpp +++ b/khexedit/bitswapwidget.cpp @@ -186,10 +186,10 @@ CByteWidget::CByteWidget( TQWidget *parent, const char *name ) mDigit[i]->setFixedSize( mDigit[i]->sizeHint()*2 ); mDigit[i]->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mDigit[i]->setAlignment( AlignCenter ); - connect( mDigit[i], TQT_SIGNAL(stepCell(const TQObject *, bool )), - this, TQT_SLOT(stepCell(const TQObject *, bool ))); - connect( mDigit[i], TQT_SIGNAL(valueChanged(const TQObject *, uint, bool )), - this, TQT_SLOT(valueChanged(const TQObject *, uint, bool ))); + connect( mDigit[i], TQ_SIGNAL(stepCell(const TQObject *, bool )), + this, TQ_SLOT(stepCell(const TQObject *, bool ))); + connect( mDigit[i], TQ_SIGNAL(valueChanged(const TQObject *, uint, bool )), + this, TQ_SLOT(valueChanged(const TQObject *, uint, bool ))); mHBox->addWidget( mDigit[i] ); } diff --git a/khexedit/chartabledialog.cpp b/khexedit/chartabledialog.cpp index a46bee0..be77c2b 100644 --- a/khexedit/chartabledialog.cpp +++ b/khexedit/chartabledialog.cpp @@ -58,8 +58,8 @@ CCharTableDialog::CCharTableDialog( TQWidget *parent, const char *name, // // I am setting the min. size below // - //connect( mCharacterList, TQT_SIGNAL(doubleClicked(TQListViewItem *) ), - //TQT_SLOT(startAssign(TQListViewItem *))); + //connect( mCharacterList, TQ_SIGNAL(doubleClicked(TQListViewItem *) ), + //TQ_SLOT(startAssign(TQListViewItem *))); topLayout->addWidget( mCharacterList, 10 ); diff --git a/khexedit/converterdialog.cpp b/khexedit/converterdialog.cpp index e742e73..1f54df7 100644 --- a/khexedit/converterdialog.cpp +++ b/khexedit/converterdialog.cpp @@ -34,8 +34,8 @@ CValidateLineEdit::CValidateLineEdit( TQWidget *parent, int validateType, { mValidator = new CHexValidator( this, (CHexValidator::EState)validateType ); setValidator( mValidator ); - connect( this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(convertText(const TQString &)) ); + connect( this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(convertText(const TQString &)) ); } @@ -101,16 +101,16 @@ CConverterDialog::CConverterDialog( TQWidget *parent, const char *name, mTxtInput = new CValidateLineEdit( page, CHexValidator::regularText ); topLayout->addWidget( mTxtInput, 4, 1 ); - connect( mHexInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mDecInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mOctInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mBinInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); - connect( mTxtInput, TQT_SIGNAL(dataChanged(const TQByteArray &)), - this, TQT_SLOT(setData(const TQByteArray &)) ); + connect( mHexInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mDecInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mOctInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mBinInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); + connect( mTxtInput, TQ_SIGNAL(dataChanged(const TQByteArray &)), + this, TQ_SLOT(setData(const TQByteArray &)) ); } diff --git a/khexedit/dialog.cpp b/khexedit/dialog.cpp index 588a715..76f48bc 100644 --- a/khexedit/dialog.cpp +++ b/khexedit/dialog.cpp @@ -189,7 +189,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) if( mSelector == 0 ) { return; } mSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mSelector->insertStringList( formatStrings() ); - connect( mSelector, TQT_SIGNAL(activated(int)), TQT_SLOT(selectorChanged(int)) ); + connect( mSelector, TQ_SIGNAL(activated(int)), TQ_SLOT(selectorChanged(int)) ); TQLabel *label = new TQLabel( mSelector, i18n("Fo&rmat:"), plainPage() ); if( label == 0 ) { return; } @@ -200,8 +200,8 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) mInput = new TQLineEdit( plainPage() ); if( mInput == 0 ) { return; } mInput->setMinimumWidth( fontMetrics().maxWidth()*17 ); - connect( mInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(inputChanged(const TQString&)) ); + connect( mInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(inputChanged(const TQString&)) ); mFindValidator = new CHexValidator( this, CHexValidator::regularText ); if( mFindValidator == 0 ) { return; } mInput->setValidator( mFindValidator ); @@ -498,8 +498,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) if( mFindSelector == 0 ) { return; } mFindSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mFindSelector->insertStringList( formatStrings() ); - connect( mFindSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(findSelectorChanged(int)) ); + connect( mFindSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(findSelectorChanged(int)) ); text = i18n("Fo&rmat (find):"); TQLabel *label = new TQLabel( mFindSelector, text, plainPage() ); @@ -514,8 +514,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) mFindValidator = new CHexValidator( this, CHexValidator::regularText ); if( mFindValidator == 0 ) { return; } mFindInput->setValidator( mFindValidator ); - connect( mFindInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(findInputChanged(const TQString&)) ); + connect( mFindInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(findInputChanged(const TQString&)) ); label = new TQLabel( mFindInput, i18n("F&ind:"), plainPage() ); if( label == 0 ) { return; } @@ -527,8 +527,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) if( mReplaceSelector == 0 ) { return; } mReplaceSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mReplaceSelector->insertStringList( formatStrings() ); - connect( mReplaceSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(replaceSelectorChanged(int)) ); + connect( mReplaceSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(replaceSelectorChanged(int)) ); text = i18n("For&mat (replace):"); label = new TQLabel( mReplaceSelector, text, plainPage() ); @@ -544,8 +544,8 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) mReplaceValidator = new CHexValidator( this, CHexValidator::regularText ); if( mReplaceValidator == 0 ) { return; } mReplaceInput->setValidator( mReplaceValidator ); - connect( mReplaceInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(replaceInputChanged(const TQString&)) ); + connect( mReplaceInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(replaceInputChanged(const TQString&)) ); label = new TQLabel( mReplaceInput, i18n("Rep&lace:"), plainPage() ); if( label == 0 ) { return; } @@ -774,8 +774,8 @@ CFilterDialog::CFilterDialog( TQWidget *parent, const char *name, bool modal ) if( mOperationSelector == 0 ) { return; } mOperationSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mOperationSelector->insertStringList( operationStrings() ); - connect( mOperationSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(operationSelectorChanged(int)) ); + connect( mOperationSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(operationSelectorChanged(int)) ); text = i18n("O&peration:"); TQLabel *label = new TQLabel( mOperationSelector, text, plainPage() ); @@ -849,8 +849,8 @@ void CFilterDialog::makeOperandLayout( void ) mOperandSelector->setFixedHeight( mOperandSelector->sizeHint().height()); mOperandSelector->setMinimumWidth( fontMetrics().width("M")*20 ); mOperandSelector->insertStringList( formatStrings() ); - connect( mOperandSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(operandSelectorChanged(int)) ); + connect( mOperandSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(operandSelectorChanged(int)) ); text = i18n("Fo&rmat (operand):"); mOperandFormatLabel = new TQLabel( mOperandSelector, text, page ); @@ -865,8 +865,8 @@ void CFilterDialog::makeOperandLayout( void ) mOperandValidator = new CHexValidator( this, CHexValidator::regularText ); if( mOperandValidator == 0 ) { return; } mOperandInput->setValidator( mOperandValidator ); - connect( mOperandInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(operandInputChanged(const TQString&)) ); + connect( mOperandInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(operandInputChanged(const TQString&)) ); mOperandInputLabel = new TQLabel( mOperandInput, i18n("O&perand:"), page ); if( mOperandInputLabel == 0 ) { return; } @@ -903,7 +903,7 @@ void CFilterDialog::makeBitSwapLayout( void ) text = i18n("&Reset"); TQPushButton *resetButton = new TQPushButton( text, page ); resetButton->setFixedHeight( resetButton->sizeHint().height() ); - connect( resetButton, TQT_SIGNAL(clicked()), mByteWidget, TQT_SLOT(reset()) ); + connect( resetButton, TQ_SIGNAL(clicked()), mByteWidget, TQ_SLOT(reset()) ); hbox->addWidget( resetButton ); hbox->addStretch( 10 ); @@ -1096,8 +1096,8 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) if( mPatternSelector == 0 ) { return; } mPatternSelector->setMinimumWidth( fontMetrics().maxWidth()*17 ); mPatternSelector->insertStringList( formatStrings() ); - connect( mPatternSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(patternSelectorChanged(int)) ); + connect( mPatternSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(patternSelectorChanged(int)) ); text = i18n("Fo&rmat (pattern):"); label = new TQLabel( mPatternSelector, text, plainPage() ); @@ -1112,8 +1112,8 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) mPatternValidator = new CHexValidator( this, CHexValidator::regularText ); if( mPatternValidator == 0 ) { return; } mPatternInput->setValidator( mPatternValidator ); - connect( mPatternInput, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(patternInputChanged(const TQString&)) ); + connect( mPatternInput, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(patternInputChanged(const TQString&)) ); label = new TQLabel( mPatternInput, i18n("&Pattern:"), plainPage() ); if( label == 0 ) { return; } @@ -1143,7 +1143,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckPattern, 1, 0 ); mCheckOnCursor = new TQCheckBox( i18n("&Insert on cursor position"), group ); gbox->addWidget( mCheckOnCursor, 2, 0 ); - connect( mCheckOnCursor, TQT_SIGNAL(clicked()), TQT_SLOT(cursorCheck()) ); + connect( mCheckOnCursor, TQ_SIGNAL(clicked()), TQ_SLOT(cursorCheck()) ); gbox->setRowStretch( 3, 10 ); TDEConfig &config = *kapp->config(); diff --git a/khexedit/exportdialog.cpp b/khexedit/exportdialog.cpp index 2cdfae7..b2ac808 100644 --- a/khexedit/exportdialog.cpp +++ b/khexedit/exportdialog.cpp @@ -163,8 +163,8 @@ void CExportDialog::setupDestinationPage( void ) mDestination.formatCombo = new TQComboBox( false, page ); mDestination.formatCombo->insertStringList( formatList ); mDestination.formatCombo->setMinimumWidth( fontMetrics().maxWidth()*10 ); - connect( mDestination.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(formatChanged(int)) ); + connect( mDestination.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(formatChanged(int)) ); text = i18n("&Format:"); TQLabel *label = new TQLabel( mDestination.formatCombo, text, page ); @@ -187,11 +187,11 @@ void CExportDialog::setupDestinationPage( void ) mDestination.fileInput = new TQLineEdit( page ); hbox->addWidget( mDestination.fileInput ); - connect(mDestination.fileInput, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(destinationChanged(const TQString &))); + connect(mDestination.fileInput, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(destinationChanged(const TQString &))); text = i18n("Choose..."); TQPushButton *browseButton = new TQPushButton( text, page, "browse" ); hbox->addWidget( browseButton ); - connect( browseButton, TQT_SIGNAL(clicked()), TQT_SLOT(browserClicked()) ); + connect( browseButton, TQ_SIGNAL(clicked()), TQ_SLOT(browserClicked()) ); mDestination.fileInput->setMinimumWidth( fontMetrics().maxWidth()*15 ); label->setBuddy(mDestination.fileInput); @@ -237,7 +237,7 @@ void CExportDialog::setupDestinationPage( void ) gbox->addWidget( mDestination.toLabel, 1, 0 ); gbox->addWidget( mDestination.toInput, 1, 1 ); - connect( group, TQT_SIGNAL(clicked(int)), TQT_SLOT(rangeChanged(int)) ); + connect( group, TQ_SIGNAL(clicked(int)), TQ_SLOT(rangeChanged(int)) ); group->setButton(0); rangeChanged(0); enableButtonOK( !mDestination.fileInput->text().isEmpty() ); diff --git a/khexedit/hexeditorwidget.cpp b/khexedit/hexeditorwidget.cpp index 09a9407..5638576 100644 --- a/khexedit/hexeditorwidget.cpp +++ b/khexedit/hexeditorwidget.cpp @@ -60,16 +60,16 @@ CHexEditorWidget::CHexEditorWidget( TQWidget *parent, const char *name ) mHexView = new CHexViewWidget( this, "hexview", hexBuffer ); if( mHexView == 0 || mHexView->widgetValid() == false ) { return; } - connect( mHexView, TQT_SIGNAL(pleaseOpenNewFile()), TQT_SLOT( newFile()) ); - connect( mHexView, TQT_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )), - TQT_SLOT( open(const TQString&, bool, uint)) ); - connect( mHexView, TQT_SIGNAL(pleaseStepFile(bool)), TQT_SLOT( stepFile(bool)) ); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ), TQT_SLOT( fontChanged() ) ); - connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ),TQT_SLOT( paletteChanged()) ); - connect( mHexView, TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), - TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); - connect( mHexView, TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); + connect( mHexView, TQ_SIGNAL(pleaseOpenNewFile()), TQ_SLOT( newFile()) ); + connect( mHexView, TQ_SIGNAL(pleaseOpenFile( const TQString&, bool, uint )), + TQ_SLOT( open(const TQString&, bool, uint)) ); + connect( mHexView, TQ_SIGNAL(pleaseStepFile(bool)), TQ_SLOT( stepFile(bool)) ); + connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ), TQ_SLOT( fontChanged() ) ); + connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ),TQ_SLOT( paletteChanged()) ); + connect( mHexView, TQ_SIGNAL( layoutChanged( const SDisplayLayout & ) ), + TQ_SLOT( layoutChanged( const SDisplayLayout & ) ) ); + connect( mHexView, TQ_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), + this, TQ_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); mHexView->setFocus(); setBackgroundColor( palette().active().base() ); @@ -1167,12 +1167,12 @@ void CHexEditorWidget::exportDialog( void ) { mExportDialog = new CExportDialog( topLevelWidget(), 0, false ); if( mExportDialog == 0 ) { return; } - connect( mExportDialog, TQT_SIGNAL( exportText(const SExportText &)), - this, TQT_SLOT( exportText( const SExportText &)) ); - connect( mExportDialog, TQT_SIGNAL( exportHtml(const SExportHtml &)), - this, TQT_SLOT( exportHtml( const SExportHtml &)) ); - connect( mExportDialog, TQT_SIGNAL( exportCArray(const SExportCArray &)), - this, TQT_SLOT( exportCArray( const SExportCArray &)) ); + connect( mExportDialog, TQ_SIGNAL( exportText(const SExportText &)), + this, TQ_SLOT( exportText( const SExportText &)) ); + connect( mExportDialog, TQ_SIGNAL( exportHtml(const SExportHtml &)), + this, TQ_SLOT( exportHtml( const SExportHtml &)) ); + connect( mExportDialog, TQ_SIGNAL( exportCArray(const SExportCArray &)), + this, TQ_SLOT( exportCArray( const SExportCArray &)) ); } mExportDialog->show(); } @@ -1449,8 +1449,8 @@ void CHexEditorWidget::gotoOffset( void ) { mGotoDialog = new CGotoDialog( topLevelWidget(), 0, false ); if( mGotoDialog == 0 ) { return; } - connect( mGotoDialog, TQT_SIGNAL(gotoOffset( uint, uint, bool, bool )), - mHexView, TQT_SLOT(gotoOffset( uint, uint, bool, bool )) ); + connect( mGotoDialog, TQ_SIGNAL(gotoOffset( uint, uint, bool, bool )), + mHexView, TQ_SLOT(gotoOffset( uint, uint, bool, bool )) ); } mGotoDialog->show(); } @@ -1468,8 +1468,8 @@ void CHexEditorWidget::find( void ) mFindDialog = new CFindDialog( topLevelWidget(), 0, false ); if( mFindDialog == 0 ) { return; } connect( mFindDialog, - TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - TQT_SLOT(findData(SSearchControl &, uint, bool)) ); + TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + TQ_SLOT(findData(SSearchControl &, uint, bool)) ); } mFindDialog->show(); } @@ -1616,10 +1616,10 @@ void CHexEditorWidget::findNavigator( SSearchControl &sc ) mFindNavigatorDialog = new CFindNavigatorDialog(topLevelWidget(),0,false); if( mFindNavigatorDialog == 0 ) { return; } connect( mFindNavigatorDialog, - TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - TQT_SLOT(findData(SSearchControl &, uint, bool)) ); - connect( mFindNavigatorDialog, TQT_SIGNAL(makeKey(void)), - TQT_SLOT(find()) ); + TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + TQ_SLOT(findData(SSearchControl &, uint, bool)) ); + connect( mFindNavigatorDialog, TQ_SIGNAL(makeKey(void)), + TQ_SLOT(find()) ); } if( mFindNavigatorDialog->isVisible() == false ) { @@ -1639,8 +1639,8 @@ void CHexEditorWidget::replace( void ) mReplaceDialog = new CReplaceDialog( topLevelWidget(), 0, false ); if( mReplaceDialog == 0 ) { return; } connect( mReplaceDialog, - TQT_SIGNAL( replaceData( SSearchControl &, uint)), - TQT_SLOT( replaceData( SSearchControl &, uint))); + TQ_SIGNAL( replaceData( SSearchControl &, uint)), + TQ_SLOT( replaceData( SSearchControl &, uint))); } mReplaceDialog->show(); } @@ -1729,8 +1729,8 @@ void CHexEditorWidget::replacePrompt( SSearchControl &sc ) mReplacePromptDialog = new CReplacePromptDialog(topLevelWidget(), 0,false); if( mReplacePromptDialog == 0 ) { return; } connect( mReplacePromptDialog, - TQT_SIGNAL( replaceData( SSearchControl &, uint)), - TQT_SLOT( replaceData( SSearchControl &, uint))); + TQ_SIGNAL( replaceData( SSearchControl &, uint)), + TQ_SLOT( replaceData( SSearchControl &, uint))); } if( mReplacePromptDialog->isVisible() == false ) { @@ -1783,8 +1783,8 @@ void CHexEditorWidget::insertPattern( void ) { mInsertDialog = new CInsertDialog( topLevelWidget(), 0, false ); if( mInsertDialog == 0 ) { return; } - connect( mInsertDialog, TQT_SIGNAL(execute( SInsertData & )), - mHexView, TQT_SLOT(insert( SInsertData & )) ); + connect( mInsertDialog, TQ_SIGNAL(execute( SInsertData & )), + mHexView, TQ_SLOT(insert( SInsertData & )) ); } mInsertDialog->show(); } @@ -1805,13 +1805,13 @@ void CHexEditorWidget::strings( void ) { mStringDialog = new CStringDialog( topLevelWidget(), 0, false ); if( mStringDialog == 0 ) { return; } - connect( mStringDialog, TQT_SIGNAL(markText( uint, uint, bool )), - mHexView, TQT_SLOT(setMark( uint, uint, bool )) ); - connect( mStringDialog, TQT_SIGNAL(collect()), TQT_SLOT(collectStrings()) ); - connect( mHexView, TQT_SIGNAL(fileName( const TQString &, bool ) ), - mStringDialog, TQT_SLOT( removeList() ) ); - connect( mHexView, TQT_SIGNAL(dataChanged()), - mStringDialog, TQT_SLOT(setDirty()) ); + connect( mStringDialog, TQ_SIGNAL(markText( uint, uint, bool )), + mHexView, TQ_SLOT(setMark( uint, uint, bool )) ); + connect( mStringDialog, TQ_SIGNAL(collect()), TQ_SLOT(collectStrings()) ); + connect( mHexView, TQ_SIGNAL(fileName( const TQString &, bool ) ), + mStringDialog, TQ_SLOT( removeList() ) ); + connect( mHexView, TQ_SIGNAL(dataChanged()), + mStringDialog, TQ_SLOT(setDirty()) ); } mStringDialog->show(); } @@ -1851,8 +1851,8 @@ void CHexEditorWidget::filter( void ) { mFilterDialog = new CFilterDialog( topLevelWidget(), 0, false ); if( mFilterDialog == 0 ) { return; } - connect( mFilterDialog, TQT_SIGNAL(filterData( SFilterControl & )), - mHexView, TQT_SLOT(filter( SFilterControl & )) ); + connect( mFilterDialog, TQ_SIGNAL(filterData( SFilterControl & )), + mHexView, TQ_SLOT(filter( SFilterControl & )) ); } mFilterDialog->show(); } @@ -1864,8 +1864,8 @@ void CHexEditorWidget::chart( void ) { mCharTableDialog = new CCharTableDialog( topLevelWidget(), 0, false ); if( mCharTableDialog == 0 ) { return; } - connect( mCharTableDialog, TQT_SIGNAL(assign( const TQByteArray & )), - mHexView, TQT_SLOT(insert( const TQByteArray & )) ); + connect( mCharTableDialog, TQ_SIGNAL(assign( const TQByteArray & )), + mHexView, TQ_SLOT(insert( const TQByteArray & )) ); } mCharTableDialog->show(); } @@ -1876,8 +1876,8 @@ void CHexEditorWidget::converter( void ) if( mConverterDialog == 0 ) { mConverterDialog = new CConverterDialog( this, "converter", false ); - connect( mConverterDialog, TQT_SIGNAL(probeCursorValue(TQByteArray &, uint)), - mHexView, TQT_SLOT(valueOnCursor(TQByteArray &, uint)) ); + connect( mConverterDialog, TQ_SIGNAL(probeCursorValue(TQByteArray &, uint)), + mHexView, TQ_SLOT(valueOnCursor(TQByteArray &, uint)) ); } mConverterDialog->show(); } @@ -1889,10 +1889,10 @@ void CHexEditorWidget::statistics( void ) { mFileInfoDialog = new CFileInfoDialog( topLevelWidget(), 0, false ); if( mFileInfoDialog == 0 ) { return; } - connect( mFileInfoDialog, TQT_SIGNAL(collectStatistic(SStatisticControl &)), - TQT_SLOT(collectStatistics(SStatisticControl &))); - connect( mHexView, TQT_SIGNAL(dataChanged()), - mFileInfoDialog, TQT_SLOT(setDirty()) ); + connect( mFileInfoDialog, TQ_SIGNAL(collectStatistic(SStatisticControl &)), + TQ_SLOT(collectStatistics(SStatisticControl &))); + connect( mHexView, TQ_SIGNAL(dataChanged()), + mFileInfoDialog, TQ_SLOT(setDirty()) ); } mFileInfoDialog->show(); } @@ -1930,20 +1930,20 @@ void CHexEditorWidget::options( void ) mOptionDialog = new COptionDialog( topLevelWidget(), 0, false ); if( mOptionDialog == 0 ) { return; } - connect( mOptionDialog, TQT_SIGNAL(lineSizeChoice(const SDisplayLine &)), - TQT_SLOT(setLineSize(const SDisplayLine &)) ); - connect( mOptionDialog, TQT_SIGNAL(layoutChoice(const SDisplayLayout &)), - TQT_SLOT(setLayout(const SDisplayLayout &)) ); - connect( mOptionDialog, TQT_SIGNAL(fontChoice(const SDisplayFont &)), - TQT_SLOT(setFont(const SDisplayFont &)) ); - connect( mOptionDialog, TQT_SIGNAL(colorChoice(const SDisplayColor &)), - TQT_SLOT(setColor(const SDisplayColor &)) ); - connect( mOptionDialog, TQT_SIGNAL(cursorChoice(const SDisplayCursor &)), - TQT_SLOT(setCursor(const SDisplayCursor &)) ); - connect( mOptionDialog, TQT_SIGNAL(miscChoice(const SDisplayMisc &)), - TQT_SLOT(setMisc(const SDisplayMisc &)) ); - connect( mOptionDialog, TQT_SIGNAL(removeRecentFiles()), - TQT_SIGNAL(removeRecentFiles()) ); + connect( mOptionDialog, TQ_SIGNAL(lineSizeChoice(const SDisplayLine &)), + TQ_SLOT(setLineSize(const SDisplayLine &)) ); + connect( mOptionDialog, TQ_SIGNAL(layoutChoice(const SDisplayLayout &)), + TQ_SLOT(setLayout(const SDisplayLayout &)) ); + connect( mOptionDialog, TQ_SIGNAL(fontChoice(const SDisplayFont &)), + TQ_SLOT(setFont(const SDisplayFont &)) ); + connect( mOptionDialog, TQ_SIGNAL(colorChoice(const SDisplayColor &)), + TQ_SLOT(setColor(const SDisplayColor &)) ); + connect( mOptionDialog, TQ_SIGNAL(cursorChoice(const SDisplayCursor &)), + TQ_SLOT(setCursor(const SDisplayCursor &)) ); + connect( mOptionDialog, TQ_SIGNAL(miscChoice(const SDisplayMisc &)), + TQ_SLOT(setMisc(const SDisplayMisc &)) ); + connect( mOptionDialog, TQ_SIGNAL(removeRecentFiles()), + TQ_SIGNAL(removeRecentFiles()) ); } if( mOptionDialog->isVisible() == false ) { diff --git a/khexedit/hexmanagerwidget.cpp b/khexedit/hexmanagerwidget.cpp index a8d4bed..a9a018f 100644 --- a/khexedit/hexmanagerwidget.cpp +++ b/khexedit/hexmanagerwidget.cpp @@ -38,18 +38,18 @@ CHexManagerWidget::CHexManagerWidget( TQWidget *parent, const char *name, mConverter = new CHexToolWidget( this ); - connect( mEditor->view(), TQT_SIGNAL(fileName(const TQString &, bool)), - this, TQT_SLOT( addName(const TQString &))); - connect( mEditor->view(), TQT_SIGNAL( fileClosed(const TQString &)), - this, TQT_SLOT( removeName(const TQString &))); - connect( mEditor->view(),TQT_SIGNAL(fileRename(const TQString &,const TQString &)), - this, TQT_SLOT(changeName(const TQString &,const TQString &))); - connect( mEditor->view(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - mConverter, TQT_SLOT( cursorChanged( SCursorState & ) ) ); - connect( mConverter, TQT_SIGNAL( closed(void) ), - this, TQT_SIGNAL( conversionClosed(void) ) ); - connect( mTabBar, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT(open(const TQString &))); + connect( mEditor->view(), TQ_SIGNAL(fileName(const TQString &, bool)), + this, TQ_SLOT( addName(const TQString &))); + connect( mEditor->view(), TQ_SIGNAL( fileClosed(const TQString &)), + this, TQ_SLOT( removeName(const TQString &))); + connect( mEditor->view(),TQ_SIGNAL(fileRename(const TQString &,const TQString &)), + this, TQ_SLOT(changeName(const TQString &,const TQString &))); + connect( mEditor->view(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + mConverter, TQ_SLOT( cursorChanged( SCursorState & ) ) ); + connect( mConverter, TQ_SIGNAL( closed(void) ), + this, TQ_SIGNAL( conversionClosed(void) ) ); + connect( mTabBar, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT(open(const TQString &))); mValid = true; setConversionVisibility( conversionPosition ); @@ -179,11 +179,11 @@ void CHexManagerWidget::setSearchBarPosition( EPosition position ) if( mSearchBar == 0 ) { mSearchBar = new CSearchBar( this ); - connect( mSearchBar, TQT_SIGNAL(hidden()), this, TQT_SLOT(searchBarHidden()) ); - connect( mSearchBar, TQT_SIGNAL(findData(SSearchControl &, uint, bool)), - mEditor, TQT_SLOT(findData(SSearchControl &, uint, bool)) ); - connect( editor()->view(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - mSearchBar, TQT_SLOT( cursorMoved() ) ); + connect( mSearchBar, TQ_SIGNAL(hidden()), this, TQ_SLOT(searchBarHidden()) ); + connect( mSearchBar, TQ_SIGNAL(findData(SSearchControl &, uint, bool)), + mEditor, TQ_SLOT(findData(SSearchControl &, uint, bool)) ); + connect( editor()->view(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + mSearchBar, TQ_SLOT( cursorMoved() ) ); } mSearchBar->show(); } @@ -261,7 +261,7 @@ int CHexManagerWidget::preferredWidth( void ) CTabBar::CTabBar( TQWidget *parent, char *name ) :TQTabBar( parent, name ) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotSelected(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotSelected(int)) ); } diff --git a/khexedit/hextoolwidget.cpp b/khexedit/hextoolwidget.cpp index ef66db2..d6f51ed 100644 --- a/khexedit/hextoolwidget.cpp +++ b/khexedit/hextoolwidget.cpp @@ -96,7 +96,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text = i18n("Show little endian decoding"); mCheckIntelFormat = new TQCheckBox( text, this ); mCheckIntelFormat->setMinimumSize( mCheckIntelFormat->sizeHint() ); - connect( mCheckIntelFormat, TQT_SIGNAL(clicked()), this, TQT_SLOT(intelFormat()) ); + connect( mCheckIntelFormat, TQ_SIGNAL(clicked()), this, TQ_SLOT(intelFormat()) ); SettingsBox->addWidget( mCheckIntelFormat, 0, AlignVCenter ); mCheckIntelFormat->setChecked( // default value to please endian system users #ifdef WORDS_BIGENDIAN @@ -110,7 +110,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) text = i18n("Show unsigned as hexadecimal"); mCheckHexadecimal = new TQCheckBox( text, this ); mCheckHexadecimal->setMinimumSize( mCheckHexadecimal->sizeHint() ); - connect( mCheckHexadecimal, TQT_SIGNAL(clicked()), this, TQT_SLOT(unsignedFormat()) ); + connect( mCheckHexadecimal, TQ_SIGNAL(clicked()), this, TQ_SLOT(unsignedFormat()) ); SettingsBox->addWidget( mCheckHexadecimal, 0, AlignVCenter ); mUtilBox->addMultiCellLayout( ValuesBox, 0, 3, 0, 0, AlignLeft|AlignVCenter ); @@ -133,7 +133,7 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) mBitCombo->insertItem( text ); } mBitCombo->setMinimumSize( mBitCombo->sizeHint() ); - connect( mBitCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(bitWidthChanged(int))); + connect( mBitCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(bitWidthChanged(int))); mUtilBox->addWidget( mBitCombo, 4, 2 ); /* load font metrics */ @@ -141,8 +141,8 @@ CHexToolWidget::CHexToolWidget( TQWidget *parent, const char *name ) mUtilBox->activate(); - connect( kapp, TQT_SIGNAL( tdedisplayFontChanged() ), - TQT_SLOT( fontChanged() ) ); + connect( kapp, TQ_SIGNAL( tdedisplayFontChanged() ), + TQ_SLOT( fontChanged() ) ); mCursorState.valid = false; mViewHexCaps = true; diff --git a/khexedit/hexviewwidget.cpp b/khexedit/hexviewwidget.cpp index 16a3ffd..19a1d54 100644 --- a/khexedit/hexviewwidget.cpp +++ b/khexedit/hexviewwidget.cpp @@ -199,10 +199,10 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, if( mHorzScroll == 0 ) { return; } mCorner = new TQWidget( this ); if( mCorner == 0 ) { return; } - connect( mHorzScroll, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeXPos(int)) ); - connect( mVertScroll, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changeYPos(int)) ); - connect( mHorzScroll, TQT_SIGNAL(hidden()), TQT_SLOT(update()) ); - connect( mVertScroll, TQT_SIGNAL(hidden()), TQT_SLOT(update()) ); + connect( mHorzScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeXPos(int)) ); + connect( mVertScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changeYPos(int)) ); + connect( mHorzScroll, TQ_SIGNAL(hidden()), TQ_SLOT(update()) ); + connect( mVertScroll, TQ_SIGNAL(hidden()), TQ_SLOT(update()) ); mHorzScroll->hide(); mVertScroll->hide(); @@ -213,7 +213,7 @@ CHexViewWidget::CHexViewWidget( TQWidget *parent, const char *name, #else mDragManager->setActivateMode( CDragManager::Timer ); #endif - connect( mDragManager, TQT_SIGNAL(startDrag(bool)), TQT_SLOT(startDrag(bool)) ); + connect( mDragManager, TQ_SIGNAL(startDrag(bool)), TQ_SLOT(startDrag(bool)) ); setFrameStyle( TQFrame::WinPanel|TQFrame::Sunken ); setWFlags( WResizeNoErase ); @@ -438,8 +438,8 @@ void CHexViewWidget::changeYPos( int p ) void CHexViewWidget::clipboardChanged( void ) { - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); unselect(); } @@ -964,8 +964,8 @@ void CHexViewWidget::copy( void ) { return; } - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); // // Note: Do no give the CHexDrag a parent != 0. The clipboard // owns the current dragdata and will destroy it on exit or @@ -975,8 +975,8 @@ void CHexViewWidget::copy( void ) // when the app. is closed (=> segfault). // TQApplication::clipboard()->setData(new CHexDrag( buf )); - connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); } @@ -988,11 +988,11 @@ void CHexViewWidget::copyText( int columnSegment ) return; } - disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); TQApplication::clipboard()->setText( buf.data() ); - connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), - this,TQT_SLOT(clipboardChanged())); + connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), + this,TQ_SLOT(clipboardChanged())); } diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index b60ad7e..7564890 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -138,9 +138,9 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl viewport()->installEventFilter( this ); installEventFilter( this ); - connect( CursorBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blinkCursor()) ); - connect( ScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(autoScrollTimerDone()) ); - connect( DragStartTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(startDrag()) ); + connect( CursorBlinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blinkCursor()) ); + connect( ScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(autoScrollTimerDone()) ); + connect( DragStartTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(startDrag()) ); viewport()->setAcceptDrops( true ); } @@ -1042,7 +1042,7 @@ void KHexEdit::updateLength() void KHexEdit::clipboardChanged() { // don't listen to selection changes - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0 ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0 ); selectAll( false ); } @@ -1674,11 +1674,11 @@ void KHexEdit::contentsMouseReleaseEvent( TQMouseEvent *e ) if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(clipboardChanged()) ); ClipboardMode = TQClipboard::Clipboard; } } @@ -2008,11 +2008,11 @@ void KHexEdit::contentsContextMenuEvent( TQContextMenuEvent *e ) if( TQApplication::clipboard()->supportsSelection() ) { ClipboardMode = TQClipboard::Selection; - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); copy(); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(clipboardChanged()) ); ClipboardMode = TQClipboard::Clipboard; } } diff --git a/khexedit/optiondialog.cpp b/khexedit/optiondialog.cpp index 49a33b7..6db0334 100644 --- a/khexedit/optiondialog.cpp +++ b/khexedit/optiondialog.cpp @@ -116,10 +116,10 @@ void COptionDialog::setupLayoutPage( void ) modeList.append( i18n("Binary Mode") ); modeList.append( i18n("Text Only Mode") ); mLayout.formatCombo->insertStringList( modeList ); - connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotModeSelectorChanged(int)) ); - connect( mLayout.formatCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotModeSelectorChanged(int)) ); + connect( mLayout.formatCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChanged()) ); gbox->addWidget( mLayout.formatCombo, 0, 1 ); // @@ -129,18 +129,18 @@ void COptionDialog::setupLayoutPage( void ) mLayout.lineSizeSpin = new TQSpinBox( page ); mLayout.lineSizeSpin->setMinimumWidth( fontMetrics().width("M") * 10 ); mLayout.lineSizeSpin->setRange( 1, 10000 ); - connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotLineSizeChanged(int) ) ); - connect( mLayout.lineSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lineSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotLineSizeChanged(int) ) ); + connect( mLayout.lineSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); gbox->addWidget( mLayout.lineSizeSpin, 1, 1 ); mLayout.columnSizeSpin = new TQSpinBox( page ); mLayout.columnSizeSpin->setRange( 1, 10000 ); - connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotColumnSizeChanged(int) ) ); - connect( mLayout.columnSizeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged() ) ); + connect( mLayout.columnSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotColumnSizeChanged(int) ) ); + connect( mLayout.columnSizeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged() ) ); gbox->addWidget( mLayout.columnSizeSpin, 2, 1 ); text = i18n("Default l&ine size [bytes]:"); @@ -158,14 +158,14 @@ void COptionDialog::setupLayoutPage( void ) text = i18n("Line size is &fixed (use scrollbar when required)"); mLayout.lockLineCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.lockLineCheck, 4, 4, 0, 1, AlignLeft ); - connect( mLayout.lockLineCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lockLineCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotChanged()) ); text = i18n("Loc&k column at end of line (when column size>1)"); mLayout.lockColumnCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.lockColumnCheck, 5, 5, 0, 1 ); - connect( mLayout.lockColumnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.lockColumnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotChanged()) ); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -179,8 +179,8 @@ void COptionDialog::setupLayoutPage( void ) mLayout.gridCombo = new TQComboBox( false, page ); mLayout.gridCombo->insertStringList( gridList ); - connect( mLayout.gridCombo, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.gridCombo, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Gridlines between text:"); label = new TQLabel( mLayout.gridCombo, text, page ); @@ -191,14 +191,14 @@ void COptionDialog::setupLayoutPage( void ) mLayout.leftSepWidthSpin = new TQSpinBox( page ); mLayout.leftSepWidthSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.leftSepWidthSpin, 8, 1 ); - connect( mLayout.leftSepWidthSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.leftSepWidthSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); mLayout.rightSepWidthSpin = new TQSpinBox( page ); mLayout.rightSepWidthSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.rightSepWidthSpin, 9, 1 ); - connect( mLayout.rightSepWidthSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.rightSepWidthSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Left separator width [pixels]:"); mLayout.leftSepLabel = new TQLabel( mLayout.leftSepWidthSpin, text, page ); @@ -211,14 +211,14 @@ void COptionDialog::setupLayoutPage( void ) mLayout.separatorSpin = new TQSpinBox( page ); mLayout.separatorSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.separatorSpin, 10, 1 ); - connect( mLayout.separatorSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.separatorSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); mLayout.edgeSpin = new TQSpinBox( page ); mLayout.edgeSpin->setRange( 0, 20 ); gbox->addWidget( mLayout.edgeSpin, 11, 1 ); - connect( mLayout.edgeSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.edgeSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("&Separator margin width [pixels]:"); label = new TQLabel( mLayout.separatorSpin, text, page ); @@ -231,15 +231,15 @@ void COptionDialog::setupLayoutPage( void ) text = i18n("Column separation is e&qual to one character"); mLayout.columnCheck = new TQCheckBox( text, page ); gbox->addMultiCellWidget( mLayout.columnCheck, 12, 12, 0, 1, AlignLeft ); - connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotColumnSepCheck(bool))); - connect( mLayout.columnCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mLayout.columnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotColumnSepCheck(bool))); + connect( mLayout.columnCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); mLayout.columnSepSpin = new TQSpinBox( page ); mLayout.columnSepSpin->setRange( 1, 100 ); - connect( mLayout.columnSepSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) ); + connect( mLayout.columnSepSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); text = i18n("Column separa&tion [pixels]:"); mLayout.columnSepLabel = new TQLabel( mLayout.columnSepSpin, text, page ); @@ -265,10 +265,10 @@ void COptionDialog::setupCursorPage( void ) text = i18n("Do not b&link"); mCursor.blinkCheck = new TQCheckBox( i18n("Do not b&link"), group ); - connect( mCursor.blinkCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotBlinkIntervalCheck(bool))); - connect( mCursor.blinkCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.blinkCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotBlinkIntervalCheck(bool))); + connect( mCursor.blinkCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); TQHBox *hbox = new TQHBox( group ); mCursor.blinkLabel = new TQLabel( i18n("&Blink interval [ms]:" ), hbox ); @@ -278,8 +278,8 @@ void COptionDialog::setupCursorPage( void ) mCursor.blinkSpin->setSteps( 100, 100 ); mCursor.blinkSpin->setValue( 500 ); mCursor.blinkLabel->setBuddy(mCursor.blinkSpin); - connect( mCursor.blinkSpin, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT( slotChanged())); + connect( mCursor.blinkSpin, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT( slotChanged())); group = new TQVButtonGroup( i18n("Shape"), page ); group->layout()->setMargin( spacingHint() ); @@ -287,14 +287,14 @@ void COptionDialog::setupCursorPage( void ) text = i18n("Always &use block (rectangular) cursor"); mCursor.blockCheck = new TQCheckBox( text, group ); - connect( mCursor.blockCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotBlockCursorCheck(bool))); - connect( mCursor.blockCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.blockCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotBlockCursorCheck(bool))); + connect( mCursor.blockCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); text = i18n("Use &thick cursor in insert mode"); mCursor.thickCheck = new TQCheckBox( text, group ); - connect( mCursor.thickCheck, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.thickCheck, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); text = i18n("Cursor Behavior When Editor Loses Focus"); group = new TQVButtonGroup( text, page ); @@ -306,12 +306,12 @@ void COptionDialog::setupCursorPage( void ) mCursor.hideRadio = new TQRadioButton( i18n("H&ide"), group, "radio2" ); text = i18n("Do ¬hing"); mCursor.nothingRadio = new TQRadioButton( text, group, "radio3" ); - connect( mCursor.stopRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); - connect( mCursor.hideRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); - connect( mCursor.nothingRadio, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mCursor.stopRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); + connect( mCursor.hideRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); + connect( mCursor.nothingRadio, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); topLayout->addStretch(10); } @@ -328,10 +328,10 @@ void COptionDialog::setupColorPage( void ) text = i18n("&Use system colors (as chosen in Control Center)"); mColor.checkSystem = new TQCheckBox( text, page ); - connect( mColor.checkSystem, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotColorSystem(bool))); - connect( mColor.checkSystem, TQT_SIGNAL(toggled(bool)), - TQT_SLOT( slotChanged())); + connect( mColor.checkSystem, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotColorSystem(bool))); + connect( mColor.checkSystem, TQ_SIGNAL(toggled(bool)), + TQ_SLOT( slotChanged())); topLayout->addWidget( mColor.checkSystem ); TQFrame *hline = new TQFrame( page ); @@ -365,7 +365,7 @@ void COptionDialog::setupColorPage( void ) mColor.colorList->insertItem( listItem ); } mColor.colorList->setCurrentItem(0); - connect( mColor.colorList, TQT_SIGNAL( dataChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( mColor.colorList, TQ_SIGNAL( dataChanged() ), this, TQ_SLOT( slotChanged() ) ); } @@ -380,10 +380,10 @@ void COptionDialog::setupFontPage( void ) text = i18n("&Use system font (as chosen in Control Center)"); mFont.checkSystem = new TQCheckBox( text, page ); - connect( mFont.checkSystem, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotFontSystem(bool))); - connect( mFont.checkSystem, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFont.checkSystem, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotFontSystem(bool))); + connect( mFont.checkSystem, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); topLayout->addWidget( mFont.checkSystem ); TQFrame *hline = new TQFrame( page ); @@ -396,8 +396,8 @@ void COptionDialog::setupFontPage( void ) fixFont.setBold(true); mFont.chooser->setFont( fixFont, true ); mFont.chooser->setSampleText( i18n("KHexEdit editor font") ); - connect( mFont.chooser, TQT_SIGNAL(fontSelected(const TQFont &)), - this, TQT_SLOT( slotChanged())); + connect( mFont.chooser, TQ_SIGNAL(fontSelected(const TQFont &)), + this, TQ_SLOT( slotChanged())); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -408,8 +408,8 @@ void COptionDialog::setupFontPage( void ) mFont.nonPrintInput = new TQLineEdit( page ); mFont.nonPrintInput->setMaxLength( 1 ); - connect( mFont.nonPrintInput, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT( slotChanged())); + connect( mFont.nonPrintInput, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT( slotChanged())); text = i18n("&Map non printable characters to:"); TQLabel *nonPrintLabel = new TQLabel( mFont.nonPrintInput, text, page ); @@ -440,8 +440,8 @@ void COptionDialog::setupFilePage( void ) modeList.append( i18n("All Recent Documents") ); mFile.openCombo->insertStringList( modeList ); mFile.openCombo->setMinimumWidth( mFile.openCombo->sizeHint().width() ); - connect( mFile.openCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT( slotChanged())); + connect( mFile.openCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT( slotChanged())); text = i18n("Open doc&uments on startup:"); TQLabel *label = new TQLabel( mFile.openCombo, text, page ); @@ -456,8 +456,8 @@ void COptionDialog::setupFilePage( void ) mFile.gotoOffsetCheck->setEnabled( false ); // ### END topLayout->addWidget( mFile.gotoOffsetCheck, 0, AlignLeft ); - connect( mFile.gotoOffsetCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.gotoOffsetCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); TQFrame *hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -466,20 +466,20 @@ void COptionDialog::setupFilePage( void ) text = i18n("Open document with &write protection enabled"); mFile.writeProtectCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.writeProtectCheck, 0, AlignLeft ); - connect( mFile.writeProtectCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.writeProtectCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Keep cursor position after reloading document"); mFile.reloadOffsetCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.reloadOffsetCheck, 0, AlignLeft ); - connect( mFile.reloadOffsetCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.reloadOffsetCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Make a backup when saving document"); mFile.backupCheck = new TQCheckBox( text, page ); topLayout->addWidget( mFile.backupCheck, 0, AlignLeft ); - connect( mFile.backupCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.backupCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); hline = new TQFrame( page ); hline->setFrameStyle( TQFrame::Sunken | TQFrame::HLine ); @@ -493,8 +493,8 @@ void COptionDialog::setupFilePage( void ) "when the program is closed.\n" "Note: it will not erase any document of the recent document list " "created by TDE." ) ); - connect( mFile.discardRecentCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mFile.discardRecentCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Cl&ear \"Recent\" Document List"); TQPushButton *discardRecentButton = new TQPushButton( page ); @@ -504,8 +504,8 @@ void COptionDialog::setupFilePage( void ) "Note: it will not erase any document of the recent document list " "created by TDE." ) ); topLayout->addWidget( discardRecentButton, 0, AlignCenter ); - connect( discardRecentButton, TQT_SIGNAL(clicked()), - TQT_SIGNAL(removeRecentFiles()) ); + connect( discardRecentButton, TQ_SIGNAL(clicked()), + TQ_SIGNAL(removeRecentFiles()) ); topLayout->addStretch(10); } @@ -526,57 +526,57 @@ void COptionDialog::setupMiscPage( void ) text = i18n("Auto&matic copy to clipboard when selection is ready"); mMisc.autoCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.autoCheck, 0, AlignLeft ); - connect( mMisc.autoCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.autoCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("&Editor starts in \"insert\" mode" ); mMisc.insertCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.insertCheck, 0, AlignLeft ); - connect( mMisc.insertCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.insertCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Confirm &wrapping (to beginning or end) during search"); mMisc.confirmWrapCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.confirmWrapCheck, 0, AlignLeft ); - connect( mMisc.confirmWrapCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.confirmWrapCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Cursor jumps to &nearest byte when moved"); mMisc.cursorJumpCheck = new TQCheckBox( text, page ); topLayout->addWidget( mMisc.cursorJumpCheck, 0, AlignLeft ); - connect( mMisc.cursorJumpCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.cursorJumpCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); TQVButtonGroup *group = new TQVButtonGroup( i18n("Sounds"), page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Make sound on data &input (eg. typing) failure"); mMisc.inputCheck = new TQCheckBox( text, group ); - connect( mMisc.inputCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.inputCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Make sound on &fatal failure"); mMisc.fatalCheck = new TQCheckBox( text, group ); - connect( mMisc.fatalCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.fatalCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); group = new TQVButtonGroup( i18n("Bookmark Visibility"), page ); group->layout()->setMargin( spacingHint() ); topLayout->addWidget( group ); text = i18n("Use visible bookmarks in the offset column"); mMisc.bookmarkColumnCheck = new TQCheckBox( text, group ); - connect( mMisc.bookmarkColumnCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.bookmarkColumnCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Use visible bookmarks in the editor fields"); mMisc.bookmarkEditorCheck = new TQCheckBox( text, group ); - connect( mMisc.bookmarkEditorCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.bookmarkEditorCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); text = i18n("Confirm when number of printed pages will e&xceed limit"); mMisc.thresholdCheck = new TQCheckBox( text, page ); - connect( mMisc.thresholdCheck, TQT_SIGNAL(clicked()), - TQT_SLOT( slotThresholdConfirm())); - connect( mMisc.thresholdCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.thresholdCheck, TQ_SIGNAL(clicked()), + TQ_SLOT( slotThresholdConfirm())); + connect( mMisc.thresholdCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT( slotChanged())); topLayout->addWidget( mMisc.thresholdCheck, 0, AlignLeft ); TQGridLayout *glay = new TQGridLayout( 3, 3 ); @@ -588,8 +588,8 @@ void COptionDialog::setupMiscPage( void ) mMisc.thresholdSpin->setRange( 5, INT_MAX ); mMisc.thresholdSpin->setSteps( 5, 5 ); mMisc.thresholdSpin->setValue( 5 ); - connect( mMisc.thresholdSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.thresholdSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT( slotChanged())); text = i18n("&Threshold [pages]:" ); mMisc.thresholdLabel = new TQLabel( mMisc.thresholdSpin, text, page ); @@ -605,8 +605,8 @@ void COptionDialog::setupMiscPage( void ) mMisc.undoSpin->setRange( 10, 10000 ); mMisc.undoSpin->setSteps( 5, 5 ); mMisc.undoSpin->setValue( 50 ); - connect( mMisc.undoSpin, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT( slotChanged())); + connect( mMisc.undoSpin, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT( slotChanged())); label = new TQLabel( mMisc.undoSpin, i18n("&Undo limit:"), page ); glay->addWidget( label, 2, 0 ); @@ -1053,7 +1053,7 @@ SDisplayCursor::EFocusMode COptionDialog::cursorFocusMode( void ) CColorListBox::CColorListBox( TQWidget *parent, const char *name, WFlags f ) :TDEListBox( parent, name, f ), mCurrentOnDragEnter(-1) { - connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); + connect( this, TQ_SIGNAL(selected(int)), this, TQ_SLOT(newColor(int)) ); setAcceptDrops( true); } diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp index 7c1d6c4..25e7c48 100644 --- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp +++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp @@ -32,8 +32,8 @@ KBytesEditWidget::KBytesEditWidget( TQWidget *parent, const char *name, const TQ TQHBoxLayout* Layout = new TQHBoxLayout( this ); BytesEdit = new KHE::KBytesEdit( this, "BytesEdit" ); Layout->addWidget( BytesEdit ); -// connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( BytesEdit, TQT_SIGNAL(copyAvailable( bool )), this, TQT_SIGNAL(copyAvailable( bool )) ); +// connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( BytesEdit, TQ_SIGNAL(copyAvailable( bool )), this, TQ_SIGNAL(copyAvailable( bool )) ); } diff --git a/khexedit/parts/kpart/khebrowserextension.cpp b/khexedit/parts/kpart/khebrowserextension.cpp index 6adebaa..ec509c7 100644 --- a/khexedit/parts/kpart/khebrowserextension.cpp +++ b/khexedit/parts/kpart/khebrowserextension.cpp @@ -29,7 +29,7 @@ KHexEditBrowserExtension::KHexEditBrowserExtension( KHexEditPart *P ) : KParts::BrowserExtension( P, "khexeditpartbrowserextension" ), HexEditPart( P ) { - connect( HexEditPart->HexEdit, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) ); + connect( HexEditPart->HexEdit, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); } void KHexEditBrowserExtension::copy() diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp index 0acab5c..41c7110 100644 --- a/khexedit/parts/kpart/khepart.cpp +++ b/khexedit/parts/kpart/khepart.cpp @@ -51,8 +51,8 @@ KHexEditPart::KHexEditPart( TQWidget *ParentWidget, const char *WidgetName, if( CopyAction ) { - connect( HexEdit, TQT_SIGNAL(copyAvailable(bool)), CopyAction,TQT_SLOT(setEnabled(bool)) ); - connect( HexEdit, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged()) ); + connect( HexEdit, TQ_SIGNAL(copyAvailable(bool)), CopyAction,TQ_SLOT(setEnabled(bool)) ); + connect( HexEdit, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged()) ); CopyAction->setEnabled( false ); } @@ -83,10 +83,10 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) { TDEActionCollection *AC = actionCollection(); // create our actions - CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQT_SLOT(copy()), AC ); + CopyAction = BrowserViewWanted ? 0 : KStdAction::copy( HexEdit, TQ_SLOT(copy()), AC ); - KStdAction::selectAll( this, TQT_SLOT(slotSelectAll()), AC ); - KStdAction::deselect( this, TQT_SLOT(slotUnselect()), AC ); + KStdAction::selectAll( this, TQ_SLOT(slotSelectAll()), AC ); + KStdAction::deselect( this, TQ_SLOT(slotUnselect()), AC ); // value encoding CodingAction = new TDESelectAction( i18n("&Value Coding"), 0, AC, "view_valuecoding" ); @@ -96,17 +96,17 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Octal") ); List.append( i18n("&Binary") ); CodingAction->setItems( List ); - connect( CodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetCoding(int)) ); + connect( CodingAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetCoding(int)) ); // document encoding EncodingAction = new TDESelectAction( i18n("&Char Encoding"), 0, AC, "view_charencoding" ); EncodingAction->setItems( KCharCodec::codecNames() ); - connect( EncodingAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetEncoding(int)) ); + connect( EncodingAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetEncoding(int)) ); - ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQT_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); + ShowUnprintableAction = new TDEToggleAction( i18n("Show &Unprintable Chars (<32)"), 0, this, TQ_SLOT(slotSetShowUnprintable()), actionCollection(), "view_showunprintable" ); - KStdAction::zoomIn( HexEdit, TQT_SLOT(zoomIn()), actionCollection() ); - KStdAction::zoomOut( HexEdit, TQT_SLOT(zoomOut()), actionCollection() ); + KStdAction::zoomIn( HexEdit, TQ_SLOT(zoomIn()), actionCollection() ); + KStdAction::zoomOut( HexEdit, TQ_SLOT(zoomOut()), actionCollection() ); // resize style ResizeStyleAction = new TDESelectAction( i18n("&Resize Style"), 0, AC, "resizestyle" ); @@ -115,9 +115,9 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Lock Groups") ); List.append( i18n("&Full Size Usage") ); ResizeStyleAction->setItems( List ); - connect( ResizeStyleAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetResizeStyle(int)) ); + connect( ResizeStyleAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetResizeStyle(int)) ); - ShowOffsetColumnAction = new TDEToggleAction( i18n("&Line Offset"), Key_F11, this, TQT_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); + ShowOffsetColumnAction = new TDEToggleAction( i18n("&Line Offset"), Key_F11, this, TQ_SLOT(slotToggleOffsetColumn()), AC, "view_lineoffset" ); // show buffer columns ToggleColumnsAction = new TDESelectAction( i18n("&Columns"), 0, AC, "togglecolumns" ); @@ -126,7 +126,7 @@ void KHexEditPart::setupActions( bool BrowserViewWanted ) List.append( i18n("&Chars Column") ); List.append( i18n("&Both Columns") ); ToggleColumnsAction->setItems( List ); - connect( ToggleColumnsAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotToggleValueCharColumns(int)) ); + connect( ToggleColumnsAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotToggleValueCharColumns(int)) ); fitActionSettings(); diff --git a/khexedit/printdialogpage.cpp b/khexedit/printdialogpage.cpp index d421880..73efb45 100644 --- a/khexedit/printdialogpage.cpp +++ b/khexedit/printdialogpage.cpp @@ -102,8 +102,8 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw h&eader above text"); mLayout.headerCheck = new TQCheckBox( text, this ); mLayout.headerCheck->setFixedSize( mLayout.headerCheck->sizeHint() ); - connect( mLayout.headerCheck, TQT_SIGNAL( toggled(bool)), - TQT_SLOT( slotDrawHeader(bool))); + connect( mLayout.headerCheck, TQ_SIGNAL( toggled(bool)), + TQ_SLOT( slotDrawHeader(bool))); topLayout->addWidget( mLayout.headerCheck, 0, AlignLeft ); gbox = new TQGridLayout( 5, 6, 0 ); @@ -164,8 +164,8 @@ void LayoutDialogPage::setupLayoutPage( void ) text = i18n("Draw &footer below text"); mLayout.footerCheck = new TQCheckBox( text, this ); mLayout.footerCheck->setFixedSize( mLayout.footerCheck->sizeHint() ); - connect( mLayout.footerCheck, TQT_SIGNAL( toggled(bool)), - TQT_SLOT( slotDrawFooter(bool))); + connect( mLayout.footerCheck, TQ_SIGNAL( toggled(bool)), + TQ_SLOT( slotDrawFooter(bool))); topLayout->addWidget( mLayout.footerCheck, 0, AlignLeft ); gbox = new TQGridLayout( 5, 6, 0 ); diff --git a/khexedit/searchbar.cpp b/khexedit/searchbar.cpp index aeb4b77..395c950 100644 --- a/khexedit/searchbar.cpp +++ b/khexedit/searchbar.cpp @@ -58,22 +58,22 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) setLineWidth( 1 ); mTypeCombo = new TQComboBox( this ); - connect( mTypeCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(selectorChanged(int)) ); + connect( mTypeCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(selectorChanged(int)) ); TQStringList list; list << i18n("Hex") << i18n("Dec") << i18n("Oct") << i18n("Bin") << i18n("Txt"); mTypeCombo->insertStringList( list ); mInputEdit = new TQLineEdit( this ); - connect( mInputEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(textChanged(const TQString&)) ); + connect( mInputEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(textChanged(const TQString&)) ); mValidator = new CHexValidator( this, CHexValidator::regularText ); mInputEdit->setValidator( mValidator ); mFindButton = new TQPushButton( i18n("Find"), this ); mFindButton->setAutoDefault(false); - connect( mFindButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(start()) ); - connect(mInputEdit,TQT_SIGNAL(returnPressed()),mFindButton,TQT_SLOT(animateClick())); + connect( mFindButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(start()) ); + connect(mInputEdit,TQ_SIGNAL(returnPressed()),mFindButton,TQ_SLOT(animateClick())); mFindButton->setFixedHeight( mTypeCombo->sizeHint().height() ); mBackwards = new TQCheckBox( i18n("Backwards"), this ); @@ -82,7 +82,7 @@ CSearchBar::CSearchBar( TQWidget *parent, const char *name, WFlags f ) mCloseButton = new TQPushButton( this ); mCloseButton->setAutoDefault(false); mCloseButton->setPixmap( TQPixmap( close_xpm ) ); - connect( mCloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(hideWidget()) ); + connect( mCloseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(hideWidget()) ); // // Make layout diff --git a/khexedit/stringdialog.cpp b/khexedit/stringdialog.cpp index 5cab7eb..4d4c9dd 100644 --- a/khexedit/stringdialog.cpp +++ b/khexedit/stringdialog.cpp @@ -70,7 +70,7 @@ CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal ) TQPushButton *useButton = new TQPushButton( plainPage(), "use" ); useButton->setText( i18n("&Use") ); useButton->setAutoDefault( false ); - connect( useButton, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotUser1()) ); + connect( useButton, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotUser1()) ); glay->addWidget( useButton, 1, 2 ); TQWidget *helper = new TQWidget( plainPage() ); @@ -97,8 +97,8 @@ CStringDialog::CStringDialog( TQWidget *parent, const char *name, bool modal ) mStringList->setAllColumnsShowFocus( true ); mStringList->setFrameStyle( TQFrame::WinPanel + TQFrame::Sunken ); - connect( mStringList, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(selectionChanged())); + connect( mStringList, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(selectionChanged())); topLayout->addWidget( mStringList, 10 ); hlay = new TQHBoxLayout( topLayout ); diff --git a/khexedit/toplevel.cpp b/khexedit/toplevel.cpp index b462b5a..474faa3 100644 --- a/khexedit/toplevel.cpp +++ b/khexedit/toplevel.cpp @@ -66,42 +66,42 @@ KHexEdit::KHexEdit( void ) // Prepare menus and status bar // mAction.bookmarkMapper = new TQSignalMapper(this); - connect(mAction.bookmarkMapper, TQT_SIGNAL(mapped(int)), editor(), TQT_SLOT(gotoBookmark(int))); + connect(mAction.bookmarkMapper, TQ_SIGNAL(mapped(int)), editor(), TQ_SLOT(gotoBookmark(int))); setupActions(); setupStatusBar(); - connect( hexView(), TQT_SIGNAL( cursorChanged( SCursorState & ) ), - this, TQT_SLOT( cursorChanged( SCursorState & ) ) ); - connect( hexView(), TQT_SIGNAL( editMode( CHexBuffer::EEditMode ) ), - this, TQT_SLOT( editMode( CHexBuffer::EEditMode ) ) ); - connect( hexView(), TQT_SIGNAL( encodingChanged( const SEncodeState &)), - this, TQT_SLOT( encodingChanged( const SEncodeState & )) ); - connect( hexView(), TQT_SIGNAL( textWidth( uint ) ), - this, TQT_SLOT( textWidth( uint ) ) ); - connect( hexView(), TQT_SIGNAL( fileState( SFileState & ) ), - this, TQT_SLOT( fileState( SFileState & ) ) ); - connect( hexView(), TQT_SIGNAL( layoutChanged( const SDisplayLayout & ) ), - this, TQT_SLOT( layoutChanged( const SDisplayLayout & ) ) ); - connect( hexView(), TQT_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), - this, TQT_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); - connect( hexView(), TQT_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)), - this, TQT_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) ); - connect( hexView(), TQT_SIGNAL( fileName( const TQString &, bool ) ), - this, TQT_SLOT( fileActive( const TQString &, bool ) ) ); - connect( hexView(), TQT_SIGNAL( fileRename( const TQString &, const TQString & )), - this, TQT_SLOT( fileRename( const TQString &, const TQString & ) ) ); - connect( hexView(), TQT_SIGNAL( fileClosed( const TQString & ) ), - this, TQT_SLOT( fileClosed( const TQString & ) ) ); - connect( editor(), TQT_SIGNAL( errorLoadFile( const TQString & ) ), - this, TQT_SLOT( removeRecentFile( const TQString & ) ) ); - connect( editor(), TQT_SIGNAL( operationChanged( bool ) ), - this, TQT_SLOT( operationChanged( bool ) ) ); - connect( editor(), TQT_SIGNAL( removeRecentFiles() ), - this, TQT_SLOT( removeRecentFiles() ) ); - connect( mManager, TQT_SIGNAL( conversionClosed() ), - this, TQT_SLOT(conversionClosed()) ); - connect( mManager, TQT_SIGNAL( searchBarClosed() ), - this, TQT_SLOT(searchBarClosed()) ); + connect( hexView(), TQ_SIGNAL( cursorChanged( SCursorState & ) ), + this, TQ_SLOT( cursorChanged( SCursorState & ) ) ); + connect( hexView(), TQ_SIGNAL( editMode( CHexBuffer::EEditMode ) ), + this, TQ_SLOT( editMode( CHexBuffer::EEditMode ) ) ); + connect( hexView(), TQ_SIGNAL( encodingChanged( const SEncodeState &)), + this, TQ_SLOT( encodingChanged( const SEncodeState & )) ); + connect( hexView(), TQ_SIGNAL( textWidth( uint ) ), + this, TQ_SLOT( textWidth( uint ) ) ); + connect( hexView(), TQ_SIGNAL( fileState( SFileState & ) ), + this, TQ_SLOT( fileState( SFileState & ) ) ); + connect( hexView(), TQ_SIGNAL( layoutChanged( const SDisplayLayout & ) ), + this, TQ_SLOT( layoutChanged( const SDisplayLayout & ) ) ); + connect( hexView(), TQ_SIGNAL( inputModeChanged( const SDisplayInputMode & ) ), + this, TQ_SLOT( inputModeChanged( const SDisplayInputMode & ) ) ); + connect( hexView(), TQ_SIGNAL( bookmarkChanged( TQPtrList<SCursorOffset> &)), + this, TQ_SLOT( bookmarkChanged( TQPtrList<SCursorOffset> & ) ) ); + connect( hexView(), TQ_SIGNAL( fileName( const TQString &, bool ) ), + this, TQ_SLOT( fileActive( const TQString &, bool ) ) ); + connect( hexView(), TQ_SIGNAL( fileRename( const TQString &, const TQString & )), + this, TQ_SLOT( fileRename( const TQString &, const TQString & ) ) ); + connect( hexView(), TQ_SIGNAL( fileClosed( const TQString & ) ), + this, TQ_SLOT( fileClosed( const TQString & ) ) ); + connect( editor(), TQ_SIGNAL( errorLoadFile( const TQString & ) ), + this, TQ_SLOT( removeRecentFile( const TQString & ) ) ); + connect( editor(), TQ_SIGNAL( operationChanged( bool ) ), + this, TQ_SLOT( operationChanged( bool ) ) ); + connect( editor(), TQ_SIGNAL( removeRecentFiles() ), + this, TQ_SLOT( removeRecentFiles() ) ); + connect( mManager, TQ_SIGNAL( conversionClosed() ), + this, TQ_SLOT(conversionClosed()) ); + connect( mManager, TQ_SIGNAL( searchBarClosed() ), + this, TQ_SLOT(searchBarClosed()) ); // // Read configuration from file and set the default editor size. @@ -122,68 +122,68 @@ KHexEdit::~KHexEdit( void ) void KHexEdit::setupActions( void ) { - KStdAction::openNew( editor(), TQT_SLOT(newFile()), actionCollection() ); - KStdAction::open( editor(), TQT_SLOT(open()), actionCollection() ); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::openNew( editor(), TQ_SLOT(newFile()), actionCollection() ); + KStdAction::open( editor(), TQ_SLOT(open()), actionCollection() ); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); mAction.insert = new TDEAction( i18n("&Insert..."), CTRL+Key_I, - editor(), TQT_SLOT(insertFile()), actionCollection(), "insert_file" ); - mAction.openRecent = KStdAction::openRecent( this, TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); - mAction.save = KStdAction::save( editor(), TQT_SLOT(save()), actionCollection() ); - mAction.saveAs = KStdAction::saveAs( editor(), TQT_SLOT(saveAs()), actionCollection() ); - mAction.revert = KStdAction::revert( editor(), TQT_SLOT(reload()), actionCollection() ); - //mAction.revert = KStdAction::revert( this, TQT_SLOT(resizeTest()), actionCollection() ); - - mAction.close = KStdAction::close( editor(), TQT_SLOT(close()), actionCollection() ); - mAction.print = KStdAction::print( editor(), TQT_SLOT(print()), actionCollection() ); + editor(), TQ_SLOT(insertFile()), actionCollection(), "insert_file" ); + mAction.openRecent = KStdAction::openRecent( this, TQ_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); + mAction.save = KStdAction::save( editor(), TQ_SLOT(save()), actionCollection() ); + mAction.saveAs = KStdAction::saveAs( editor(), TQ_SLOT(saveAs()), actionCollection() ); + mAction.revert = KStdAction::revert( editor(), TQ_SLOT(reload()), actionCollection() ); + //mAction.revert = KStdAction::revert( this, TQ_SLOT(resizeTest()), actionCollection() ); + + mAction.close = KStdAction::close( editor(), TQ_SLOT(close()), actionCollection() ); + mAction.print = KStdAction::print( editor(), TQ_SLOT(print()), actionCollection() ); mAction.exportData = new TDEAction( i18n("E&xport..."), 0, - editor(), TQT_SLOT(exportDialog()), actionCollection(), "export" ); + editor(), TQ_SLOT(exportDialog()), actionCollection(), "export" ); mAction.cancel = new TDEAction( i18n("&Cancel Operation"), - "process-stop", 0, editor(), TQT_SLOT(stop()), actionCollection(), "cancel" ); + "process-stop", 0, editor(), TQ_SLOT(stop()), actionCollection(), "cancel" ); mAction.readOnly = new TDEToggleAction( i18n("&Read Only"), - 0, editor(), TQT_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); + 0, editor(), TQ_SLOT(toggleWriteProtection()),actionCollection(), "read_only" ); mAction.resizeLock = new TDEToggleAction( i18n("&Allow Resize"), - 0, editor(), TQT_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); + 0, editor(), TQ_SLOT(toggleResizeLock()),actionCollection(), "resize_lock" ); mAction.newWindow = new TDEAction( i18n("N&ew Window"), - 0, this, TQT_SLOT(newWindow()),actionCollection(), "new_window" ); + 0, this, TQ_SLOT(newWindow()),actionCollection(), "new_window" ); mAction.closeWindow= new TDEAction( i18n("Close &Window"), - 0, this, TQT_SLOT(closeWindow()),actionCollection(), "close_window" ); - mAction.quit = KStdAction::quit( this, TQT_SLOT(closeProgram()), actionCollection() ); - - mAction.undo = KStdAction::undo( editor(), TQT_SLOT(undo()), actionCollection() ); - mAction.redo = KStdAction::redo( editor(), TQT_SLOT(redo()), actionCollection() ); - mAction.cut = KStdAction::cut( editor(), TQT_SLOT(cut()), actionCollection() ); - mAction.copy = KStdAction::copy( editor(), TQT_SLOT(copy()), actionCollection() ); - mAction.paste = KStdAction::paste( editor(), TQT_SLOT(paste()), actionCollection() ); - mAction.selectAll = KStdAction::selectAll( editor(), TQT_SLOT(selectAll()),actionCollection() ); - mAction.unselect = KStdAction::deselect( editor(), TQT_SLOT(unselect()), actionCollection()); - mAction.find = KStdAction::find( editor(), TQT_SLOT(find()), actionCollection() ); - mAction.findNext = KStdAction::findNext( editor(), TQT_SLOT(findNext()), actionCollection() ); - mAction.findPrev = KStdAction::findPrev( editor(),TQT_SLOT(findPrevious()),actionCollection() ); - mAction.replace = KStdAction::replace( editor(), TQT_SLOT(replace()), actionCollection() ); + 0, this, TQ_SLOT(closeWindow()),actionCollection(), "close_window" ); + mAction.quit = KStdAction::quit( this, TQ_SLOT(closeProgram()), actionCollection() ); + + mAction.undo = KStdAction::undo( editor(), TQ_SLOT(undo()), actionCollection() ); + mAction.redo = KStdAction::redo( editor(), TQ_SLOT(redo()), actionCollection() ); + mAction.cut = KStdAction::cut( editor(), TQ_SLOT(cut()), actionCollection() ); + mAction.copy = KStdAction::copy( editor(), TQ_SLOT(copy()), actionCollection() ); + mAction.paste = KStdAction::paste( editor(), TQ_SLOT(paste()), actionCollection() ); + mAction.selectAll = KStdAction::selectAll( editor(), TQ_SLOT(selectAll()),actionCollection() ); + mAction.unselect = KStdAction::deselect( editor(), TQ_SLOT(unselect()), actionCollection()); + mAction.find = KStdAction::find( editor(), TQ_SLOT(find()), actionCollection() ); + mAction.findNext = KStdAction::findNext( editor(), TQ_SLOT(findNext()), actionCollection() ); + mAction.findPrev = KStdAction::findPrev( editor(),TQ_SLOT(findPrevious()),actionCollection() ); + mAction.replace = KStdAction::replace( editor(), TQ_SLOT(replace()), actionCollection() ); mAction.gotoOffset = new TDEAction( i18n("&Goto Offset..."), CTRL+Key_G, - editor(), TQT_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); + editor(), TQ_SLOT(gotoOffset()),actionCollection(), "goto_offset" ); mAction.insertPattern = new TDEAction( i18n("&Insert Pattern..."), CTRL+Key_Insert, - editor(), TQT_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); + editor(), TQ_SLOT(insertPattern()), actionCollection(), "insert_pattern" ); mAction.copyAsText = new TDEAction( i18n("Copy as &Text"), 0, - editor(), TQT_SLOT(copyText()), actionCollection(), "copy_as_text" ); + editor(), TQ_SLOT(copyText()), actionCollection(), "copy_as_text" ); mAction.pasteToNewFile = new TDEAction( i18n("Paste into New &File"), 0, - editor(), TQT_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); + editor(), TQ_SLOT(pasteNewFile()), actionCollection(), "paste_into_new_file" ); mAction.pasteToNewWindow = new TDEAction( i18n("Paste into New &Window"), 0, - this, TQT_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); + this, TQ_SLOT(pasteNewWindow()), actionCollection(), "paste_into_new_window" ); mAction.hexadecimal = new TDERadioAction( i18n("&Hexadecimal"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_hex" ); mAction.decimal = new TDERadioAction( i18n("&Decimal"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_dec" ); mAction.octal = new TDERadioAction( i18n("&Octal"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_oct" ); mAction.binary = new TDERadioAction( i18n("&Binary"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_bin" ); mAction.textOnly = new TDERadioAction( i18n("&Text"), - 0, this, TQT_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); + 0, this, TQ_SLOT(setDisplayMode()), actionCollection(), "mode_text" ); mAction.hexadecimal->setExclusiveGroup( "displayMode" ); mAction.decimal->setExclusiveGroup( "displayMode" ); mAction.octal->setExclusiveGroup( "displayMode" ); @@ -191,104 +191,104 @@ actionCollection()); mAction.textOnly->setExclusiveGroup( "displayMode" ); mAction.showOffsetColumn = new TDEToggleAction( i18n("Show O&ffset Column"), - 0, editor(), TQT_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); + 0, editor(), TQ_SLOT(toggleOffsetColumnVisibility()),actionCollection(), "show_offset_column" ); mAction.showTextColumn = new TDEToggleAction( i18n("Show Te&xt Field"), - 0, editor(), TQT_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); + 0, editor(), TQ_SLOT(toggleTextColumnVisibility()),actionCollection(), "show_text_field" ); mAction.offsetAsDecimal = new TDEToggleAction( i18n("Off&set as Decimal"), - 0, editor(), TQT_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); + 0, editor(), TQ_SLOT(toggleOffsetAsDecimal()),actionCollection(), "offset_as_decimal" ); mAction.dataUppercase = new TDEToggleAction( i18n("&Upper Case (Data)"), - 0, editor(), TQT_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); + 0, editor(), TQ_SLOT(toggleDataUppercase()),actionCollection(), "upper_case_data" ); mAction.offsetUppercase = new TDEToggleAction( i18n("Upper &Case (Offset)"), - 0, editor(), TQT_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); + 0, editor(), TQ_SLOT(toggleOffsetUppercase()),actionCollection(), "upper_case_offset" ); mAction.defaultEncoding = new TDERadioAction( i18n("&Default encoding", "&Default"), - 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_default" ); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_default" ); mAction.usAsciiEncoding = new TDERadioAction( i18n("US-&ASCII (7 bit)"), - 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ascii"); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_ascii"); mAction.ebcdicEncoding = new TDERadioAction( i18n("&EBCDIC"), - 0, this, TQT_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); + 0, this, TQ_SLOT( setEncoding()), actionCollection(), "enc_ebcdic" ); // mAction.customEncoding = new TDEAction( i18n("&Custom..."), -// 0, editor(), TQT_SLOT( encoding()), actionCollection(), "enc_custom" ); +// 0, editor(), TQ_SLOT( encoding()), actionCollection(), "enc_custom" ); mAction.defaultEncoding->setExclusiveGroup( "encodingMode" ); mAction.usAsciiEncoding->setExclusiveGroup( "encodingMode" ); mAction.ebcdicEncoding->setExclusiveGroup( "encodingMode" ); mAction.strings = new TDEAction( i18n("&Extract Strings..."), 0, - editor(), TQT_SLOT(strings()), actionCollection(), "extract_strings" ); + editor(), TQ_SLOT(strings()), actionCollection(), "extract_strings" ); // mAction.recordViewer = new TDEAction( i18n("&Record Viewer"), 0, -// editor(), TQT_SLOT(recordView()), actionCollection(), "record_viewer" ); +// editor(), TQ_SLOT(recordView()), actionCollection(), "record_viewer" ); mAction.filter = new TDEAction( i18n("&Binary Filter..."), 0, - editor(), TQT_SLOT(filter()), actionCollection(), "binary_filter" ); + editor(), TQ_SLOT(filter()), actionCollection(), "binary_filter" ); mAction.characterTable = new TDEAction( i18n("&Character Table"), 0, - editor(), TQT_SLOT(chart()), actionCollection(), "char_table" ); + editor(), TQ_SLOT(chart()), actionCollection(), "char_table" ); mAction.converter = new TDEAction( i18n("C&onverter"), 0, - editor(), TQT_SLOT(converter()), actionCollection(), "converter" ); + editor(), TQ_SLOT(converter()), actionCollection(), "converter" ); mAction.statistics = new TDEAction( i18n("&Statistics"), 0, - editor(), TQT_SLOT(statistics()), actionCollection(), "statistics" ); + editor(), TQ_SLOT(statistics()), actionCollection(), "statistics" ); mAction.addBookmark = KStdAction::addBookmark( editor(), - TQT_SLOT(addBookmark()), actionCollection() ); + TQ_SLOT(addBookmark()), actionCollection() ); mAction.replaceBookmark = new TDEAction( i18n("&Replace Bookmark"), CTRL+Key_E, - editor(), TQT_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); + editor(), TQ_SLOT(replaceBookmark()), actionCollection(), "replace_bookmark"); mAction.removeBookmark = new TDEAction( i18n("R&emove Bookmark"), CTRL+Key_U, - editor(), TQT_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); + editor(), TQ_SLOT(removeBookmark()), actionCollection(), "remove_bookmark" ); mAction.removeAllBookmark = new TDEAction( i18n("Re&move All"), 0, - editor(), TQT_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); + editor(), TQ_SLOT(removeAllBookmark()), actionCollection(), "remove_all_bookmarks" ); mAction.nextBookmark = new TDEAction( i18n("Goto &Next Bookmark"), ALT+Key_Down, editor(), - TQT_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); + TQ_SLOT(gotoNextBookmark()), actionCollection(), "next_bookmark" ); mAction.prevBookmark = new TDEAction( i18n("Goto &Previous Bookmark"), ALT+Key_Up, editor(), - TQT_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); + TQ_SLOT(gotoPrevBookmark()), actionCollection(), "prev_bookmark" ); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); mAction.showFullPath = new TDEToggleAction( i18n("Show F&ull Path"), - 0, this, TQT_SLOT(showFullPath()), actionCollection(), "show_full_path" ); + 0, this, TQ_SLOT(showFullPath()), actionCollection(), "show_full_path" ); mAction.tabHide = new TDERadioAction( i18n("&Hide"), - 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_hide" ); mAction.tabShowAboveEditor = new TDERadioAction( i18n("&Above Editor"), - 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_above" ); mAction.tabShowBelowEditor = new TDERadioAction( i18n("&Below Editor"), - 0, this, TQT_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); + 0, this, TQ_SLOT(showDocumentTabs()), actionCollection(), "doctab_below" ); mAction.tabHide->setExclusiveGroup( "editorTab" ); mAction.tabShowAboveEditor->setExclusiveGroup( "editorTab" ); mAction.tabShowBelowEditor->setExclusiveGroup( "editorTab" ); mAction.conversionHide = new TDERadioAction( i18n("&Hide"), - 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); + 0, this, TQ_SLOT(showConversionField()), actionCollection(), "conversion_field_hide"); mAction.conversionFloat = new TDERadioAction( i18n("&Floating"), - 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); + 0, this, TQ_SLOT(showConversionField()), actionCollection(), "conversion_field_float"); mAction.conversionEmbed = new TDERadioAction( i18n("&Embed in Main Window"), - 0, this, TQT_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); + 0, this, TQ_SLOT(showConversionField()), actionCollection(), "conversion_field_embed"); mAction.conversionHide->setExclusiveGroup( "conversionField" ); mAction.conversionFloat->setExclusiveGroup( "conversionField" ); mAction.conversionEmbed->setExclusiveGroup( "conversionField" ); mAction.searchHide = new TDERadioAction( i18n("&Hide"), - 0, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); + 0, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_hide" ); mAction.searchShowAboveEditor = new TDERadioAction( i18n("&Above Editor"), - Key_F5, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); + Key_F5, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_above" ); mAction.searchShowBelowEditor = new TDERadioAction( i18n("&Below Editor"), - Key_F6, this, TQT_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); + Key_F6, this, TQ_SLOT(showSearchBar()), actionCollection(), "searchbar_below" ); mAction.searchHide->setExclusiveGroup( "searchBar" ); mAction.searchShowAboveEditor->setExclusiveGroup( "searchBar" ); mAction.searchShowBelowEditor->setExclusiveGroup( "searchBar" ); - KStdAction::saveOptions(this, TQT_SLOT(writeConfiguration()), actionCollection()); - KStdAction::preferences(editor() ,TQT_SLOT(options()),actionCollection() ); + KStdAction::saveOptions(this, TQ_SLOT(writeConfiguration()), actionCollection()); + KStdAction::preferences(editor() ,TQ_SLOT(options()),actionCollection() ); // mAction.favorites = new TDEAction( i18n("P&rofiles..."), 0, -// editor(), TQT_SLOT(favorites()), actionCollection(), "favorites" ); +// editor(), TQ_SLOT(favorites()), actionCollection(), "favorites" ); - KStdAction::help( this, TQT_SLOT(appHelpActivated()), actionCollection() ); + KStdAction::help( this, TQ_SLOT(appHelpActivated()), actionCollection() ); mDragLabel = new CDragLabel(this); mDragLabel->setPixmap( UserIcon( "hexdrag" ) ); mDragLabel->setDragMask( UserIcon( "hexmask" ) ); mDragLabel->setEnabled( false ); // Enabled once we open a document TQToolTip::add( mDragLabel, i18n("Drag document") ); - (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, editor(), TQT_SLOT(options()), actionCollection(), "drag_document"); + (void) new KWidgetAction(mDragLabel, i18n("Drag Document"), 0, editor(), TQ_SLOT(options()), actionCollection(), "drag_document"); createGUI("khexeditui.rc", false); @@ -296,15 +296,15 @@ actionCollection()); hexView()->setPopupMenu( popup ); int id = 100; - toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQT_SIGNAL(clicked()), - editor(), TQT_SLOT(toggleWriteProtection()), true, + toolBar(0)->insertButton( MainBarIcon("system-lock-screen"), id, TQ_SIGNAL(clicked()), + editor(), TQ_SLOT(toggleWriteProtection()), true, i18n("Toggle write protection") ); toolBar(0)->alignItemRight( id ); mWriteProtectButton = toolBar(0)->getButton(id); TQPopupMenu *documentMenu = (TQPopupMenu *)factory()->container("documents", this); hexView()->setDocumentMenu(documentMenu); - connect(documentMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(documentMenuCB(int))); + connect(documentMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(documentMenuCB(int))); } @@ -313,15 +313,15 @@ void KHexEdit::setupStatusBar( void ) { CStatusBarProgress *progess = new CStatusBarProgress( statusBar() ); statusBar()->addWidget( progess, 10 ); - connect( progess, TQT_SIGNAL(pressed()), editor(), TQT_SLOT(stop()) ); - connect( editor(), TQT_SIGNAL( setProgress( int ) ), - progess, TQT_SLOT( setValue( int ) ) ); - connect( editor(), TQT_SIGNAL( setProgress( int, int ) ), - progess, TQT_SLOT( setValue( int, int ) ) ); - connect( editor(), TQT_SIGNAL( enableProgressText( bool ) ), - progess, TQT_SLOT( setTextEnabled( bool ) ) ); - connect( editor(), TQT_SIGNAL( setProgressText( const TQString & ) ), - progess, TQT_SLOT( setText( const TQString & ) ) ); + connect( progess, TQ_SIGNAL(pressed()), editor(), TQ_SLOT(stop()) ); + connect( editor(), TQ_SIGNAL( setProgress( int ) ), + progess, TQ_SLOT( setValue( int ) ) ); + connect( editor(), TQ_SIGNAL( setProgress( int, int ) ), + progess, TQ_SLOT( setValue( int, int ) ) ); + connect( editor(), TQ_SIGNAL( enableProgressText( bool ) ), + progess, TQ_SLOT( setTextEnabled( bool ) ) ); + connect( editor(), TQ_SIGNAL( setProgressText( const TQString & ) ), + progess, TQ_SLOT( setText( const TQString & ) ) ); statusBar()->insertFixedItem( i18n("Selection: 0000:0000 0000:0000"), status_Selection ); @@ -344,7 +344,7 @@ void KHexEdit::setupStatusBar( void ) statusBar()->changeItem( i18n("Size:"), status_Size ); statusBar()->changeItem( "", status_Modified ); statusBar()->changeItem( "", status_Selection ); - connect( statusBar(),TQT_SIGNAL(pressed(int)),this,TQT_SLOT(statusBarPressed(int)) ); + connect( statusBar(),TQ_SIGNAL(pressed(int)),this,TQ_SLOT(statusBarPressed(int)) ); } @@ -408,7 +408,7 @@ void KHexEdit::initialize( bool openFiles ) // is displayed, then the editor will not be visible until the error // is confirmed and the (modal) dialog is closed. // - TQTimer::singleShot( 100, this, TQT_SLOT(delayedStartupOpen()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(delayedStartupOpen()) ); } @@ -920,7 +920,7 @@ void KHexEdit::bookmarkChanged( TQPtrList<SCursorOffset> &list ) { offset.sprintf("%04X:%04X", p->offset>>16, p->offset&0x0000FFFF ); text = i18n("Offset: %1").arg(offset); - TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQT_SLOT(map()), this, text.latin1()); + TDEAction *action = new TDEAction(text, 0, mAction.bookmarkMapper, TQ_SLOT(map()), this, text.latin1()); int key = acceleratorNumKey( i ); if( key > 0 ) { diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index 200d1f7..5510f23 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -93,7 +93,7 @@ KJotsMain::KJotsMain(const char* name) me_text->setFocusPolicy(TQWidget::StrongFocus); me_text->setEnabled(false); textStack->addWidget(me_text); - connect(me_text, TQT_SIGNAL(findSuccessful()), this, TQT_SLOT(slotFindSuccessful())); + connect(me_text, TQ_SIGNAL(findSuccessful()), this, TQ_SLOT(slotFindSuccessful())); roTextView = new KTextBrowser(textStack, "roTextView", true); textStack->addWidget(roTextView); @@ -105,72 +105,72 @@ KJotsMain::KJotsMain(const char* name) // create actions actions[ACTION_NEXT_BOOK] = new TDEAction(i18n("Next Book"), TQString(), CTRL + Key_D, this, - TQT_SLOT(nextBook()), actionCollection(), "go_next_book"); + TQ_SLOT(nextBook()), actionCollection(), "go_next_book"); actions[ACTION_PREV_BOOK] = new TDEAction(i18n("Previous Book"), TQString(), CTRL + SHIFT + Key_D, this, - TQT_SLOT(prevBook()), actionCollection(), "go_prev_book"); + TQ_SLOT(prevBook()), actionCollection(), "go_prev_book"); actions[ACTION_NEXT_PAGE] = new TDEAction(i18n("Next Page"), TQString(), CTRL + Key_PageDown, this, - TQT_SLOT(nextPage()), actionCollection(), "go_next_page"); + TQ_SLOT(nextPage()), actionCollection(), "go_next_page"); actions[ACTION_PREV_PAGE] = new TDEAction(i18n("Previous Page"), TQString(), CTRL + Key_PageUp, this, - TQT_SLOT(prevPage()), actionCollection(), "go_prev_page"); + TQ_SLOT(prevPage()), actionCollection(), "go_prev_page"); - actions[ACTION_NEW_PAGE] = KStdAction::openNew(this, TQT_SLOT(newEntry()), actionCollection()); + actions[ACTION_NEW_PAGE] = KStdAction::openNew(this, TQ_SLOT(newEntry()), actionCollection()); actions[ACTION_NEW_PAGE]->setText(i18n("&New Page")); actions[ACTION_NEW_BOOK] = new TDEAction(i18n("New &Book..."), "contents", CTRL + SHIFT + Key_N, this, - TQT_SLOT(createNewBook()), actionCollection(), "new_book"); + TQ_SLOT(createNewBook()), actionCollection(), "new_book"); exportPageMenu = new TDEActionMenu(i18n("Export Page"), actionCollection(), "save_page_to"); actions[ACTION_PAGE2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, this, - TQT_SLOT(writePage()), actionCollection(), "save_page_to_ascii"); + TQ_SLOT(writePage()), actionCollection(), "save_page_to_ascii"); actions[ACTION_PAGE2TEXT]->plug(exportPageMenu->popupMenu()); actions[ACTION_PAGE2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, this, - TQT_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html"); + TQ_SLOT(writePageToHTML()), actionCollection(), "save_page_to_html"); actions[ACTION_PAGE2HTML]->plug(exportPageMenu->popupMenu()); exportBookMenu = new TDEActionMenu(i18n("Export Book"), actionCollection(), "save_book_to"); actions[ACTION_BOOK2TEXT] = new TDEAction(i18n("To Text File..."), TQString(), 0, this, - TQT_SLOT(writeBook()), actionCollection(), "save_book_to_ascii"); + TQ_SLOT(writeBook()), actionCollection(), "save_book_to_ascii"); actions[ACTION_BOOK2TEXT]->plug(exportBookMenu->popupMenu()); actions[ACTION_BOOK2HTML] = new TDEAction(i18n("To HTML File..."), TQString(), 0, this, - TQT_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html"); + TQ_SLOT(writeBookToHTML()), actionCollection(), "save_book_to_html"); actions[ACTION_BOOK2HTML]->plug(exportBookMenu->popupMenu()); actions[ACTION_DELETE_PAGE] = new TDEAction(i18n("&Delete Page"), "edit-delete", CTRL + Key_Delete, this, - TQT_SLOT(deleteEntry()), actionCollection(), "del_page"); + TQ_SLOT(deleteEntry()), actionCollection(), "del_page"); actions[ACTION_DELETE_BOOK] = new TDEAction(i18n("Delete Boo&k"), "edit-delete", CTRL + SHIFT + Key_Delete, this, - TQT_SLOT(deleteBook()), actionCollection(), "del_folder"); + TQ_SLOT(deleteBook()), actionCollection(), "del_folder"); actions[ACTION_MANUAL_SAVE] = new TDEAction(i18n("Manual Save"), 0, TDEStdAccel::save(), - this, TQT_SLOT(autoSave()), actionCollection(), "manual_save"); - actions[ACTION_PRINT] = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection()); - actions[ACTION_QUIT] = KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); + this, TQ_SLOT(autoSave()), actionCollection(), "manual_save"); + actions[ACTION_PRINT] = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection()); + actions[ACTION_QUIT] = KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); - actions[ACTION_CUT] = KStdAction::cut(me_text, TQT_SLOT(cut()), actionCollection()); - connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_CUT], TQT_SLOT(setEnabled(bool))); + actions[ACTION_CUT] = KStdAction::cut(me_text, TQ_SLOT(cut()), actionCollection()); + connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_CUT], TQ_SLOT(setEnabled(bool))); actions[ACTION_CUT]->setEnabled(false); - actions[ACTION_COPY] = KStdAction::copy(me_text, TQT_SLOT(copy()), actionCollection()); - connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQT_SLOT(setEnabled(bool))); + actions[ACTION_COPY] = KStdAction::copy(me_text, TQ_SLOT(copy()), actionCollection()); + connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_COPY], TQ_SLOT(setEnabled(bool))); actions[ACTION_COPY]->setEnabled(false); actions[ACTION_PASTE2TITLE] = new TDEAction(i18n("Copy &into Page Title"), "edit-copy", CTRL+Key_T, this, - TQT_SLOT(copySelection()), actionCollection(), "copyIntoTitle"); - connect(me_text, TQT_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQT_SLOT(setEnabled(bool))); + TQ_SLOT(copySelection()), actionCollection(), "copyIntoTitle"); + connect(me_text, TQ_SIGNAL(copyAvailable(bool)), actions[ACTION_PASTE2TITLE], TQ_SLOT(setEnabled(bool))); actions[ACTION_PASTE2TITLE]->setEnabled(false); - actions[ACTION_PASTE] = KStdAction::pasteText(me_text, TQT_SLOT(paste()), actionCollection()); + actions[ACTION_PASTE] = KStdAction::pasteText(me_text, TQ_SLOT(paste()), actionCollection()); - actions[ACTION_FIND] = KStdAction::find( this, TQT_SLOT( slotSearch() ), actionCollection() ); - actions[ACTION_FIND_NEXT] = KStdAction::findNext( this, TQT_SLOT( slotRepeatSearch() ), actionCollection() ); + actions[ACTION_FIND] = KStdAction::find( this, TQ_SLOT( slotSearch() ), actionCollection() ); + actions[ACTION_FIND_NEXT] = KStdAction::findNext( this, TQ_SLOT( slotRepeatSearch() ), actionCollection() ); actions[ACTION_FIND_NEXT]->setEnabled(false); - actions[ACTION_REPLACE] = KStdAction::replace( this, TQT_SLOT( slotReplace() ), actionCollection() ); + actions[ACTION_REPLACE] = KStdAction::replace( this, TQ_SLOT( slotReplace() ), actionCollection() ); actions[ACTION_RENAME] = new TDEAction(i18n("Rename..."), TQString(), CTRL + Key_M, this, - TQT_SLOT(slotRenameEntry()), actionCollection(), "rename_entry"); + TQ_SLOT(slotRenameEntry()), actionCollection(), "rename_entry"); actions[ACTION_INSERT_DATE] = new TDEAction(i18n("Insert Date"), "date", CTRL + Key_I, this, - TQT_SLOT(insertDate()), actionCollection(), "insert_date"); + TQ_SLOT(insertDate()), actionCollection(), "insert_date"); - KStdAction::preferences(this, TQT_SLOT(configure()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection()); bookmarkMenu = new TDEActionMenu(i18n("&Bookmarks"), "bookmarks", actionCollection(), "bookmarks"); KJotsBookmarks* bookmarks = new KJotsBookmarks(this); - connect(bookmarks, TQT_SIGNAL(openPage(const TQString&)), TQT_SLOT(jumpToBookmark(const TQString&))); + connect(bookmarks, TQ_SIGNAL(openPage(const TQString&)), TQ_SLOT(jumpToBookmark(const TQString&))); new KBookmarkMenu(KBookmarkManager::managerForFile(locateLocal("appdata","bookmarks.xml")), bookmarks, bookmarkMenu->popupMenu(), actionCollection(), true); @@ -204,25 +204,25 @@ KJotsMain::KJotsMain(const char* name) updateConfiguration(); updateMenu(); - TQTimer::singleShot(0, this, TQT_SLOT(slotSetupInterface())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetupInterface())); //connect new slots - connect(subjectList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(jumpToEntry(TQListViewItem*))); - connect(subjectList, TQT_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), - this, TQT_SLOT(slotItemMoved(TQListViewItem*, TQListViewItem*, TQListViewItem*))); - connect(subjectList, TQT_SIGNAL(expanded(TQListViewItem*)), - this, TQT_SLOT(slotExpandBook(TQListViewItem*))); - connect(subjectList, TQT_SIGNAL(collapsed(TQListViewItem*)), - this, TQT_SLOT(slotCollapseBook(TQListViewItem*))); - connect(subjectList, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), - this, TQT_SLOT(showListviewContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); - connect(subjectList, TQT_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); - connect(roTextView, TQT_SIGNAL(urlClick(const TQString&)), - this, TQT_SLOT(linkClicked(const TQString&))); - connect(m_autosaveTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(autoSave())); + connect(subjectList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(jumpToEntry(TQListViewItem*))); + connect(subjectList, TQ_SIGNAL(moved(TQListViewItem*, TQListViewItem*, TQListViewItem*)), + this, TQ_SLOT(slotItemMoved(TQListViewItem*, TQListViewItem*, TQListViewItem*))); + connect(subjectList, TQ_SIGNAL(expanded(TQListViewItem*)), + this, TQ_SLOT(slotExpandBook(TQListViewItem*))); + connect(subjectList, TQ_SIGNAL(collapsed(TQListViewItem*)), + this, TQ_SLOT(slotCollapseBook(TQListViewItem*))); + connect(subjectList, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + this, TQ_SLOT(showListviewContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); + connect(subjectList, TQ_SIGNAL(itemRenamed(TQListViewItem*,const TQString&,int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*,const TQString&,int))); + connect(roTextView, TQ_SIGNAL(urlClick(const TQString&)), + this, TQ_SLOT(linkClicked(const TQString&))); + connect(m_autosaveTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(autoSave())); } void KJotsMain::slotSetupInterface() @@ -399,7 +399,7 @@ void KJotsMain::configure() confPageMisc* cpMisc = new confPageMisc(0, "Autosave"); dialog->addPage(cpMisc, i18n("Autosave"), "misc"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateConfiguration())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateConfiguration())); dialog->show(); } diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp index 562947a..2b78698 100644 --- a/kjots/kjotsedit.cpp +++ b/kjots/kjotsedit.cpp @@ -45,7 +45,7 @@ KJotsEdit::KJotsEdit (TQWidget* parent, const char* name) setWordWrap(TQTextEdit::WidgetWidth); setLinkUnderline(true); web_menu = new TDEPopupMenu(this);; - web_menu->insertItem(i18n("Open URL"), this, TQT_SLOT(openUrl()) ); + web_menu->insertItem(i18n("Open URL"), this, TQ_SLOT(openUrl()) ); } KJotsEdit::~KJotsEdit() diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index e09b468..0a20072 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -541,8 +541,8 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding) m_saveProgressDialog->showCancelButton(false); m_saveProgressDialog->setAutoClose(true); - connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); - connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *))); + connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQ_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); + connect(job, TQ_SIGNAL(result( TDEIO::Job *)), TQ_SLOT(slotSaveResult( TDEIO::Job *))); m_saveInProgress = true; } @@ -939,8 +939,8 @@ void KJotsPage::saveToFile(KURL url, bool plainText, const TQString& encoding) return; } - connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); - connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *))); + connect(job, TQ_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQ_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); + connect(job, TQ_SIGNAL(result( TDEIO::Job *)), TQ_SLOT(slotSaveResult( TDEIO::Job *))); m_saveInProgress = true; } diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index 8bce86b..8ff1e43 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -86,27 +86,27 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableStandby ); TQToolTip::add( enableStandby, i18n( "If checked this box enables transitions to the 'standby' state - a temporary powered down state" ) ); enableStandby->setEnabled(can_enable); - connect( enableStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableSuspend = new TQCheckBox( i18n("Enable &suspend"), this ); top_layout->addWidget( enableSuspend ); TQToolTip::add( enableSuspend, i18n( "If checked this box enables transitions to the 'suspend' state - a semi-powered down state, sometimes called 'suspend-to-ram'" ) ); enableSuspend->setEnabled(can_enable); - connect( enableSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); TQHBoxLayout *ll = new TQHBoxLayout(); enableHibernate = new TQCheckBox( i18n("Enable &hibernate"), this ); ll->addWidget( enableHibernate ); TQToolTip::add( enableHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state - a powered down state, sometimes called 'suspend-to-disk'" ) ); enableHibernate->setEnabled(can_enable); - connect( enableHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (laptop_portable::has_software_suspend()) { ll->addStretch(1); enableSoftwareSuspendHibernate = new TQCheckBox( i18n("Use software suspend for hibernate"), this ); ll->addWidget( enableSoftwareSuspendHibernate ); TQToolTip::add( enableSoftwareSuspendHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state - a powered down state, sometimes called 'suspend-to-disk' - the kernel 'Software Suspend' mechanism will be used instead of using ACPI directly" ) ); enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2)); - connect( enableSoftwareSuspendHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); } else { enableSoftwareSuspendHibernate = 0; } @@ -118,13 +118,13 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( enablePerformance ); TQToolTip::add( enablePerformance, i18n( "If checked this box enables access to ACPI performance profiles - usually OK in 2.4 and later" ) ); enablePerformance->setEnabled(can_enable); - connect( enablePerformance, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enablePerformance, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableThrottle = new TQCheckBox( i18n("Enable &CPU throttling"), this ); top_layout->addWidget( enableThrottle ); TQToolTip::add( enableThrottle, i18n( "If checked this box enables access to ACPI throttle speed changes - usually OK in 2.4 and later" ) ); enableThrottle->setEnabled(can_enable); - connect( enableThrottle, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableThrottle, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); tmp_label = new TQLabel(i18n("If the above boxes are disabled then there is no 'helper' " "application set up to help change ACPI states, there are two " @@ -136,7 +136,7 @@ AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); ll = new TQHBoxLayout(); TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the ACPI helper application" ) ); ll->addStretch(2); ll->addWidget(setupButton); diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index e2940d2..e02c2f1 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -84,13 +84,13 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableStandby ); TQToolTip::add( enableStandby, i18n( "If checked this box enables transitions to the 'standby' state - a temporary powered down state" ) ); enableStandby->setEnabled(can_enable); - connect( enableStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableSuspend = new TQCheckBox( i18n("Enable &suspend"), this ); top_layout->addWidget( enableSuspend ); TQToolTip::add( enableSuspend, i18n( "If checked this box enables transitions to the 'suspend' state - a semi-powered down state, sometimes called 'suspend-to-ram'" ) ); enableSuspend->setEnabled(can_enable); - connect( enableSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); apm_name = "/usr/bin/apm"; if (::access(apm_name, F_OK) != 0 && ::access("/usr/sbin/apm", F_OK) == 0) apm_name = "/usr/sbin/apm"; @@ -105,7 +105,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); TQHBoxLayout *ll = new TQHBoxLayout(top_layout); TQPushButton *setupButton = new TQPushButton(i18n("Setup Helper Application"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the APM helper application" ) ); ll->addStretch(2); ll->addWidget(setupButton); @@ -120,7 +120,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( enableSoftwareSuspendHibernate ); TQToolTip::add( enableSoftwareSuspendHibernate, i18n( "If checked this box enables transitions to the 'hibernate' state using the 'Software Suspend' mechanism" ) ); enableSoftwareSuspendHibernate->setEnabled(laptop_portable::has_software_suspend(2)); - connect( enableSoftwareSuspendHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableSoftwareSuspendHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); tmp_label = new TQLabel( i18n("If the above box is disabled then you need to be logged in " "as root or need a helper application to invoke the Software " "Suspend utility - TDE provides a utility to do this, if you " @@ -130,7 +130,7 @@ ApmConfig::ApmConfig (TQWidget * parent, const char *name) top_layout->addWidget( tmp_label ); ll = new TQHBoxLayout(this); TQPushButton *setupSSButton = new TQPushButton(i18n("Setup SS Helper Application"), this); - connect( setupSSButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper2()) ); + connect( setupSSButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper2()) ); TQToolTip::add( setupSSButton, i18n( "This button can be used to enable the Software Suspend helper application" ) ); ll->addStretch(2); ll->addWidget(setupSSButton); diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index 9bf6be9..dcd03da 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -72,23 +72,23 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) runMonitor = new TQCheckBox( i18n("&Show battery monitor"), this ); top_layout->addWidget( runMonitor ); TQToolTip::add( runMonitor, i18n( "This box enables the battery state icon in the panel" ) ); - connect( runMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); - connect( runMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(runMonitorChanged()) ); + connect( runMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); + connect( runMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(runMonitorChanged()) ); // show also the battery level percentage showLevel = new TQCheckBox( i18n("Show battery level percentage"), this ); top_layout->addWidget( showLevel ); TQToolTip::add( showLevel, i18n( "This box enables a text message near the battery state icon containing battery level percentage" ) ); - connect( showLevel, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( showLevel, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); notifyMe = new TQCheckBox( i18n("&Notify me whenever my battery becomes fully charged"), this ); top_layout->addWidget( notifyMe ); TQToolTip::add( notifyMe, i18n( "This box enables a dialog box that pops up when your battery becomes fully charged" ) ); - connect( notifyMe, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( notifyMe, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); blankSaver = new TQCheckBox( i18n("&Use a blank screen saver when running on battery"), this ); top_layout->addWidget( blankSaver ); - connect( blankSaver, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( blankSaver, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (!apm) { top_layout->addWidget( laptop_portable::no_power_management_explanation(this) ); @@ -105,8 +105,8 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) TQToolTip::add( editPoll, i18n( "Choose how responsive the laptop software will be when it checks the battery status" ) ); editPoll->setSuffix( i18n("keep short, unit in spinbox", "sec") ); poll_label->setBuddy( editPoll ); - connect( editPoll, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(configChanged()) ); + connect( editPoll, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(configChanged()) ); TQWidget* spacer = new TQWidget( hb ); hb->setStretchFactor( spacer, 1 ); @@ -128,9 +128,9 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) buttonNoBattery->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); buttonNoCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); buttonCharge->setIconType( TDEIcon::NoGroup, TDEIcon::Any, 1); - connect(buttonNoBattery, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged())); - connect(buttonNoCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(iconChanged())); - connect(buttonCharge, TQT_SIGNAL(iconChanged(TQString)), this, TQT_SLOT(configChanged())); + connect(buttonNoBattery, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(iconChanged())); + connect(buttonNoCharge, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(iconChanged())); + connect(buttonCharge, TQ_SIGNAL(iconChanged(TQString)), this, TQ_SLOT(configChanged())); int num_batteries; @@ -178,7 +178,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) top_layout->addStretch(1); startMonitor = new TQPushButton( i18n("&Start Battery Monitor"), this); - connect(startMonitor, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartMonitor())); + connect(startMonitor, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartMonitor())); top_layout->addWidget( startMonitor, 0, TQt::AlignRight ); load(); diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index 5c453de..cc27f5f 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -155,7 +155,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) lidValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); lidValBrightness->setEnabled(0); TQToolTip::add( lidValBrightness, i18n( "How bright the back panel will be set to" ) ); - connect (lidValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (lidValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -170,7 +170,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( lidValPerformance, i18n( "The performance profile to switch to" ) ); lidValPerformance->insertStringList(performance_list); lidValPerformance->setEnabled(0); - connect (lidValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (lidValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValPerformance); xl->addStretch(1); } @@ -184,13 +184,13 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( lidValThrottle, i18n( "How much to throttle back the CPU" ) ); lidValThrottle->insertStringList(throttle_list); lidValThrottle->setEnabled(0); - connect (lidValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (lidValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(lidValThrottle); xl->addStretch(1); } - connect(lidBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); + connect(lidBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged())); } if (laptop_portable::has_button(laptop_portable::PowerButton)) { @@ -231,7 +231,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) powerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( powerValBrightness, i18n( "How bright the back panel will be set to" ) ); powerValBrightness->setEnabled(0); - connect (powerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (powerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -246,7 +246,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValPerformance, i18n( "The performance profile to switch to" ) ); powerValPerformance->insertStringList(performance_list); powerValPerformance->setEnabled(0); - connect (powerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (powerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValPerformance); xl->addStretch(1); } @@ -260,11 +260,11 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValThrottle, i18n( "How much to throttle back the CPU" ) ); powerValThrottle->insertStringList(throttle_list); powerValThrottle->setEnabled(0); - connect (powerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (powerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(powerValThrottle); xl->addStretch(1); } - connect(powerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(configChanged())); + connect(powerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(configChanged())); } hlay->addStretch(1); diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index affe7b4..e2a388a 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -80,16 +80,16 @@ laptop_dock::SetupPopup() TQStringList throttle_list; int current_throttle; bool has_throttle = laptop_portable::get_system_throttling(0, current_throttle, throttle_list, active_list); - rightPopup->insertItem(SmallIcon("configure"), i18n("&Configure KLaptop..."), this, TQT_SLOT(invokeSetup())); + rightPopup->insertItem(SmallIcon("configure"), i18n("&Configure KLaptop..."), this, TQ_SLOT(invokeSetup())); if (has_brightness) - rightPopup->insertItem(i18n("Screen Brightness..."), this, TQT_SLOT(invokeBrightness())); + rightPopup->insertItem(i18n("Screen Brightness..."), this, TQ_SLOT(invokeBrightness())); if (has_performance) { performance_popup = new TQPopupMenu(0, "performance"); performance_popup->setCheckable(1); rightPopup->insertItem(i18n("Performance Profile..."), performance_popup); - connect( performance_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( activate_performance( int ) ) ); - connect( performance_popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fill_performance() ) ); + connect( performance_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_performance( int ) ) ); + connect( performance_popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fill_performance() ) ); } else { performance_popup = 0; } @@ -97,24 +97,24 @@ laptop_dock::SetupPopup() throttle_popup = new TQPopupMenu(0, "throttle"); throttle_popup->setCheckable(1); rightPopup->insertItem(i18n("CPU Throttling..."), throttle_popup); - connect( throttle_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( activate_throttle( int ) ) ); - connect( throttle_popup, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fill_throttle() ) ); + connect( throttle_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( activate_throttle( int ) ) ); + connect( throttle_popup, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fill_throttle() ) ); } else { throttle_popup = 0; } if (can_standby || can_suspend || can_hibernate) { rightPopup->insertSeparator(); - if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, TQT_SLOT(invokeStandby())); - // if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, TQT_SLOT(invokeLockSuspend())); - if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, TQT_SLOT(invokeLockSuspend())); - // if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, TQT_SLOT(invokeLockHibernation())); - if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, TQT_SLOT(invokeLockHibernation())); + if (can_standby) rightPopup->insertItem(i18n("Standby..."), this, TQ_SLOT(invokeStandby())); + // if (can_suspend) rightPopup->insertItem(i18n("&Lock && Suspend..."), this, TQ_SLOT(invokeLockSuspend())); + if (can_suspend) rightPopup->insertItem(i18n("&Suspend..."), this, TQ_SLOT(invokeLockSuspend())); + // if (can_hibernate) rightPopup->insertItem(i18n("&Lock && Hibernate..."), this, TQ_SLOT(invokeLockHibernation())); + if (can_hibernate) rightPopup->insertItem(i18n("&Hibernate..."), this, TQ_SLOT(invokeLockHibernation())); } rightPopup->insertSeparator(); - rightPopup->insertItem(i18n("&Hide Monitor"), this, TQT_SLOT(slotHide())); - rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQT_SLOT(slotQuit())); + rightPopup->insertItem(i18n("&Hide Monitor"), this, TQ_SLOT(slotHide())); + rightPopup->insertItem(SmallIcon("system-log-out"), KStdGuiItem::quit().text(), this, TQ_SLOT(slotQuit())); } laptop_dock::~laptop_dock() @@ -201,7 +201,7 @@ laptop_dock::invokeBrightness() brightness_slider = new TQSlider(0, 255, 16, 255-brightness, TQt::Vertical, brightness_widget, 0); brightness_slider->setMinimumHeight(40); brightness_slider->setMinimumWidth(15); - connect(brightness_slider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(invokeBrightnessSlider(int))); + connect(brightness_slider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(invokeBrightnessSlider(int))); brightness_widget->resize(brightness_widget->sizeHint()); } else { brightness_slider->setValue(255-brightness); @@ -251,8 +251,8 @@ void laptop_dock::slotGoRoot(int /*id*/) { *_rootProcess << "root"; //*_rootProcess << "--nonewdcop"; *_rootProcess << TDEStandardDirs::findExe("klaptopdaemon"); - connect(_rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), - this, TQT_SLOT(rootExited(TDEProcess*))); + connect(_rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), + this, TQ_SLOT(rootExited(TDEProcess*))); _rootProcess->start(TDEProcess::NotifyOnExit); // We should disable this menu item here now. } @@ -419,30 +419,30 @@ void laptop_dock::mousePressEvent( TQMouseEvent *event ) _suspendActions.clear(); _resumeActions.clear(); _displayActions.clear(); - id = popup->insertItem(i18n("Card Slots..."), this, TQT_SLOT(slotDisplayAction(int))); + id = popup->insertItem(i18n("Card Slots..."), this, TQ_SLOT(slotDisplayAction(int))); _displayActions.insert(id, _pcmcia->getCard(0)); for (int i = 0; i < _pcmcia->getCardCount(); i++) { KPCMCIACard *thiscard; thiscard = _pcmcia->getCard(i); if (thiscard && (thiscard->present())) { TQPopupMenu *thisSub = new TQPopupMenu(popup, thiscard->name().latin1()); - id = thisSub->insertItem(i18n("Details..."), this, TQT_SLOT(slotDisplayAction(int))); + id = thisSub->insertItem(i18n("Details..."), this, TQ_SLOT(slotDisplayAction(int))); _displayActions.insert(id, thiscard); // add the actions TQPopupMenu *actionsSub = new TQPopupMenu(thisSub, "actions"); - id = actionsSub->insertItem(i18n("Eject"), this, TQT_SLOT(slotEjectAction(int))); + id = actionsSub->insertItem(i18n("Eject"), this, TQ_SLOT(slotEjectAction(int))); actionsSub->setItemEnabled(id, !(thiscard->status() & CARD_STATUS_BUSY)); _ejectActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Suspend"), this, TQT_SLOT(slotSuspendAction(int))); + id = actionsSub->insertItem(i18n("Suspend"), this, TQ_SLOT(slotSuspendAction(int))); actionsSub->setItemEnabled(id, !(thiscard->status() & (CARD_STATUS_SUSPEND|CARD_STATUS_BUSY))); _suspendActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Resume"), this, TQT_SLOT(slotResumeAction(int))); + id = actionsSub->insertItem(i18n("Resume"), this, TQ_SLOT(slotResumeAction(int))); actionsSub->setItemEnabled(id, (thiscard->status() & CARD_STATUS_SUSPEND)); _resumeActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Reset"), this, TQT_SLOT(slotResetAction(int))); + id = actionsSub->insertItem(i18n("Reset"), this, TQ_SLOT(slotResetAction(int))); _resetActions.insert(id, thiscard); - id = actionsSub->insertItem(i18n("Insert"), this, TQT_SLOT(slotInsertAction(int))); + id = actionsSub->insertItem(i18n("Insert"), this, TQ_SLOT(slotInsertAction(int))); _insertActions.insert(id, thiscard); actionsSub->setItemEnabled(id, !(thiscard->status() & (CARD_STATUS_READY|CARD_STATUS_SUSPEND))); thisSub->insertItem(i18n("Actions"), actionsSub); diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp index 941f739..1311997 100644 --- a/klaptopdaemon/kpcmcia.cpp +++ b/klaptopdaemon/kpcmcia.cpp @@ -367,7 +367,7 @@ _refreshSpeed = 750; _haveCardServices = false; _timer = new TQTimer(this); -connect(_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateCardInfo())); +connect(_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateCardInfo())); _cards = new TQMemArray<KPCMCIACard *>(_maxSlots+1); _cardCnt = 0; diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp index e2e70d5..738b1e3 100644 --- a/klaptopdaemon/kpcmciainfo.cpp +++ b/klaptopdaemon/kpcmciainfo.cpp @@ -60,7 +60,7 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name) _mainTab->resize(KDialog::sizeHint()); resize(KDialog::sizeHint()); - connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updateCard(int))); + connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updateCard(int))); _sb = new KStatusBar(this); _sb->insertItem(i18n("Ready."), 0, 1, true); @@ -70,10 +70,10 @@ KPCMCIAInfo::KPCMCIAInfo(KPCMCIA *pcmcia, TQWidget *parent, const char *name) _updateButton = new TQPushButton(i18n("&Update"), this); _mainGrid->addWidget(_updateButton, 7, 3); - connect(_updateButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(update())); + connect(_updateButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(update())); _closeButton = new KPushButton(KStdGuiItem::close(), this); _mainGrid->addWidget(_closeButton, 7, 4); - connect(_closeButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClose())); + connect(_closeButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClose())); _mainGrid->setRowStretch(7, 0); show(); @@ -99,7 +99,7 @@ void KPCMCIAInfo::slotResetStatus() { void KPCMCIAInfo::statusNotice(const TQString& text, int life) { _sb->changeItem(text, 0); if (life > 0) - TQTimer::singleShot(life, this, TQT_SLOT(slotResetStatus())); + TQTimer::singleShot(life, this, TQ_SLOT(slotResetStatus())); } @@ -133,8 +133,8 @@ void KPCMCIAInfo::prepareCards() { for (int i = 0; i < _pcmcia->getCardCount(); i++) { TQString tabname = i18n("Card Slot %1"); KPCMCIAInfoPage *tp = new KPCMCIAInfoPage(_pcmcia->getCard(i), _mainTab); - connect(this, TQT_SIGNAL(updateNow()), tp, TQT_SLOT(update())); - connect(tp, TQT_SIGNAL(setStatusBar(const TQString&)), this, TQT_SLOT(slotTabSetStatus(const TQString&))); + connect(this, TQ_SIGNAL(updateNow()), tp, TQ_SLOT(update())); + connect(tp, TQ_SIGNAL(setStatusBar(const TQString&)), this, TQ_SLOT(slotTabSetStatus(const TQString&))); tp->resize(_mainTab->sizeHint()); _mainTab->addTab(tp, tabname.arg(i+1)); _pages.insert(i, tp); @@ -182,9 +182,9 @@ KPCMCIAInfoPage::KPCMCIAInfoPage(KPCMCIACard *card, TQWidget *parent, const char _mainGrid->addWidget(_card_ej_ins, 9, 5); _mainGrid->addWidget(_card_sus_res, 9, 6); _mainGrid->addWidget(_card_reset, 9, 7); - connect(_card_reset, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotResetCard())); - connect(_card_sus_res, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSuspendResume())); - connect(_card_ej_ins, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotInsertEject())); + connect(_card_reset, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotResetCard())); + connect(_card_sus_res, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSuspendResume())); + connect(_card_ej_ins, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotInsertEject())); update(); } diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 97e70ba..4a7545d 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -100,7 +100,7 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) sony_notifier = 0; knownFullyCharged = 0; sony_disp = 0; - connect(this, TQT_SIGNAL(signal_checkBattery()), TQT_SLOT(checkBatteryNow())); + connect(this, TQ_SIGNAL(signal_checkBattery()), TQ_SLOT(checkBatteryNow())); //hasAudio = (audioServer.serverStatus() == 0) ? true : false; @@ -113,8 +113,8 @@ laptop_daemon::laptop_daemon(const TQCString& obj): KDEDModule(obj) else _pcmcia = NULL; if (_pcmcia) - connect(_pcmcia, TQT_SIGNAL(cardUpdated(int)), this, TQT_SLOT(updatePCMCIA(int))); - connect( &autoLock, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect(_pcmcia, TQ_SIGNAL(cardUpdated(int)), this, TQ_SLOT(updatePCMCIA(int))); + connect( &autoLock, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); } @@ -297,8 +297,8 @@ void laptop_daemon::restart() if (sony_notifier == 0) { sony_notifier = new TQSocketNotifier( sony_fd, TQSocketNotifier::Read, this ); if (sony_notifier) - TQObject::connect( sony_notifier, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(sonyDataReceived()) ); + TQObject::connect( sony_notifier, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(sonyDataReceived()) ); } } else { if (sony_notifier) { @@ -388,13 +388,13 @@ void laptop_daemon::timerDone() wakepos.setY(TQCursor::pos().y()); if (!wake_timer) { wake_timer = new TQTimer(this); - connect(wake_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(WakeCheck())); + connect(wake_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(WakeCheck())); wake_timer->start(1*1000, 1); } } else { if (!backoffTimer) { backoffTimer = new TQTimer(this); - connect(backoffTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(BackoffRestart())); + connect(backoffTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(BackoffRestart())); backoffTimer->start(60*1000, 1); } } diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 5068a4e..258f833 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -153,19 +153,19 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) battery = new BatteryConfig(parent, "kcmlaptop"); tab->addTab(battery, i18n("&Battery")); - connect(battery, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(battery, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); power = new PowerConfig(parent, "kcmlaptop"); tab->addTab(power, i18n("&Power Control")); - connect(power, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(power, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); warning = new WarningConfig(0, parent, "kcmlaptop"); tab->addTab(warning, i18n("Low Battery &Warning")); - connect(warning, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(warning, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); critical = new WarningConfig(1, parent, "kcmlaptop"); tab->addTab(critical, i18n("Low Battery &Critical")); - connect(critical, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(critical, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); TQStringList profile_list; int current_profile; @@ -177,28 +177,28 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) if (laptop_portable::has_brightness() || has_profile || has_throttling) { profile = new ProfileConfig(parent, "kcmlaptop"); tab->addTab(profile, i18n("Default Power Profiles")); - connect(profile, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(profile, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { profile = 0; } if (laptop_portable::has_button(laptop_portable::LidButton) || laptop_portable::has_button(laptop_portable::PowerButton)) { buttons = new ButtonsConfig(parent, "kcmlaptop"); tab->addTab(buttons, i18n("Button Actions")); - connect(buttons, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(buttons, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { buttons = 0; } if (laptop_portable::has_acpi()) { acpi = new AcpiConfig(parent, "kcmlaptop"); tab->addTab(acpi, i18n("&ACPI Config")); - connect(acpi, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(acpi, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { acpi = 0; } if (laptop_portable::has_apm()) { apm = new ApmConfig(parent, "kcmlaptop"); tab->addTab(apm, i18n("&APM Config")); - connect(apm, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(apm, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { apm = 0; } @@ -215,7 +215,7 @@ LaptopModule::LaptopModule(TQWidget *parent, const char *) if (do_sony) { sony = new SonyConfig(parent, "kcmlaptop"); tab->addTab(sony, i18n("&Sony Laptop Config")); - connect(sony, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); + connect(sony, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(moduleChanged(bool))); } else { sony = 0; } diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index 89c25dc..cf132c9 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -148,8 +148,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) nopowerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( nopowerValBrightness, i18n( "How bright to change the back panel" ) ); nopowerValBrightness->setEnabled(0); - connect(nopowerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(nopowerBrightness, TQT_SIGNAL(toggled(bool)), nopowerValBrightness, TQT_SLOT(setEnabled(bool))); + connect(nopowerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(nopowerBrightness, TQ_SIGNAL(toggled(bool)), nopowerValBrightness, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -164,8 +164,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( nopowerValPerformance, i18n( "Which profile to change it to" ) ); nopowerValPerformance->insertStringList(performance_list); nopowerValPerformance->setEnabled(0); - connect(nopowerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(nopowerPerformance, TQT_SIGNAL(toggled(bool)), nopowerValPerformance, TQT_SLOT(setEnabled(bool))); + connect(nopowerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(nopowerPerformance, TQ_SIGNAL(toggled(bool)), nopowerValPerformance, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValPerformance); xl->addStretch(1); } @@ -179,25 +179,25 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( nopowerValThrottle, i18n( "How much to throttle the laptop's CPU" ) ); nopowerValThrottle->insertStringList(throttle_list); nopowerValThrottle->setEnabled(0); - connect(nopowerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(nopowerThrottle, TQT_SIGNAL(toggled(bool)), nopowerValThrottle, TQT_SLOT(setEnabled(bool))); + connect(nopowerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(nopowerThrottle, TQ_SIGNAL(toggled(bool)), nopowerValThrottle, TQ_SLOT(setEnabled(bool))); xl->addWidget(nopowerValThrottle); xl->addStretch(1); } - connect(nopowerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); + connect(nopowerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); bool can_lav = laptop_portable::has_lav(); TQHBox *hbox; if (can_lav) { hbox = new TQHBox( nopowerBox ); noenablelav = new TQCheckBox(i18n("Don't act if LAV is >"), hbox); - connect(noenablelav, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect(noenablelav, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); noeditlav = new KDoubleSpinBox(0.0, 10.0, 0.0, 0.1, 1, hbox); TQToolTip::add( noeditlav, i18n( "If enabled and the system load average is greater than this value none of the above options will be applied" ) ); - connect(noeditlav, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); - connect(noenablelav, TQT_SIGNAL(toggled(bool)), noeditlav, TQT_SLOT(setEnabled(bool))); + connect(noeditlav, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed())); + connect(noenablelav, TQ_SIGNAL(toggled(bool)), noeditlav, TQ_SLOT(setEnabled(bool))); } hbox = new TQHBox( nopowerBox ); @@ -207,7 +207,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) noeditwait->setSuffix( i18n("keep short, unit in spinbox", "min") ); noedlabel->setBuddy( noeditwait ); hbox->setStretchFactor( noeditwait, 1 ); - connect( noeditwait, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( noeditwait, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); /////////////////////////////////////////////////////////////// @@ -241,8 +241,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) powerValBrightness = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); TQToolTip::add( powerValBrightness, i18n( "How bright to change the back panel" ) ); powerValBrightness->setEnabled(0); - connect(powerValBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); - connect(powerBrightness, TQT_SIGNAL(toggled(bool)), powerValBrightness, TQT_SLOT(setEnabled(bool))); + connect(powerValBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); + connect(powerBrightness, TQ_SIGNAL(toggled(bool)), powerValBrightness, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValBrightness); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -257,8 +257,8 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValPerformance, i18n( "Which profile to change it to" ) ); powerValPerformance->insertStringList(performance_list); powerValPerformance->setEnabled(0); - connect(powerValPerformance, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(powerPerformance, TQT_SIGNAL(toggled(bool)), powerValPerformance, TQT_SLOT(setEnabled(bool))); + connect(powerValPerformance, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(powerPerformance, TQ_SIGNAL(toggled(bool)), powerValPerformance, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValPerformance); xl->addStretch(1); } @@ -272,22 +272,22 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TQToolTip::add( powerValThrottle, i18n( "How much to throttle the laptop's CPU" ) ); powerValThrottle->insertStringList(throttle_list); powerValThrottle->setEnabled(0); - connect(powerValThrottle, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changed())); - connect(powerThrottle, TQT_SIGNAL(toggled(bool)), powerValThrottle, TQT_SLOT(setEnabled(bool))); + connect(powerValThrottle, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changed())); + connect(powerThrottle, TQ_SIGNAL(toggled(bool)), powerValThrottle, TQ_SLOT(setEnabled(bool))); xl->addWidget(powerValThrottle); xl->addStretch(1); } - connect(powerBox, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(changed())); + connect(powerBox, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(changed())); if (can_lav) { hbox = new TQHBox( powerBox ); enablelav = new TQCheckBox(i18n("Don't act if LAV is >"), hbox); - connect( enablelav, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed())); + connect( enablelav, TQ_SIGNAL(clicked()), this, TQ_SLOT(changed())); editlav = new KDoubleSpinBox(0.0, 10.0, 0.0, 0.1, 1, hbox); TQToolTip::add( editlav, i18n( "If enabled and the system load average is greater than this value none of the above options will be applied" ) ); - connect( editlav, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(changed())); - connect( enablelav, TQT_SIGNAL(toggled(bool)), editlav, TQT_SLOT(setEnabled(bool)) ); + connect( editlav, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(changed())); + connect( enablelav, TQ_SIGNAL(toggled(bool)), editlav, TQ_SLOT(setEnabled(bool)) ); } hbox = new TQHBox( powerBox ); @@ -297,7 +297,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) editwait->setSuffix( i18n("keep short, unit in spinbox", "min") ); edlabel->setBuddy( editwait ); hbox->setStretchFactor( editwait, 1 ); - connect( editwait, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed())); + connect( editwait, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changed())); hlay->addStretch(1); diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index 492b136..24f6228 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -81,13 +81,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) poff = new TQCheckBox(i18n("Back panel brightness"), wp); TQToolTip::add( poff, i18n( "Enables the changing of the back panel brightness" ) ); xl->addWidget(poff); - connect (poff, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(poff_changed(bool))); + connect (poff, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(poff_changed(bool))); xl->addWidget(new TQLabel("-", wp)); soff = new TQSlider(0, 255, 16, 160, TQt::Horizontal, wp); soff->setEnabled(0); TQToolTip::add( soff, i18n( "How bright it should be when it is changed" ) ); - connect (soff, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (soff, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(soff); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -102,13 +102,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) performance_off = new TQCheckBox(i18n("System performance"), wp); TQToolTip::add( performance_off, i18n( "Enables the changing of the system performance profile" ) ); xl->addWidget(performance_off); - connect (performance_off, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_off_changed(bool))); + connect (performance_off, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_off_changed(bool))); performance_val_off = new KComboBox(0, wp); TQToolTip::add( performance_val_off, i18n( "The new system performance profile to change to" ) ); performance_val_off->insertStringList(performance_list); performance_val_off->setEnabled(0); - connect (performance_val_off, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val_off, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(performance_val_off); xl->addStretch(1); } else { @@ -121,13 +121,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) throttle_off = new TQCheckBox(i18n("CPU throttling"), wp); TQToolTip::add( throttle_off, i18n( "Enables the throttling of the CPU performance" ) ); xl->addWidget(throttle_off); - connect (throttle_off, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_off_changed(bool))); + connect (throttle_off, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_off_changed(bool))); throttle_val_off = new KComboBox(0, wp); throttle_val_off->insertStringList(throttle_list); throttle_val_off->setEnabled(0); TQToolTip::add( throttle_val_off, i18n( "How much to throttle the CPU by" ) ); - connect (throttle_val_off, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val_off, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(throttle_val_off); xl->addStretch(1); } else { @@ -145,13 +145,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) pon = new TQCheckBox(i18n("Back panel brightness"), wp); TQToolTip::add( pon, i18n( "Enables the changing of the back panel brightness" ) ); xl->addWidget(pon); - connect (pon, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(pon_changed(bool))); + connect (pon, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(pon_changed(bool))); xl->addWidget(new TQLabel("-", wp)); son = new TQSlider(0, 255, 16, 255, TQt::Horizontal, wp); son->setEnabled(0); TQToolTip::add( son, i18n( "How bright it should be when it is changed" ) ); - connect (son, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect (son, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); xl->addWidget(son); xl->addWidget(new TQLabel("+", wp)); xl->addStretch(1); @@ -165,13 +165,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) performance_on = new TQCheckBox(i18n("System performance"), wp); TQToolTip::add( performance_on, i18n( "Enables the changing of the system performance profile" ) ); xl->addWidget(performance_on); - connect (performance_on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_on_changed(bool))); + connect (performance_on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_on_changed(bool))); performance_val_on = new KComboBox(0, wp); performance_val_on->insertStringList(performance_list); performance_val_on->setEnabled(0); TQToolTip::add( performance_val_on, i18n( "The new system performance profile to change to" ) ); - connect (performance_val_on, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val_on, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(performance_val_on); xl->addStretch(1); } else { @@ -184,13 +184,13 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) throttle_on = new TQCheckBox(i18n("CPU throttle"), wp); TQToolTip::add( throttle_on, i18n( "Enables the throttling of the CPU performance" ) ); xl->addWidget(throttle_on); - connect (throttle_on, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_on_changed(bool))); + connect (throttle_on, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_on_changed(bool))); throttle_val_on = new KComboBox(0, wp); throttle_val_on->insertStringList(throttle_list); throttle_val_on->setEnabled(0); TQToolTip::add( throttle_val_on, i18n( "How much to throttle the CPU by" ) ); - connect (throttle_val_on, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val_on, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); xl->addWidget(throttle_val_on); xl->addStretch(1); } else { diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index 02b941a..b252876 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -73,12 +73,12 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name) enableScrollBar = new TQCheckBox( i18n("Enable &scroll bar"), this ); TQToolTip::add( enableScrollBar, i18n( "When checked this box enables the scrollbar so that it works under TDE" ) ); top_layout->addWidget( enableScrollBar ); - connect( enableScrollBar, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableScrollBar, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); enableMiddleEmulation = new TQCheckBox( i18n("&Emulate middle mouse button with scroll bar press"), this ); TQToolTip::add( enableMiddleEmulation, i18n( "When checked this box enables pressing the scroll bar to act in the same way as pressing the middle button on a 3 button mouse" ) ); top_layout->addWidget( enableMiddleEmulation ); - connect( enableMiddleEmulation, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()) ); + connect( enableMiddleEmulation, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged()) ); if (::access("/dev/sonypi", R_OK) != 0) { enableMiddleEmulation->setEnabled(0); @@ -89,7 +89,7 @@ SonyConfig::SonyConfig(TQWidget * parent, const char *name) "protections need to be changed. Clicking on the button below will change them\n").replace("\n", " "), this)); TQHBoxLayout *ll = new TQHBoxLayout(); TQPushButton *setupButton = new TQPushButton(i18n("Setup /dev/sonypi"), this); - connect( setupButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(setupHelper()) ); + connect( setupButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(setupHelper()) ); TQToolTip::add( setupButton, i18n( "This button can be used to enable the sony specific features" ) ); ll->addStretch(2); ll->addWidget(setupButton); diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index bc129a4..ab3edc1 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -88,12 +88,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) grid->addWidget(checkCriticalPercent, curRow, 0); grid->addWidget(editCriticalPercent, curRow++, TQt::AlignLeft); - connect(editCriticalTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(editCriticalPercent, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(checkCriticalTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkCriticalPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkCriticalTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkCriticalTimeChanged(bool))); - connect(checkCriticalPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkCriticalPercentChanged(bool))); + connect(editCriticalTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(editCriticalPercent, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(checkCriticalTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkCriticalPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkCriticalTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkCriticalTimeChanged(bool))); + connect(checkCriticalPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkCriticalPercentChanged(bool))); } else { checkLowTime = new TQCheckBox( i18n("Low &trigger:"), this ); checkLowPercent = new TQCheckBox( i18n("Low &trigger:"), this ); @@ -108,12 +108,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) grid->addWidget(checkLowPercent, curRow, 0); grid->addWidget(editLowPercent, curRow++, TQt::AlignLeft); - connect(editLowTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(editLowPercent, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(checkLowTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkLowPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(configChanged())); - connect(checkLowTime, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkLowTimeChanged(bool))); - connect(checkLowPercent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(checkLowPercentChanged(bool))); + connect(editLowTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(editLowPercent, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(checkLowTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkLowPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(configChanged())); + connect(checkLowTime, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkLowTimeChanged(bool))); + connect(checkLowPercent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(checkLowPercentChanged(bool))); } @@ -123,12 +123,12 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) editRunCommand = new KURLRequester( this ); editRunCommand->setEnabled(false); - connect( checkRunCommand, TQT_SIGNAL(toggled(bool)), - editRunCommand, TQT_SLOT(setEnabled(bool)) ); - connect( checkRunCommand, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged()) ); - connect( editRunCommand, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); + connect( checkRunCommand, TQ_SIGNAL(toggled(bool)), + editRunCommand, TQ_SLOT(setEnabled(bool)) ); + connect( checkRunCommand, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged()) ); + connect( editRunCommand, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); grid->addWidget(editRunCommand, curRow++, 1); TQToolTip::add( editRunCommand, i18n( "This command will be run when the battery gets low" ) ); @@ -138,24 +138,24 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) editPlaySound = new KURLRequester( this ); editPlaySound->setEnabled(false); - connect( checkPlaySound, TQT_SIGNAL(toggled(bool)), - editPlaySound, TQT_SLOT(setEnabled(bool)) ); - connect( checkPlaySound, TQT_SIGNAL(clicked()), - this, TQT_SLOT(configChanged()) ); - connect( editPlaySound, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(configChanged()) ); + connect( checkPlaySound, TQ_SIGNAL(toggled(bool)), + editPlaySound, TQ_SLOT(setEnabled(bool)) ); + connect( checkPlaySound, TQ_SIGNAL(clicked()), + this, TQ_SLOT(configChanged()) ); + connect( editPlaySound, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(configChanged()) ); grid->addWidget(editPlaySound, curRow++, 1); TQToolTip::add( editPlaySound, i18n( "This sound will play when the battery gets low" ) ); // setup the System Sound stuff checkBeep = new TQCheckBox(i18n("System &beep"), this); grid->addWidget(checkBeep, curRow++, 0); - connect(checkBeep, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkBeep, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); TQToolTip::add( checkBeep, i18n( "The system will beep if this is enabled" ) ); checkNotify = new TQCheckBox(i18n("&Notify"), this); grid->addWidget(checkNotify, curRow++, 0); - connect(checkNotify, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkNotify, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); int can_suspend = laptop_portable::has_suspend(); int can_standby = laptop_portable::has_standby(); @@ -167,7 +167,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) checkBrightness->setMinimumSize(checkBrightness->sizeHint()); TQToolTip::add( checkBrightness, i18n( "If enabled the back panel brightness will change" ) ); grid->addWidget(checkBrightness, curRow, 0); - connect(checkBrightness, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(brightness_changed(bool))); + connect(checkBrightness, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(brightness_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); v->addWidget(new TQLabel("-", this)); valueBrightness = new TQSlider(0, 255, 16, 160, TQt::Horizontal, this); @@ -178,7 +178,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) v->addStretch(1); grid->addLayout(v, curRow, 1); valueBrightness->setEnabled(0); - connect(valueBrightness, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); + connect(valueBrightness, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); ++curRow; } else { checkBrightness = 0; @@ -192,13 +192,13 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) performance = new TQCheckBox(i18n("System performance"), this); TQToolTip::add( performance, i18n( "If enabled the laptop's power performance profile will change" ) ); grid->addWidget(performance, curRow, 0); - connect (performance, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(performance_changed(bool))); + connect (performance, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(performance_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); performance_val = new KComboBox(0, this); performance_val->insertStringList(performance_list); performance_val->setEnabled(0); - connect (performance_val, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (performance_val, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); TQToolTip::add( performance_val, i18n( "The performance profile to change to" ) ); v->addWidget(performance_val); v->addStretch(1); @@ -215,13 +215,13 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) throttle = new TQCheckBox(i18n("CPU throttling"), this); TQToolTip::add( throttle, i18n( "If enabled the CPU performance will be throttled" ) ); grid->addWidget(throttle, curRow, 0); - connect (throttle, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(throttle_changed(bool))); + connect (throttle, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(throttle_changed(bool))); TQHBoxLayout *v = new TQHBoxLayout(); throttle_val = new KComboBox(0, this); throttle_val->insertStringList(throttle_list); throttle_val->setEnabled(0); - connect (throttle_val, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); + connect (throttle_val, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); TQToolTip::add( throttle_val, i18n( "How much to throttle the CPU performance by" ) ); v->addWidget(throttle_val); v->addStretch(1); @@ -241,30 +241,30 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) checkStandby = new TQRadioButton(i18n("Standb&y"), b); TQToolTip::add( checkStandby, i18n( "Move the system into the standby state - a temporary lower power state" ) ); checkStandby->setMinimumSize(checkStandby->sizeHint()); - connect(checkStandby, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkStandby, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } if (can_suspend) { checkSuspend = new TQRadioButton(i18n("&Suspend"), b); TQToolTip::add( checkSuspend, i18n( "Move the system into the suspend state - also known as 'save-to-ram'" ) ); checkSuspend->setMinimumSize(checkSuspend->sizeHint()); - connect(checkSuspend, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkSuspend, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } if (can_hibernate) { checkHibernate = new TQRadioButton(i18n("H&ibernate"), b); TQToolTip::add( checkHibernate, i18n( "Move the system into the hibernate state - also known as 'save-to-disk'" ) ); checkHibernate->setMinimumSize(checkHibernate->sizeHint()); - connect(checkHibernate, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkHibernate, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); } // setup the logout option checkLogout = new TQRadioButton(i18n("&Logout"), b); - connect(checkLogout, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkLogout, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); // setup the shutdown option checkShutdown = new TQRadioButton(i18n("System power off"), b); TQToolTip::add( checkShutdown, i18n( "Power the laptop off" ) ); - connect(checkShutdown, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkShutdown, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); checkNone = new TQRadioButton(i18n("&None"), b); - connect(checkNone, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); + connect(checkNone, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); grid->addMultiCellWidget(b, curRow, curRow, 0, 1, TQt::AlignLeft|TQt::AlignTop); curRow++; diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index b1f00c1..b46425c 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -52,27 +52,27 @@ struct ShortcutInfo static const ShortcutInfo shortcuts[] = { - { "Search", TDEShortcut("XF86Search"), TQT_SLOT(launchSearch()) }, - { "Home Folder", TDEShortcut("XF86MyComputer"), TQT_SLOT(launchHomeFolder()) }, - { "Mail", TDEShortcut("XF86Mail"), TQT_SLOT(launchMail()) }, - { "Audio Media", TDEShortcut("XF86AudioMedia"), TQT_SLOT(launchMusic()) }, - { "Music", TDEShortcut("XF86Music"), TQT_SLOT(launchMusic()) }, - { "Browser", TDEShortcut("XF86WWW"), TQT_SLOT(launchBrowser()) }, - { "Calculator", TDEShortcut("XF86Calculator"), TQT_SLOT(launchCalculator()) }, - { "Terminal", TDEShortcut("XF86Terminal"), TQT_SLOT(launchTerminal()) }, - { "Eject", TDEShortcut("XF86Eject"), TQT_SLOT(eject()) }, - { "Help", TDEShortcut("XF86Launch0"), TQT_SLOT(launchHelp()) }, - { "Light Bulb", TDEShortcut("XF86LightBulb"), TQT_SLOT(lightBulb()) }, - { "Battery", TDEShortcut("XF86LaunchB"), TQT_SLOT(pmBattery()) }, - { "FastVolumeUp", TQt::Key_VolumeUp, TQT_SLOT(fastVolumeUp()) }, - { "FastVolumeDown", TQt::Key_VolumeDown, TQT_SLOT(fastVolumeDown()) }, - { "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQT_SLOT(slowVolumeUp()) }, - { "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQT_SLOT(slowVolumeDown()) }, - { "Mute", TDEShortcut("XF86AudioMute"), TQT_SLOT(toggleMute()) }, - { "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQT_SLOT(brightnessUp()) }, - { "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQT_SLOT(brightnessDown()) }, - { "BrightnessSlowUp", TDEShortcut("Ctrl+XF86MonBrightnessUp"), TQT_SLOT(brightnessSlowUp()) }, - { "BrightnessSlowDown", TDEShortcut("Ctrl+XF86MonBrightnessDown"), TQT_SLOT(brightnessSlowDown()) } + { "Search", TDEShortcut("XF86Search"), TQ_SLOT(launchSearch()) }, + { "Home Folder", TDEShortcut("XF86MyComputer"), TQ_SLOT(launchHomeFolder()) }, + { "Mail", TDEShortcut("XF86Mail"), TQ_SLOT(launchMail()) }, + { "Audio Media", TDEShortcut("XF86AudioMedia"), TQ_SLOT(launchMusic()) }, + { "Music", TDEShortcut("XF86Music"), TQ_SLOT(launchMusic()) }, + { "Browser", TDEShortcut("XF86WWW"), TQ_SLOT(launchBrowser()) }, + { "Calculator", TDEShortcut("XF86Calculator"), TQ_SLOT(launchCalculator()) }, + { "Terminal", TDEShortcut("XF86Terminal"), TQ_SLOT(launchTerminal()) }, + { "Eject", TDEShortcut("XF86Eject"), TQ_SLOT(eject()) }, + { "Help", TDEShortcut("XF86Launch0"), TQ_SLOT(launchHelp()) }, + { "Light Bulb", TDEShortcut("XF86LightBulb"), TQ_SLOT(lightBulb()) }, + { "Battery", TDEShortcut("XF86LaunchB"), TQ_SLOT(pmBattery()) }, + { "FastVolumeUp", TQt::Key_VolumeUp, TQ_SLOT(fastVolumeUp()) }, + { "FastVolumeDown", TQt::Key_VolumeDown, TQ_SLOT(fastVolumeDown()) }, + { "SlowVolumeUp", TQt::CTRL+TQt::Key_VolumeUp, TQ_SLOT(slowVolumeUp()) }, + { "SlowVolumeDown", TQt::CTRL+TQt::Key_VolumeDown, TQ_SLOT(slowVolumeDown()) }, + { "Mute", TDEShortcut("XF86AudioMute"), TQ_SLOT(toggleMute()) }, + { "BrightnessUp", TDEShortcut("XF86MonBrightnessUp"), TQ_SLOT(brightnessUp()) }, + { "BrightnessDown", TDEShortcut("XF86MonBrightnessDown"), TQ_SLOT(brightnessDown()) }, + { "BrightnessSlowUp", TDEShortcut("Ctrl+XF86MonBrightnessUp"), TQ_SLOT(brightnessSlowUp()) }, + { "BrightnessSlowDown", TDEShortcut("Ctrl+XF86MonBrightnessDown"), TQ_SLOT(brightnessSlowDown()) } }; GenericMonitor::GenericMonitor(TQObject *parent, const char *name, const TQStringList& args) @@ -289,7 +289,7 @@ void GenericMonitor::brightnessChange(int direction, int step) { tdepowersave->call("do_brightnessDown", step); } - TQTimer::singleShot(250, this, TQT_SLOT(brightnessValueUpdate())); + TQTimer::singleShot(250, this, TQ_SLOT(brightnessValueUpdate())); } void GenericMonitor::brightnessValueUpdate() diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index d6e7f11..ea24905 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -82,10 +82,10 @@ KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList // mKVaioGeneral->frameMain->setEnabled (true); } - connect(mKVaioGeneral, TQT_SIGNAL(changed()), - TQT_SLOT(changed())); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); - connect(mDriver, TQT_SIGNAL (vaioEvent(int)), TQT_SLOT (vaioEvent(int) ) ); + connect(mKVaioGeneral, TQ_SIGNAL(changed()), + TQ_SLOT(changed())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); + connect(mDriver, TQ_SIGNAL (vaioEvent(int)), TQ_SLOT (vaioEvent(int) ) ); } void KVaioModule::save() diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 63f50da..004f15e 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -69,8 +69,8 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name) kdDebug() << "KVaio: Cannot connect to driver." << endl; } else { kdDebug() << "KVaio: Connected to SonyPI driver." << endl; - connect(mDriver, TQT_SIGNAL(vaioEvent(int)), TQT_SLOT(slotVaioEvent(int))); - connect (mTimer, TQT_SIGNAL (timeout ()), TQT_SLOT (slotTimeout() ) ); + connect(mDriver, TQ_SIGNAL(vaioEvent(int)), TQ_SLOT(slotVaioEvent(int))); + connect (mTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (slotTimeout() ) ); mTimer->start (10000, true); } diff --git a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp index eb8c5e4..e8e8541 100644 --- a/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp +++ b/kmilo/kmilo_kvaio/kvaiodriverinterface.cpp @@ -97,7 +97,7 @@ bool KVaioDriverInterface::connectToDriver(bool listen) if(listen) { mNotifier = new TQSocketNotifier(mFd, TQSocketNotifier::Read, this); - connect(mNotifier, TQT_SIGNAL(activated(int)), TQT_SLOT(socketActivated(int))); + connect(mNotifier, TQ_SIGNAL(activated(int)), TQ_SLOT(socketActivated(int))); } return true; } diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index bcf6a9f..156f2ac 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -38,7 +38,7 @@ DefaultSkin::DefaultSkin() { - connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); _widget = new DefaultWidget(0, "Screen Indicator", TQt::WX11BypassWM); _widget->setFocusPolicy(TQWidget::NoFocus); diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp index 07d72aa..187b848 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -79,7 +79,7 @@ KMiloD::KMiloD(const TQCString &name) : KDEDModule(name), _interval(100) } // Start the timer - TQObject::connect(&_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimer())); + TQObject::connect(&_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimer())); if (shouldPoll) { _timer.start(_interval); } diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index 9113f36..fd893d6 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -122,7 +122,7 @@ KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const T m_KCMThinkpadGeneral->tlOff->setText(i18n("Thinkpad Buttons KMilo Plugin Ready For Configuration")); } - connect( m_KCMThinkpadGeneral, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect( m_KCMThinkpadGeneral, TQ_SIGNAL(changed()), TQ_SLOT(changed())); } diff --git a/kregexpeditor/KMultiFormListBox/indexWindow.cpp b/kregexpeditor/KMultiFormListBox/indexWindow.cpp index 22bc14f..020ecf5 100644 --- a/kregexpeditor/KMultiFormListBox/indexWindow.cpp +++ b/kregexpeditor/KMultiFormListBox/indexWindow.cpp @@ -29,7 +29,7 @@ indexWindow::indexWindow() : TQWidget(0,"", WStyle_Customize | WType_Popup) { lb = new TQListBox(this); - connect(lb,TQT_SIGNAL(selected(int)), this, TQT_SLOT(lbSelected(int))); + connect(lb,TQ_SIGNAL(selected(int)), this, TQ_SLOT(lbSelected(int))); TQHBoxLayout *lay = new TQHBoxLayout(this); lay->addWidget(lb); lbFinish = false; diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp index 02941a2..a394c58 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp @@ -178,9 +178,9 @@ void KMultiFormListBoxMultiVisible::insertElmIntoWidget(KMultiFormListBoxEntry * if (elm->indexButton()) { elm->indexButton()->setPixmap(TQBitmap(indexButtonWidth, indexButtonHeight, indexButtonBits, true)); - connect(elm->indexButton(), TQT_SIGNAL(clicked()), elm, TQT_SLOT(acceptIndexButton())); - connect(elm, TQT_SIGNAL(gotoIndex(KMultiFormListBoxEntry *)), - this, TQT_SLOT(showIndexList(KMultiFormListBoxEntry *))); + connect(elm->indexButton(), TQ_SIGNAL(clicked()), elm, TQ_SLOT(acceptIndexButton())); + connect(elm, TQ_SIGNAL(gotoIndex(KMultiFormListBoxEntry *)), + this, TQ_SLOT(showIndexList(KMultiFormListBoxEntry *))); } // Find the location to insert the new element. diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp index f39c9e9..a366ad1 100644 --- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp +++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp @@ -46,40 +46,40 @@ KMultiFormListBoxWindowed::KMultiFormListBoxWindowed(KMultiFormListBoxFactory *f TQPushButton *but = new TQPushButton(addButtonText, this,"Add Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(addNewElement())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(addNewElement())); but = new TQPushButton(i18n("Edit"), this,"Edit Button"); buttons->addWidget(but,0); - connect(but,TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditSelected())); - connect(_listbox, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQT_SLOT(slotEditSelected(TQListBoxItem *))); + connect(but,TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditSelected())); + connect(_listbox, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), this, TQ_SLOT(slotEditSelected(TQListBoxItem *))); _buttonList.append(but); but = new TQPushButton(i18n("Delete"), this, "Delete Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteEntry())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteEntry())); _buttonList.append(but); but = new TQPushButton(i18n("Copy"), this, "Copy Button"); buttons->addWidget(but,0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopySelected())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopySelected())); _buttonList.append(but); if (showUpDownButtons) { but = new TQPushButton(i18n("Up"), this, "Up Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveItemUp())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveItemUp())); _buttonList.append(but); but = new TQPushButton(i18n("Down"), this, "Down Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMoveItemDown())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMoveItemDown())); _buttonList.append(but); } if (showHelpButton) { but = new KPushButton(KStdGuiItem::help(), this, "Help Button"); buttons->addWidget(but, 0); - connect(but, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(showHelp())); + connect(but, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(showHelp())); } buttons->addStretch(1); @@ -123,7 +123,7 @@ void KMultiFormListBoxWindowed::addNewElement() TQWidget *widget = new WidgetWindow(_factory, _listbox); widget->show(); - connect(widget, TQT_SIGNAL(finished()), this, TQT_SLOT(slotUpdateButtonState())); + connect(widget, TQ_SIGNAL(finished()), this, TQ_SLOT(slotUpdateButtonState())); } void KMultiFormListBoxWindowed::addElement() diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp index ffa47c1..0bcd10d 100644 --- a/kregexpeditor/auxbuttons.cpp +++ b/kregexpeditor/auxbuttons.cpp @@ -40,44 +40,44 @@ AuxButtons::AuxButtons( TQWidget* parent, const char* name = 0) _undo = new TQToolButton( this ); _undo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-undo") ) ); layout->addWidget( _undo ); - connect( _undo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(undo()) ); + connect( _undo, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(undo()) ); TQToolTip::add( _undo, i18n( "Undo" ) ); _redo = new TQToolButton( this ); _redo->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-redo") ) ); layout->addWidget( _redo ); - connect( _redo, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(redo()) ); + connect( _redo, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(redo()) ); TQToolTip::add( _redo, i18n( "Redo" ) ); _cut = new TQToolButton( this ); _cut->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-cut") ) ); layout->addWidget( _cut ); - connect( _cut, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(cut()) ); + connect( _cut, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(cut()) ); TQToolTip::add( _cut, i18n( "Cut" ) ); _copy = new TQToolButton( this ); _copy->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-copy") ) ); layout->addWidget( _copy ); - connect( _copy, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(copy()) ); + connect( _copy, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(copy()) ); TQToolTip::add( _copy, i18n( "Copy" ) ); _paste = new TQToolButton( this ); _paste->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("edit-paste")) ); layout->addWidget( _paste ); - connect( _paste, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(paste()) ); + connect( _paste, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(paste()) ); TQToolTip::add( _paste, i18n( "Paste" ) ); _save = new TQToolButton( this ); _save->setIconSet( Util::getSystemIconSet(TQString::fromLatin1("document-save")) ); layout->addWidget( _save ); - connect( _save, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(save()) ); + connect( _save, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(save()) ); TQToolTip::add( _save, i18n( "Save" ) ); TQToolButton* button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("contexthelp") ) ); layout->addWidget( button ); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEnterWhatsThis())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEnterWhatsThis())); _undo->setEnabled( false ); _redo->setEnabled( false ); diff --git a/kregexpeditor/characterswidget.cpp b/kregexpeditor/characterswidget.cpp index 3926260..cae60e8 100644 --- a/kregexpeditor/characterswidget.cpp +++ b/kregexpeditor/characterswidget.cpp @@ -322,7 +322,7 @@ CharacterEdits::CharacterEdits( TQWidget *parent, const char *name) moreLay->addWidget( more ); moreLay->addStretch( 1 ); - connect(more,TQT_SIGNAL(clicked()), _single, TQT_SLOT(addElement())); + connect(more,TQ_SIGNAL(clicked()), _single, TQ_SLOT(addElement())); // Ranges TQVGroupBox* rangeBox = new TQVGroupBox(i18n("Character Ranges"), top ); @@ -337,9 +337,9 @@ CharacterEdits::CharacterEdits( TQWidget *parent, const char *name) more = new TQPushButton( i18n("More Entries"), moreW ); moreLay->addWidget( more ); moreLay->addStretch( 1 ); - connect(more,TQT_SIGNAL(clicked()), _range, TQT_SLOT(addElement())); + connect(more,TQ_SIGNAL(clicked()), _range, TQ_SLOT(addElement())); // Buttons - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotOK())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotOK())); } void CharacterEdits::slotOK() diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp index afba02b..5a3406f 100644 --- a/kregexpeditor/charselector.cpp +++ b/kregexpeditor/charselector.cpp @@ -84,7 +84,7 @@ CharSelector::CharSelector( TQWidget* parent, const char* name ) _stack->raiseWidget( 0 ); - connect( _type, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(slotNewItem( int ) ) ); + connect( _type, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT(slotNewItem( int ) ) ); } void CharSelector::slotNewItem( int which ) diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp index 56b3226..0c13bd6 100644 --- a/kregexpeditor/compoundwidget.cpp +++ b/kregexpeditor/compoundwidget.cpp @@ -125,8 +125,8 @@ void CompoundWidget::init( ) _content = new CompoundDetailWindow( _configWindow ); _configWindow->setMainWidget( _content ); - connect( _configWindow, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotConfigCanceled())) ; - connect(_configWindow, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigWindowClosed())); + connect( _configWindow, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotConfigCanceled())) ; + connect(_configWindow, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigWindowClosed())); _down = getIcon( TQString::fromLocal8Bit( "1downarrow" )); _up = getIcon( TQString::fromLocal8Bit( "1uparrow" ) ); diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp index 58afa1d..b4c8331 100644 --- a/kregexpeditor/editorwindow.cpp +++ b/kregexpeditor/editorwindow.cpp @@ -55,15 +55,15 @@ RegExpEditorWindow::RegExpEditorWindow( TQWidget *parent, const char *name) _pasteData = 0; TQAccel* accel = new TQAccel( this ); - accel->connectItem( accel->insertItem( CTRL+Key_C ), this, TQT_SLOT( slotCopy() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_X ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( Key_Delete ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( Key_BackSpace ), this, TQT_SLOT( slotCut() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_V ), this, TQT_SLOT( slotStartPasteAction() ) ); - accel->connectItem( accel->insertItem( Key_Escape ), this, TQT_SLOT( slotEndActions() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_S ), this, TQT_SLOT( slotSave() ) ); - - connect( this, TQT_SIGNAL( change() ), this, TQT_SLOT( emitVerifyRegExp() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_C ), this, TQ_SLOT( slotCopy() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_X ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( Key_Delete ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( Key_BackSpace ), this, TQ_SLOT( slotCut() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_V ), this, TQ_SLOT( slotStartPasteAction() ) ); + accel->connectItem( accel->insertItem( Key_Escape ), this, TQ_SLOT( slotEndActions() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_S ), this, TQ_SLOT( slotSave() ) ); + + connect( this, TQ_SIGNAL( change() ), this, TQ_SLOT( emitVerifyRegExp() ) ); } RegExp* RegExpEditorWindow::regExp() const diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp index f248251..e16e16a 100644 --- a/kregexpeditor/kregexpeditorgui.cpp +++ b/kregexpeditor/kregexpeditorgui.cpp @@ -41,9 +41,9 @@ KRegExpEditorGUI::KRegExpEditorGUI(TQWidget *parent, const char *name, TQHBoxLayout* layout = new TQHBoxLayout( this, 6 ); _editor = new KRegExpEditorPrivate( this, "_editor" ); layout->addWidget( _editor ); - connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) ); - connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) ); + connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( _editor, TQ_SIGNAL( canRedo(bool) ), this, TQ_SIGNAL( canRedo(bool) ) ); + connect( _editor, TQ_SIGNAL( changes(bool) ), this, TQ_SIGNAL( changes(bool) ) ); } TQString KRegExpEditorGUI::regExp() const @@ -78,14 +78,14 @@ KRegExpEditorGUIDialog::KRegExpEditorGUIDialog( TQWidget *parent, layout->setAutoAdd( true ); _editor = new KRegExpEditorGUI( frame ); - connect( _editor, TQT_SIGNAL( canUndo(bool) ), this, TQT_SIGNAL( canUndo(bool) ) ); - connect( _editor, TQT_SIGNAL( canRedo(bool) ), this, TQT_SIGNAL( canRedo(bool) ) ); - connect( _editor, TQT_SIGNAL( changes(bool) ), this, TQT_SIGNAL( changes(bool) ) ); + connect( _editor, TQ_SIGNAL( canUndo(bool) ), this, TQ_SIGNAL( canUndo(bool) ) ); + connect( _editor, TQ_SIGNAL( canRedo(bool) ), this, TQ_SIGNAL( canRedo(bool) ) ); + connect( _editor, TQ_SIGNAL( changes(bool) ), this, TQ_SIGNAL( changes(bool) ) ); resize( 640, 400 ); setHelp( TQString(), TQString::fromLocal8Bit( "KRegExpEditor" ) ); #ifdef TQT_ONLY - connect( this, TQT_SIGNAL( helpClicked() ), _editor, TQT_SLOT( showHelp() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), _editor, TQ_SLOT( showHelp() ) ); #endif } diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp index 30b1537..17ed27f 100644 --- a/kregexpeditor/kregexpeditorprivate.cpp +++ b/kregexpeditor/kregexpeditorprivate.cpp @@ -77,7 +77,7 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) _info = new InfoPage( this, "_info" ); _verifier = new Verifier( _editor, "KRegExpEditorPrivate::_verifier" ); - connect( _verifier, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( maybeVerify() ) ); + connect( _verifier, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( maybeVerify() ) ); TQWhatsThis::add( _verifier, i18n("Type in some text in this window, and see what the regular expression you have developed matches.<p>" "Each second match will be colored in red and each other match will be colored blue, simply so you " "can distinguish them from each other.<p>" @@ -98,54 +98,54 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) rows->addWidget( verArea2 ); // Connect the buttons - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), _scrolledEditorWindow, TQT_SLOT( slotInsertRegExp( int ) ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), _scrolledEditorWindow, TQT_SLOT( slotDoSelect() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), _scrolledEditorWindow, TQT_SLOT( slotInsertRegExp( RegExp* ) ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), _scrolledEditorWindow, TQ_SLOT( slotInsertRegExp( int ) ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), _scrolledEditorWindow, TQ_SLOT( slotDoSelect() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), _scrolledEditorWindow, TQ_SLOT( slotInsertRegExp( RegExp* ) ) ); - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), _userRegExps, TQT_SLOT( slotUnSelect() ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), _userRegExps, TQT_SLOT( slotUnSelect() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), _regExpButtons, TQT_SLOT( slotUnSelect() ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), _userRegExps, TQ_SLOT( slotUnSelect() ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), _userRegExps, TQ_SLOT( slotUnSelect() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), _regExpButtons, TQ_SLOT( slotUnSelect() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( doneEditing() ), _regExpButtons, TQT_SLOT( slotSelectNewAction() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( doneEditing() ), _userRegExps, TQT_SLOT( slotSelectNewAction() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( doneEditing() ), _regExpButtons, TQ_SLOT( slotSelectNewAction() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( doneEditing() ), _userRegExps, TQ_SLOT( slotSelectNewAction() ) ); - connect( _regExpButtons, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotShowEditor() ) ); - connect( _userRegExps, TQT_SIGNAL( load( RegExp* ) ), this, TQT_SLOT( slotShowEditor() ) ); - connect( _regExpButtons, TQT_SIGNAL( doSelect() ), this, TQT_SLOT( slotShowEditor() ) ); + connect( _regExpButtons, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotShowEditor() ) ); + connect( _userRegExps, TQ_SIGNAL( load( RegExp* ) ), this, TQ_SLOT( slotShowEditor() ) ); + connect( _regExpButtons, TQ_SIGNAL( doSelect() ), this, TQ_SLOT( slotShowEditor() ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( savedRegexp() ), _userRegExps, TQT_SLOT( slotPopulateUserRegexps() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( savedRegexp() ), _userRegExps, TQ_SLOT( slotPopulateUserRegexps() ) ); - connect( _auxButtons, TQT_SIGNAL( undo() ), this, TQT_SLOT( slotUndo() ) ); - connect( _auxButtons, TQT_SIGNAL( redo() ), this, TQT_SLOT( slotRedo() ) ); - connect( _auxButtons, TQT_SIGNAL( cut() ), _scrolledEditorWindow, TQT_SLOT( slotCut() ) ); - connect( _auxButtons, TQT_SIGNAL( copy() ), _scrolledEditorWindow, TQT_SLOT( slotCopy() ) ); - connect( _auxButtons, TQT_SIGNAL( paste() ), _scrolledEditorWindow, TQT_SLOT( slotPaste() ) ); - connect( _auxButtons, TQT_SIGNAL( save() ), _scrolledEditorWindow, TQT_SLOT( slotSave() ) ); - connect( _verifyButtons, TQT_SIGNAL( autoVerify( bool ) ), this, TQT_SLOT( setAutoVerify( bool ) ) ); - connect( _verifyButtons, TQT_SIGNAL( verify() ), this, TQT_SLOT( doVerify() ) ); - connect( _verifyButtons, TQT_SIGNAL( changeSyntax( const TQString& ) ), this, TQT_SLOT( setSyntax( const TQString& ) ) ); + connect( _auxButtons, TQ_SIGNAL( undo() ), this, TQ_SLOT( slotUndo() ) ); + connect( _auxButtons, TQ_SIGNAL( redo() ), this, TQ_SLOT( slotRedo() ) ); + connect( _auxButtons, TQ_SIGNAL( cut() ), _scrolledEditorWindow, TQ_SLOT( slotCut() ) ); + connect( _auxButtons, TQ_SIGNAL( copy() ), _scrolledEditorWindow, TQ_SLOT( slotCopy() ) ); + connect( _auxButtons, TQ_SIGNAL( paste() ), _scrolledEditorWindow, TQ_SLOT( slotPaste() ) ); + connect( _auxButtons, TQ_SIGNAL( save() ), _scrolledEditorWindow, TQ_SLOT( slotSave() ) ); + connect( _verifyButtons, TQ_SIGNAL( autoVerify( bool ) ), this, TQ_SLOT( setAutoVerify( bool ) ) ); + connect( _verifyButtons, TQ_SIGNAL( verify() ), this, TQ_SLOT( doVerify() ) ); + connect( _verifyButtons, TQ_SIGNAL( changeSyntax( const TQString& ) ), this, TQ_SLOT( setSyntax( const TQString& ) ) ); - connect( this, TQT_SIGNAL( canUndo( bool ) ), _auxButtons, TQT_SLOT( slotCanUndo( bool ) ) ); - connect( this, TQT_SIGNAL( canRedo( bool ) ), _auxButtons, TQT_SLOT( slotCanRedo( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQT_SLOT( slotCanCut( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQT_SLOT( slotCanCopy( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( anythingOnClipboard( bool ) ), _auxButtons, TQT_SLOT( slotCanPaste( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( canSave( bool ) ), _auxButtons, TQT_SLOT( slotCanSave( bool ) ) ); + connect( this, TQ_SIGNAL( canUndo( bool ) ), _auxButtons, TQ_SLOT( slotCanUndo( bool ) ) ); + connect( this, TQ_SIGNAL( canRedo( bool ) ), _auxButtons, TQ_SLOT( slotCanRedo( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQ_SLOT( slotCanCut( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingSelected( bool ) ), _auxButtons, TQ_SLOT( slotCanCopy( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( anythingOnClipboard( bool ) ), _auxButtons, TQ_SLOT( slotCanPaste( bool ) ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( canSave( bool ) ), _auxButtons, TQ_SLOT( slotCanSave( bool ) ) ); - connect( _scrolledEditorWindow, TQT_SIGNAL( verifyRegExp() ), this, TQT_SLOT( maybeVerify() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( verifyRegExp() ), this, TQ_SLOT( maybeVerify() ) ); - connect( _verifyButtons, TQT_SIGNAL( loadVerifyText( const TQString& ) ), this, TQT_SLOT( setVerifyText( const TQString& ) ) ); + connect( _verifyButtons, TQ_SIGNAL( loadVerifyText( const TQString& ) ), this, TQ_SLOT( setVerifyText( const TQString& ) ) ); - // connect( _verifier, TQT_SIGNAL( countChanged( int ) ), _verifyButtons, TQT_SLOT( setMatchCount( int ) ) ); + // connect( _verifier, TQ_SIGNAL( countChanged( int ) ), _verifyButtons, TQ_SLOT( setMatchCount( int ) ) ); // TQt anchors do not work for <pre>...</pre>, thefore scrolling to next/prev match // do not work. Enable this when they work. - // connect( _verifyButtons, TQT_SIGNAL( gotoFirst() ), _verifier, TQT_SLOT( gotoFirst() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoPrev() ), _verifier, TQT_SLOT( gotoPrev() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoNext() ), _verifier, TQT_SLOT( gotoNext() ) ); - // connect( _verifyButtons, TQT_SIGNAL( gotoLast() ), _verifier, TQT_SLOT( gotoLast() ) ); - // connect( _verifier, TQT_SIGNAL( goForwardPossible( bool ) ), _verifyButtons, TQT_SLOT( enableForwardButtons( bool ) ) ); - // connect( _verifier, TQT_SIGNAL( goBackwardPossible( bool ) ), _verifyButtons, TQT_SLOT( enableBackwardButtons( bool ) ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoFirst() ), _verifier, TQ_SLOT( gotoFirst() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoPrev() ), _verifier, TQ_SLOT( gotoPrev() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoNext() ), _verifier, TQ_SLOT( gotoNext() ) ); + // connect( _verifyButtons, TQ_SIGNAL( gotoLast() ), _verifier, TQ_SLOT( gotoLast() ) ); + // connect( _verifier, TQ_SIGNAL( goForwardPossible( bool ) ), _verifyButtons, TQ_SLOT( enableForwardButtons( bool ) ) ); + // connect( _verifier, TQ_SIGNAL( goBackwardPossible( bool ) ), _verifyButtons, TQ_SLOT( enableBackwardButtons( bool ) ) ); _auxButtons->slotCanPaste( false ); _auxButtons->slotCanCut( false ); @@ -183,18 +183,18 @@ KRegExpEditorPrivate::KRegExpEditorPrivate(TQWidget *parent, const char *name) _timer = new TQTimer(this); - connect( _scrolledEditorWindow, TQT_SIGNAL( change() ), this, TQT_SLOT( slotUpdateLineEdit() ) ); - connect( _regexpEdit, TQT_SIGNAL(textChanged( const TQString& ) ), this, TQT_SLOT( slotTriggerUpdate() ) ); - connect( _timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); - connect( clearButton, TQT_SIGNAL( clicked() ), _regexpEdit, TQT_SLOT( clear() ) ); + connect( _scrolledEditorWindow, TQ_SIGNAL( change() ), this, TQ_SLOT( slotUpdateLineEdit() ) ); + connect( _regexpEdit, TQ_SIGNAL(textChanged( const TQString& ) ), this, TQ_SLOT( slotTriggerUpdate() ) ); + connect( _timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), _regexpEdit, TQ_SLOT( clear() ) ); // Push an initial empty element on the stack. _undoStack.push( _scrolledEditorWindow->regExp() ); _redoStack.setAutoDelete( true ); TQAccel* accel = new TQAccel( this ); - accel->connectItem( accel->insertItem( CTRL+Key_Z ), this, TQT_SLOT( slotUndo() ) ); - accel->connectItem( accel->insertItem( CTRL+Key_R ), this, TQT_SLOT( slotRedo() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_Z ), this, TQ_SLOT( slotUndo() ) ); + accel->connectItem( accel->insertItem( CTRL+Key_R ), this, TQ_SLOT( slotRedo() ) ); setSyntax( TQString::fromLatin1( "TQt" ) ); } diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp index 728bb19..0bc7990 100644 --- a/kregexpeditor/main.cpp +++ b/kregexpeditor/main.cpp @@ -58,11 +58,11 @@ int main( int argc, char* argv[] ) lay2->addStretch(1); lay2->addWidget( quit ); - TQObject::connect( help, TQT_SIGNAL( clicked() ), iface, TQT_SLOT( showHelp() ) ); - TQObject::connect( quit, TQT_SIGNAL( clicked() ), tqApp, TQT_SLOT( quit() ) ); + TQObject::connect( help, TQ_SIGNAL( clicked() ), iface, TQ_SLOT( showHelp() ) ); + TQObject::connect( quit, TQ_SIGNAL( clicked() ), tqApp, TQ_SLOT( quit() ) ); top->show(); - TQObject::connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), tqApp, TQT_SLOT( quit() ) ); + TQObject::connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), tqApp, TQ_SLOT( quit() ) ); myapp.exec(); } diff --git a/kregexpeditor/qt-only/compat.cpp b/kregexpeditor/qt-only/compat.cpp index a7a5d12..2d3315a 100644 --- a/kregexpeditor/qt-only/compat.cpp +++ b/kregexpeditor/qt-only/compat.cpp @@ -50,18 +50,18 @@ void KDialogBase::init( int buttonMask, ButtonCode /*defaultButton*/, const TQSt if ( buttonMask & Help ) { but = new TQPushButton( tr("Help"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( helpClicked() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( helpClicked() ) ); } buts->addStretch(1); if ( buttonMask & Ok ) { but = new TQPushButton( tr("OK"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOk() ) ); } if ( buttonMask & Cancel ) { but = new TQPushButton( tr("Cancel"), this ); buts->addWidget( but ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCancel() ) ); } } diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp index 1974534..d65f302 100644 --- a/kregexpeditor/regexpbuttons.cpp +++ b/kregexpeditor/regexpbuttons.cpp @@ -44,7 +44,7 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) _grp->setExclusive( true ); _mapper = new TQSignalMapper( this, "RegExpButtons::_mapper" ); - connect( _mapper, TQT_SIGNAL( mapped(int) ), this, TQT_SIGNAL( clicked(int) ) ); + connect( _mapper, TQ_SIGNAL( mapped(int) ), this, TQ_SIGNAL( clicked(int) ) ); // The "select" button. _selectBut = new TQToolButton( this); @@ -60,8 +60,8 @@ RegExpButtons::RegExpButtons( TQWidget *parent, const char *name ) layout->addWidget( _selectBut ); _grp->insert(_selectBut); _selectBut->setToggleButton( true ); - connect( _selectBut, TQT_SIGNAL(clicked()), TQT_SIGNAL(doSelect())); - connect( _selectBut, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetNonKeepMode()) ); + connect( _selectBut, TQ_SIGNAL(clicked()), TQ_SIGNAL(doSelect())); + connect( _selectBut, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSetNonKeepMode()) ); TQToolTip::add( _selectBut, i18n("Selection tool")); TQWhatsThis::add( _selectBut, i18n("<qt>This will change the state of the editor to <i>selection state</i>.<p>" @@ -166,9 +166,9 @@ DoubleClickButton* RegExpButtons::insert(RegExpType tp, const char* name, TQStri _mapper->setMapping( but, tp ); - connect( but, TQT_SIGNAL( clicked() ), _mapper, TQT_SLOT( map() ) ); - connect( but, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSetNonKeepMode() ) ); - connect( but, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( slotSetKeepMode() ) ); + connect( but, TQ_SIGNAL( clicked() ), _mapper, TQ_SLOT( map() ) ); + connect( but, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSetNonKeepMode() ) ); + connect( but, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( slotSetKeepMode() ) ); _grp->insert( but ); but->setToggleButton( true ); diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp index b46cade..9a87eb6 100644 --- a/kregexpeditor/repeatwidget.cpp +++ b/kregexpeditor/repeatwidget.cpp @@ -80,8 +80,8 @@ void RepeatWidget::init() KDialogBase::Ok | KDialogBase::Cancel); _content = new RepeatRangeWindow( _configWindow ); _configWindow->setMainWidget( _content ); - connect( _configWindow, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotConfigCanceled() ) ); - connect(_configWindow, TQT_SIGNAL(finished()), this, TQT_SLOT(slotConfigWindowClosed())); + connect( _configWindow, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotConfigCanceled() ) ); + connect(_configWindow, TQ_SIGNAL(finished()), this, TQ_SLOT(slotConfigWindowClosed())); } @@ -206,15 +206,15 @@ RepeatRangeWindow::RepeatRangeWindow( TQWidget* parent, const char* name ) _rangeTo = new TQSpinBox( 1, 999, 1, box ); (void) new TQLabel( i18n( "time(s)" ), box ); - connect( _rangeFrom, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotUpdateMaxVal( int ) ) ); - connect( _rangeTo, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotUpdateMinVal( int ) ) ); + connect( _rangeFrom, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotUpdateMaxVal( int ) ) ); + connect( _rangeTo, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotUpdateMinVal( int ) ) ); // set a default button. _group->setButton(ANY); slotItemChange( ANY ); - connect( _group, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotItemChange( int ) ) ); + connect( _group, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotItemChange( int ) ) ); } diff --git a/kregexpeditor/scrollededitorwindow.cpp b/kregexpeditor/scrollededitorwindow.cpp index 07e8bf0..442ac22 100644 --- a/kregexpeditor/scrollededitorwindow.cpp +++ b/kregexpeditor/scrollededitorwindow.cpp @@ -30,21 +30,21 @@ RegExpScrolledEditorWindow::RegExpScrolledEditorWindow( TQWidget* parent, const _scrollView->addChild( _editorWindow ); _scrollView->setResizePolicy( TQScrollView::Manual ); - connect( _editorWindow, TQT_SIGNAL( contentChanged( TQPoint ) ), - this, TQT_SLOT( slotUpdateContentSize( TQPoint ) ) ); + connect( _editorWindow, TQ_SIGNAL( contentChanged( TQPoint ) ), + this, TQ_SLOT( slotUpdateContentSize( TQPoint ) ) ); - connect( _editorWindow, TQT_SIGNAL( scrolling( TQPoint ) ), - this, TQT_SLOT( slotScroll( TQPoint ) ) ); + connect( _editorWindow, TQ_SIGNAL( scrolling( TQPoint ) ), + this, TQ_SLOT( slotScroll( TQPoint ) ) ); - connect( _editorWindow, TQT_SIGNAL( doneEditing() ), this, TQT_SIGNAL( doneEditing() ) ); + connect( _editorWindow, TQ_SIGNAL( doneEditing() ), this, TQ_SIGNAL( doneEditing() ) ); - connect( _editorWindow, TQT_SIGNAL( change() ), this, TQT_SIGNAL( change() ) ); - connect( _editorWindow, TQT_SIGNAL( savedRegexp() ), this, TQT_SIGNAL( savedRegexp() ) ); + connect( _editorWindow, TQ_SIGNAL( change() ), this, TQ_SIGNAL( change() ) ); + connect( _editorWindow, TQ_SIGNAL( savedRegexp() ), this, TQ_SIGNAL( savedRegexp() ) ); - connect( _editorWindow, TQT_SIGNAL( anythingSelected(bool) ), this, TQT_SIGNAL( anythingSelected(bool) ) ); - connect( _editorWindow, TQT_SIGNAL( anythingOnClipboard(bool) ), this, TQT_SIGNAL( anythingOnClipboard(bool) ) ); - connect( _editorWindow, TQT_SIGNAL( canSave(bool) ), this, TQT_SIGNAL( canSave(bool) ) ); - connect( _editorWindow, TQT_SIGNAL( verifyRegExp() ), this, TQT_SIGNAL( verifyRegExp() ) ); + connect( _editorWindow, TQ_SIGNAL( anythingSelected(bool) ), this, TQ_SIGNAL( anythingSelected(bool) ) ); + connect( _editorWindow, TQ_SIGNAL( anythingOnClipboard(bool) ), this, TQ_SIGNAL( anythingOnClipboard(bool) ) ); + connect( _editorWindow, TQ_SIGNAL( canSave(bool) ), this, TQ_SIGNAL( canSave(bool) ) ); + connect( _editorWindow, TQ_SIGNAL( verifyRegExp() ), this, TQ_SIGNAL( verifyRegExp() ) ); } void RegExpScrolledEditorWindow::slotSetRegExp( RegExp* regexp ) diff --git a/kregexpeditor/selectablelineedit.cpp b/kregexpeditor/selectablelineedit.cpp index 0e085d5..fc44b91 100644 --- a/kregexpeditor/selectablelineedit.cpp +++ b/kregexpeditor/selectablelineedit.cpp @@ -25,8 +25,8 @@ SelectableLineEdit::SelectableLineEdit( RegExpWidget* owner, TQWidget* parent, const char* name) : TQLineEdit( parent, name ), _owner(owner) { - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, - TQT_SLOT( slotKeyPressed() ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), this, + TQ_SLOT( slotKeyPressed() ) ); setAcceptDrops( false ); } diff --git a/kregexpeditor/textwidget.cpp b/kregexpeditor/textwidget.cpp index 121dad4..07e2da1 100644 --- a/kregexpeditor/textwidget.cpp +++ b/kregexpeditor/textwidget.cpp @@ -47,10 +47,10 @@ void TextWidget::init( const TQString& txt ) _edit->setText( txt ); - connect( _edit, TQT_SIGNAL( parentPleaseUpdate() ), this, TQT_SLOT(slotUpdate()) ); + connect( _edit, TQ_SIGNAL( parentPleaseUpdate() ), this, TQ_SLOT(slotUpdate()) ); setFocusProxy( _edit ); _edit->installEventFilter( this ); - connect( _edit, TQT_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQT_SLOT( emitChange() ) ); + connect( _edit, TQ_SIGNAL( textChanged( const TQString & ) ), _editorWindow, TQ_SLOT( emitChange() ) ); } diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp index e6d83aa..35853fc 100644 --- a/kregexpeditor/userdefinedregexps.cpp +++ b/kregexpeditor/userdefinedregexps.cpp @@ -54,9 +54,9 @@ UserDefinedRegExps::UserDefinedRegExps( TQWidget *parent, const char *name ) setWidget( top ); slotPopulateUserRegexps(); - connect( _userDefined, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(slotLoad(TQListViewItem*)) ); - connect( _userDefined, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&, int )), - this, TQT_SLOT( slotEdit( TQListViewItem*, const TQPoint& ) ) ); + connect( _userDefined, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(slotLoad(TQListViewItem*)) ); + connect( _userDefined, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&, int )), + this, TQ_SLOT( slotEdit( TQListViewItem*, const TQPoint& ) ) ); } void UserDefinedRegExps::slotPopulateUserRegexps() diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp index 6f5b316..1f62e0a 100644 --- a/kregexpeditor/verifybuttons.cpp +++ b/kregexpeditor/verifybuttons.cpp @@ -51,40 +51,40 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) TQWhatsThis::add( _verify, i18n("Shows what part of the regular expression is being matched in the <i>verifier window</i>." "(The window below the graphical editor window).")); layout->addWidget( _verify ); - connect( _verify, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( verify() ) ); + connect( _verify, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( verify() ) ); TQToolButton* button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("document-open")) ); layout->addWidget( button ); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadText())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadText())); TQToolTip::add( button, i18n("Load text in the verifier window") ); button = new TQToolButton(this); button->setPixmap( Util::getSystemIcon( TQString::fromLatin1("package_settings")) ); layout->addWidget( button ); - connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(configure())); + connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(configure())); TQToolTip::add( button, i18n("Settings") ); // It is currently not possible to ask for the paragraph being highlighted, thefore scrolling to next/prev match // do not work. Enable this when they work. // _first = new TQToolButton( TQString::fromLatin1("<<"), this); // layout->addWidget( _first ); - // connect(_first, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoFirst())); + // connect(_first, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoFirst())); // _first->setFixedWidth( 25 ); // // _prev = new TQToolButton(TQString::fromLatin1("<"), this); // layout->addWidget( _prev ); - // connect(_prev, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoPrev())); + // connect(_prev, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoPrev())); // _prev->setFixedWidth( 20 ); // // _next = new TQToolButton(TQString::fromLatin1(">"), this); // layout->addWidget( _next ); - // connect(_next, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoNext())); + // connect(_next, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoNext())); // _next->setFixedWidth( 20 ); // // _last = new TQToolButton(TQString::fromLatin1(">>"), this); // layout->addWidget( _last ); - // connect(_last, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( gotoLast())); + // connect(_last, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( gotoLast())); // _last->setFixedWidth( 25 ); // Same as above @@ -117,8 +117,8 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) TQAction* autoVerify = new TQAction( i18n("Verify on the Fly"), 0, this ); autoVerify->setToggleAction( true ); autoVerify->setOn( true ); - connect( autoVerify, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( updateVerifyButton( bool ) ) ); - connect( autoVerify, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( autoVerify( bool ) ) ); + connect( autoVerify, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( updateVerifyButton( bool ) ) ); + connect( autoVerify, TQ_SIGNAL( toggled( bool ) ), this, TQ_SIGNAL( autoVerify( bool ) ) ); autoVerify->addTo( _configMenu ); autoVerify->setToolTip( i18n( "Toggle on-the-fly verification of regular expression" ) ); autoVerify->setWhatsThis( i18n( "Enabling this option will make the verifier update for each edit. " @@ -138,7 +138,7 @@ VerifyButtons::VerifyButtons( TQWidget* parent, const char* name ) (*it).second = action; } grp->addTo( languages ); - connect( grp, TQT_SIGNAL( selected( TQAction* ) ), this, TQT_SLOT( slotChangeSyntax( TQAction* ) ) ); + connect( grp, TQ_SIGNAL( selected( TQAction* ) ), this, TQ_SLOT( slotChangeSyntax( TQAction* ) ) ); _configMenu->setItemEnabled( _languageId, false ); // Select the TQt converter by default diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp index b7b9b4d..ee601c2 100644 --- a/ksim/generalprefs.cpp +++ b/ksim/generalprefs.cpp @@ -174,21 +174,21 @@ KSim::UptimePrefs::UptimePrefs(TQWidget *parent, const char *name) m_uptimeCombo->insertItem(i18n("%dd %h:%m")); m_uptimeCombo->insertItem(i18n("Uptime: %h:%m:%s")); connect(m_uptimeCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(uptimeContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(uptimeContextMenu(TQPopupMenu *))); m_uptimeAdd = new TQPushButton(this); m_uptimeAdd->setPixmap(SmallIcon("go-down")); - connect(m_uptimeAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertUptimeItem())); + connect(m_uptimeAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertUptimeItem())); TQToolTip::add(m_uptimeAdd, i18n("Insert item")); m_uptimeCheck = new TQCheckBox(this); m_uptimeCheck->setText(i18n("Show uptime")); m_uptimeCheck->setChecked(true); - connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)), - m_uptimeCombo, TQT_SLOT(setEnabled(bool))); - connect(m_uptimeCheck, TQT_SIGNAL(toggled(bool)), - m_uptimeAdd, TQT_SLOT(setEnabled(bool))); + connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)), + m_uptimeCombo, TQ_SLOT(setEnabled(bool))); + connect(m_uptimeCheck, TQ_SIGNAL(toggled(bool)), + m_uptimeAdd, TQ_SLOT(setEnabled(bool))); m_mainLayout->addWidget(m_uptimeCheck); m_subLayout = new TQHBoxLayout; @@ -273,9 +273,9 @@ void KSim::UptimePrefs::uptimeContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); menu->insertItem(m_addIcon, i18n("Insert Item"), - this, TQT_SLOT(insertUptimeItem())); + this, TQ_SLOT(insertUptimeItem())); menu->insertItem(m_removeIcon, i18n("Remove Item"), - this, TQT_SLOT(removeUptimeItem())); + this, TQ_SLOT(removeUptimeItem())); } void KSim::UptimePrefs::insertUptimeItem() @@ -310,21 +310,21 @@ KSim::MemoryPrefs::MemoryPrefs(TQWidget *parent, const char *name) //m_memCombo->insertItem(i18n("%tM - %fM free")); //m_memCombo->insertItem(i18n("%tM - %uM used")); connect(m_memCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(memoryContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(memoryContextMenu(TQPopupMenu *))); m_memoryAdd = new TQPushButton(this); m_memoryAdd->setPixmap(SmallIcon("go-down")); - connect(m_memoryAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertMemoryItem())); + connect(m_memoryAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertMemoryItem())); TQToolTip::add(m_memoryAdd, i18n("Insert item")); m_memCheck = new TQCheckBox(this); m_memCheck->setText(i18n("Show memory and free memory")); m_memCheck->setChecked(false); - connect(m_memCheck, TQT_SIGNAL(toggled(bool)), - m_memCombo, TQT_SLOT(setEnabled(bool))); - connect(m_memCheck, TQT_SIGNAL(toggled(bool)), - m_memoryAdd, TQT_SLOT(setEnabled(bool))); + connect(m_memCheck, TQ_SIGNAL(toggled(bool)), + m_memCombo, TQ_SLOT(setEnabled(bool))); + connect(m_memCheck, TQ_SIGNAL(toggled(bool)), + m_memoryAdd, TQ_SLOT(setEnabled(bool))); m_mainLayout->addWidget(m_memCheck); m_subLayout = new TQHBoxLayout; @@ -421,9 +421,9 @@ void KSim::MemoryPrefs::memoryContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); menu->insertItem(m_addIcon, i18n("Insert Item"), - this, TQT_SLOT(insertMemoryItem())); + this, TQ_SLOT(insertMemoryItem())); menu->insertItem(m_removeIcon, i18n("Remove Item"), - this, TQT_SLOT(removeMemoryItem())); + this, TQ_SLOT(removeMemoryItem())); } void KSim::MemoryPrefs::insertMemoryItem() @@ -464,20 +464,20 @@ KSim::SwapPrefs::SwapPrefs(TQWidget *parent, const char *name) //m_swapCombo->insertItem(i18n("%tM - %uM used")); connect(m_swapCombo, - TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), - TQT_SLOT(swapContextMenu(TQPopupMenu *))); + TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu *)), + TQ_SLOT(swapContextMenu(TQPopupMenu *))); m_swapAdd = new TQPushButton(this); m_swapAdd->setPixmap(SmallIcon("go-down")); - connect(m_swapAdd, TQT_SIGNAL(clicked()), TQT_SLOT(insertSwapItem())); + connect(m_swapAdd, TQ_SIGNAL(clicked()), TQ_SLOT(insertSwapItem())); TQToolTip::add(m_swapAdd, i18n("Insert item")); m_subLayout = new TQHBoxLayout; m_subLayout->setSpacing(6); - connect(m_swapCheck, TQT_SIGNAL(toggled(bool)), - m_swapCombo, TQT_SLOT(setEnabled(bool))); - connect(m_swapCheck, TQT_SIGNAL(toggled(bool)), - m_swapAdd, TQT_SLOT(setEnabled(bool))); + connect(m_swapCheck, TQ_SIGNAL(toggled(bool)), + m_swapCombo, TQ_SLOT(setEnabled(bool))); + connect(m_swapCheck, TQ_SIGNAL(toggled(bool)), + m_swapAdd, TQ_SLOT(setEnabled(bool))); m_swapFormat = new TQLabel(this); m_swapFormat->setText(i18n("Swap format:")); @@ -553,8 +553,8 @@ void KSim::SwapPrefs::readConfig(KSim::Config *config) void KSim::SwapPrefs::swapContextMenu(TQPopupMenu *menu) { menu->insertSeparator(); - menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQT_SLOT(insertSwapItem())); - menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQT_SLOT(removeSwapItem())); + menu->insertItem(m_addIcon, i18n("Insert Item"), this, TQ_SLOT(insertSwapItem())); + menu->insertItem(m_removeIcon, i18n("Remove Item"), this, TQ_SLOT(removeSwapItem())); } void KSim::SwapPrefs::insertSwapItem() diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp index 746c810..b5600db 100644 --- a/ksim/ksimpref.cpp +++ b/ksim/ksimpref.cpp @@ -91,10 +91,10 @@ KSim::ConfigDialog::ConfigDialog(KSim::Config *config, i18n("Theme Selector"), BarIcon("folder_image", TDEIcon::SizeSmall)); m_themePage = new KSim::ThemePrefs(theme); - connect(this, TQT_SIGNAL(applyClicked()), TQT_SLOT(savePrefs())); - connect(this, TQT_SIGNAL(okClicked()), TQT_SLOT(closePrefs())); - connect(this, TQT_SIGNAL(closeClicked()), TQT_SLOT(loadPluginConfig())); - connect(parent, TQT_SIGNAL(reload()), TQT_SLOT(reload())); + connect(this, TQ_SIGNAL(applyClicked()), TQ_SLOT(savePrefs())); + connect(this, TQ_SIGNAL(okClicked()), TQ_SLOT(closePrefs())); + connect(this, TQ_SIGNAL(closeClicked()), TQ_SLOT(loadPluginConfig())); + connect(parent, TQ_SIGNAL(reload()), TQ_SLOT(reload())); KSim::PluginList::ConstIterator it; const KSim::PluginList &pluginList = KSim::PluginLoader::self().pluginList(); @@ -164,8 +164,8 @@ void KSim::ConfigDialog::createPage(const KSim::Plugin &plugin) plugin.configPage()->readConfig(); // TODO: implement this correctly one day -// connect (info.configPage(), TQT_SIGNAL(pageChanged()), -// this, TQT_SLOT(enableButtons())); +// connect (info.configPage(), TQ_SIGNAL(pageChanged()), +// this, TQ_SLOT(enableButtons())); } void KSim::ConfigDialog::savePrefs() diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp index 1f204b7..e6b58e8 100644 --- a/ksim/ksimsysinfo.cpp +++ b/ksim/ksimsysinfo.cpp @@ -55,10 +55,10 @@ KSim::Sysinfo::Sysinfo(KSim::Config *config, //m_procsLabel = 0L; m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(clockUptimeUpdate())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(clockUptimeUpdate())); m_sysTimer = new TQTimer(this); - connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(sysUpdate())); + connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(sysUpdate())); createView(); } diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 21b4fa6..91fd84c 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -140,8 +140,8 @@ KSim::MainView::MainView(TDEConfig *config, m_sizeLayout->addWidget(m_rightFrame); connect(&KSim::PluginLoader::self(), - TQT_SIGNAL(pluginLoaded(const KSim::Plugin &)), - this, TQT_SLOT(addMonitor(const KSim::Plugin &))); + TQ_SIGNAL(pluginLoaded(const KSim::Plugin &)), + this, TQ_SLOT(addMonitor(const KSim::Plugin &))); KSim::ThemeLoader::self().themeColours(this); @@ -150,7 +150,7 @@ KSim::MainView::MainView(TDEConfig *config, addPlugins(); } - connect(&m_maskTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotMaskMainView())); + connect(&m_maskTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotMaskMainView())); } KSim::MainView::~MainView() @@ -371,8 +371,8 @@ void KSim::MainView::addMonitor(const KSim::Plugin &plugin) // kdDebug(2003) << "m_oldLocation: " << m_oldLocation << endl; // kdDebug(2003) << "location: " << location << endl; m_pluginLayout->addWidget(plugin.view()); - connect(plugin.view(), TQT_SIGNAL(runCommand(const TQCString &)), - TQT_SLOT(runCommand(const TQCString &))); + connect(plugin.view(), TQ_SIGNAL(runCommand(const TQCString &)), + TQ_SLOT(runCommand(const TQCString &))); // if (location > m_oldLocation) // m_oldLocation = location; @@ -393,8 +393,8 @@ void KSim::MainView::preferences() { if (m_prefDialog == 0L) { m_prefDialog = new KSim::ConfigDialog(m_config, this, "m_prefDialog"); - connect(m_prefDialog, TQT_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), - this, TQT_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); + connect(m_prefDialog, TQ_SIGNAL(reparse(bool, const KSim::ChangedPluginList &)), + this, TQ_SLOT(reparseConfig(bool, const KSim::ChangedPluginList &))); } m_prefDialog->exec(); diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp index 99eb9c8..8f07f30 100644 --- a/ksim/library/chart.cpp +++ b/ksim/library/chart.cpp @@ -49,8 +49,8 @@ class KSim::Chart::Timer tqAddPostRoutine(cleanup); } - TQObject::connect(m_timer, TQT_SIGNAL(timeout()), - chart, TQT_SLOT(updateDisplay())); + TQObject::connect(m_timer, TQ_SIGNAL(timeout()), + chart, TQ_SLOT(updateDisplay())); } static void disconnect(KSim::Chart *chart) @@ -58,8 +58,8 @@ class KSim::Chart::Timer if (!m_timer) return; - TQObject::disconnect(m_timer, TQT_SIGNAL(timeout()), - chart, TQT_SLOT(updateDisplay())); + TQObject::disconnect(m_timer, TQ_SIGNAL(timeout()), + chart, TQ_SLOT(updateDisplay())); } private: diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index 7ef24b2..150a2ba 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -123,7 +123,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) d->parent = parent; d->popupMenu = new TQPopupMenu(this); d->popupMenu->insertItem(i18n("About"), this, - TQT_SLOT(showAbout()), 0, -1, 0); + TQ_SLOT(showAbout()), 0, -1, 0); if (parent && !parent->configFileName().isEmpty()) d->config = new TDEConfig(parent->configFileName() + "rc"); diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp index 68b2b90..68d720b 100644 --- a/ksim/monitors/cpu/ksimcpu.cpp +++ b/ksim/monitors/cpu/ksimcpu.cpp @@ -126,7 +126,7 @@ CpuView::CpuView(KSim::PluginObject *parent, const char *name) addDisplay(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateView())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateView())); m_timer->start(CPU_SPEED); updateView(); } @@ -372,8 +372,8 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_listView->addColumn(i18n("Chart Format")); m_listView->setAllColumnsShowFocus(true); m_listView->setSelectionMode(TQListView::Single); - connect( m_listView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_listView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); mainLayout->addWidget( m_listView ); @@ -386,7 +386,7 @@ CpuConfig::CpuConfig(KSim::PluginObject *parent, const char *name) m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); layout->addWidget( m_modify ); mainLayout->addLayout( layout ); diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp index d3a3827..fe278b5 100644 --- a/ksim/monitors/disk/ksimdisk.cpp +++ b/ksim/monitors/disk/ksimdisk.cpp @@ -126,7 +126,7 @@ DiskView::DiskView(KSim::PluginObject *parent, const char *name) init(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(updateDisplay())); + connect(m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(updateDisplay())); m_timer->start(DISK_SPEED); updateDisplay(); } @@ -491,12 +491,12 @@ DiskConfig::DiskConfig(KSim::PluginObject *parent, const char *name) m_add = new TQPushButton(this); m_add->setText(i18n("Add...")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); layout->addWidget(m_add); m_remove = new TQPushButton(this); m_remove->setText(i18n("Remove")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); layout->addWidget(m_remove); m_layout->addLayout(layout); diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp index 4a63e04..21aebff 100644 --- a/ksim/monitors/filesystem/filesystemwidget.cpp +++ b/ksim/monitors/filesystem/filesystemwidget.cpp @@ -200,11 +200,11 @@ void FilesystemWidget::createProcess(const TQString &command, const TQString &po { m_process = new TDEProcess(); connect(m_process, - TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); + TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); connect(m_process, - TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(processExited(TDEProcess *))); + TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(processExited(TDEProcess *))); (*m_process) << command << point; void(m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)); diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp index 0a436ed..262ae93 100644 --- a/ksim/monitors/filesystem/ksimfsystem.cpp +++ b/ksim/monitors/filesystem/ksimfsystem.cpp @@ -100,7 +100,7 @@ Fsystem::Fsystem(KSim::PluginObject *parent, const char *name) createFreeInfo(); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateFS())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateFS())); m_updateTimer->start(config()->readNumEntry("updateValue", 60) * 1000); } diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 21d0c9e..556f15c 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -121,7 +121,7 @@ void I8KView::openStream() { m_procStream = new TQTextIStream( m_procFile ); disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( updateView() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( updateView() ) ); m_timer->start( m_interval*1000 ); kdDebug( 2003 ) << "i8k: Success" << endl; @@ -130,7 +130,7 @@ void I8KView::openStream() { // i8k module is not loaded. Try again after 30 secs. disconnect( m_timer, 0, 0, 0 ); - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( openStream() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( openStream() ) ); m_timer->start( 30*1000 ); kdDebug( 2003 ) << "i8k: Failed...retry after 30 secs" << endl; } diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp index 9514bc5..e920df9 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.cpp +++ b/ksim/monitors/lm_sensors/ksimsensors.cpp @@ -77,8 +77,8 @@ SensorsView::SensorsView(KSim::PluginObject *parent, const char *name) config()->setGroup("Sensors"); (new TQVBoxLayout(this))->setAutoAdd(true); - connect(SensorBase::self(), TQT_SIGNAL(updateSensors(const SensorList &)), - this, TQT_SLOT(updateSensors(const SensorList &))); + connect(SensorBase::self(), TQ_SIGNAL(updateSensors(const SensorList &)), + this, TQ_SLOT(updateSensors(const SensorList &))); insertSensors(); } diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp index c81ad56..0584870 100644 --- a/ksim/monitors/lm_sensors/sensorbase.cpp +++ b/ksim/monitors/lm_sensors/sensorbase.cpp @@ -76,7 +76,7 @@ SensorBase::SensorBase() : TQObject() } m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(update())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(update())); } SensorBase::~SensorBase() diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp index 1a1f4a1..e8afb88 100644 --- a/ksim/monitors/lm_sensors/sensorsconfig.cpp +++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp @@ -67,18 +67,18 @@ SensorsConfig::SensorsConfig(KSim::PluginObject *parent, const char *name) m_sensorView->setColumnWidth(1, 60); m_sensorView->setColumnWidth(2, 80); m_sensorView->setAllColumnsShowFocus(true); - connect(m_sensorView, TQT_SIGNAL(contextMenu(TDEListView *, - TQListViewItem *, const TQPoint &)), this, TQT_SLOT(menu(TDEListView *, + connect(m_sensorView, TQ_SIGNAL(contextMenu(TDEListView *, + TQListViewItem *, const TQPoint &)), this, TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect( m_sensorView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( modify( TQListViewItem * ) ) ); + connect( m_sensorView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( modify( TQListViewItem * ) ) ); m_layout->addMultiCellWidget(m_sensorView, 1, 1, 0, 3); m_modify = new TQPushButton( this ); m_modify->setText( i18n( "Modify..." ) ); - connect( m_modify, TQT_SIGNAL( clicked() ), TQT_SLOT( modify() ) ); + connect( m_modify, TQ_SIGNAL( clicked() ), TQ_SLOT( modify() ) ); m_layout->addMultiCellWidget( m_modify, 2, 2, 3, 3 ); m_fahrenBox = new TQCheckBox(i18n("Display Fahrenheit"), this); diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp index bf67d46..fdfc977 100644 --- a/ksim/monitors/mail/ksimmail.cpp +++ b/ksim/monitors/mail/ksimmail.cpp @@ -93,7 +93,7 @@ MailLabel::MailLabel( TQWidget* parent ) // label->setPixmap( KSim::ThemeLoader::self().current().krellMail() ); configureObject( false ); TQTimer* timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), TQT_SLOT( animation() ) ); + connect( timer, TQ_SIGNAL( timeout() ), TQ_SLOT( animation() ) ); timer->start( 100 ); } diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp index e72f8ea..2167abe 100644 --- a/ksim/monitors/net/ksimnet.cpp +++ b/ksim/monitors/net/ksimnet.cpp @@ -119,11 +119,11 @@ NetView::NetView(KSim::PluginObject *parent, const char *name) addDisplay(); m_netTimer = new TQTimer(this); - connect(m_netTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph())); + connect(m_netTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph())); m_netTimer->start(NET_UPDATE); m_lightTimer = new TQTimer(this); - connect(m_lightTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateLights())); + connect(m_lightTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateLights())); m_lightTimer->start(LED_UPDATE); updateGraph(); @@ -444,10 +444,10 @@ TQPopupMenu *NetView::addPopupMenu(const TQString &device, int value) { TQPopupMenu *popup = new TQPopupMenu(this); popup->insertItem(SmallIcon("network"), i18n("Connect"), this, - TQT_SLOT(runConnectCommand(int)), 0, 1); + TQ_SLOT(runConnectCommand(int)), 0, 1); popup->setItemParameter(1, value); popup->insertItem(SmallIcon("network"), i18n("Disconnect"), this, - TQT_SLOT(runDisconnectCommand(int)), 0, 2); + TQ_SLOT(runDisconnectCommand(int)), 0, 2); popup->setItemParameter(2, value); menu()->insertItem(device, popup, 100 + value); return popup; diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp index eb2c1a3..2cfc1af 100644 --- a/ksim/monitors/net/netconfig.cpp +++ b/ksim/monitors/net/netconfig.cpp @@ -49,11 +49,11 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) usingBox ->addColumn(i18n("Commands")); usingBox->setAllColumnsShowFocus(true); - connect(usingBox, TQT_SIGNAL(contextMenu(TDEListView *, + connect(usingBox, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - TQT_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect(usingBox, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - TQT_SLOT(modifyItem(TQListViewItem *))); + TQ_SLOT(menu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(usingBox, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + TQ_SLOT(modifyItem(TQListViewItem *))); mainLayout->addWidget(usingBox); layout = new TQHBoxLayout; @@ -65,17 +65,17 @@ NetConfig::NetConfig(KSim::PluginObject *parent, const char *name) insertButton = new TQPushButton(this); insertButton->setText(i18n("Add...")); - connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(showNetDialog())); + connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(showNetDialog())); layout->addWidget(insertButton); modifyButton = new TQPushButton(this); modifyButton->setText(i18n("Modify...")); - connect(modifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(modifyCurrent())); + connect(modifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(modifyCurrent())); layout->addWidget(modifyButton); removeButton = new TQPushButton(this); removeButton->setText(i18n("Remove")); - connect(removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeCurrent())); + connect(removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeCurrent())); layout->addWidget(removeButton); mainLayout->addLayout(layout); diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp index 12ef26d..39ea761 100644 --- a/ksim/monitors/net/netdialog.cpp +++ b/ksim/monitors/net/netdialog.cpp @@ -99,8 +99,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_showTimer = new TQCheckBox(m_timerBox); m_showTimer->setText(i18n("Show timer")); - connect(m_showTimer, TQT_SIGNAL(toggled(bool)), - m_timerEdit, TQT_SLOT(setEnabled(bool))); + connect(m_showTimer, TQ_SIGNAL(toggled(bool)), + m_timerEdit, TQ_SLOT(setEnabled(bool))); m_timerBoxLayout->addWidget(m_showTimer); m_timerBoxLayout->addWidget(m_timerEdit); @@ -138,8 +138,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_connectRequester = new KURLRequester(m_commandTab); m_connectRequester->setMinimumSize(145, 0); m_connectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_connectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_connectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_connectRequester, 1, 1, 1, 2); m_dCommand = new TQLabel(m_commandTab); @@ -149,8 +149,8 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) m_disconnectRequester = new KURLRequester(m_commandTab); m_disconnectRequester->setMinimumSize(145, 0); m_disconnectRequester->setEnabled(false); - connect(m_enableCommands, TQT_SIGNAL(toggled(bool)), - m_disconnectRequester, TQT_SLOT(setEnabled(bool))); + connect(m_enableCommands, TQ_SIGNAL(toggled(bool)), + m_disconnectRequester, TQ_SLOT(setEnabled(bool))); m_commandLayout->addMultiCellWidget(m_disconnectRequester, 2, 2, 1, 2); TQSpacerItem *commandSpacer = new TQSpacerItem(20, 20, @@ -160,7 +160,7 @@ NetDialog::NetDialog(TQWidget *parent, const char *name) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect(this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(sendClicked())); + connect(this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(sendClicked())); } NetDialog::~NetDialog() diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp index 6e224f8..3aeb2b1 100644 --- a/ksim/monitors/snmp/browsedialog.cpp +++ b/ksim/monitors/snmp/browsedialog.cpp @@ -96,10 +96,10 @@ void BrowseDialog::startWalk( const Identifier &startOid ) stopWalker(); m_walker = new Walker( m_host, startOid, this ); - connect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - connect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + connect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + connect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); stop->setEnabled( true ); } @@ -109,10 +109,10 @@ void BrowseDialog::stopWalker() if ( !m_walker ) return; - disconnect( m_walker, TQT_SIGNAL( resultReady( const Walker::Result & ) ), - this, TQT_SLOT( insertBrowseItem( const Walker::Result & ) ) ); - disconnect( m_walker, TQT_SIGNAL( finished() ), - this, TQT_SLOT( nextWalk() ) ); + disconnect( m_walker, TQ_SIGNAL( resultReady( const Walker::Result & ) ), + this, TQ_SLOT( insertBrowseItem( const Walker::Result & ) ) ); + disconnect( m_walker, TQ_SIGNAL( finished() ), + this, TQ_SLOT( nextWalk() ) ); m_walker->deleteLater(); m_walker = 0; diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index e1dfcca..4ecd44e 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -50,24 +50,24 @@ ConfigPage::ConfigPage( Plugin *parent, const char *name ) m_page = new ConfigWidget( this ); - connect( m_page->addHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewHost() ) ); - connect( m_page->modifyHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyHost() ) ); - connect( m_page->removeHost, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeHost() ) ); - - connect( m_page->addMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( addNewMonitor() ) ); - connect( m_page->modifyMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( modifyMonitor() ) ); - connect( m_page->removeMonitor, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( removeMonitor() ) ); - - connect( m_page->hosts, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); - connect( m_page->monitors, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->addHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewHost() ) ); + connect( m_page->modifyHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyHost() ) ); + connect( m_page->removeHost, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeHost() ) ); + + connect( m_page->addMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( addNewMonitor() ) ); + connect( m_page->modifyMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( modifyMonitor() ) ); + connect( m_page->removeMonitor, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( removeMonitor() ) ); + + connect( m_page->hosts, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); + connect( m_page->monitors, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( disableOrEnableSomeWidgets() ) ); } ConfigPage::~ConfigPage() diff --git a/ksim/monitors/snmp/monitor.cpp b/ksim/monitors/snmp/monitor.cpp index aa645cf..1294c10 100644 --- a/ksim/monitors/snmp/monitor.cpp +++ b/ksim/monitors/snmp/monitor.cpp @@ -32,7 +32,7 @@ Monitor::Monitor( const HostConfig &host, const Identifier &oid, int refresh, TQ else m_timerId = -1; - TQTimer::singleShot( 0, this, TQT_SLOT( performSnmpRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( performSnmpRequest() ) ); } Monitor::~Monitor() diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 5242ee0..4e42bda 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -108,8 +108,8 @@ TQWidget *MonitorConfig::createMonitorWidget( TQWidget *parent, const char *name w = new ChartMonitor( *this, parent, name ); Monitor *monitor = new Monitor( host, id, refresh, w ); - TQObject::connect( monitor, TQT_SIGNAL( newData( const Value & ) ), - w, TQT_SLOT( setData( const Value & ) ) ); + TQObject::connect( monitor, TQ_SIGNAL( newData( const Value & ) ), + w, TQ_SLOT( setData( const Value & ) ) ); return w; } diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp index 736c534..2c9e930 100644 --- a/ksim/monitors/snmp/probedialog.cpp +++ b/ksim/monitors/snmp/probedialog.cpp @@ -79,10 +79,10 @@ void ProbeDialog::probeOne() delete m_currentMonitor; m_currentMonitor = new Monitor( m_host, oid, 0 /* no refresh */, this ); - connect( m_currentMonitor, TQT_SIGNAL( newData( const Identifier &, const Value & ) ), - this, TQT_SLOT( probeResult( const Identifier &, const Value & ) ) ); - connect( m_currentMonitor, TQT_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), - this, TQT_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( newData( const Identifier &, const Value & ) ), + this, TQ_SLOT( probeResult( const Identifier &, const Value & ) ) ); + connect( m_currentMonitor, TQ_SIGNAL( error( const Identifier &, const ErrorInfo & ) ), + this, TQ_SLOT( probeError( const Identifier &, const ErrorInfo & ) ) ); } void ProbeDialog::probeResult( const Identifier &oid, const Value &value ) @@ -108,7 +108,7 @@ void ProbeDialog::nextProbe() if ( m_canceled ) KProgressDialog::done( TQDialog::Rejected ); else - TQTimer::singleShot( 0, this, TQT_SLOT( probeOne() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( probeOne() ) ); } #include "probedialog.moc" diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp index b0218d4..b39d02c 100644 --- a/ksim/themeprefs.cpp +++ b/ksim/themeprefs.cpp @@ -77,8 +77,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_urlLabel = new KURLLabel(this); m_urlLabel->setText(i18n("Open Konqueror in KSim's theme folder")); m_urlLabel->setURL(TQString::fromLatin1("file://") + themeDir); - connect(m_urlLabel, TQT_SIGNAL(leftClickedURL(const TQString &)), - this, TQT_SLOT(openURL(const TQString &))); + connect(m_urlLabel, TQ_SIGNAL(leftClickedURL(const TQString &)), + this, TQ_SLOT(openURL(const TQString &))); m_themeLayout->addMultiCellWidget(m_urlLabel, 1, 1, 0, 4); m_line = new KSeparator(TQt::Horizontal, this); @@ -99,8 +99,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_listView = new TDEListView(this); m_listView->addColumn(i18n("Theme")); m_listView->setFullWidth(true); - connect(m_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(selectItem(TQListViewItem *))); + connect(m_listView, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(selectItem(TQListViewItem *))); m_themeLayout->addMultiCellWidget(m_listView, 4, 4, 0, 4); m_alternateLabel = new TQLabel(this); @@ -126,8 +126,8 @@ KSim::ThemePrefs::ThemePrefs(TQWidget *parent, const char *name) m_fontsCombo->insertItem(i18n("Default")); m_fontsCombo->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect(m_fontsCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(showFontDialog(int))); + connect(m_fontsCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(showFontDialog(int))); m_themeLayout->addMultiCellWidget(m_fontsCombo, 5, 5, 4, 4); TQStringList locatedFiles = TDEGlobal::dirs()->findDirs("data", "ksim/themes"); diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp index 3a3cef8..fb047f3 100644 --- a/ktimer/ktimer.cpp +++ b/ktimer/ktimer.cpp @@ -115,11 +115,11 @@ KTimerPref::KTimerPref( TQWidget *parent, const char *name ) tray->setPixmap( SmallIcon( "ktimer" ) ); // connect - connect( m_add, TQT_SIGNAL(clicked()), TQT_SLOT(add()) ); - connect( m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove()) ); - connect( m_help, TQT_SIGNAL(clicked()), TQT_SLOT(help()) ); - connect( m_list, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(currentChanged(TQListViewItem*)) ); + connect( m_add, TQ_SIGNAL(clicked()), TQ_SLOT(add()) ); + connect( m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove()) ); + connect( m_help, TQ_SIGNAL(clicked()), TQ_SLOT(help()) ); + connect( m_list, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(currentChanged(TQListViewItem*)) ); loadJobs( kapp->config() ); show(); @@ -138,16 +138,16 @@ void KTimerPref::add() KTimerJob *job = new KTimerJob; KTimerJobItem *item = new KTimerJobItem( job, m_list ); - connect( job, TQT_SIGNAL(delayChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(valueChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(stateChanged(KTimerJob*,States)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(commandChanged(KTimerJob*,const TQString&)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)), - TQT_SLOT(jobFinished(KTimerJob*,bool)) ); + connect( job, TQ_SIGNAL(delayChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(valueChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(stateChanged(KTimerJob*,States)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(commandChanged(KTimerJob*,const TQString&)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(finished(KTimerJob*,bool)), + TQ_SLOT(jobFinished(KTimerJob*,bool)) ); job->setUser( item ); @@ -192,22 +192,22 @@ void KTimerPref::currentChanged( TQListViewItem *i ) m_counter->disconnect(); m_slider->disconnect(); - connect( m_commandLine->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)), - job, TQT_SLOT(setCommand(const TQString &)) ); - connect( m_delay, TQT_SIGNAL(valueChanged(int)), - job, TQT_SLOT(setDelay(int)) ); - connect( m_loop, TQT_SIGNAL(toggled(bool)), - job, TQT_SLOT(setLoop(bool)) ); - connect( m_one, TQT_SIGNAL(toggled(bool)), - job, TQT_SLOT(setOneInstance(bool)) ); - connect( m_stop, TQT_SIGNAL(clicked()), - job, TQT_SLOT(stop()) ); - connect( m_pause, TQT_SIGNAL(clicked()), - job, TQT_SLOT(pause()) ); - connect( m_start, TQT_SIGNAL(clicked()), - job, TQT_SLOT(start()) ); - connect( m_slider, TQT_SIGNAL(valueChanged(int)), - job, TQT_SLOT(setValue(int)) ); + connect( m_commandLine->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)), + job, TQ_SLOT(setCommand(const TQString &)) ); + connect( m_delay, TQ_SIGNAL(valueChanged(int)), + job, TQ_SLOT(setDelay(int)) ); + connect( m_loop, TQ_SIGNAL(toggled(bool)), + job, TQ_SLOT(setLoop(bool)) ); + connect( m_one, TQ_SIGNAL(toggled(bool)), + job, TQ_SLOT(setOneInstance(bool)) ); + connect( m_stop, TQ_SIGNAL(clicked()), + job, TQ_SLOT(stop()) ); + connect( m_pause, TQ_SIGNAL(clicked()), + job, TQ_SLOT(pause()) ); + connect( m_start, TQ_SIGNAL(clicked()), + job, TQ_SLOT(start()) ); + connect( m_slider, TQ_SIGNAL(valueChanged(int)), + job, TQ_SLOT(setValue(int)) ); m_commandLine->lineEdit()->setText( job->command() ); m_delay->setValue( job->delay() ); @@ -276,16 +276,16 @@ void KTimerPref::loadJobs( TDEConfig *cfg ) KTimerJob *job = new KTimerJob; KTimerJobItem *item = new KTimerJobItem( job, m_list ); - connect( job, TQT_SIGNAL(delayChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(valueChanged(KTimerJob*,unsigned)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(stateChanged(KTimerJob*,States)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(commandChanged(KTimerJob*,const TQString&)), - TQT_SLOT(jobChanged(KTimerJob*)) ); - connect( job, TQT_SIGNAL(finished(KTimerJob*,bool)), - TQT_SLOT(jobFinished(KTimerJob*,bool)) ); + connect( job, TQ_SIGNAL(delayChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(valueChanged(KTimerJob*,unsigned)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(stateChanged(KTimerJob*,States)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(commandChanged(KTimerJob*,const TQString&)), + TQ_SLOT(jobChanged(KTimerJob*)) ); + connect( job, TQ_SIGNAL(finished(KTimerJob*,bool)), + TQ_SLOT(jobFinished(KTimerJob*,bool)) ); job->load( cfg, TQString( "Job%1" ).arg(n) ); @@ -327,7 +327,7 @@ KTimerJob::KTimerJob( TQObject *parent, const char *name ) d->user = 0; d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) ); + connect( d->timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) ); } @@ -509,8 +509,8 @@ void KTimerJob::fire() KShellProcess *proc = new KShellProcess; (*proc) << d->command; d->processes.append( proc ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(processExited(TDEProcess*)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(processExited(TDEProcess*)) ); bool ok = proc->start( TDEProcess::NotifyOnExit ); emit fired( this ); if( !ok ) { diff --git a/superkaramba/src/datesensor.cpp b/superkaramba/src/datesensor.cpp index 6adef6d..24e4675 100644 --- a/superkaramba/src/datesensor.cpp +++ b/superkaramba/src/datesensor.cpp @@ -87,7 +87,7 @@ void DateSensor::toggleCalendar(TQMouseEvent *ev) hidden = false; cal = new DatePicker(0); - connect(cal, TQT_SIGNAL(destroyed()), TQT_SLOT(slotCalendarDeleted())); + connect(cal, TQ_SIGNAL(destroyed()), TQ_SLOT(slotCalendarDeleted())); TQPoint c = (TQPoint(ev->x(), ev->y())); int w = cal->sizeHint().width(); diff --git a/superkaramba/src/disksensor.cpp b/superkaramba/src/disksensor.cpp index e16d415..50f23ff 100644 --- a/superkaramba/src/disksensor.cpp +++ b/superkaramba/src/disksensor.cpp @@ -18,10 +18,10 @@ DiskSensor::DiskSensor( int msec ) : Sensor( msec ) { - connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int ))); - connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processExited( TDEProcess * ))); + connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int ))); + connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processExited( TDEProcess * ))); // update values on startup ksp.clearArguments(); diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp index 2edac34..4b934a9 100644 --- a/superkaramba/src/imagelabel.cpp +++ b/superkaramba/src/imagelabel.cpp @@ -39,7 +39,7 @@ Effect::Effect(ImageLabel* img, int msec) : if (msec > 0) { // remove the effect after the given time - //TQTimer::singleShot (millisec, myImage, TQT_SLOT(slotEffectExpired())); + //TQTimer::singleShot (millisec, myImage, TQ_SLOT(slotEffectExpired())); //timer -> changeInterval(millisec); millisec = msec; } @@ -57,7 +57,7 @@ void Effect::startTimer() { if (millisec > 0) { - TQTimer::singleShot (millisec, myImage, TQT_SLOT(slotEffectExpired())); + TQTimer::singleShot (millisec, myImage, TQ_SLOT(slotEffectExpired())); millisec = 0; } } @@ -287,8 +287,8 @@ void ImageLabel::setValue(TQString fn) KTempFile tmpFile; TDEIO::FileCopyJob* copy = TDEIO::file_copy(fileName, tmpFile.name(), 0600, true, false, false); - connect(copy, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotCopyResult(TDEIO::Job*))); + connect(copy, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotCopyResult(TDEIO::Job*))); return; } else diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index ebd7f2f..d4a74f7 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -77,7 +77,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, if(!m_theme.set(url)) { setFixedSize(0, 0); - TQTimer::singleShot(100, this, TQT_SLOT(killWidget())); + TQTimer::singleShot(100, this, TQ_SLOT(killWidget())); return; } // Add self to list of open themes @@ -93,8 +93,8 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, setName(qName.ascii()); KDirWatch *dirWatch = KDirWatch::self(); - connect(dirWatch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( slotFileChanged( const TQString & ) ) ); + connect(dirWatch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( slotFileChanged( const TQString & ) ) ); if(!dirWatch->contains(m_theme.file())) dirWatch->addFile(m_theme.file()); @@ -132,7 +132,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, if(m_theme.pythonModuleExists()) { kdDebug() << "Loading python module: " << m_theme.pythonModule() << endl; - TQTimer::singleShot(0, this, TQT_SLOT(initPythonInterface())); + TQTimer::singleShot(0, this, TQ_SLOT(initPythonInterface())); } widgetMask = 0; @@ -142,22 +142,22 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, kWinModule = new KWinModule(); desktop = 0; - connect( kWinModule,TQT_SIGNAL(currentDesktopChanged(int)), this, - TQT_SLOT(currentDesktopChanged(int)) ); - connect( kapp, TQT_SIGNAL(backgroundChanged(int)), this, - TQT_SLOT(currentWallpaperChanged(int))); + connect( kWinModule,TQ_SIGNAL(currentDesktopChanged(int)), this, + TQ_SLOT(currentDesktopChanged(int)) ); + connect( kapp, TQ_SIGNAL(backgroundChanged(int)), this, + TQ_SLOT(currentWallpaperChanged(int))); // Setup of the Task Manager Callbacks - connect(&taskManager, TQT_SIGNAL(activeTaskChanged(Task*)), this, - TQT_SLOT(activeTaskChanged(Task*)) ); - connect(&taskManager, TQT_SIGNAL(taskAdded(Task*)), this, - TQT_SLOT(taskAdded(Task*)) ); - connect(&taskManager, TQT_SIGNAL(taskRemoved(Task*)), this, - TQT_SLOT(taskRemoved(Task*)) ); - connect(&taskManager, TQT_SIGNAL(startupAdded(Startup*)), this, - TQT_SLOT(startupAdded(Startup*)) ); - connect(&taskManager, TQT_SIGNAL(startupRemoved(Startup*)), this, - TQT_SLOT(startupRemoved(Startup*)) ); + connect(&taskManager, TQ_SIGNAL(activeTaskChanged(Task*)), this, + TQ_SLOT(activeTaskChanged(Task*)) ); + connect(&taskManager, TQ_SIGNAL(taskAdded(Task*)), this, + TQ_SLOT(taskAdded(Task*)) ); + connect(&taskManager, TQ_SIGNAL(taskRemoved(Task*)), this, + TQ_SLOT(taskRemoved(Task*)) ); + connect(&taskManager, TQ_SIGNAL(startupAdded(Startup*)), this, + TQ_SLOT(startupAdded(Startup*)) ); + connect(&taskManager, TQ_SIGNAL(startupRemoved(Startup*)), this, + TQ_SLOT(startupRemoved(Startup*)) ); themeConfMenu = new TDEPopupMenu( this); themeConfMenu -> setCheckable(true); @@ -171,7 +171,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, toDesktopMenu -> setCheckable(true); mid = toDesktopMenu -> insertItem (i18n("&All Desktops"), dslot = new DesktopChangeSlot(this,0), - TQT_SLOT(receive())); + TQ_SLOT(receive())); dslot->setMenuId(mid); toDesktopMenu -> insertSeparator(); @@ -181,7 +181,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, name += ('0' + ndesktop); mid = toDesktopMenu -> insertItem (name, - dslot = new DesktopChangeSlot(this, ndesktop), TQT_SLOT(receive())); + dslot = new DesktopChangeSlot(this, ndesktop), TQ_SLOT(receive())); dslot->setMenuId(mid); } @@ -193,11 +193,11 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, menuAccColl = new TDEActionCollection( this ); kpop->insertItem( SmallIconSet("reload"),i18n("Update"), this, - TQT_SLOT(updateSensors()), Key_F5 ); + TQ_SLOT(updateSensors()), Key_F5 ); toggleLocked = new TDEToggleAction ( i18n("Toggle &Locked Position"), SmallIconSet("locked"), CTRL+Key_L, this, - TQT_SLOT( slotToggleLocked() ), + TQ_SLOT( slotToggleLocked() ), accColl, "Locked position" ); accColl->insert(toggleLocked); toggleLocked -> setChecked(true); @@ -206,7 +206,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, toggleFastTransforms = new TDEToggleAction(i18n("Use &Fast Image Scaling"), CTRL+Key_F, this, - TQT_SLOT( slotToggleFastTransforms() ), + TQ_SLOT( slotToggleFastTransforms() ), accColl, "Fast transformations"); accColl->insert(toggleFastTransforms); @@ -221,9 +221,9 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, kpop->insertItem(i18n("To Des&ktop"), toDesktopMenu); kpop->insertItem( SmallIconSet("reload3"),i18n("&Reload Theme"),this, - TQT_SLOT(reloadConfig()), CTRL+Key_R ); + TQ_SLOT(reloadConfig()), CTRL+Key_R ); kpop->insertItem( SmallIconSet("window-close"),i18n("&Close This Theme"), this, - TQT_SLOT(killWidget()), CTRL+Key_C ); + TQ_SLOT(killWidget()), CTRL+Key_C ); if(!SuperKarambaSettings::showSysTray()) showMenuExtension(); @@ -262,7 +262,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, if( !parseConfig() ) { setFixedSize(0,0); - TQTimer::singleShot( 100, this, TQT_SLOT(killWidget()) ); + TQTimer::singleShot( 100, this, TQ_SLOT(killWidget()) ); tqWarning("Could not read config file."); } else @@ -605,7 +605,7 @@ bool karamba::parseConfig() if (!tiptext.isEmpty()) tmp->setTooltip(tiptext); - connect(tmp, TQT_SIGNAL(pixmapLoaded()), this, TQT_SLOT(externalStep())); + connect(tmp, TQ_SIGNAL(pixmapLoaded()), this, TQ_SLOT(externalStep())); setSensor(lineParser, (Meter*) tmp ); meterList->append (tmp ); imageList->append (tmp ); @@ -790,12 +790,12 @@ void karamba::start() { m_sysTimer = new TQTimer(this); - connect(m_sysTimer, TQT_SIGNAL(timeout()), TQT_SLOT(step())); + connect(m_sysTimer, TQ_SIGNAL(timeout()), TQ_SLOT(step())); m_sysTimer->start(m_interval); //Start the widget running - TQTimer::singleShot( 0, this, TQT_SLOT(step()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(step()) ); if( !(onTop || managed) ) lowerTimer.start(); @@ -1015,7 +1015,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) int interval = lineParser.getInt("INTERVAL"); interval = (interval == 0)?5000:interval; sensor = ( sensorMap["DISK"] = new DiskSensor( interval ) ); - connect( sensor, TQT_SIGNAL(initComplete()), this, TQT_SLOT(externalStep()) ); + connect( sensor, TQ_SIGNAL(initComplete()), this, TQ_SLOT(externalStep()) ); sensorList->append( sensor ); } // meter->setMax( ((DiskSensor*)sensor)->getTotalSpace(mntPt)/1024 ); @@ -1216,7 +1216,7 @@ void karamba::setSensor(const LineParser& lineParser, Meter* meter) if (sensor != 0) { - TQTimer::singleShot( 0, sensor, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, sensor, TQ_SLOT(update()) ); sensor->start(); } } @@ -1560,7 +1560,7 @@ void karamba::updateSensors() ((Sensor*) *it)->update(); ++it; } - TQTimer::singleShot( 500, this, TQT_SLOT(step()) ); + TQTimer::singleShot( 500, this, TQ_SLOT(step()) ); } void karamba::updateBackground(TDESharedPixmap* kpm) @@ -1780,14 +1780,14 @@ void karamba::addMenuConfigOption(TQString key, TQString name) SignalBridge* action = new SignalBridge(this, key, menuAccColl); TDEToggleAction* confItem = new TDEToggleAction (name, TDEShortcut::null(), - action, TQT_SLOT(receive()), + action, TQ_SLOT(receive()), menuAccColl, key.ascii()); confItem -> setName(key.ascii()); menuAccColl -> insert(confItem); - connect(action, TQT_SIGNAL( enabled(TQString, bool) ), - this, TQT_SLOT( slotToggleConfigOption(TQString, bool) )); + connect(action, TQ_SIGNAL( enabled(TQString, bool) ), + this, TQ_SLOT( slotToggleConfigOption(TQString, bool) )); config -> setGroup("config menu"); confItem -> setChecked(config -> readBoolEntry(key)); @@ -2034,16 +2034,16 @@ void karamba::showMenuExtension() trayMenuToggleId = kglobal->insertItem(SmallIconSet("superkaramba"), i18n("Show System Tray Icon"), this, - TQT_SLOT(slotToggleSystemTray()), + TQ_SLOT(slotToggleSystemTray()), CTRL+Key_S); trayMenuThemeId = kglobal->insertItem(SmallIconSet("knewstuff"), i18n("&Manage Themes..."), this, - TQT_SLOT(slotShowTheme()), CTRL+Key_M); + TQ_SLOT(slotShowTheme()), CTRL+Key_M); trayMenuQuitId = kglobal->insertItem(SmallIconSet("system-log-out"), i18n("&Quit SuperKaramba"), this, - TQT_SLOT(slotQuit()), CTRL+Key_Q); + TQ_SLOT(slotQuit()), CTRL+Key_Q); kglobal->polish(); diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index 79d7d42..b4bf15c 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -141,17 +141,17 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about) TDEPopupMenu *menu = sysTrayIcon->contextMenu(); menu->insertItem(SmallIconSet("superkaramba"), i18n("Hide System Tray Icon"), this, - TQT_SLOT(globalHideSysTray())); + TQ_SLOT(globalHideSysTray())); menu->insertSeparator(); m_helpMenu = new KHelpMenu(themeListWindow, about); - action = KStdAction::help(m_helpMenu, TQT_SLOT(appHelpActivated()), + action = KStdAction::help(m_helpMenu, TQ_SLOT(appHelpActivated()), sysTrayIcon->actionCollection()); action->plug(menu); - action = KStdAction::aboutApp(m_helpMenu, TQT_SLOT(aboutApplication()), + action = KStdAction::aboutApp(m_helpMenu, TQ_SLOT(aboutApplication()), sysTrayIcon->actionCollection()); action->plug(menu); - action = KStdAction::aboutKDE(m_helpMenu, TQT_SLOT(aboutKDE()), + action = KStdAction::aboutKDE(m_helpMenu, TQ_SLOT(aboutKDE()), sysTrayIcon->actionCollection()); action->plug(menu); @@ -164,8 +164,8 @@ void KarambaApplication::setUpSysTray(TDEAboutData* about) sysTrayIcon->hide(); //Connect Systray icon's quit event - TQObject::connect(sysTrayIcon, TQT_SIGNAL(quitSelected()), - this, TQT_SLOT(globalQuitSuperKaramba())); + TQObject::connect(sysTrayIcon, TQ_SIGNAL(quitSelected()), + this, TQ_SLOT(globalQuitSuperKaramba())); } void KarambaApplication::showKarambaMenuExtension(bool show) diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp index 1811f38..56e0769 100644 --- a/superkaramba/src/kwidgetlistbox.cpp +++ b/superkaramba/src/kwidgetlistbox.cpp @@ -33,8 +33,8 @@ KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name) verticalHeader()->hide(); setSelectionMode(TQTable::NoSelection); setFocusStyle(TQTable::FollowStyle); - connect(this, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(selectionChanged(int, int))); + connect(this, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(selectionChanged(int, int))); setHScrollBarMode(TQScrollView::AlwaysOff); setVScrollBarMode(TQScrollView::Auto); } diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp index 6196983..d336bd4 100644 --- a/superkaramba/src/main.cpp +++ b/superkaramba/src/main.cpp @@ -128,7 +128,7 @@ int main(int argc, char **argv) KarambaApplication::unlockKaramba(); - app.connect(tqApp,TQT_SIGNAL(lastWindowClosed()),tqApp,TQT_SLOT(quit())); + app.connect(tqApp,TQ_SIGNAL(lastWindowClosed()),tqApp,TQ_SLOT(quit())); // Try to restore a previous session if applicable. app.checkPreviousSession(app, lst); diff --git a/superkaramba/src/memsensor.cpp b/superkaramba/src/memsensor.cpp index 98eceea..1d6c4dc 100644 --- a/superkaramba/src/memsensor.cpp +++ b/superkaramba/src/memsensor.cpp @@ -57,10 +57,10 @@ MemSensor::MemSensor(int msec) : Sensor(msec) # if defined(Q_OS_FREEBSD) && defined(__FreeBSD_version) && __FreeBSD_version >= 500018 kd = kvm_open("/dev/null", "/dev/null", "/dev/null", O_RDONLY, "kvm_open"); # elif defined Q_OS_FREEBSD - connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int ))); - connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processExited( TDEProcess * ))); + connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int ))); + connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processExited( TDEProcess * ))); swapTotal = swapUsed = 0; diff --git a/superkaramba/src/menu_python.cpp b/superkaramba/src/menu_python.cpp index c42a009..bc5d9e3 100644 --- a/superkaramba/src/menu_python.cpp +++ b/superkaramba/src/menu_python.cpp @@ -40,8 +40,8 @@ long createMenu(long widget) TDEPopupMenu* tmp = new TDEPopupMenu(currTheme); currTheme->menuList->append( tmp ); - currTheme->connect(tmp, TQT_SIGNAL(activated(int)), currTheme, - TQT_SLOT(passMenuItemClicked(int))); + currTheme->connect(tmp, TQ_SIGNAL(activated(int)), currTheme, + TQ_SLOT(passMenuItemClicked(int))); return (long)tmp; } diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp index 271ec51..5f60ff0 100644 --- a/superkaramba/src/misc_python.cpp +++ b/superkaramba/src/misc_python.cpp @@ -149,13 +149,13 @@ PyObject* py_execute_command_interactive(PyObject *, PyObject* args) } TQApplication::connect(currTheme->currProcess, - TQT_SIGNAL(processExited(TDEProcess *)), + TQ_SIGNAL(processExited(TDEProcess *)), currTheme, - TQT_SLOT(processExited(TDEProcess *))); + TQ_SLOT(processExited(TDEProcess *))); TQApplication::connect(currTheme->currProcess, - TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), currTheme, - TQT_SLOT(receivedStdout(TDEProcess *, char *, int))); + TQ_SLOT(receivedStdout(TDEProcess *, char *, int))); currTheme->currProcess->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); return Py_BuildValue((char*)"l", (int)(currTheme->currProcess->pid())); diff --git a/superkaramba/src/programsensor.cpp b/superkaramba/src/programsensor.cpp index 0c2f3e2..6bae664 100644 --- a/superkaramba/src/programsensor.cpp +++ b/superkaramba/src/programsensor.cpp @@ -25,10 +25,10 @@ ProgramSensor::ProgramSensor(const TQString &progName, int interval, TQString en programName = progName; //update(); - connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int ))); - connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processExited( TDEProcess * ))); + connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int ))); + connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processExited( TDEProcess * ))); } ProgramSensor::~ProgramSensor() diff --git a/superkaramba/src/sensor.cpp b/superkaramba/src/sensor.cpp index 378cb1d..8655754 100644 --- a/superkaramba/src/sensor.cpp +++ b/superkaramba/src/sensor.cpp @@ -19,7 +19,7 @@ void Sensor::start() { if (!timer.isActive()) { - connect (&timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(update())); + connect (&timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(update())); timer.start( (msec == 0)?1000:msec); } } diff --git a/superkaramba/src/sensorsensor.cpp b/superkaramba/src/sensorsensor.cpp index baea31d..2998ba4 100644 --- a/superkaramba/src/sensorsensor.cpp +++ b/superkaramba/src/sensorsensor.cpp @@ -29,10 +29,10 @@ SensorSensor::SensorSensor(int interval, char tempUnit) : Sensor( interval ) #endif if(tempUnit == 'F') extraParams = " -f"; - connect(&ksp, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )), - this,TQT_SLOT(receivedStdout(TDEProcess *, char *, int ))); - connect(&ksp, TQT_SIGNAL(processExited(TDEProcess *)), - this,TQT_SLOT(processExited( TDEProcess * ))); + connect(&ksp, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int )), + this,TQ_SLOT(receivedStdout(TDEProcess *, char *, int ))); + connect(&ksp, TQ_SIGNAL(processExited(TDEProcess *)), + this,TQ_SLOT(processExited( TDEProcess * ))); // readValues(); } diff --git a/superkaramba/src/showdesktop.cpp b/superkaramba/src/showdesktop.cpp index 57d1f46..1259288 100644 --- a/superkaramba/src/showdesktop.cpp +++ b/superkaramba/src/showdesktop.cpp @@ -40,10 +40,10 @@ ShowDesktop::ShowDesktop() kWinModule = new KWinModule( this ); // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect( kWinModule, TQT_SIGNAL(currentDesktopChanged(int)), - TQT_SLOT(slotCurrentDesktopChanged(int))); - connect( kWinModule, TQT_SIGNAL(windowChanged(WId,unsigned int)), - TQT_SLOT(slotWindowChanged(WId,unsigned int))); + connect( kWinModule, TQ_SIGNAL(currentDesktopChanged(int)), + TQ_SLOT(slotCurrentDesktopChanged(int))); + connect( kWinModule, TQ_SIGNAL(windowChanged(WId,unsigned int)), + TQ_SLOT(slotWindowChanged(WId,unsigned int))); } void ShowDesktop::slotCurrentDesktopChanged(int) diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp index f8397de..ea93889 100644 --- a/superkaramba/src/systemtray.cpp +++ b/superkaramba/src/systemtray.cpp @@ -95,7 +95,7 @@ void Systemtray::initSystray( void ) emb->setAutoDelete(false); - connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); + connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows())); m_Wins.append(emb); @@ -107,8 +107,8 @@ void Systemtray::initSystray( void ) updateTrayWindows(); - connect(twin_module, TQT_SIGNAL(systemTrayWindowAdded(WId)), TQT_SLOT(systemTrayWindowAdded(WId))); - connect(twin_module, TQT_SIGNAL(systemTrayWindowRemoved(WId)), TQT_SLOT(systemTrayWindowRemoved(WId))); + connect(twin_module, TQ_SIGNAL(systemTrayWindowAdded(WId)), TQ_SLOT(systemTrayWindowAdded(WId))); + connect(twin_module, TQ_SIGNAL(systemTrayWindowRemoved(WId)), TQ_SLOT(systemTrayWindowRemoved(WId))); TQCString screenstr; screenstr.setNum(tqt_xscreen()); @@ -206,7 +206,7 @@ void Systemtray::systemTrayWindowAdded( WId w ) emb->setAutoDelete(false); //emb->setBackgroundMode(X11ParentRelative); emb->setBackgroundMode(FixedPixmap); - connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); + connect(emb, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(updateTrayWindows())); m_Wins.append(emb); emb->embed(w); diff --git a/superkaramba/src/systray_python.cpp b/superkaramba/src/systray_python.cpp index c953fdb..e0d96a1 100644 --- a/superkaramba/src/systray_python.cpp +++ b/superkaramba/src/systray_python.cpp @@ -111,8 +111,8 @@ long createSystray(long widget, long x, long y, long w, long h) currTheme->systray->move((int)x,(int)y); currTheme->systray->setMinimumSize((int)w,(int)h); currTheme->systray->initSystray(); - TQObject::connect(currTheme->systray,TQT_SIGNAL(updated()), - currTheme,TQT_SLOT(systrayUpdated())); + TQObject::connect(currTheme->systray,TQ_SIGNAL(updated()), + currTheme,TQ_SLOT(systrayUpdated())); currTheme->systray->show(); } diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index e58f9b3..b666d28 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -55,11 +55,11 @@ TaskManager::TaskManager(TQObject *parent, const char *name) twin_module = new KWinModule(); // TDEGlobal::locale()->insertCatalogue("libtaskmanager"); - connect(twin_module, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId))); - connect(twin_module, TQT_SIGNAL(windowRemoved(WId)), TQT_SLOT(windowRemoved(WId))); - connect(twin_module, TQT_SIGNAL(activeWindowChanged(WId)), TQT_SLOT(activeWindowChanged(WId))); - connect(twin_module, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(currentDesktopChanged(int))); - connect(twin_module, TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(windowChanged(WId,unsigned int))); + connect(twin_module, TQ_SIGNAL(windowAdded(WId)), TQ_SLOT(windowAdded(WId))); + connect(twin_module, TQ_SIGNAL(windowRemoved(WId)), TQ_SLOT(windowRemoved(WId))); + connect(twin_module, TQ_SIGNAL(activeWindowChanged(WId)), TQ_SLOT(activeWindowChanged(WId))); + connect(twin_module, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(currentDesktopChanged(int))); + connect(twin_module, TQ_SIGNAL(windowChanged(WId,unsigned int)), TQ_SLOT(windowChanged(WId,unsigned int))); // register existing windows const TQValueList<WId> windows = twin_module->windows(); @@ -86,14 +86,14 @@ void TaskManager::configure_startup() return; _startup_info = new TDEStartupInfo( true, 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( gotRemoveStartup( const TDEStartupInfoId& ))); + TQ_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQ_SLOT( gotRemoveStartup( const TDEStartupInfoId& ))); c.setGroup( "TaskbarButtonSettings" ); _startup_info->setTimeout( c.readUnsignedNumEntry( "Timeout", 30 )); } @@ -780,7 +780,7 @@ void Task::updateThumbnail() geom.width(), geom.height() ); if ( !_grab.isNull() ) - TQTimer::singleShot( 200, this, TQT_SLOT( generateThumbnail() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( generateThumbnail() ) ); } void Task::generateThumbnail() diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index 7534054..4d79048 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -134,8 +134,8 @@ void ThemesDlg::populateListbox() item->buttonGo->setText(i18n("New Stuff...")); #ifdef HAVE_TDENEWSTUFF item->buttonGo->setEnabled(true); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(getNewStuff())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(getNewStuff())); #else item->buttonGo->setEnabled(false); #endif @@ -148,8 +148,8 @@ void ThemesDlg::populateListbox() item->setDescriptionText(i18n("Add local theme to the list.")); item->buttonGo->setProperty("stdItem", 18); item->buttonGo->setText(i18n("Open...")); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(openLocalTheme())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(openLocalTheme())); tableThemes->insertItem(item); dirs = ksd.findDirs("data", TQString(kapp->name()) + "/themes"); @@ -164,8 +164,8 @@ void ThemesDlg::populateListbox() item = new ThemeWidget(new ThemeFile(dir.filePath(*it))); tableThemes->insertItem(item); item->buttonGo->setText(i18n("Uninstall")); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(uninstall())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(uninstall())); } } t = SuperKarambaSettings::userAddedThemes(); @@ -178,8 +178,8 @@ void ThemesDlg::populateListbox() item = new ThemeWidget(file); tableThemes->insertItem(item); item->buttonGo->setText(i18n("Uninstall")); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(uninstall())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(uninstall())); } else delete file; @@ -363,8 +363,8 @@ int ThemesDlg::addThemeToList(const TQString &file) i = tableThemes->insertItem(item); item->buttonGo->setText(i18n("Uninstall")); - connect(item->buttonGo, TQT_SIGNAL(clicked()), - this, TQT_SLOT(uninstall())); + connect(item->buttonGo, TQ_SIGNAL(clicked()), + this, TQ_SLOT(uninstall())); } tableThemes->setSelected(i); return i; diff --git a/tdefilereplace/commandengine.cpp b/tdefilereplace/commandengine.cpp index 81feb0f..d59ef05 100644 --- a/tdefilereplace/commandengine.cpp +++ b/tdefilereplace/commandengine.cpp @@ -104,9 +104,9 @@ TQString CommandEngine::mathexp(const TQString& opt, const TQString& arg) *(proc) << script; - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*))); //Through slotGetScriptOutput, m_processOutput contains the result of the TDEProcess call if(!proc->start(TDEProcess::Block, TDEProcess::All)) diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp index ba76c8c..70f4f4e 100644 --- a/tdefilereplace/kaddstringdlg.cpp +++ b/tdefilereplace/kaddstringdlg.cpp @@ -44,12 +44,12 @@ KAddStringDlg::KAddStringDlg(RCOptions* info, TQWidget *parent, const char *name initGUI(); - connect(m_pbOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOK())); - connect(m_rbSearchOnly, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSearchOnly())); - connect(m_rbSearchReplace, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSearchReplace())); - connect(m_pbAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddStringToView())); - connect(m_pbDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteStringFromView())); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this ,TQT_SLOT(slotHelp())); + connect(m_pbOK, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOK())); + connect(m_rbSearchOnly, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSearchOnly())); + connect(m_rbSearchReplace, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSearchReplace())); + connect(m_pbAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddStringToView())); + connect(m_pbDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteStringFromView())); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this ,TQ_SLOT(slotHelp())); whatsThis(); } diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp index 69ffda3..dc142d9 100644 --- a/tdefilereplace/knewprojectdlg.cpp +++ b/tdefilereplace/knewprojectdlg.cpp @@ -58,23 +58,23 @@ KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *parent, const char *na initGUI(); - connect(m_chbIncludeSubfolders, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableMaxDepthControls(bool))); - connect(m_chbLimitDepth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxMaxDepth(bool))); - connect(m_pbLocation, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDir())); - connect(m_pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReject())); - connect(m_pbSearchNow, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchNow())); - connect(m_pbSearchLater, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchLater())); - connect(m_cbSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSearchLineEdit(const TQString&))); - connect(m_chbSizeMin, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxSizeMin(bool))); - connect(m_chbSizeMax, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxSizeMax(bool))); - connect(m_chbDateMin, TQT_SIGNAL(toggled(bool)), m_dedDateMin, TQT_SLOT(setEnabled(bool))); - connect(m_chbDateMax, TQT_SIGNAL(toggled(bool)), m_dedDateMax, TQT_SLOT(setEnabled(bool))); - connect(m_chbDateMin,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(slotEnableCbValidDate(bool))); - connect(m_chbDateMax,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(slotEnableCbValidDate(bool))); - connect(m_chbOwnerUser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbUser(bool))); - connect(m_chbOwnerGroup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbGroup(bool))); - connect(m_chbBackup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbBackup(bool))); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); + connect(m_chbIncludeSubfolders, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableMaxDepthControls(bool))); + connect(m_chbLimitDepth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxMaxDepth(bool))); + connect(m_pbLocation, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDir())); + connect(m_pbCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReject())); + connect(m_pbSearchNow, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchNow())); + connect(m_pbSearchLater, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchLater())); + connect(m_cbSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotSearchLineEdit(const TQString&))); + connect(m_chbSizeMin, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxSizeMin(bool))); + connect(m_chbSizeMax, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxSizeMax(bool))); + connect(m_chbDateMin, TQ_SIGNAL(toggled(bool)), m_dedDateMin, TQ_SLOT(setEnabled(bool))); + connect(m_chbDateMax, TQ_SIGNAL(toggled(bool)), m_dedDateMax, TQ_SLOT(setEnabled(bool))); + connect(m_chbDateMin,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(slotEnableCbValidDate(bool))); + connect(m_chbDateMax,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(slotEnableCbValidDate(bool))); + connect(m_chbOwnerUser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbUser(bool))); + connect(m_chbOwnerGroup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbGroup(bool))); + connect(m_chbBackup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbBackup(bool))); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHelp())); whatsThis(); } diff --git a/tdefilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp index 748c925..8a66d85 100644 --- a/tdefilereplace/koptionsdlg.cpp +++ b/tdefilereplace/koptionsdlg.cpp @@ -48,12 +48,12 @@ KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : initGUI(); - connect(m_pbOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOK())); - connect(m_pbDefault, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotDefaults())); - connect(m_chbBackup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbBackup(bool))); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); - connect(m_chbConfirmStrings, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbConfirmStrings(bool))); - connect(m_chbShowConfirmDialog, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbShowConfirmDialog(bool))); + connect(m_pbOK, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOK())); + connect(m_pbDefault, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotDefaults())); + connect(m_chbBackup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbBackup(bool))); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHelp())); + connect(m_chbConfirmStrings, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbConfirmStrings(bool))); + connect(m_chbShowConfirmDialog, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbShowConfirmDialog(bool))); whatsThis(); } diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp index 4b9497b..e88d4c5 100644 --- a/tdefilereplace/tdefilereplace.cpp +++ b/tdefilereplace/tdefilereplace.cpp @@ -36,9 +36,9 @@ TDEFileReplace::TDEFileReplace() if (m_part) { setCentralWidget(m_part->widget()); - KStdAction::quit(this, TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); setStandardToolBarMenuEnabled(true); createGUI(m_part); removeDuplicatedActions(); @@ -78,8 +78,8 @@ void TDEFileReplace::slotConfigureToolbars() { saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp index 86cd451..ce98154 100644 --- a/tdefilereplace/tdefilereplacepart.cpp +++ b/tdefilereplace/tdefilereplacepart.cpp @@ -506,53 +506,53 @@ void TDEFileReplacePart::initGUI() } // GUI - connect(m_view, TQT_SIGNAL(updateGUI()), this, TQT_SLOT(updateGUI())); + connect(m_view, TQ_SIGNAL(updateGUI()), this, TQ_SLOT(updateGUI())); // File - (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), this, TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project"); - (void)new TDEAction(i18n("&Search"), "filesearch", 0, this, TQT_SLOT(slotSearchingOperation()), actionCollection(), "search"); - (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, this, TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); - (void)new TDEAction(i18n("&Replace"), "filereplace", 0, this, TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace"); - (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, this, TQT_SLOT(slotStop()), actionCollection(), "stop"); - (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, this, TQT_SLOT(slotCreateReport()), actionCollection(), "results_create_report"); - (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, m_view, TQT_SLOT(slotResultSave()), actionCollection(), "results_save"); - (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, m_view, TQT_SLOT(slotResultLoad()), actionCollection(), "results_load"); + (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), this, TQ_SLOT(slotSetNewParameters()), actionCollection(), "new_project"); + (void)new TDEAction(i18n("&Search"), "filesearch", 0, this, TQ_SLOT(slotSearchingOperation()), actionCollection(), "search"); + (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, this, TQ_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); + (void)new TDEAction(i18n("&Replace"), "filereplace", 0, this, TQ_SLOT(slotReplacingOperation()), actionCollection(), "replace"); + (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, this, TQ_SLOT(slotStop()), actionCollection(), "stop"); + (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, this, TQ_SLOT(slotCreateReport()), actionCollection(), "results_create_report"); + (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, m_view, TQ_SLOT(slotResultSave()), actionCollection(), "results_save"); + (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, m_view, TQ_SLOT(slotResultLoad()), actionCollection(), "results_load"); // Strings - (void)new TDEAction(i18n("&Add String..."), "editadd", 0, m_view, TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); - (void)new TDEAction(i18n("&Delete String"), "editremove", 0, m_view, TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); - (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, m_view, TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); - (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, m_view, TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save"); - (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, m_view, TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); - (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, m_view, TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); - (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, m_view, TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); + (void)new TDEAction(i18n("&Add String..."), "editadd", 0, m_view, TQ_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); + (void)new TDEAction(i18n("&Delete String"), "editremove", 0, m_view, TQ_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); + (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, m_view, TQ_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); + (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, m_view, TQ_SLOT(slotStringsSave()), actionCollection(), "strings_save"); + (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, m_view, TQ_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); + (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, m_view, TQ_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); + (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, m_view, TQ_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); // Options - (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, this, TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive"); - (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, this, TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup"); - (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, this, TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); - (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, this, TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var"); - (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, this, TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); - (void)new TDEAction(i18n("Configure &TDEFileReplace..."), "configure", 0, this, TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); + (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, this, TQ_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive"); + (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, this, TQ_SLOT(slotOptionBackup()), actionCollection(), "options_backup"); + (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, this, TQ_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); + (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, this, TQ_SLOT(slotOptionVariables()), actionCollection(), "options_var"); + (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, this, TQ_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); + (void)new TDEAction(i18n("Configure &TDEFileReplace..."), "configure", 0, this, TQ_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); // Results - (void)new TDEAction(i18n("&Properties"), "informations", 0, m_view, TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos"); - (void)new TDEAction(i18n("&Open"), "document-open", 0, m_view, TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); - (void)new TDEAction(i18n("Open &With..."), "document-open", 0, m_view, TQT_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith"); + (void)new TDEAction(i18n("&Properties"), "informations", 0, m_view, TQ_SLOT(slotResultProperties()), actionCollection(), "results_infos"); + (void)new TDEAction(i18n("&Open"), "document-open", 0, m_view, TQ_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); + (void)new TDEAction(i18n("Open &With..."), "document-open", 0, m_view, TQ_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith"); if(quantaFound) { - (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, m_view, TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); + (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, m_view, TQ_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); } - (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, m_view, TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); - (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, m_view, TQT_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry"); - (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, m_view, TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete"); - (void)new TDEAction(i18n("E&xpand Tree"), 0, m_view, TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); - (void)new TDEAction(i18n("&Reduce Tree"), 0, m_view, TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); + (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, m_view, TQ_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); + (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, m_view, TQ_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry"); + (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, m_view, TQ_SLOT(slotResultDelete()), actionCollection(), "results_delete"); + (void)new TDEAction(i18n("E&xpand Tree"), 0, m_view, TQ_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); + (void)new TDEAction(i18n("&Reduce Tree"), 0, m_view, TQ_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); // Help - (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); - (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); - (void)new TDEAction(i18n("&Report Bug"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug"); + (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, this, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); + (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, this, TQ_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); + (void)new TDEAction(i18n("&Report Bug"), 0, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug"); } void TDEFileReplacePart::initView() diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp index b7cd78c..5861eb1 100644 --- a/tdefilereplace/tdefilereplaceview.cpp +++ b/tdefilereplace/tdefilereplaceview.cpp @@ -52,25 +52,25 @@ TDEFileReplaceView::TDEFileReplaceView(RCOptions* info, TQWidget *parent,const c initGUI(); // result listview: connect events - connect(m_lvResults, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); - connect(m_lvResults, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults_2, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); - connect(m_lvResults_2, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults_2, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); + connect(m_lvResults, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults_2, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); + connect(m_lvResults_2, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults_2, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); // connect header events - connect(m_lvResults->header(), TQT_SIGNAL(clicked(int)), this,TQT_SLOT(slotResultHeaderClicked(int))); - connect(m_lvResults_2->header(), TQT_SIGNAL(clicked(int)), this,TQT_SLOT(slotResultHeaderClicked(int))); + connect(m_lvResults->header(), TQ_SIGNAL(clicked(int)), this,TQ_SLOT(slotResultHeaderClicked(int))); + connect(m_lvResults_2->header(), TQ_SIGNAL(clicked(int)), this,TQ_SLOT(slotResultHeaderClicked(int))); // string listview: connect events - connect(m_lvStrings, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsAdd())); - connect(m_lvStrings_2, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsAdd())); + connect(m_lvStrings, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotStringsAdd())); + connect(m_lvStrings_2, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotStringsAdd())); whatsThis(); } @@ -768,37 +768,37 @@ void TDEFileReplaceView::initGUI() m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("document-open")), i18n("&Open"), this, - TQT_SLOT(slotResultOpen())); + TQ_SLOT(slotResultOpen())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("document-open")), i18n("Open &With..."), this, - TQT_SLOT(slotResultOpenWith())); + TQ_SLOT(slotResultOpenWith())); if(quantaFound) { m_menuResult->insertItem(SmallIconSet("quanta"), i18n("&Edit in Quanta"), this, - TQT_SLOT(slotResultEdit())); + TQ_SLOT(slotResultEdit())); } m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("go-up")), i18n("Open Parent &Folder"), this, - TQT_SLOT(slotResultDirOpen())); + TQ_SLOT(slotResultDirOpen())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-clear")), i18n("Remove &Entry"), this, - TQT_SLOT(slotResultRemoveEntry())); + TQ_SLOT(slotResultRemoveEntry())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-delete")), i18n("&Delete"), this, - TQT_SLOT(slotResultDelete())); + TQ_SLOT(slotResultDelete())); m_menuResult->insertSeparator(); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("application-vnd.tde.info")), i18n("&Properties"), this, - TQT_SLOT(slotResultProperties())); + TQ_SLOT(slotResultProperties())); changeViews(); } diff --git a/tdelirc/irkick/irkick.cpp b/tdelirc/irkick/irkick.cpp index 25a0c9f..cf4827a 100644 --- a/tdelirc/irkick/irkick.cpp +++ b/tdelirc/irkick/irkick.cpp @@ -60,23 +60,23 @@ IRKick::IRKick(const TQCString &obj) : TQObject(), DCOPObject(obj), npApp(TQStri else { theTrayIcon->setPixmap(SmallIcon("irkickoff")); TQToolTip::add(theTrayIcon, i18n("TDE Lirc Server: No infra-red remote controls found.")); - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } theFlashOff = new TQTimer(theTrayIcon); - connect(theFlashOff, TQT_SIGNAL(timeout()), TQT_SLOT(flashOff())); + connect(theFlashOff, TQ_SIGNAL(timeout()), TQ_SLOT(flashOff())); theResetCount = 0; slotReloadConfiguration(); - connect(theClient, TQT_SIGNAL(connectionClosed()), this, TQT_SLOT(slotClosed())); - connect(theClient, TQT_SIGNAL(remotesRead()), this, TQT_SLOT(resetModes())); - connect(theClient, TQT_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQT_SLOT(gotMessage(const TQString &, const TQString &, int))); + connect(theClient, TQ_SIGNAL(connectionClosed()), this, TQ_SLOT(slotClosed())); + connect(theClient, TQ_SIGNAL(remotesRead()), this, TQ_SLOT(resetModes())); + connect(theClient, TQ_SIGNAL(commandReceived(const TQString &, const TQString &, int)), this, TQ_SLOT(gotMessage(const TQString &, const TQString &, int))); theTrayIcon->contextMenu()->changeTitle(0, "IRKick"); - theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQT_SLOT(slotConfigure())); + theTrayIcon->contextMenu()->insertItem(SmallIcon( "configure" ), i18n("&Configure..."), this, TQ_SLOT(slotConfigure())); theTrayIcon->contextMenu()->insertSeparator(); theTrayIcon->contextMenu()->insertItem(SmallIcon( "help" ), KStdGuiItem::help().text(), (new KHelpMenu(theTrayIcon, TDEGlobal::instance()->aboutData()))->menu()); - theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQT_SIGNAL(activated())); - connect(theTrayIcon->actionCollection()->action("file_quit"), TQT_SIGNAL(activated()), TQT_SLOT(doQuit())); + theTrayIcon->actionCollection()->action("file_quit")->disconnect(TQ_SIGNAL(activated())); + connect(theTrayIcon->actionCollection()->action("file_quit"), TQ_SIGNAL(activated()), TQ_SLOT(doQuit())); theTrayIcon->show(); } @@ -92,7 +92,7 @@ void IRKick::slotClosed() { theTrayIcon->setPixmap(SmallIcon("irkickoff")); KPassivePopup::message("IRKick", i18n("The infrared system has severed its connection. Remote controls are no longer available."), SmallIcon("irkick"), theTrayIcon); - TQTimer::singleShot(1000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(1000, this, TQ_SLOT(checkLirc())); } void IRKick::checkLirc() @@ -103,7 +103,7 @@ void IRKick::checkLirc() theTrayIcon->setPixmap(SmallIcon("irkick")); } else - TQTimer::singleShot(10000, this, TQT_SLOT(checkLirc())); + TQTimer::singleShot(10000, this, TQ_SLOT(checkLirc())); } void IRKick::flashOff() diff --git a/tdelirc/irkick/tdelircclient.cpp b/tdelirc/irkick/tdelircclient.cpp index ee00c88..c70d39a 100644 --- a/tdelirc/irkick/tdelircclient.cpp +++ b/tdelirc/irkick/tdelircclient.cpp @@ -72,8 +72,8 @@ bool KLircClient::connectToLirc() theSocket = new TQSocket; theSocket->setSocket(sock); - connect(theSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotRead())); - connect(theSocket, TQT_SIGNAL(connectionClosed()), TQT_SLOT(slotClosed())); + connect(theSocket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotRead())); + connect(theSocket, TQ_SIGNAL(connectionClosed()), TQ_SLOT(slotClosed())); updateRemotes(); return true; } diff --git a/tdelirc/kcmlirc/addaction.cpp b/tdelirc/kcmlirc/addaction.cpp index b43879b..3a3e6bd 100644 --- a/tdelirc/kcmlirc/addaction.cpp +++ b/tdelirc/kcmlirc/addaction.cpp @@ -34,8 +34,8 @@ AddAction::AddAction(TQWidget *parent, const char *name, const Mode &mode): AddActionBase(parent, name), theMode(mode) { - connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( updateForPageChange() )); - connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( slotCorrectPage() )); + connect(this, TQ_SIGNAL( selected(const TQString &) ), TQ_SLOT( updateForPageChange() )); + connect(this, TQ_SIGNAL( selected(const TQString &) ), TQ_SLOT( slotCorrectPage() )); curPage = 0; updateProfiles(); updateButtons(); diff --git a/tdelirc/kcmlirc/kcmlirc.cpp b/tdelirc/kcmlirc/kcmlirc.cpp index 512d10d..92f0fd9 100644 --- a/tdelirc/kcmlirc/kcmlirc.cpp +++ b/tdelirc/kcmlirc/kcmlirc.cpp @@ -74,20 +74,20 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC (new TQHBoxLayout(this))->setAutoAdd(true); theKCMLircBase = new KCMLircBase(this); - connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateActions() )); - connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModesStatus(TQListViewItem *) )); - connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) )); - connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() )); - connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) )); - connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); - connect((TQObject *)(theKCMLircBase->theAddActions), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddActions() )); - connect((TQObject *)(theKCMLircBase->theAddAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAction() )); - connect((TQObject *)(theKCMLircBase->theEditAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditAction() )); - connect((TQObject *)(theKCMLircBase->theActions), TQT_SIGNAL( doubleClicked(TQListViewItem *) ), this, TQT_SLOT( slotEditAction() )); - connect((TQObject *)(theKCMLircBase->theRemoveAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveAction() )); - connect((TQObject *)(theKCMLircBase->theAddMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddMode() )); - connect((TQObject *)(theKCMLircBase->theEditMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditMode() )); - connect((TQObject *)(theKCMLircBase->theRemoveMode), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveMode() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateActions() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateModesStatus(TQListViewItem *) )); + connect(theKCMLircBase->theActions, TQ_SIGNAL( currentChanged(TQListViewItem *) ), this, TQ_SLOT( updateActionsStatus(TQListViewItem *) )); + connect(theKCMLircBase->theExtensions, TQ_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQ_SLOT( updateInformation() )); + connect(theKCMLircBase->theModes, TQ_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQ_SLOT( slotRenamed(TQListViewItem *) )); + connect(theKCMLircBase->theModes, TQ_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQ_SLOT(slotDrop(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect((TQObject *)(theKCMLircBase->theAddActions), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddActions() )); + connect((TQObject *)(theKCMLircBase->theAddAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAction() )); + connect((TQObject *)(theKCMLircBase->theEditAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditAction() )); + connect((TQObject *)(theKCMLircBase->theActions), TQ_SIGNAL( doubleClicked(TQListViewItem *) ), this, TQ_SLOT( slotEditAction() )); + connect((TQObject *)(theKCMLircBase->theRemoveAction), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveAction() )); + connect((TQObject *)(theKCMLircBase->theAddMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddMode() )); + connect((TQObject *)(theKCMLircBase->theEditMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditMode() )); + connect((TQObject *)(theKCMLircBase->theRemoveMode), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveMode() )); load(); } @@ -163,7 +163,7 @@ void KCMLirc::slotAddAction() Mode m = modeMap[theKCMLircBase->theModes->selectedItem()]; AddAction theDialog(this, 0, m); - connect(this, TQT_SIGNAL(haveButton(const TQString &, const TQString &)), &theDialog, TQT_SLOT(updateButton(const TQString &, const TQString &))); + connect(this, TQ_SIGNAL(haveButton(const TQString &, const TQString &)), &theDialog, TQ_SLOT(updateButton(const TQString &, const TQString &))); // populate the modes list box TQListViewItem *item = theKCMLircBase->theModes->selectedItem(); diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp index bc132b0..4b7563f 100644 --- a/tdewallet/allyourbase.cpp +++ b/tdewallet/allyourbase.cpp @@ -621,7 +621,7 @@ class TDEWalletIconDrag : public TQIconDrag { TDEWalletIconView::TDEWalletIconView(TQWidget *parent, const char *name) : TDEIconView(parent, name) { TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQ_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&))); } TDEWalletIconView::~TDEWalletIconView() { diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp index 9dcb4c7..592101f 100644 --- a/tdewallet/konfigurator/konfigurator.cpp +++ b/tdewallet/konfigurator/konfigurator.cpp @@ -57,21 +57,21 @@ TDEWalletConfig::TDEWalletConfig(TQWidget *parent, const char *name, const TQStr TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint()); vbox->add(_wcw = new WalletConfigWidget(this)); - connect(_wcw->_enabled, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_launchManager, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_autocloseManager, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_autoclose, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_closeIdle, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_openPrompt, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_screensaverLock, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_localWalletSelected, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged())); - connect(_wcw->_idleTime, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(configChanged())); - connect(_wcw->_launch, TQT_SIGNAL(clicked()), this, TQT_SLOT(launchManager())); - connect(_wcw->_newWallet, TQT_SIGNAL(clicked()), this, TQT_SLOT(newNetworkWallet())); - connect(_wcw->_newLocalWallet, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLocalWallet())); - connect(_wcw->_localWallet, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); - connect(_wcw->_defaultWallet, TQT_SIGNAL(activated(int)), this, TQT_SLOT(configChanged())); - connect(_wcw->_accessList, TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); + connect(_wcw->_enabled, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_launchManager, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_autocloseManager, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_autoclose, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_closeIdle, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_openPrompt, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_screensaverLock, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_localWalletSelected, TQ_SIGNAL(clicked()), this, TQ_SLOT(configChanged())); + connect(_wcw->_idleTime, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(configChanged())); + connect(_wcw->_launch, TQ_SIGNAL(clicked()), this, TQ_SLOT(launchManager())); + connect(_wcw->_newWallet, TQ_SIGNAL(clicked()), this, TQ_SLOT(newNetworkWallet())); + connect(_wcw->_newLocalWallet, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLocalWallet())); + connect(_wcw->_localWallet, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); + connect(_wcw->_defaultWallet, TQ_SIGNAL(activated(int)), this, TQ_SLOT(configChanged())); + connect(_wcw->_accessList, TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint&, int)), this, TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int))); _wcw->_accessList->setAllColumnsShowFocus(true); updateWalletLists(); @@ -316,7 +316,7 @@ void TDEWalletConfig::contextMenuRequested(TQListViewItem *item, const TQPoint& if (item && item->parent()) { TDEPopupMenu *m = new TDEPopupMenu(this); m->insertTitle(item->parent()->text(0)); - m->insertItem(i18n("&Delete"), this, TQT_SLOT(deleteEntry()), Key_Delete); + m->insertItem(i18n("&Delete"), this, TQ_SLOT(deleteEntry()), Key_Delete); m->popup(pos); } } diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp index 87e2f88..3e5c5b5 100644 --- a/tdewallet/kwmapeditor.cpp +++ b/tdewallet/kwmapeditor.cpp @@ -34,10 +34,10 @@ KWMapEditor::KWMapEditor(TQMap<TQString,TQString>& map, TQWidget *parent, const char *name) : TQTable(0, 3, parent, name), _map(map) { _ac = new TDEActionCollection(this); - _copyAct = KStdAction::copy(this, TQT_SLOT(copy()), _ac); - connect(this, TQT_SIGNAL(valueChanged(int,int)), this, TQT_SIGNAL(dirty())); - connect(this, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - this, TQT_SLOT(contextMenu(int,int,const TQPoint&))); + _copyAct = KStdAction::copy(this, TQ_SLOT(copy()), _ac); + connect(this, TQ_SIGNAL(valueChanged(int,int)), this, TQ_SIGNAL(dirty())); + connect(this, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + this, TQ_SLOT(contextMenu(int,int,const TQPoint&))); setSelectionMode(TQTable::NoSelection); horizontalHeader()->setLabel(0, TQString()); horizontalHeader()->setLabel(1, i18n("Key")); @@ -57,7 +57,7 @@ void KWMapEditor::reload() { insertRows(row, _map.count() - row); for (int x = row; x < numRows(); ++x) { TQPushButton *b = new TQPushButton("X", this); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(erase())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(erase())); setCellWidget(x, 0, b); } } @@ -101,7 +101,7 @@ void KWMapEditor::addEntry() { int x = numRows(); insertRows(x, 1); TQPushButton *b = new TQPushButton("X", this); - connect(b, TQT_SIGNAL(clicked()), this, TQT_SLOT(erase())); + connect(b, TQ_SIGNAL(clicked()), this, TQ_SLOT(erase())); setCellWidget(x, 0, b); ensureCellVisible(x, 1); setCurrentCell(x, 1); @@ -118,7 +118,7 @@ void KWMapEditor::contextMenu(int row, int col, const TQPoint& pos) { _contextRow = row; _contextCol = col; TDEPopupMenu *m = new TDEPopupMenu(this); - m->insertItem(i18n("&New Entry"), this, TQT_SLOT(addEntry())); + m->insertItem(i18n("&New Entry"), this, TQ_SLOT(addEntry())); _copyAct->plug(m); m->popup(pos); } @@ -135,7 +135,7 @@ class InlineEditor : public TQTextEdit { : TQTextEdit(), _p(p), row(row), col(col) { setWFlags(WStyle_NoBorder | WDestructiveClose); KWin::setType(winId(), NET::Override); - connect(p, TQT_SIGNAL(destroyed()), TQT_SLOT(close())); + connect(p, TQ_SIGNAL(destroyed()), TQ_SLOT(close())); } virtual ~InlineEditor() { if (!_p) return; _p->setText(row, col, text()); _p->emitDirty(); } diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp index 81321f7..2b68fbd 100644 --- a/tdewallet/tdewalleteditor.cpp +++ b/tdewallet/tdewalleteditor.cpp @@ -66,7 +66,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * : TDEMainWindow(parent, name), _walletName(wallet), _nonLocal(isPath) { _newWallet = false; _ww = new WalletWidget(this, "Wallet Widget"); - _copyPassAction = KStdAction::copy(this, TQT_SLOT(copyPassword()), actionCollection()); + _copyPassAction = KStdAction::copy(this, TQ_SLOT(copyPassword()), actionCollection()); TQVBoxLayout *box = new TQVBoxLayout(_ww->_entryListFrame); box->setSpacing( KDialog::spacingHint() ); @@ -79,7 +79,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * box = new TQVBoxLayout(_ww->_entryStack->widget(2)); _mapEditorShowHide = new TQCheckBox(i18n("&Show values"), _ww->_entryStack->widget(2)); - connect(_mapEditorShowHide, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showHideMapEditorValue(bool))); + connect(_mapEditorShowHide, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showHideMapEditorValue(bool))); _mapEditor = new KWMapEditor(_currentMap, _ww->_entryStack->widget(2)); box->addWidget(_mapEditorShowHide); box->addWidget(_mapEditor); @@ -88,40 +88,40 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * resize(600, 400); - connect(_entryList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(entrySelectionChanged(TQListViewItem*))); + connect(_entryList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(entrySelectionChanged(TQListViewItem*))); connect(_entryList, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), + TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)), this, - TQT_SLOT(listContextMenuRequested(TQListViewItem*,const TQPoint&,int))); + TQ_SLOT(listContextMenuRequested(TQListViewItem*,const TQPoint&,int))); connect(_entryList, - TQT_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), + TQ_SIGNAL(itemRenamed(TQListViewItem*, int, const TQString&)), this, - TQT_SLOT(listItemRenamed(TQListViewItem*, int, const TQString&))); + TQ_SLOT(listItemRenamed(TQListViewItem*, int, const TQString&))); - connect(_ww->_passwordValue, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(entryEditted())); - connect(_mapEditor, TQT_SIGNAL(dirty()), - this, TQT_SLOT(entryEditted())); + connect(_ww->_passwordValue, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(entryEditted())); + connect(_mapEditor, TQ_SIGNAL(dirty()), + this, TQ_SLOT(entryEditted())); - connect(_ww->_undoChanges, TQT_SIGNAL(clicked()), - this, TQT_SLOT(restoreEntry())); - connect(_ww->_saveChanges, TQT_SIGNAL(clicked()), - this, TQT_SLOT(saveEntry())); + connect(_ww->_undoChanges, TQ_SIGNAL(clicked()), + this, TQ_SLOT(restoreEntry())); + connect(_ww->_saveChanges, TQ_SIGNAL(clicked()), + this, TQ_SLOT(saveEntry())); - connect(_ww->_showContents, TQT_SIGNAL(clicked()), - this, TQT_SLOT(showPasswordContents())); - connect(_ww->_hideContents, TQT_SIGNAL(clicked()), - this, TQT_SLOT(hidePasswordContents())); + connect(_ww->_showContents, TQ_SIGNAL(clicked()), + this, TQ_SLOT(showPasswordContents())); + connect(_ww->_hideContents, TQ_SIGNAL(clicked()), + this, TQ_SLOT(hidePasswordContents())); _walletIsOpen = false; _w = TDEWallet::Wallet::openWallet(wallet, winId(), isPath ? TDEWallet::Wallet::Path : TDEWallet::Wallet::Asynchronous); if (_w) { - connect(_w, TQT_SIGNAL(walletOpened(bool)), this, TQT_SLOT(walletOpened(bool))); - connect(_w, TQT_SIGNAL(walletClosed()), this, TQT_SLOT(walletClosed())); - connect(_w, TQT_SIGNAL(folderUpdated(const TQString&)), this, TQT_SLOT(updateEntries(const TQString&))); - connect(_w, TQT_SIGNAL(folderListUpdated()), this, TQT_SLOT(updateFolderList())); + connect(_w, TQ_SIGNAL(walletOpened(bool)), this, TQ_SLOT(walletOpened(bool))); + connect(_w, TQ_SIGNAL(walletClosed()), this, TQ_SLOT(walletClosed())); + connect(_w, TQ_SIGNAL(folderUpdated(const TQString&)), this, TQ_SLOT(updateEntries(const TQString&))); + connect(_w, TQ_SIGNAL(folderListUpdated()), this, TQ_SLOT(updateFolderList())); updateFolderList(); } else { kdDebug(2300) << "Wallet open failed!" << endl; @@ -133,7 +133,7 @@ TDEWalletEditor::TDEWalletEditor(const TQString& wallet, bool isPath, TQWidget * setCaption(wallet); - TQTimer::singleShot(0, this, TQT_SLOT(layout())); + TQTimer::singleShot(0, this, TQ_SLOT(layout())); } TDEWalletEditor::~TDEWalletEditor() { @@ -159,49 +159,49 @@ void TDEWalletEditor::layout() { void TDEWalletEditor::createActions() { _newFolderAction = new TDEAction(i18n("&New Folder..."), "folder-new", - 0, this, TQT_SLOT(createFolder()), actionCollection(), + 0, this, TQ_SLOT(createFolder()), actionCollection(), "create_folder"); - connect(this, TQT_SIGNAL(enableFolderActions(bool)), - _newFolderAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableFolderActions(bool)), + _newFolderAction, TQ_SLOT(setEnabled(bool))); _deleteFolderAction = new TDEAction(i18n("&Delete Folder"), 0, 0, - this, TQT_SLOT(deleteFolder()), actionCollection(), + this, TQ_SLOT(deleteFolder()), actionCollection(), "delete_folder"); - connect(this, TQT_SIGNAL(enableContextFolderActions(bool)), - _deleteFolderAction, TQT_SLOT(setEnabled(bool))); - connect(this, TQT_SIGNAL(enableFolderActions(bool)), - _deleteFolderAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableContextFolderActions(bool)), + _deleteFolderAction, TQ_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableFolderActions(bool)), + _deleteFolderAction, TQ_SLOT(setEnabled(bool))); _passwordAction = new TDEAction(i18n("Change &Password..."), 0, 0, this, - TQT_SLOT(changePassword()), actionCollection(), + TQ_SLOT(changePassword()), actionCollection(), "change_password"); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _passwordAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _passwordAction, TQ_SLOT(setEnabled(bool))); _mergeAction = new TDEAction(i18n("&Merge Wallet..."), 0, 0, this, - TQT_SLOT(importWallet()), actionCollection(), + TQ_SLOT(importWallet()), actionCollection(), "merge"); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _mergeAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _mergeAction, TQ_SLOT(setEnabled(bool))); _importAction = new TDEAction(i18n("&Import XML..."), 0, 0, this, - TQT_SLOT(importXML()), actionCollection(), + TQ_SLOT(importXML()), actionCollection(), "import"); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _importAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _importAction, TQ_SLOT(setEnabled(bool))); _exportAction = new TDEAction(i18n("&Export..."), 0, 0, this, - TQT_SLOT(exportXML()), actionCollection(), + TQ_SLOT(exportXML()), actionCollection(), "export"); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _exportAction, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _exportAction, TQ_SLOT(setEnabled(bool))); - _saveAsAction = KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection()); - connect(this, TQT_SIGNAL(enableWalletActions(bool)), - _saveAsAction, TQT_SLOT(setEnabled(bool))); + _saveAsAction = KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + connect(this, TQ_SIGNAL(enableWalletActions(bool)), + _saveAsAction, TQ_SLOT(setEnabled(bool))); - 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()); emit enableWalletActions(false); emit enableFolderActions(false); @@ -585,9 +585,9 @@ void TDEWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoi m->insertTitle(title); switch (menuClass) { case TDEWalletEntryItemClass: - m->insertItem(i18n("&New..." ), this, TQT_SLOT(newEntry()), Key_Insert); - m->insertItem(i18n( "&Rename" ), this, TQT_SLOT(renameEntry()), Key_F2); - m->insertItem(i18n( "&Delete" ), this, TQT_SLOT(deleteEntry()), Key_Delete); + m->insertItem(i18n("&New..." ), this, TQ_SLOT(newEntry()), Key_Insert); + m->insertItem(i18n( "&Rename" ), this, TQ_SLOT(renameEntry()), Key_F2); + m->insertItem(i18n( "&Delete" ), this, TQ_SLOT(deleteEntry()), Key_Delete); if (ci && ci->type() == TDEWallet::Wallet::Password) { m->insertSeparator(); _copyPassAction->plug(m); @@ -595,7 +595,7 @@ void TDEWalletEditor::listContextMenuRequested(TQListViewItem *item, const TQPoi break; case TDEWalletContainerItemClass: - m->insertItem(i18n( "&New..." ), this, TQT_SLOT(newEntry()), Key_Insert); + m->insertItem(i18n( "&New..." ), this, TQ_SLOT(newEntry()), Key_Insert); break; case TDEWalletFolderItemClass: diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp index 8bc0b20..37608c2 100644 --- a/tdewallet/tdewalletmanager.cpp +++ b/tdewallet/tdewalletmanager.cpp @@ -61,7 +61,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) _tray = new KSystemTray(this, "tdewalletmanager tray"); _tray->setPixmap(loadSystemTrayIcon("wallet_closed")); TQToolTip::add(_tray, i18n("TDE Wallet: No wallets open.")); - connect(_tray, TQT_SIGNAL(quitSelected()), TQT_SLOT(shuttingDown())); + connect(_tray, TQ_SIGNAL(quitSelected()), TQ_SLOT(shuttingDown())); TQStringList wl = TDEWallet::Wallet::walletList(); bool isOpen = false; for (TQStringList::Iterator it = wl.begin(); it != wl.end(); ++it) { @@ -76,7 +76,7 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) if (!isOpen && kapp->isRestored()) { delete _tray; _tray = 0L; - TQTimer::singleShot( 0, kapp, TQT_SLOT( quit())); + TQTimer::singleShot( 0, kapp, TQ_SLOT( quit())); return; } } else { @@ -84,8 +84,8 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) } _iconView = new TDEWalletIconView(this, "tdewalletmanager icon view"); - connect(_iconView, TQT_SIGNAL(executed(TQIconViewItem*)), this, TQT_SLOT(openWallet(TQIconViewItem*))); - connect(_iconView, TQT_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQT_SLOT(contextMenu(TQIconViewItem*, const TQPoint&))); + connect(_iconView, TQ_SIGNAL(executed(TQIconViewItem*)), this, TQ_SLOT(openWallet(TQIconViewItem*))); + connect(_iconView, TQ_SIGNAL(contextMenuRequested(TQIconViewItem*, const TQPoint&)), this, TQ_SLOT(contextMenu(TQIconViewItem*, const TQPoint&))); updateWalletDisplay(); setCentralWidget(_iconView); @@ -94,13 +94,13 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) _dcopRef = new DCOPRef("kded", "tdewalletd"); _dcopRef->dcopClient()->setNotifications(true); connect(_dcopRef->dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(possiblyRescan(const TQCString&))); + TQ_SLOT(possiblyRescan(const TQCString&))); connect(_dcopRef->dcopClient(), - TQT_SIGNAL(applicationRegistered(const TQCString&)), + TQ_SIGNAL(applicationRegistered(const TQCString&)), this, - TQT_SLOT(possiblyRescan(const TQCString&))); + TQ_SLOT(possiblyRescan(const TQCString&))); connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "allWalletsClosed()", "allWalletsClosed()", false); connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "walletClosed(TQString)", "updateWalletDisplay()", false); @@ -113,27 +113,27 @@ TDEWalletManager::TDEWalletManager(TQWidget *parent, const char *name, WFlags f) // open. Must check that a wallet is still open here. new TDEAction(i18n("&New Wallet..."), "tdewalletmanager", 0, this, - TQT_SLOT(createWallet()), actionCollection(), + TQ_SLOT(createWallet()), actionCollection(), "wallet_create"); TDEAction *act = new TDEAction(i18n("Configure &Wallet..."), "configure", - 0, this, TQT_SLOT(setupWallet()), actionCollection(), + 0, this, TQ_SLOT(setupWallet()), actionCollection(), "wallet_settings"); if (_tray) { act->plug(_tray->contextMenu()); } act = new TDEAction(i18n("Close &All Wallets"), 0, 0, this, - TQT_SLOT(closeAllWallets()), actionCollection(), + TQ_SLOT(closeAllWallets()), actionCollection(), "close_all_wallets"); if (_tray) { act->plug(_tray->contextMenu()); } - KStdAction::quit(this, TQT_SLOT(shuttingDown()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::quit(this, TQ_SLOT(shuttingDown()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); createGUI("tdewalletmanager.rc"); - accel->connectItem(accel->insertItem(Key_Return), this, TQT_SLOT(openWallet())); - accel->connectItem(accel->insertItem(Key_Delete), this, TQT_SLOT(deleteWallet())); + accel->connectItem(accel->insertItem(Key_Return), this, TQ_SLOT(openWallet())); + accel->connectItem(accel->insertItem(Key_Delete), this, TQ_SLOT(deleteWallet())); if (_tray) { _tray->show(); @@ -208,11 +208,11 @@ TQPtrStack<TQIconViewItem> trash; void TDEWalletManager::contextMenu(TQIconViewItem *item, const TQPoint& pos) { if (item) { TQGuardedPtr<TDEWalletPopup> popupMenu = new TDEWalletPopup(item->text(), this); - connect(popupMenu, TQT_SIGNAL(walletOpened(const TQString&)), this, TQT_SLOT(openWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletClosed(const TQString&)), this, TQT_SLOT(closeWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletDeleted(const TQString&)), this, TQT_SLOT(deleteWallet(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletChangePassword(const TQString&)), this, TQT_SLOT(changeWalletPassword(const TQString&))); - connect(popupMenu, TQT_SIGNAL(walletCreated()), this, TQT_SLOT(createWallet())); + connect(popupMenu, TQ_SIGNAL(walletOpened(const TQString&)), this, TQ_SLOT(openWallet(const TQString&))); + connect(popupMenu, TQ_SIGNAL(walletClosed(const TQString&)), this, TQ_SLOT(closeWallet(const TQString&))); + connect(popupMenu, TQ_SIGNAL(walletDeleted(const TQString&)), this, TQ_SLOT(deleteWallet(const TQString&))); + connect(popupMenu, TQ_SIGNAL(walletChangePassword(const TQString&)), this, TQ_SLOT(changeWalletPassword(const TQString&))); + connect(popupMenu, TQ_SIGNAL(walletCreated()), this, TQ_SLOT(createWallet())); popupMenu->exec(pos); delete popupMenu; } @@ -256,8 +256,8 @@ void TDEWalletManager::changeWalletPassword(const TQString& walletName) { void TDEWalletManager::openWalletFile(const TQString& path) { TDEWalletEditor *we = new TDEWalletEditor(path, true, this, "Wallet Editor"); if (we->isOpen()) { - connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)), - this, TQT_SLOT(editorClosed(TDEMainWindow*))); + connect(we, TQ_SIGNAL(editorClosed(TDEMainWindow*)), + this, TQ_SLOT(editorClosed(TDEMainWindow*))); we->show(); } else { KMessageBox::sorry(this, i18n("Error opening wallet %1.").arg(path)); @@ -297,8 +297,8 @@ void TDEWalletManager::openWallet(const TQString& walletName, bool newWallet) { TDEWalletEditor *we = new TDEWalletEditor(walletName, false, this, "Wallet Editor"); we->setNewWallet(newWallet); if (we->isOpen()) { - connect(we, TQT_SIGNAL(editorClosed(TDEMainWindow*)), - this, TQT_SLOT(editorClosed(TDEMainWindow*))); + connect(we, TQ_SIGNAL(editorClosed(TDEMainWindow*)), + this, TQ_SLOT(editorClosed(TDEMainWindow*))); we->show(); _windows.append(we); } else if (!newWallet) { diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp index e4939cc..5639f55 100644 --- a/tdewallet/tdewalletpopup.cpp +++ b/tdewallet/tdewalletpopup.cpp @@ -35,15 +35,15 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c TDEAction *act; act = new TDEAction(i18n("&New Wallet..."), 0, 0, this, - TQT_SLOT(createWallet()), ac, "wallet_create"); + TQ_SLOT(createWallet()), ac, "wallet_create"); act->plug(this); act = new TDEAction(i18n("&Open..."), 0, Key_Return, this, - TQT_SLOT(openWallet()), ac, "wallet_open"); + TQ_SLOT(openWallet()), ac, "wallet_open"); act->plug(this); act = new TDEAction(i18n("Change &Password..."), 0, 0, this, - TQT_SLOT(changeWalletPassword()), ac, "wallet_password"); + TQ_SLOT(changeWalletPassword()), ac, "wallet_password"); act->plug(this); TQStringList ul = TDEWallet::Wallet::users(wallet); @@ -52,7 +52,7 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c int id = 7000; for (TQStringList::Iterator it = ul.begin(); it != ul.end(); ++it) { _appMap[id] = *it; - pm->insertItem(*it, this, TQT_SLOT(disconnectApp(int)), 0, id); + pm->insertItem(*it, this, TQ_SLOT(disconnectApp(int)), 0, id); pm->setItemParameter(id, id); id++; } @@ -61,14 +61,14 @@ TDEWalletPopup::TDEWalletPopup(const TQString& wallet, TQWidget *parent, const c } act = KStdAction::close( this, - TQT_SLOT(closeWallet()), ac, "wallet_close"); + TQ_SLOT(closeWallet()), ac, "wallet_close"); // FIXME: let's track this inside the manager so we don't need a dcop // roundtrip here. act->setEnabled(TDEWallet::Wallet::isOpen(wallet)); act->plug(this); act = new TDEAction(i18n("&Delete"), 0, Key_Delete, this, - TQT_SLOT(deleteWallet()), ac, "wallet_delete"); + TQ_SLOT(deleteWallet()), ac, "wallet_delete"); act->plug(this); } |