diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:53 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:53 -0600 |
commit | a935c1de6f952a489a96a27cb897144b5d225ebe (patch) | |
tree | f18b873df3b93a00c8fc16844a30d1476434c03d /katapult/plugins/catalogs/amarokcatalog | |
parent | 155220cc57a9be0841398c81b35cd8b22b3156ba (diff) | |
download | katapult-a935c1de6f952a489a96a27cb897144b5d225ebe.tar.gz katapult-a935c1de6f952a489a96a27cb897144b5d225ebe.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'katapult/plugins/catalogs/amarokcatalog')
-rw-r--r-- | katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp | 2 | ||||
-rw-r--r-- | katapult/plugins/catalogs/amarokcatalog/song.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp index 9847bcb..be9f492 100644 --- a/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/actionplaysong.cpp @@ -35,7 +35,7 @@ TQPixmap ActionPlaySong::icon(int size) const { - return KGlobal::iconLoader()->loadIcon("amarok", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("amarok", KIcon::NoGroup, size); } TQString ActionPlaySong::text() const diff --git a/katapult/plugins/catalogs/amarokcatalog/song.cpp b/katapult/plugins/catalogs/amarokcatalog/song.cpp index ebad14a..2b58f14 100644 --- a/katapult/plugins/catalogs/amarokcatalog/song.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/song.cpp @@ -68,7 +68,7 @@ TQPixmap Song::icon(int size) const { TQImage image = cover.load(size); if ( image.isNull() ) - return KGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, size); + return TDEGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, size); return TQPixmap(image); } |