diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:30:37 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:30:37 -0600 |
commit | 00c3041bcca175069e36271b72188965ad1ffcf5 (patch) | |
tree | ac654751aa6d89f7da1faf4af1db1121164250b5 /kipi-plugins/rawconverter | |
parent | cee209f8b3fe41533e21171f62ca32c552c2d2b3 (diff) | |
download | kipi-plugins-00c3041bcca175069e36271b72188965ad1ffcf5.tar.gz kipi-plugins-00c3041bcca175069e36271b72188965ad1ffcf5.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kipi-plugins/rawconverter')
-rw-r--r-- | kipi-plugins/rawconverter/actionthread.cpp | 2 | ||||
-rw-r--r-- | kipi-plugins/rawconverter/rawdecodingiface.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/kipi-plugins/rawconverter/actionthread.cpp b/kipi-plugins/rawconverter/actionthread.cpp index d17fa7d..f1fd62d 100644 --- a/kipi-plugins/rawconverter/actionthread.cpp +++ b/kipi-plugins/rawconverter/actionthread.cpp @@ -178,7 +178,7 @@ void ActionThread::run() if (info.dateTime.isValid()) { identify.append(i18n("Created: %1\n") - .arg(KGlobal::locale()->formatDateTime(info.dateTime, true, true))); + .arg(TDEGlobal::locale()->formatDateTime(info.dateTime, true, true))); } if (info.aperture != -1.0) diff --git a/kipi-plugins/rawconverter/rawdecodingiface.cpp b/kipi-plugins/rawconverter/rawdecodingiface.cpp index 3c67d38..3451824 100644 --- a/kipi-plugins/rawconverter/rawdecodingiface.cpp +++ b/kipi-plugins/rawconverter/rawdecodingiface.cpp @@ -86,32 +86,32 @@ RawDecodingIface::~RawDecodingIface() TQByteArray RawDecodingIface::getICCProfilFromFile(KDcrawIface::RawDecodingSettings::OutputColorSpace colorSpace) { TQString filePath; - KGlobal::dirs()->addResourceType("profiles", KGlobal::dirs()->kde_default("data") + + TDEGlobal::dirs()->addResourceType("profiles", TDEGlobal::dirs()->kde_default("data") + "kipiplugin_rawconverter/profiles"); switch(colorSpace) { case KDcrawIface::RawDecodingSettings::SRGB: { - filePath = KGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); + filePath = TDEGlobal::dirs()->findResourceDir("profiles", "srgb.icm"); filePath.append("srgb.icm"); break; } case KDcrawIface::RawDecodingSettings::ADOBERGB: { - filePath = KGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); + filePath = TDEGlobal::dirs()->findResourceDir("profiles", "adobergb.icm"); filePath.append("adobergb.icm"); break; } case KDcrawIface::RawDecodingSettings::WIDEGAMMUT: { - filePath = KGlobal::dirs()->findResourceDir("profiles", "widegamut.icm"); + filePath = TDEGlobal::dirs()->findResourceDir("profiles", "widegamut.icm"); filePath.append("widegamut.icm"); break; } case KDcrawIface::RawDecodingSettings::PROPHOTO: { - filePath = KGlobal::dirs()->findResourceDir("profiles", "prophoto.icm"); + filePath = TDEGlobal::dirs()->findResourceDir("profiles", "prophoto.icm"); filePath.append("prophoto.icm"); break; } |