diff options
Diffstat (limited to 'kdesktop')
| -rw-r--r-- | kdesktop/minicli.cpp | 8 | ||||
| -rw-r--r-- | kdesktop/startupid.cpp | 22 | ||||
| -rw-r--r-- | kdesktop/startupid.h | 12 |
3 files changed, 21 insertions, 21 deletions
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index ce6d20e34..a793102f8 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -422,12 +422,12 @@ int Minicli::runCommand() TQCString asn; if( tqApp->desktop()->isVirtualDesktop()) { - asn = KStartupInfo::createNewStartupId(); - KStartupInfoId id; + asn = TDEStartupInfo::createNewStartupId(); + TDEStartupInfoId id; id.initId( asn ); - KStartupInfoData data; + TDEStartupInfoData data; data.setXinerama( tqApp->desktop()->screenNumber( this )); - KStartupInfo::sendChange( id, data ); + TDEStartupInfo::sendChange( id, data ); } // Determine whether the application should be run through diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index 6603e7b7b..2cedadcdf 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -42,7 +42,7 @@ static Atom kde_splash_progress; StartupId::StartupId( TQWidget* parent, const char* name ) : TQWidget( parent, name ), - startup_info( KStartupInfo::CleanOnCantDetect ), + startup_info( TDEStartupInfo::CleanOnCantDetect ), startup_widget( NULL ), blinking( true ), bouncing( false ) @@ -58,14 +58,14 @@ StartupId::StartupId( TQWidget* parent, const char* name ) } connect( &update_timer, TQT_SIGNAL( timeout()), TQT_SLOT( update_startupid())); connect( &startup_info, - TQT_SIGNAL( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& )), - TQT_SLOT( gotNewStartup( const KStartupInfoId&, const KStartupInfoData& ))); + TQT_SIGNAL( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQT_SLOT( gotNewStartup( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( &startup_info, - TQT_SIGNAL( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& )), - TQT_SLOT( gotStartupChange( const KStartupInfoId&, const KStartupInfoData& ))); + TQT_SIGNAL( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQT_SLOT( gotStartupChange( const TDEStartupInfoId&, const TDEStartupInfoData& ))); connect( &startup_info, - TQT_SIGNAL( gotRemoveStartup( const KStartupInfoId&, const KStartupInfoData& )), - TQT_SLOT( gotRemoveStartup( const KStartupInfoId& ))); + TQT_SIGNAL( gotRemoveStartup( const TDEStartupInfoId&, const TDEStartupInfoData& )), + TQT_SLOT( gotRemoveStartup( const TDEStartupInfoId& ))); } StartupId::~StartupId() @@ -80,7 +80,7 @@ void StartupId::configure() bouncing = KLaunchSettings::bouncing(); } -void StartupId::gotNewStartup( const KStartupInfoId& id_P, const KStartupInfoData& data_P ) +void StartupId::gotNewStartup( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P ) { TQString icon = data_P.findIcon(); current_startup = id_P; @@ -88,7 +88,7 @@ void StartupId::gotNewStartup( const KStartupInfoId& id_P, const KStartupInfoDat start_startupid( icon ); } -void StartupId::gotStartupChange( const KStartupInfoId& id_P, const KStartupInfoData& data_P ) +void StartupId::gotStartupChange( const TDEStartupInfoId& id_P, const TDEStartupInfoData& data_P ) { if( current_startup == id_P ) { @@ -101,12 +101,12 @@ void StartupId::gotStartupChange( const KStartupInfoId& id_P, const KStartupInfo } } -void StartupId::gotRemoveStartup( const KStartupInfoId& id_P ) +void StartupId::gotRemoveStartup( const TDEStartupInfoId& id_P ) { startups.remove( id_P ); if( startups.count() == 0 ) { - current_startup = KStartupInfoId(); // null + current_startup = TDEStartupInfoId(); // null if( kde_startup_status == StartupIn ) start_startupid( KDE_STARTUP_ICON ); else diff --git a/kdesktop/startupid.h b/kdesktop/startupid.h index 62e7031db..4c0027bfa 100644 --- a/kdesktop/startupid.h +++ b/kdesktop/startupid.h @@ -45,16 +45,16 @@ class StartupId void stop_startupid(); protected slots: void update_startupid(); - void gotNewStartup( const KStartupInfoId& id, const KStartupInfoData& data ); - void gotStartupChange( const KStartupInfoId& id, const KStartupInfoData& data ); - void gotRemoveStartup( const KStartupInfoId& id ); + void gotNewStartup( const TDEStartupInfoId& id, const TDEStartupInfoData& data ); + void gotStartupChange( const TDEStartupInfoId& id, const TDEStartupInfoData& data ); + void gotRemoveStartup( const TDEStartupInfoId& id ); void finishKDEStartup(); protected: - KStartupInfo startup_info; + TDEStartupInfo startup_info; TQWidget* startup_widget; TQTimer update_timer; - TQMap< KStartupInfoId, TQString > startups; // TQString == pixmap - KStartupInfoId current_startup; + TQMap< TDEStartupInfoId, TQString > startups; // TQString == pixmap + TDEStartupInfoId current_startup; bool blinking; bool bouncing; unsigned int color_index; |