diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kdesktop/startupid.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/startupid.cpp')
| -rw-r--r-- | kdesktop/startupid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index 3bec0f9af..36d566e31 100644 --- a/kdesktop/startupid.cpp +++ b/kdesktop/startupid.cpp @@ -179,7 +179,7 @@ void StartupId::start_startupid( const TQString& icon_P ) = { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white }; - TQPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0, + TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0, KIcon::DefaultState, 0, true ); // return null pixmap if not found if( icon_pixmap.isNull()) icon_pixmap = SmallIcon( "exec" ); |