Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/8/head
Michele Calgaro 12 months ago
parent 41317d1d01
commit 72f4f1bbe7
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -99,13 +99,13 @@ KDirStatApp::KDirStatApp( TQWidget* , const char* name )
connect( this, TQT_SIGNAL( readConfig() ), _treeView, TQT_SLOT ( readConfig() ) ); connect( this, TQT_SIGNAL( readConfig() ), _treeView, TQT_SLOT ( readConfig() ) );
connect( this, TQT_SIGNAL( saveConfig() ), _treeView, TQT_SLOT ( saveConfig() ) ); connect( this, TQT_SIGNAL( saveConfig() ), _treeView, TQT_SLOT ( saveConfig() ) );
connect( _treeView, TQT_SIGNAL( finished() ), TQT_TQOBJECT(this), TQT_SLOT( createTreemapView() ) ); connect( _treeView, TQT_SIGNAL( finished() ), this, TQT_SLOT( createTreemapView() ) );
connect( _treeView, TQT_SIGNAL( aborted() ), TQT_TQOBJECT(this), TQT_SLOT( createTreemapView() ) ); connect( _treeView, TQT_SIGNAL( aborted() ), this, TQT_SLOT( createTreemapView() ) );
connect( _treeView, TQT_SIGNAL( startingReading() ), TQT_TQOBJECT(this), TQT_SLOT( deleteTreemapView() ) ); connect( _treeView, TQT_SIGNAL( startingReading() ), this, TQT_SLOT( deleteTreemapView() ) );
connect( _treeView, TQT_SIGNAL( startingReading() ), TQT_TQOBJECT(this), TQT_SLOT( updateActions() ) ); connect( _treeView, TQT_SIGNAL( startingReading() ), this, TQT_SLOT( updateActions() ) );
connect( _treeView, TQT_SIGNAL( finished() ), TQT_TQOBJECT(this), TQT_SLOT( updateActions() ) ); connect( _treeView, TQT_SIGNAL( finished() ), this, TQT_SLOT( updateActions() ) );
connect( _treeView, TQT_SIGNAL( aborted() ), TQT_TQOBJECT(this), TQT_SLOT( updateActions() ) ); connect( _treeView, TQT_SIGNAL( aborted() ), this, TQT_SLOT( updateActions() ) );
// Call inits to invoke all other construction parts // Call inits to invoke all other construction parts
@ -141,72 +141,72 @@ KDirStatApp::~KDirStatApp()
void void
KDirStatApp::initActions() KDirStatApp::initActions()
{ {
_fileAskOpenDir = KStdAction::open ( TQT_TQOBJECT(this), TQT_SLOT( fileAskOpenDir() ), actionCollection() ); _fileAskOpenDir = KStdAction::open ( this, TQT_SLOT( fileAskOpenDir() ), actionCollection() );
_fileAskOpenUrl = new TDEAction( i18n( "Open &URL..." ), "konqueror", 0, _fileAskOpenUrl = new TDEAction( i18n( "Open &URL..." ), "konqueror", 0,
TQT_TQOBJECT(this), TQT_SLOT( fileAskOpenUrl() ), this, TQT_SLOT( fileAskOpenUrl() ),
actionCollection(), "file_open_url" ); actionCollection(), "file_open_url" );
_fileOpenRecent = KStdAction::openRecent ( TQT_TQOBJECT(this), TQT_SLOT( fileOpenRecent( const KURL& ) ), actionCollection() ); _fileOpenRecent = KStdAction::openRecent ( this, TQT_SLOT( fileOpenRecent( const KURL& ) ), actionCollection() );
_fileCloseDir = KStdAction::close ( TQT_TQOBJECT(this), TQT_SLOT( fileCloseDir() ), actionCollection() ); _fileCloseDir = KStdAction::close ( this, TQT_SLOT( fileCloseDir() ), actionCollection() );
_fileRefreshAll = new TDEAction( i18n( "Refresh &All" ), "reload", 0, _fileRefreshAll = new TDEAction( i18n( "Refresh &All" ), "reload", 0,
TQT_TQOBJECT(this), TQT_SLOT( refreshAll() ), this, TQT_SLOT( refreshAll() ),
actionCollection(), "file_refresh_all" ); actionCollection(), "file_refresh_all" );
_fileRefreshSelected = new TDEAction( i18n( "Refresh &Selected" ), 0, _fileRefreshSelected = new TDEAction( i18n( "Refresh &Selected" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( refreshSelected() ), this, TQT_SLOT( refreshSelected() ),
actionCollection(), "file_refresh_selected" ); actionCollection(), "file_refresh_selected" );
_fileContinueReadingAtMountPoint = new TDEAction( i18n( "Continue Reading at &Mount Point" ), "drive-harddisk-mounted", 0, _fileContinueReadingAtMountPoint = new TDEAction( i18n( "Continue Reading at &Mount Point" ), "drive-harddisk-mounted", 0,
TQT_TQOBJECT(this), TQT_SLOT( refreshSelected() ), actionCollection(), this, TQT_SLOT( refreshSelected() ), actionCollection(),
"file_continue_reading_at_mount_point" ); "file_continue_reading_at_mount_point" );
_fileStopReading = new TDEAction( i18n( "Stop Rea&ding" ), "process-stop", 0, _fileStopReading = new TDEAction( i18n( "Stop Rea&ding" ), "process-stop", 0,
TQT_TQOBJECT(this), TQT_SLOT( stopReading() ), actionCollection(), this, TQT_SLOT( stopReading() ), actionCollection(),
"file_stop_reading" ); "file_stop_reading" );
_fileQuit = KStdAction::quit ( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() ); _fileQuit = KStdAction::quit ( kapp, TQT_SLOT( quit() ), actionCollection() );
_editCopy = KStdAction::copy ( TQT_TQOBJECT(this), TQT_SLOT( editCopy() ), actionCollection() ); _editCopy = KStdAction::copy ( this, TQT_SLOT( editCopy() ), actionCollection() );
_showToolBar = KStdAction::showToolbar ( TQT_TQOBJECT(this), TQT_SLOT( toggleToolBar() ), actionCollection() ); _showToolBar = KStdAction::showToolbar ( this, TQT_SLOT( toggleToolBar() ), actionCollection() );
_showStatusBar = KStdAction::showStatusbar ( TQT_TQOBJECT(this), TQT_SLOT( toggleStatusBar() ), actionCollection() ); _showStatusBar = KStdAction::showStatusbar ( this, TQT_SLOT( toggleStatusBar() ), actionCollection() );
_cleanupOpenWith = new TDEAction( i18n( "Open With" ), 0, _cleanupOpenWith = new TDEAction( i18n( "Open With" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( cleanupOpenWith() ), this, TQT_SLOT( cleanupOpenWith() ),
actionCollection(), "cleanup_open_with" ); actionCollection(), "cleanup_open_with" );
_treemapZoomIn = new TDEAction( i18n( "Zoom in" ), "zoom-in", Key_Plus, _treemapZoomIn = new TDEAction( i18n( "Zoom in" ), "zoom-in", Key_Plus,
TQT_TQOBJECT(this), TQT_SLOT( treemapZoomIn() ), this, TQT_SLOT( treemapZoomIn() ),
actionCollection(), "treemap_zoom_in" ); actionCollection(), "treemap_zoom_in" );
_treemapZoomOut = new TDEAction( i18n( "Zoom out" ), "zoom-out", Key_Minus, _treemapZoomOut = new TDEAction( i18n( "Zoom out" ), "zoom-out", Key_Minus,
TQT_TQOBJECT(this), TQT_SLOT( treemapZoomOut() ), this, TQT_SLOT( treemapZoomOut() ),
actionCollection(), "treemap_zoom_out" ); actionCollection(), "treemap_zoom_out" );
_treemapSelectParent= new TDEAction( i18n( "Select Parent" ), "go-up", Key_Asterisk, _treemapSelectParent= new TDEAction( i18n( "Select Parent" ), "go-up", Key_Asterisk,
TQT_TQOBJECT(this), TQT_SLOT( treemapSelectParent() ), this, TQT_SLOT( treemapSelectParent() ),
actionCollection(), "treemap_select_parent" ); actionCollection(), "treemap_select_parent" );
_treemapRebuild = new TDEAction( i18n( "Rebuild Treemap" ), 0, _treemapRebuild = new TDEAction( i18n( "Rebuild Treemap" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( treemapRebuild() ), this, TQT_SLOT( treemapRebuild() ),
actionCollection(), "treemap_rebuild" ); actionCollection(), "treemap_rebuild" );
_showTreemapView = new TDEToggleAction( i18n( "Show Treemap" ), Key_F9, _showTreemapView = new TDEToggleAction( i18n( "Show Treemap" ), Key_F9,
TQT_TQOBJECT(this), TQT_SLOT( toggleTreemapView() ), this, TQT_SLOT( toggleTreemapView() ),
actionCollection(), "options_show_treemap" ); actionCollection(), "options_show_treemap" );
new TDEAction( i18n( "Help about Treemaps" ), "help", 0, new TDEAction( i18n( "Help about Treemaps" ), "help", 0,
TQT_TQOBJECT(this), TQT_SLOT( treemapHelp() ), this, TQT_SLOT( treemapHelp() ),
actionCollection(), "treemap_help" ); actionCollection(), "treemap_help" );
TDEAction * pref = KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( preferences() ), actionCollection() ); TDEAction * pref = KStdAction::preferences( this, TQT_SLOT( preferences() ), actionCollection() );
_reportMailToOwner = new TDEAction( i18n( "Send &Mail to Owner" ), "mail_generic", 0, _reportMailToOwner = new TDEAction( i18n( "Send &Mail to Owner" ), "mail_generic", 0,
TQT_TQOBJECT(_treeView), TQT_SLOT( sendMailToOwner() ), _treeView, TQT_SLOT( sendMailToOwner() ),
actionCollection(), "report_mail_to_owner" ); actionCollection(), "report_mail_to_owner" );
_helpSendFeedbackMail = new TDEAction( i18n( "Send &Feedback Mail..." ), 0, _helpSendFeedbackMail = new TDEAction( i18n( "Send &Feedback Mail..." ), 0,
TQT_TQOBJECT(this), TQT_SLOT( sendFeedbackMail() ), this, TQT_SLOT( sendFeedbackMail() ),
actionCollection(), "help_send_feedback_mail" ); actionCollection(), "help_send_feedback_mail" );
@ -314,7 +314,7 @@ KDirStatApp::initActivityTracker()
if ( ! doFeedbackReminder() ) if ( ! doFeedbackReminder() )
return; return;
_activityTracker = new KActivityTracker( TQT_TQOBJECT(this), "Feedback", _activityTracker = new KActivityTracker( this, "Feedback",
INITIAL_FEEDBACK_REMINDER ); INITIAL_FEEDBACK_REMINDER );
connect( _activityTracker, TQT_SIGNAL( thresholdReached() ), connect( _activityTracker, TQT_SIGNAL( thresholdReached() ),

@ -409,7 +409,7 @@ KTreemapView::rebuildTreemap( KFileInfo * newRoot,
if ( ! canvas() ) if ( ! canvas() )
{ {
TQCanvas * canv = new TQCanvas( TQT_TQOBJECT(this) ); TQCanvas * canv = new TQCanvas( this );
TQ_CHECK_PTR( canv ); TQ_CHECK_PTR( canv );
setCanvas( canv ); setCanvas( canv );
} }

Loading…
Cancel
Save