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 /kioslave/media/libmediacommon | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/media/libmediacommon')
| -rw-r--r-- | kioslave/media/libmediacommon/notifieraction.cpp | 2 | ||||
| -rw-r--r-- | kioslave/media/libmediacommon/notifiersettings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kioslave/media/libmediacommon/notifieraction.cpp b/kioslave/media/libmediacommon/notifieraction.cpp index d10314701..0dfc4110e 100644 --- a/kioslave/media/libmediacommon/notifieraction.cpp +++ b/kioslave/media/libmediacommon/notifieraction.cpp @@ -57,7 +57,7 @@ TQPixmap NotifierAction::pixmap() const } else { - TQString path = KGlobal::iconLoader()->iconPath( m_iconName, -32 ); + TQString path = TDEGlobal::iconLoader()->iconPath( m_iconName, -32 ); return TQPixmap( path ); } } diff --git a/kioslave/media/libmediacommon/notifiersettings.cpp b/kioslave/media/libmediacommon/notifiersettings.cpp index 0cdf6f26b..cc90e5ef7 100644 --- a/kioslave/media/libmediacommon/notifiersettings.cpp +++ b/kioslave/media/libmediacommon/notifiersettings.cpp @@ -361,7 +361,7 @@ bool NotifierSettings::shouldLoadActions( KDesktopFile &desktop, const TQString TQValueList<NotifierServiceAction*> NotifierSettings::listServices( const TQString &mimetype ) const { TQValueList<NotifierServiceAction*> services; - TQStringList dirs = KGlobal::dirs()->findDirs("data", "konqueror/servicemenus/"); + TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "konqueror/servicemenus/"); TQStringList::ConstIterator dir_it = dirs.begin(); TQStringList::ConstIterator dir_end = dirs.end(); |